Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -54,96 +54,96 @@
             self.tr("Yes to all"),
         ]
         self.buttonsCodeListBinary = [
-            QMessageBox.NoButton,
-            QMessageBox.Abort,
-            QMessageBox.Apply,
-            QMessageBox.Cancel,
-            QMessageBox.Close,
-            QMessageBox.Discard,
-            QMessageBox.Help,
-            QMessageBox.Ignore,
-            QMessageBox.No,
-            QMessageBox.NoToAll,
-            QMessageBox.Ok,
-            QMessageBox.Open,
-            QMessageBox.Reset,
-            QMessageBox.RestoreDefaults,
-            QMessageBox.Retry,
-            QMessageBox.Save,
-            QMessageBox.SaveAll,
-            QMessageBox.Yes,
-            QMessageBox.YesToAll,
+            QMessageBox.StandardButton.NoButton,
+            QMessageBox.StandardButton.Abort,
+            QMessageBox.StandardButton.Apply,
+            QMessageBox.StandardButton.Cancel,
+            QMessageBox.StandardButton.Close,
+            QMessageBox.StandardButton.Discard,
+            QMessageBox.StandardButton.Help,
+            QMessageBox.StandardButton.Ignore,
+            QMessageBox.StandardButton.No,
+            QMessageBox.StandardButton.NoToAll,
+            QMessageBox.StandardButton.Ok,
+            QMessageBox.StandardButton.Open,
+            QMessageBox.StandardButton.Reset,
+            QMessageBox.StandardButton.RestoreDefaults,
+            QMessageBox.StandardButton.Retry,
+            QMessageBox.StandardButton.Save,
+            QMessageBox.StandardButton.SaveAll,
+            QMessageBox.StandardButton.Yes,
+            QMessageBox.StandardButton.YesToAll,
         ]
         self.buttonsCodeListText = [
-            "QMessageBox.NoButton",
-            "QMessageBox.Abort",
-            "QMessageBox.Apply",
-            "QMessageBox.Cancel",
-            "QMessageBox.Close",
-            "QMessageBox.Discard",
-            "QMessageBox.Help",
-            "QMessageBox.Ignore",
-            "QMessageBox.No",
-            "QMessageBox.NoToAll",
-            "QMessageBox.Ok",
-            "QMessageBox.Open",
-            "QMessageBox.Reset",
-            "QMessageBox.RestoreDefaults",
-            "QMessageBox.Retry",
-            "QMessageBox.Save",
-            "QMessageBox.SaveAll",
-            "QMessageBox.Yes",
-            "QMessageBox.YesToAll",
+            "QMessageBox.StandardButton.NoButton",
+            "QMessageBox.StandardButton.Abort",
+            "QMessageBox.StandardButton.Apply",
+            "QMessageBox.StandardButton.Cancel",
+            "QMessageBox.StandardButton.Close",
+            "QMessageBox.StandardButton.Discard",
+            "QMessageBox.StandardButton.Help",
+            "QMessageBox.StandardButton.Ignore",
+            "QMessageBox.StandardButton.No",
+            "QMessageBox.StandardButton.NoToAll",
+            "QMessageBox.StandardButton.Ok",
+            "QMessageBox.StandardButton.Open",
+            "QMessageBox.StandardButton.Reset",
+            "QMessageBox.StandardButton.RestoreDefaults",
+            "QMessageBox.StandardButton.Retry",
+            "QMessageBox.StandardButton.Save",
+            "QMessageBox.StandardButton.SaveAll",
+            "QMessageBox.StandardButton.Yes",
+            "QMessageBox.StandardButton.YesToAll",
         ]
         
         self.defaultCombo.addItems(self.buttonsList)
         
         self.bTest = self.buttonBox.addButton(
-            self.tr("Test"), QDialogButtonBox.ActionRole)
+            self.tr("Test"), QDialogButtonBox.ButtonRole.ActionRole)
     
     def __testSelectedOptions(self):
         """
         Private method to test the selected options.
         """
-        buttons = QMessageBox.NoButton
+        buttons = QMessageBox.StandardButton.NoButton
         if self.abortCheck.isChecked():
-            buttons |= QMessageBox.Abort
+            buttons |= QMessageBox.StandardButton.Abort
         if self.applyCheck.isChecked():
-            buttons |= QMessageBox.Apply
+            buttons |= QMessageBox.StandardButton.Apply
         if self.cancelCheck.isChecked():
-            buttons |= QMessageBox.Cancel
+            buttons |= QMessageBox.StandardButton.Cancel
         if self.closeCheck.isChecked():
-            buttons |= QMessageBox.Close
+            buttons |= QMessageBox.StandardButton.Close
         if self.discardCheck.isChecked():
-            buttons |= QMessageBox.Discard
+            buttons |= QMessageBox.StandardButton.Discard
         if self.helpCheck.isChecked():
-            buttons |= QMessageBox.Help
+            buttons |= QMessageBox.StandardButton.Help
         if self.ignoreCheck.isChecked():
