Fri, 28 Jun 2013 19:49:58 +0200
Fixed an issue with the py regexp dialog and the QRegExp dialog. They showed too many buttons when called as a stand-alone application.
(grafted from 5d556f9040e3772100afc8d19c3ee4d03d0fa245)
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sat Jun 22 20:09:26 2013 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Fri Jun 28 19:49:58 2013 +0200 @@ -85,15 +85,15 @@ self.nextButton.setEnabled(False) if fromEric: - self.buttonBox.button(QDialogButtonBox.Close).hide() + self.buttonBox.setStandardButtons( + QDialogButtonBox.Cancel | QDialogButtonBox.Ok) self.copyButton = None else: self.copyButton = \ self.buttonBox.addButton(self.trUtf8("Copy"), QDialogButtonBox.ActionRole) self.copyButton.setToolTip( self.trUtf8("Copy the regular expression to the clipboard")) - self.buttonBox.button(QDialogButtonBox.Ok).hide() - self.buttonBox.button(QDialogButtonBox.Cancel).hide() + self.buttonBox.setStandardButtons(QDialogButtonBox.Close) self.variableLabel.hide() self.variableLineEdit.hide() self.variableLine.hide()
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sat Jun 22 20:09:26 2013 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Fri Jun 28 19:49:58 2013 +0200 @@ -98,15 +98,15 @@ self.nextButton.setEnabled(False) if fromEric: - self.buttonBox.button(QDialogButtonBox.Close).hide() + self.buttonBox.setStandardButtons( + QDialogButtonBox.Cancel | QDialogButtonBox.Ok) self.copyButton = None else: self.copyButton = \ self.buttonBox.addButton(self.trUtf8("Copy"), QDialogButtonBox.ActionRole) self.copyButton.setToolTip( self.trUtf8("Copy the regular expression to the clipboard")) - self.buttonBox.button(QDialogButtonBox.Ok).hide() - self.buttonBox.button(QDialogButtonBox.Cancel).hide() + self.buttonBox.setStandardButtons(QDialogButtonBox.Close) self.variableLabel.hide() self.variableLineEdit.hide() self.variableLine.hide()