diff options
| author | Stefano Karapetsas <[email protected]> | 2012-10-27 16:37:04 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-10-27 16:37:04 +0200 |
| commit | 2021a69960802a6ee2562b7047a3c0eb968c470b (patch) | |
| tree | 594fb03bc3215ca3f9ff12bd5c7d0dedcfa7f363 | |
| parent | 44205a3b8439614e1a2b176006e9f8e6a6c49439 (diff) | |
| download | marco-2021a69960802a6ee2562b7047a3c0eb968c470b.tar.bz2 marco-2021a69960802a6ee2562b7047a3c0eb968c470b.tar.xz | |
migrate keybindings xml files for gsettings
| -rw-r--r-- | src/50-marco-desktop-key.xml.in | 17 | ||||
| -rw-r--r-- | src/50-marco-global-key.xml.in | 131 | ||||
| -rw-r--r-- | src/50-marco-key.xml.in | 269 | ||||
| -rw-r--r-- | src/50-marco-window-key.xml.in | 201 | ||||
| -rw-r--r-- | src/Makefile.am | 5 |
5 files changed, 342 insertions, 281 deletions
diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in index 5705607d..00ebc91d 100644 --- a/src/50-marco-desktop-key.xml.in +++ b/src/50-marco-desktop-key.xml.in @@ -1,20 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> -<KeyListEntries _name="Desktop" wm_name="Marco" package="marco"> +<KeyListEntries _name="Desktop" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings"> - <KeyListEntry - name="/apps/marco/global_keybindings/panel_run_dialog" /> + <KeyListEntry name="panel-run-dialog" _description="Show the panel's "Run Application" dialog box" /> - <KeyListEntry - name="/apps/marco/global_keybindings/panel_main_menu" /> + <KeyListEntry name="panel-main-menu" _description="Show the panel's main menu" /> - <KeyListEntry - name="/apps/marco/global_keybindings/run_command_screenshot" /> + <KeyListEntry name="run-command-screenshot" _description="Take a screenshot" /> - <KeyListEntry - name="/apps/marco/global_keybindings/run_command_window_screenshot" /> + <KeyListEntry name="run-command-window-screenshot" _description="Take a screenshot of a window" /> - <KeyListEntry - name="/apps/marco/global_keybindings/run_command_terminal" /> + <KeyListEntry name="run-command-terminal" _description="Run a terminal" /> </KeyListEntries> diff --git a/src/50-marco-global-key.xml.in b/src/50-marco-global-key.xml.in new file mode 100644 index 00000000..9a61c376 --- /dev/null +++ b/src/50-marco-global-key.xml.in @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings"> + + <KeyListEntry name="switch-windows" _description="Move between windows, using a popup window" /> + + <KeyListEntry name="switch-group" _description="Move between windows of an application, using a popup window" /> + + <KeyListEntry name="switch-panels" _description="Move between panels and the desktop, using a popup window" /> + + <KeyListEntry name="cycle-windows" _description="Move between windows immediately" /> + + <KeyListEntry name="cycle-group" _description="Move between windows of an application immediately" /> + + <KeyListEntry name="cycle-panels" _description="Move between panels and the desktop immediately" /> + + <KeyListEntry name="show-desktop" _description="Hide all normal windows and set focus to the desktop" /> + + <KeyListEntry name="switch-to-workspace-1" + _description="Switch to workspace 1" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-2" + _description="Switch to workspace 2" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-3" + _description="Switch to workspace 3" + value="2" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-4" + _description="Switch to workspace 4" + value="3" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-5" + _description="Switch to workspace 5" + value="4" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-6" + _description="Switch to workspace 6" + value="5" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-7" + _description="Switch to workspace 7" + value="6" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-8" + _description="Switch to workspace 8" + value="7" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-9" + _description="Switch to workspace 9" + value="8" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-10" + _description="Switch to workspace 10" + value="9" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-11" + _description="Switch to workspace 11" + value="10" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-12" + _description="Switch to workspace 12" + value="11" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-left" + _description="Switch to workspace on the left of the current workspace" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-right" + _description="Switch to workspace on the right of the current workspace" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-up" + _description="Switch to workspace above the current workspace" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry name="switch-to-workspace-down" + _description="Switch to workspace below the current workspace" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + +</KeyListEntries> + diff --git a/src/50-marco-key.xml.in b/src/50-marco-key.xml.in deleted file mode 100644 index 62c98236..00000000 --- a/src/50-marco-key.xml.in +++ /dev/null @@ -1,269 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<KeyListEntries _name="Window Management" wm_name="Marco" package="marco"> - - <KeyListEntry - name="/apps/marco/window_keybindings/activate_window_menu" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/toggle_fullscreen" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/toggle_maximized" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/maximize" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/unmaximize" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/toggle_shaded" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/close" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/minimize" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/begin_move" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/begin_resize" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/toggle_on_all_workspaces" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/raise_or_lower" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/raise" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/lower" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/maximize_vertically" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/maximize_horizontally" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_1" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_2" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_3" - value="2" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_4" - value="3" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_5" - value="4" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_6" - value="5" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_7" - value="6" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_8" - value="7" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_9" - value="8" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_10" - value="9" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_11" - value="10" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_12" - value="11" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_left" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_right" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_up" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/window_keybindings/move_to_workspace_down" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_windows" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_group" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_panels" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/cycle_windows" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/cycle_group" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/cycle_panels" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/show_desktop" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_1" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_2" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_3" - value="2" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_4" - value="3" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_5" - value="4" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_6" - value="5" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_7" - value="6" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_8" - value="7" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_9" - value="8" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_10" - value="9" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_11" - value="10" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_12" - value="11" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_left" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_right" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_up" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - - <KeyListEntry - name="/apps/marco/global_keybindings/switch_to_workspace_down" - value="1" - key="/apps/marco/general/num_workspaces" - comparison="gt" /> - -</KeyListEntries> - diff --git a/src/50-marco-window-key.xml.in b/src/50-marco-window-key.xml.in new file mode 100644 index 00000000..3aba645c --- /dev/null +++ b/src/50-marco-window-key.xml.in @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.window-keybindings"> + + <KeyListEntry + name="activate-window-menu" + _description="Activate the window menu" /> + + <KeyListEntry + name="toggle-fullscreen" + _description="Toggle fullscreen mode" /> + + <KeyListEntry + name="toggle-maximized" + _description="Toggle maximization state" /> + + <KeyListEntry + name="maximize" + _description="Maximize window" /> + + <KeyListEntry + name="unmaximize" + _description="Restore window" /> + + <KeyListEntry + name="toggle-shaded" + _description="Toggle shaded state" /> + + <KeyListEntry + name="close" + _description="Close window" /> + + <KeyListEntry + name="minimize" + _description="Minimize window" /> + + <KeyListEntry + name="begin-move" + _description="Move window" /> + + <KeyListEntry + name="begin-resize" + _description="Resize window" /> + + <KeyListEntry + name="toggle-on-all-workspaces" + _description="Toggle whether window is on all workspaces or just one" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="raise-or-lower" + _description="Raise window if it's covered by another window, otherwise lower it" /> + + <KeyListEntry + name="raise" + _description="Raise window above other windows" /> + + <KeyListEntry + name="lower" + _description="Lower window below other windows" /> + + <KeyListEntry + name="maximize-vertically" + _description="Maximize window vertically" /> + + <KeyListEntry + name="maximize-horizontally" + _description="Maximize window horizontally" /> + + <KeyListEntry + name="move-to-workspace-1" + _description="Move window to workspace 1" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-2" + _description="Move window to workspace 2" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-3" + _description="Move window to workspace 3" + value="2" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-4" + _description="Move window to workspace 4" + value="3" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-5" + _description="Move window to workspace 5" + value="4" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-6" + _description="Move window to workspace 6" + value="5" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-7" + _description="Move window to workspace 7" + value="6" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-8" + _description="Move window to workspace 8" + value="7" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-9" + _description="Move window to workspace 9" + value="8" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-10" + _description="Move window to workspace 10" + value="9" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-11" + _description="Move window to workspace 11" + value="10" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-12" + _description="Move window to workspace 12" + value="11" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-left" + _description="Move window one workspace to the left" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-right" + _description="Move window one workspace to the right" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-up" + _description="Move window one workspace up" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + + <KeyListEntry + name="move-to-workspace-down" + _description="Move window one workspace down" + value="1" + key="num-workspaces" + schema="org.mate.Marco.general" + comparison="gt" /> + +</KeyListEntries> + diff --git a/src/Makefile.am b/src/Makefile.am index 4688139d..db190def 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -176,7 +176,10 @@ gsettings_SCHEMAS = org.mate.marco.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ xmldir = @MATE_KEYBINDINGS_KEYSDIR@ -xml_in_files = 50-marco-desktop-key.xml.in 50-marco-key.xml.in +xml_in_files = \ + 50-marco-desktop-key.xml.in \ + 50-marco-window-key.xml.in \ + 50-marco-global-key.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) BUILT_SOURCES = |