Mercurial Repositories > Eric Assistant / file diff

--- a/AssistantEric/APIsManager.py	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/APIsManager.py	Sat Jul 05 19:58:44 2014 +0200
@@ -11,10 +11,10 @@
 
 import os
 
-from PyQt4.QtCore import QTimer, QThread, QFileInfo, pyqtSignal, QDateTime, \
+from PyQt5.QtCore import QTimer, QThread, QFileInfo, pyqtSignal, QDateTime, \
     QObject, Qt
 try:
-    from PyQt4.QtSql import QSqlDatabase, QSqlQuery
+    from PyQt5.QtSql import QSqlDatabase, QSqlQuery
 except ImportError:
     # just ignore it because the main plug-in file will deal with it
     pass
@@ -605,17 +605,8 @@
         self.__project.projectOpened.connect(self.__projectOpened)
         self.__project.newProject.connect(self.__projectOpened)
         self.__project.projectClosed.connect(self.__projectClosed)
-        try:
-            self.__project.projectFormCompiled.connect(
-                self.__projectFormCompiled)
-        except AttributeError:
-            # older eric5 versions don't have this signal
-            pass
-        try:
-            self.__project.projectChanged.connect(self.__projectChanged)
-        except AttributeError:
-            # older eric5 versions don't have this signal
-            pass
+        self.__project.projectFormCompiled.connect(self.__projectFormCompiled)
+        self.__project.projectChanged.connect(self.__projectChanged)
         
         if self.__project.isOpen():
             self.__projectOpened()
@@ -1121,7 +1112,7 @@
         """
         Constructor
         
-        @param mainWindow reference to the main eric5 window (QMainWindow)
+        @param mainWindow reference to the main eric6 window (QMainWindow)
         @param parent reference to the parent object (QObject)
         """
         QObject.__init__(self, parent)
@@ -1188,8 +1179,8 @@
         @param language language of the API (string)
         """
         if language == ApisNameProject:
-            language = self.trUtf8("Project")
-        self.__showMessage(self.trUtf8("Preparation of '{0}' APIs finished.")
+            language = self.tr("Project")
+        self.__showMessage(self.tr("Preparation of '{0}' APIs finished.")
             .format(language))
     
     def __apiPreparationStarted(self, language):
@@ -1199,8 +1190,8 @@
         @param language language of the API (string)
         """
         if language == ApisNameProject:
-            language = self.trUtf8("Project")
-        self.__showMessage(self.trUtf8("Preparation of '{0}' APIs started.")
+            language = self.tr("Project")
+        self.__showMessage(self.tr("Preparation of '{0}' APIs started.")
             .format(language))
     
     def __apiPreparationCancelled(self, language):
@@ -1211,8 +1202,8 @@
         @param language language of the API (string)
         """
         if language == ApisNameProject:
-            language = self.trUtf8("Project")
-        self.__showMessage(self.trUtf8("Preparation of '{0}' APIs cancelled.")
+            language = self.tr("Project")
+        self.__showMessage(self.tr("Preparation of '{0}' APIs cancelled.")
             .format(language))
     
     def __apiPreparationStatus(self, language, status, filename):
@@ -1224,18 +1215,18 @@
         @param filename name of the file being processed (string)
         """
         if language == ApisNameProject:
-            language = self.trUtf8("Project")
+            language = self.tr("Project")
         
         if status == WorkerStatusStarted:
-            self.__showMessage(self.trUtf8(
+            self.__showMessage(self.tr(
                 "Preparation of '{0}' APIs started.").format(language))
         elif status == WorkerStatusFile:
-            self.__showMessage(self.trUtf8(
+            self.__showMessage(self.tr(
                 "'{0}' APIs: Processing '{1}'").format(
                 language, os.path.basename(filename)))
         elif status == WorkerStatusFinished:
-            self.__showMessage(self.trUtf8(
+            self.__showMessage(self.tr(
                 "Preparation of '{0}' APIs finished.").format(language))
         elif status == WorkerStatusAborted:
-            self.__showMessage(self.trUtf8(
+            self.__showMessage(self.tr(
                 "Preparation of '{0}' APIs cancelled.").format(language))