--- a/eric7/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sat May 22 18:51:46 2021 +0200 @@ -12,7 +12,7 @@ from PyQt6.QtCore import pyqtSlot from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton -from E5Gui import E5MessageBox +from E5Gui import EricMessageBox from .Ui_E5MessageBoxWizardDialog import Ui_E5MessageBoxWizardDialog @@ -22,7 +22,7 @@ Class implementing the eric message box wizard dialog. It displays a dialog for entering the parameters - for the E5MessageBox code generator. + for the EricMessageBox code generator. """ def __init__(self, parent=None): """ @@ -56,46 +56,46 @@ self.tr("Yes to all"), ] self.buttonsCodeListBinary = [ - E5MessageBox.NoButton, - E5MessageBox.Abort, - E5MessageBox.Apply, - E5MessageBox.Cancel, - E5MessageBox.Close, - E5MessageBox.Discard, - E5MessageBox.Help, - E5MessageBox.Ignore, - E5MessageBox.No, - E5MessageBox.NoToAll, - E5MessageBox.Ok, - E5MessageBox.Open, - E5MessageBox.Reset, - E5MessageBox.RestoreDefaults, - E5MessageBox.Retry, - E5MessageBox.Save, - E5MessageBox.SaveAll, - E5MessageBox.Yes, - E5MessageBox.YesToAll, + EricMessageBox.NoButton, + EricMessageBox.Abort, + EricMessageBox.Apply, + EricMessageBox.Cancel, + EricMessageBox.Close, + EricMessageBox.Discard, + EricMessageBox.Help, + EricMessageBox.Ignore, + EricMessageBox.No, + EricMessageBox.NoToAll, + EricMessageBox.Ok, + EricMessageBox.Open, + EricMessageBox.Reset, + EricMessageBox.RestoreDefaults, + EricMessageBox.Retry, + EricMessageBox.Save, + EricMessageBox.SaveAll, + EricMessageBox.Yes, + EricMessageBox.YesToAll, ] self.buttonsCodeListText = [ - "E5MessageBox.NoButton", - "E5MessageBox.Abort", - "E5MessageBox.Apply", - "E5MessageBox.Cancel", - "E5MessageBox.Close", - "E5MessageBox.Discard", - "E5MessageBox.Help", - "E5MessageBox.Ignore", - "E5MessageBox.No", - "E5MessageBox.NoToAll", - "E5MessageBox.Ok", - "E5MessageBox.Open", - "E5MessageBox.Reset", - "E5MessageBox.RestoreDefaults", - "E5MessageBox.Retry", - "E5MessageBox.Save", - "E5MessageBox.SaveAll", - "E5MessageBox.Yes", - "E5MessageBox.YesToAll", + "EricMessageBox.NoButton", + "EricMessageBox.Abort", + "EricMessageBox.Apply", + "EricMessageBox.Cancel", + "EricMessageBox.Close", + "EricMessageBox.Discard", + "EricMessageBox.Help", + "EricMessageBox.Ignore", + "EricMessageBox.No", + "EricMessageBox.NoToAll", + "EricMessageBox.Ok", + "EricMessageBox.Open", + "EricMessageBox.Reset", + "EricMessageBox.RestoreDefaults", + "EricMessageBox.Retry", + "EricMessageBox.Save", + "EricMessageBox.SaveAll", + "EricMessageBox.Yes", + "EricMessageBox.YesToAll", ] self.defaultCombo.addItems(self.buttonsList) @@ -250,13 +250,13 @@ Private method to test the selected options. """ if self.rAbout.isChecked(): - E5MessageBox.about( + EricMessageBox.about( None, self.eCaption.text(), self.eMessage.toPlainText() ) elif self.rAboutQt.isChecked(): - E5MessageBox.aboutQt( + EricMessageBox.aboutQt( None, self.eCaption.text() ) elif ( @@ -265,51 +265,51 @@ self.rWarning.isChecked() or self.rCritical.isChecked() ): - buttons = E5MessageBox.NoButton + buttons = EricMessageBox.NoButton if self.abortCheck.isChecked(): - buttons |= E5MessageBox.Abort + buttons |= EricMessageBox.Abort if self.applyCheck.isChecked(): - buttons |= E5MessageBox.Apply + buttons |= EricMessageBox.Apply if self.cancelCheck.isChecked(): - buttons |= E5MessageBox.Cancel + buttons |= EricMessageBox.Cancel if self.closeCheck.isChecked(): - buttons |= E5MessageBox.Close + buttons |= EricMessageBox.Close if self.discardCheck.isChecked(): - buttons |= E5MessageBox.Discard + buttons |= EricMessageBox.Discard if self.helpCheck.isChecked(): - buttons |= E5MessageBox.Help + buttons |= EricMessageBox.Help if self.ignoreCheck.isChecked(): - buttons |= E5MessageBox.Ignore + buttons |= EricMessageBox.Ignore if self.noCheck.isChecked(): - buttons |= E5MessageBox.No + buttons |= EricMessageBox.No if self.notoallCheck.isChecked(): - buttons |= E5MessageBox.NoToAll + buttons |= EricMessageBox.NoToAll if self.okCheck.isChecked(): - buttons |= E5MessageBox.Ok + buttons |= EricMessageBox.Ok if self.openCheck.isChecked(): - buttons |= E5MessageBox.Open + buttons |= EricMessageBox.Open if self.resetCheck.isChecked(): - buttons |= E5MessageBox.Reset + buttons |= EricMessageBox.Reset if self.restoreCheck.isChecked(): - buttons |= E5MessageBox.RestoreDefaults + buttons |= EricMessageBox.RestoreDefaults if self.retryCheck.isChecked(): - buttons |= E5MessageBox.Retry + buttons |= EricMessageBox.Retry if self.saveCheck.isChecked(): - buttons |= E5MessageBox.Save + buttons |= EricMessageBox.Save if self.saveallCheck.isChecked(): - buttons |= E5MessageBox.SaveAll + buttons |= EricMessageBox.SaveAll if self.yesCheck.isChecked(): - buttons |= E5MessageBox.Yes + buttons |= EricMessageBox.Yes if self.yestoallCheck.isChecked(): - buttons |= E5MessageBox.YesToAll - if buttons == E5MessageBox.NoButton: - buttons = E5MessageBox.Ok + buttons |= EricMessageBox.YesToAll + if buttons == EricMessageBox.NoButton: + buttons = EricMessageBox.Ok defaultButton = self.buttonsCodeListBinary[ self.defaultCombo.currentIndex()] if self.rInformation.isChecked(): - E5MessageBox.information( + EricMessageBox.information( self, self.eCaption.text(), self.eMessage.toPlainText(), @@ -317,7 +317,7 @@ defaultButton ) elif self.rQuestion.isChecked(): - E5MessageBox.question( + EricMessageBox.question( self, self.eCaption.text(), self.eMessage.toPlainText(), @@ -325,7 +325,7 @@ defaultButton ) elif self.rWarning.isChecked(): - E5MessageBox.warning( + EricMessageBox.warning( self, self.eCaption.text(), self.eMessage.toPlainText(), @@ -333,7 +333,7 @@ defaultButton ) elif self.rCritical.isChecked(): - E5MessageBox.critical( + EricMessageBox.critical( self, self.eCaption.text(), self.eMessage.toPlainText(), @@ -345,16 +345,16 @@ self.rRetryAbort.isChecked() ): if self.iconInformation.isChecked(): - icon = E5MessageBox.Information + icon = EricMessageBox.Information elif self.iconQuestion.isChecked(): - icon = E5MessageBox.Question + icon = EricMessageBox.Question elif self.iconWarning.isChecked(): - icon = E5MessageBox.Warning + icon = EricMessageBox.Warning elif self.iconCritical.isChecked(): - icon = E5MessageBox.Critical + icon = EricMessageBox.Critical if self.rYesNo.isChecked(): - E5MessageBox.yesNo( + EricMessageBox.yesNo( self, self.eCaption.text(), self.eMessage.toPlainText(), @@ -362,14 +362,14 @@ yesDefault=self.yesDefaultCheck.isChecked() ) elif self.rRetryAbort.isChecked(): - E5MessageBox.retryAbort( + EricMessageBox.retryAbort( self, self.eCaption.text(), self.eMessage.toPlainText(), icon=icon ) elif self.rOkToClearData.isChecked(): - E5MessageBox.okToClearData( + EricMessageBox.okToClearData( self, self.eCaption.text(), self.eMessage.toPlainText(), @@ -388,41 +388,41 @@ """ buttons = [] if self.abortCheck.isChecked(): - buttons.append("E5MessageBox.Abort") + buttons.append("EricMessageBox.Abort") if self.applyCheck.isChecked(): - buttons.append("E5MessageBox.Apply") + buttons.append("EricMessageBox.Apply") if self.cancelCheck.isChecked(): - buttons.append("E5MessageBox.Cancel") + buttons.append("EricMessageBox.Cancel") if self.closeCheck.isChecked(): - buttons.append("E5MessageBox.Close") + buttons.append("EricMessageBox.Close") if self.discardCheck.isChecked(): - buttons.append("E5MessageBox.Discard") + buttons.append("EricMessageBox.Discard") if self.helpCheck.isChecked(): - buttons.append("E5MessageBox.Help") + buttons.append("EricMessageBox.Help") if self.ignoreCheck.isChecked(): - buttons.append("E5MessageBox.Ignore") + buttons.append("EricMessageBox.Ignore") if self.noCheck.isChecked(): - buttons.append("E5MessageBox.No") + buttons.append("EricMessageBox.No") if self.notoallCheck.isChecked(): - buttons.append("E5MessageBox.NoToAll") + buttons.append("EricMessageBox.NoToAll") if self.okCheck.isChecked(): - buttons.append("E5MessageBox.Ok") + buttons.append("EricMessageBox.Ok") if self.openCheck.isChecked(): - buttons.append("E5MessageBox.Open") + buttons.append("EricMessageBox.Open") if self.resetCheck.isChecked(): - buttons.append("E5MessageBox.Reset") + buttons.append("EricMessageBox.Reset") if self.restoreCheck.isChecked(): - buttons.append("E5MessageBox.RestoreDefaults") + buttons.append("EricMessageBox.RestoreDefaults") if self.retryCheck.isChecked(): - buttons.append("E5MessageBox.Retry") + buttons.append("EricMessageBox.Retry") if self.saveCheck.isChecked(): - buttons.append("E5MessageBox.Save") + buttons.append("EricMessageBox.Save") if self.saveallCheck.isChecked(): - buttons.append("E5MessageBox.SaveAll") + buttons.append("EricMessageBox.SaveAll") if self.yesCheck.isChecked(): - buttons.append("E5MessageBox.Yes") + buttons.append("EricMessageBox.Yes") if self.yestoallCheck.isChecked(): - buttons.append("E5MessageBox.YesToAll") + buttons.append("EricMessageBox.YesToAll") if len(buttons) == 0: return "" @@ -477,13 +477,13 @@ parent = "None" if self.iconInformation.isChecked(): - icon = "E5MessageBox.Information" + icon = "EricMessageBox.Information" elif self.iconQuestion.isChecked(): - icon = "E5MessageBox.Question" + icon = "EricMessageBox.Question" elif self.iconWarning.isChecked(): - icon = "E5MessageBox.Warning" + icon = "EricMessageBox.Warning" elif self.iconCritical.isChecked(): - icon = "E5MessageBox.Critical" + icon = "EricMessageBox.Critical" if not self.rStandard.isChecked(): resvar = self.eResultVar.text() @@ -491,29 +491,29 @@ resvar = "res" if self.rAbout.isChecked(): - msgdlg = "E5MessageBox.about({0}".format(os.linesep) + msgdlg = "EricMessageBox.about({0}".format(os.linesep) elif self.rAboutQt.isChecked(): - msgdlg = "E5MessageBox.aboutQt({0}".format(os.linesep) + msgdlg = "EricMessageBox.aboutQt({0}".format(os.linesep) elif self.rInformation.isChecked(): - msgdlg = "{0} = E5MessageBox.information({1}".format( + msgdlg = "{0} = EricMessageBox.information({1}".format( resvar, os.linesep) elif self.rQuestion.isChecked(): - msgdlg = "{0} = E5MessageBox.question({1}".format( + msgdlg = "{0} = EricMessageBox.question({1}".format( resvar, os.linesep) elif self.rWarning.isChecked(): - msgdlg = "{0} = E5MessageBox.warning({1}".format( + msgdlg = "{0} = EricMessageBox.warning({1}".format( resvar, os.linesep) elif self.rCritical.isChecked(): - msgdlg = "{0} = E5MessageBox.critical({1}".format( + msgdlg = "{0} = EricMessageBox.critical({1}".format( resvar, os.linesep) elif self.rYesNo.isChecked(): - msgdlg = "{0} = E5MessageBox.yesNo({1}".format( + msgdlg = "{0} = EricMessageBox.yesNo({1}".format( resvar, os.linesep) elif self.rRetryAbort.isChecked(): - msgdlg = "{0} = E5MessageBox.retryAbort({1}".format( + msgdlg = "{0} = EricMessageBox.retryAbort({1}".format( resvar, os.linesep) elif self.rOkToClearData.isChecked(): - msgdlg = "{0} = E5MessageBox.okToClearData({1}".format( + msgdlg = "{0} = EricMessageBox.okToClearData({1}".format( resvar, os.linesep) msgdlg += '{0}{1},{2}'.format(istring, parent, os.linesep) @@ -553,7 +553,7 @@ if not resvar: resvar = "dlg" - msgdlg = "{0} = E5MessageBox.E5MessageBox({1}".format( + msgdlg = "{0} = EricMessageBox.EricMessageBox({1}".format( resvar, os.linesep) msgdlg += '{0}{1},{2}'.format(istring, icon, os.linesep) msgdlg += '{0}self.tr("{1}")'.format(