Merge lp:~compiz-team/compiz/compiz.gnome-control-center-integration into lp:compiz/0.9.8

[Sam Spilsbury]

Adds keybinding integration for g-c-c

Adds keybinding integration for g-c-c

[Timo Jyrinki (timo-jyrinki)]

This seems to be working as intended.

review: Approve

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2012-08-02 23:42:20 +0000
+++ cmake/CompizCommon.cmake	2012-08-21 11:38:10 +0000
@@ -457,14 +457,29 @@
     find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
     mark_as_advanced (FORCE INTLTOOL_MERGE_EXECUTABLE)
 
+    set (_additional_arg
+	 -x
+	 -u
+	 ${COMPIZ_I18N_DIR})
+
+    foreach (_arg ${ARGN})
+	if ("${_arg}" STREQUAL "NOTRANSLATIONS")
+	    set (_additional_arg
+		 --no-translations
+		 -x
+		 -u)
+	endif ("${_arg}" STREQUAL "NOTRANSLATIONS")
+    endforeach (_arg ${ARGN})
+
     if (INTLTOOL_MERGE_EXECUTABLE
 	AND COMPIZ_I18N_DIR
 	AND EXISTS ${COMPIZ_I18N_DIR})
 	add_custom_command (
 	    OUTPUT ${_dst}
-	    COMMAND ${INTLTOOL_MERGE_EXECUTABLE} -x -u -c
+	    COMMAND ${INTLTOOL_MERGE_EXECUTABLE}
+		    -c
 		    ${CMAKE_BINARY_DIR}/.intltool-merge-cache
-		    ${COMPIZ_I18N_DIR}
+		    ${_additional_arg}
 		    ${_src}
 		    ${_dst}
 	    DEPENDS ${_src}

=== added file 'gtk/gnome/50-compiz-launchers.xml.in'
--- gtk/gnome/50-compiz-launchers.xml.in	1970-01-01 00:00:00 +0000
+++ gtk/gnome/50-compiz-launchers.xml.in	2012-08-21 11:38:10 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="Launchers" package="compiz">
+
+	<KeyListEntry name="exec" _description="Launch Terminal"/>
+
+</KeyListEntries>

=== added file 'gtk/gnome/50-compiz-navigation.xml.in'
--- gtk/gnome/50-compiz-navigation.xml.in	1970-01-01 00:00:00 +0000
+++ gtk/gnome/50-compiz-navigation.xml.in	2012-08-21 11:38:10 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings" wm_name="Compiz" group="system" _name="Navigation" package="compiz">
+
+	<KeyListEntry name="move-to-workspace-1" _description="Move window to workspace 1" />
+
+	<KeyListEntry name="move-to-workspace-2" _description="Move window to workspace 2" />
+
+	<KeyListEntry name="move-to-workspace-3" _description="Move window to workspace 3" />
+
+	<KeyListEntry name="move-to-workspace-4" _description="Move window to workspace 4" />
+
+	<KeyListEntry name="move-to-workspace-5" _description="Move window to workspace 5" />
+
+	<KeyListEntry name="move-to-workspace-6" _description="Move window to workspace 6" />
+
+	<KeyListEntry name="move-to-workspace-7" _description="Move window to workspace 7" />
+
+	<KeyListEntry name="move-to-workspace-8" _description="Move window to workspace 8" />
+
+	<KeyListEntry name="move-to-workspace-9" _description="Move window to workspace 9" />
+
+	<KeyListEntry name="move-to-workspace-10" _description="Move window to workspace 10" />
+
+	<KeyListEntry name="move-to-workspace-11" _description="Move window to workspace 11" />
+
+	<KeyListEntry name="move-to-workspace-12" _description="Move window to workspace 12" />
+
+	<KeyListEntry name="move-to-workspace-left" _description="Move window one workspace to the left" />
+
+	<KeyListEntry name="move-to-workspace-right" _description="Move window one workspace to the right" />
+
+	<KeyListEntry name="move-to-workspace-up" _description="Move window one workspace up" />
+
+	<KeyListEntry name="move-to-workspace-down" _description="Move window one workspace down" />
+
+	<KeyListEntry name="switch-windows" _description="Switch applications"/>
+
+	<KeyListEntry name="switch-group" _description="Switch windows of an app directly"/>
+
+	<KeyListEntry name="show-desktop" _description="Hide all normal windows" />
+
+	<KeyListEntry name="switch-to-workspace-1" _description="Switch to workspace 1" />
+
+	<KeyListEntry name="switch-to-workspace-2" _description="Switch to workspace 2" />
+
+	<KeyListEntry name="switch-to-workspace-3" _description="Switch to workspace 3" />
+
+	<KeyListEntry name="switch-to-workspace-4" _description="Switch to workspace 4" />
+
+	<KeyListEntry name="switch-to-workspace-5" _description="Switch to workspace 5" />
+
+	<KeyListEntry name="switch-to-workspace-6" _description="Switch to workspace 6" />
+
+	<KeyListEntry name="switch-to-workspace-7" _description="Switch to workspace 7" />
+
+	<KeyListEntry name="switch-to-workspace-8" _description="Switch to workspace 8" />
+
+	<KeyListEntry name="switch-to-workspace-9" _description="Switch to workspace 9" />
+
+	<KeyListEntry name="switch-to-workspace-10" _description="Switch to workspace 10" />
+
+	<KeyListEntry name="switch-to-workspace-11" _description="Switch to workspace 11" />
+
+	<KeyListEntry name="switch-to-workspace-12" _description="Switch to workspace 12" />
+
+	<KeyListEntry name="switch-to-workspace-left" _description="Switch to workspace left" />
+
+	<KeyListEntry name="switch-to-workspace-right" _description="Switch to workspace right"/>
+
+	<KeyListEntry name="switch-to-workspace-up" _description="Switch to workspace above"/>
+
+	<KeyListEntry name="switch-to-workspace-down" _description="Switch to workspace below"/>
+
+</KeyListEntries>

=== added file 'gtk/gnome/50-compiz-screenshot.xml.in'
--- gtk/gnome/50-compiz-screenshot.xml.in	1970-01-01 00:00:00 +0000
+++ gtk/gnome/50-compiz-screenshot.xml.in	2012-08-21 11:38:10 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="Screenshots" package="compiz">
+
+	<KeyListEntry name="run-command-screenshot" _description="Take a screenshot" />
+
+	<KeyListEntry name="run-command-window-screenshot" _description="Take a screenshot of a window"/>
+
+</KeyListEntries>

=== added file 'gtk/gnome/50-compiz-system.xml.in'
--- gtk/gnome/50-compiz-system.xml.in	1970-01-01 00:00:00 +0000
+++ gtk/gnome/50-compiz-system.xml.in	2012-08-21 11:38:10 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeyListEntries schema="org.compiz.integrated" wm_name="Compiz" group="system" _name="System" package="compiz">
+
+	<KeyListEntry name="panel-run-dialog" _description="Show the run command prompt" />
+
+	<KeyListEntry name="panel-main-menu" _description="Show the activities overview" />
+
+</KeyListEntries>

=== added file 'gtk/gnome/50-compiz-windows.xml.in'
--- gtk/gnome/50-compiz-windows.xml.in	1970-01-01 00:00:00 +0000
+++ gtk/gnome/50-compiz-windows.xml.in	2012-08-21 11:38:10 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeyListEntries schema="org.gnome.desktop.wm.keybindings" wm_name="Compiz" group="system" _name="Windows" package="compiz">
+
+	<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="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" />
+
+</KeyListEntries>

=== modified file 'gtk/gnome/CMakeLists.txt'
--- gtk/gnome/CMakeLists.txt	2012-05-24 00:55:17 +0000
+++ gtk/gnome/CMakeLists.txt	2012-08-21 11:38:10 +0000
@@ -9,5 +9,33 @@
 	DESTINATION ${datadir}/applications
     )
 
