huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 01:29:49 +00:00
Code Issues Wiki Activity

Merge pull request #71 from Calinou/simplify-cmd-key-mask

Browse source 
Simplify the Command key mask binding
This commit is contained in:
Overloaded 2019-12-17 22:48:33 +02:00 committed by GitHub
parent b9267b51fc 5d912d27f6
commit a8119ea392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Scripts/Main.gd
View file

@ -15,7 +15,6 @@ var redone := false
var fps := 6.0 var fps := 6.0
var animation_loop := 0 #0 is no loop, 1 is cycle loop, 2 is ping-pong loop var animation_loop := 0 #0 is no loop, 1 is cycle loop, 2 is ping-pong loop
var animation_forward := true var animation_forward := true
var sub_key_mask := KEY_MASK_CMD if OS.has_feature("OSX") else KEY_MASK_CTRL
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready() -> void: func _ready() -> void:
@ -52,18 +51,18 @@ func _ready() -> void:
OS.window_size = config_cache.get_value("window", "size") OS.window_size = config_cache.get_value("window", "size")
var file_menu_items := { var file_menu_items := {
"New..." : sub_key_mask + KEY_N, "New..." : KEY_MASK_CMD + KEY_N,
"Open..." : sub_key_mask + KEY_O, "Open..." : KEY_MASK_CMD + KEY_O,
"Save..." : sub_key_mask + KEY_S, "Save..." : KEY_MASK_CMD + KEY_S,
"Save as..." : KEY_MASK_SHIFT + sub_key_mask + KEY_S, "Save as..." : KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_S,
"Import PNG..." : sub_key_mask + KEY_I, "Import PNG..." : KEY_MASK_CMD + KEY_I,
"Export PNG..." : sub_key_mask + KEY_E, "Export PNG..." : KEY_MASK_CMD + KEY_E,
"Export PNG as..." : KEY_MASK_SHIFT + sub_key_mask + KEY_E, "Export PNG as..." : KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_E,
"Quit" : sub_key_mask + KEY_Q "Quit" : KEY_MASK_CMD + KEY_Q
} }
var edit_menu_items := { var edit_menu_items := {
"Undo" : sub_key_mask + KEY_Z, "Undo" : KEY_MASK_CMD + KEY_Z,
"Redo" : KEY_MASK_SHIFT + sub_key_mask + KEY_Z, "Redo" : KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_Z,
"Scale Image" : 0, "Scale Image" : 0,
"Crop Image" : 0, "Crop Image" : 0,
"Clear Selection" : 0, "Clear Selection" : 0,
@ -72,10 +71,10 @@ func _ready() -> void:
"Preferences" : 0 "Preferences" : 0
} }
var view_menu_items := { var view_menu_items := {
"Tile Mode" : sub_key_mask + KEY_T, "Tile Mode" : KEY_MASK_CMD + KEY_T,
"Show Grid" : sub_key_mask + KEY_G, "Show Grid" : KEY_MASK_CMD + KEY_G,
"Show Rulers" : sub_key_mask + KEY_R, "Show Rulers" : KEY_MASK_CMD + KEY_R,
"Show Guides" : sub_key_mask + KEY_Y "Show Guides" : KEY_MASK_CMD + KEY_Y
} }
var help_menu_items := { var help_menu_items := {
"About Pixelorama" : 0 "About Pixelorama" : 0
@ -1070,4 +1069,3 @@ func _on_RemovePalette_pressed() -> void:
func _on_NewPaletteDialog_confirmed() -> void: func _on_NewPaletteDialog_confirmed() -> void:
Global.palette_container.on_new_palette_confirmed() Global.palette_container.on_new_palette_confirmed()
pass pass