diff --git a/project.godot b/project.godot index 373f5f50e..455ae8aac 100644 --- a/project.godot +++ b/project.godot @@ -67,7 +67,7 @@ _global_script_classes=[ { "base": "Popup", "class": "Brushes", "language": "GDScript", -"path": "res://src/UI/BrushesPopup.gd" +"path": "res://src/UI/Buttons/BrushesPopup.gd" }, { "base": "Node2D", "class": "Canvas", @@ -152,7 +152,7 @@ _global_script_classes=[ { "base": "PopupPanel", "class": "Patterns", "language": "GDScript", -"path": "res://src/UI/PatternsPopup.gd" +"path": "res://src/UI/Buttons/PatternsPopup.gd" }, { "base": "BaseCel", "class": "PixelCel", @@ -172,12 +172,12 @@ _global_script_classes=[ { "base": "Sprite", "class": "ReferenceImage", "language": "GDScript", -"path": "res://src/UI/Canvas/ReferenceImage.gd" +"path": "res://src/UI/ReferenceImages/ReferenceImage.gd" }, { "base": "VBoxContainer", "class": "ReferencesPanel", "language": "GDScript", -"path": "res://src/UI/ReferencesPanel.gd" +"path": "res://src/UI/ReferenceImages/ReferencesPanel.gd" }, { "base": "Image", "class": "SelectionMap", diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index 64b74cfd2..8fca01480 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -148,7 +148,7 @@ var onion_skinning_blue_red := false var palettes := {} # Nodes -var notification_label_node: PackedScene = preload("res://src/UI/NotificationLabel.tscn") +var notification_label_node := preload("res://src/UI/NotificationLabel/NotificationLabel.tscn") var pixel_layer_button_node: PackedScene = preload("res://src/UI/Timeline/PixelLayerButton.tscn") var group_layer_button_node: PackedScene = preload("res://src/UI/Timeline/GroupLayerButton.tscn") var pixel_cel_button_node: PackedScene = preload("res://src/UI/Timeline/PixelCelButton.tscn") diff --git a/src/Main.tscn b/src/Main.tscn index b10276b59..9987e7039 100644 --- a/src/Main.tscn +++ b/src/Main.tscn @@ -2,10 +2,10 @@ [ext_resource path="res://assets/themes/dark/theme.tres" type="Theme" id=1] [ext_resource path="res://src/Main.gd" type="Script" id=2] -[ext_resource path="res://src/UI/TopMenuContainer.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/UI/TopMenuContainer/TopMenuContainer.tscn" type="PackedScene" id=3] [ext_resource path="res://src/UI/UI.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/UI/PatternsPopup.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/UI/BrushesPopup.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/UI/Buttons/PatternsPopup.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/UI/Buttons/BrushesPopup.tscn" type="PackedScene" id=6] [ext_resource path="res://src/UI/Dialogs/ImageEffects/ImageEffects.tscn" type="PackedScene" id=7] [ext_resource path="res://src/UI/Dialogs/SaveSpriteHTML5.tscn" type="PackedScene" id=8] [ext_resource path="res://src/UI/Timeline/FrameProperties.tscn" type="PackedScene" id=9] @@ -86,6 +86,7 @@ margin_bottom = 388.0 [node name="UnsavedCanvasDialog" type="ConfirmationDialog" parent="Dialogs"] margin_right = 467.0 margin_bottom = 70.0 +rect_min_size = Vector2( 180, 63 ) window_title = "Unsaved Image" dialog_text = "You have unsaved changes. If you proceed, the progress you have made will be lost." @@ -155,5 +156,5 @@ visible = false [connection signal="custom_action" from="Dialogs/QuitAndSaveDialog" to="." method="_on_QuitAndSaveDialog_custom_action"] [connection signal="popup_hide" from="Dialogs/QuitAndSaveDialog" to="." method="_can_draw_true"] [connection signal="popup_hide" from="Dialogs/ErrorDialog" to="." method="_can_draw_true"] -[connection signal="popup_hide" from="Dialogs/BackupConfirmation" to="." method="_can_draw_true"] [connection signal="popup_hide" from="Dialogs/BackupConfirmation" to="." method="_on_BackupConfirmation_popup_hide"] +[connection signal="popup_hide" from="Dialogs/BackupConfirmation" to="." method="_can_draw_true"] diff --git a/src/UI/BrushButton.gd b/src/UI/Buttons/BrushButton.gd similarity index 100% rename from src/UI/BrushButton.gd rename to src/UI/Buttons/BrushButton.gd diff --git a/src/UI/BrushButton.tscn b/src/UI/Buttons/BrushButton.tscn similarity index 95% rename from src/UI/BrushButton.tscn rename to src/UI/Buttons/BrushButton.tscn index a0a854527..8599ae11b 100644 --- a/src/UI/BrushButton.tscn +++ b/src/UI/Buttons/BrushButton.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/BrushButton.gd" type="Script" id=2] +[ext_resource path="res://src/UI/Buttons/BrushButton.gd" type="Script" id=2] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 1, 1, 1, 1 ) @@ -47,6 +47,7 @@ text = "X" __meta__ = { "_edit_use_anchors_": false } + [connection signal="mouse_entered" from="." to="." method="_on_BrushButton_mouse_entered"] [connection signal="mouse_exited" from="." to="." method="_on_BrushButton_mouse_exited"] [connection signal="pressed" from="." to="." method="_on_BrushButton_pressed"] diff --git a/src/UI/BrushesPopup.gd b/src/UI/Buttons/BrushesPopup.gd similarity index 98% rename from src/UI/BrushesPopup.gd rename to src/UI/Buttons/BrushesPopup.gd index b2666756a..71f13b410 100644 --- a/src/UI/BrushesPopup.gd +++ b/src/UI/Buttons/BrushesPopup.gd @@ -51,7 +51,7 @@ static func get_default_brush() -> Brush: static func create_button(image: Image) -> Node: - var button: BaseButton = preload("res://src/UI/BrushButton.tscn").instance() + var button: BaseButton = preload("res://src/UI/Buttons/BrushButton.tscn").instance() var tex := ImageTexture.new() tex.create_from_image(image, 0) button.get_child(0).texture = tex diff --git a/src/UI/BrushesPopup.tscn b/src/UI/Buttons/BrushesPopup.tscn similarity index 93% rename from src/UI/BrushesPopup.tscn rename to src/UI/Buttons/BrushesPopup.tscn index b96585ea3..6e39a02cb 100644 --- a/src/UI/BrushesPopup.tscn +++ b/src/UI/Buttons/BrushesPopup.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/BrushesPopup.gd" type="Script" id=1] +[ext_resource path="res://src/UI/Buttons/BrushesPopup.gd" type="Script" id=1] [node name="BrushesPopup" type="Popup"] margin_right = 226.0 diff --git a/src/UI/PatternButton.gd b/src/UI/Buttons/PatternButton.gd similarity index 100% rename from src/UI/PatternButton.gd rename to src/UI/Buttons/PatternButton.gd diff --git a/src/UI/PatternButton.tscn b/src/UI/Buttons/PatternButton.tscn similarity index 93% rename from src/UI/PatternButton.tscn rename to src/UI/Buttons/PatternButton.tscn index 8ac4825f4..6825b656b 100644 --- a/src/UI/PatternButton.tscn +++ b/src/UI/Buttons/PatternButton.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://src/UI/PatternButton.gd" type="Script" id=2] +[ext_resource path="res://src/UI/Buttons/PatternButton.gd" type="Script" id=2] [sub_resource type="StyleBoxFlat" id=2] bg_color = Color( 1, 1, 1, 1 ) @@ -41,4 +41,5 @@ stretch_mode = 6 __meta__ = { "_edit_use_anchors_": false } + [connection signal="pressed" from="." to="." method="_on_PatternButton_pressed"] diff --git a/src/UI/PatternsPopup.gd b/src/UI/Buttons/PatternsPopup.gd similarity index 93% rename from src/UI/PatternsPopup.gd rename to src/UI/Buttons/PatternsPopup.gd index 3c3c61acf..6b5f366be 100644 --- a/src/UI/PatternsPopup.gd +++ b/src/UI/Buttons/PatternsPopup.gd @@ -21,7 +21,7 @@ func select_pattern(pattern: Pattern) -> void: func create_button(image: Image) -> Node: - var button: BaseButton = preload("res://src/UI/PatternButton.tscn").instance() + var button: BaseButton = preload("res://src/UI/Buttons/PatternButton.tscn").instance() var tex := ImageTexture.new() if !image.is_empty(): tex.create_from_image(image, 0) diff --git a/src/UI/PatternsPopup.tscn b/src/UI/Buttons/PatternsPopup.tscn similarity index 87% rename from src/UI/PatternsPopup.tscn rename to src/UI/Buttons/PatternsPopup.tscn index 9a215445b..7bde3f996 100644 --- a/src/UI/PatternsPopup.tscn +++ b/src/UI/Buttons/PatternsPopup.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/PatternsPopup.gd" type="Script" id=1] +[ext_resource path="res://src/UI/Buttons/PatternsPopup.gd" type="Script" id=1] [node name="PatternsPopup" type="PopupPanel"] margin_right = 226.0 diff --git a/src/UI/CanvasPreviewContainer.gd b/src/UI/CanvasPreviewContainer/CanvasPreviewContainer.gd similarity index 100% rename from src/UI/CanvasPreviewContainer.gd rename to src/UI/CanvasPreviewContainer/CanvasPreviewContainer.gd diff --git a/src/UI/CanvasPreviewContainer.tscn b/src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn similarity index 88% rename from src/UI/CanvasPreviewContainer.tscn rename to src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn index 5bfe1df9d..4a2c5c31f 100644 --- a/src/UI/CanvasPreviewContainer.tscn +++ b/src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn @@ -1,14 +1,14 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/UI/CanvasPreviewContainer.gd" type="Script" id=3] -[ext_resource path="res://src/UI/Canvas/CameraMovement.gd" type="Script" id=4] -[ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=5] -[ext_resource path="res://assets/graphics/timeline/play.png" type="Texture" id=7] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=2] +[ext_resource path="res://src/UI/Canvas/CameraMovement.gd" type="Script" id=3] +[ext_resource path="res://src/UI/CanvasPreviewContainer/CanvasPreviewContainer.gd" type="Script" id=4] +[ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=5] +[ext_resource path="res://assets/graphics/timeline/play.png" type="Texture" id=6] [sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 5 ) +shader = ExtResource( 2 ) shader_param/size = 10.0 shader_param/alpha = 1.0 shader_param/color1 = Color( 0.7, 0.7, 0.7, 1 ) @@ -23,7 +23,7 @@ shader_param/follow_scale = false margin_right = 328.0 margin_bottom = 174.0 size_flags_vertical = 0 -script = ExtResource( 3 ) +script = ExtResource( 4 ) [node name="HBoxContainer" type="HBoxContainer" parent="."] margin_left = 7.0 @@ -80,7 +80,7 @@ margin_top = -6.0 margin_right = 3.5 margin_bottom = 6.0 mouse_default_cursor_shape = 2 -texture = ExtResource( 7 ) +texture = ExtResource( 6 ) __meta__ = { "_edit_use_anchors_": false } @@ -99,16 +99,16 @@ transparent_bg = true handle_input_locally = false render_target_update_mode = 3 -[node name="TransparentChecker" parent="HBoxContainer/PreviewViewportContainer/Viewport" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="HBoxContainer/PreviewViewportContainer/Viewport" instance=ExtResource( 1 )] material = SubResource( 1 ) -[node name="CanvasPreview" parent="HBoxContainer/PreviewViewportContainer/Viewport" instance=ExtResource( 1 )] +[node name="CanvasPreview" parent="HBoxContainer/PreviewViewportContainer/Viewport" instance=ExtResource( 5 )] [node name="CameraPreview" type="Camera2D" parent="HBoxContainer/PreviewViewportContainer/Viewport"] offset = Vector2( 32, 32 ) current = true zoom = Vector2( 0.15, 0.15 ) -script = ExtResource( 4 ) +script = ExtResource( 3 ) [connection signal="value_changed" from="HBoxContainer/VBoxContainer/PreviewZoomSlider" to="." method="_on_PreviewZoomSlider_value_changed"] [connection signal="toggled" from="HBoxContainer/VBoxContainer/PlayButton" to="." method="_on_PlayButton_toggled"] diff --git a/src/UI/ColorPickers.gd b/src/UI/ColorPickers/ColorPickers.gd similarity index 100% rename from src/UI/ColorPickers.gd rename to src/UI/ColorPickers/ColorPickers.gd diff --git a/src/UI/ColorPickers.tscn b/src/UI/ColorPickers/ColorPickers.tscn similarity index 97% rename from src/UI/ColorPickers.tscn rename to src/UI/ColorPickers/ColorPickers.tscn index 18d363479..d82bbfd8a 100644 --- a/src/UI/ColorPickers.tscn +++ b/src/UI/ColorPickers/ColorPickers.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://assets/graphics/misc/color_defaults.png" type="Texture" id=1] [ext_resource path="res://assets/graphics/misc/color_switch.png" type="Texture" id=2] -[ext_resource path="res://src/UI/ColorPickers.gd" type="Script" id=3] +[ext_resource path="res://src/UI/ColorPickers/ColorPickers.gd" type="Script" id=3] [sub_resource type="InputEventAction" id=20] action = "switch_colors" diff --git a/src/UI/Dialogs/ExportDialog.tscn b/src/UI/Dialogs/ExportDialog.tscn index 43274f1de..ed86e0ae9 100644 --- a/src/UI/Dialogs/ExportDialog.tscn +++ b/src/UI/Dialogs/ExportDialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://src/UI/Dialogs/ExportDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [ext_resource path="res://src/UI/Nodes/CollapsibleContainer.tscn" type="PackedScene" id=3] [node name="ExportDialog" type="ConfirmationDialog"] diff --git a/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn b/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn index 08a4c9a8a..2ef9f73a2 100644 --- a/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/DesaturateDialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/DesaturateDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [node name="DesaturateDialog" type="ConfirmationDialog"] margin_right = 294.0 diff --git a/src/UI/Dialogs/ImageEffects/DropShadowDialog.tscn b/src/UI/Dialogs/ImageEffects/DropShadowDialog.tscn index 2f20683e9..54a21a34b 100644 --- a/src/UI/Dialogs/ImageEffects/DropShadowDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/DropShadowDialog.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=1] [ext_resource path="res://src/UI/Dialogs/ImageEffects/DropShadowDialog.gd" type="Script" id=2] [node name="DropShadowDialog" type="ConfirmationDialog"] diff --git a/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn b/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn index bdec3f522..81e09ab04 100644 --- a/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/FlipImageDialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/FlipImageDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [node name="FlipImageDialog" type="ConfirmationDialog"] margin_right = 283.0 diff --git a/src/UI/Dialogs/ImageEffects/GradientDialog.tscn b/src/UI/Dialogs/ImageEffects/GradientDialog.tscn index dac139308..bf7d21930 100644 --- a/src/UI/Dialogs/ImageEffects/GradientDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/GradientDialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/GradientDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [node name="GradientDialog" type="ConfirmationDialog"] margin_right = 334.0 diff --git a/src/UI/Dialogs/ImageEffects/GradientMapDialog.tscn b/src/UI/Dialogs/ImageEffects/GradientMapDialog.tscn index d8661702a..9c81a076e 100644 --- a/src/UI/Dialogs/ImageEffects/GradientMapDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/GradientMapDialog.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=1] [ext_resource path="res://src/UI/Nodes/GradientEdit.tscn" type="PackedScene" id=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/GradientMapDialog.gd" type="Script" id=3] diff --git a/src/UI/Dialogs/ImageEffects/HSVDialog.tscn b/src/UI/Dialogs/ImageEffects/HSVDialog.tscn index 8db9d7b7a..0eacd3831 100644 --- a/src/UI/Dialogs/ImageEffects/HSVDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/HSVDialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/HSVDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [ext_resource path="res://src/UI/Nodes/ValueSlider.tscn" type="PackedScene" id=3] [node name="HSVDialog" type="ConfirmationDialog"] diff --git a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn b/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn index 514c96805..df1158e0d 100644 --- a/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/InvertColorsDialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/InvertColorsDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [node name="InvertColorsDialog" type="ConfirmationDialog"] margin_right = 294.0 diff --git a/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn b/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn index 5acacad49..da9d9bf9e 100644 --- a/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/OutlineDialog.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [node name="OutlineDialog" type="ConfirmationDialog"] margin_right = 543.0 diff --git a/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn b/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn index a17c2b6ad..8d285b584 100644 --- a/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn +++ b/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=1] [ext_resource path="res://src/UI/Dialogs/ImageEffects/ResizeCanvas.gd" type="Script" id=2] [node name="ResizeCanvas" type="ConfirmationDialog"] diff --git a/src/UI/Dialogs/ImageEffects/RotateImage.tscn b/src/UI/Dialogs/ImageEffects/RotateImage.tscn index 325be4d8c..10fd633b3 100644 --- a/src/UI/Dialogs/ImageEffects/RotateImage.tscn +++ b/src/UI/Dialogs/ImageEffects/RotateImage.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/RotateImage.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [ext_resource path="res://src/UI/Nodes/ValueSlider.tscn" type="PackedScene" id=3] [node name="RotateImage" type="ConfirmationDialog"] diff --git a/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn b/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn index 5999f4f8e..1343b0054 100644 --- a/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn +++ b/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://src/UI/Dialogs/ImageEffects/ShaderEffect.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [sub_resource type="ShaderMaterial" id=1] diff --git a/src/UI/Dialogs/TileModeOffsetsDialog.tscn b/src/UI/Dialogs/TileModeOffsetsDialog.tscn index c913d7a42..300adb391 100644 --- a/src/UI/Dialogs/TileModeOffsetsDialog.tscn +++ b/src/UI/Dialogs/TileModeOffsetsDialog.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=1] [ext_resource path="res://src/UI/Canvas/TileMode.gd" type="Script" id=2] [ext_resource path="res://src/UI/Dialogs/TileModeOffsetsDialog.gd" type="Script" id=3] diff --git a/src/UI/GlobalToolOptions.gd b/src/UI/GlobalToolOptions/GlobalToolOptions.gd similarity index 100% rename from src/UI/GlobalToolOptions.gd rename to src/UI/GlobalToolOptions/GlobalToolOptions.gd diff --git a/src/UI/GlobalToolOptions.tscn b/src/UI/GlobalToolOptions/GlobalToolOptions.tscn similarity index 97% rename from src/UI/GlobalToolOptions.tscn rename to src/UI/GlobalToolOptions/GlobalToolOptions.tscn index 02596b91f..ffb837e0c 100644 --- a/src/UI/GlobalToolOptions.tscn +++ b/src/UI/GlobalToolOptions/GlobalToolOptions.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://assets/graphics/misc/horizontal_mirror_off.png" type="Texture" id=1] [ext_resource path="res://assets/graphics/misc/vertical_mirror_off.png" type="Texture" id=2] -[ext_resource path="res://src/UI/GlobalToolOptions.gd" type="Script" id=3] +[ext_resource path="res://src/UI/GlobalToolOptions/GlobalToolOptions.gd" type="Script" id=3] [ext_resource path="res://assets/graphics/misc/pixel_perfect_off.png" type="Texture" id=4] [node name="Global Tool Options" type="PanelContainer"] diff --git a/src/UI/Nodes/GradientEdit.tscn b/src/UI/Nodes/GradientEdit.tscn index 4a82145e4..2544cb196 100644 --- a/src/UI/Nodes/GradientEdit.tscn +++ b/src/UI/Nodes/GradientEdit.tscn @@ -72,6 +72,7 @@ text = "Divide into equal parts" margin_top = 650.0 margin_right = 200.0 margin_bottom = 746.0 +rect_min_size = Vector2( 180, 63 ) resizable = true [node name="VBoxContainer" type="VBoxContainer" parent="DivideConfirmationDialog"] diff --git a/src/UI/TransparentChecker.gd b/src/UI/Nodes/TransparentChecker.gd similarity index 100% rename from src/UI/TransparentChecker.gd rename to src/UI/Nodes/TransparentChecker.gd diff --git a/src/UI/TransparentChecker.tscn b/src/UI/Nodes/TransparentChecker.tscn similarity index 90% rename from src/UI/TransparentChecker.tscn rename to src/UI/Nodes/TransparentChecker.tscn index 6324ebcff..242eb84f0 100644 --- a/src/UI/TransparentChecker.tscn +++ b/src/UI/Nodes/TransparentChecker.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=1] -[ext_resource path="res://src/UI/TransparentChecker.gd" type="Script" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.gd" type="Script" id=2] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) diff --git a/src/UI/NotificationLabel.gd b/src/UI/NotificationLabel/NotificationLabel.gd similarity index 100% rename from src/UI/NotificationLabel.gd rename to src/UI/NotificationLabel/NotificationLabel.gd diff --git a/src/UI/NotificationLabel.tscn b/src/UI/NotificationLabel/NotificationLabel.tscn similarity index 77% rename from src/UI/NotificationLabel.tscn rename to src/UI/NotificationLabel/NotificationLabel.tscn index 301184d89..e93b03cbb 100644 --- a/src/UI/NotificationLabel.tscn +++ b/src/UI/NotificationLabel/NotificationLabel.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/NotificationLabel.gd" type="Script" id=2] +[ext_resource path="res://src/UI/NotificationLabel/NotificationLabel.gd" type="Script" id=1] [node name="NotificationLabel" type="Label"] margin_right = 116.0 margin_bottom = 14.0 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) text = "Undo: Notification" -script = ExtResource( 2 ) +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/src/UI/Canvas/ReferenceImage.gd b/src/UI/ReferenceImages/ReferenceImage.gd similarity index 100% rename from src/UI/Canvas/ReferenceImage.gd rename to src/UI/ReferenceImages/ReferenceImage.gd diff --git a/src/UI/ReferenceImageButton.gd b/src/UI/ReferenceImages/ReferenceImageButton.gd similarity index 100% rename from src/UI/ReferenceImageButton.gd rename to src/UI/ReferenceImages/ReferenceImageButton.gd diff --git a/src/UI/ReferenceImageButton.tscn b/src/UI/ReferenceImages/ReferenceImageButton.tscn similarity index 95% rename from src/UI/ReferenceImageButton.tscn rename to src/UI/ReferenceImages/ReferenceImageButton.tscn index a7a5cb86e..8333aed28 100644 --- a/src/UI/ReferenceImageButton.tscn +++ b/src/UI/ReferenceImages/ReferenceImageButton.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/ReferenceImageButton.gd" type="Script" id=1] -[ext_resource path="res://src/UI/Nodes/ValueSlider.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/ValueSlider.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/UI/ReferenceImages/ReferenceImageButton.gd" type="Script" id=2] [node name="ReferenceImageButton" type="PanelContainer"] anchor_right = 1.0 @@ -9,7 +9,7 @@ anchor_bottom = 1.0 margin_right = -969.0 margin_bottom = -581.0 size_flags_horizontal = 3 -script = ExtResource( 1 ) +script = ExtResource( 2 ) [node name="Interior" type="VBoxContainer" parent="."] margin_left = 7.0 @@ -66,12 +66,12 @@ margin_right = 213.0 margin_bottom = 24.0 size_flags_horizontal = 3 -[node name="X" parent="Interior/PreviewAndOptions/Options/Position" instance=ExtResource( 2 )] +[node name="X" parent="Interior/PreviewAndOptions/Options/Position" instance=ExtResource( 1 )] margin_right = 74.0 allow_greater = true allow_lesser = true -[node name="Y" parent="Interior/PreviewAndOptions/Options/Position" instance=ExtResource( 2 )] +[node name="Y" parent="Interior/PreviewAndOptions/Options/Position" instance=ExtResource( 1 )] margin_left = 78.0 margin_right = 153.0 allow_greater = true @@ -84,7 +84,7 @@ margin_bottom = 47.0 text = "Scale:" align = 2 -[node name="Scale" parent="Interior/PreviewAndOptions/Options" instance=ExtResource( 2 )] +[node name="Scale" parent="Interior/PreviewAndOptions/Options" instance=ExtResource( 1 )] margin_left = 60.0 margin_top = 28.0 margin_right = 213.0 @@ -99,7 +99,7 @@ margin_bottom = 75.0 text = "Opacity:" align = 2 -[node name="Opacity" parent="Interior/PreviewAndOptions/Options" instance=ExtResource( 2 )] +[node name="Opacity" parent="Interior/PreviewAndOptions/Options" instance=ExtResource( 1 )] margin_left = 60.0 margin_top = 56.0 margin_right = 213.0 diff --git a/src/UI/ReferencesPanel.gd b/src/UI/ReferenceImages/ReferencesPanel.gd similarity index 85% rename from src/UI/ReferencesPanel.gd rename to src/UI/ReferenceImages/ReferencesPanel.gd index 52f0d7b82..78f1adf1b 100644 --- a/src/UI/ReferencesPanel.gd +++ b/src/UI/ReferenceImages/ReferencesPanel.gd @@ -16,6 +16,6 @@ func project_changed(): # And update. for ref in Global.current_project.reference_images: ref.visible = true - var l = preload("res://src/UI/ReferenceImageButton.tscn").instance() + var l = preload("res://src/UI/ReferenceImages/ReferenceImageButton.tscn").instance() l.element = ref list.add_child(l) diff --git a/src/UI/ReferencesPanel.tscn b/src/UI/ReferenceImages/ReferencesPanel.tscn similarity index 93% rename from src/UI/ReferencesPanel.tscn rename to src/UI/ReferenceImages/ReferencesPanel.tscn index 4907ea985..cfa373cd0 100644 --- a/src/UI/ReferencesPanel.tscn +++ b/src/UI/ReferenceImages/ReferencesPanel.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/ReferencesPanel.gd" type="Script" id=1] +[ext_resource path="res://src/UI/ReferenceImages/ReferencesPanel.gd" type="Script" id=1] [node name="Reference Images" type="VBoxContainer"] anchor_right = 1.0 diff --git a/src/UI/Timeline/BaseCelButton.tscn b/src/UI/Timeline/BaseCelButton.tscn index ca2f6231d..1c8142b74 100644 --- a/src/UI/Timeline/BaseCelButton.tscn +++ b/src/UI/Timeline/BaseCelButton.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=2] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) diff --git a/src/UI/ToolButtons.gd b/src/UI/Tools/ToolButtons.gd similarity index 100% rename from src/UI/ToolButtons.gd rename to src/UI/Tools/ToolButtons.gd diff --git a/src/UI/Tools.tscn b/src/UI/Tools/Tools.tscn similarity index 84% rename from src/UI/Tools.tscn rename to src/UI/Tools/Tools.tscn index ed8d332a3..329b5a049 100644 --- a/src/UI/Tools.tscn +++ b/src/UI/Tools/Tools.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/ToolButtons.gd" type="Script" id=3] +[ext_resource path="res://src/UI/Tools/ToolButtons.gd" type="Script" id=1] [node name="Tools" type="ScrollContainer"] anchor_right = 1.0 @@ -24,4 +24,4 @@ margin_left = 7.0 margin_top = 7.0 margin_right = 31.0 margin_bottom = 7.0 -script = ExtResource( 3 ) +script = ExtResource( 1 ) diff --git a/src/UI/TopMenuContainer.gd b/src/UI/TopMenuContainer/TopMenuContainer.gd similarity index 100% rename from src/UI/TopMenuContainer.gd rename to src/UI/TopMenuContainer/TopMenuContainer.gd diff --git a/src/UI/TopMenuContainer.tscn b/src/UI/TopMenuContainer/TopMenuContainer.tscn similarity index 97% rename from src/UI/TopMenuContainer.tscn rename to src/UI/TopMenuContainer/TopMenuContainer.tscn index 6e6e0140c..5bcdeee67 100644 --- a/src/UI/TopMenuContainer.tscn +++ b/src/UI/TopMenuContainer/TopMenuContainer.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/TopMenuContainer.gd" type="Script" id=2] +[ext_resource path="res://src/UI/TopMenuContainer/TopMenuContainer.gd" type="Script" id=2] [node name="TopMenuContainer" type="Panel"] margin_right = 1280.0 diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index 64741c505..db710e6f7 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -1,19 +1,19 @@ [gd_scene load_steps=48 format=2] -[ext_resource path="res://src/UI/Tools.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/UI/Tools/Tools.tscn" type="PackedScene" id=1] [ext_resource path="res://src/UI/Canvas/CanvasPreview.tscn" type="PackedScene" id=2] [ext_resource path="res://src/UI/Tabs.gd" type="Script" id=3] [ext_resource path="res://src/UI/Canvas/Rulers/VerticalRuler.gd" type="Script" id=4] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/UI/Nodes/TransparentChecker.tscn" type="PackedScene" id=5] [ext_resource path="res://src/UI/Canvas/Rulers/HorizontalRuler.gd" type="Script" id=6] [ext_resource path="res://src/UI/Canvas/CameraMovement.gd" type="Script" id=7] [ext_resource path="res://src/Shaders/Greyscale.gdshader" type="Shader" id=8] [ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=9] -[ext_resource path="res://src/UI/GlobalToolOptions.tscn" type="PackedScene" id=10] -[ext_resource path="res://src/UI/ReferencesPanel.tscn" type="PackedScene" id=11] +[ext_resource path="res://src/UI/GlobalToolOptions/GlobalToolOptions.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/UI/ReferenceImages/ReferencesPanel.tscn" type="PackedScene" id=11] [ext_resource path="res://addons/dockable_container/layout.gd" type="Script" id=14] -[ext_resource path="res://src/UI/CanvasPreviewContainer.tscn" type="PackedScene" id=16] -[ext_resource path="res://src/UI/ColorPickers.tscn" type="PackedScene" id=17] +[ext_resource path="res://src/UI/CanvasPreviewContainer/CanvasPreviewContainer.tscn" type="PackedScene" id=16] +[ext_resource path="res://src/UI/ColorPickers/ColorPickers.tscn" type="PackedScene" id=17] [ext_resource path="res://src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=18] [ext_resource path="res://src/UI/Canvas/Canvas.tscn" type="PackedScene" id=19] [ext_resource path="res://src/Palette/PalettePanel.tscn" type="PackedScene" id=20]