From 9af4d29bbffb1b7d2417df879e1cee4f670f5e7b Mon Sep 17 00:00:00 2001 From: RedBearAK <64876997+RedBearAK@users.noreply.github.com> Date: Tue, 6 Apr 2021 21:59:59 -0800 Subject: [PATCH 1/4] Add PCManFM-Qt to PCManFM override, Fix typos, clarify Dolphin Just doing some sweeping up and prettifying. Main thing is adding the PCManFM fork, PCManFM-Qt to the overrides block for PCManFM. Working on the Nautilus variant reminded me. --- linux/kinto.py | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/linux/kinto.py b/linux/kinto.py index 91b4f66..7b8a0fe 100755 --- a/linux/kinto.py +++ b/linux/kinto.py @@ -256,28 +256,29 @@ define_keymap(re.compile("^jetbrains-(?!.*toolbox).*$", re.IGNORECASE),{ # Keybindings overrides for Caja # (overrides some bindings from general file manager code block below) define_keymap(re.compile("caja", re.IGNORECASE),{ - # K("RC-Super-o"): K("RC-Shift-Enter"), # Open in new tab - K("RC-Super-o"): K("RC-Shift-W"), # Open in new window + # K("RC-Super-o"): K("RC-Shift-Enter"), # Open in new tab + K("RC-Super-o"): K("RC-Shift-W"), # Open in new window },"Overrides for Caja - Finder") # Keybindings overrides for DDE (Deepin) File Manager # (overrides some bindings from general file manager code block below) define_keymap(re.compile("dde-file-manager", re.IGNORECASE),{ - K("RC-i"): K("RC-i"), # File properties dialog (Get Info) - K("RC-comma"): K("RC-comma"), # Open preferences dialog (doesn't work, no shortcut available?) - K("RC-Up"): K("RC-Up"), # Go Up dir + K("RC-i"): K("RC-i"), # File properties dialog (Get Info) + K("RC-comma"): None, # Disable preferences shortcut (no shortcut available) + K("RC-Up"): K("RC-Up"), # Go Up dir },"Overrides for DDE File Manager - Finder") # Keybindings overrides for Dolphin # (overrides some bindings from general file manager code block below) define_keymap(re.compile("dolphin", re.IGNORECASE),{ - K("RC-Super-o"): K("RC-Shift-o"), # Open in new window (or new tab, user's choice) - # "Open in new window" requires manually setting custom shortcut of Ctrl+Shift+o - # in Dolphin's keyboard shortcuts. There is no default shortcut set for this function. - ### - # "Open in new tab" requires manually setting custom shortcut of Ctrl+Shift+o in - # Dolphin's keyboard shortcuts. There is no default shortcut set for this function. - ### + ########################################################################################## + ### "Open in new window" requires manually setting custom shortcut of Ctrl+Shift+o + ### in Dolphin's keyboard shortcuts. There is no default shortcut set for this function. + ########################################################################################## + ### "Open in new tab" requires manually setting custom shortcut of Ctrl+Shift+o in + ### Dolphin's keyboard shortcuts. There is no default shortcut set for this function. + ########################################################################################## + K("RC-Super-o"): K("RC-Shift-o"), # Open in new window (or new tab, user's choice, see above) K("RC-Shift-N"): K("F10"), # Create new folder K("RC-comma"): K("RC-Shift-comma"), # Open preferences dialog },"Overrides for Dolphin - Finder") @@ -285,21 +286,21 @@ define_keymap(re.compile("dolphin", re.IGNORECASE),{ # Keybindings overrides for elementary OS Files # (overrides some bindings from general file manager code block below) define_keymap(re.compile("io.elementary.files", re.IGNORECASE),{ - # K("RC-Super-o"): K("Shift-Enter"), # Open folder in new tab - K("RC-Comma"): None, # Disable preferences shortcut since none availabe + # K("RC-Super-o"): K("Shift-Enter"), # Open folder in new tab + K("RC-Comma"): None, # Disable preferences shortcut since none available },"Overrides for Pantheon - Finder") # Keybindings overrides for Nautilus # (overrides some bindings from general file manager code block below) define_keymap(re.compile("org.gnome.nautilus|nautilus", re.IGNORECASE),{ - K("RC-Super-o"): K("Shift-Enter"), # Open in new window - # K("RC-Super-o"): K("RC-Enter"), # Open in new tab - K("RC-comma"): K("RC-comma"), # Overrides "Open preferences dialog" shortcut below + K("RC-Super-o"): K("Shift-Enter"), # Open in new window + # K("RC-Super-o"): K("RC-Enter"), # Open in new tab + K("RC-comma"): K("RC-comma"), # Overrides "Open preferences dialog" shortcut below },"Overrides for Nautilus - Finder") -# Keybindings overrides for PCManFM +# Keybindings overrides for PCManFM and PCManFM-Qt # (overrides some bindings from general file manager code block below) -define_keymap(re.compile("pcmanfm", re.IGNORECASE),{ +define_keymap(re.compile("pcmanfm|pcmanfm-qt", re.IGNORECASE),{ K("RC-Backspace"): [K("Delete"),K("Enter")], # Move to Trash (delete, bypass dialog) },"Overrides for PCManFM - Finder") From 2b83e34c3fa56924a3bdfb65c07ea469921c4d3b Mon Sep 17 00:00:00 2001 From: RedBearAK <64876997+RedBearAK@users.noreply.github.com> Date: Tue, 6 Apr 2021 23:23:16 -0800 Subject: [PATCH 2/4] Fix comment alignment (two more spaces if line is disabled) --- linux/kinto.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/kinto.py b/linux/kinto.py index 7b8a0fe..68dd263 100755 --- a/linux/kinto.py +++ b/linux/kinto.py @@ -256,7 +256,7 @@ define_keymap(re.compile("^jetbrains-(?!.*toolbox).*$", re.IGNORECASE),{ # Keybindings overrides for Caja # (overrides some bindings from general file manager code block below) define_keymap(re.compile("caja", re.IGNORECASE),{ - # K("RC-Super-o"): K("RC-Shift-Enter"), # Open in new tab + # K("RC-Super-o"): K("RC-Shift-Enter"), # Open in new tab K("RC-Super-o"): K("RC-Shift-W"), # Open in new window },"Overrides for Caja - Finder") @@ -286,7 +286,7 @@ define_keymap(re.compile("dolphin", re.IGNORECASE),{ # Keybindings overrides for elementary OS Files # (overrides some bindings from general file manager code block below) define_keymap(re.compile("io.elementary.files", re.IGNORECASE),{ - # K("RC-Super-o"): K("Shift-Enter"), # Open folder in new tab + # K("RC-Super-o"): K("Shift-Enter"), # Open folder in new tab K("RC-Comma"): None, # Disable preferences shortcut since none available },"Overrides for Pantheon - Finder") @@ -294,7 +294,7 @@ define_keymap(re.compile("io.elementary.files", re.IGNORECASE),{ # (overrides some bindings from general file manager code block below) define_keymap(re.compile("org.gnome.nautilus|nautilus", re.IGNORECASE),{ K("RC-Super-o"): K("Shift-Enter"), # Open in new window - # K("RC-Super-o"): K("RC-Enter"), # Open in new tab + # K("RC-Super-o"): K("RC-Enter"), # Open in new tab K("RC-comma"): K("RC-comma"), # Overrides "Open preferences dialog" shortcut below },"Overrides for Nautilus - Finder") @@ -364,8 +364,8 @@ define_keymap(re.compile(filemanagerStr, re.IGNORECASE),{ K("RC-Left"): K("M-Left"), # Go Back K("RC-Right"): K("M-Right"), # Go Forward K("RC-Up"): K("M-Up"), # Go Up dir - # K("RC-Down"): K("M-Down"), # Go Down dir (only works on folders) [not universal] - # K("RC-Down"): K("RC-O"), # Go Down dir (open folder/file) [not universal] + # K("RC-Down"): K("M-Down"), # Go Down dir (only works on folders) [not universal] + # K("RC-Down"): K("RC-O"), # Go Down dir (open folder/file) [not universal] K("RC-Down"): K("Enter"), # Go Down dir (open folder/file) [universal] ########################################################################################################### ### Open in New Window | Move to Trash | Duplicate file/folder ### @@ -377,8 +377,8 @@ define_keymap(re.compile(filemanagerStr, re.IGNORECASE),{ ### To enable renaming files with the Enter key, uncomment the two keymapping lines just below this. ### ### Use Ctrl+Shift+Enter to escape or activate text fields such as "[F]ind" and "[L]ocation" fields. ### ########################################################################################################### - # K("Enter"): K("F2"), # Rename with Enter key - # K("RC-Shift-Enter"): K("Enter"), # Remap alternative "Enter" key to easily activate/exit text fields + # K("Enter"): K("F2"), # Rename with Enter key + # K("RC-Shift-Enter"): K("Enter"), # Remap alternative "Enter" key to easily activate/exit text fields },"File Managers - Finder") ############################################ From 2ff2b4c08227b0277e04df0c6776e80a64220721 Mon Sep 17 00:00:00 2001 From: RedBearAK <64876997+RedBearAK@users.noreply.github.com> Date: Tue, 6 Apr 2021 23:31:35 -0800 Subject: [PATCH 3/4] Tabs to spaces --- linux/kinto.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/kinto.py b/linux/kinto.py index 68dd263..e0dcac5 100755 --- a/linux/kinto.py +++ b/linux/kinto.py @@ -377,8 +377,8 @@ define_keymap(re.compile(filemanagerStr, re.IGNORECASE),{ ### To enable renaming files with the Enter key, uncomment the two keymapping lines just below this. ### ### Use Ctrl+Shift+Enter to escape or activate text fields such as "[F]ind" and "[L]ocation" fields. ### ########################################################################################################### - # K("Enter"): K("F2"), # Rename with Enter key - # K("RC-Shift-Enter"): K("Enter"), # Remap alternative "Enter" key to easily activate/exit text fields + # K("Enter"): K("F2"), # Rename with Enter key + # K("RC-Shift-Enter"): K("Enter"), # Remap alternative "Enter" key to easily activate/exit text fields },"File Managers - Finder") ############################################ From e71fa554d315944a51da24f258ba1d7e5d080c29 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 7 Apr 2021 03:04:58 -0500 Subject: [PATCH 4/4] KI-469 Aligned comments --- linux/kinto.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/kinto.py b/linux/kinto.py index e0dcac5..c838a0b 100755 --- a/linux/kinto.py +++ b/linux/kinto.py @@ -278,7 +278,7 @@ define_keymap(re.compile("dolphin", re.IGNORECASE),{ ### "Open in new tab" requires manually setting custom shortcut of Ctrl+Shift+o in ### Dolphin's keyboard shortcuts. There is no default shortcut set for this function. ########################################################################################## - K("RC-Super-o"): K("RC-Shift-o"), # Open in new window (or new tab, user's choice, see above) + K("RC-Super-o"): K("RC-Shift-o"), # Open in new window (or new tab, user's choice, see above) K("RC-Shift-N"): K("F10"), # Create new folder K("RC-comma"): K("RC-Shift-comma"), # Open preferences dialog },"Overrides for Dolphin - Finder") @@ -427,7 +427,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in terminals,{ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{ K("RC-Space"): K("Alt-F1"), # Default SL - Launch Application Menu (gnome/kde) K("RC-F3"):K("Super-d"), # Default SL - Show Desktop (gnome/kde,eos) - K("RC-Super-f"):K("M-F10"), # Default SL - Maximize app (gnome/kde) + K("RC-Super-f"):K("M-F10"), # Default SL - Maximize app (gnome/kde) # K("Super-Right"):K("C-M-Right"), # Default SL - Change workspace (budgie) # K("Super-Left"):K("C-M-Left"), # Default SL - Change workspace (budgie) K("RC-Q"): K("M-F4"), # Default SL - not-popos @@ -476,7 +476,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{ K("Super-k"): [K("Shift-End"), K("Backspace")], K("Super-d"): K("Delete"), - # K("M-RC-Space"): K(""), # Open Finder - Placeholder + # K("M-RC-Space"): K(""), # Open Finder - Placeholder # Wordwise K("RC-Left"): K("Home"), # Beginning of Line