Cleanup keyboard shortcuts a bit.

1 files changed, 72 insertions, 66 deletions

diff --git a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
index 1e4a71cb..9726d5a4 100644
--- a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
+++ b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
@@ -47,94 +47,100 @@ OnTitlebar Mouse2 :Lower
 OnTitlebar Mouse3 :WindowMenu
 
 # alt-tab
-Mod1 Tab  :NextWindow (workspace=[current])  (workspace=[current]) !! FBCV13 !!
-Mod1 Shift Tab  :PrevWindow (workspace=[current])  (workspace=[current]) !! FBCV13 !!
+Mod1 Tab   :NextWindow (workspace=[current])  (workspace=[current]) !! FBCV13 !!
+Mod1 Shift Tab   :PrevWindow (workspace=[current])  (workspace=[current]) !! FBCV13 !!
 
 # Arrange/Tile Current windows
-Mod1 Control Left  :ArrangeWindowsStackRight (Layer=Normal)
-Mod1 Control Right  :ArrangeWindowsStackLeft (Layer=Normal)
+Mod1 Control Prev   :ArrangeWindowsStackRight (Layer=Normal)
+Mod1 Control Next   :ArrangeWindowsStackLeft (Layer=Normal)
 
 # go to a specific tab in the current window
-Mod4 1  :Tab 1
-Mod4 2  :Tab 2
-Mod4 3  :Tab 3
-Mod4 4  :Tab 4
-Mod4 5  :Tab 5
-Mod4 6  :Tab 6
-Mod4 7  :Tab 7
-Mod4 8  :Tab 8
-Mod4 9  :Tab 9
+Mod4 1   :Tab 1
+Mod4 2   :Tab 2
+Mod4 3   :Tab 3
+Mod4 4   :Tab 4
+Mod4 5   :Tab 5
+Mod4 6   :Tab 6
+Mod4 7   :Tab 7
+Mod4 8   :Tab 8
+Mod4 9   :Tab 9
 
 # open a terminal
-Mod1 F1  :Exec lumina-open -terminal
+Mod1 F1   :Exec lumina-open -terminal
 
 # open a dialog to run programs
-Mod1 F2  :Exec lumina-search
+Mod1 F2   :Exec lumina-search
 
 # current window commands
-Mod1 F4  :If {Matches (Layer=Normal)} {Close}
-Mod1 F5  :If {Matches (Layer=Normal)} {Kill}
-Mod1 F9  :If {Matches (Layer=Normal)} {Minimize}
-Mod1 F10  :If {Matches (Layer=Normal)} {Maximize}
-Mod1 F11  :If {Matches (Layer=Normal)} {Fullscreen}
+Mod1 F4   :If {Matches (Layer=Normal)} {Close}
+Mod1 F5   :If {Matches (Layer=Normal)} {Kill}
+Mod1 F9   :If {Matches (Layer=Normal)} {Minimize}
+Mod1 F10   :If {Matches (Layer=Normal)} {Maximize}
+Mod1 F11   :If {Matches (Layer=Normal)} {Fullscreen}
 
 # change to a specific workspace
-Control F1  :Workspace 1
-Control F2  :Workspace 2
-Control F3  :Workspace 3
-Control F4  :Workspace 4
-Control F5  :Workspace 5
-Control F6  :Workspace 6
-Control F7  :Workspace 7
-Control F8  :Workspace 8
-Control F9  :Workspace 9
-Control F10  :Workspace 10
-Control F11  :Workspace 11
-Control F12  :Workspace 12
-
-Control Mod1 Left  :PrevWorkspace
-Control Mod1 Right  :NextWorkspace
+Control F12   :Workspace 12
+Control F2   :Workspace 2
+Control F3   :Workspace 3
+Control F4   :Workspace 4
+Control F5   :Workspace 5
+Control F6   :Workspace 6
+Control F7   :Workspace 7
+Control F8   :Workspace 8
+Control F9   :Workspace 9
+Control F10   :Workspace 10
+Control F11   :Workspace 11
+Control Mod4 F12  :If {Matches (Layer=Normal)} {TakeToWorkspace 12}
+
+Control Mod1 Left   :PrevWorkspace
+Control Mod1 Right   :NextWorkspace
 
 # Control+Alt + MouseWheel to change workspaces
-Control Mod1 Mouse4 :PrevWorkspace
-Control Mod1 Mouse5 :NextWorkspace
+Control Mod1 Mouse4  :PrevWorkspace
+Control Mod1 Mouse5  :NextWorkspace
 
 # send the current window to a specific workspace
