compizconfig-backend-kconfig: Changes to 'upstream-unstable'
configure.in.in | 2 +-
settings-backend/kconfig_backend.cpp | 34 +++++-----------------------------
2 files changed, 6 insertions(+), 30 deletions(-)
New commits:
commit 16a32d19f5364359cc542e705708104c6e753d39
Author: Guillaume Seguin <guillaume@segu.in>
Date: Wed Oct 14 04:09:45 2009 +0200
* Bump version to 0.8.4
diff --git a/configure.in.in b/configure.in.in
index a935856..a74f3d5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,6 +1,6 @@
#MIN_CONFIG
KDE_ENABLE_HIDDEN_VISIBILITY
-AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.8.3)
+AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.8.4)
AC_CHECK_RANDOM
AC_CHECK_USLEEP
commit cd90fe31a59cb2d22d6284a32ad6f98bc3448dca
Author: Guillaume Seguin <guillaume@segu.in>
Date: Mon Mar 9 15:52:49 2009 +0100
* Bump version to 0.8.3
diff --git a/configure.in.in b/configure.in.in
index d5a2b33..a935856 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,6 +1,6 @@
#MIN_CONFIG
KDE_ENABLE_HIDDEN_VISIBILITY
-AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.8.2)
+AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.8.3)
AC_CHECK_RANDOM
AC_CHECK_USLEEP
commit 214b5f900eebca6a844459ebb30e178aa72fb1b7
Author: Guillaume Seguin <guillaume@segu.in>
Date: Mon Mar 9 15:50:43 2009 +0100
* Bump version to 0.8.2
diff --git a/configure.in.in b/configure.in.in
index 4deadbe..d5a2b33 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,6 +1,6 @@
#MIN_CONFIG
KDE_ENABLE_HIDDEN_VISIBILITY
-AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.7.7)
+AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.8.2)
AC_CHECK_RANDOM
AC_CHECK_USLEEP
commit 2ce691a692cbde55af27cc9ab6a11bf450493130
Author: Danny Baumann <dannybaumann@web.de>
Date: Thu Feb 5 08:28:54 2009 +0100
Track option movements.
diff --git a/settings-backend/kconfig_backend.cpp b/settings-backend/kconfig_backend.cpp
index e9d9ced..6d1f4bf 100644
--- a/settings-backend/kconfig_backend.cpp
+++ b/settings-backend/kconfig_backend.cpp
@@ -92,21 +92,17 @@ struct _SpecialOption
const specialOptions[] =
{
{"close_window_key", CORE_NAME, "Window Close", true, OptionKey},
- {"run_key", CORE_NAME, "Run Command", true, OptionKey},
- {"main_menu_key", CORE_NAME, "Popup Launch Menu", true, OptionKey},
{"lower_window_key", CORE_NAME, "Window Lower", true, OptionKey},
{"toggle_window_maximized_key", CORE_NAME, "Window Maximize", true, OptionKey},
{"minimize_window_key", CORE_NAME, "Window Minimize", true, OptionKey},
{"toggle_window_maximized_horizontally_key", CORE_NAME, "Window Maximize Horizontal", true, OptionKey},
{"toggle_window_maximized_vertically_key", CORE_NAME, "Window Maximize Vertical", true, OptionKey},
{"show_desktop_key", CORE_NAME, "Toggle Showing Desktop", true, OptionKey},
- {"run_command_screenshot_key", CORE_NAME, "Desktop Screenshot", true, OptionKey},
- {"run_command_window_screenshot_key", CORE_NAME, "Window Screenshot", true, OptionKey},
{"window_menu_key", CORE_NAME, "Window Operations Menu", true, OptionKey},
{"toggle_window_shaded_key", CORE_NAME, "Window Shade", true, OptionKey},
{"raise_window_key", CORE_NAME, "Window Raise", true, OptionKey},
{"toggle_window_fullscreen_key", CORE_NAME, "Window Fullscreen", true, OptionKey},
- {"run_command11_key", CORE_NAME, "Kill Window", true, OptionKey},
+ {"run_command11_key", "commands", "Kill Window", true, OptionKey},
{"initiate_key", "move", "Window Move", true, OptionKey},
{"initiate_key", "resize", "Window Resize", true, OptionKey},
{"rotate_right_key", "rotate", "Switch to Next Desktop", true, OptionKey},
@@ -171,13 +167,11 @@ const specialOptions[] =
{"autoraise_delay", CORE_NAME, "AutoRaiseInterval", false, OptionInt},
{"flip_time", "rotate", "ElectricBorderDelay", false, OptionInt},
- {"command_screenshot", CORE_NAME, NULL, true, OptionSpecial},
- {"command_window_screenshot", CORE_NAME, NULL, true, OptionSpecial},
{"unmaximize_window_key", CORE_NAME, NULL, true, OptionSpecial},
{"maximize_window_key", CORE_NAME, NULL, true, OptionSpecial},
{"maximize_window_horizontally_key", CORE_NAME, NULL, true, OptionSpecial},
{"maximize_window_vertically_key", CORE_NAME, NULL, true, OptionSpecial},
- {"command11", CORE_NAME, NULL, true, OptionSpecial},
+ {"command11", "commands", NULL, true, OptionSpecial},
{"click_to_focus", CORE_NAME, NULL, false, OptionSpecial},
{"mode", "resize", NULL, true, OptionSpecial},
{"number_of_desktops", CORE_NAME, "Number", false, OptionSpecial},
@@ -334,15 +328,7 @@ readIntegratedOption (CCSSetting *setting)
break;
case OptionSpecial:
- if (specialOptions[option].settingName == "command_screenshot")
- {
- ccsSetString (setting, "ksnapshot");
- }
- else if (specialOptions[option].settingName == "command_window_screenshot")
- {
- ccsSetString (setting, "ksnapshot -c");
- }
- else if (specialOptions[option].settingName == "command11")
+ if (specialOptions[option].settingName == "command11")
{
ccsSetString (setting, "xkill");
}
@@ -591,15 +577,7 @@ getSettingIsReadOnly (CCSSetting *setting)
{
case OptionSpecial:
- if (specialOptions[option].settingName == "command_screenshot")
- {
- return TRUE;
- }
- else if (specialOptions[option].settingName == "command_window_screenshot")
- {
- return TRUE;
- }
- else if (specialOptions[option].settingName == "command11")
+ if (specialOptions[option].settingName == "command11")
{
return TRUE;
}
@@ -1163,9 +1141,7 @@ writeIntegratedOption (CCSSetting *setting)
break;
case OptionSpecial:
- if (specialOptions[option].settingName == "command_screenshot"
- || specialOptions[option].settingName == "command_window_screenshot"
- || specialOptions[option].settingName == "command11"
+ if (specialOptions[option].settingName == "command11"
|| specialOptions[option].settingName == "unmaximize_window_key"
|| specialOptions[option].settingName == "maximize_window_key"
|| specialOptions[option].settingName == "maximize_window_horizontally_key"
commit 6c1557ec746c63ddb10f10679dd052f2b7e72e4c
Author: Guillaume Seguin <guillaume@segu.in>
Date: Sat May 31 14:12:58 2008 +0200
* Bump version to 0.7.7
diff --git a/configure.in.in b/configure.in.in
index 66d06ba..4deadbe 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,6 +1,6 @@
#MIN_CONFIG
KDE_ENABLE_HIDDEN_VISIBILITY
-AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.7.6)
+AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.7.7)
AC_CHECK_RANDOM
AC_CHECK_USLEEP
Reply to: