Changeset 7451b88 in sasview

Timestamp:

Oct 7, 2016 4:41:12 PM (8 years ago)

Author:

davidm

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

d813cad8

Parents:

97f05432

git-author:

David Mannicke <david.mannicke@…> (10/07/16 16:16:42)

git-committer:

David Mannicke <david.mannicke@…> (10/07/16 16:41:12)

Message:

cancelling the Quit dialog will now prevent the MainWindow? from closing

Location:

src/sas/qtgui

Files:

• GuiManager.py (modified) (1 diff)
• MainWindow.py (modified) (1 diff)

src/sas/qtgui/GuiManager.py

@@ -238 +238 @@
         reply = QtGui.QMessageBox.question(
             self._parent,
-            'Warning',
+            'Information',
             quit_msg,
             QtGui.QMessageBox.Yes,
             QtGui.QMessageBox.No)
 
-        if reply == QtGui.QMessageBox.No:
-            return
-
         # Exit if yes
-        reactor.callFromThread(reactor.stop)
+        if reply == QtGui.QMessageBox.Yes:
+            reactor.callFromThread(reactor.stop)
+            return True
+
+        return False
 
     def checkUpdate(self):

src/sas/qtgui/MainWindow.py

@@ -65 +65 @@
 
     def closeEvent(self, event):
-        self.guiManager.quitApplication()
+        if self.guiManager.quitApplication():
+            event.accept()
+        else:
+            event.ignore()