diff --git a/src/Tools/BaseShapeDrawer.tscn b/src/Tools/BaseShapeDrawer.tscn index 243e93646..a5badf2ae 100644 --- a/src/Tools/BaseShapeDrawer.tscn +++ b/src/Tools/BaseShapeDrawer.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://ubyatap3sylf" path="res://src/Tools/BaseDraw.tscn" id="2"] [ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/ValueSlider.tscn" id="3"] -[sub_resource type="ButtonGroup" id="ButtonGroup_mvrqm"] +[sub_resource type="ButtonGroup" id="ButtonGroup_7w1wt"] resource_name = "rotate" allow_unpress = true @@ -26,14 +26,14 @@ tooltip_text = "Fills the drawn shape with color, instead of drawing a hollow sh mouse_default_cursor_shape = 2 text = "Fill Shape" -[node name="Rotate90" parent="RotationOptions/Rotate" index="0"] -button_group = SubResource("ButtonGroup_mvrqm") +[node name="Rotate90" parent="RotationOptions/GridContainer/Rotate" index="0"] +button_group = SubResource("ButtonGroup_7w1wt") -[node name="Rotate180" parent="RotationOptions/Rotate" index="1"] -button_group = SubResource("ButtonGroup_mvrqm") +[node name="Rotate180" parent="RotationOptions/GridContainer/Rotate" index="1"] +button_group = SubResource("ButtonGroup_7w1wt") -[node name="Rotate270" parent="RotationOptions/Rotate" index="2"] -button_group = SubResource("ButtonGroup_mvrqm") +[node name="Rotate270" parent="RotationOptions/GridContainer/Rotate" index="2"] +button_group = SubResource("ButtonGroup_7w1wt") [node name="Brush" parent="." index="5"] visible = false diff --git a/src/Tools/DesignTools/Bucket.tscn b/src/Tools/DesignTools/Bucket.tscn index 871cac243..d24b67424 100644 --- a/src/Tools/DesignTools/Bucket.tscn +++ b/src/Tools/DesignTools/Bucket.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://src/Tools/DesignTools/Bucket.gd" id="3"] [ext_resource type="Script" path="res://src/UI/Nodes/ValueSlider.gd" id="4_1pngp"] -[sub_resource type="StyleBoxFlat" id="1"] +[sub_resource type="StyleBoxFlat" id="2"] bg_color = Color(1, 1, 1, 1) border_color = Color(1, 1, 1, 1) corner_radius_top_left = 5 @@ -14,7 +14,7 @@ corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id="2"] +[sub_resource type="StyleBoxFlat" id="1"] bg_color = Color(1, 1, 1, 1) border_color = Color(1, 1, 1, 1) corner_radius_top_left = 5 @@ -38,10 +38,9 @@ text = "Fill area:" layout_mode = 2 size_flags_horizontal = 3 mouse_default_cursor_shape = 2 -item_count = 3 selected = 0 +item_count = 3 popup/item_0/text = "Similar area" -popup/item_0/id = 0 popup/item_1/text = "Similar colors" popup/item_1/id = 1 popup/item_2/text = "Whole selection" @@ -71,10 +70,9 @@ text = "Fill with:" layout_mode = 2 size_flags_horizontal = 3 mouse_default_cursor_shape = 2 -item_count = 2 selected = 0 +item_count = 2 popup/item_0/text = "Selected color" -popup/item_0/id = 0 popup/item_1/text = "Pattern" popup/item_1/id = 1 @@ -89,11 +87,11 @@ layout_mode = 2 size_flags_horizontal = 0 tooltip_text = "Select a brush" mouse_default_cursor_shape = 2 -theme_override_styles/normal = SubResource("1") +theme_override_styles/focus = SubResource("2") +theme_override_styles/disabled = SubResource("2") theme_override_styles/hover = SubResource("1") theme_override_styles/pressed = SubResource("1") -theme_override_styles/disabled = SubResource("2") -theme_override_styles/focus = SubResource("2") +theme_override_styles/normal = SubResource("1") [node name="Texture2D" type="TextureRect" parent="FillPattern/Type" index="0"] layout_mode = 0 diff --git a/src/Tools/DesignTools/CurveTool.tscn b/src/Tools/DesignTools/CurveTool.tscn index 354b58a1b..094ad3e83 100644 --- a/src/Tools/DesignTools/CurveTool.tscn +++ b/src/Tools/DesignTools/CurveTool.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://src/Tools/DesignTools/CurveTool.gd" id="2_tjnp6"] [ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/ValueSlider.tscn" id="3_g0nav"] -[sub_resource type="ButtonGroup" id="ButtonGroup_ko8wf"] +[sub_resource type="ButtonGroup" id="ButtonGroup_drx24"] resource_name = "rotate" allow_unpress = true @@ -26,14 +26,14 @@ tooltip_text = "Fills the drawn shape with color, instead of drawing a hollow sh mouse_default_cursor_shape = 2 text = "Fill Shape" -[node name="Rotate90" parent="RotationOptions/Rotate" index="0"] -button_group = SubResource("ButtonGroup_ko8wf") +[node name="Rotate90" parent="RotationOptions/GridContainer/Rotate" index="0"] +button_group = SubResource("ButtonGroup_drx24") -[node name="Rotate180" parent="RotationOptions/Rotate" index="1"] -button_group = SubResource("ButtonGroup_ko8wf") +[node name="Rotate180" parent="RotationOptions/GridContainer/Rotate" index="1"] +button_group = SubResource("ButtonGroup_drx24") -[node name="Rotate270" parent="RotationOptions/Rotate" index="2"] -button_group = SubResource("ButtonGroup_ko8wf") +[node name="Rotate270" parent="RotationOptions/GridContainer/Rotate" index="2"] +button_group = SubResource("ButtonGroup_drx24") [node name="Brush" parent="." index="5"] visible = false diff --git a/src/Tools/DesignTools/EllipseTool.tscn b/src/Tools/DesignTools/EllipseTool.tscn index 59f20adee..65826128a 100644 --- a/src/Tools/DesignTools/EllipseTool.tscn +++ b/src/Tools/DesignTools/EllipseTool.tscn @@ -3,18 +3,18 @@ [ext_resource type="PackedScene" uid="uid://n40lhf8hm7o1" path="res://src/Tools/BaseShapeDrawer.tscn" id="1"] [ext_resource type="Script" path="res://src/Tools/DesignTools/EllipseTool.gd" id="2"] -[sub_resource type="ButtonGroup" id="ButtonGroup_q7ttl"] +[sub_resource type="ButtonGroup" id="ButtonGroup_nq4ym"] resource_name = "rotate" allow_unpress = true [node name="ToolOptions" instance=ExtResource("1")] script = ExtResource("2") -[node name="Rotate90" parent="RotationOptions/Rotate" index="0"] -button_group = SubResource("ButtonGroup_q7ttl") +[node name="Rotate90" parent="RotationOptions/GridContainer/Rotate" index="0"] +button_group = SubResource("ButtonGroup_nq4ym") -[node name="Rotate180" parent="RotationOptions/Rotate" index="1"] -button_group = SubResource("ButtonGroup_q7ttl") +[node name="Rotate180" parent="RotationOptions/GridContainer/Rotate" index="1"] +button_group = SubResource("ButtonGroup_nq4ym") -[node name="Rotate270" parent="RotationOptions/Rotate" index="2"] -button_group = SubResource("ButtonGroup_q7ttl") +[node name="Rotate270" parent="RotationOptions/GridContainer/Rotate" index="2"] +button_group = SubResource("ButtonGroup_nq4ym") diff --git a/src/Tools/DesignTools/Eraser.tscn b/src/Tools/DesignTools/Eraser.tscn index f161245e0..edb437339 100644 --- a/src/Tools/DesignTools/Eraser.tscn +++ b/src/Tools/DesignTools/Eraser.tscn @@ -4,21 +4,21 @@ [ext_resource type="Script" path="res://src/Tools/DesignTools/Eraser.gd" id="2"] [ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/ValueSlider.tscn" id="3"] -[sub_resource type="ButtonGroup" id="ButtonGroup_kkavr"] +[sub_resource type="ButtonGroup" id="ButtonGroup_7k1sb"] resource_name = "rotate" allow_unpress = true [node name="ToolOptions" instance=ExtResource("1")] script = ExtResource("2") -[node name="Rotate90" parent="RotationOptions/Rotate" index="0"] -button_group = SubResource("ButtonGroup_kkavr") +[node name="Rotate90" parent="RotationOptions/GridContainer/Rotate" index="0"] +button_group = SubResource("ButtonGroup_7k1sb") -[node name="Rotate180" parent="RotationOptions/Rotate" index="1"] -button_group = SubResource("ButtonGroup_kkavr") +[node name="Rotate180" parent="RotationOptions/GridContainer/Rotate" index="1"] +button_group = SubResource("ButtonGroup_7k1sb") -[node name="Rotate270" parent="RotationOptions/Rotate" index="2"] -button_group = SubResource("ButtonGroup_kkavr") +[node name="Rotate270" parent="RotationOptions/GridContainer/Rotate" index="2"] +button_group = SubResource("ButtonGroup_7k1sb") [node name="OpacitySlider" parent="." index="5" instance=ExtResource("3")] layout_mode = 2 diff --git a/src/Tools/DesignTools/LineTool.tscn b/src/Tools/DesignTools/LineTool.tscn index 08777f19c..62a9e900e 100644 --- a/src/Tools/DesignTools/LineTool.tscn +++ b/src/Tools/DesignTools/LineTool.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" path="res://src/Tools/DesignTools/LineTool.gd" id="2"] [ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/ValueSlider.tscn" id="3"] -[sub_resource type="ButtonGroup" id="ButtonGroup_ko8wf"] +[sub_resource type="ButtonGroup" id="ButtonGroup_o5212"] resource_name = "rotate" allow_unpress = true @@ -20,14 +20,14 @@ suffix = "px" global_increment_action = "brush_size_increment" global_decrement_action = "brush_size_decrement" -[node name="Rotate90" parent="RotationOptions/Rotate" index="0"] -button_group = SubResource("ButtonGroup_ko8wf") +[node name="Rotate90" parent="RotationOptions/GridContainer/Rotate" index="0"] +button_group = SubResource("ButtonGroup_o5212") -[node name="Rotate180" parent="RotationOptions/Rotate" index="1"] -button_group = SubResource("ButtonGroup_ko8wf") +[node name="Rotate180" parent="RotationOptions/GridContainer/Rotate" index="1"] +button_group = SubResource("ButtonGroup_o5212") -[node name="Rotate270" parent="RotationOptions/Rotate" index="2"] -button_group = SubResource("ButtonGroup_ko8wf") +[node name="Rotate270" parent="RotationOptions/GridContainer/Rotate" index="2"] +button_group = SubResource("ButtonGroup_o5212") [node name="Brush" parent="." index="4"] visible = false diff --git a/src/Tools/DesignTools/Pencil.tscn b/src/Tools/DesignTools/Pencil.tscn index af81dc0a4..2ac7774f6 100644 --- a/src/Tools/DesignTools/Pencil.tscn +++ b/src/Tools/DesignTools/Pencil.tscn @@ -4,21 +4,21 @@ [ext_resource type="PackedScene" path="res://src/UI/Nodes/ValueSliderV2.tscn" id="2"] [ext_resource type="Script" path="res://src/Tools/DesignTools/Pencil.gd" id="3"] -[sub_resource type="ButtonGroup" id="ButtonGroup_clato"] +[sub_resource type="ButtonGroup" id="ButtonGroup_e3rs3"] resource_name = "rotate" allow_unpress = true [node name="ToolOptions" instance=ExtResource("1")] script = ExtResource("3") -[node name="Rotate90" parent="RotationOptions/Rotate" index="0"] -button_group = SubResource("ButtonGroup_clato") +[node name="Rotate90" parent="RotationOptions/GridContainer/Rotate" index="0"] +button_group = SubResource("ButtonGroup_e3rs3") -[node name="Rotate180" parent="RotationOptions/Rotate" index="1"] -button_group = SubResource("ButtonGroup_clato") +[node name="Rotate180" parent="RotationOptions/GridContainer/Rotate" index="1"] +button_group = SubResource("ButtonGroup_e3rs3") -[node name="Rotate270" parent="RotationOptions/Rotate" index="2"] -button_group = SubResource("ButtonGroup_clato") +[node name="Rotate270" parent="RotationOptions/GridContainer/Rotate" index="2"] +button_group = SubResource("ButtonGroup_e3rs3") [node name="Overwrite" type="CheckBox" parent="." index="5"] layout_mode = 2 diff --git a/src/Tools/DesignTools/RectangleTool.tscn b/src/Tools/DesignTools/RectangleTool.tscn index 461bc8e09..5c0f91b34 100644 --- a/src/Tools/DesignTools/RectangleTool.tscn +++ b/src/Tools/DesignTools/RectangleTool.tscn @@ -3,18 +3,18 @@ [ext_resource type="PackedScene" uid="uid://n40lhf8hm7o1" path="res://src/Tools/BaseShapeDrawer.tscn" id="1"] [ext_resource type="Script" path="res://src/Tools/DesignTools/RectangleTool.gd" id="2"] -[sub_resource type="ButtonGroup" id="ButtonGroup_cyxrj"] +[sub_resource type="ButtonGroup" id="ButtonGroup_vkkkg"] resource_name = "rotate" allow_unpress = true [node name="ToolOptions" instance=ExtResource("1")] script = ExtResource("2") -[node name="Rotate90" parent="RotationOptions/Rotate" index="0"] -button_group = SubResource("ButtonGroup_cyxrj") +[node name="Rotate90" parent="RotationOptions/GridContainer/Rotate" index="0"] +button_group = SubResource("ButtonGroup_vkkkg") -[node name="Rotate180" parent="RotationOptions/Rotate" index="1"] -button_group = SubResource("ButtonGroup_cyxrj") +[node name="Rotate180" parent="RotationOptions/GridContainer/Rotate" index="1"] +button_group = SubResource("ButtonGroup_vkkkg") -[node name="Rotate270" parent="RotationOptions/Rotate" index="2"] -button_group = SubResource("ButtonGroup_cyxrj") +[node name="Rotate270" parent="RotationOptions/GridContainer/Rotate" index="2"] +button_group = SubResource("ButtonGroup_vkkkg")