diff --git a/Translations/Translations.pot b/Translations/Translations.pot index 17943116b..8ca518f6a 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -308,7 +308,7 @@ msgstr "" msgid "Blue" msgstr "" -msgid "Gold" +msgid "Caramel" msgstr "" msgid "Light" diff --git a/assets/graphics/gold_themes/misc/color_defaults.png b/assets/graphics/caramel_themes/misc/color_defaults.png similarity index 100% rename from assets/graphics/gold_themes/misc/color_defaults.png rename to assets/graphics/caramel_themes/misc/color_defaults.png diff --git a/assets/graphics/gold_themes/misc/color_defaults.png.import b/assets/graphics/caramel_themes/misc/color_defaults.png.import similarity index 65% rename from assets/graphics/gold_themes/misc/color_defaults.png.import rename to assets/graphics/caramel_themes/misc/color_defaults.png.import index 7f2014a44..b93670fb5 100644 --- a/assets/graphics/gold_themes/misc/color_defaults.png.import +++ b/assets/graphics/caramel_themes/misc/color_defaults.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/color_defaults.png-84e75aa71b489dcb793f4ea5f94d7013.stex" +path="res://.import/color_defaults.png-3088ca5359814cf52db3b100d58ec066.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/gold_themes/misc/color_defaults.png" -dest_files=[ "res://.import/color_defaults.png-84e75aa71b489dcb793f4ea5f94d7013.stex" ] +source_file="res://assets/graphics/caramel_themes/misc/color_defaults.png" +dest_files=[ "res://.import/color_defaults.png-3088ca5359814cf52db3b100d58ec066.stex" ] [params] diff --git a/assets/graphics/gold_themes/misc/color_switch.png b/assets/graphics/caramel_themes/misc/color_switch.png similarity index 100% rename from assets/graphics/gold_themes/misc/color_switch.png rename to assets/graphics/caramel_themes/misc/color_switch.png diff --git a/assets/graphics/gold_themes/misc/color_switch.png.import b/assets/graphics/caramel_themes/misc/color_switch.png.import similarity index 66% rename from assets/graphics/gold_themes/misc/color_switch.png.import rename to assets/graphics/caramel_themes/misc/color_switch.png.import index b58e37a92..1bd47549d 100644 --- a/assets/graphics/gold_themes/misc/color_switch.png.import +++ b/assets/graphics/caramel_themes/misc/color_switch.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/color_switch.png-28fa6814e2d05784b4f658935e0e6f5c.stex" +path="res://.import/color_switch.png-11fe6c86a67c84bd6421124d4b21feaf.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/gold_themes/misc/color_switch.png" -dest_files=[ "res://.import/color_switch.png-28fa6814e2d05784b4f658935e0e6f5c.stex" ] +source_file="res://assets/graphics/caramel_themes/misc/color_switch.png" +dest_files=[ "res://.import/color_switch.png-11fe6c86a67c84bd6421124d4b21feaf.stex" ] [params] diff --git a/assets/graphics/gold_themes/tools/horizontal_mirror_off.png b/assets/graphics/caramel_themes/tools/horizontal_mirror_off.png similarity index 100% rename from assets/graphics/gold_themes/tools/horizontal_mirror_off.png rename to assets/graphics/caramel_themes/tools/horizontal_mirror_off.png diff --git a/assets/graphics/gold_themes/tools/horizontal_mirror_off.png.import b/assets/graphics/caramel_themes/tools/horizontal_mirror_off.png.import similarity index 63% rename from assets/graphics/gold_themes/tools/horizontal_mirror_off.png.import rename to assets/graphics/caramel_themes/tools/horizontal_mirror_off.png.import index 3d8c94807..e0fa07d12 100644 --- a/assets/graphics/gold_themes/tools/horizontal_mirror_off.png.import +++ b/assets/graphics/caramel_themes/tools/horizontal_mirror_off.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/horizontal_mirror_off.png-0f4a19df8090f2f12d404c55b6fc31ba.stex" +path="res://.import/horizontal_mirror_off.png-e92d466fd155f6c283c9a036d22c782c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/gold_themes/tools/horizontal_mirror_off.png" -dest_files=[ "res://.import/horizontal_mirror_off.png-0f4a19df8090f2f12d404c55b6fc31ba.stex" ] +source_file="res://assets/graphics/caramel_themes/tools/horizontal_mirror_off.png" +dest_files=[ "res://.import/horizontal_mirror_off.png-e92d466fd155f6c283c9a036d22c782c.stex" ] [params] diff --git a/assets/graphics/gold_themes/tools/horizontal_mirror_on.png b/assets/graphics/caramel_themes/tools/horizontal_mirror_on.png similarity index 100% rename from assets/graphics/gold_themes/tools/horizontal_mirror_on.png rename to assets/graphics/caramel_themes/tools/horizontal_mirror_on.png diff --git a/assets/graphics/gold_themes/tools/horizontal_mirror_on.png.import b/assets/graphics/caramel_themes/tools/horizontal_mirror_on.png.import similarity index 64% rename from assets/graphics/gold_themes/tools/horizontal_mirror_on.png.import rename to assets/graphics/caramel_themes/tools/horizontal_mirror_on.png.import index ea4f1337c..a430a2ca6 100644 --- a/assets/graphics/gold_themes/tools/horizontal_mirror_on.png.import +++ b/assets/graphics/caramel_themes/tools/horizontal_mirror_on.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/horizontal_mirror_on.png-56f4a1f86f802954d5050171d87c8ea9.stex" +path="res://.import/horizontal_mirror_on.png-f9ae0555a1773f2636b55882cabed09a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/gold_themes/tools/horizontal_mirror_on.png" -dest_files=[ "res://.import/horizontal_mirror_on.png-56f4a1f86f802954d5050171d87c8ea9.stex" ] +source_file="res://assets/graphics/caramel_themes/tools/horizontal_mirror_on.png" +dest_files=[ "res://.import/horizontal_mirror_on.png-f9ae0555a1773f2636b55882cabed09a.stex" ] [params] diff --git a/assets/graphics/gold_themes/tools/vertical_mirror_off.png b/assets/graphics/caramel_themes/tools/vertical_mirror_off.png similarity index 100% rename from assets/graphics/gold_themes/tools/vertical_mirror_off.png rename to assets/graphics/caramel_themes/tools/vertical_mirror_off.png diff --git a/assets/graphics/gold_themes/tools/vertical_mirror_off.png.import b/assets/graphics/caramel_themes/tools/vertical_mirror_off.png.import similarity index 64% rename from assets/graphics/gold_themes/tools/vertical_mirror_off.png.import rename to assets/graphics/caramel_themes/tools/vertical_mirror_off.png.import index 218fa246b..a0790a0db 100644 --- a/assets/graphics/gold_themes/tools/vertical_mirror_off.png.import +++ b/assets/graphics/caramel_themes/tools/vertical_mirror_off.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/vertical_mirror_off.png-2e34853d2c45625ba73ee5f6333b1026.stex" +path="res://.import/vertical_mirror_off.png-db6fc46b3456476646388c1e22c55e4f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/gold_themes/tools/vertical_mirror_off.png" -dest_files=[ "res://.import/vertical_mirror_off.png-2e34853d2c45625ba73ee5f6333b1026.stex" ] +source_file="res://assets/graphics/caramel_themes/tools/vertical_mirror_off.png" +dest_files=[ "res://.import/vertical_mirror_off.png-db6fc46b3456476646388c1e22c55e4f.stex" ] [params] diff --git a/assets/graphics/gold_themes/tools/vertical_mirror_on.png b/assets/graphics/caramel_themes/tools/vertical_mirror_on.png similarity index 100% rename from assets/graphics/gold_themes/tools/vertical_mirror_on.png rename to assets/graphics/caramel_themes/tools/vertical_mirror_on.png diff --git a/assets/graphics/gold_themes/tools/vertical_mirror_on.png.import b/assets/graphics/caramel_themes/tools/vertical_mirror_on.png.import similarity index 64% rename from assets/graphics/gold_themes/tools/vertical_mirror_on.png.import rename to assets/graphics/caramel_themes/tools/vertical_mirror_on.png.import index 9fc562210..fcbd6da44 100644 --- a/assets/graphics/gold_themes/tools/vertical_mirror_on.png.import +++ b/assets/graphics/caramel_themes/tools/vertical_mirror_on.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/vertical_mirror_on.png-db6bbb96c6351fb40de7e7529428093a.stex" +path="res://.import/vertical_mirror_on.png-d96c7bd12a4aba856046631017f59b51.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/gold_themes/tools/vertical_mirror_on.png" -dest_files=[ "res://.import/vertical_mirror_on.png-db6bbb96c6351fb40de7e7529428093a.stex" ] +source_file="res://assets/graphics/caramel_themes/tools/vertical_mirror_on.png" +dest_files=[ "res://.import/vertical_mirror_on.png-d96c7bd12a4aba856046631017f59b51.stex" ] [params] diff --git a/assets/themes/gold/ruler_style.tres b/assets/themes/caramel/ruler_style.tres similarity index 100% rename from assets/themes/gold/ruler_style.tres rename to assets/themes/caramel/ruler_style.tres diff --git a/assets/themes/gold/theme.tres b/assets/themes/caramel/theme.tres similarity index 99% rename from assets/themes/gold/theme.tres rename to assets/themes/caramel/theme.tres index ee8b90319..1e39ffc10 100644 --- a/assets/themes/gold/theme.tres +++ b/assets/themes/caramel/theme.tres @@ -1,10 +1,10 @@ [gd_resource type="Theme" load_steps=37 format=2] -[ext_resource path="res://assets/themes/light/icons/hsplit.png" type="Texture" id=1] +[ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] [ext_resource path="res://assets/themes/light/icons/grabber.png" type="Texture" id=2] [ext_resource path="res://assets/themes/light/icons/grabber_hover.png" type="Texture" id=3] -[ext_resource path="res://assets/themes/light/icons/vsplit.png" type="Texture" id=4] -[ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=5] +[ext_resource path="res://assets/themes/light/icons/hsplit.png" type="Texture" id=4] +[ext_resource path="res://assets/themes/light/icons/vsplit.png" type="Texture" id=5] [ext_resource path="res://assets/themes/light/icons/spinbox.png" type="Texture" id=6] [sub_resource type="StyleBoxFlat" id=1] @@ -283,7 +283,7 @@ border_color = Color( 0.372549, 0.360784, 0.301961, 1 ) expand_margin_top = 20.0 [resource] -default_font = ExtResource( 5 ) +default_font = ExtResource( 1 ) Button/colors/font_color = Color( 0, 0, 0, 1 ) Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) Button/colors/font_color_hover = Color( 0, 0, 0, 1 ) @@ -365,7 +365,7 @@ HSlider/styles/grabber_highlight = null HSlider/styles/slider = SubResource( 16 ) HSplitContainer/constants/autohide = 1 HSplitContainer/constants/separation = 6 -HSplitContainer/icons/grabber = ExtResource( 1 ) +HSplitContainer/icons/grabber = ExtResource( 4 ) HSplitContainer/styles/bg = null "Label/colors/Selected Color" = Color( 0.235294, 0.364706, 0.458824, 1 ) Label/colors/font_color = Color( 0, 0, 0, 1 ) @@ -561,7 +561,7 @@ VSeparator/constants/separation = 4 VSeparator/styles/separator = SubResource( 29 ) VSplitContainer/constants/autohide = 1 VSplitContainer/constants/separation = 6 -VSplitContainer/icons/grabber = ExtResource( 4 ) +VSplitContainer/icons/grabber = ExtResource( 5 ) VSplitContainer/styles/bg = null WindowDialog/colors/title_color = Color( 1, 1, 1, 1 ) WindowDialog/constants/close_h_ofs = 18 diff --git a/assets/themes/gold/top_menu_style.tres b/assets/themes/caramel/top_menu_style.tres similarity index 100% rename from assets/themes/gold/top_menu_style.tres rename to assets/themes/caramel/top_menu_style.tres diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index 6baa08bf3..00c72a02e 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -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: diff --git a/src/UI/Dialogs/PreferencesDialog.gd b/src/UI/Dialogs/PreferencesDialog.gd index 16dc83bfe..0cc5e134e 100644 --- a/src/UI/Dialogs/PreferencesDialog.gd +++ b/src/UI/Dialogs/PreferencesDialog.gd @@ -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]) diff --git a/src/UI/Dialogs/PreferencesDialog.tscn b/src/UI/Dialogs/PreferencesDialog.tscn index e1b0d7347..715aca316 100644 --- a/src/UI/Dialogs/PreferencesDialog.tscn +++ b/src/UI/Dialogs/PreferencesDialog.tscn @@ -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