From 8058cf2f556a2065f6164dbb591e1ab42ada3ac4 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Sat, 21 Dec 2019 03:27:11 +0200 Subject: [PATCH 1/2] Button textures change based on their filename and not their node name Restored layer nodes back to their previous names --- Main.tscn | 24 ++++++++++++------------ Prefabs/LayerContainer.tscn | 4 ++-- Scripts/Global.gd | 8 ++++---- Scripts/LayerContainer.gd | 4 +--- Scripts/PreferencesDialog.gd | 9 ++++++--- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Main.tscn b/Main.tscn index 89a4677..0bb933d 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1198,7 +1198,7 @@ margin_left = 6.0 margin_right = 218.0 margin_bottom = 32.0 -[node name="New_Layer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ +[node name="AddLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ "LayerButtons", ]] margin_right = 32.0 @@ -1208,7 +1208,7 @@ mouse_default_cursor_shape = 2 texture_normal = ExtResource( 37 ) texture_hover = ExtResource( 38 ) -[node name="Delete_Layer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ +[node name="RemoveLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ "LayerButtons", ]] margin_left = 36.0 @@ -1221,7 +1221,7 @@ texture_normal = ExtResource( 39 ) texture_hover = ExtResource( 40 ) texture_disabled = ExtResource( 41 ) -[node name="Move_Up" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ +[node name="MoveUpLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ "LayerButtons", ]] margin_left = 72.0 @@ -1234,7 +1234,7 @@ texture_normal = ExtResource( 42 ) texture_hover = ExtResource( 43 ) texture_disabled = ExtResource( 44 ) -[node name="Move_Down" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ +[node name="MovwDownLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ "LayerButtons", ]] margin_left = 108.0 @@ -1247,7 +1247,7 @@ texture_normal = ExtResource( 45 ) texture_hover = ExtResource( 46 ) texture_disabled = ExtResource( 47 ) -[node name="Clone_Layer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ +[node name="CloneLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ "LayerButtons", ]] margin_left = 144.0 @@ -1258,7 +1258,7 @@ mouse_default_cursor_shape = 2 texture_normal = ExtResource( 48 ) texture_hover = ExtResource( 49 ) -[node name="Merge_Down" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ +[node name="MergeDownLayer" type="TextureButton" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons" groups=[ "LayerButtons", ]] margin_left = 180.0 @@ -1744,12 +1744,12 @@ visible = false [connection signal="value_changed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/PastOnionSkinning" to="." method="_on_PastOnionSkinning_value_changed"] [connection signal="value_changed" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/FutureOnionSkinning" to="." method="_on_FutureOnionSkinning_value_changed"] [connection signal="toggled" from="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons/BlueRedMode" to="." method="_on_BlueRedMode_toggled"] -[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/New_Layer" to="." method="add_layer"] -[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/Delete_Layer" to="." method="_on_RemoveLayerButton_pressed"] -[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/Move_Up" to="." method="change_layer_order" binds= [ 1 ]] -[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/Move_Down" to="." method="change_layer_order" binds= [ -1 ]] -[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/Clone_Layer" to="." method="add_layer" binds= [ false ]] -[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/Merge_Down" to="." method="_on_MergeLayer_pressed"] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/AddLayer" to="." method="add_layer"] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayerButton_pressed"] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [ 1 ]] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/MovwDownLayer" to="." method="change_layer_order" binds= [ -1 ]] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] +[connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/MergeDownLayer" to="." method="_on_MergeLayer_pressed"] [connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/PaletteVBoxContainer/PaletteButtons/RemovePalette" to="." method="_on_RemovePalette_pressed"] [connection signal="item_selected" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/PaletteVBoxContainer/PaletteButtons/PaletteOptionButton" to="." method="_on_PaletteOptionButton_item_selected"] [connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/PaletteVBoxContainer/PaletteButtons/EditPalette" to="." method="_on_EditPalette_pressed"] diff --git a/Prefabs/LayerContainer.tscn b/Prefabs/LayerContainer.tscn index a887e12..d783a97 100644 --- a/Prefabs/LayerContainer.tscn +++ b/Prefabs/LayerContainer.tscn @@ -14,7 +14,7 @@ __meta__ = { "_edit_horizontal_guides_": [ ] } -[node name="Layer_Visible" type="TextureButton" parent="." groups=[ +[node name="VisibilityButton" type="TextureButton" parent="." groups=[ "LayerButtons", ]] margin_left = 6.0 @@ -68,5 +68,5 @@ editable = false caret_blink = true caret_blink_speed = 0.5 [connection signal="pressed" from="." to="." method="_on_LayerContainer_pressed"] -[connection signal="pressed" from="Layer_Visible" to="." method="_on_VisibilityButton_pressed"] +[connection signal="pressed" from="VisibilityButton" to="." method="_on_VisibilityButton_pressed"] [connection signal="text_changed" from="HBoxContainer/LineEdit" to="." method="_on_LineEdit_text_changed"] diff --git a/Scripts/Global.gd b/Scripts/Global.gd index cc7fe40..0c407c6 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -281,10 +281,10 @@ func _ready() -> void: frame_container = find_node_by_name(root, "FrameContainer") var layer_buttons = find_node_by_name(root, "LayerButtons") - remove_layer_button = find_node_by_name(layer_buttons, "Delete_Layer") - move_up_layer_button = find_node_by_name(layer_buttons, "Move_Up") - move_down_layer_button = find_node_by_name(layer_buttons, "Move_Down") - merge_down_layer_button = find_node_by_name(layer_buttons, "Merge_Down") + remove_layer_button = find_node_by_name(layer_buttons, "RemoveLayer") + move_up_layer_button = find_node_by_name(layer_buttons, "MoveUpLayer") + move_down_layer_button = find_node_by_name(layer_buttons, "MovwDownLayer") + merge_down_layer_button = find_node_by_name(layer_buttons, "MergeDownLayer") vbox_layer_container = find_node_by_name(root, "VBoxLayerContainer") add_palette_button = find_node_by_name(root, "AddPalette") diff --git a/Scripts/LayerContainer.gd b/Scripts/LayerContainer.gd index 512a37a..f3950e4 100644 --- a/Scripts/LayerContainer.gd +++ b/Scripts/LayerContainer.gd @@ -5,7 +5,7 @@ var i # warning-ignore:unused_class_variable var currently_selected := false -onready var visibility_button := $Layer_Visible +onready var visibility_button := $VisibilityButton onready var label := $HBoxContainer/Label onready var line_edit := $HBoxContainer/LineEdit @@ -71,12 +71,10 @@ func changed_selection() -> void: func _on_VisibilityButton_pressed() -> void: if Global.canvas.layers[i][3]: Global.canvas.layers[i][3] = false - visibility_button.name = "Layer_Invisible" visibility_button.texture_normal = load("res://Assets/Graphics/%s Themes/Layers/Layer_Invisible.png" % Global.theme_type) visibility_button.texture_hover = load("res://Assets/Graphics/%s Themes/Layers/Layer_Invisible_Hover.png" % Global.theme_type) else: Global.canvas.layers[i][3] = true - visibility_button.name = "Layer_Visible" visibility_button.texture_normal = load("res://Assets/Graphics/%s Themes/Layers/Layer_Visible.png" % Global.theme_type) visibility_button.texture_hover = load("res://Assets/Graphics/%s Themes/Layers/Layer_Visible_Hover.png" % Global.theme_type) diff --git a/Scripts/PreferencesDialog.gd b/Scripts/PreferencesDialog.gd index 2ee630f..f27e831 100644 --- a/Scripts/PreferencesDialog.gd +++ b/Scripts/PreferencesDialog.gd @@ -63,10 +63,13 @@ func change_theme(ID : int) -> void: Global.vertical_ruler.add_stylebox_override("hover", ruler_style) Global.vertical_ruler.add_stylebox_override("focus", ruler_style) for button in get_tree().get_nodes_in_group("LayerButtons"): - button.texture_normal = load("res://Assets/Graphics/%s Themes/Layers/%s.png" % [Global.theme_type, button.name]) - button.texture_hover = load("res://Assets/Graphics/%s Themes/Layers/%s_Hover.png" % [Global.theme_type, button.name]) + var normal_file_name = button.texture_normal.resource_path.get_file() + button.texture_normal = load("res://Assets/Graphics/%s Themes/Layers/%s" % [Global.theme_type, normal_file_name]) + var hover_file_name = button.texture_hover.resource_path.get_file() + button.texture_hover = load("res://Assets/Graphics/%s Themes/Layers/%s" % [Global.theme_type, hover_file_name]) if button.texture_disabled: - button.texture_disabled = load("res://Assets/Graphics/%s Themes/Layers/%s_Disabled.png" % [Global.theme_type, button.name]) + var disabled_file_name = button.texture_disabled.resource_path.get_file() + button.texture_disabled = load("res://Assets/Graphics/%s Themes/Layers/%s" % [Global.theme_type, disabled_file_name]) func _on_GridWidthValue_value_changed(value : float) -> void: Global.grid_width = value From 238bb3b4881d3ce492cae0d59741918dfd8e42dd Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Sat, 21 Dec 2019 03:50:09 +0200 Subject: [PATCH 2/2] Made Timeline & Tool buttons change depending on theme type Changed "LayerButtons" group to "UIButtons", as it includes most UI buttons. --- .../Timeline/Next_Frame_hover.png.import | 6 +- .../Dark Themes/Timeline/onion_skinning.png | Bin 660 -> 0 bytes .../Timeline/Play Backwards_Hover.png | Bin 0 -> 654 bytes .../Timeline/Play Backwards_Hover.png.import} | 6 +- Main.tscn | 88 ++++++++++++------ Prefabs/LayerContainer.tscn | 2 +- Scripts/PreferencesDialog.gd | 13 ++- 7 files changed, 77 insertions(+), 38 deletions(-) delete mode 100644 Assets/Graphics/Dark Themes/Timeline/onion_skinning.png create mode 100644 Assets/Graphics/Light Themes/Timeline/Play Backwards_Hover.png rename Assets/Graphics/{Dark Themes/Timeline/onion_skinning.png.import => Light Themes/Timeline/Play Backwards_Hover.png.import} (64%) diff --git a/Assets/Graphics/Dark Themes/Timeline/Next_Frame_hover.png.import b/Assets/Graphics/Dark Themes/Timeline/Next_Frame_hover.png.import index 2a09b5f..dfe23dc 100644 --- a/Assets/Graphics/Dark Themes/Timeline/Next_Frame_hover.png.import +++ b/Assets/Graphics/Dark Themes/Timeline/Next_Frame_hover.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Next_Frame_hover.png-29e3bdc3bfb09dbf24f0d4ef57cdadd0.stex" +path="res://.import/Next_Frame_Hover.png-ba92cf8a5dbcda245610c78c96d6bf93.stex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/Graphics/Dark Themes/Timeline/Next_Frame_hover.png" -dest_files=[ "res://.import/Next_Frame_hover.png-29e3bdc3bfb09dbf24f0d4ef57cdadd0.stex" ] +source_file="res://Assets/Graphics/Dark Themes/Timeline/Next_Frame_Hover.png" +dest_files=[ "res://.import/Next_Frame_Hover.png-ba92cf8a5dbcda245610c78c96d6bf93.stex" ] [params] diff --git a/Assets/Graphics/Dark Themes/Timeline/onion_skinning.png b/Assets/Graphics/Dark Themes/Timeline/onion_skinning.png deleted file mode 100644 index 93acce0c25ea7253514a50f5d3fe353ae04dd115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 zcmV;F0&D$=P)EX>4Tx04R}tkv&MmKpe$iQ$^8=phZL+GPF(>L`58>ibb$c+6t{Ym|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfadlF3krMxx6k5c1aNLh~_a1le0HI!Hs@X9CsG4OY zV^J}aT@|}t(Tf29VGK#k)Z?keG(5-GJ$!tV@h8Y7ldA+q zjs;YpLUR1zfAG6oGe0%yCIzBE=ZkHBgn_PIpi#5!?_=9;oB;l3;7V)xD|KM@lk{3k z3mpOd+rY(jOOyA2%N=0&NtX=Ck^D4;d>(i|qi@OrgSSA>n%i4*AEysMnz~xP0S*p< zu>xhUd%U~5y|;hQH2eDjW3O_d7Y=~l00006VoOIv00000008+zyMF)x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru;|mf3BrA^;p#cB@02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003-BL_t(I%VT60+9>?Rix-n-AT~|7ETf;7iHS|3 u4Ma~e=wUVjk`1od#05rR@x@5(DgXe3!5ucJ5`=C50000EX>4Tx04R}tkxeK>Q5c3FgGeLED9Pe3hLtHHS!#$BrI}F%3-{hJL(RRWdq*~w z%2rwU+4x)7ShKaTRZ96O+1OeU8|nJaovE2*oI0JS_k8c$cfJFG!>nn!H9cV2c_%g& z)n<~jTHOmlTB!n>b<@pF#zzxWT%UJ-CASfkRk`lZ)tFjzO{mg@hs>Ol7hVt^Sj*=W z?+S;^B|Rm4Cfw~vgTfC=Hwyf!IOB6bWrmzYY*;uXtYymBC}VTUv4s1D!zs&_{J>0s zQ;OFWTiI2!*r$47aM7NQD_wR6V~jJ&6dDGrER!WqL{3{2mzdl~EBM=e|CG24aV=wt zV}unfbl;EqgWt1t(|x^#q+k?kpFQur6Y93%d&~2_jy&)C7^ zK7ghTIKL`s#tvL;Lfd0bcXVH>mK{i^;q6quDG4n%&@fk+Tk)Qgdq~KvCaz&`AG$J< zJzwG7_2qN>x28D19|v-Be9lZ8WdHyG24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{ z04^f|c%?sf00007bV*G`2jdJC0W1-$aHvZF000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_C zX>@2HM@dakSAh-}0001KNkl*3ThJrnks5FXQD7A-fef|;S?m$q!QTBgb9DU+chF_YEL!Rz ogO-O void: Global.vertical_ruler.add_stylebox_override("pressed", ruler_style) Global.vertical_ruler.add_stylebox_override("hover", ruler_style) Global.vertical_ruler.add_stylebox_override("focus", ruler_style) - for button in get_tree().get_nodes_in_group("LayerButtons"): + for button in get_tree().get_nodes_in_group("UIButtons"): + var last_backslash = button.texture_normal.resource_path.get_base_dir().find_last("/") + var button_category = button.texture_normal.resource_path.get_base_dir().right(last_backslash + 1) var normal_file_name = button.texture_normal.resource_path.get_file() - button.texture_normal = load("res://Assets/Graphics/%s Themes/Layers/%s" % [Global.theme_type, normal_file_name]) - var hover_file_name = button.texture_hover.resource_path.get_file() - button.texture_hover = load("res://Assets/Graphics/%s Themes/Layers/%s" % [Global.theme_type, hover_file_name]) + button.texture_normal = load("res://Assets/Graphics/%s Themes/%s/%s" % [Global.theme_type, button_category, normal_file_name]) + if button.texture_hover: + var hover_file_name = button.texture_hover.resource_path.get_file() + button.texture_hover = load("res://Assets/Graphics/%s Themes/%s/%s" % [Global.theme_type, button_category, hover_file_name]) if button.texture_disabled: var disabled_file_name = button.texture_disabled.resource_path.get_file() - button.texture_disabled = load("res://Assets/Graphics/%s Themes/Layers/%s" % [Global.theme_type, disabled_file_name]) + button.texture_disabled = load("res://Assets/Graphics/%s Themes/%s/%s" % [Global.theme_type, button_category, disabled_file_name]) func _on_GridWidthValue_value_changed(value : float) -> void: Global.grid_width = value