GNOME.org
 

[metacity] use the new group names

commit f71c004e1b47f4abb471b05e309b12914d25ba89
Author: William Jon McCann <jmccann redhat com>
Date:   Wed Feb 2 16:40:31 2011 -0500

    use the new group names
    
    From http://live.gnome.org/Design/SystemSettings/Keyboard
    
    https://bugzilla.gnome.org/show_bug.cgi?id=641282

 .gitignore                                         |    7 ++-
 po/POTFILES.in                                     |    7 ++-
 src/50-metacity-desktop-key.xml.in                 |   20 -------
 src/50-metacity-launchers.xml.in                   |    8 +++
 ...ty-key.xml.in => 50-metacity-navigation.xml.in} |   53 +------------------
 src/50-metacity-screenshot.xml.in                  |   11 ++++
 src/50-metacity-system.xml.in                      |   11 ++++
 src/50-metacity-windows.xml.in                     |   56 ++++++++++++++++++++
 src/Makefile.am                                    |   10 +++-
 9 files changed, 105 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 45586a1..c32e43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,8 +126,11 @@ po/zh_HK.gmo
 po/zh_TW.gmo
 src/.deps/
 src/.libs/
-src/50-metacity-desktop-key.xml
-src/50-metacity-key.xml
+src/50-metacity-launchers.xml
+src/50-metacity-navigation.xml
+src/50-metacity-screenshot.xml
+src/50-metacity-system.xml
+src/50-metacity-windows.xml
 src/Makefile
 src/Makefile.in
 src/async-getprop.o
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 730a48e..16ec2f8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,10 @@
 # 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/50-metacity-launchers.xml.in
+src/50-metacity-navigation.xml.in
+src/50-metacity-screenshot.xml.in
+src/50-metacity-system.xml.in
+src/50-metacity-windows.xml.in
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
diff --git a/src/50-metacity-launchers.xml.in b/src/50-metacity-launchers.xml.in
new file mode 100644
index 0000000..b3c78dd
--- /dev/null
+++ b/src/50-metacity-launchers.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries group="system" _name="Launchers" wm_name="Metacity" package="metacity">
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_terminal" />
+
+</KeyListEntries>
+
diff --git a/src/50-metacity-key.xml.in b/src/50-metacity-navigation.xml.in
similarity index 80%
rename from src/50-metacity-key.xml.in
rename to src/50-metacity-navigation.xml.in
index 945145b..f2b0ea6 100644
--- a/src/50-metacity-key.xml.in
+++ b/src/50-metacity-navigation.xml.in
@@ -1,56 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries group="system" _name="Windows" 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" />
+<KeyListEntries group="system" _name="Navigation" wm_name="Metacity" package="metacity">
 
 	<KeyListEntry
 	name="/apps/metacity/window_keybindings/move_to_workspace_1"
diff --git a/src/50-metacity-screenshot.xml.in b/src/50-metacity-screenshot.xml.in
new file mode 100644
index 0000000..a2e3b49
--- /dev/null
+++ b/src/50-metacity-screenshot.xml.in
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries group="system" _name="Screen Shots" wm_name="Metacity" package="metacity">
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_screenshot" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/run_command_window_screenshot" />
+
+</KeyListEntries>
+
diff --git a/src/50-metacity-system.xml.in b/src/50-metacity-system.xml.in
new file mode 100644
index 0000000..0356bb9
--- /dev/null
+++ b/src/50-metacity-system.xml.in
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries group="system" _name="System" wm_name="Metacity" package="metacity">
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/panel_run_dialog" />
+
+	<KeyListEntry
+	name="/apps/metacity/global_keybindings/panel_main_menu" />
+
+</KeyListEntries>
+
diff --git a/src/50-metacity-windows.xml.in b/src/50-metacity-windows.xml.in
new file mode 100644
index 0000000..c0dd3f6
--- /dev/null
+++ b/src/50-metacity-windows.xml.in
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries group="system" _name="Windows" 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" />
+
+</KeyListEntries>
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c9c379..2f35a2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -180,7 +180,13 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_XML_NOMERGE_RULE@
 
 xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
-xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
+xml_in_files = \
+	50-metacity-launchers.xml.in	\
+	50-metacity-navigation.xml.in	\
+	50-metacity-screenshot.xml.in	\
+	50-metacity-system.xml.in	\
+	50-metacity-windows.xml.in
+
 xml_DATA     = $(xml_in_files:.xml.in=.xml)
 
 @INTLTOOL_SCHEMAS_RULE@
@@ -198,7 +204,7 @@ VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
           stock_delete_data $(srcdir)/stock_delete.png
 
 BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas metacity.schemas.in 50-metacity-desktop-key.xml 50-metacity-key.xml
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas metacity.schemas.in 50-metacity-launchers.xml 50-metacity-navigation.xml 50-metacity-screenshot.xml 50-metacity-system.xml 50-metacity-windows.xml
 
 inlinepixbufs.h: $(IMAGES)
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]