eric: comparison Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py

-:96232974dcdb
+:645c12de6b0c
 import os
 import re
 import sys
 import json
-from PyQt4.QtCore import QFileInfo, pyqtSlot, qVersion, QProcess, QByteArray
+from PyQt4.QtCore import QFileInfo, pyqtSlot, QProcess, QByteArray
 from PyQt4.QtGui import QWidget, QDialog, QInputDialog, QApplication, \
 QClipboard, QTextCursor, QDialogButtonBox, QVBoxLayout, QTableWidgetItem
 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5MainWindow import E5MainWindow
 response = self.__receiveResponse()
 if response and response["available"]:
 self.__pyqt5Available = True
 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"))
-if qVersion() >= "5.0.0" and self.__pyqt5Available:
+if self.__pyqt5Available:
 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)
 else:
 self.validateButton = None
 self.executeButton = None
 self.nextButton = None
 self.buttonBox.setStandardButtons(
 QDialogButtonBox.Cancel | QDialogButtonBox.Ok)
 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()
 self.variableLine.hide()
 self.regexpTextEdit.setFocus()
 responseStr = data.decode("utf-8")
 responseDict = json.loads(responseStr)
 if responseDict["error"]:
 E5MessageBox.critical(
 self,
-self.trUtf8("Communication Error"),
+self.tr("Communication Error"),
-self.trUtf8("""<p>The PyQt5 backend reported"""
+self.tr("""<p>The PyQt5 backend reported"""
 """ an error.</p><p>{0}</p>""")
 .format(responseDict["error"]))
 responseDict = {}
 return responseDict
 regex = self.regexpTextEdit.toPlainText()[:length]
 names = self.namedGroups(regex)
 if not names:
 E5MessageBox.information(
 self,
-self.trUtf8("Named reference"),
+self.tr("Named reference"),
-self.trUtf8("""No named groups have been defined yet."""))
+self.tr("""No named groups have been defined yet."""))
 return
 groupName, ok = QInputDialog.getItem(
 self,
-self.trUtf8("Named reference"),
+self.tr("Named reference"),
-self.trUtf8("Select group name:"),
+self.tr("Select group name:"),
 names,
 0, True)
 if ok and groupName:
 self.__insertString("(?P={0})".format(groupName))
 """
 Private slot to save the QRegularExpression to a file.
 """
 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:
 ext = QFileInfo(fname).suffix()
 if not ext:
 if ex:
 fname += ex
 if QFileInfo(fname).exists():
 res = E5MessageBox.yesNo(
 self,
-self.trUtf8("Save regular expression"),
+self.tr("Save regular expression"),
-self.trUtf8("<p>The file <b>{0}</b> already exists."
+self.tr("<p>The file <b>{0}</b> already exists."
 " Overwrite it?</p>").format(fname),
 icon=E5MessageBox.Warning)
 if not res:
 return
 try:
 f.write(self.regexpTextEdit.toPlainText())
 f.close()
 except IOError as err:
 E5MessageBox.information(
 self,
-self.trUtf8("Save regular expression"),
+self.tr("Save regular expression"),
-self.trUtf8("""<p>The regular expression could not"""
+self.tr("""<p>The regular expression could not"""
 """ be saved.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 @pyqtSlot()
 def on_loadButton_clicked(self):
 """
 Private slot to load a QRegularExpression from a file.
 """
 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(
 Utilities.toNativeSeparators(fname), "r", encoding="utf-8")
 regexp = f.read()
 f.close()
 self.regexpTextEdit.setPlainText(regexp)
 except IOError as err:
 E5MessageBox.information(
 self,
-self.trUtf8("Save regular expression"),
+self.tr("Save regular expression"),
-self.trUtf8("""<p>The regular expression could not"""
+self.tr("""<p>The regular expression could not"""
 """ be saved.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 @pyqtSlot()
 def on_copyButton_clicked(self):
 """
 @pyqtSlot()
 def on_validateButton_clicked(self):
 """
 Private slot to validate the entered QRegularExpression.
 """
-if qVersion() < "5.0.0" or not self.__pyqt5Available:
+if not self.__pyqt5Available:
-# only available for Qt5
+# only available for PyQt5
 return
 regexp = self.regexpTextEdit.toPlainText()
 if regexp:
 options = []
 response = self.__receiveResponse()
 if response and "valid" in response:
 if response["valid"]:
 E5MessageBox.information(
 self,
-self.trUtf8("Validation"),
+self.tr("Validation"),
-self.trUtf8(
+self.tr(
 """The regular expression is valid."""))
 else:
 E5MessageBox.critical(
 self,
-self.trUtf8("Error"),
+self.tr("Error"),
-self.trUtf8("""Invalid regular expression: {0}""")
+self.tr("""Invalid regular expression: {0}""")
 .format(response["errorMessage"]))
 # move cursor to error offset
 offset = response["errorOffset"]
 tc = self.regexpTextEdit.textCursor()
 tc.setPosition(offset)
 self.regexpTextEdit.setFocus()
 return
 else:
 E5MessageBox.critical(
 self,
-self.trUtf8("Communication Error"),
+self.tr("Communication Error"),
-self.trUtf8("""Invalid response received from"""
+self.tr("""Invalid response received from"""
 """ PyQt5 backend."""))
 else:
 E5MessageBox.critical(
 self,
-self.trUtf8("Communication Error"),
+self.tr("Communication Error"),
-self.trUtf8("""Communication with PyQt5 backend"""
+self.tr("""Communication with PyQt5 backend"""
 """ failed."""))
 else:
 E5MessageBox.critical(
 self,
-self.trUtf8("Error"),
+self.tr("Error"),
-self.trUtf8("""A regular expression must be given."""))
+self.tr("""A regular expression must be given."""))
 @pyqtSlot()
 def on_executeButton_clicked(self, startpos=0):
 """
 Private slot to execute the entered QRegularExpression on the test
 This slot will execute the entered QRegularExpression on the entered
 test data and will display the result in the table part of the dialog.
 @param startpos starting position for the QRegularExpression matching
 """
-if qVersion() < "5.0.0" or not self.__pyqt5Available:
+if not self.__pyqt5Available:
-# only available for Qt5
+# only available for PyQt5
 return
 regexp = self.regexpTextEdit.toPlainText()
 text = self.textTextEdit.toPlainText()
 if regexp and text:
 response = self.__receiveResponse()
 if response and ("valid" in response or "matched" in response):
 if "valid" in response:
 E5MessageBox.critical(
 self,
-self.trUtf8("Error"),
+self.tr("Error"),
-self.trUtf8("""Invalid regular expression: {0}""")
+self.tr("""Invalid regular expression: {0}""")
 .format(response["errorMessage"]))
 # move cursor to error offset
 offset = response["errorOffset"]
 tc = self.regexpTextEdit.textCursor()
 tc.setPosition(offset)
 self.resultTable.setColumnCount(0)
 self.resultTable.setColumnCount(3)
 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(regexp))
 if response["matched"]:
 captures = response["captures"]
 # index 0 is the complete match
 self.lastMatchEnd = captures[0][2]
 self.nextButton.setEnabled(True)
 row += 1
 self.resultTable.setItem(
 row, 0,
-QTableWidgetItem(self.trUtf8("Offset")))
+QTableWidgetItem(self.tr("Offset")))
 self.resultTable.setItem(
 row, 1,
 QTableWidgetItem("{0:d}".format(offset)))
 row += 1
 self.resultTable.setItem(
 row, 0,
-QTableWidgetItem(self.trUtf8("Captures")))
+QTableWidgetItem(self.tr("Captures")))
 self.resultTable.setItem(
 row, 1,
 QTableWidgetItem(
 "{0:d}".format(len(captures) - 1)))
 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(captures[0][0]))
 self.resultTable.setItem(
 row, 2,
 row += 1
 self.resultTable.insertRow(row)
 self.resultTable.setItem(
 row, 0,
 QTableWidgetItem(
-self.trUtf8("Capture #{0}")
+self.tr("Capture #{0}")
 .format(i)))
 self.resultTable.setItem(
 row, 1,
 QTableWidgetItem(captures[i][0]))
 self.resultTable.setItem(
 row += 1
 if startpos > 0:
 self.resultTable.setItem(
 row, 0,
 QTableWidgetItem(
-self.trUtf8("No more matches")))
+self.tr("No more matches")))
 else:
 self.resultTable.setItem(
 row, 0,
 QTableWidgetItem(
-self.trUtf8("No matches")))
+self.tr("No matches")))
 # remove the highlight
 tc = self.textTextEdit.textCursor()
 tc.setPosition(0)
 self.textTextEdit.setTextCursor(tc)
 self.resultTable.verticalHeader().hide()
 self.resultTable.horizontalHeader().hide()
 else:
 E5MessageBox.critical(
 self,
-self.trUtf8("Communication Error"),
+self.tr("Communication Error"),
-self.trUtf8("""Invalid response received from"""
+self.tr("""Invalid response received from"""
 """ PyQt5 backend."""))
 else:
 E5MessageBox.critical(
 self,
-self.trUtf8("Communication Error"),
+self.tr("Communication Error"),
-self.trUtf8("""Communication with PyQt5"""
+self.tr("""Communication with PyQt5"""
 """ backend failed."""))
 else:
 E5MessageBox.critical(
 self,
-self.trUtf8("Error"),
+self.tr("Error"),
-self.trUtf8("""A regular expression and a text must"""
+self.tr("""A regular expression and a text must"""
 """ be given."""))
 @pyqtSlot()
 def on_nextButton_clicked(self):
 """
 Private slot to find the next match.
 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.accepted.connect(self.accept)
-self.cw.buttonBox.rejected[()].connect(self.reject)
+self.cw.buttonBox.rejected.connect(self.reject)
 def getCode(self, indLevel, indString):
 """
 Public method to get the source code.
 self.setWindowTitle(self.cw.windowTitle())
 self.setStyle(
 Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
-self.cw.buttonBox.accepted[()].connect(self.close)
+self.cw.buttonBox.accepted.connect(self.close)
-self.cw.buttonBox.rejected[()].connect(self.close)
+self.cw.buttonBox.rejected.connect(self.close)
 def closeEvent(self, evt):
 """
 Protected method handling the close event.

Mercurial Repositories > eric / file comparison

comparison: Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py

Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py