diff -r 3078a9781573 -r 573767cf6bde E5Gui/E5MessageBox.py
--- a/E5Gui/E5MessageBox.py Sat Sep 11 18:09:03 2010 +0200
+++ b/E5Gui/E5MessageBox.py Sat Sep 11 19:00:10 2010 +0200
@@ -78,8 +78,13 @@
"""
QMessageBox.__init__(self, parent)
self.setIcon(icon)
- if modal and parent is not None:
- self.setWindowModality(Qt.WindowModal)
+ if modal:
+ if parent is not None:
+ self.setWindowModality(Qt.WindowModal)
+ else:
+ self.setWindowModality(Qt.ApplicationModal)
+ else:
+ self.setWindowModality(Qt.NonModal)
if title == "":
self.setWindowTitle("{0}".format(
QApplication.applicationName()))
@@ -87,6 +92,8 @@
self.setWindowTitle("{0} - {1}".format(
QApplication.applicationName(), title))
self.setText(text)
+ if buttons == QMessageBox.NoButton:
+ buttons = QMessageBox.StandardButtons(QMessageBox.Ok)
self.setStandardButtons(buttons)
################################################################################
