diff --git a/Assets/Graphics/Dark Themes/Timeline/Copy_Frame.png b/Assets/Graphics/Dark Themes/Timeline/Copy_Frame.png new file mode 100644 index 000000000..2f571ab86 Binary files /dev/null and b/Assets/Graphics/Dark Themes/Timeline/Copy_Frame.png differ diff --git a/Assets/Graphics/Dark Themes/Timeline/Copy_Frame.png.import b/Assets/Graphics/Dark Themes/Timeline/Copy_Frame.png.import new file mode 100644 index 000000000..dccf7edcc --- /dev/null +++ b/Assets/Graphics/Dark Themes/Timeline/Copy_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Copy_Frame.png-ea8bd6c53f6b065d73ee3e92bdaabf9d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Dark Themes/Timeline/Copy_Frame.png" +dest_files=[ "res://.import/Copy_Frame.png-ea8bd6c53f6b065d73ee3e92bdaabf9d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Dark Themes/Timeline/Copy_Frame_Hover.png b/Assets/Graphics/Dark Themes/Timeline/Copy_Frame_Hover.png new file mode 100644 index 000000000..54cf75c28 Binary files /dev/null and b/Assets/Graphics/Dark Themes/Timeline/Copy_Frame_Hover.png differ diff --git a/Assets/Graphics/Dark Themes/Timeline/Copy_Frame_Hover.png.import b/Assets/Graphics/Dark Themes/Timeline/Copy_Frame_Hover.png.import new file mode 100644 index 000000000..99c2bb82f --- /dev/null +++ b/Assets/Graphics/Dark Themes/Timeline/Copy_Frame_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Copy_Frame_Hover.png-c0c72db5b872c01d7096594a37323da1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Dark Themes/Timeline/Copy_Frame_Hover.png" +dest_files=[ "res://.import/Copy_Frame_Hover.png-c0c72db5b872c01d7096594a37323da1.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Dark Themes/Timeline/Delete_Frame.png b/Assets/Graphics/Dark Themes/Timeline/Delete_Frame.png new file mode 100644 index 000000000..8266a6ca7 Binary files /dev/null and b/Assets/Graphics/Dark Themes/Timeline/Delete_Frame.png differ diff --git a/Assets/Graphics/Dark Themes/Timeline/Delete_Frame.png.import b/Assets/Graphics/Dark Themes/Timeline/Delete_Frame.png.import new file mode 100644 index 000000000..3e70f1964 --- /dev/null +++ b/Assets/Graphics/Dark Themes/Timeline/Delete_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Delete_Frame.png-f4d36ee110b7238a6e25c5b91df0fb71.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Dark Themes/Timeline/Delete_Frame.png" +dest_files=[ "res://.import/Delete_Frame.png-f4d36ee110b7238a6e25c5b91df0fb71.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Dark Themes/Timeline/Delete_Frame_Hover.png b/Assets/Graphics/Dark Themes/Timeline/Delete_Frame_Hover.png new file mode 100644 index 000000000..fccc4dedf Binary files /dev/null and b/Assets/Graphics/Dark Themes/Timeline/Delete_Frame_Hover.png differ diff --git a/Assets/Graphics/Dark Themes/Timeline/Delete_Frame_Hover.png.import b/Assets/Graphics/Dark Themes/Timeline/Delete_Frame_Hover.png.import new file mode 100644 index 000000000..72f8531b9 --- /dev/null +++ b/Assets/Graphics/Dark Themes/Timeline/Delete_Frame_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Delete_Frame_Hover.png-66c12342201b24b86b316468faa7dcd1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Dark Themes/Timeline/Delete_Frame_Hover.png" +dest_files=[ "res://.import/Delete_Frame_Hover.png-66c12342201b24b86b316468faa7dcd1.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Gold Themes/Timeline/Copy_Frame.png b/Assets/Graphics/Gold Themes/Timeline/Copy_Frame.png new file mode 100644 index 000000000..09944fa46 Binary files /dev/null and b/Assets/Graphics/Gold Themes/Timeline/Copy_Frame.png differ diff --git a/Assets/Graphics/Gold Themes/Timeline/Copy_Frame.png.import b/Assets/Graphics/Gold Themes/Timeline/Copy_Frame.png.import new file mode 100644 index 000000000..7428f9397 --- /dev/null +++ b/Assets/Graphics/Gold Themes/Timeline/Copy_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Copy_Frame.png-3baba988160a4f7443d4a3b83347775a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Gold Themes/Timeline/Copy_Frame.png" +dest_files=[ "res://.import/Copy_Frame.png-3baba988160a4f7443d4a3b83347775a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Gold Themes/Timeline/Copy_Frame_Hover.png b/Assets/Graphics/Gold Themes/Timeline/Copy_Frame_Hover.png new file mode 100644 index 000000000..6a2919e63 Binary files /dev/null and b/Assets/Graphics/Gold Themes/Timeline/Copy_Frame_Hover.png differ diff --git a/Assets/Graphics/Gold Themes/Timeline/Copy_Frame_Hover.png.import b/Assets/Graphics/Gold Themes/Timeline/Copy_Frame_Hover.png.import new file mode 100644 index 000000000..1df668e40 --- /dev/null +++ b/Assets/Graphics/Gold Themes/Timeline/Copy_Frame_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Copy_Frame_Hover.png-3f24eba5a1085b5c6f12e42e3cf40458.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Gold Themes/Timeline/Copy_Frame_Hover.png" +dest_files=[ "res://.import/Copy_Frame_Hover.png-3f24eba5a1085b5c6f12e42e3cf40458.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Gold Themes/Timeline/Delete_Frame.png b/Assets/Graphics/Gold Themes/Timeline/Delete_Frame.png new file mode 100644 index 000000000..3cdba3a6c Binary files /dev/null and b/Assets/Graphics/Gold Themes/Timeline/Delete_Frame.png differ diff --git a/Assets/Graphics/Gold Themes/Timeline/Delete_Frame.png.import b/Assets/Graphics/Gold Themes/Timeline/Delete_Frame.png.import new file mode 100644 index 000000000..0da1a5977 --- /dev/null +++ b/Assets/Graphics/Gold Themes/Timeline/Delete_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Delete_Frame.png-1698b2ed71e69d68a618fc959521c5a5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Gold Themes/Timeline/Delete_Frame.png" +dest_files=[ "res://.import/Delete_Frame.png-1698b2ed71e69d68a618fc959521c5a5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Gold Themes/Timeline/Delete_Frame_Hover.png b/Assets/Graphics/Gold Themes/Timeline/Delete_Frame_Hover.png new file mode 100644 index 000000000..5e30fbc6b Binary files /dev/null and b/Assets/Graphics/Gold Themes/Timeline/Delete_Frame_Hover.png differ diff --git a/Assets/Graphics/Gold Themes/Timeline/Delete_Frame_Hover.png.import b/Assets/Graphics/Gold Themes/Timeline/Delete_Frame_Hover.png.import new file mode 100644 index 000000000..06969a165 --- /dev/null +++ b/Assets/Graphics/Gold Themes/Timeline/Delete_Frame_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Delete_Frame_Hover.png-cdd4de5e383f55f9299a7f0230511d37.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Gold Themes/Timeline/Delete_Frame_Hover.png" +dest_files=[ "res://.import/Delete_Frame_Hover.png-cdd4de5e383f55f9299a7f0230511d37.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Light Themes/Timeline/Copy_Frame.png b/Assets/Graphics/Light Themes/Timeline/Copy_Frame.png new file mode 100644 index 000000000..f52a098b2 Binary files /dev/null and b/Assets/Graphics/Light Themes/Timeline/Copy_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Copy_Frame.png.import b/Assets/Graphics/Light Themes/Timeline/Copy_Frame.png.import new file mode 100644 index 000000000..0d39e2448 --- /dev/null +++ b/Assets/Graphics/Light Themes/Timeline/Copy_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Copy_Frame.png-9c2adc3b0461f4375ff042575c6c26c5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Light Themes/Timeline/Copy_Frame.png" +dest_files=[ "res://.import/Copy_Frame.png-9c2adc3b0461f4375ff042575c6c26c5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Light Themes/Timeline/Copy_Frame_Hover.png b/Assets/Graphics/Light Themes/Timeline/Copy_Frame_Hover.png new file mode 100644 index 000000000..0bc989a14 Binary files /dev/null and b/Assets/Graphics/Light Themes/Timeline/Copy_Frame_Hover.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Copy_Frame_Hover.png.import b/Assets/Graphics/Light Themes/Timeline/Copy_Frame_Hover.png.import new file mode 100644 index 000000000..e02e9ed92 --- /dev/null +++ b/Assets/Graphics/Light Themes/Timeline/Copy_Frame_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Copy_Frame_Hover.png-995ad5c2bf7fdc011a2efe84a1b5cc04.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Light Themes/Timeline/Copy_Frame_Hover.png" +dest_files=[ "res://.import/Copy_Frame_Hover.png-995ad5c2bf7fdc011a2efe84a1b5cc04.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Light Themes/Timeline/Delete_Frame.png b/Assets/Graphics/Light Themes/Timeline/Delete_Frame.png new file mode 100644 index 000000000..ead1def70 Binary files /dev/null and b/Assets/Graphics/Light Themes/Timeline/Delete_Frame.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Delete_Frame.png.import b/Assets/Graphics/Light Themes/Timeline/Delete_Frame.png.import new file mode 100644 index 000000000..4242ea56b --- /dev/null +++ b/Assets/Graphics/Light Themes/Timeline/Delete_Frame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Delete_Frame.png-ef718a1b2b44719b549a24ee028a16f8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Light Themes/Timeline/Delete_Frame.png" +dest_files=[ "res://.import/Delete_Frame.png-ef718a1b2b44719b549a24ee028a16f8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Light Themes/Timeline/Delete_Frame_Hover.png b/Assets/Graphics/Light Themes/Timeline/Delete_Frame_Hover.png new file mode 100644 index 000000000..cfc8f499b Binary files /dev/null and b/Assets/Graphics/Light Themes/Timeline/Delete_Frame_Hover.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Delete_Frame_Hover.png.import b/Assets/Graphics/Light Themes/Timeline/Delete_Frame_Hover.png.import new file mode 100644 index 000000000..af2e8c6bd --- /dev/null +++ b/Assets/Graphics/Light Themes/Timeline/Delete_Frame_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Delete_Frame_Hover.png-2dc5289f837bdaee8e55078733b7003a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Light Themes/Timeline/Delete_Frame_Hover.png" +dest_files=[ "res://.import/Delete_Frame_Hover.png-2dc5289f837bdaee8e55078733b7003a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Main.tscn b/Main.tscn index a4b0a0d92..713e1318d 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=55 format=2] +[gd_scene load_steps=54 format=2] [ext_resource path="res://Themes & Styles/Dark Theme/Dark Theme.tres" type="Theme" id=1] [ext_resource path="res://Scripts/Main.gd" type="Script" id=2] @@ -1178,6 +1178,9 @@ texture_hover = ExtResource( 22 ) margin_right = 12.0 margin_bottom = 20.0 items = [ "New Empty Palette", null, 0, false, false, 0, 0, null, "", false, "Import Palette", null, 0, false, false, 1, 0, null, "", false ] +__meta__ = { +"_edit_use_anchors_": false +} [node name="EditPalette" type="TextureButton" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/PaletteVBoxContainer/CenterContainer/PaletteButtons" groups=[ "UIButtons", @@ -1287,6 +1290,7 @@ columns = 5 [node name="SplashDialog" parent="." instance=ExtResource( 27 )] [node name="CreateNewImage" parent="." instance=ExtResource( 28 )] +window_title = "Please Confirm..." [node name="OpenSprite" type="FileDialog" parent="."] margin_right = 515.0 @@ -1322,13 +1326,16 @@ current_path = "D:/libDev/git/Pixelorama-git/" [node name="ExportDialog" parent="." instance=ExtResource( 39 )] [node name="ScaleImage" parent="." instance=ExtResource( 31 )] +window_title = "Please Confirm..." [node name="PreferencesDialog" parent="." instance=ExtResource( 32 )] [node name="RotateImage" parent="." instance=ExtResource( 38 )] +window_title = "Please Confirm..." [node name="OutlineDialog" parent="." instance=ExtResource( 33 )] visible = false +window_title = "Please Confirm..." [node name="AboutDialog" parent="." instance=ExtResource( 34 )] @@ -1341,6 +1348,7 @@ dialog_text = "Are you sure want to proceed?" [node name="QuitDialog" type="ConfirmationDialog" parent="."] margin_right = 200.0 margin_bottom = 70.0 +window_title = "Please Confirm..." resizable = true dialog_text = "Are you sure you want to exit Pixelorama?" diff --git a/Prefabs/AnimationTimeline.tscn b/Prefabs/AnimationTimeline.tscn index 35e18fc23..85493f1d6 100644 --- a/Prefabs/AnimationTimeline.tscn +++ b/Prefabs/AnimationTimeline.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=61 format=2] +[gd_scene load_steps=65 format=2] [ext_resource path="res://Scripts/AnimationTimeline.gd" type="Script" id=1] [ext_resource path="res://Assets/Graphics/Dark Themes/Layers/New_Layer.png" type="Texture" id=2] @@ -42,6 +42,10 @@ [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Tag_Hover.png" type="Texture" id=40] [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Tag.png" type="Texture" id=41] [ext_resource path="res://Prefabs/Dialogs/FrameTagDialog.tscn" type="PackedScene" id=42] +[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Delete_Frame.png" type="Texture" id=43] +[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Delete_Frame_Hover.png" type="Texture" id=44] +[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Copy_Frame_Hover.png" type="Texture" id=45] +[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Copy_Frame.png" type="Texture" id=46] [sub_resource type="InputEventKey" id=1] control = true @@ -260,12 +264,38 @@ size_flags_vertical = 0 texture_normal = ExtResource( 19 ) texture_hover = ExtResource( 20 ) -[node name="FrameTagButton" type="TextureButton" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[ +[node name="DeleteFrame" type="TextureButton" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[ "UIButtons", ]] margin_left = 178.0 margin_right = 198.0 margin_bottom = 20.0 +hint_tooltip = "Remove Frame" +mouse_default_cursor_shape = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 +texture_normal = ExtResource( 43 ) +texture_hover = ExtResource( 44 ) + +[node name="CopyFrame" type="TextureButton" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[ +"UIButtons", +]] +margin_left = 202.0 +margin_right = 222.0 +margin_bottom = 20.0 +hint_tooltip = "Clone Frame" +mouse_default_cursor_shape = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 +texture_normal = ExtResource( 46 ) +texture_hover = ExtResource( 45 ) + +[node name="FrameTagButton" type="TextureButton" parent="AnimationContainer/TimelineContainer/AnimationButtons" groups=[ +"UIButtons", +]] +margin_left = 226.0 +margin_right = 246.0 +margin_bottom = 20.0 hint_tooltip = "Manage frame tags" mouse_default_cursor_shape = 2 size_flags_horizontal = 0 @@ -274,8 +304,8 @@ texture_normal = ExtResource( 41 ) texture_hover = ExtResource( 40 ) [node name="PlaybackButtons" type="HBoxContainer" parent="AnimationContainer/TimelineContainer/AnimationButtons"] -margin_left = 263.0 -margin_right = 403.0 +margin_left = 287.0 +margin_right = 427.0 margin_bottom = 24.0 size_flags_horizontal = 6 @@ -589,6 +619,8 @@ text = "Blue-Red Mode" [connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/CloneLayer" to="." method="add_layer" binds= [ false ]] [connection signal="pressed" from="AnimationContainer/ForLayerButtons/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"] [connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/AddFrame" to="." method="add_frame"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"] +[connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"] [connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/FrameTagButton" to="." method="_on_FrameTagButton_pressed"] [connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/FirstFrame" to="." method="_on_FirstFrame_pressed"] [connection signal="pressed" from="AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons/PreviousFrame" to="." method="_on_PreviousFrame_pressed"] diff --git a/Prefabs/FrameButton.tscn b/Prefabs/FrameButton.tscn index 59ca88ddc..e7e66b698 100644 --- a/Prefabs/FrameButton.tscn +++ b/Prefabs/FrameButton.tscn @@ -19,9 +19,9 @@ __meta__ = { [node name="FrameTexture" type="TextureRect" parent="."] margin_left = 2.0 -margin_top = 2.0 +margin_top = 1.78536 margin_right = 34.0 -margin_bottom = 34.0 +margin_bottom = 33.7854 rect_min_size = Vector2( 32, 32 ) size_flags_horizontal = 0 size_flags_vertical = 0 diff --git a/Scripts/AnimationTimeline.gd b/Scripts/AnimationTimeline.gd index 5c4ad063b..94d0c18ee 100644 --- a/Scripts/AnimationTimeline.gd +++ b/Scripts/AnimationTimeline.gd @@ -53,6 +53,81 @@ func add_frame() -> void: Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame) Global.undo_redo.commit_action() +func _on_DeleteFrame_pressed(): + if Global.canvases.size() == 1: + return + var canvas : Canvas = Global.canvases[Global.current_frame] + var new_canvases := Global.canvases.duplicate() + new_canvases.erase(canvas) + var new_hidden_canvases := Global.hidden_canvases.duplicate() + new_hidden_canvases.append(canvas) + var current_frame := Global.current_frame + if current_frame > 0 && current_frame == new_canvases.size(): # If it's the last frame + current_frame -= 1 + + Global.undos += 1 + Global.undo_redo.create_action("Remove Frame") + + Global.undo_redo.add_do_property(Global, "canvases", new_canvases) + Global.undo_redo.add_do_property(Global, "hidden_canvases", new_hidden_canvases) + Global.undo_redo.add_do_property(Global, "canvas", new_canvases[current_frame]) + Global.undo_redo.add_do_property(Global, "current_frame", current_frame) + + for i in range(Global.current_frame, new_canvases.size()): + var c : Canvas = new_canvases[i] + Global.undo_redo.add_do_property(c, "frame", i) + Global.undo_redo.add_undo_property(c, "frame", c.frame) + + Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases) + Global.undo_redo.add_undo_property(Global, "hidden_canvases", Global.hidden_canvases) + Global.undo_redo.add_undo_property(Global, "canvas", canvas) + Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame) + + Global.undo_redo.add_do_method(Global, "redo", [canvas]) + Global.undo_redo.add_undo_method(Global, "undo", [canvas]) + Global.undo_redo.commit_action() + +func _on_CopyFrame_pressed(): + var canvas : Canvas = Global.canvases[Global.current_frame] + var new_canvas : Canvas = load("res://Prefabs/Canvas.tscn").instance() + new_canvas.size = Global.canvas.size + new_canvas.frame = Global.canvases.size() + + var new_canvases := Global.canvases.duplicate() + new_canvases.append(new_canvas) + var new_hidden_canvases := Global.hidden_canvases.duplicate() + new_hidden_canvases.append(new_canvas) + + for layer in canvas.layers: # Copy every layer + var sprite := Image.new() + sprite.copy_from(layer[0]) + sprite.lock() + var tex := ImageTexture.new() + tex.create_from_image(sprite, 0) + new_canvas.layers.append([sprite, tex, layer[2]]) + + Global.undos += 1 + Global.undo_redo.create_action("Add Frame") + Global.undo_redo.add_do_method(Global, "redo", [new_canvas]) + Global.undo_redo.add_undo_method(Global, "undo", [new_canvas]) + + Global.undo_redo.add_do_property(Global, "canvases", new_canvases) + Global.undo_redo.add_do_property(Global, "hidden_canvases", Global.hidden_canvases) + Global.undo_redo.add_do_property(Global, "canvas", new_canvas) + Global.undo_redo.add_do_property(Global, "current_frame", new_canvases.size() - 1) + for i in range(Global.layers.size()): + for child in Global.layers[i][3].get_children(): + Global.undo_redo.add_do_property(child, "pressed", false) + Global.undo_redo.add_undo_property(child, "pressed", child.pressed) + for c in Global.canvases: + Global.undo_redo.add_do_property(c, "visible", false) + Global.undo_redo.add_undo_property(c, "visible", c.visible) + + Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases) + Global.undo_redo.add_undo_property(Global, "hidden_canvases", new_hidden_canvases) + Global.undo_redo.add_undo_property(Global, "canvas", Global.canvas) + Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame) + Global.undo_redo.commit_action() func _on_FrameTagButton_pressed() -> void: Global.tag_dialog.popup_centered() @@ -319,6 +394,7 @@ func _on_MergeDownLayer_pressed() -> void: func _on_OpacitySlider_value_changed(value) -> void: Global.canvas.layers[Global.current_layer][2] = value / 100 Global.layer_opacity_slider.value = value + Global.layer_opacity_slider.value = value Global.layer_opacity_spinbox.value = value Global.canvas.update() diff --git a/Themes & Styles/Gray Theme/Gray Theme.tres b/Themes & Styles/Gray Theme/Gray Theme.tres index 62b0531d7..c9e073ae7 100644 --- a/Themes & Styles/Gray Theme/Gray Theme.tres +++ b/Themes & Styles/Gray Theme/Gray Theme.tres @@ -127,25 +127,25 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=27] +[sub_resource type="StyleBoxFlat" id=14] border_width_top = 2 border_width_bottom = 2 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -[sub_resource type="StyleBoxFlat" id=14] +[sub_resource type="StyleBoxFlat" id=15] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) corner_radius_top_left = 4 corner_radius_top_right = 4 corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 -[sub_resource type="StyleBoxFlat" id=15] +[sub_resource type="StyleBoxFlat" id=16] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_top = 3 border_width_bottom = 3 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -[sub_resource type="StyleBoxFlat" id=16] +[sub_resource type="StyleBoxFlat" id=17] bg_color = Color( 0.109804, 0.0862745, 0.0862745, 0 ) border_width_left = 1 border_width_top = 1 @@ -158,10 +158,10 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=17] +[sub_resource type="StyleBoxFlat" id=18] bg_color = Color( 0.262745, 0.262745, 0.262745, 1 ) -[sub_resource type="StyleBoxFlat" id=18] +[sub_resource type="StyleBoxFlat" id=19] bg_color = Color( 0.2, 0.2, 0.2, 1 ) border_width_left = 6 border_width_top = 10 @@ -174,10 +174,10 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=19] +[sub_resource type="StyleBoxFlat" id=20] bg_color = Color( 0.2, 0.2, 0.2, 1 ) -[sub_resource type="StyleBoxFlat" id=20] +[sub_resource type="StyleBoxFlat" id=21] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 5 border_width_top = 10 @@ -190,7 +190,7 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=21] +[sub_resource type="StyleBoxFlat" id=22] bg_color = Color( 0.2, 0.2, 0.2, 1 ) border_width_left = 10 border_width_top = 6 @@ -198,7 +198,7 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.2, 0.2, 0.2, 1 ) -[sub_resource type="StyleBoxFlat" id=22] +[sub_resource type="StyleBoxFlat" id=23] bg_color = Color( 0.145098, 0.145098, 0.164706, 1 ) border_width_left = 10 border_width_top = 6 @@ -206,7 +206,7 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.145098, 0.145098, 0.164706, 1 ) -[sub_resource type="StyleBoxFlat" id=23] +[sub_resource type="StyleBoxFlat" id=24] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 10 border_width_top = 6 @@ -214,19 +214,6 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -[sub_resource type="StyleBoxFlat" id=24] -bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -corner_radius_top_left = 4 -corner_radius_top_right = 4 -corner_radius_bottom_right = 4 -corner_radius_bottom_left = 4 -anti_aliasing = false - [sub_resource type="StyleBoxFlat" id=25] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 4 @@ -238,14 +225,27 @@ corner_radius_top_left = 4 corner_radius_top_right = 4 corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 +anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=28] +[sub_resource type="StyleBoxFlat" id=26] +bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id=27] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_left = 2 border_width_right = 2 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -[sub_resource type="StyleBoxFlat" id=26] +[sub_resource type="StyleBoxFlat" id=28] bg_color = Color( 0.176471, 0.176471, 0.176471, 1 ) border_width_left = 2 border_width_top = 20 @@ -325,16 +325,16 @@ HScrollBar/styles/grabber_pressed = SubResource( 13 ) HScrollBar/styles/scroll = null HScrollBar/styles/scroll_focus = null HSeparator/constants/separation = 4 -HSeparator/styles/separator = SubResource( 27 ) +HSeparator/styles/separator = SubResource( 14 ) HSlider/icons/grabber = null HSlider/icons/grabber_disabled = null HSlider/icons/grabber_highlight = null HSlider/icons/tick = null HSlider/styles/focus = null -HSlider/styles/grabber_area = SubResource( 14 ) +HSlider/styles/grabber_area = SubResource( 15 ) HSlider/styles/grabber_disabled = null HSlider/styles/grabber_highlight = null -HSlider/styles/slider = SubResource( 15 ) +HSlider/styles/slider = SubResource( 16 ) LineEdit/colors/clear_button_color = Color( 0.878431, 0.878431, 0.878431, 1 ) LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) LineEdit/colors/cursor_color = Color( 0.941176, 0.941176, 0.941176, 1 ) @@ -345,7 +345,7 @@ LineEdit/constants/minimum_spaces = 12 LineEdit/fonts/font = null LineEdit/icons/clear = null LineEdit/styles/focus = null -LineEdit/styles/normal = SubResource( 16 ) +LineEdit/styles/normal = SubResource( 17 ) LineEdit/styles/read_only = null MenuButton/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) @@ -371,7 +371,7 @@ OptionButton/styles/focus = null OptionButton/styles/hover = null OptionButton/styles/normal = null OptionButton/styles/pressed = null -Panel/styles/panel = SubResource( 17 ) +Panel/styles/panel = SubResource( 18 ) Panel/styles/panelf = null Panel/styles/panelnc = null PopupMenu/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) @@ -389,10 +389,10 @@ PopupMenu/icons/unchecked = null PopupMenu/styles/hover = null PopupMenu/styles/labeled_separator_left = null PopupMenu/styles/labeled_separator_right = null -PopupMenu/styles/panel = SubResource( 18 ) +PopupMenu/styles/panel = SubResource( 19 ) PopupMenu/styles/panel_disabled = null PopupMenu/styles/separator = null -PopupPanel/styles/panel = SubResource( 19 ) +PopupPanel/styles/panel = SubResource( 20 ) SpinBox/icons/updown = null TabContainer/colors/font_color_bg = Color( 0.690196, 0.690196, 0.690196, 1 ) TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -409,10 +409,10 @@ TabContainer/icons/increment = null TabContainer/icons/increment_highlight = null TabContainer/icons/menu = null TabContainer/icons/menu_highlight = null -TabContainer/styles/panel = SubResource( 20 ) -TabContainer/styles/tab_bg = SubResource( 21 ) -TabContainer/styles/tab_disabled = SubResource( 22 ) -TabContainer/styles/tab_fg = SubResource( 23 ) +TabContainer/styles/panel = SubResource( 21 ) +TabContainer/styles/tab_bg = SubResource( 22 ) +TabContainer/styles/tab_disabled = SubResource( 23 ) +TabContainer/styles/tab_fg = SubResource( 24 ) Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) @@ -428,10 +428,10 @@ Tabs/icons/increment = null Tabs/icons/increment_highlight = null Tabs/styles/button = null Tabs/styles/button_pressed = null -Tabs/styles/panel = SubResource( 20 ) -Tabs/styles/tab_bg = SubResource( 21 ) -Tabs/styles/tab_disabled = SubResource( 22 ) -Tabs/styles/tab_fg = SubResource( 23 ) +Tabs/styles/panel = SubResource( 21 ) +Tabs/styles/tab_bg = SubResource( 22 ) +Tabs/styles/tab_disabled = SubResource( 23 ) +Tabs/styles/tab_fg = SubResource( 24 ) TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) @@ -463,7 +463,7 @@ TextEdit/fonts/font = null TextEdit/icons/tab = null TextEdit/styles/completion = null TextEdit/styles/focus = null -TextEdit/styles/normal = SubResource( 24 ) +TextEdit/styles/normal = SubResource( 25 ) TextEdit/styles/read_only = null Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) Tree/colors/custom_button_font_highlight = Color( 0.941176, 0.941176, 0.941176, 1 ) @@ -491,7 +491,7 @@ Tree/icons/checked = null Tree/icons/select_arrow = null Tree/icons/unchecked = null Tree/icons/updown = null -Tree/styles/bg = SubResource( 25 ) +Tree/styles/bg = SubResource( 26 ) Tree/styles/bg_focus = null Tree/styles/button_pressed = null Tree/styles/cursor = null @@ -515,7 +515,7 @@ VScrollBar/styles/grabber_pressed = SubResource( 13 ) VScrollBar/styles/scroll = null VScrollBar/styles/scroll_focus = null VSeparator/constants/separation = 4 -VSeparator/styles/separator = SubResource( 28 ) +VSeparator/styles/separator = SubResource( 27 ) WindowDialog/colors/title_color = Color( 1, 1, 1, 1 ) WindowDialog/constants/close_h_ofs = 18 WindowDialog/constants/close_v_ofs = 18 @@ -524,4 +524,4 @@ WindowDialog/constants/title_height = 20 WindowDialog/fonts/title_font = null WindowDialog/icons/close = null WindowDialog/icons/close_highlight = null -WindowDialog/styles/panel = SubResource( 26 ) +WindowDialog/styles/panel = SubResource( 28 ) diff --git a/Themes & Styles/Light Theme/Light Theme.tres b/Themes & Styles/Light Theme/Light Theme.tres index bae92087d..a2ada69b2 100644 --- a/Themes & Styles/Light Theme/Light Theme.tres +++ b/Themes & Styles/Light Theme/Light Theme.tres @@ -137,25 +137,25 @@ corner_radius_top_right = 2 corner_radius_bottom_right = 2 corner_radius_bottom_left = 2 -[sub_resource type="StyleBoxFlat" id=29] +[sub_resource type="StyleBoxFlat" id=15] border_width_top = 2 border_width_bottom = 2 border_color = Color( 0.627451, 0.627451, 0.627451, 1 ) -[sub_resource type="StyleBoxFlat" id=15] +[sub_resource type="StyleBoxFlat" id=16] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) corner_radius_top_left = 4 corner_radius_top_right = 4 corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 -[sub_resource type="StyleBoxFlat" id=16] +[sub_resource type="StyleBoxFlat" id=17] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) border_width_top = 3 border_width_bottom = 3 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) -[sub_resource type="StyleBoxFlat" id=17] +[sub_resource type="StyleBoxFlat" id=18] bg_color = Color( 0.109804, 0.0862745, 0.0862745, 0 ) border_width_left = 1 border_width_top = 1 @@ -168,10 +168,10 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=18] +[sub_resource type="StyleBoxFlat" id=19] bg_color = Color( 1, 1, 1, 1 ) -[sub_resource type="StyleBoxFlat" id=19] +[sub_resource type="StyleBoxFlat" id=20] bg_color = Color( 0.627451, 0.627451, 0.627451, 1 ) border_width_left = 6 border_width_top = 10 @@ -184,10 +184,10 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=20] +[sub_resource type="StyleBoxFlat" id=21] bg_color = Color( 0.764706, 0.764706, 0.764706, 1 ) -[sub_resource type="StyleBoxFlat" id=21] +[sub_resource type="StyleBoxFlat" id=22] bg_color = Color( 0.627451, 0.627451, 0.627451, 1 ) border_width_left = 5 border_width_top = 10 @@ -200,7 +200,7 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id=22] +[sub_resource type="StyleBoxFlat" id=23] bg_color = Color( 0.352941, 0.352941, 0.352941, 1 ) border_width_left = 10 border_width_top = 6 @@ -208,7 +208,7 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.352941, 0.352941, 0.352941, 1 ) -[sub_resource type="StyleBoxFlat" id=23] +[sub_resource type="StyleBoxFlat" id=24] bg_color = Color( 0.239216, 0.239216, 0.239216, 1 ) border_width_left = 10 border_width_top = 6 @@ -216,7 +216,7 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.239216, 0.239216, 0.239216, 1 ) -[sub_resource type="StyleBoxFlat" id=24] +[sub_resource type="StyleBoxFlat" id=25] bg_color = Color( 0.627451, 0.627451, 0.627451, 1 ) border_width_left = 10 border_width_top = 6 @@ -224,19 +224,6 @@ border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.627451, 0.627451, 0.627451, 1 ) -[sub_resource type="StyleBoxFlat" id=25] -bg_color = Color( 0.627451, 0.627451, 0.627451, 1 ) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color( 0.627451, 0.627451, 0.627451, 1 ) -corner_radius_top_left = 4 -corner_radius_top_right = 4 -corner_radius_bottom_right = 4 -corner_radius_bottom_left = 4 -anti_aliasing = false - [sub_resource type="StyleBoxFlat" id=26] bg_color = Color( 0.627451, 0.627451, 0.627451, 1 ) border_width_left = 4 @@ -248,8 +235,21 @@ corner_radius_top_left = 4 corner_radius_top_right = 4 corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 +anti_aliasing = false [sub_resource type="StyleBoxFlat" id=27] +bg_color = Color( 0.627451, 0.627451, 0.627451, 1 ) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color( 0.627451, 0.627451, 0.627451, 1 ) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id=28] bg_color = Color( 0.529412, 0.529412, 0.529412, 1 ) border_width_left = 5 border_width_right = 5 @@ -259,13 +259,13 @@ corner_radius_top_right = 2 corner_radius_bottom_right = 2 corner_radius_bottom_left = 2 -[sub_resource type="StyleBoxFlat" id=30] +[sub_resource type="StyleBoxFlat" id=29] bg_color = Color( 0.627451, 0.627451, 0.627451, 1 ) border_width_left = 2 border_width_right = 2 border_color = Color( 0.627451, 0.627451, 0.627451, 1 ) -[sub_resource type="StyleBoxFlat" id=28] +[sub_resource type="StyleBoxFlat" id=30] bg_color = Color( 0.835294, 0.835294, 0.835294, 1 ) border_width_left = 2 border_width_top = 20 @@ -345,16 +345,16 @@ HScrollBar/styles/grabber_pressed = SubResource( 13 ) HScrollBar/styles/scroll = SubResource( 14 ) HScrollBar/styles/scroll_focus = null HSeparator/constants/separation = 4 -HSeparator/styles/separator = SubResource( 29 ) +HSeparator/styles/separator = SubResource( 15 ) HSlider/icons/grabber = null HSlider/icons/grabber_disabled = null HSlider/icons/grabber_highlight = null HSlider/icons/tick = null HSlider/styles/focus = null -HSlider/styles/grabber_area = SubResource( 15 ) +HSlider/styles/grabber_area = SubResource( 16 ) HSlider/styles/grabber_disabled = null HSlider/styles/grabber_highlight = null -HSlider/styles/slider = SubResource( 16 ) +HSlider/styles/slider = SubResource( 17 ) Label/colors/font_color = Color( 0, 0, 0, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 0, 0, 0, 1 ) @@ -374,7 +374,7 @@ LineEdit/constants/minimum_spaces = 12 LineEdit/fonts/font = null LineEdit/icons/clear = null LineEdit/styles/focus = null -LineEdit/styles/normal = SubResource( 17 ) +LineEdit/styles/normal = SubResource( 18 ) LineEdit/styles/read_only = null MenuButton/colors/font_color = Color( 0, 0, 0, 1 ) MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) @@ -400,7 +400,7 @@ OptionButton/styles/focus = null OptionButton/styles/hover = null OptionButton/styles/normal = null OptionButton/styles/pressed = null -Panel/styles/panel = SubResource( 18 ) +Panel/styles/panel = SubResource( 19 ) Panel/styles/panelf = null Panel/styles/panelnc = null PopupMenu/colors/font_color = Color( 0, 0, 0, 1 ) @@ -418,10 +418,10 @@ PopupMenu/icons/unchecked = null PopupMenu/styles/hover = null PopupMenu/styles/labeled_separator_left = null PopupMenu/styles/labeled_separator_right = null -PopupMenu/styles/panel = SubResource( 19 ) +PopupMenu/styles/panel = SubResource( 20 ) PopupMenu/styles/panel_disabled = null PopupMenu/styles/separator = null -PopupPanel/styles/panel = SubResource( 20 ) +PopupPanel/styles/panel = SubResource( 21 ) SpinBox/icons/updown = null TabContainer/colors/font_color_bg = Color( 0, 0, 0, 1 ) TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -438,10 +438,10 @@ TabContainer/icons/increment = null TabContainer/icons/increment_highlight = null TabContainer/icons/menu = null TabContainer/icons/menu_highlight = null -TabContainer/styles/panel = SubResource( 21 ) -TabContainer/styles/tab_bg = SubResource( 22 ) -TabContainer/styles/tab_disabled = SubResource( 23 ) -TabContainer/styles/tab_fg = SubResource( 24 ) +TabContainer/styles/panel = SubResource( 22 ) +TabContainer/styles/tab_bg = SubResource( 23 ) +TabContainer/styles/tab_disabled = SubResource( 24 ) +TabContainer/styles/tab_fg = SubResource( 25 ) Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) @@ -457,10 +457,10 @@ Tabs/icons/increment = null Tabs/icons/increment_highlight = null Tabs/styles/button = null Tabs/styles/button_pressed = null -Tabs/styles/panel = SubResource( 21 ) -Tabs/styles/tab_bg = SubResource( 22 ) -Tabs/styles/tab_disabled = SubResource( 23 ) -Tabs/styles/tab_fg = SubResource( 24 ) +Tabs/styles/panel = SubResource( 22 ) +Tabs/styles/tab_bg = SubResource( 23 ) +Tabs/styles/tab_disabled = SubResource( 24 ) +Tabs/styles/tab_fg = SubResource( 25 ) TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) @@ -492,7 +492,7 @@ TextEdit/fonts/font = null TextEdit/icons/tab = null TextEdit/styles/completion = null TextEdit/styles/focus = null -TextEdit/styles/normal = SubResource( 25 ) +TextEdit/styles/normal = SubResource( 26 ) TextEdit/styles/read_only = null ToolButton/colors/font_color = Color( 0, 0, 0, 1 ) ToolButton/colors/font_color_disabled = Color( 0.9, 0.95, 1, 0.3 ) @@ -531,7 +531,7 @@ Tree/icons/checked = null Tree/icons/select_arrow = null Tree/icons/unchecked = null Tree/icons/updown = null -Tree/styles/bg = SubResource( 26 ) +Tree/styles/bg = SubResource( 27 ) Tree/styles/bg_focus = null Tree/styles/button_pressed = null Tree/styles/cursor = null @@ -552,10 +552,10 @@ VScrollBar/icons/increment_highlight = null VScrollBar/styles/grabber = SubResource( 11 ) VScrollBar/styles/grabber_highlight = SubResource( 12 ) VScrollBar/styles/grabber_pressed = SubResource( 13 ) -VScrollBar/styles/scroll = SubResource( 27 ) +VScrollBar/styles/scroll = SubResource( 28 ) VScrollBar/styles/scroll_focus = null VSeparator/constants/separation = 4 -VSeparator/styles/separator = SubResource( 30 ) +VSeparator/styles/separator = SubResource( 29 ) WindowDialog/colors/title_color = Color( 1, 1, 1, 1 ) WindowDialog/constants/close_h_ofs = 18 WindowDialog/constants/close_v_ofs = 18 @@ -564,4 +564,4 @@ WindowDialog/constants/title_height = 20 WindowDialog/fonts/title_font = null WindowDialog/icons/close = null WindowDialog/icons/close_highlight = null -WindowDialog/styles/panel = SubResource( 28 ) +WindowDialog/styles/panel = SubResource( 30 )