-Mod4 F1  :SendToWorkspace 1
-Mod4 F2  :SendToWorkspace 2
-Mod4 F3  :SendToWorkspace 3
-Mod4 F4  :SendToWorkspace 4
-Mod4 F5  :SendToWorkspace 5
-Mod4 F6  :SendToWorkspace 6
-Mod4 F7  :SendToWorkspace 7
-Mod4 F8  :SendToWorkspace 8
-Mod4 F9  :SendToWorkspace 9
-Mod4 F10  :SendToWorkspace 10
-Mod4 F11  :SendToWorkspace 11
+Mod4 F12  :SendToWorkspace 12
+Mod4 F2   :SendToWorkspace 2
+Mod4 F3   :SendToWorkspace 3
+Mod4 F4   :SendToWorkspace 4
+Mod4 F5   :SendToWorkspace 5
+Mod4 F6   :SendToWorkspace 6
+Mod4 F7   :SendToWorkspace 7
+Mod4 F8   :SendToWorkspace 8
+Mod4 F9   :SendToWorkspace 9
+Mod4 F10   :SendToWorkspace 10
+Mod4 F11   :SendToWorkspace 11
 Mod4 F12 :SendToWorkspace 12
 
 # send the current window and change to a specific workspace
-Control Mod4 F1  :If {Matches (Layer=Normal)} {TakeToWorkspace 1}
-Control Mod4 F2  :If {Matches (Layer=Normal)} {TakeToWorkspace 2}
-Control Mod4 F3  :If {Matches (Layer=Normal)} {TakeToWorkspace 3}
-Control Mod4 F4  :If {Matches (Layer=Normal)} {TakeToWorkspace 4}
-Control Mod4 F5  :If {Matches (Layer=Normal)} {TakeToWorkspace 5}
-Control Mod4 F6  :If {Matches (Layer=Normal)} {TakeToWorkspace 6}
-Control Mod4 F7  :If {Matches (Layer=Normal)} {TakeToWorkspace 7}
-Control Mod4 F8  :If {Matches (Layer=Normal)} {TakeToWorkspace 8}
-Control Mod4 F9  :If {Matches (Layer=Normal)} {TakeToWorkspace 9}
-Control Mod4 F10  :If {Matches (Layer=Normal)} {TakeToWorkspace 10}
-Control Mod4 F11  :If {Matches (Layer=Normal)} {TakeToWorkspace 11}
+Control Mod4 F1   :If {Matches (Layer=Normal)} {TakeToWorkspace 1}
+Control Mod4 F2   :If {Matches (Layer=Normal)} {TakeToWorkspace 2}
+Control Mod4 F3   :If {Matches (Layer=Normal)} {TakeToWorkspace 3}
+Control Mod4 F4   :If {Matches (Layer=Normal)} {TakeToWorkspace 4}
+Control Mod4 F5   :If {Matches (Layer=Normal)} {TakeToWorkspace 5}
+Control Mod4 F6   :If {Matches (Layer=Normal)} {TakeToWorkspace 6}
+Control Mod4 F7   :If {Matches (Layer=Normal)} {TakeToWorkspace 7}
+Control Mod4 F8   :If {Matches (Layer=Normal)} {TakeToWorkspace 8}
+Control Mod4 F9   :If {Matches (Layer=Normal)} {TakeToWorkspace 9}
+Control Mod4 F10   :If {Matches (Layer=Normal)} {TakeToWorkspace 10}
+Control Mod4 F11   :If {Matches (Layer=Normal)} {TakeToWorkspace 11}
 Control Mod4 F12 :If {Matches (Layer=Normal)} {TakeToWorkspace 12}
 
 #Lumina Specific defaults
 Print  :Exec lumina-screenshot
-Pause  :Exec xscreensaver-command -lock
-Mod1 L  :Exec xscreensaver-command -lock
-Mod1 space  :Exec lumina-search
-Mod1 Prior :Exec lumina-open -volumeup
-Mod1 Next :Exec lumina-open -volumedown
+Pause   :Exec xscreensaver-command -lock
+Mod1 L   :Exec xscreensaver-command -lock
+Mod1 space   :Exec lumina-search
+XF86AudioRaiseVolume  :Exec lumina-open -volumeup
+XF86AudioLowerVolume  :Exec lumina-open -volumedown
 Mod1 Home  :Exec lumina-open -brightnessup
 Mod1 End  :Exec lumina-open -brightnessdown
-F12 :Exec lumina-terminal -toggle
-Mod4 space :Exec lumina-desktop --show-start
+F12  :Exec lumina-terminal -toggle
+Mod4 space  :Exec lumina-desktop --show-start
+Control F1   :Workspace 1
+Mod4 F1   :SendToWorkspace 1
+Print   :Exec lumina-screenshot
+Mod1 Home   :Exec lumina-open -brightnessup
+Mod1 End   :Exec lumina-open -brightnessdown
+Pause  :Exec xscreensaver-command -lock