From d4fe1f7b12430f7c3213c6fd5f2693484c692974 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:34:27 +0300 Subject: [PATCH] Moved image effect scene and script files into a new folder --- src/Main.tscn | 2 +- .../{ => ImageEffects}/GradientDialog.gd | 0 .../{ => ImageEffects}/GradientDialog.tscn | 2 +- src/UI/Dialogs/{ => ImageEffects}/HSVDialog.gd | 0 .../Dialogs/{ => ImageEffects}/HSVDialog.tscn | 2 +- .../{ => ImageEffects}/ImageEffects.tscn | 18 +++++++++++------- .../{ => ImageEffects}/OutlineDialog.gd | 0 .../{ => ImageEffects}/OutlineDialog.tscn | 2 +- .../Dialogs/{ => ImageEffects}/ResizeCanvas.gd | 0 .../{ => ImageEffects}/ResizeCanvas.tscn | 8 ++++---- .../Dialogs/{ => ImageEffects}/RotateImage.gd | 0 .../{ => ImageEffects}/RotateImage.tscn | 2 +- .../Dialogs/{ => ImageEffects}/ScaleImage.gd | 0 .../Dialogs/{ => ImageEffects}/ScaleImage.tscn | 2 +- .../Dialogs/{ => ImageEffects}/ShaderEffect.gd | 0 .../{ => ImageEffects}/ShaderEffect.tscn | 4 ++-- 16 files changed, 23 insertions(+), 19 deletions(-) rename src/UI/Dialogs/{ => ImageEffects}/GradientDialog.gd (100%) rename src/UI/Dialogs/{ => ImageEffects}/GradientDialog.tscn (97%) rename src/UI/Dialogs/{ => ImageEffects}/HSVDialog.gd (100%) rename src/UI/Dialogs/{ => ImageEffects}/HSVDialog.tscn (98%) rename src/UI/Dialogs/{ => ImageEffects}/ImageEffects.tscn (51%) rename src/UI/Dialogs/{ => ImageEffects}/OutlineDialog.gd (100%) rename src/UI/Dialogs/{ => ImageEffects}/OutlineDialog.tscn (97%) rename src/UI/Dialogs/{ => ImageEffects}/ResizeCanvas.gd (100%) rename src/UI/Dialogs/{ => ImageEffects}/ResizeCanvas.tscn (96%) rename src/UI/Dialogs/{ => ImageEffects}/RotateImage.gd (100%) rename src/UI/Dialogs/{ => ImageEffects}/RotateImage.tscn (96%) rename src/UI/Dialogs/{ => ImageEffects}/ScaleImage.gd (100%) rename src/UI/Dialogs/{ => ImageEffects}/ScaleImage.tscn (96%) rename src/UI/Dialogs/{ => ImageEffects}/ShaderEffect.gd (100%) rename src/UI/Dialogs/{ => ImageEffects}/ShaderEffect.tscn (95%) diff --git a/src/Main.tscn b/src/Main.tscn index ceb557c00..1e42a40fd 100644 --- a/src/Main.tscn +++ b/src/Main.tscn @@ -6,7 +6,7 @@ [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/Dialogs/ImageEffects.tscn" type="PackedScene" id=7] +[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/Dialogs/SaveSprite.tscn" type="PackedScene" id=11] [ext_resource path="res://src/UI/Dialogs/OpenSprite.tscn" type="PackedScene" id=12] diff --git a/src/UI/Dialogs/GradientDialog.gd b/src/UI/Dialogs/ImageEffects/GradientDialog.gd similarity index 100% rename from src/UI/Dialogs/GradientDialog.gd rename to src/UI/Dialogs/ImageEffects/GradientDialog.gd diff --git a/src/UI/Dialogs/GradientDialog.tscn b/src/UI/Dialogs/ImageEffects/GradientDialog.tscn similarity index 97% rename from src/UI/Dialogs/GradientDialog.tscn rename to src/UI/Dialogs/ImageEffects/GradientDialog.tscn index af44cf2d5..8a4768db2 100644 --- a/src/UI/Dialogs/GradientDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/GradientDialog.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Dialogs/GradientDialog.gd" type="Script" id=1] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/GradientDialog.gd" type="Script" id=1] [node name="GradientDialog" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/HSVDialog.gd b/src/UI/Dialogs/ImageEffects/HSVDialog.gd similarity index 100% rename from src/UI/Dialogs/HSVDialog.gd rename to src/UI/Dialogs/ImageEffects/HSVDialog.gd diff --git a/src/UI/Dialogs/HSVDialog.tscn b/src/UI/Dialogs/ImageEffects/HSVDialog.tscn similarity index 98% rename from src/UI/Dialogs/HSVDialog.tscn rename to src/UI/Dialogs/ImageEffects/HSVDialog.tscn index fbf7294b3..f55d2efff 100644 --- a/src/UI/Dialogs/HSVDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/HSVDialog.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Dialogs/HSVDialog.gd" type="Script" id=1] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/HSVDialog.gd" type="Script" id=1] [node name="HSVDialog" type="WindowDialog"] margin_left = 1.0 diff --git a/src/UI/Dialogs/ImageEffects.tscn b/src/UI/Dialogs/ImageEffects/ImageEffects.tscn similarity index 51% rename from src/UI/Dialogs/ImageEffects.tscn rename to src/UI/Dialogs/ImageEffects/ImageEffects.tscn index e0ee4b247..b807cdefa 100644 --- a/src/UI/Dialogs/ImageEffects.tscn +++ b/src/UI/Dialogs/ImageEffects/ImageEffects.tscn @@ -1,12 +1,16 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://src/UI/Dialogs/ResizeCanvas.tscn" type="PackedScene" id=8] -[ext_resource path="res://src/UI/Dialogs/RotateImage.tscn" type="PackedScene" id=9] -[ext_resource path="res://src/UI/Dialogs/ShaderEffect.tscn" type="PackedScene" id=10] -[ext_resource path="res://src/UI/Dialogs/HSVDialog.tscn" type="PackedScene" id=11] -[ext_resource path="res://src/UI/Dialogs/GradientDialog.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/UI/Dialogs/OutlineDialog.tscn" type="PackedScene" id=13] -[ext_resource path="res://src/UI/Dialogs/ScaleImage.tscn" type="PackedScene" id=14] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/RotateImage.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/ShaderEffect.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/HSVDialog.tscn" type="PackedScene" id=11] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/GradientDialog.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/OutlineDialog.tscn" type="PackedScene" id=13] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/ScaleImage.tscn" type="PackedScene" id=14] + + + + [node name="ImageEffects" type="Control"] mouse_filter = 2 diff --git a/src/UI/Dialogs/OutlineDialog.gd b/src/UI/Dialogs/ImageEffects/OutlineDialog.gd similarity index 100% rename from src/UI/Dialogs/OutlineDialog.gd rename to src/UI/Dialogs/ImageEffects/OutlineDialog.gd diff --git a/src/UI/Dialogs/OutlineDialog.tscn b/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn similarity index 97% rename from src/UI/Dialogs/OutlineDialog.tscn rename to src/UI/Dialogs/ImageEffects/OutlineDialog.tscn index e65a1a378..68c3ff935 100644 --- a/src/UI/Dialogs/OutlineDialog.tscn +++ b/src/UI/Dialogs/ImageEffects/OutlineDialog.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Dialogs/OutlineDialog.gd" type="Script" id=1] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/OutlineDialog.gd" type="Script" id=1] [node name="OutlineDialog" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/ResizeCanvas.gd b/src/UI/Dialogs/ImageEffects/ResizeCanvas.gd similarity index 100% rename from src/UI/Dialogs/ResizeCanvas.gd rename to src/UI/Dialogs/ImageEffects/ResizeCanvas.gd diff --git a/src/UI/Dialogs/ResizeCanvas.tscn b/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn similarity index 96% rename from src/UI/Dialogs/ResizeCanvas.tscn rename to src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn index 5773c4f8d..49c09614b 100644 --- a/src/UI/Dialogs/ResizeCanvas.tscn +++ b/src/UI/Dialogs/ImageEffects/ResizeCanvas.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ResizeCanvas.gd" type="Script" id=1] -[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UI/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"] margin_right = 200.0 margin_bottom = 114.0 resizable = true -script = ExtResource( 1 ) +script = ExtResource( 2 ) [node name="VBoxContainer" type="VBoxContainer" parent="."] margin_left = 8.0 @@ -122,7 +122,7 @@ size_flags_vertical = 0 expand = true stretch_mode = 5 -[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 2 )] +[node name="TransparentChecker" parent="VBoxContainer/Preview" instance=ExtResource( 1 )] show_behind_parent = true [connection signal="about_to_show" from="." to="." method="_on_ResizeCanvas_about_to_show"] [connection signal="confirmed" from="." to="." method="_on_ResizeCanvas_confirmed"] diff --git a/src/UI/Dialogs/RotateImage.gd b/src/UI/Dialogs/ImageEffects/RotateImage.gd similarity index 100% rename from src/UI/Dialogs/RotateImage.gd rename to src/UI/Dialogs/ImageEffects/RotateImage.gd diff --git a/src/UI/Dialogs/RotateImage.tscn b/src/UI/Dialogs/ImageEffects/RotateImage.tscn similarity index 96% rename from src/UI/Dialogs/RotateImage.tscn rename to src/UI/Dialogs/ImageEffects/RotateImage.tscn index a13c7fa6e..cb7a3d168 100644 --- a/src/UI/Dialogs/RotateImage.tscn +++ b/src/UI/Dialogs/ImageEffects/RotateImage.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Dialogs/RotateImage.gd" type="Script" id=1] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/RotateImage.gd" type="Script" id=1] [node name="RotateImage" type="ConfirmationDialog"] margin_right = 245.0 diff --git a/src/UI/Dialogs/ScaleImage.gd b/src/UI/Dialogs/ImageEffects/ScaleImage.gd similarity index 100% rename from src/UI/Dialogs/ScaleImage.gd rename to src/UI/Dialogs/ImageEffects/ScaleImage.gd diff --git a/src/UI/Dialogs/ScaleImage.tscn b/src/UI/Dialogs/ImageEffects/ScaleImage.tscn similarity index 96% rename from src/UI/Dialogs/ScaleImage.tscn rename to src/UI/Dialogs/ImageEffects/ScaleImage.tscn index 958becfa4..d5f8f322d 100644 --- a/src/UI/Dialogs/ScaleImage.tscn +++ b/src/UI/Dialogs/ImageEffects/ScaleImage.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UI/Dialogs/ScaleImage.gd" type="Script" id=1] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/ScaleImage.gd" type="Script" id=1] [node name="ScaleImage" type="ConfirmationDialog"] margin_right = 200.0 diff --git a/src/UI/Dialogs/ShaderEffect.gd b/src/UI/Dialogs/ImageEffects/ShaderEffect.gd similarity index 100% rename from src/UI/Dialogs/ShaderEffect.gd rename to src/UI/Dialogs/ImageEffects/ShaderEffect.gd diff --git a/src/UI/Dialogs/ShaderEffect.tscn b/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn similarity index 95% rename from src/UI/Dialogs/ShaderEffect.tscn rename to src/UI/Dialogs/ImageEffects/ShaderEffect.tscn index ad17d5097..d26726a55 100644 --- a/src/UI/Dialogs/ShaderEffect.tscn +++ b/src/UI/Dialogs/ImageEffects/ShaderEffect.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://src/UI/Dialogs/ShaderEffect.gd" type="Script" id=2] +[ext_resource path="res://src/UI/Dialogs/ImageEffects/ShaderEffect.gd" type="Script" id=1] [sub_resource type="ShaderMaterial" id=1] @@ -9,7 +9,7 @@ margin_right = 200.0 margin_bottom = 228.0 rect_min_size = Vector2( 400, 300 ) resizable = true -script = ExtResource( 2 ) +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false }