Moved shortcuts code from PreferencesDialog

src/Preferences/HandleShortcuts.gd

@@ -0,0 +1,125 @@
+extends Node
+
+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
+
+onready var shortcut_selector_popup = Global.preferences_dialog.get_node("Popups/ShortcutSelector")
+onready var theme_font_color : Color = Global.preferences_dialog.get_node("Popups/ShortcutSelector/EnteredShortcut").get_color("font_color")
+
+
+func _ready() -> void:
+	# Disable input until the shortcut selector is displayed
+	set_process_input(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 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)
+	get_node("HBoxContainer/PresetOptionButton").select(shortcuts_preset)
+	_on_PresetOptionButton_item_selected(shortcuts_preset)
+
+
+func _input(event : InputEvent) -> void:
+	if event is InputEventKey:
+		if event.pressed:
+			if event.scancode == KEY_ESCAPE:
+				shortcut_selector_popup.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()):
+								shortcut_selector_popup.get_node("EnteredShortcut").text = tr("Already assigned")
+								shortcut_selector_popup.get_node("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
+				shortcut_selector_popup.get_node("EnteredShortcut").text = OS.get_scancode_string(event.get_scancode_with_modifiers())
+				shortcut_selector_popup.get_node("EnteredShortcut").add_color_override("font_color", theme_font_color)
+			get_tree().set_input_as_handled()
+
+
+func _on_PresetOptionButton_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 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])
+		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 get_node("Shortcuts").get_children():
+		if shortcut_grid_item is Button:
+			shortcut_grid_item.disabled = not enabled
+			if shortcut_grid_item.disabled:
+				shortcut_grid_item.mouse_default_cursor_shape = Control.CURSOR_FORBIDDEN
+			else:
+				shortcut_grid_item.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
+
+
+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)
+	Global.update_hint_tooltips()
+	# Set shortcut to switch colors button
+	if action == "switch_colors":
+		Global.color_switch_button.shortcut.shortcut = InputMap.get_action_list("switch_colors")[0]
+
+
+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
+	shortcut_selector_popup.popup_centered()
+
+
+func _on_ShortcutSelector_popup_hide() -> void:
+	set_process_input(false)
+	shortcut_selector_popup.get_node("EnteredShortcut").text = ""
+
+
+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")
+		get_node("Shortcuts/" + action_being_edited).text = OS.get_scancode_string(new_input_event.get_scancode_with_modifiers())
+		shortcut_selector_popup.hide()

src/Preferences/PreferencesDialog.gd

@@ -28,21 +28,8 @@ onready var checker_size_value = $HSplitContainer/ScrollContainer/VBoxContainer/
 onready var checker_color_1 = $HSplitContainer/ScrollContainer/VBoxContainer/Canvas/CheckerOptions/CheckerColor1
 onready var checker_color_2 = $HSplitContainer/ScrollContainer/VBoxContainer/Canvas/CheckerOptions/CheckerColor2
 
-# Shortcuts
-onready var shortcut_selector_popup = $Popups/ShortcutSelector
-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)
-
 	# Replace OK with Close since preference changes are being applied immediately, not after OK confirmation
 	get_ok().text = tr("Close")
 
@@ -131,54 +118,6 @@ func _ready() -> void:
 	checker_color_2.get_picker().presets_visible = false
 	default_fill_color.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/PresetOptionButton").select(shortcuts_preset)
-	_on_PresetOptionButton_item_selected(shortcuts_preset)
-
-
-func _input(event : InputEvent) -> void:
-	if event is InputEventKey:
-		if event.pressed:
-			if event.scancode == KEY_ESCAPE:
-				shortcut_selector_popup.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()
@@ -245,32 +184,6 @@ func _on_SmoothZoom_pressed() -> void:
 	Global.config_cache.save("user://cache.ini")
 
 
-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
-			if shortcut_grid_item.disabled:
-				shortcut_grid_item.mouse_default_cursor_shape = Control.CURSOR_FORBIDDEN
-			else:
-				shortcut_grid_item.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
-
-
-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)
-	Global.update_hint_tooltips()
-	# Set shortcut to switch colors button
-	if action == "switch_colors":
-		Global.color_switch_button.shortcut.shortcut = InputMap.get_action_list("switch_colors")[0]
-
-
 func _on_GridWidthValue_value_changed(value : float) -> void:
 	Global.grid_width = value
 	Global.canvas.update()
@@ -361,41 +274,6 @@ func _on_RightToolIconCheckbox_toggled(button_pressed : bool) -> void:
 	Global.config_cache.save("user://cache.ini")
 
 
-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
-	shortcut_selector_popup.popup_centered()
-
-
-func _on_ShortcutSelector_popup_hide() -> void:
-	set_process_input(false)
-	$Popups/ShortcutSelector/EnteredShortcut.text = ""
-
-
-func _on_PresetOptionButton_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())
-		shortcut_selector_popup.hide()
-
-
 func _on_OpenLastProject_pressed() -> void:
 	Global.open_last_project = !Global.open_last_project
 	Global.config_cache.set_value("preferences", "open_last_project", Global.open_last_project)

src/Preferences/PreferencesDialog.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://src/Preferences/PreferencesDialog.gd" type="Script" id=1]
 [ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=2]
 [ext_resource path="res://assets/fonts/CJK/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3]
 [ext_resource path="res://src/Preferences/HandleLanguages.gd" type="Script" id=4]
 [ext_resource path="res://src/Preferences/HandleThemes.gd" type="Script" id=5]
+[ext_resource path="res://src/Preferences/HandleShortcuts.gd" type="Script" id=6]
 
 [node name="PreferencesDialog" type="AcceptDialog"]
 margin_left = -3.0
@@ -604,6 +605,7 @@ color = Color( 0, 0, 0, 0 )
 margin_top = 1052.0
 margin_right = 494.0
 margin_bottom = 1286.0
+script = ExtResource( 6 )
 
 [node name="HBoxContainer" type="HBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts"]
 margin_right = 494.0
@@ -889,6 +891,6 @@ __meta__ = {
 [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/PresetOptionButton" to="." method="_on_PresetOptionButton_item_selected"]
+[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="." method="_on_ShortcutSelector_confirmed"]
+[connection signal="confirmed" from="Popups/ShortcutSelector" to="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts" method="_on_ShortcutSelector_confirmed"]
-[connection signal="popup_hide" from="Popups/ShortcutSelector" to="." method="_on_ShortcutSelector_popup_hide"]
+[connection signal="popup_hide" from="Popups/ShortcutSelector" to="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts" method="_on_ShortcutSelector_popup_hide"]