diff -r ce77f0b1ee67 -r 9986ec0e559a Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py --- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sun Sep 08 19:04:07 2013 +0200 +++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Tue Oct 15 22:03:54 2013 +0200 @@ -99,8 +99,8 @@ self.defaultCombo.addItems(self.buttonsList) - self.bTest = \ - self.buttonBox.addButton(self.trUtf8("Test"), QDialogButtonBox.ActionRole) + self.bTest = self.buttonBox.addButton( + self.trUtf8("Test"), QDialogButtonBox.ActionRole) self.__enabledGroups() @@ -136,7 +136,8 @@ @pyqtSlot(bool) def on_rInformation_toggled(self, checked): """ - Private slot to handle the toggled signal of the rInformation radio button. + Private slot to handle the toggled signal of the rInformation + radio button. @param on toggle state (boolean) (ignored) """ @@ -145,7 +146,8 @@ @pyqtSlot(bool) def on_rQuestion_toggled(self, checked): """ - Private slot to handle the toggled signal of the rQuestion radio button. + Private slot to handle the toggled signal of the rQuestion + radio button. @param on toggle state (boolean) (ignored) """ @@ -154,7 +156,8 @@ @pyqtSlot(bool) def on_rWarning_toggled(self, checked): """ - Private slot to handle the toggled signal of the rWarning radio button. + Private slot to handle the toggled signal of the rWarning + radio button. @param on toggle state (boolean) (ignored) """ @@ -163,7 +166,8 @@ @pyqtSlot(bool) def on_rCritical_toggled(self, checked): """ - Private slot to handle the toggled signal of the rCritical radio button. + Private slot to handle the toggled signal of the rCritical + radio button. @param on toggle state (boolean) (ignored) """ @@ -172,7 +176,8 @@ @pyqtSlot(bool) def on_rYesNo_toggled(self, checked): """ - Private slot to handle the toggled signal of the rYesNo radio button. + Private slot to handle the toggled signal of the rYesNo + radio button. @param on toggle state (boolean) (ignored) """ @@ -181,7 +186,8 @@ @pyqtSlot(bool) def on_rRetryAbort_toggled(self, checked): """ - Private slot to handle the toggled signal of the rRetryAbort radio button. + Private slot to handle the toggled signal of the rRetryAbort + radio button. @param on toggle state (boolean) (ignored) """ @@ -190,7 +196,8 @@ @pyqtSlot(bool) def on_rOkToClearData_toggled(self, checked): """ - Private slot to handle the toggled signal of the rOkToClearData radio button. + Private slot to handle the toggled signal of the rOkToClearData + radio button. @param on toggle state (boolean) (ignored) """ @@ -199,7 +206,8 @@ @pyqtSlot(bool) def on_rAbout_toggled(self, checked): """ - Private slot to handle the toggled signal of the rAbout radio button. + Private slot to handle the toggled signal of the rAbout + radio button. @param on toggle state (boolean) (ignored) """ @@ -208,7 +216,8 @@ @pyqtSlot(bool) def on_rAboutQt_toggled(self, checked): """ - Private slot to handle the toggled signal of the rAboutQt radio button. + Private slot to handle the toggled signal of the rAboutQt + radio button. @param on toggle state (boolean) (ignored) """ @@ -217,7 +226,8 @@ @pyqtSlot(bool) def on_rStandard_toggled(self, checked): """ - Private slot to handle the toggled signal of the rStandard radio button. + Private slot to handle the toggled signal of the rStandard + radio button. @param on toggle state (boolean) (ignored) """ @@ -291,7 +301,8 @@ if buttons == E5MessageBox.NoButton: buttons = E5MessageBox.Ok - defaultButton = self.buttonsCodeListBinary[self.defaultCombo.currentIndex()] + defaultButton = self.buttonsCodeListBinary[ + self.defaultCombo.currentIndex()] if self.rInformation.isChecked(): E5MessageBox.information(self, @@ -405,10 +416,13 @@ istring2 = istring + indString joinstring = ' | \\{0}{1}'.format(os.linesep, istring2) if withIntro: - btnCode = ',{0}{1}E5MessageBox.StandardButtons('.format(os.linesep, istring) + btnCode = ',{0}{1}E5MessageBox.StandardButtons('.format( + os.linesep, istring) else: - btnCode = 'E5MessageBox.StandardButtons('.format(os.linesep, istring) - btnCode += '{0}{1}{2})'.format(os.linesep, istring2, joinstring.join(buttons)) + btnCode = 'E5MessageBox.StandardButtons('.format( + os.linesep, istring) + btnCode += '{0}{1}{2})'.format( + os.linesep, istring2, joinstring.join(buttons)) return btnCode @@ -461,27 +475,29 @@ if not self.rStandard.isChecked(): if self.rAbout.isChecked(): - msgdlg = "E5MessageBox.about({0},{1}".format(parent, os.linesep) + msgdlg = "E5MessageBox.about({0}".format(os.linesep) elif self.rAboutQt.isChecked(): - msgdlg = "E5MessageBox.aboutQt({0},{1}".format(parent, os.linesep) + msgdlg = "E5MessageBox.aboutQt({0}".format(os.linesep) elif self.rInformation.isChecked(): - msgdlg = "res = E5MessageBox.information({0},{1}".format( - parent, os.linesep) + msgdlg = "res = E5MessageBox.information({0}".format( + os.linesep) elif self.rQuestion.isChecked(): - msgdlg = "res = E5MessageBox.question({0},{1}".format(parent, os.linesep) + msgdlg = "res = E5MessageBox.question({0}".format(os.linesep) elif self.rWarning.isChecked(): - msgdlg = "res = E5MessageBox.warning({0},{1}".format(parent, os.linesep) + msgdlg = "res = E5MessageBox.warning({0}".format(os.linesep) elif self.rCritical.isChecked(): - msgdlg = "res = E5MessageBox.critical({0},{1}".format(parent, os.linesep) + msgdlg = "res = E5MessageBox.critical({0}".format(os.linesep) elif self.rYesNo.isChecked(): - msgdlg = "res = E5MessageBox.yesNo({0},{1}".format(parent, os.linesep) + msgdlg = "res = E5MessageBox.yesNo({0}".format(os.linesep) elif self.rRetryAbort.isChecked(): - msgdlg = "res = E5MessageBox.retryAbort({0},{1}".format(parent, os.linesep) + msgdlg = "res = E5MessageBox.retryAbort({0}".format(os.linesep) elif self.rOkToClearData.isChecked(): - msgdlg = "res = E5MessageBox.okToClearData({0},{1}".format( - parent, os.linesep) + msgdlg = "res = E5MessageBox.okToClearData({0}".format( + os.linesep) - msgdlg += '{0}self.trUtf8("{1}")'.format(istring, self.eCaption.text()) + msgdlg += '{0}{1}{2}'.format(istring, parent, os.linesep) + msgdlg += '{0}self.trUtf8("{1}")'.format( + istring, self.eCaption.text()) if not self.rAboutQt.isChecked(): msgdlg += ',{0}{1}self.trUtf8("""{2}""")'.format( @@ -495,29 +511,37 @@ msgdlg += self.__getDefaultButtonCode(istring) elif self.rYesNo.isChecked(): if not self.iconQuestion.isChecked(): - msgdlg += ',{0}{1}icon={2}'.format(os.linesep, istring, icon) + msgdlg += ',{0}{1}icon={2}'.format( + os.linesep, istring, icon) if self.yesDefaultCheck.isChecked(): - msgdlg += ',{0}{1}yesDefault=True'.format(os.linesep, istring) + msgdlg += ',{0}{1}yesDefault=True'.format( + os.linesep, istring) elif self.rRetryAbort.isChecked(): if not self.iconQuestion.isChecked(): - msgdlg += ',{0}{1}icon={2}'.format(os.linesep, istring, icon) + msgdlg += ',{0}{1}icon={2}'.format( + os.linesep, istring, icon) elif self.rOkToClearData.isChecked(): saveFunc = self.saveFuncEdit.text() if saveFunc == "": saveFunc = "lambda: True" msgdlg += ',{0}{1}{2}'.format(os.linesep, istring, saveFunc) else: - msgdlg = "E5MessageBox.E5MessageBox({0}, {1}".format(icon, os.linesep) - msgdlg += '{0}self.trUtf8("{1}")'.format(istring, self.eCaption.text()) + msgdlg = "E5MessageBox.E5MessageBox({0}".format(os.linesep) + msgdlg += '{0}{1}{2}'.format(istring, icon, os.linesep) + msgdlg += '{0}self.trUtf8("{1}")'.format( + istring, self.eCaption.text()) msgdlg += ',{0}{1}self.trUtf8("""{2}""")'.format( os.linesep, istring, self.eMessage.toPlainText()) if self.modalCheck.isChecked(): msgdlg += ',{0}{1}modal=True'.format(os.linesep, istring) - btnCode = self.__getStandardButtonCode(istring, indString, withIntro=False) + btnCode = self.__getStandardButtonCode( + istring, indString, withIntro=False) if btnCode: - msgdlg += ',{0}{1}buttons={2}'.format(os.linesep, istring, btnCode) + msgdlg += ',{0}{1}buttons={2}'.format( + os.linesep, istring, btnCode) if not self.parentNone.isChecked(): - msgdlg += ',{0}{1}parent={2}'.format(os.linesep, istring, parent) + msgdlg += ',{0}{1}parent={2}'.format( + os.linesep, istring, parent) msgdlg += '){0}'.format(estring) return msgdlg