diff --git a/Translations/Translations.pot b/Translations/Translations.pot index 7c58adfa8..08cd1617a 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -335,6 +335,9 @@ msgstr "" msgid "General" msgstr "" +msgid "Startup" +msgstr "" + msgid "Language" msgstr "" @@ -347,6 +350,15 @@ msgstr "" msgid "Shortcuts" msgstr "" +msgid "Backup" +msgstr "" + +msgid "Indicators" +msgstr "" + +msgid "On" +msgstr "" + msgid "Smooth Zoom" msgstr "" @@ -675,12 +687,18 @@ msgstr "" msgid "Displays an icon of the selected right tool next to the cursor on the canvas" msgstr "" +msgid "Guides" +msgstr "" + msgid "Guides color:" msgstr "" msgid "A color of ruler guides displayed on the canvas" msgstr "" +msgid "Grid" +msgstr "" + msgid "Grid width:" msgstr "" @@ -699,6 +717,9 @@ msgstr "" msgid "A color of the grid" msgstr "" +msgid "Transparency" +msgstr "" + msgid "Checker size:" msgstr "" diff --git a/assets/themes/caramel/theme.tres b/assets/themes/caramel/theme.tres index 862e74342..04cd000b3 100644 --- a/assets/themes/caramel/theme.tres +++ b/assets/themes/caramel/theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=37 format=2] +[gd_resource type="Theme" load_steps=38 format=2] [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] [ext_resource path="res://assets/themes/light/icons/grabber.png" type="Texture" id=2] @@ -177,6 +177,18 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false +[sub_resource type="StyleBoxFlat" id=31] +bg_color = Color( 0.392157, 0.329412, 0.207843, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.2, 0.2, 0.2, 1 ) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + [sub_resource type="StyleBoxFlat" id=19] bg_color = Color( 0.854902, 0.74902, 0.494118, 1 ) @@ -402,7 +414,7 @@ LineEdit/fonts/font = null LineEdit/icons/clear = null LineEdit/styles/focus = null LineEdit/styles/normal = SubResource( 18 ) -LineEdit/styles/read_only = null +LineEdit/styles/read_only = SubResource( 31 ) MenuButton/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) diff --git a/assets/themes/dark/theme.tres b/assets/themes/dark/theme.tres index 87969514c..778865252 100644 --- a/assets/themes/dark/theme.tres +++ b/assets/themes/dark/theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=42 format=2] +[gd_resource type="Theme" load_steps=43 format=2] [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] [ext_resource path="res://assets/themes/dark/icons/grabber.png" type="Texture" id=2] @@ -197,6 +197,18 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false +[sub_resource type="StyleBoxFlat" id=36] +bg_color = Color( 0.129412, 0.129412, 0.129412, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.2, 0.2, 0.2, 1 ) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + [sub_resource type="StyleBoxFlat" id=22] content_margin_left = 0.0 content_margin_right = 0.0 @@ -267,6 +279,7 @@ border_width_top = 6 border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.321569, 0.321569, 0.321569, 1 ) +expand_margin_bottom = 3.0 [sub_resource type="StyleBoxFlat" id=30] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) @@ -284,6 +297,7 @@ border_width_top = 6 border_width_right = 10 border_width_bottom = 8 border_color = Color( 0.2, 0.2, 0.2, 1 ) +expand_margin_bottom = 3.0 [sub_resource type="StyleBoxFlat" id=32] bg_color = Color( 0.321569, 0.321569, 0.321569, 1 ) @@ -454,7 +468,7 @@ LineEdit/fonts/font = null LineEdit/icons/clear = null LineEdit/styles/focus = null LineEdit/styles/normal = SubResource( 21 ) -LineEdit/styles/read_only = null +LineEdit/styles/read_only = SubResource( 36 ) MenuButton/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) diff --git a/assets/themes/gray/theme.tres b/assets/themes/gray/theme.tres index 73a9b2343..f1ff5393b 100644 --- a/assets/themes/gray/theme.tres +++ b/assets/themes/gray/theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=37 format=2] +[gd_resource type="Theme" load_steps=38 format=2] [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=1] [ext_resource path="res://assets/themes/dark/icons/grabber.png" type="Texture" id=2] @@ -190,6 +190,18 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false +[sub_resource type="StyleBoxFlat" id=31] +bg_color = Color( 0.129412, 0.129412, 0.129412, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.2, 0.2, 0.2, 1 ) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + [sub_resource type="StyleBoxFlat" id=20] bg_color = Color( 0.180392, 0.180392, 0.180392, 1 ) @@ -405,7 +417,7 @@ LineEdit/fonts/font = null LineEdit/icons/clear = null LineEdit/styles/focus = null LineEdit/styles/normal = SubResource( 19 ) -LineEdit/styles/read_only = null +LineEdit/styles/read_only = SubResource( 31 ) MenuButton/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) diff --git a/assets/themes/light/theme.tres b/assets/themes/light/theme.tres index f4457f0ee..c0ee3b80f 100644 --- a/assets/themes/light/theme.tres +++ b/assets/themes/light/theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=39 format=2] +[gd_resource type="Theme" load_steps=40 format=2] [ext_resource path="res://assets/themes/light/icons/hsplit.png" type="Texture" id=1] [ext_resource path="res://assets/themes/light/icons/grabber.png" type="Texture" id=2] @@ -200,6 +200,18 @@ corner_radius_bottom_right = 4 corner_radius_bottom_left = 4 anti_aliasing = false +[sub_resource type="StyleBoxFlat" id=33] +bg_color = Color( 0.541176, 0.541176, 0.541176, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.2, 0.2, 0.2, 1 ) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + [sub_resource type="StyleBoxFlat" id=21] bg_color = Color( 0.772549, 0.772549, 0.772549, 1 ) @@ -425,7 +437,7 @@ LineEdit/fonts/font = null LineEdit/icons/clear = null LineEdit/styles/focus = null LineEdit/styles/normal = SubResource( 20 ) -LineEdit/styles/read_only = null +LineEdit/styles/read_only = SubResource( 33 ) MenuButton/colors/font_color = Color( 0, 0, 0, 1 ) MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) MenuButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index 3a34e9a40..bf6f4af08 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -33,9 +33,6 @@ var layers_changed_skip := false var can_draw := false var has_focus := false -var pressure_sensitivity_mode = Pressure_Sensitivity.NONE -var open_last_project := false -var smooth_zoom := true var cursor_image = preload("res://assets/graphics/cursor_icons/cursor.png") var left_cursor_tool_texture := ImageTexture.new() var right_cursor_tool_texture := ImageTexture.new() @@ -46,6 +43,9 @@ var show_x_symmetry_axis := false var show_y_symmetry_axis := false # Preferences +var pressure_sensitivity_mode = Pressure_Sensitivity.NONE +var open_last_project := false +var smooth_zoom := true var theme_type : int = Theme_Types.DARK var default_image_width := 64 var default_image_height := 64 diff --git a/src/Main.gd b/src/Main.gd index 259917c3e..3a21ae761 100644 --- a/src/Main.gd +++ b/src/Main.gd @@ -124,6 +124,8 @@ func _on_files_dropped(_files : PoolStringArray, _screen : int) -> void: func load_last_project() -> void: + if OS.get_name() == "HTML5": + return # Check if any project was saved or opened last time if Global.config_cache.has_section_key("preferences", "last_project_path"): # Check if file still exists on disk diff --git a/src/Preferences/PreferencesDialog.gd b/src/Preferences/PreferencesDialog.gd index 3a996ddcc..57a1772d0 100644 --- a/src/Preferences/PreferencesDialog.gd +++ b/src/Preferences/PreferencesDialog.gd @@ -2,15 +2,15 @@ extends AcceptDialog # Preferences table: [Prop name in Global, relative node path, value type] var preferences = [ - ["open_last_project", "General/OpenLastProject", "pressed"], - ["smooth_zoom", "General/SmoothZoom", "pressed"], - ["pressure_sensitivity_mode", "General/PressureSentivity/PressureSensitivityOptionButton", "selected"], - ["show_left_tool_icon", "General/GridContainer/LeftToolIconCheckbox", "pressed"], - ["show_right_tool_icon", "General/GridContainer/RightToolIconCheckbox", "pressed"], - ["left_square_indicator_visible", "General/GridContainer/LeftIndicatorCheckbox", "pressed"], - ["right_square_indicator_visible", "General/GridContainer/RightIndicatorCheckbox", "pressed"], - ["autosave_interval", "General/AutosaveInterval/AutosaveInterval", "value"], - ["enable_autosave", "General/EnableAutosave", "pressed"], + ["open_last_project", "Startup/StartupContainer/OpenLastProject", "pressed"], + ["smooth_zoom", "Canvas/SmoothZoom", "pressed"], + ["pressure_sensitivity_mode", "Startup/PressureSentivity/PressureSensitivityOptionButton", "selected"], + ["show_left_tool_icon", "Indicators/IndicatorsContainer/LeftToolIconCheckbox", "pressed"], + ["show_right_tool_icon", "Indicators/IndicatorsContainer/RightToolIconCheckbox", "pressed"], + ["left_square_indicator_visible", "Indicators/IndicatorsContainer/LeftIndicatorCheckbox", "pressed"], + ["right_square_indicator_visible", "Indicators/IndicatorsContainer/RightIndicatorCheckbox", "pressed"], + ["autosave_interval", "Backup/AutosaveContainer/AutosaveInterval", "value"], + ["enable_autosave", "Backup/AutosaveContainer/EnableAutosave", "pressed"], ["default_image_width", "Image/ImageOptions/ImageDefaultWidth", "value"], ["default_image_height", "Image/ImageOptions/ImageDefaultHeight", "value"], @@ -29,7 +29,7 @@ var selected_item := 0 onready var list : ItemList = $HSplitContainer/List onready var right_side : VBoxContainer = $HSplitContainer/ScrollContainer/VBoxContainer -onready var general = $HSplitContainer/ScrollContainer/VBoxContainer/General +onready var autosave_interval : SpinBox = $HSplitContainer/ScrollContainer/VBoxContainer/Backup/AutosaveContainer/AutosaveInterval func _ready() -> void: @@ -37,7 +37,8 @@ func _ready() -> void: get_ok().text = tr("Close") if OS.get_name() == "HTML5": - right_side.get_node("General/OpenLastProject").visible = false + right_side.get_node("Startup").queue_free() + right_side.get_node("Languages").visible = true Global.open_last_project = false for pref in preferences: @@ -87,6 +88,11 @@ func _on_Preference_item_selected(id : int, prop : String) -> void: func preference_update(prop : String) -> void: if prop in ["autosave_interval", "enable_autosave"]: OpenSave.update_autosave() + autosave_interval.editable = Global.enable_autosave + if autosave_interval.editable: + autosave_interval.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND + else: + autosave_interval.mouse_default_cursor_shape = Control.CURSOR_FORBIDDEN if prop in ["grid_width", "grid_height", "grid_color"]: Global.canvas.update() @@ -103,22 +109,28 @@ func preference_update(prop : String) -> void: func _on_PreferencesDialog_about_to_show(changed_language := false) -> void: - list.add_item(" " + tr("General")) + if OS.get_name() != "HTML5": + list.add_item(" " + tr("Startup")) list.add_item(" " + tr("Language")) list.add_item(" " + tr("Themes")) list.add_item(" " + tr("Canvas")) list.add_item(" " + tr("Image")) list.add_item(" " + tr("Shortcuts")) + list.add_item(" " + tr("Backup")) + list.add_item(" " + tr("Indicators")) list.select(1 if changed_language else selected_item) - general.get_node("AutosaveInterval/AutosaveInterval").suffix = tr("minute(s)") + autosave_interval.suffix = tr("minute(s)") func _on_PreferencesDialog_popup_hide() -> void: list.clear() -func _on_List_item_selected(index) -> void: +func _on_List_item_selected(index : int) -> void: selected_item = index for child in right_side.get_children(): - child.visible = child.name == ["General", "Languages", "Themes", "Canvas", "Image", "Shortcuts"][index] + var content_list = ["Startup", "Languages", "Themes", "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 15239d70b..04189c6f2 100644 --- a/src/Preferences/PreferencesDialog.tscn +++ b/src/Preferences/PreferencesDialog.tscn @@ -35,6 +35,7 @@ margin_right = -8.0 margin_bottom = -36.0 size_flags_horizontal = 3 custom_constants/autohide = 0 +custom_constants/separation = 20 split_offset = 1 __meta__ = { "_edit_use_anchors_": false @@ -46,99 +47,52 @@ margin_bottom = 1110.0 rect_min_size = Vector2( 85, 0 ) [node name="ScrollContainer" type="ScrollContainer" parent="HSplitContainer"] -margin_left = 98.0 +margin_left = 106.0 margin_right = 604.0 margin_bottom = 1110.0 rect_min_size = Vector2( 100, 0 ) size_flags_horizontal = 3 [node name="VBoxContainer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer"] -margin_right = 506.0 -margin_bottom = 180.0 -size_flags_horizontal = 3 - -[node name="General" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] -margin_right = 506.0 -margin_bottom = 180.0 - -[node name="SmoothZoom" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_right = 506.0 +margin_right = 498.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" +size_flags_horizontal = 3 -[node name="HSeparator2" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_top = 28.0 -margin_right = 506.0 -margin_bottom = 32.0 - -[node name="GridContainer" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_top = 36.0 -margin_right = 506.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 = 251.0 +[node name="Startup" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] +margin_right = 498.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 = 255.0 -margin_right = 506.0 +[node name="StartupContainer" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup"] +margin_right = 498.0 margin_bottom = 24.0 -hint_tooltip = "Show right mouse pixel indicator or brush on the canvas when drawing" + +[node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup/StartupContainer"] +margin_top = 5.0 +margin_right = 180.0 +margin_bottom = 19.0 +text = "Open last project on startup" + +[node name="OpenLastProject" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup/StartupContainer"] +margin_left = 184.0 +margin_right = 231.0 +margin_bottom = 24.0 +hint_tooltip = "Opens last opened project on startup" mouse_default_cursor_shape = 2 -size_flags_horizontal = 3 -text = "Right pixel indicator" +text = "On" -[node name="LeftToolIconCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer"] -margin_top = 28.0 -margin_right = 251.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 = 255.0 -margin_top = 28.0 -margin_right = 506.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" - -[node name="HSeparator3" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_top = 92.0 -margin_right = 506.0 -margin_bottom = 96.0 - -[node name="PressureSentivity" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] +[node name="PressureSentivity" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup"] visible = false margin_top = 100.0 margin_right = 506.0 margin_bottom = 120.0 -[node name="PressureSensitivityLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/PressureSentivity"] +[node name="PressureSensitivityLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup/PressureSentivity"] margin_top = 3.0 margin_right = 173.0 margin_bottom = 17.0 text = "Tablet pressure sensitivity:" -[node name="PressureSensitivityOptionButton" type="OptionButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/PressureSentivity"] +[node name="PressureSensitivityOptionButton" type="OptionButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Startup/PressureSentivity"] margin_left = 177.0 margin_right = 334.0 margin_bottom = 20.0 @@ -146,55 +100,6 @@ text = "Affect Brush's Alpha" items = [ "None", null, false, 0, null, "Affect Brush's Alpha", null, false, 1, null ] selected = 1 -[node name="OpenLastProject" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_top = 100.0 -margin_right = 506.0 -margin_bottom = 124.0 -hint_tooltip = "Opens last opened project on startup" -mouse_default_cursor_shape = 2 -text = "Open last project on startup" - -[node name="EnableAutosave" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_top = 128.0 -margin_right = 506.0 -margin_bottom = 152.0 -mouse_default_cursor_shape = 2 -pressed = true -text = "Enable autosave" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="AutosaveInterval" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"] -margin_top = 156.0 -margin_right = 506.0 -margin_bottom = 180.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="AutosaveIntervalLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/AutosaveInterval"] -margin_top = 5.0 -margin_right = 115.0 -margin_bottom = 19.0 -text = "Autosave interval:" - -[node name="AutosaveInterval" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/AutosaveInterval"] -margin_left = 119.0 -margin_right = 506.0 -margin_bottom = 24.0 -mouse_default_cursor_shape = 2 -size_flags_horizontal = 3 -min_value = 0.1 -max_value = 30.0 -step = 0.25 -value = 1.0 -align = 2 -suffix = "minute(s)" -__meta__ = { -"_edit_use_anchors_": false -} - [node name="Languages" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] visible = false margin_top = 184.0 @@ -381,12 +286,38 @@ text = "Light" [node name="Canvas" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] visible = false margin_top = 184.0 -margin_right = 506.0 -margin_bottom = 376.0 +margin_right = 498.0 +margin_bottom = 484.0 + +[node name="ZoomLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] +margin_right = 498.0 +margin_bottom = 14.0 +text = "Zoom" + +[node name="SmoothZoom" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] +margin_top = 18.0 +margin_right = 498.0 +margin_bottom = 42.0 +hint_tooltip = "Adds a smoother transition when zooming in or out" +mouse_default_cursor_shape = 2 +pressed = true +text = "Smooth Zoom" + +[node name="HSeparator" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] +margin_top = 46.0 +margin_right = 498.0 +margin_bottom = 50.0 + +[node name="GuideLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] +margin_top = 54.0 +margin_right = 498.0 +margin_bottom = 68.0 +text = "Guides" [node name="GuideOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] -margin_right = 506.0 -margin_bottom = 20.0 +margin_top = 72.0 +margin_right = 498.0 +margin_bottom = 92.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 2 @@ -402,23 +333,28 @@ text = "Guides color:" [node name="GuideColor" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas/GuideOptions"] margin_left = 114.0 -margin_right = 506.0 +margin_right = 178.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/Canvas"] -margin_top = 24.0 -margin_right = 506.0 -margin_bottom = 28.0 +[node name="HSeparator2" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] +margin_top = 96.0 +margin_right = 498.0 +margin_bottom = 100.0 + +[node name="GridLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] +margin_top = 104.0 +margin_right = 498.0 +margin_bottom = 118.0 +text = "Grid" [node name="GridOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] -margin_top = 32.0 -margin_right = 506.0 -margin_bottom = 108.0 +margin_top = 122.0 +margin_right = 498.0 +margin_bottom = 198.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 2 @@ -434,7 +370,7 @@ text = "Grid width:" [node name="GridWidthValue" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas/GridOptions"] margin_left = 114.0 -margin_right = 506.0 +margin_right = 188.0 margin_bottom = 24.0 hint_tooltip = "Sets how far apart are vertical lines of the grid" mouse_default_cursor_shape = 2 @@ -456,11 +392,10 @@ text = "Grid height:" [node name="GridHeightValue" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas/GridOptions"] margin_left = 114.0 margin_top = 28.0 -margin_right = 506.0 +margin_right = 188.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 @@ -479,21 +414,27 @@ text = "Grid color:" [node name="GridColor" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas/GridOptions"] margin_left = 114.0 margin_top = 56.0 -margin_right = 506.0 +margin_right = 188.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="HSeparator2" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] -margin_top = 112.0 -margin_right = 506.0 -margin_bottom = 116.0 +[node name="HSeparator3" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] +margin_top = 202.0 +margin_right = 498.0 +margin_bottom = 206.0 + +[node name="TransparencyLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] +margin_top = 210.0 +margin_right = 498.0 +margin_bottom = 224.0 +text = "Transparency" [node name="CheckerOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas"] -margin_top = 120.0 -margin_right = 506.0 -margin_bottom = 192.0 +margin_top = 228.0 +margin_right = 498.0 +margin_bottom = 300.0 custom_constants/vseparation = 4 custom_constants/hseparation = 4 columns = 2 @@ -509,11 +450,10 @@ text = "Checker size:" [node name="CheckerSizeValue" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas/CheckerOptions"] margin_left = 114.0 -margin_right = 506.0 +margin_right = 188.0 margin_bottom = 24.0 hint_tooltip = "Size of the transparent checker background" mouse_default_cursor_shape = 2 -size_flags_horizontal = 3 min_value = 1.0 max_value = 16384.0 value = 10.0 @@ -532,7 +472,7 @@ text = "Checker color 1:" [node name="CheckerColor1" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas/CheckerOptions"] margin_left = 114.0 margin_top = 28.0 -margin_right = 506.0 +margin_right = 188.0 margin_bottom = 48.0 rect_min_size = Vector2( 64, 20 ) hint_tooltip = "First color of the transparent checker background" @@ -550,7 +490,7 @@ text = "Checker color 2:" [node name="CheckerColor2" type="ColorPickerButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Canvas/CheckerOptions"] margin_left = 114.0 margin_top = 52.0 -margin_right = 506.0 +margin_right = 188.0 margin_bottom = 72.0 rect_min_size = Vector2( 64, 20 ) hint_tooltip = "Second color of the transparent checker background" @@ -559,9 +499,9 @@ color = Color( 0.341176, 0.34902, 0.341176, 1 ) [node name="Image" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] visible = false -margin_top = 184.0 +margin_top = 240.0 margin_right = 506.0 -margin_bottom = 260.0 +margin_bottom = 316.0 [node name="ImageOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image"] margin_right = 506.0 @@ -581,11 +521,10 @@ text = "Default width:" [node name="ImageDefaultWidth" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions"] margin_left = 114.0 -margin_right = 506.0 +margin_right = 188.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 = 64.0 @@ -604,7 +543,7 @@ text = "Default height:" [node name="ImageDefaultHeight" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions"] margin_left = 114.0 margin_top = 28.0 -margin_right = 506.0 +margin_right = 188.0 margin_bottom = 52.0 hint_tooltip = "A default height of a new image" mouse_default_cursor_shape = 2 @@ -626,7 +565,7 @@ 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 = 506.0 +margin_right = 188.0 margin_bottom = 76.0 rect_min_size = Vector2( 64, 20 ) hint_tooltip = "A default background color of a new image" @@ -880,6 +819,140 @@ margin_top = 182.0 margin_right = 321.0 margin_bottom = 202.0 +[node name="Backup" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] +visible = false +margin_top = 184.0 +margin_right = 498.0 +margin_bottom = 254.0 + +[node name="AutosaveContainer" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Backup"] +margin_top = 18.0 +margin_right = 498.0 +margin_bottom = 70.0 +columns = 2 + +[node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Backup/AutosaveContainer"] +margin_top = 5.0 +margin_right = 115.0 +margin_bottom = 19.0 +text = "Enable autosave" + +[node name="EnableAutosave" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Backup/AutosaveContainer"] +margin_left = 119.0 +margin_right = 214.0 +margin_bottom = 24.0 +mouse_default_cursor_shape = 2 +pressed = true +text = "On" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="AutosaveIntervalLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Backup/AutosaveContainer"] +margin_top = 33.0 +margin_right = 115.0 +margin_bottom = 47.0 +size_flags_horizontal = 0 +text = "Autosave interval:" + +[node name="AutosaveInterval" type="SpinBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Backup/AutosaveContainer"] +margin_left = 119.0 +margin_top = 28.0 +margin_right = 214.0 +margin_bottom = 52.0 +rect_min_size = Vector2( 95, 0 ) +mouse_default_cursor_shape = 2 +size_flags_horizontal = 0 +min_value = 0.1 +max_value = 30.0 +step = 0.25 +value = 1.0 +align = 2 +suffix = "minute(s)" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Indicators" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"] +visible = false +margin_top = 54.0 +margin_right = 498.0 +margin_bottom = 180.0 + +[node name="IndicatorsContainer" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators"] +margin_top = 18.0 +margin_right = 498.0 +margin_bottom = 126.0 +custom_constants/vseparation = 4 +custom_constants/hseparation = 4 +columns = 2 + +[node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators/IndicatorsContainer"] +margin_top = 5.0 +margin_right = 127.0 +margin_bottom = 19.0 +text = "Left pixel indicator" + +[node name="LeftIndicatorCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators/IndicatorsContainer"] +margin_left = 131.0 +margin_right = 498.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 = "On" + +[node name="Label2" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators/IndicatorsContainer"] +margin_top = 33.0 +margin_right = 127.0 +margin_bottom = 47.0 +text = "Right pixel indicator" + +[node name="RightIndicatorCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators/IndicatorsContainer"] +margin_left = 131.0 +margin_top = 28.0 +margin_right = 498.0 +margin_bottom = 52.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 = "On" + +[node name="Label3" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators/IndicatorsContainer"] +margin_top = 61.0 +margin_right = 127.0 +margin_bottom = 75.0 +text = "Show left tool icon" + +[node name="LeftToolIconCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators/IndicatorsContainer"] +margin_left = 131.0 +margin_top = 56.0 +margin_right = 498.0 +margin_bottom = 80.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 = "On" + +[node name="Label4" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators/IndicatorsContainer"] +margin_top = 89.0 +margin_right = 127.0 +margin_bottom = 103.0 +text = "Show right tool icon" + +[node name="RightToolIconCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Indicators/IndicatorsContainer"] +margin_left = 131.0 +margin_top = 84.0 +margin_right = 498.0 +margin_bottom = 108.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 = "On" + [node name="Popups" type="Node" parent="."] [node name="ShortcutSelector" type="ConfirmationDialog" parent="Popups"]