diff --git a/Prefabs/Dialogs/PreferencesDialog.tscn b/Prefabs/Dialogs/PreferencesDialog.tscn index 43ea7ef95..1909e9441 100644 --- a/Prefabs/Dialogs/PreferencesDialog.tscn +++ b/Prefabs/Dialogs/PreferencesDialog.tscn @@ -5,9 +5,11 @@ [ext_resource path="res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3] [node name="PreferencesDialog" type="AcceptDialog"] -margin_right = 430.0 -margin_bottom = 1347.0 -rect_min_size = Vector2( 430, 0 ) +margin_left = -3.0 +margin_top = 2.0 +margin_right = 419.0 +margin_bottom = 1092.0 +rect_min_size = Vector2( 422, 0 ) window_title = "Preferences" resizable = true script = ExtResource( 1 ) @@ -26,85 +28,91 @@ margin_right = -8.0 margin_bottom = -36.0 size_flags_horizontal = 3 custom_constants/autohide = 0 +split_offset = 1 __meta__ = { "_edit_use_anchors_": false } [node name="Tree" type="Tree" parent="HSplitContainer"] -margin_right = 88.0 -margin_bottom = 1303.0 -rect_min_size = Vector2( 88, 0 ) +margin_right = 86.0 +margin_bottom = 1046.0 +rect_min_size = Vector2( 85, 0 ) custom_constants/item_margin = -2 hide_root = true [node name="ScrollContainer" type="ScrollContainer" parent="HSplitContainer"] -margin_left = 100.0 -margin_right = 414.0 -margin_bottom = 1303.0 +margin_left = 98.0 +margin_right = 406.0 +margin_bottom = 1046.0 rect_min_size = Vector2( 100, 0 ) size_flags_horizontal = 3 [node name="VBoxContainer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer"] -margin_right = 314.0 -margin_bottom = 1186.0 +margin_right = 308.0 +margin_bottom = 1042.0 size_flags_horizontal = 3 [node name="General" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] -margin_right = 314.0 -margin_bottom = 112.0 - -[node name="General Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_right = 314.0 -margin_bottom = 28.0 -rect_min_size = Vector2( 0, 28 ) -text = "General Options" +margin_right = 308.0 +margin_bottom = 88.0 [node name="SmoothZoom" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_top = 32.0 -margin_right = 314.0 -margin_bottom = 56.0 +margin_right = 308.0 +margin_bottom = 24.0 +hint_tooltip = "Adds a smoother transition when zooming in or out" mouse_default_cursor_shape = 2 pressed = true text = "Smooth Zoom" +[node name="HSeparator2" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] +margin_top = 28.0 +margin_right = 308.0 +margin_bottom = 32.0 + [node name="GridContainer" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_top = 60.0 -margin_right = 314.0 -margin_bottom = 112.0 +margin_top = 36.0 +margin_right = 308.0 +margin_bottom = 88.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 2 [node name="LeftIndicatorCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer"] -margin_right = 147.0 +margin_right = 149.0 margin_bottom = 24.0 hint_tooltip = "Show left mouse pixel indicator or brush on the canvas when drawing" mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 pressed = true text = "Left pixel indicator" [node name="RightIndicatorCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer"] -margin_left = 151.0 -margin_right = 306.0 +margin_left = 153.0 +margin_right = 308.0 margin_bottom = 24.0 hint_tooltip = "Show right mouse pixel indicator or brush on the canvas when drawing" mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 text = "Right pixel indicator" [node name="LeftToolIconCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer"] margin_top = 28.0 -margin_right = 147.0 +margin_right = 149.0 margin_bottom = 52.0 +hint_tooltip = "Displays an icon of the selected left tool next to the cursor on the canvas" mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 pressed = true text = "Show left tool icon" [node name="RightToolIconCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer"] -margin_left = 151.0 +margin_left = 153.0 margin_top = 28.0 -margin_right = 306.0 +margin_right = 308.0 margin_bottom = 52.0 +hint_tooltip = "Displays an icon of the selected right tool next to the cursor on the canvas" mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 pressed = true text = "Show right tool icon" @@ -129,260 +137,262 @@ items = [ "None", null, false, 0, null, "Affect Brush's Alpha", null, false, 1, selected = 1 [node name="Languages" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] -margin_top = 116.0 -margin_right = 314.0 -margin_bottom = 540.0 - -[node name="Language Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_right = 314.0 -margin_bottom = 28.0 -rect_min_size = Vector2( 0, 28 ) -text = "Language options" +margin_top = 92.0 +margin_right = 308.0 +margin_bottom = 484.0 [node name="System Language" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 32.0 -margin_right = 314.0 -margin_bottom = 56.0 +margin_right = 308.0 +margin_bottom = 24.0 mouse_default_cursor_shape = 2 pressed = true text = "System Language" [node name="German" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 60.0 -margin_right = 314.0 -margin_bottom = 84.0 +margin_top = 28.0 +margin_right = 308.0 +margin_bottom = 52.0 mouse_default_cursor_shape = 2 text = "Deutsch [de]" [node name="Greek" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 88.0 -margin_right = 314.0 -margin_bottom = 112.0 +margin_top = 56.0 +margin_right = 308.0 +margin_bottom = 80.0 mouse_default_cursor_shape = 2 custom_fonts/font = ExtResource( 2 ) text = "Ελληνικά [el]" [node name="English" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 116.0 -margin_right = 314.0 -margin_bottom = 140.0 +margin_top = 84.0 +margin_right = 308.0 +margin_bottom = 108.0 mouse_default_cursor_shape = 2 text = "English [en]" [node name="Esperanto" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 144.0 -margin_right = 314.0 -margin_bottom = 168.0 +margin_top = 112.0 +margin_right = 308.0 +margin_bottom = 136.0 mouse_default_cursor_shape = 2 text = "Esperanto [eo]" [node name="Spanish" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 172.0 -margin_right = 314.0 -margin_bottom = 196.0 +margin_top = 140.0 +margin_right = 308.0 +margin_bottom = 164.0 mouse_default_cursor_shape = 2 text = "Español [es]" [node name="French" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 200.0 -margin_right = 314.0 -margin_bottom = 224.0 +margin_top = 168.0 +margin_right = 308.0 +margin_bottom = 192.0 mouse_default_cursor_shape = 2 text = "Français [fr]" [node name="Italian" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 228.0 -margin_right = 314.0 -margin_bottom = 252.0 +margin_top = 196.0 +margin_right = 308.0 +margin_bottom = 220.0 mouse_default_cursor_shape = 2 text = "Italiano [it]" [node name="Latvian" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 256.0 -margin_right = 314.0 -margin_bottom = 280.0 +margin_top = 224.0 +margin_right = 308.0 +margin_bottom = 248.0 mouse_default_cursor_shape = 2 text = "Latvian [lv]" [node name="Polish" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 284.0 -margin_right = 314.0 -margin_bottom = 308.0 +margin_top = 252.0 +margin_right = 308.0 +margin_bottom = 276.0 mouse_default_cursor_shape = 2 text = "Polski [pl]" [node name="Brazilian Portuguese" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 312.0 -margin_right = 314.0 -margin_bottom = 336.0 +margin_top = 280.0 +margin_right = 308.0 +margin_bottom = 304.0 mouse_default_cursor_shape = 2 text = "Português Brasileiro [pt_BR]" [node name="Russian" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 340.0 -margin_right = 314.0 -margin_bottom = 364.0 +margin_top = 308.0 +margin_right = 308.0 +margin_bottom = 332.0 mouse_default_cursor_shape = 2 text = "Русский [ru]" [node name="Chinese Simplified" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 368.0 -margin_right = 314.0 -margin_bottom = 394.0 +margin_top = 336.0 +margin_right = 308.0 +margin_bottom = 362.0 mouse_default_cursor_shape = 2 custom_fonts/font = ExtResource( 3 ) text = "简体中文 [zh_CN]" [node name="Chinese Traditional" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"] -margin_top = 398.0 -margin_right = 314.0 -margin_bottom = 424.0 +margin_top = 366.0 +margin_right = 308.0 +margin_bottom = 392.0 mouse_default_cursor_shape = 2 custom_fonts/font = ExtResource( 3 ) text = "繁體中文 [zh_TW]" [node name="Themes" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] -margin_top = 544.0 -margin_right = 314.0 -margin_bottom = 712.0 - -[node name="Theme Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"] -margin_right = 314.0 -margin_bottom = 28.0 -rect_min_size = Vector2( 0, 28 ) -text = "Theme options" +margin_top = 488.0 +margin_right = 308.0 +margin_bottom = 624.0 [node name="Dark Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"] -margin_top = 32.0 -margin_right = 314.0 -margin_bottom = 56.0 +margin_right = 308.0 +margin_bottom = 24.0 mouse_default_cursor_shape = 2 text = "Dark" [node name="Gray Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"] -margin_top = 60.0 -margin_right = 314.0 -margin_bottom = 84.0 +margin_top = 28.0 +margin_right = 308.0 +margin_bottom = 52.0 mouse_default_cursor_shape = 2 text = "Gray" [node name="Godot\'s Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"] -margin_top = 88.0 -margin_right = 314.0 -margin_bottom = 112.0 +margin_top = 56.0 +margin_right = 308.0 +margin_bottom = 80.0 mouse_default_cursor_shape = 2 text = "Godot" [node name="Gold Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"] -margin_top = 116.0 -margin_right = 314.0 -margin_bottom = 140.0 +margin_top = 84.0 +margin_right = 308.0 +margin_bottom = 108.0 mouse_default_cursor_shape = 2 text = "Gold" [node name="Light Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"] -margin_top = 144.0 -margin_right = 314.0 -margin_bottom = 168.0 +margin_top = 112.0 +margin_right = 308.0 +margin_bottom = 136.0 mouse_default_cursor_shape = 2 text = "Light" [node name="Grid&Guides" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] -margin_top = 716.0 -margin_right = 314.0 -margin_bottom = 848.0 +margin_top = 628.0 +margin_right = 308.0 +margin_bottom = 736.0 -[node name="GridOptionsLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides"] -margin_right = 314.0 +[node name="GuideOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides"] +margin_right = 308.0 +margin_bottom = 20.0 +custom_constants/vseparation = 4 +custom_constants/hseparation = 4 +columns = 2 + +[node name="GuideColorLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GuideOptions"] +margin_top = 3.0 +margin_right = 110.0 +margin_bottom = 17.0 +rect_min_size = Vector2( 110, 0 ) +hint_tooltip = "A color of ruler guides displayed on the canvas" +mouse_filter = 0 +text = "Guides color:" + +[node name="GuideColor" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GuideOptions"] +margin_left = 114.0 +margin_right = 308.0 +margin_bottom = 20.0 +rect_min_size = Vector2( 64, 20 ) +hint_tooltip = "A color of ruler guides displayed on the canvas" +mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 +color = Color( 0.63, 0.13, 0.94, 1 ) + +[node name="HSeparator" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides"] +margin_top = 24.0 +margin_right = 308.0 margin_bottom = 28.0 -rect_min_size = Vector2( 0, 28 ) -text = "Grid options" [node name="GridOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides"] margin_top = 32.0 -margin_right = 314.0 -margin_bottom = 132.0 +margin_right = 308.0 +margin_bottom = 108.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 2 [node name="WidthLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions"] margin_top = 5.0 -margin_right = 78.0 +margin_right = 110.0 margin_bottom = 19.0 -text = "Width:" +rect_min_size = Vector2( 110, 0 ) +hint_tooltip = "Sets how far apart are vertical lines of the grid" +mouse_filter = 0 +text = "Grid width:" [node name="GridWidthValue" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions"] -margin_left = 82.0 -margin_right = 156.0 +margin_left = 114.0 +margin_right = 308.0 margin_bottom = 24.0 +hint_tooltip = "Sets how far apart are vertical lines of the grid" mouse_default_cursor_shape = 2 min_value = 1.0 max_value = 16384.0 value = 1.0 +align = 2 suffix = "px" [node name="Height" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions"] margin_top = 33.0 -margin_right = 78.0 +margin_right = 110.0 margin_bottom = 47.0 -text = "Height:" +hint_tooltip = "Sets how far apart are horizontal lines of the grid" +mouse_filter = 0 +text = "Grid height:" [node name="GridHeightValue" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions"] -margin_left = 82.0 +margin_left = 114.0 margin_top = 28.0 -margin_right = 156.0 +margin_right = 308.0 margin_bottom = 52.0 +hint_tooltip = "Sets how far apart are horizontal lines of the grid" mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 min_value = 1.0 max_value = 16384.0 value = 1.0 +align = 2 suffix = "px" [node name="GridColorLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions"] margin_top = 59.0 -margin_right = 78.0 +margin_right = 110.0 margin_bottom = 73.0 -text = "Color:" +hint_tooltip = "A color of the grid" +mouse_filter = 0 +text = "Grid color:" [node name="GridColor" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions"] -margin_left = 82.0 +margin_left = 114.0 margin_top = 56.0 -margin_right = 156.0 +margin_right = 308.0 margin_bottom = 76.0 rect_min_size = Vector2( 64, 20 ) +hint_tooltip = "A color of the grid" mouse_default_cursor_shape = 2 -[node name="GuideColorLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions"] -margin_top = 83.0 -margin_right = 78.0 -margin_bottom = 97.0 -text = "Guide color:" - -[node name="GuideColor" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions"] -margin_left = 82.0 -margin_top = 80.0 -margin_right = 156.0 -margin_bottom = 100.0 -rect_min_size = Vector2( 64, 20 ) -mouse_default_cursor_shape = 2 -color = Color( 0.63, 0.13, 0.94, 1 ) - [node name="Image" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] -margin_top = 852.0 -margin_right = 314.0 -margin_bottom = 960.0 - -[node name="ImageOptionsLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image"] -margin_right = 314.0 -margin_bottom = 28.0 -rect_min_size = Vector2( 0, 28 ) -text = "Image Options" +margin_top = 740.0 +margin_right = 308.0 +margin_bottom = 816.0 [node name="ImageOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image"] -margin_top = 32.0 -margin_right = 314.0 -margin_bottom = 108.0 +margin_right = 308.0 +margin_bottom = 76.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 2 @@ -391,58 +401,72 @@ columns = 2 margin_top = 5.0 margin_right = 110.0 margin_bottom = 19.0 -text = "Default Width:" +rect_min_size = Vector2( 110, 0 ) +hint_tooltip = "A default width of a new image" +mouse_filter = 0 +text = "Default width:" [node name="ImageDefaultWidth" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions"] margin_left = 114.0 -margin_right = 188.0 +margin_right = 308.0 margin_bottom = 24.0 +hint_tooltip = "A default width of a new image" mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 min_value = 1.0 max_value = 16384.0 -value = 32.0 +value = 64.0 +align = 2 suffix = "px" [node name="DefaultHeightLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions"] margin_top = 33.0 margin_right = 110.0 margin_bottom = 47.0 -text = "Default Height:" +hint_tooltip = "A default height of a new image" +mouse_filter = 0 +text = "Default height:" [node name="ImageDefaultHeight" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions"] margin_left = 114.0 margin_top = 28.0 -margin_right = 188.0 +margin_right = 308.0 margin_bottom = 52.0 +hint_tooltip = "A default height of a new image" mouse_default_cursor_shape = 2 min_value = 1.0 max_value = 16384.0 -value = 32.0 +value = 64.0 +align = 2 suffix = "px" [node name="DefaultFillColorLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions"] margin_top = 59.0 margin_right = 110.0 margin_bottom = 73.0 -text = "Default Fill Color:" +hint_tooltip = "A default background color of a new image" +mouse_filter = 0 +text = "Default fill color:" [node name="DefaultFillColor" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions"] margin_left = 114.0 margin_top = 56.0 -margin_right = 188.0 +margin_right = 308.0 margin_bottom = 76.0 rect_min_size = Vector2( 64, 20 ) +hint_tooltip = "A default background color of a new image" mouse_default_cursor_shape = 2 color = Color( 0, 0, 0, 0 ) [node name="Shortcuts" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] -margin_top = 964.0 -margin_right = 314.0 -margin_bottom = 1186.0 +margin_top = 820.0 +margin_right = 308.0 +margin_bottom = 1042.0 [node name="HBoxContainer" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts"] -margin_right = 314.0 +margin_right = 308.0 margin_bottom = 20.0 +hint_tooltip = "Only custom preset can be modified" [node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer"] margin_top = 3.0 @@ -452,7 +476,7 @@ text = "Preset: " [node name="PresetOptionButton" type="OptionButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer"] margin_left = 53.0 -margin_right = 314.0 +margin_right = 308.0 margin_bottom = 20.0 mouse_default_cursor_shape = 2 size_flags_horizontal = 3 @@ -462,12 +486,12 @@ selected = 0 [node name="HSeparator" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts"] margin_top = 24.0 -margin_right = 314.0 +margin_right = 308.0 margin_bottom = 28.0 [node name="Shortcuts" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts"] margin_top = 32.0 -margin_right = 314.0 +margin_right = 308.0 margin_bottom = 222.0 custom_constants/hseparation = 5 columns = 3 @@ -478,19 +502,29 @@ margin_bottom = 14.0 [node name="LeftToolLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 14.0 +hint_tooltip = "A tool assigned to the left mouse button" +mouse_filter = 0 text = "Left Tool:" align = 1 [node name="RightToolLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 -margin_right = 313.0 +margin_left = 227.0 +margin_right = 307.0 margin_bottom = 14.0 +hint_tooltip = "A tool assigned to the right mouse button" +mouse_filter = 0 text = "Right Tool:" align = 1 +[node name="Empty2" type="Control" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] +margin_top = 18.0 +margin_right = 137.0 +margin_bottom = 22.0 + [node name="HSeparator" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] +visible = false margin_top = 18.0 margin_right = 137.0 margin_bottom = 22.0 @@ -498,13 +532,13 @@ margin_bottom = 22.0 [node name="HSeparator2" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 margin_top = 18.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 22.0 [node name="HSeparator3" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 +margin_left = 227.0 margin_top = 18.0 -margin_right = 313.0 +margin_right = 307.0 margin_bottom = 22.0 [node name="RectSelectLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] @@ -516,14 +550,14 @@ text = "Rectangular Selection" [node name="left_rectangle_select_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 margin_top = 26.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 46.0 size_flags_horizontal = 3 [node name="right_rectangle_select_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 +margin_left = 227.0 margin_top = 26.0 -margin_right = 313.0 +margin_right = 307.0 margin_bottom = 46.0 size_flags_horizontal = 3 @@ -536,14 +570,14 @@ text = "Zoom" [node name="left_zoom_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 margin_top = 50.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 70.0 size_flags_horizontal = 3 [node name="right_zoom_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 +margin_left = 227.0 margin_top = 50.0 -margin_right = 313.0 +margin_right = 307.0 margin_bottom = 70.0 size_flags_horizontal = 3 @@ -556,13 +590,13 @@ text = "Color Picker" [node name="left_colorpicker_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 margin_top = 74.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 94.0 [node name="right_colorpicker_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 +margin_left = 227.0 margin_top = 74.0 -margin_right = 313.0 +margin_right = 307.0 margin_bottom = 94.0 [node name="PencilLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] @@ -574,13 +608,13 @@ text = "Pencil" [node name="left_pencil_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 margin_top = 98.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 118.0 [node name="right_pencil_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 +margin_left = 227.0 margin_top = 98.0 -margin_right = 313.0 +margin_right = 307.0 margin_bottom = 118.0 [node name="EraserLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] @@ -592,13 +626,13 @@ text = "Eraser" [node name="left_eraser_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 margin_top = 122.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 142.0 [node name="right_eraser_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 +margin_left = 227.0 margin_top = 122.0 -margin_right = 313.0 +margin_right = 307.0 margin_bottom = 142.0 [node name="BucketLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] @@ -610,13 +644,13 @@ text = "Bucket" [node name="left_fill_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 margin_top = 146.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 166.0 [node name="right_fill_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 +margin_left = 227.0 margin_top = 146.0 -margin_right = 313.0 +margin_right = 307.0 margin_bottom = 166.0 [node name="LightenDarkenLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] @@ -628,13 +662,13 @@ text = "Lighten/Darken" [node name="left_lightdark_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] margin_left = 142.0 margin_top = 170.0 -margin_right = 225.0 +margin_right = 222.0 margin_bottom = 190.0 [node name="right_lightdark_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"] -margin_left = 230.0 +margin_left = 227.0 margin_top = 170.0 -margin_right = 313.0 +margin_right = 307.0 margin_bottom = 190.0 [node name="Popups" type="Node" parent="."] @@ -669,10 +703,10 @@ __meta__ = { [connection signal="toggled" from="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer/LeftToolIconCheckbox" to="." method="_on_LeftToolIconCheckbox_toggled"] [connection signal="toggled" from="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer/RightToolIconCheckbox" to="." method="_on_RightToolIconCheckbox_toggled"] [connection signal="item_selected" from="HSplitContainer/ScrollContainer/VBoxContainer/General/PressureSentivity/PressureSensitivityOptionButton" to="." method="_on_PressureSensitivityOptionButton_item_selected"] +[connection signal="color_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GuideOptions/GuideColor" to="." method="_on_GuideColor_color_changed"] [connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridWidthValue" to="." method="_on_GridWidthValue_value_changed"] [connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridHeightValue" to="." method="_on_GridHeightValue_value_changed"] [connection signal="color_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridColor" to="." method="_on_GridColor_color_changed"] -[connection signal="color_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GuideColor" to="." method="_on_GuideColor_color_changed"] [connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions/ImageDefaultWidth" to="." method="_on_ImageDefaultWidth_value_changed"] [connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions/ImageDefaultHeight" to="." method="_on_ImageDefaultHeight_value_changed"] [connection signal="color_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions/DefaultFillColor" to="." method="_on_DefaultBackground_color_changed"] diff --git a/Scripts/Dialogs/PreferencesDialog.gd b/Scripts/Dialogs/PreferencesDialog.gd index 1f94d8873..2e94a5966 100644 --- a/Scripts/Dialogs/PreferencesDialog.gd +++ b/Scripts/Dialogs/PreferencesDialog.gd @@ -21,7 +21,7 @@ onready var default_fill_color = $HSplitContainer/ScrollContainer/VBoxContainer/ onready var grid_width_value = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridWidthValue" onready var grid_height_value = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridHeightValue" onready var grid_color = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridColor" -onready var guide_color = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GuideColor" +onready var guide_color = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GuideOptions/GuideColor" # Shortcuts onready var theme_font_color : Color = $Popups/ShortcutSelector/EnteredShortcut.get_color("font_color") @@ -48,10 +48,10 @@ func _ready() -> void: if Global.config_cache.has_section_key("preferences", "theme"): var theme_id = Global.config_cache.get_value("preferences", "theme") change_theme(theme_id) - themes.get_child(theme_id + 1).pressed = true + themes.get_child(theme_id).pressed = true else: change_theme(0) - themes.get_child(1).pressed = true + themes.get_child(0).pressed = true # Set default values for General options if Global.config_cache.has_section_key("preferences", "smooth_zoom"): diff --git a/Scripts/Main.gd b/Scripts/Main.gd index 803d27433..ae3ad318c 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -87,8 +87,8 @@ func _ready() -> void: # Set the language option menu's default selected option to the loaded locale var locale_index: int = Global.loaded_locales.find(saved_locale) - $PreferencesDialog.languages.get_child(1).pressed = false - $PreferencesDialog.languages.get_child(locale_index + 2).pressed = true + $PreferencesDialog.languages.get_child(0).pressed = false # Unset System Language option in preferences + $PreferencesDialog.languages.get_child(locale_index + 1).pressed = true else: # If the user doesn't have a language preference, set it to their OS' locale TranslationServer.set_locale(OS.get_locale()) diff --git a/Translations/Translations.pot b/Translations/Translations.pot index e0c46b3de..c0665301b 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -266,10 +266,10 @@ msgstr "" msgid "Shortcuts" msgstr "" -msgid "General Options" +msgid "Smooth Zoom" msgstr "" -msgid "Smooth Zoom" +msgid "Adds a smoother transition when zooming in or out" msgstr "" msgid "Tablet pressure sensitivity:" @@ -281,15 +281,6 @@ msgstr "" msgid "Affect Brush's Alpha" msgstr "" -msgid "Language options" -msgstr "" - -msgid "Theme options" -msgstr "" - -msgid "Grid options" -msgstr "" - msgid "Color:" msgstr "" @@ -513,13 +504,46 @@ msgstr "" msgid "Show left mouse pixel indicator or brush on the canvas when drawing" msgstr "" +msgid "Right pixel indicator" +msgstr "" + msgid "Show right mouse pixel indicator or brush on the canvas when drawing" msgstr "" -msgid "Show tool icon" +msgid "Show left tool icon" msgstr "" -msgid "Right pixel indicator" +msgid "Displays an icon of the selected left tool next to the cursor on the canvas" +msgstr "" + +msgid "Show right tool icon" +msgstr "" + +msgid "Displays an icon of the selected right tool next to the cursor on the canvas" +msgstr "" + +msgid "Guides color:" +msgstr "" + +msgid "A color of ruler guides displayed on the canvas" +msgstr "" + +msgid "Grid width:" +msgstr "" + +msgid "Sets how far apart are vertical lines of the grid" +msgstr "" + +msgid "Grid height:" +msgstr "" + +msgid "Grid color:" +msgstr "" + +msgid "A color of the grid" +msgstr "" + +msgid "Only custom preset can be modified" msgstr "" msgid "Brush:" @@ -891,13 +915,22 @@ msgstr "" msgid "Image Options" msgstr "" -msgid "Default Width:" +msgid "Default width:" msgstr "" -msgid "Default Height:" +msgid "A default width of a new image" msgstr "" -msgid "Default Fill Color:" +msgid "Default height:" +msgstr "" + +msgid "A default height of a new image" +msgstr "" + +msgid "Default fill color:" +msgstr "" + +msgid "A default background color of a new image" msgstr "" msgid "Lock aspect ratio:" @@ -947,3 +980,15 @@ msgstr "" msgid "Already assigned" msgstr "" + +msgid "Left Tool:" +msgstr "" + +msgid "A tool assigned to the left mouse button" +msgstr "" + +msgid "Right Tool:" +msgstr "" + +msgid "A tool assigned to the right mouse button" +msgstr ""