+    set (_keybindings_files
+	 50-compiz-launchers.xml.in
+	 50-compiz-navigation.xml.in
+	 50-compiz-screenshot.xml.in
+	 50-compiz-system.xml.in
+	 50-compiz-windows.xml.in)
+
+    set (_keybindings_files_translated "")
+
+    foreach (_keybinding_file ${_keybindings_files})
+	string (LENGTH ${_keybinding_file} _str_len)
+	math (EXPR _str_len_no_in "${_str_len} - 3")
+	string (SUBSTRING ${_keybinding_file} 0 ${_str_len_no_in} _keybinding_file_no_in)
+
+	compiz_translate_xml (${CMAKE_CURRENT_SOURCE_DIR}/${_keybinding_file}
+			      ${CMAKE_CURRENT_BINARY_DIR}/${_keybinding_file_no_in} NOTRANSLATIONS)
+
+	list (APPEND _keybindings_files_translated ${CMAKE_CURRENT_BINARY_DIR}/${_keybinding_file_no_in})
+    endforeach (_keybinding_file ${keybinding_files})
+
+    add_custom_target (compiz-gnome-keybindings ALL DEPENDS
+		       ${_keybindings_files_translated})
+
+    install (
+	FILES ${_keybinding_files_translated}
+	DESTINATION ${datadir}/gnome-control-center/keybindings
+    )
+
     add_custom_target (compiz.desktop ALL SOURCES ${desktop_file})
 endif (BUILD_GNOME)

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-02-18 01:34:16 +0000
+++ po/POTFILES.in	2012-08-21 11:38:10 +0000
@@ -3,6 +3,11 @@
 gtk/window-decorator/forcequit.c
 gtk/window-decorator/gtk-window-decorator.c
 gtk/window-decorator/gwd.schemas.in
+gtk/gnome/50-compiz-launchers.xml.in
+gtk/gnome/50-compiz-navigation.xml.in
+gtk/gnome/50-compiz-screenshot.xml.in
+gtk/gnome/50-compiz-windows.xml.in
+gtk/gnome/50-compiz-system.xml.in
 metadata/core.xml.in
 plugins/annotate/annotate.xml.in
 plugins/blur/blur.xml.in