Mercurial Repositories > Pyramid Project / file diff

--- a/ProjectPyramid/ConfigurationPage/PyramidPage.py	Sat Apr 26 17:12:15 2014 +0200
+++ b/ProjectPyramid/ConfigurationPage/PyramidPage.py	Fri Jul 11 19:01:33 2014 +0200
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.QtCore import pyqtSlot
+from PyQt5.QtCore import pyqtSlot
 
 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
@@ -57,13 +57,13 @@
         self.virtualEnvPy2Completer = E5DirCompleter(self.virtualEnvPy2Edit)
         self.virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit)
         
-        self.py2ShellCombo.addItem(self.trUtf8("Plain Python"), "python")
-        self.py2ShellCombo.addItem(self.trUtf8("IPython"), "ipython")
-        self.py2ShellCombo.addItem(self.trUtf8("bpython"), "bpython")
+        self.py2ShellCombo.addItem(self.tr("Plain Python"), "python")
+        self.py2ShellCombo.addItem(self.tr("IPython"), "ipython")
+        self.py2ShellCombo.addItem(self.tr("bpython"), "bpython")
         
-        self.py3ShellCombo.addItem(self.trUtf8("Plain Python"), "python")
-        self.py3ShellCombo.addItem(self.trUtf8("IPython"), "ipython")
-        self.py3ShellCombo.addItem(self.trUtf8("bpython"), "bpython")
+        self.py3ShellCombo.addItem(self.tr("Plain Python"), "python")
+        self.py3ShellCombo.addItem(self.tr("IPython"), "ipython")
+        self.py3ShellCombo.addItem(self.tr("bpython"), "bpython")
         
         # set initial values
         self.consoleCommandCombo.setEditText(
@@ -121,7 +121,7 @@
             vDir = Utilities.getHomeDir()
         virtualEnv = E5FileDialog.getExistingDirectory(
             self,
-            self.trUtf8("Select Virtual Environment for Python 3"),
+            self.tr("Select Virtual Environment for Python 3"),
             vDir,
             E5FileDialog.Options(E5FileDialog.Option(0)))
         
@@ -140,7 +140,7 @@
             vDir = Utilities.getHomeDir()
         virtualEnv = E5FileDialog.getExistingDirectory(
             self,
-            self.trUtf8("Select Virtual Environment for Python 2"),
+            self.tr("Select Virtual Environment for Python 2"),
             vDir,
             E5FileDialog.Options(E5FileDialog.Option(0)))
         
@@ -156,8 +156,8 @@
         """
         editor = E5FileDialog.getOpenFileName(
             self,
-            self.trUtf8("Translations Editor"),
+            self.tr("Translations Editor"),
             self.translationsEdit.text(),
-            self.trUtf8("All Files (*)"))
+            self.tr("All Files (*)"))
         if editor:
             self.translationsEdit.setText(Utilities.toNativeSeparators(editor))