![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package control-center2 checked in at Sat Apr 22 01:23:47 CEST 2006. -------- --- GNOME/control-center2/control-center2.changes 2006-04-19 16:43:37.000000000 +0200 +++ STABLE/control-center2/control-center2.changes 2006-04-20 22:20:07.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 20 22:19:06 CEST 2006 - danw@suse.de + +- Add compiz keybindings to gnome-keybinding-properties. 163208 + +------------------------------------------------------------------- New: ---- control-center2-compiz-keybindings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ control-center2.spec ++++++ --- /var/tmp/diff_new_pack.CWgoRW/_old 2006-04-22 01:23:39.000000000 +0200 +++ /var/tmp/diff_new_pack.CWgoRW/_new 2006-04-22 01:23:39.000000000 +0200 @@ -21,7 +21,7 @@ Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.12.2 -Release: 47 +Release: 53 Summary: The GNOME Control Center for the GNOME 2.x Desktop Source: %{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -45,6 +45,7 @@ Patch17: control-center2-esd.patch Patch18: control-center2-multiple-displays.patch Patch19: control-center2-gst-0-10.patch +Patch20: control-center2-compiz-keybindings.patch URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem gconf2 shared-mime-info permissions @@ -95,6 +96,7 @@ %patch17 %patch18 %patch19 +%patch20 gnome-patch-translation-update %build @@ -234,6 +236,8 @@ %{prefix}/share/idl/*.idl %changelog -n control-center2 +* Thu Apr 20 2006 - danw@suse.de +- Add compiz keybindings to gnome-keybinding-properties. 163208 * Wed Apr 19 2006 - sreeves@suse.de - Fix for 148037 - mangled widgetry in sound capplet * Thu Apr 13 2006 - sbrabec@suse.cz ++++++ control-center2-compiz-keybindings.patch ++++++ --- capplets/common/wm-common.h +++ capplets/common/wm-common.h @@ -3,6 +3,7 @@ #define WM_COMMON_METACITY "Metacity" #define WM_COMMON_SAWFISH "Sawfish" +#define WM_COMMON_COMPIZ "compiz" #define WM_COMMON_UNKNOWN "Unknown" gchar *wm_common_get_current_window_manager (void); --- capplets/keybindings/gnome-keybinding-properties.c +++ capplets/keybindings/gnome-keybinding-properties.c @@ -28,7 +28,8 @@ typedef enum { ALWAYS_VISIBLE, - N_WORKSPACES_GT + N_WORKSPACES_GT, + N_FACES_GT } KeyListEntryVisibility; typedef struct @@ -38,7 +39,7 @@ gint data; } KeyListEntry; -static const KeyListEntry desktop_key_list[] = +static const KeyListEntry metacity_desktop_key_list[] = { { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 }, { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 }, @@ -59,6 +60,28 @@ #endif { NULL } }; + +static const KeyListEntry compiz_desktop_key_list[] = +{ + { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/general/allscreens/options/run", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/general/allscreens/options/main_menu", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/general/allscreens/options/run_command_screenshot", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/general/allscreens/options/run_command_window_screenshot", ALWAYS_VISIBLE, 0 }, +#ifdef USE_FBLEVEL + { "/apps/gnome_settings_daemon/keybindings/brightness_down", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/brightness_up", ALWAYS_VISIBLE, 0 }, +#endif + { NULL } +}; + static const KeyListEntry sounds_key_list[] = { { "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 }, @@ -133,6 +156,46 @@ { NULL } }; +static const KeyListEntry compiz_key_list[] = +{ + { "/apps/compiz/general/allscreens/options/maximize_window", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/general/allscreens/options/unmaximize_window", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/general/allscreens/options/close_window", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/general/allscreens/options/minimize_window", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/general/allscreens/options/lower_window", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_1_window", N_FACES_GT, 1 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_2_window", N_FACES_GT, 1 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_3_window", N_FACES_GT, 2 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_4_window", N_FACES_GT, 3 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_5_window", N_FACES_GT, 4 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_6_window", N_FACES_GT, 5 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_7_window", N_FACES_GT, 6 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_8_window", N_FACES_GT, 7 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_9_window", N_FACES_GT, 8 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_10_window", N_FACES_GT, 9 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_11_window", N_FACES_GT, 10 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_12_window", N_FACES_GT, 11 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_left_window", N_FACES_GT, 1 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_right_window", N_FACES_GT, 1 }, + { "/apps/compiz/plugins/switcher/screen0/options/initiate", ALWAYS_VISIBLE, 0 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_1", N_FACES_GT, 1 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_2", N_FACES_GT, 1 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_3", N_FACES_GT, 2 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_4", N_FACES_GT, 3 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_5", N_FACES_GT, 4 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_6", N_FACES_GT, 5 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_7", N_FACES_GT, 6 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_8", N_FACES_GT, 7 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_9", N_FACES_GT, 8 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_10", N_FACES_GT, 9 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_11", N_FACES_GT, 10 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_to_12", N_FACES_GT, 11 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_left", N_FACES_GT, 1 }, + { "/apps/compiz/plugins/rotate/screen0/options/rotate_right", N_FACES_GT, 1 }, + { "/apps/compiz/general/allscreens/options/slow_animations", ALWAYS_VISIBLE, 0 }, + { NULL, 0, 0 } +}; + enum { DESCRIPTION_COLUMN, @@ -426,7 +489,7 @@ static gboolean should_show_key (const KeyListEntry *entry) { - gint workspaces; + gint workspaces, faces; GConfClient *client; switch (entry->visibility) { @@ -442,6 +505,16 @@ return TRUE; else return FALSE; + case N_FACES_GT: + client = gconf_client_get_default(); + faces = gconf_client_get_int (client, + "/apps/compiz/general/screen0/options/size", NULL); + g_object_unref (client); + + if (faces > entry->data) + return TRUE; + else + return FALSE; } return FALSE; @@ -562,13 +635,23 @@ { clear_old_model (dialog, WID ("shortcut_treeview")); - append_keys_to_tree (dialog, _("Desktop"), desktop_key_list); - append_keys_to_tree (dialog, _("Sound"), sounds_key_list); - if (strcmp((char *) wm_name, WM_COMMON_METACITY) == 0) { + append_keys_to_tree (dialog, _("Desktop"), metacity_desktop_key_list); + append_keys_to_tree (dialog, _("Sound"), sounds_key_list); append_keys_to_tree (dialog, _("Window Management"), metacity_key_list); } + else if (strcmp((char *) wm_name, WM_COMMON_COMPIZ) == 0) + { + append_keys_to_tree (dialog, _("Desktop"), compiz_desktop_key_list); + append_keys_to_tree (dialog, _("Sound"), sounds_key_list); + append_keys_to_tree (dialog, _("Window Management"), compiz_key_list); + } + else + { + append_keys_to_tree (dialog, _("Desktop"), metacity_desktop_key_list); + append_keys_to_tree (dialog, _("Sound"), sounds_key_list); + } } static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...