diff --git a/Translations/Translations.pot b/Translations/Translations.pot index f16379798..3509b8221 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -353,6 +353,9 @@ msgstr "" msgid "Language" msgstr "" +msgid "Interface" +msgstr "" + msgid "Themes" msgstr "" @@ -398,6 +401,9 @@ msgstr "" msgid "System Language" msgstr "" +msgid "Shrink GUI" +msgstr "" + msgid "Dark" msgstr "" diff --git a/src/Preferences/PreferencesDialog.gd b/src/Preferences/PreferencesDialog.gd index f03e4047a..5494f1daa 100644 --- a/src/Preferences/PreferencesDialog.gd +++ b/src/Preferences/PreferencesDialog.gd @@ -3,7 +3,7 @@ extends AcceptDialog # Preferences table: [Prop name in Global, relative node path, value type, default value] var preferences = [ ["open_last_project", "Startup/StartupContainer/OpenLastProject", "pressed", Global.open_last_project], - ["shrink", "Startup/ShrinkContainer/ShrinkHSlider", "value", Global.shrink], + ["shrink", "Interface/ShrinkContainer/ShrinkHSlider", "value", Global.shrink], ["smooth_zoom", "Canvas/ZoomOptions/SmoothZoom", "pressed", Global.smooth_zoom], ["pressure_sensitivity_mode", "Startup/PressureSentivity/PressureSensitivityOptionButton", "selected", Global.pressure_sensitivity_mode], ["show_left_tool_icon", "Indicators/IndicatorsContainer/LeftToolIconCheckbox", "pressed", Global.show_left_tool_icon], @@ -37,7 +37,7 @@ onready var list : ItemList = $HSplitContainer/List onready var right_side : VBoxContainer = $HSplitContainer/ScrollContainer/VBoxContainer onready var autosave_interval : SpinBox = $HSplitContainer/ScrollContainer/VBoxContainer/Backup/AutosaveContainer/AutosaveInterval onready var restore_default_button_scene = preload("res://src/Preferences/RestoreDefaultButton.tscn") -onready var shrink_label : Label = $HSplitContainer/ScrollContainer/VBoxContainer/Startup/ShrinkContainer/ShrinkLabel +onready var shrink_label : Label = $HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer/ShrinkLabel func _ready() -> void: @@ -152,7 +152,7 @@ func _on_PreferencesDialog_about_to_show(changed_language := false) -> void: if OS.get_name() != "HTML5": list.add_item(" " + tr("Startup")) list.add_item(" " + tr("Language")) - list.add_item(" " + tr("Themes")) + list.add_item(" " + tr("Interface")) list.add_item(" " + tr("Canvas")) list.add_item(" " + tr("Image")) list.add_item(" " + tr("Shortcuts")) @@ -170,7 +170,7 @@ func _on_PreferencesDialog_popup_hide() -> void: func _on_List_item_selected(index : int) -> void: selected_item = index for child in right_side.get_children(): - var content_list = ["Startup", "Languages", "Themes", "Canvas", "Image", "Shortcuts", "Backup", "Indicators"] + var content_list = ["Startup", "Languages", "Interface", "Canvas", "Image", "Shortcuts", "Backup", "Indicators"] if OS.get_name() == "HTML5": content_list.erase("Startup") child.visible = child.name == content_list[index] diff --git a/src/Preferences/PreferencesDialog.tscn b/src/Preferences/PreferencesDialog.tscn index 83616ee93..038c47d62 100644 --- a/src/Preferences/PreferencesDialog.tscn +++ b/src/Preferences/PreferencesDialog.tscn @@ -51,12 +51,12 @@ size_flags_horizontal = 3 [node name="VBoxContainer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer"] margin_right = 498.0 -margin_bottom = 48.0 +margin_bottom = 24.0 size_flags_horizontal = 3 [node name="Startup" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] margin_right = 498.0 -margin_bottom = 48.0 +margin_bottom = 24.0 [node name="StartupContainer" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup"] margin_right = 498.0 @@ -96,44 +96,6 @@ text = "Affect Brush's Alpha" items = [ "None", null, false, 0, null, "Affect Brush's Alpha", null, false, 1, null ] selected = 1 -[node name="ShrinkContainer" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup"] -margin_top = 28.0 -margin_right = 498.0 -margin_bottom = 48.0 - -[node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup/ShrinkContainer"] -margin_top = 3.0 -margin_right = 68.0 -margin_bottom = 17.0 -text = "Shrink GUI" - -[node name="ShrinkLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup/ShrinkContainer"] -margin_left = 72.0 -margin_top = 3.0 -margin_right = 122.0 -margin_bottom = 17.0 -rect_min_size = Vector2( 50, 0 ) -text = "1" -align = 2 - -[node name="ShrinkHSlider" type="HSlider" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup/ShrinkContainer"] -margin_left = 126.0 -margin_right = 446.0 -margin_bottom = 16.0 -size_flags_horizontal = 3 -min_value = 1.0 -max_value = 4.0 -step = 0.5 -value = 1.0 -tick_count = 7 -ticks_on_borders = true - -[node name="ShrinkApplyButton" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup/ShrinkContainer"] -margin_left = 450.0 -margin_right = 498.0 -margin_bottom = 20.0 -text = "Apply" - [node name="Languages" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] visible = false margin_top = 184.0 @@ -149,24 +111,80 @@ pressed = true group = SubResource( 1 ) text = "System Language" -[node name="Themes" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] +[node name="Interface" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] visible = false +margin_top = 28.0 margin_right = 498.0 +margin_bottom = 66.0 + +[node name="ShrinkContainer" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] +margin_right = 498.0 +margin_bottom = 20.0 + +[node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer"] +margin_top = 3.0 +margin_right = 68.0 +margin_bottom = 17.0 +text = "Shrink GUI" + +[node name="ShrinkLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer"] +margin_left = 72.0 +margin_top = 3.0 +margin_right = 122.0 +margin_bottom = 17.0 +rect_min_size = Vector2( 50, 0 ) +text = "1" +align = 2 + +[node name="ShrinkHSlider" type="HSlider" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer"] +margin_left = 126.0 +margin_right = 446.0 +margin_bottom = 16.0 +mouse_default_cursor_shape = 2 +size_flags_horizontal = 3 +min_value = 1.0 +max_value = 4.0 +step = 0.5 +value = 1.0 +tick_count = 7 +ticks_on_borders = true + +[node name="ShrinkApplyButton" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer"] +margin_left = 450.0 +margin_right = 498.0 +margin_bottom = 20.0 +mouse_default_cursor_shape = 2 +text = "Apply" + +[node name="HSeparator" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] +margin_right = 40.0 +margin_bottom = 4.0 + +[node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] +margin_top = 24.0 +margin_right = 498.0 +margin_bottom = 38.0 +text = "Themes" + +[node name="Themes" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface"] +margin_top = 52.0 +margin_right = 498.0 +margin_bottom = 56.0 script = ExtResource( 5 ) -[node name="ThemeButtons" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"] +[node name="ThemeButtons" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/Themes"] +margin_bottom = 4.0 -[node name="ThemeColorsSpacer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"] -margin_right = 40.0 -margin_bottom = 40.0 - -[node name="Control" type="Control" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes/ThemeColorsSpacer"] -margin_right = 40.0 -margin_bottom = 40.0 - -[node name="ThemeColors" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes/ThemeColorsSpacer"] +[node name="ThemeColorsSpacer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/Themes"] margin_left = 4.0 margin_right = 4.0 +margin_bottom = 4.0 + +[node name="Control" type="Control" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/Themes/ThemeColorsSpacer"] + +[node name="ThemeColors" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Interface/Themes/ThemeColorsSpacer"] +margin_top = 4.0 +margin_bottom = 4.0 custom_constants/separation = 12 [node name="Canvas" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] @@ -977,8 +995,8 @@ __meta__ = { [connection signal="about_to_show" from="." to="." method="_on_PreferencesDialog_about_to_show"] [connection signal="popup_hide" from="." to="." method="_on_PreferencesDialog_popup_hide"] [connection signal="item_selected" from="HSplitContainer/List" to="." method="_on_List_item_selected"] -[connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Startup/ShrinkContainer/ShrinkHSlider" to="." method="_on_HSlider_value_changed"] -[connection signal="pressed" from="HSplitContainer/ScrollContainer/VBoxContainer/Startup/ShrinkContainer/ShrinkApplyButton" to="." method="_on_ShrinkApplyButton_pressed"] +[connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer/ShrinkHSlider" to="." method="_on_HSlider_value_changed"] +[connection signal="pressed" from="HSplitContainer/ScrollContainer/VBoxContainer/Interface/ShrinkContainer/ShrinkApplyButton" to="." method="_on_ShrinkApplyButton_pressed"] [connection signal="item_selected" from="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer/PresetOptionButton" to="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts" method="_on_PresetOptionButton_item_selected"] [connection signal="confirmed" from="Popups/ShortcutSelector" to="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts" method="_on_ShortcutSelector_confirmed"] [connection signal="popup_hide" from="Popups/ShortcutSelector" to="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts" method="_on_ShortcutSelector_popup_hide"]