Changeset 10181

Timestamp:

08/11/08 10:38:35 (3 months ago)

Author:

asterix

Message:

make ad-hoc cancel warning dialog non-blocking. It was the last blocking dialog ! Fixes #4147

Files:

• trunk/src/adhoc_commands.py (modified) (2 diffs)

trunk/src/adhoc_commands.py

@@ -55 +55 @@
                 self.sessionid = None
                 self.dataform = None
+                self.allow_stage3_close = False
 
                 # retrieving widgets from xml
@@ -248 +249 @@
                         return False
 
-                dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL,
-                        gtk.BUTTONS_YES_NO, _('Cancel confirmation'),
-                        _('You are in process of executing command. Do you really want to cancel it?'))
+                if self.allow_stage3_close:
+                        return False
+
+                def on_yes(button):
+                        self.send_cancel()
+                        self.allow_stage3_close = True
+                        self.window.destroy()
+
+                dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT | \
+                        gtk.DIALOG_MODAL, gtk.BUTTONS_YES_NO, _('Cancel confirmation'),
+                        _('You are in process of executing command. Do you really want to '
+                        'cancel it?'), on_response_yes=on_yes)
                 dialog.popup()
-                if dialog.get_response()==gtk.RESPONSE_YES:
-                        self.send_cancel()
-                        if widget==self.window:
-                                return False
-                        else:
-                                self.window.destroy()
-                        return False
-                return True
+                return True # Block event, don't close window
 
         def stage3_back_button_clicked(self, widget):