Hello community, here is the log from the commit of package simple-ccsm checked in at Sat Nov 29 23:21:01 CET 2008. -------- --- simple-ccsm/simple-ccsm.changes 2008-11-27 19:45:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/simple-ccsm/simple-ccsm.changes 2008-11-28 18:02:54.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 28 18:01:03 CET 2008 - rodrigo@novell.com + +- Use GtkMessageDialog's for the question/warning dialogs, to get + nice icons +- Fix some issues with the timeout dialog callbacks + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simple-ccsm.spec ++++++ --- /var/tmp/diff_new_pack.W10567/_old 2008-11-29 23:20:51.000000000 +0100 +++ /var/tmp/diff_new_pack.W10567/_new 2008-11-29 23:20:51.000000000 +0100 @@ -24,7 +24,7 @@ Group: System/X11/Utilities PreReq: %fillup_prereq Version: 0.7.8 -Release: 10 +Release: 11 Requires: compiz python-compizconfig python-xml compiz-manager compiz-fusion-plugins-main compizconfig-settings-manager Summary: Simple Settings Manager for Compiz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,6 +82,10 @@ %{py_sitedir}/* %changelog +* Fri Nov 28 2008 rodrigo@novell.com +- Use GtkMessageDialog's for the question/warning dialogs, to get + nice icons +- Fix some issues with the timeout dialog callbacks * Thu Nov 27 2008 rodrigo@novell.com - Improve rollback mechanism with a timeout'ed dialog, which restores previous settings if something goes wrong ++++++ simple-ccsm-cm-dry.patch ++++++ --- /var/tmp/diff_new_pack.W10567/_old 2008-11-29 23:20:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W10567/_new 2008-11-29 23:20:52.000000000 +0100 @@ -2,24 +2,25 @@ =================================================================== --- simple-ccsm.in.orig +++ simple-ccsm.in -@@ -1213,6 +1213,16 @@ class MainWin: - self.Notebook.set_sensitive(running) - self.ProfileChooser.set_sensitive(running) - -+ def EffectsEnabledDialogResponse(self, response, dialog): -+ if response != gtk.RESPONSE_OK: -+ self.EnableEffectsButton.set_active(False) -+ os.system("killall -9 compiz") +@@ -214,6 +214,17 @@ def SetupBoxModel(box): + else: + box.get_model().clear() + ++def ReallyEnableEffectsConfirmationResponse(dialog, response, mainwin): ++ if response != gtk.RESPONSE_YES: ++ mainwin.EnableEffectsButton.set_active(False) ++ os.system("killall -9 compiz") + -+ dialog.destroy() ++ dialog.destroy() + -+ def EffectsEnabledDialogTimeout(self, dialog): -+ self.EffectsEnabledDialogResponse(gtk.RESPONSE_CANCEL, dialog) ++def DialogCloseOnTimeout(dialog): ++ dialog.response(gtk.RESPONSE_NO) ++ return False + - def EnableDesktopEffectsChanged(self, widget): - if self.Block > 0: - return -@@ -1220,10 +1230,7 @@ class MainWin: + class DesktopPreview(gtk.Widget): + def __init__(self, size=(0,0)): + gtk.Widget.__init__(self) +@@ -1220,26 +1231,17 @@ class MainWin: enabled = self.EnableEffectsButton.get_active() if enabled: # First try to check if compiz can be run @@ -29,24 +30,31 @@ - if proc.returncode != 0: + if os.system(CompizDryRunCommand) != 0: # Dry run detected problems, warn the user - dialog = gtk.Dialog () - dialog.set_title("Error") -@@ -1231,11 +1238,11 @@ class MainWin: - label = gtk.Label(_("Desktop effects are not supported on your current hardware / configuration. Would you like to cancel enabling of desktop effects or run them anyway?")) - label.set_line_wrap(True) - dialog.vbox.pack_start(label, +- dialog = gtk.Dialog () +- dialog.set_title("Error") +- dialog.set_border_width(6) +- label = gtk.Label(_("Desktop effects are not supported on your current hardware / configuration. Would you like to cancel enabling of desktop effects or run them anyway?")) +- label.set_line_wrap(True) +- dialog.vbox.pack_start(label, - gtk.TRUE, - gtk.FALSE, -+ True, -+ False, - 3) - dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) +- 3) +- dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) - dialog.add_button("Run anyway", gtk.RESPONSE_OK) -+ dialog.add_button(_("Run anyway"), gtk.RESPONSE_OK) ++ dialog = gtk.MessageDialog(self.Window, ++ 0, ++ gtk.MESSAGE_WARNING, ++ gtk.BUTTONS_YES_NO, ++ _("Desktop effects are not supported on your current hardware / configuration. Would you like to activate them anyway?")) dialog.show_all() response = dialog.run() dialog.destroy() -@@ -1267,7 +1274,7 @@ class MainWin: +- if response != gtk.RESPONSE_OK: ++ if response != gtk.RESPONSE_YES: + self.EnableEffectsButton.set_active(False) + return + +@@ -1267,7 +1269,7 @@ class MainWin: # Start compiz cmd = CompizStartCommand.split(" ") @@ -55,27 +63,24 @@ # Enable compiz in kde try: -@@ -1284,6 +1291,19 @@ class MainWin: +@@ -1284,6 +1286,16 @@ class MainWin: os.remove(path) except (IOError, OSError): pass + + # Show a timeout dialog to rollback if there's any problem -+ dialog = gtk.Dialog() -+ dialog.set_title(_("Desktop effects enabled")) -+ dialog.set_border_width(6) -+ label = gtk.Label(_("Do you want to keep these settings or return to the previous settings? In 10 seconds, previous settings will be restored if you don't aknowledge the changes to your configuration")) -+ label.set_line_wrap(True) -+ dialog.vbox.pack_start(label, True, False, 3) -+ dialog.add_button(_("Keep previous settings"), gtk.RESPONSE_CANCEL) -+ dialog.add_button(_("Use new settings"), gtk.RESPONSE_OK) -+ dialog.connect("response", self.EffectsEnabledDialogResponse, dialog) ++ dialog = gtk.MessageDialog(self.Window, ++ 0, ++ gtk.MESSAGE_QUESTION, ++ gtk.BUTTONS_YES_NO, ++ _("Do you want to keep these settings? In 10 seconds, previous settings will be restored if you don't aknowledge the changes to your configuration")) + dialog.show_all() -+ gobject.timeout_add(10000, self.EffectsEnabledDialogTimeout, dialog) ++ dialog.connect("response", ReallyEnableEffectsConfirmationResponse, self) ++ gobject.timeout_add(10000, DialogCloseOnTimeout, dialog) else: fallbackWM = "" if GnomeSession in os.environ and os.environ[GnomeSession]: -@@ -1297,8 +1317,10 @@ class MainWin: +@@ -1297,8 +1309,10 @@ class MainWin: subprocess.Popen(cmd) # Reset window manager config for KDE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de