Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/DjangoDialog.py	Sat Apr 26 16:57:10 2014 +0200
+++ b/ProjectDjango/DjangoDialog.py	Sun Jul 06 18:43:50 2014 +0200
@@ -13,8 +13,9 @@
 except NameError:
     pass
 
-from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo
-from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, QTextEdit
+from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo
+from PyQt5.QtWidgets import (QDialog, QDialogButtonBox, QAbstractButton,
+                             QTextEdit)
 
 from E5Gui import E5MessageBox, E5FileDialog
 
@@ -178,8 +179,8 @@
             self.buttonBox.setFocus()
             E5MessageBox.critical(
                 self,
-                self.trUtf8('Process Generation Error'),
-                self.trUtf8(
+                self.tr('Process Generation Error'),
+                self.tr(
                     'The process {0} could not be started. '
                     'Ensure, that it is in the search path.'
                 ).format(prog))
@@ -262,7 +263,7 @@
         """
         fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
             self,
-            self.trUtf8("Select data file"),
+            self.tr("Select data file"),
             self.workingDir,
             self.fileFilters,
             None)
@@ -283,7 +284,7 @@
             except IOError as err:
                 E5MessageBox.critical(
                     self,
-                    self.trUtf8("Error saving data"),
-                    self.trUtf8("""<p>The data could not be written"""
-                                """ to <b>{0}</b></p><p>Reason: {1}</p>""")
+                    self.tr("Error saving data"),
+                    self.tr("""<p>The data could not be written"""
+                            """ to <b>{0}</b></p><p>Reason: {1}</p>""")
                     .format(fname, str(err)))