Merge pull request #191 from novhack/shortcuts

Add tools shortcuts binding to preferences

Prefabs/Dialogs/PreferencesDialog.tscn

@@ -5,13 +5,16 @@
 [ext_resource path="res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3]
 
 [node name="PreferencesDialog" type="AcceptDialog"]
-margin_right = 216.0
+visible = true
-margin_bottom = 70.0
+margin_right = 430.0
+margin_bottom = 1347.0
+rect_min_size = Vector2( 430, 0 )
 window_title = "Preferences"
 resizable = true
 script = ExtResource( 1 )
 __meta__ = {
 "_edit_horizontal_guides_": [  ],
+"_edit_use_anchors_": false,
 "_edit_vertical_guides_": [  ]
 }
 
@@ -24,39 +27,42 @@ margin_right = -8.0
 margin_bottom = -36.0
 size_flags_horizontal = 3
 custom_constants/autohide = 0
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="Tree" type="Tree" parent="HSplitContainer"]
 margin_right = 88.0
-margin_bottom = 26.0
+margin_bottom = 1303.0
 rect_min_size = Vector2( 88, 0 )
 custom_constants/item_margin = -2
 hide_root = true
 
 [node name="ScrollContainer" type="ScrollContainer" parent="HSplitContainer"]
 margin_left = 100.0
-margin_right = 200.0
+margin_right = 414.0
-margin_bottom = 26.0
+margin_bottom = 1303.0
 rect_min_size = Vector2( 100, 0 )
 size_flags_horizontal = 3
 
 [node name="VBoxContainer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer"]
