Add new control-center key bindings definitions (Closes: #420145)

2007-04-05  Bastien Nocera  <hadess@hadess.net>

	* src/50-metacity-desktop-key.xml.in:
	* src/50-metacity-key.xml.in:
	* src/Makefile.am:
	Add new control-center key bindings definitions (Closes: #420145)

2007-04-05  Bastien Nocera  <hadess@hadess.net>

	* POTFILES.in: add the XML keys definitions to the list


svn path=/trunk/; revision=3170

6 files changed, 308 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f46c8def..c75ce586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-05  Bastien Nocera  <hadess@hadess.net>
+
+	* src/50-metacity-desktop-key.xml.in:
+	* src/50-metacity-key.xml.in:
+	* src/Makefile.am:
+	Add new control-center key bindings definitions (Closes: #420145)
+
 2007-04-04  Elijah Newren  <newren gmail com>
 
         * configure.in: post-release bump to 2.19.2.
diff --git a/po/ChangeLog b/po/ChangeLog
index fa977073..906bceee 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-05  Bastien Nocera  <hadess@hadess.net>
+
+	* POTFILES.in: add the XML keys definitions to the list
+
 2007-04-05  Raivis Dejus <orvils@gmail.com>
 
         * lv.po: Updated Latvian Translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 63d83c18..396148ba 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+src/50-metacity-desktop-key.xml.in
+src/50-metacity-key.xml.in
 src/tools/metacity-message.c
 src/delete.c
 src/display.c
diff --git a/src/50-metacity-desktop-key.xml.in b/src/50-metacity-desktop-key.xml.in
new file mode 100644
index 00000000..dbd5d75a
--- /dev/null
+++ b/src/50-metacity-desktop-key.xml.in
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries _name="Desktop" wm_name="Metacity" package="metacity">
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/panel_run_dialog" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/panel_main_menu" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_screenshot" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_window_screenshot" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_terminal" />
+
+</KeyListEntries>
+
diff --git a/src/50-metacity-key.xml.in b/src/50-metacity-key.xml.in
new file mode 100644
index 00000000..3ce4fe87
--- /dev/null
+++ b/src/50-metacity-key.xml.in
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries _name="Window Management" wm_name="Metacity" package="metacity">
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/activate_window_menu" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/toggle_fullscreen" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/toggle_maximized" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/maximize" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/unmaximize" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/toggle_shaded" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/close" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/minimize" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/begin_move" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/begin_resize" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/toggle_on_all_workspaces"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/raise_or_lower" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/raise" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/lower" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/maximize_vertically" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/maximize_horizontally" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_1"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_2"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_3"
+	value="2"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_4"
+	value="3"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_5"
+	value="4"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_6"
+	value="5"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_7"
+	value="6"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_8"
+	value="7"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_9"
+	value="8"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_10"
+	value="9"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_11"
+	value="10"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_12"
+	value="11"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_left"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_right"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_up"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/window_keybindings/move_to_workspace_down"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_windows" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_panels" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/cycle_windows" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/cycle_group" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/cycle_panels" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/show_desktop" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_1"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_2"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_3"
+	value="2"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_4"
+	value="3"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_5"
+	value="4"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_6"
+	value="5"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_7"
+	value="6"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_8"
+	value="7"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_9"
+	value="8"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_10"
+	value="9"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_11"
+	value="10"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_12"
+	value="11"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_left"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_right"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_up"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/switch_to_workspace_down"
+	value="1"
+	key="/apps/metacity/general/num_workspaces"
+	comparison="gt" />
+
+</KeyListEntries>
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 4815aa4c..40b349ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -161,6 +161,12 @@ schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = metacity.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
+@INTLTOOL_XML_NOMERGE_RULE@
+
+xmldir       = $(datadir)/control-center/keybindings
+xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
+xml_DATA     = $(xml_in_files:.xml.in=.xml)
+
 @INTLTOOL_SCHEMAS_RULE@
 
 if GCONF_SCHEMAS_INSTALL
@@ -177,7 +183,7 @@ VARIABLES=default_icon_data $(srcdir)/default_icon.png \
           stock_delete_data $(srcdir)/stock_delete.png
 
 BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
 
 inlinepixbufs.h: $(IMAGES)
 	   $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
@@ -190,4 +196,6 @@ EXTRA_DIST=$(desktopfiles_files) 	\
 	$(IMAGES) $(schema_DATA) 	\
 	$(desktopfiles_in_files)	\
 	$(schema_in_files)		\
+	$(xml_in_files)			\
 	libmetacity-private.pc.in
+