--- a/PluginAssistantEric.py Sat Jul 05 18:58:03 2014 +0200 +++ b/PluginAssistantEric.py Sat Jul 05 19:58:44 2014 +0200 @@ -11,8 +11,7 @@ import os -from PyQt4.QtCore import QObject, QTranslator -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QObject, QTranslator, QCoreApplication from E5Gui.E5Application import e5App @@ -25,7 +24,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "2.7.0" +version = "3.0.0" className = "AssistantEricPlugin" packageName = "AssistantEric" shortDescription = "Alternative autocompletion and calltips provider." @@ -78,12 +77,12 @@ """ return { "ericAutoCompletionPage": [ - QApplication.translate("AssistantEricPlugin", "Eric"), + QCoreApplication.translate("AssistantEricPlugin", "Eric"), os.path.join("AssistantEric", "ConfigurationPages", "eric.png"), createAutoCompletionPage, "editorAutocompletionPage", None], "ericCallTipsPage": [ - QApplication.translate("AssistantEricPlugin", "Eric"), + QCoreApplication.translate("AssistantEricPlugin", "Eric"), os.path.join("AssistantEric", "ConfigurationPages", "eric.png"), createCallTipsPage, "editorCalltipsPage", None], @@ -139,9 +138,9 @@ """ global error - suitable = self.__ui.versionIsNewer("5.0.99", "20100811") + suitable = self.__ui.versionIsNewer("5.99.99", "20140704") if not suitable: - error = self.trUtf8("Your version of eric5 is not supported.") + error = self.tr("Your version of eric6 is not supported.") return suitable def __checkQSql(self): @@ -153,16 +152,16 @@ global error try: - from PyQt4.QtSql import QSqlDatabase + from PyQt5.QtSql import QSqlDatabase except ImportError: - error = self.trUtf8("PyQt4.QtSql is not available.") + error = self.tr("PyQt5.QtSql is not available.") return False drivers = QSqlDatabase.drivers() if "QSQLITE" in drivers: return True else: - error = self.trUtf8("The SQLite database driver is not available.") + error = self.tr("The SQLite database driver is not available.") return False def activate(self):