-margin_right = 306.0
+margin_right = 314.0
-margin_bottom = 960.0
+margin_bottom = 1162.0
 size_flags_horizontal = 3
 
 [node name="General" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
-margin_right = 205.0
+margin_right = 314.0
-margin_bottom = 84.0
+margin_bottom = 112.0
 
 [node name="General Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"]
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "General Options"
 
 [node name="SmoothZoom" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"]
 margin_top = 32.0
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 56.0
 mouse_default_cursor_shape = 2
 pressed = true
@@ -64,8 +70,8 @@ text = "Smooth Zoom"
 
 [node name="GridContainer" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"]
 margin_top = 60.0
-margin_right = 205.0
+margin_right = 314.0
-margin_bottom = 84.0
+margin_bottom = 112.0
 custom_constants/vseparation = 4
 custom_constants/hseparation = 4
 columns = 2
@@ -79,22 +85,26 @@ pressed = true
 text = "Left pixel indicator"
 
 [node name="RightIndicatorCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer"]
-margin_right = 147.0
+margin_left = 151.0
+margin_right = 306.0
 margin_bottom = 24.0
 hint_tooltip = "Show right mouse pixel indicator or brush on the canvas when drawing"
 mouse_default_cursor_shape = 2
 text = "Right pixel indicator"
 
 [node name="LeftToolIconCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer"]
+margin_top = 28.0
 margin_right = 147.0
-margin_bottom = 24.0
+margin_bottom = 52.0
 mouse_default_cursor_shape = 2
 pressed = true
 text = "Show left tool icon"
 
 [node name="RightToolIconCheckbox" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General/GridContainer"]
-margin_right = 147.0
+margin_left = 151.0
-margin_bottom = 24.0
+margin_top = 28.0
+margin_right = 306.0
+margin_bottom = 52.0
 mouse_default_cursor_shape = 2
 pressed = true
 text = "Show right tool icon"
@@ -120,19 +130,19 @@ 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 = 88.0
+margin_top = 116.0
-margin_right = 205.0
+margin_right = 314.0
-margin_bottom = 512.0
+margin_bottom = 540.0
 
 [node name="Language Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "Language options"
 
 [node name="System Language" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 32.0
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 56.0
 mouse_default_cursor_shape = 2
 pressed = true
@@ -140,14 +150,14 @@ text = "System Language"
 
 [node name="German" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 60.0
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 84.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 = 205.0
+margin_right = 314.0
 margin_bottom = 112.0
 mouse_default_cursor_shape = 2
 custom_fonts/font = ExtResource( 2 )
@@ -155,70 +165,70 @@ text = "Ελληνικά [el]"
 
 [node name="English" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 116.0
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 140.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 = 205.0
+margin_right = 314.0
 margin_bottom = 168.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 = 205.0
+margin_right = 314.0
 margin_bottom = 196.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 = 205.0
+margin_right = 314.0
 margin_bottom = 224.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 = 205.0
+margin_right = 314.0
 margin_bottom = 252.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 = 205.0
+margin_right = 314.0
 margin_bottom = 280.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 = 205.0
+margin_right = 314.0
 margin_bottom = 308.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 = 205.0
+margin_right = 314.0
 margin_bottom = 336.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 = 205.0
+margin_right = 314.0
 margin_bottom = 364.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 = 205.0
+margin_right = 314.0
 margin_bottom = 394.0
 mouse_default_cursor_shape = 2
 custom_fonts/font = ExtResource( 3 )
@@ -226,72 +236,72 @@ text = "简体中文 [zh_CN]"
 
 [node name="Chinese Traditional" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 398.0
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 424.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 = 516.0
+margin_top = 544.0
-margin_right = 205.0
+margin_right = 314.0
-margin_bottom = 684.0
+margin_bottom = 712.0
 
 [node name="Theme Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "Theme options"
 
 [node name="Dark Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
 margin_top = 32.0
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 56.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 = 205.0
+margin_right = 314.0
 margin_bottom = 84.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 = 205.0
+margin_right = 314.0
 margin_bottom = 112.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 = 205.0
+margin_right = 314.0
 margin_bottom = 140.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 = 205.0
+margin_right = 314.0
 margin_bottom = 168.0
 mouse_default_cursor_shape = 2
 text = "Light"
 
 [node name="Grid&Guides" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
-margin_top = 688.0
+margin_top = 716.0
-margin_right = 205.0
+margin_right = 314.0
-margin_bottom = 820.0
+margin_bottom = 848.0
 
 [node name="GridOptionsLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides"]
-margin_right = 205.0
+margin_right = 314.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 = 205.0
+margin_right = 314.0
 margin_bottom = 132.0
 custom_constants/vseparation = 4
 custom_constants/hseparation = 4
@@ -360,19 +370,19 @@ 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 = 824.0
+margin_top = 852.0
-margin_right = 205.0
+margin_right = 314.0
-margin_bottom = 932.0
+margin_bottom = 960.0
 
 [node name="ImageOptionsLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image"]
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "Image Options"
 
 [node name="ImageOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image"]
 margin_top = 32.0
-margin_right = 205.0
+margin_right = 314.0
 margin_bottom = 108.0
 custom_constants/vseparation = 4
 custom_constants/hseparation = 4
@@ -425,6 +435,211 @@ margin_bottom = 76.0
 rect_min_size = Vector2( 64, 20 )
 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 = 1162.0
+
+[node name="HBoxContainer" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts"]
+margin_right = 314.0
+margin_bottom = 20.0
+
+[node name="Label" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer"]
+margin_top = 3.0
+margin_right = 49.0
+margin_bottom = 17.0
+text = "Preset: "
+
+[node name="OptionButton" type="OptionButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer"]
+margin_left = 53.0
+margin_right = 314.0
+margin_bottom = 20.0
+size_flags_horizontal = 3
+text = "Default"
+items = [ "Default", null, false, 0, null, "Custom", null, false, 1, null ]
+selected = 0
+
+[node name="HSeparator" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts"]
+margin_top = 24.0
+margin_right = 314.0
+margin_bottom = 28.0
+
+[node name="Shortcuts" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts"]
+margin_top = 32.0
+margin_right = 314.0
+margin_bottom = 198.0
+custom_constants/hseparation = 5
+columns = 3
+
+[node name="Empty" type="Control" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_right = 137.0
+margin_bottom = 14.0
+
+[node name="LeftToolLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 142.0
+margin_right = 225.0
+margin_bottom = 14.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_bottom = 14.0
+text = "Right Tool:"
+align = 1
+
+[node name="HSeparator" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_top = 18.0
+margin_right = 137.0
+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_bottom = 22.0
+
+[node name="HSeparator3" type="HSeparator" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 230.0
+margin_top = 18.0
+margin_right = 313.0
+margin_bottom = 22.0
+
+[node name="RectSelectLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_top = 29.0
+margin_right = 137.0
+margin_bottom = 43.0
+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_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_top = 26.0
+margin_right = 313.0
+margin_bottom = 46.0
+size_flags_horizontal = 3
+
+[node name="ColorPickerLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_top = 53.0
+margin_right = 137.0
+margin_bottom = 67.0
+text = "Color Picker"
+
+[node name="left_colorpicker_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 142.0
+margin_top = 50.0
+margin_right = 225.0
+margin_bottom = 70.0
+
+[node name="right_colorpicker_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 230.0
+margin_top = 50.0
+margin_right = 313.0
+margin_bottom = 70.0
+
+[node name="PencilLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_top = 77.0
+margin_right = 137.0
+margin_bottom = 91.0
+text = "Pencil"
+
+[node name="left_pencil_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 142.0
+margin_top = 74.0
+margin_right = 225.0
+margin_bottom = 94.0
+
+[node name="right_pencil_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 230.0
+margin_top = 74.0
+margin_right = 313.0
+margin_bottom = 94.0
+
+[node name="EraserLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_top = 101.0
+margin_right = 137.0
+margin_bottom = 115.0
+text = "Eraser"
+
+[node name="left_eraser_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 142.0
+margin_top = 98.0
+margin_right = 225.0
+margin_bottom = 118.0
+
+[node name="right_eraser_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 230.0
+margin_top = 98.0
+margin_right = 313.0
+margin_bottom = 118.0
+
+[node name="BucketLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_top = 125.0
+margin_right = 137.0
+margin_bottom = 139.0
+text = "Bucket"
+
+[node name="left_fill_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 142.0
+margin_top = 122.0
+margin_right = 225.0
+margin_bottom = 142.0
+
+[node name="right_fill_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 230.0
+margin_top = 122.0
+margin_right = 313.0
+margin_bottom = 142.0
+
+[node name="LightenDarkenLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_top = 149.0
+margin_right = 137.0
+margin_bottom = 163.0
+text = "Lighten/Darken"
+
+[node name="left_lightdark_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 142.0
+margin_top = 146.0
+margin_right = 225.0
+margin_bottom = 166.0
+
+[node name="right_lightdark_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
+margin_left = 230.0
+margin_top = 146.0
+margin_right = 313.0
+margin_bottom = 166.0
+
+[node name="Popups" type="Node" parent="."]
+
+[node name="ShortcutSelector" type="ConfirmationDialog" parent="Popups"]
+margin_right = 250.0
+margin_bottom = 87.5
+rect_min_size = Vector2( 250, 87.5 )
+window_title = "Set the shortcut"
+dialog_text = "Press a key or a key combination to set the shortcut"
+dialog_hide_on_ok = false
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="EnteredShortcut" type="Label" parent="Popups/ShortcutSelector"]
+margin_left = 8.0
+margin_top = 22.0
+margin_right = 341.0
+margin_bottom = 51.5
+align = 1
+valign = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
 [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/Tree" to="." method="_on_Tree_item_selected"]
@@ -441,3 +656,6 @@ color = Color( 0, 0, 0, 0 )
 [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"]
+[connection signal="item_selected" from="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer/OptionButton" to="." method="_on_OptionButton_item_selected"]
+[connection signal="confirmed" from="Popups/ShortcutSelector" to="." method="_on_ShortcutSelector_confirmed"]
+[connection signal="popup_hide" from="Popups/ShortcutSelector" to="." method="_on_ShortcutSelector_popup_hide"]

Scripts/Dialogs/PreferencesDialog.gd

@@ -7,6 +7,7 @@ onready var languages = $HSplitContainer/ScrollContainer/VBoxContainer/Languages
 onready var themes = $HSplitContainer/ScrollContainer/VBoxContainer/Themes
 onready var grid_guides = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides"
 onready var image = $HSplitContainer/ScrollContainer/VBoxContainer/Image
+onready var shortcuts = $HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts
 
 onready var smooth_zoom_button = $"HSplitContainer/ScrollContainer/VBoxContainer/General/SmoothZoom"
 onready var sensitivity_option = $"HSplitContainer/ScrollContainer/VBoxContainer/General/PressureSentivity/PressureSensitivityOptionButton"
@@ -20,7 +21,19 @@ onready var grid_height_value = $"HSplitContainer/ScrollContainer/VBoxContainer/
 onready var grid_color = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridColor"
 onready var guide_color = $"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GuideColor"
 
+# Shortcuts
+onready var theme_font_color : Color = $Popups/ShortcutSelector/EnteredShortcut.get_color("font_color")
+var default_shortcuts_preset := {}
+var custom_shortcuts_preset := {}
+var action_being_edited := ""
+var shortcut_already_assigned = false
+var old_input_event : InputEventKey
+var new_input_event : InputEventKey
+
 func _ready() -> void:
+	# Disable input until the shortcut selector is displayed
+	set_process_input(false)
+
 	for child in languages.get_children():
 		if child is Button:
 			child.connect("pressed", self, "_on_Language_pressed", [child])
@@ -86,6 +99,55 @@ func _ready() -> void:
 	$"HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides/GridOptions/GridColor".get_picker().presets_visible = false
 	$HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions/DefaultFillColor.get_picker().presets_visible = false
 
+	# Get default preset for shortcuts from project input map
+	# Buttons in shortcuts selector should be called the same as actions
+	for shortcut_grid_item in shortcuts.get_node("Shortcuts").get_children():
+		if shortcut_grid_item is Button:
+			var input_events = InputMap.get_action_list(shortcut_grid_item.name)
+			if input_events.size() > 1:
+				printerr("Every shortcut action should have just one input event assigned in input map")
+			shortcut_grid_item.text = (input_events[0] as InputEventKey).as_text()
+			shortcut_grid_item.connect("pressed", self, "_on_Shortcut_button_pressed", [shortcut_grid_item])
+			default_shortcuts_preset[shortcut_grid_item.name] = input_events[0]
+
+	# Load custom shortcuts from the config file
+	custom_shortcuts_preset = default_shortcuts_preset.duplicate()
+	for action in default_shortcuts_preset:
+		var saved_input_event = Global.config_cache.get_value("shortcuts", action, 0)
+		if saved_input_event is InputEventKey:
+			custom_shortcuts_preset[action] = saved_input_event
+
+	var shortcuts_preset = Global.config_cache.get_value("shortcuts", "shortcuts_preset", 0)
+	shortcuts.get_node("HBoxContainer/OptionButton").select(shortcuts_preset)
+	_on_OptionButton_item_selected(shortcuts_preset)
+
+
+func _input(event : InputEvent) -> void:
+	if event is InputEventKey:
+		if event.pressed:
+			if event.scancode == KEY_ESCAPE:
+				$Popups/ShortcutSelector.hide()
+			else:
+				# Check if shortcut was already used
+				for action in InputMap.get_actions():
+					for input_event in InputMap.get_action_list(action):
+						if input_event is InputEventKey:
+							if OS.get_scancode_string(input_event.get_scancode_with_modifiers()) == OS.get_scancode_string(event.get_scancode_with_modifiers()):
+								$Popups/ShortcutSelector/EnteredShortcut.text = tr("Already assigned")
+								$Popups/ShortcutSelector/EnteredShortcut.add_color_override("font_color", Color.crimson)
+								get_tree().set_input_as_handled()
+								shortcut_already_assigned = true
+								return
+
+				# Store new shortcut
+				shortcut_already_assigned = false
+				old_input_event = InputMap.get_action_list(action_being_edited)[0]
+				new_input_event = event
+				$Popups/ShortcutSelector/EnteredShortcut.text = OS.get_scancode_string(event.get_scancode_with_modifiers())
+				$Popups/ShortcutSelector/EnteredShortcut.add_color_override("font_color", theme_font_color)
+			get_tree().set_input_as_handled()
+
+
 func _on_PreferencesDialog_about_to_show(changed_language := false) -> void:
 	var root := tree.create_item()
 	var general_button := tree.create_item(root)
@@ -93,6 +155,7 @@ func _on_PreferencesDialog_about_to_show(changed_language := false) -> void:
 	var theme_button := tree.create_item(root)
 	var grid_button := tree.create_item(root)
 	var image_button := tree.create_item(root)
+	var shortcuts_button := tree.create_item(root)
 
 	general_button.set_text(0, "  " + tr("General"))
 	# We use metadata to avoid being affected by translations
@@ -105,6 +168,8 @@ func _on_PreferencesDialog_about_to_show(changed_language := false) -> void:
 	grid_button.set_metadata(0, "Guides & Grid")
 	image_button.set_text(0, "  " + tr("Image"))
 	image_button.set_metadata(0, "Image")
+	shortcuts_button.set_text(0, "  " + tr("Shortcuts"))
+	shortcuts_button.set_metadata(0, "Shortcuts")
 
 	if changed_language:
 		language_button.select(0)
@@ -115,6 +180,7 @@ func _on_PreferencesDialog_about_to_show(changed_language := false) -> void:
 func _on_PreferencesDialog_popup_hide() -> void:
 	tree.clear()
 
+
 func _on_Tree_item_selected() -> void:
 	for child in right_side.get_children():
 		child.visible = false
@@ -129,17 +195,22 @@ func _on_Tree_item_selected() -> void:
 		grid_guides.visible = true
 	elif "Image" in selected:
 		image.visible = true
+	elif "Shortcuts" in selected:
+		shortcuts.visible = true
+
 
 func _on_PressureSensitivityOptionButton_item_selected(id : int) -> void:
 	Global.pressure_sensitivity_mode = id
 	Global.config_cache.set_value("preferences", "pressure_sensitivity", id)
 	Global.config_cache.save("user://cache.ini")
 
+
 func _on_SmoothZoom_pressed() -> void:
 	Global.smooth_zoom = !Global.smooth_zoom
 	Global.config_cache.set_value("preferences", "smooth_zoom", Global.smooth_zoom)
 	Global.config_cache.save("user://cache.ini")
 
+
 func _on_Language_pressed(button : Button) -> void:
 	var index := 0
 	var i := -1
@@ -168,6 +239,7 @@ func _on_Language_pressed(button : Button) -> void:
 	_on_PreferencesDialog_popup_hide()
 	_on_PreferencesDialog_about_to_show(true)
 
+
 func _on_Theme_pressed(button : Button) -> void:
 	var index := 0
 	var i := 0
@@ -257,24 +329,46 @@ func change_theme(ID : int) -> void:
 	# Make sure the frame text gets updated
 	Global.current_frame = Global.current_frame
 
+
+func apply_shortcuts_preset(preset) -> void:
+	for action in preset:
+		var old_input_event : InputEventKey = InputMap.get_action_list(action)[0]
+		set_action_shortcut(action, old_input_event, preset[action])
+		shortcuts.get_node("Shortcuts/" + action).text = OS.get_scancode_string(preset[action].get_scancode_with_modifiers())
+
+
+func toggle_shortcut_buttons(enabled : bool) -> void:
+	for shortcut_grid_item in shortcuts.get_node("Shortcuts").get_children():
+		if shortcut_grid_item is Button:
+			shortcut_grid_item.disabled = not enabled
+
+
+func set_action_shortcut(action : String, old_input : InputEventKey, new_input : InputEventKey) -> void:
+	InputMap.action_erase_event(action, old_input)
+	InputMap.action_add_event(action, new_input)
+
+
 func _on_GridWidthValue_value_changed(value : float) -> void:
 	Global.grid_width = value
 	Global.canvas.update()
 	Global.config_cache.set_value("preferences", "grid_size", Vector2(value, grid_height_value.value))
 	Global.config_cache.save("user://cache.ini")
 
+
 func _on_GridHeightValue_value_changed(value : float) -> void:
 	Global.grid_height = value
 	Global.canvas.update()
 	Global.config_cache.set_value("preferences", "grid_size", Vector2(grid_width_value.value, value))
 	Global.config_cache.save("user://cache.ini")
 
+
 func _on_GridColor_color_changed(color : Color) -> void:
 	Global.grid_color = color
 	Global.canvas.update()
 	Global.config_cache.set_value("preferences", "grid_color", color)
 	Global.config_cache.save("user://cache.ini")
 
+
 func _on_GuideColor_color_changed(color : Color) -> void:
 	Global.guide_color = color
 	for canvas in Global.canvases:
@@ -284,11 +378,13 @@ func _on_GuideColor_color_changed(color : Color) -> void:
 	Global.config_cache.set_value("preferences", "guide_color", color)
 	Global.config_cache.save("user://cache.ini")
 
+
 func _on_ImageDefaultWidth_value_changed(value: float) -> void:
 	Global.default_image_width = value
 	Global.config_cache.set_value("preferences", "default_width", value)
 	Global.config_cache.save("user://cache.ini")
 
+
 func _on_ImageDefaultHeight_value_changed(value: float) -> void:
 	Global.default_image_height = value
 	Global.config_cache.set_value("preferences", "default_height", value)
@@ -315,3 +411,38 @@ func _on_LeftToolIconCheckbox_toggled(button_pressed : bool) -> void:
 
 func _on_RightToolIconCheckbox_toggled(button_pressed : bool) -> void:
 	Global.show_right_tool_icon = button_pressed
+
+
+func _on_Shortcut_button_pressed(button : Button) -> void:
+	set_process_input(true)
+	action_being_edited = button.name
+	new_input_event = InputMap.get_action_list(button.name)[0]
+	shortcut_already_assigned = true
+	$Popups/ShortcutSelector.popup_centered()
+
+
+func _on_ShortcutSelector_popup_hide() -> void:
+	set_process_input(false)
+	$Popups/ShortcutSelector/EnteredShortcut.text = ""
+
+
+func _on_OptionButton_item_selected(id : int) -> void:
+	# Only custom preset which is modifiable
+	toggle_shortcut_buttons(true if id == 1 else false)
+	match id:
+		0:
+			apply_shortcuts_preset(default_shortcuts_preset)
+		1:
+			apply_shortcuts_preset(custom_shortcuts_preset)
+	Global.config_cache.set_value("shortcuts", "shortcuts_preset", id)
+	Global.config_cache.save("user://cache.ini")
+
+
+func _on_ShortcutSelector_confirmed() -> void:
+	if not shortcut_already_assigned:
+		set_action_shortcut(action_being_edited, old_input_event, new_input_event)
+		custom_shortcuts_preset[action_being_edited] = new_input_event
+		Global.config_cache.set_value("shortcuts", action_being_edited, new_input_event)
+		Global.config_cache.save("user://cache.ini")
+		shortcuts.get_node("Shortcuts/" + action_being_edited).text = OS.get_scancode_string(new_input_event.get_scancode_with_modifiers())
+		$Popups/ShortcutSelector.hide()

Scripts/Main.gd

@@ -41,33 +41,33 @@ func _ready() -> void:
 			OS.window_size = Global.config_cache.get_value("window", "size")
 
 	var file_menu_items := {
-		"New..." : KEY_MASK_CMD + KEY_N,
+		"New..." : InputMap.get_action_list("new_file")[0].get_scancode_with_modifiers(),
-		"Open..." : KEY_MASK_CMD + KEY_O,
+		"Open..." : InputMap.get_action_list("open_file")[0].get_scancode_with_modifiers(),
-		"Save..." : KEY_MASK_CMD + KEY_S,
+		"Save..." : InputMap.get_action_list("save_file")[0].get_scancode_with_modifiers(),
-		"Save as..." : KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_S,
+		"Save as..." : InputMap.get_action_list("save_file_as")[0].get_scancode_with_modifiers(),
-		"Import..." : KEY_MASK_CMD + KEY_I,
+		"Import..." : InputMap.get_action_list("import_file")[0].get_scancode_with_modifiers(),
-		"Export..." : KEY_MASK_CMD + KEY_E,
+		"Export..." : InputMap.get_action_list("export_file")[0].get_scancode_with_modifiers(),
-		"Export as..." : KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_E,
+		"Export as..." : InputMap.get_action_list("export_file_as")[0].get_scancode_with_modifiers(),
-		"Quit" : KEY_MASK_CMD + KEY_Q
+		"Quit" : InputMap.get_action_list("quit")[0].get_scancode_with_modifiers(),
 		}
 	var edit_menu_items := {
-		"Undo" : KEY_MASK_CMD + KEY_Z,
+		"Undo" : InputMap.get_action_list("undo")[0].get_scancode_with_modifiers(),
-		"Redo" : KEY_MASK_CMD + KEY_Y,
+		"Redo" : InputMap.get_action_list("redo")[0].get_scancode_with_modifiers(),
 		"Clear Selection" : 0,
 		"Preferences" : 0
 		}
 	var view_menu_items := {
-		"Tile Mode" : KEY_MASK_CMD + KEY_T,
+		"Tile Mode" : InputMap.get_action_list("tile_mode")[0].get_scancode_with_modifiers(),
-		"Show Grid" : KEY_MASK_CMD + KEY_G,
+		"Show Grid" : InputMap.get_action_list("show_grid")[0].get_scancode_with_modifiers(),
-		"Show Rulers" : KEY_MASK_CMD + KEY_R,
+		"Show Rulers" : InputMap.get_action_list("show_rulers")[0].get_scancode_with_modifiers(),
-		"Show Guides" : KEY_MASK_CMD + KEY_F,
+		"Show Guides" : InputMap.get_action_list("show_guides")[0].get_scancode_with_modifiers(),
 		"Show Animation Timeline" : 0
 		}
 	var image_menu_items := {
 		"Scale Image" : 0,
 		"Crop Image" : 0,
-		"Flip Horizontal" : KEY_MASK_SHIFT + KEY_H,
+		"Flip Horizontal" : InputMap.get_action_list("image_flip_horizontal")[0].get_scancode_with_modifiers(),
-		"Flip Vertical" : KEY_MASK_SHIFT + KEY_V,
+		"Flip Vertical" : InputMap.get_action_list("image_flip_vertical")[0].get_scancode_with_modifiers(),
 		"Rotate Image" : 0,
 		"Invert colors" : 0,
 		"Desaturation" : 0,

Translations/Translations.pot

@@ -272,6 +272,9 @@ msgstr ""
 msgid "Guides & Grid"
 msgstr ""
 
+msgid "Shortcuts"
+msgstr ""
+
 msgid "General Options"
 msgstr ""
 
@@ -849,3 +852,39 @@ msgstr ""
 
 msgid "Templates:"
 msgstr ""
+
+msgid "Preset"
+msgstr ""
+
+msgid "Default"
+msgstr ""
+
+msgid "Custom"
+msgstr ""
+
+msgid "Rectangular Selection"
+msgstr ""
+
+msgid "Color Picker"
+msgstr ""
+
+msgid "Pencil"
+msgstr ""
+
+msgid "Eraser"
+msgstr ""
+
+msgid "Bucket"
+msgstr ""
+
+msgid "Lighten/Darken"
+msgstr ""
+
+msgid "Set the shortcut"
+msgstr ""
+
+msgid "Press a key or a key combination to set the shortcut"
+msgstr ""
+
+msgid "Already assigned"
+msgstr ""

project.godot

@@ -229,6 +229,86 @@ space={
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
  ]
 }
+new_file={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":78,"unicode":0,"echo":false,"script":null)
+ ]
+}
+open_file={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":79,"unicode":0,"echo":false,"script":null)
+ ]
+}
+save_file={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
+ ]
+}
+save_file_as={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":true,"meta":false,"command":true,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
+ ]
+}
+import_file={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":73,"unicode":0,"echo":false,"script":null)
+ ]
+}
+export_file={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null)
+ ]
+}
+export_file_as={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":true,"meta":false,"command":true,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null)
+ ]
+}
+quit={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":81,"unicode":0,"echo":false,"script":null)
+ ]
+}
+undo={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null)
+ ]
+}
+redo={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":89,"unicode":0,"echo":false,"script":null)
+ ]
+}
+tile_mode={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":84,"unicode":0,"echo":false,"script":null)
+ ]
+}
+show_grid={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":71,"unicode":0,"echo":false,"script":null)
+ ]
+}
+show_rulers={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":82,"unicode":0,"echo":false,"script":null)
+ ]
+}
+show_guides={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":70,"unicode":0,"echo":false,"script":null)
+ ]
+}
+image_flip_horizontal={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":false,"meta":false,"command":false,"pressed":false,"scancode":72,"unicode":0,"echo":false,"script":null)
+ ]
+}
+image_flip_vertical={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":false,"meta":false,"command":false,"pressed":false,"scancode":86,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [locale]