Renamed Gold theme to Caramel

This commit is contained in:
OverloadedOrama 2020-05-06 22:01:58 +03:00
parent 79bcb01787
commit 1873945e9f
19 changed files with 35 additions and 35 deletions

View file

@ -633,7 +633,7 @@ func frame_changed(value : int) -> void:
c.is_making_line = false
c.line_2d.set_point_position(1, c.line_2d.points[0])
var text_color := Color.white
if theme_type == "Gold" || theme_type == "Light":
if theme_type == "Caramel" || theme_type == "Light":
text_color = Color.black
frame_ids.get_child(i).add_color_override("font_color", text_color)
for layer in layers:
@ -700,7 +700,7 @@ func disable_button(button : BaseButton, disable : bool) -> void:
if button is Button:
var theme := theme_type
if theme == "Gold":
if theme == "Caramel":
theme = "Dark"
for c in button.get_children():
if c is TextureRect:

View file

@ -329,11 +329,11 @@ func change_theme(ID : int) -> void:
main_theme = preload("res://assets/themes/blue/theme.tres")
top_menu_style = preload("res://assets/themes/blue/top_menu_style.tres")
ruler_style = preload("res://assets/themes/blue/ruler_style.tres")
elif ID == 3: # Gold Theme
Global.theme_type = "Gold"
main_theme = preload("res://assets/themes/gold/theme.tres")
top_menu_style = preload("res://assets/themes/gold/top_menu_style.tres")
ruler_style = preload("res://assets/themes/gold/ruler_style.tres")
elif ID == 3: # Caramel Theme
Global.theme_type = "Caramel"
main_theme = preload("res://assets/themes/caramel/theme.tres")
top_menu_style = preload("res://assets/themes/caramel/top_menu_style.tres")
ruler_style = preload("res://assets/themes/caramel/ruler_style.tres")
elif ID == 4: # Light Theme
Global.theme_type = "Light"
main_theme = preload("res://assets/themes/light/theme.tres")
@ -395,7 +395,7 @@ func change_theme(ID : int) -> void:
var button_category = texture.texture.resource_path.get_base_dir().right(last_backslash + 1)
var normal_file_name = texture.texture.resource_path.get_file()
var theme_type := Global.theme_type
if theme_type == "Gold" or (theme_type == "Blue" and button_category != "tools"):
if theme_type == "Caramel" or (theme_type == "Blue" and button_category != "tools"):
theme_type = "Dark"
texture.texture = load("res://assets/graphics/%s_themes/%s/%s" % [theme_type.to_lower(), button_category, normal_file_name])

View file

@ -333,12 +333,12 @@ margin_bottom = 80.0
mouse_default_cursor_shape = 2
text = "Blue"
[node name="Gold Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
[node name="Caramel Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
margin_top = 84.0
margin_right = 494.0
margin_bottom = 108.0
mouse_default_cursor_shape = 2
text = "Gold"
text = "Caramel"
[node name="Light Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
margin_top = 112.0