diff -r 96232974dcdb -r 645c12de6b0c Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Mar 30 22:00:14 2014 +0200
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Thu Apr 03 23:05:31 2014 +0200
@@ -72,25 +72,25 @@
self.namedGroups = re.compile(r"""\(?P<([^>]+)>""").findall
self.saveButton = self.buttonBox.addButton(
- self.trUtf8("Save"), QDialogButtonBox.ActionRole)
+ self.tr("Save"), QDialogButtonBox.ActionRole)
self.saveButton.setToolTip(
- self.trUtf8("Save the regular expression to a file"))
+ self.tr("Save the regular expression to a file"))
self.loadButton = self.buttonBox.addButton(
- self.trUtf8("Load"), QDialogButtonBox.ActionRole)
+ self.tr("Load"), QDialogButtonBox.ActionRole)
self.loadButton.setToolTip(
- self.trUtf8("Load a regular expression from a file"))
+ self.tr("Load a regular expression from a file"))
self.validateButton = self.buttonBox.addButton(
- self.trUtf8("Validate"), QDialogButtonBox.ActionRole)
+ self.tr("Validate"), QDialogButtonBox.ActionRole)
self.validateButton.setToolTip(
- self.trUtf8("Validate the regular expression"))
+ self.tr("Validate the regular expression"))
self.executeButton = self.buttonBox.addButton(
- self.trUtf8("Execute"), QDialogButtonBox.ActionRole)
+ self.tr("Execute"), QDialogButtonBox.ActionRole)
self.executeButton.setToolTip(
- self.trUtf8("Execute the regular expression"))
+ self.tr("Execute the regular expression"))
self.nextButton = self.buttonBox.addButton(
- self.trUtf8("Next match"), QDialogButtonBox.ActionRole)
+ self.tr("Next match"), QDialogButtonBox.ActionRole)
self.nextButton.setToolTip(
- self.trUtf8("Show the next match of the regular expression"))
+ self.tr("Show the next match of the regular expression"))
self.nextButton.setEnabled(False)
if fromEric:
@@ -99,9 +99,9 @@
self.copyButton = None
else:
self.copyButton = self.buttonBox.addButton(
- self.trUtf8("Copy"), QDialogButtonBox.ActionRole)
+ self.tr("Copy"), QDialogButtonBox.ActionRole)
self.copyButton.setToolTip(
- self.trUtf8("Copy the regular expression to the clipboard"))
+ self.tr("Copy the regular expression to the clipboard"))
self.buttonBox.setStandardButtons(QDialogButtonBox.Close)
self.variableLabel.hide()
self.variableLineEdit.hide()
@@ -180,14 +180,14 @@
if not names:
E5MessageBox.information(
self,
- self.trUtf8("Named reference"),
- self.trUtf8("""No named groups have been defined yet."""))
+ self.tr("Named reference"),
+ self.tr("""No named groups have been defined yet."""))
return
groupName, ok = QInputDialog.getItem(
self,
- self.trUtf8("Named reference"),
- self.trUtf8("Select group name:"),
+ self.tr("Named reference"),
+ self.tr("Select group name:"),
names,
0, True)
if ok and groupName:
@@ -317,9 +317,9 @@
"""
fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
self,
- self.trUtf8("Save regular expression"),
+ self.tr("Save regular expression"),
"",
- self.trUtf8("RegExp Files (*.rx);;All Files (*)"),
+ self.tr("RegExp Files (*.rx);;All Files (*)"),
None,
E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
if fname:
@@ -331,9 +331,9 @@
if QFileInfo(fname).exists():
res = E5MessageBox.yesNo(
self,
- self.trUtf8("Save regular expression"),
- self.trUtf8("<p>The file <b>{0}</b> already exists."
- " Overwrite it?</p>").format(fname),
+ self.tr("Save regular expression"),
+ self.tr("<p>The file <b>{0}</b> already exists."
+ " Overwrite it?</p>").format(fname),
icon=E5MessageBox.Warning)
if not res:
return
@@ -346,9 +346,9 @@
except IOError as err:
E5MessageBox.information(
self,
- self.trUtf8("Save regular expression"),
- self.trUtf8("""<p>The regular expression could not"""
- """ be saved.</p><p>Reason: {0}</p>""")
+ self.tr("Save regular expression"),
+ self.tr("""<p>The regular expression could not"""
+ """ be saved.</p><p>Reason: {0}</p>""")
.format(str(err)))
@pyqtSlot()
@@ -358,9 +358,9 @@
"""
fname = E5FileDialog.getOpenFileName(
self,
- self.trUtf8("Load regular expression"),
+ self.tr("Load regular expression"),
"",
- self.trUtf8("RegExp Files (*.rx);;All Files (*)"))
+ self.tr("RegExp Files (*.rx);;All Files (*)"))
if fname:
try:
f = open(
@@ -371,9 +371,9 @@
except IOError as err:
E5MessageBox.information(
self,
- self.trUtf8("Save regular expression"),
- self.trUtf8("""<p>The regular expression could not"""
- """ be saved.</p><p>Reason: {0}</p>""")
+ self.tr("Save regular expression"),
+ self.tr("""<p>The regular expression could not"""
+ """ be saved.</p><p>Reason: {0}</p>""")
.format(str(err)))
@pyqtSlot()
@@ -419,27 +419,27 @@
re.compile(regex, flags)
E5MessageBox.information(
self,
- self.trUtf8("Validation"),
- self.trUtf8("""The regular expression is valid."""))
+ self.tr("Validation"),
+ self.tr("""The regular expression is valid."""))
except re.error as e:
E5MessageBox.critical(
self,
- self.trUtf8("Error"),
- self.trUtf8("""Invalid regular expression: {0}""")
+ self.tr("Error"),
+ self.tr("""Invalid regular expression: {0}""")
.format(str(e)))
return
except IndexError:
E5MessageBox.critical(
self,
- self.trUtf8("Error"),
- self.trUtf8("""Invalid regular expression: missing"""
- """ group name"""))
+ self.tr("Error"),
+ self.tr("""Invalid regular expression: missing"""
+ """ group name"""))
return
else:
E5MessageBox.critical(
self,
- self.trUtf8("Error"),
- self.trUtf8("""A regular expression must be given."""))
+ self.tr("Error"),
+ self.tr("""A regular expression must be given."""))
@pyqtSlot()
def on_executeButton_clicked(self, startpos=0):
@@ -488,7 +488,7 @@
self.resultTable.setRowCount(0)
self.resultTable.setRowCount(OFFSET)
self.resultTable.setItem(
- row, 0, QTableWidgetItem(self.trUtf8("Regexp")))
+ row, 0, QTableWidgetItem(self.tr("Regexp")))
self.resultTable.setItem(
row, 1, QTableWidgetItem(regex))
@@ -499,7 +499,7 @@
row += 1
self.resultTable.setItem(
row, 0,
- QTableWidgetItem(self.trUtf8("Offset")))
+ QTableWidgetItem(self.tr("Offset")))
self.resultTable.setItem(
row, 1,
QTableWidgetItem("{0:d}".format(matchobj.start(0))))
@@ -507,22 +507,22 @@
row += 1
self.resultTable.setItem(
row, 0,
- QTableWidgetItem(self.trUtf8("Captures")))
+ QTableWidgetItem(self.tr("Captures")))
self.resultTable.setItem(
row, 1,
QTableWidgetItem("{0:d}".format(captures)))
row += 1
self.resultTable.setItem(
row, 1,
- QTableWidgetItem(self.trUtf8("Text")))
+ QTableWidgetItem(self.tr("Text")))
self.resultTable.setItem(
row, 2,
- QTableWidgetItem(self.trUtf8("Characters")))
+ QTableWidgetItem(self.tr("Characters")))
row += 1
self.resultTable.setItem(
row, 0,
- QTableWidgetItem(self.trUtf8("Match")))
+ QTableWidgetItem(self.tr("Match")))
self.resultTable.setItem(
row, 1,
QTableWidgetItem(matchobj.group(0)))
@@ -538,7 +538,7 @@
self.resultTable.setItem(
row, 0,
QTableWidgetItem(
- self.trUtf8("Capture #{0}").format(i)))
+ self.tr("Capture #{0}").format(i)))
self.resultTable.setItem(
row, 1, QTableWidgetItem(matchobj.group(i)))
self.resultTable.setItem(
@@ -557,11 +557,11 @@
if startpos > 0:
self.resultTable.setItem(
row, 0,
- QTableWidgetItem(self.trUtf8("No more matches")))
+ QTableWidgetItem(self.tr("No more matches")))
else:
self.resultTable.setItem(
row, 0,
- QTableWidgetItem(self.trUtf8("No matches")))
+ QTableWidgetItem(self.tr("No matches")))
# remove the highlight
tc = self.textTextEdit.textCursor()
@@ -575,23 +575,23 @@
except re.error as e:
E5MessageBox.critical(
self,
- self.trUtf8("Error"),
- self.trUtf8("""Invalid regular expression: {0}""")
+ self.tr("Error"),
+ self.tr("""Invalid regular expression: {0}""")
.format(str(e)))
return
except IndexError:
E5MessageBox.critical(
self,
- self.trUtf8("Error"),
- self.trUtf8("""Invalid regular expression: missing"""
- """ group name"""))
+ self.tr("Error"),
+ self.tr("""Invalid regular expression: missing"""
+ """ group name"""))
return
else:
E5MessageBox.critical(
self,
- self.trUtf8("Error"),
- self.trUtf8("""A regular expression and a text must be"""
- """ given."""))
+ self.tr("Error"),
+ self.tr("""A regular expression and a text must be"""
+ """ given."""))
@pyqtSlot()
def on_nextButton_clicked(self):
@@ -617,9 +617,9 @@
# set the checkboxes
self.localeCheckBox.setEnabled(checked)
if checked:
- self.unicodeCheckBox.setText(self.trUtf8("Unicode"))
+ self.unicodeCheckBox.setText(self.tr("Unicode"))
else:
- self.unicodeCheckBox.setText(self.trUtf8("ASCII"))
+ self.unicodeCheckBox.setText(self.tr("ASCII"))
self.unicodeCheckBox.setChecked(not self.unicodeCheckBox.isChecked())
# clear the result table
@@ -706,9 +706,10 @@
size = self.cw.size()
self.__layout.addWidget(self.cw)
self.resize(size)
+ self.setWindowTitle(self.cw.windowTitle())
- self.cw.buttonBox.accepted[()].connect(self.accept)
- self.cw.buttonBox.rejected[()].connect(self.reject)
+ self.cw.buttonBox.accepted.connect(self.accept)
+ self.cw.buttonBox.rejected.connect(self.reject)
def getCode(self, indLevel, indString):
"""
@@ -736,9 +737,10 @@
size = self.cw.size()
self.setCentralWidget(self.cw)
self.resize(size)
+ self.setWindowTitle(self.cw.windowTitle())
self.setStyle(
Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
- self.cw.buttonBox.accepted[()].connect(self.close)
- self.cw.buttonBox.rejected[()].connect(self.close)
+ self.cw.buttonBox.accepted.connect(self.close)
+ self.cw.buttonBox.rejected.connect(self.close)