-            buttons |= QMessageBox.Ignore
+            buttons |= QMessageBox.StandardButton.Ignore
         if self.noCheck.isChecked():
-            buttons |= QMessageBox.No
+            buttons |= QMessageBox.StandardButton.No
         if self.notoallCheck.isChecked():
-            buttons |= QMessageBox.NoToAll
+            buttons |= QMessageBox.StandardButton.NoToAll
         if self.okCheck.isChecked():
-            buttons |= QMessageBox.Ok
+            buttons |= QMessageBox.StandardButton.Ok
         if self.openCheck.isChecked():
-            buttons |= QMessageBox.Open
+            buttons |= QMessageBox.StandardButton.Open
         if self.resetCheck.isChecked():
-            buttons |= QMessageBox.Reset
+            buttons |= QMessageBox.StandardButton.Reset
         if self.restoreCheck.isChecked():
-            buttons |= QMessageBox.RestoreDefaults
+            buttons |= QMessageBox.StandardButton.RestoreDefaults
         if self.retryCheck.isChecked():
-            buttons |= QMessageBox.Retry
+            buttons |= QMessageBox.StandardButton.Retry
         if self.saveCheck.isChecked():
-            buttons |= QMessageBox.Save
+            buttons |= QMessageBox.StandardButton.Save
         if self.saveallCheck.isChecked():
-            buttons |= QMessageBox.SaveAll
+            buttons |= QMessageBox.StandardButton.SaveAll
         if self.yesCheck.isChecked():
-            buttons |= QMessageBox.Yes
+            buttons |= QMessageBox.StandardButton.Yes
         if self.yestoallCheck.isChecked():
-            buttons |= QMessageBox.YesToAll
-        if buttons == QMessageBox.NoButton:
-            buttons = QMessageBox.Ok
+            buttons |= QMessageBox.StandardButton.YesToAll
+        if buttons == QMessageBox.StandardButton.NoButton:
+            buttons = QMessageBox.StandardButton.Ok
         
         defaultButton = self.buttonsCodeListBinary[
             self.defaultCombo.currentIndex()]
@@ -246,41 +246,41 @@
         """
         buttons = []
         if self.abortCheck.isChecked():
-            buttons.append("QMessageBox.Abort")
+            buttons.append("QMessageBox.StandardButton.Abort")
         if self.applyCheck.isChecked():
-            buttons.append("QMessageBox.Apply")
+            buttons.append("QMessageBox.StandardButton.Apply")
         if self.cancelCheck.isChecked():
-            buttons.append("QMessageBox.Cancel")
+            buttons.append("QMessageBox.StandardButton.Cancel")
         if self.closeCheck.isChecked():
-            buttons.append("QMessageBox.Close")
+            buttons.append("QMessageBox.StandardButton.Close")
         if self.discardCheck.isChecked():
-            buttons.append("QMessageBox.Discard")
+            buttons.append("QMessageBox.StandardButton.Discard")
         if self.helpCheck.isChecked():
-            buttons.append("QMessageBox.Help")
+            buttons.append("QMessageBox.StandardButton.Help")
         if self.ignoreCheck.isChecked():
-            buttons.append("QMessageBox.Ignore")
+            buttons.append("QMessageBox.StandardButton.Ignore")
         if self.noCheck.isChecked():
-            buttons.append("QMessageBox.No")
+            buttons.append("QMessageBox.StandardButton.No")
         if self.notoallCheck.isChecked():
-            buttons.append("QMessageBox.NoToAll")
+            buttons.append("QMessageBox.StandardButton.NoToAll")
         if self.okCheck.isChecked():
-            buttons.append("QMessageBox.Ok")
+            buttons.append("QMessageBox.StandardButton.Ok")
         if self.openCheck.isChecked():
-            buttons.append("QMessageBox.Open")
+            buttons.append("QMessageBox.StandardButton.Open")
         if self.resetCheck.isChecked():
-            buttons.append("QMessageBox.Reset")
+            buttons.append("QMessageBox.StandardButton.Reset")
         if self.restoreCheck.isChecked():
-            buttons.append("QMessageBox.RestoreDefaults")
+            buttons.append("QMessageBox.StandardButton.RestoreDefaults")
         if self.retryCheck.isChecked():
-            buttons.append("QMessageBox.Retry")
+            buttons.append("QMessageBox.StandardButton.Retry")
         if self.saveCheck.isChecked():
-            buttons.append("QMessageBox.Save")
+            buttons.append("QMessageBox.StandardButton.Save")
         if self.saveallCheck.isChecked():
-            buttons.append("QMessageBox.SaveAll")
+            buttons.append("QMessageBox.StandardButton.SaveAll")
         if self.yesCheck.isChecked():
-            buttons.append("QMessageBox.Yes")
+            buttons.append("QMessageBox.StandardButton.Yes")
         if self.yestoallCheck.isChecked():
-            buttons.append("QMessageBox.YesToAll")
+            buttons.append("QMessageBox.StandardButton.YesToAll")
         if len(buttons) == 0:
             return ""