Eric Assistant: changeset 97:6226cdaea3ad

--- 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))
--- a/AssistantEric/Assistant.py	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/Assistant.py	Sat Jul 05 19:58:44 2014 +0200
@@ -13,7 +13,7 @@
 import re
 import imp

-from PyQt4.QtCore import QRegExp, QObject
+from PyQt5.QtCore import QRegExp, QObject

 from E5Gui.E5Application import e5App
--- a/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.APIsManager.html	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.APIsManager.html	Sat Jul 05 19:58:44 2014 +0200
@@ -104,7 +104,7 @@
 </p><dl>
 <dt><i>mainWindow</i></dt>
 <dd>
-reference to the main eric5 window (QMainWindow)
+reference to the main eric6 window (QMainWindow)
 </dd><dt><i>parent</i></dt>
 <dd>
 reference to the parent object (QObject)
--- a/AssistantEric/Documentation/source/Plugin_Assistant_Eric.PluginAssistantEric.html	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/Documentation/source/Plugin_Assistant_Eric.PluginAssistantEric.html	Sat Jul 05 19:58:44 2014 +0200
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>assistantEricPluginObject</td></tr><tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>error</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr>
+<tr><td>assistantEricPluginObject</td></tr><tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>error</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>python2Compatible</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr>
 </table>
 <h3>Classes</h3>
 <table>
--- a/AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.html	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.html	Sat Jul 05 19:58:44 2014 +0200
@@ -21,7 +21,7 @@
 <body>
 <h1>Plugin_Assistant_Eric</h1>
 <p>
-Package implementing the eric5 assistant plugin.
+Package implementing the eric6 assistant plugin.
 </p>

 <h3>Packages</h3>
--- a/AssistantEric/Documentation/source/index.html	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/Documentation/source/index.html	Sat Jul 05 19:58:44 2014 +0200
@@ -26,7 +26,7 @@
 <table>
 <tr>
 <td><a href="index-Plugin_Assistant_Eric.html">Plugin_Assistant_Eric</a></td>
-<td>Package implementing the eric5 assistant plugin.</td>
+<td>Package implementing the eric6 assistant plugin.</td>
 </tr>
 </table>
--- a/AssistantEric/i18n/assistant_cs.ts	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/i18n/assistant_cs.ts	Sat Jul 05 19:58:44 2014 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1175"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1184"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1178"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1187"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1181"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,85 +31,90 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="82"/>
+        <location filename="../../PluginAssistantEric.py" line="86"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="161"/>
+        <location filename="../../PluginAssistantEric.py" line="165"/>
         <source>The SQLite database driver is not available.</source>
         <translation>Ovladač SQLite databáze není dostupný.</translation>
     </message>
     <message>
         <location filename="../../PluginAssistantEric.py" line="154"/>
         <source>PyQt4.QtSql is not available.</source>
-        <translation>PyQt4.QtSql není dostupné.</translation>
+        <translation type="obsolete">PyQt4.QtSql není dostupné.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="140"/>
-        <source>Your version of eric5 is not supported.</source>
+        <location filename="../../PluginAssistantEric.py" line="144"/>
+        <source>Your version of eric6 is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <source>PyQt5.QtSql is not available.</source>
+        <translation type="unfinished">PyQt4.QtSql není dostupné. {5.?}</translation>
+    </message>
 </context>
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation>&lt;b&gt;Nastavení Eric  autodoplňování&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
         <source>Enable autocompletion</source>
         <translation>Zapnout autodoplňování</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>Vybrat, má-li být podpora eric autodoplňování zapnuta.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
         <source>Source</source>
         <translation>Zdroj</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
         <source>from Document</source>
         <translation>z dokumentu</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>Vybrat toto pro získání autodoplňování z nainstalovaných API</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
         <source>from API files</source>
         <translation>z API souborů</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>Vybrat toto pro získání autodoplňování z aktuálního dokumentu</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>Vybrat toto pro získání autodoplňování z aktuálního projektu</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
         <source>from Project</source>
         <translation>z projektu</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,47 +122,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation>&lt;b&gt;Nastavení Eric Rychlých tipů&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>Vybrat, má-li být podpora Eric Rychlých tipů zapnuta.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
         <source>Enable calltips</source>
         <translation>Zapnout Rychlé tipy</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
         <source>Context display options</source>
         <translation>Nastavení kontextu zobrazování</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
         <source>Select to display calltips with a context</source>
         <translation>Zvolte pro zobrazování rychlých tipů s kontextem</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
         <source>Show context information</source>
         <translation>Zobrazit kontextové informace</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation>Kontext je jmenný prostor (např. C++ namespace, nebo Python modul) před jménem funkce/metody.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="70"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
Binary file AssistantEric/i18n/assistant_de.qm has changed
--- a/AssistantEric/i18n/assistant_de.ts	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/i18n/assistant_de.ts	Sat Jul 05 19:58:44 2014 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1175"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1184"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation>Aufbereitung der &apos;{0}&apos; APIs beendet.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1178"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation>Aufbereitung der &apos;{0}&apos; APIs begonnen.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1187"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation>Aufbereitung der &apos;{0}&apos; APIs abgebrochen.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1181"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation></translation>
     </message>
@@ -31,85 +31,85 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="82"/>
+        <location filename="../../PluginAssistantEric.py" line="86"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="161"/>
+        <location filename="../../PluginAssistantEric.py" line="165"/>
         <source>The SQLite database driver is not available.</source>
         <translation>Der SQLite Datenbanktreiber ist nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="154"/>
-        <source>PyQt4.QtSql is not available.</source>
-        <translation>PyQt4.QtSql ist nicht verfügbar.</translation>
+        <location filename="../../PluginAssistantEric.py" line="144"/>
+        <source>Your version of eric6 is not supported.</source>
+        <translation>Ihre eric6 Version wird nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="140"/>
-        <source>Your version of eric5 is not supported.</source>
-        <translation>Ihre eric5 Version wird nicht unterstützt.</translation>
+        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <source>PyQt5.QtSql is not available.</source>
+        <translation>PyQt5.QtSql ist nicht verfügbar.</translation>
     </message>
 </context>
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation>&lt;b&gt;Eric Autom. Vervollständigung einstellen&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
         <source>Enable autocompletion</source>
         <translation>Autom. Vervollständigung aktivieren</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>Auswählen, um die automatische Vervollständigung mittels Eric Plugin zu aktivieren.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
         <source>Source</source>
         <translation>Quelle</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
         <source>from Document</source>
         <translation>vom Dokument</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>Wähle dies, um Vervollständigungsinfo aus API Dateien zu erhalten</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
         <source>from API files</source>
         <translation>von API Dateien</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>Wähle dies, um Vervollständigungsinfo aus dem aktuellen Dokument zu erhalten</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>Wähle dies, um Vervollständigungsinfo aus dem aktuellen Projekt zu erhalten</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
         <source>from Project</source>
         <translation>vom Projekt</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation>Auswählen, um die vollständige Klassenhierarchie nach Vervollständigungen zu durchsuchen</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
         <source>Search class hierarchy</source>
         <translation>Klassenhierarchie durchsuchen</translation>
     </message>
@@ -117,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation>&lt;b&gt;Eric Calltips einstellen&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>Auswählen, um die Calltipps Unterstützung des Eric Plugins zu aktivieren.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
         <source>Enable calltips</source>
         <translation>Calltipps aktivieren</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
         <source>Context display options</source>
         <translation>Anzeige Optionen für Kontext</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
         <source>Select to display calltips with a context</source>
         <translation>Auswählen, um Calltips mit Kontext anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
         <source>Show context information</source>
         <translation>Kontextinformationen anzeigen</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation>Ein Kontext ist jeder Gültigkeitsbereich (z.B. ein C++ Namensraum oder ein Python Modul), der vor dem Namen der Funktion/Methode steht.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="70"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation>Auswählen, um die vollständige Klassenhierarchie nach Calltipps zu durchsuchen</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
         <source>Search class hierarchy</source>
         <translation>Klassenhierarchie durchsuchen</translation>
     </message>
--- a/AssistantEric/i18n/assistant_en.ts	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/i18n/assistant_en.ts	Sat Jul 05 19:58:44 2014 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1175"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1184"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1178"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1187"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1181"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,85 +31,85 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="82"/>
+        <location filename="../../PluginAssistantEric.py" line="86"/>
         <source>Eric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="140"/>
-        <source>Your version of eric5 is not supported.</source>
+        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <source>The SQLite database driver is not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="154"/>
-        <source>PyQt4.QtSql is not available.</source>
+        <location filename="../../PluginAssistantEric.py" line="144"/>
+        <source>Your version of eric6 is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="161"/>
-        <source>The SQLite database driver is not available.</source>
+        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <source>PyQt5.QtSql is not available.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
         <source>Enable autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
         <source>from API files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
         <source>Select this to get autocompletion from current document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
         <source>from Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
         <source>Select this to get autocompletion from current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
         <source>from Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
         <source>Enable calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
         <source>Context display options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
         <source>Select to display calltips with a context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
         <source>Show context information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="70"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/AssistantEric/i18n/assistant_es.ts	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/i18n/assistant_es.ts	Sat Jul 05 19:58:44 2014 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1175"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
         <source>Project</source>
         <translation>Proyecto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1184"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation>Preparación de &apos;{0}&apos; APIs finalizada.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1178"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation>Preparación de &apos;{0}&apos; APIs iniciada.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1187"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation>Preparación de &apos;{0}&apos; APIs cancelada.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1181"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation>&apos;{0}&apos; APIs: Procesando &apos;{1}&apos;</translation>
     </message>
@@ -31,85 +31,95 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="82"/>
+        <location filename="../../PluginAssistantEric.py" line="86"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="161"/>
+        <location filename="../../PluginAssistantEric.py" line="165"/>
         <source>The SQLite database driver is not available.</source>
         <translation>El driver para base de datos SQLite no está disponible.</translation>
     </message>
     <message>
         <location filename="../../PluginAssistantEric.py" line="154"/>
         <source>PyQt4.QtSql is not available.</source>
-        <translation>No está disponible PyQt4.QtSql.</translation>
+        <translation type="obsolete">No está disponible PyQt4.QtSql.</translation>
     </message>
     <message>
         <location filename="../../PluginAssistantEric.py" line="140"/>
         <source>Your version of eric5 is not supported.</source>
-        <translation>Esta versión de eric5 no está soportada.</translation>
+        <translation type="obsolete">Esta versión de eric5 no está soportada.</translation>
+    </message>
+    <message>
+        <location filename="../../PluginAssistantEric.py" line="144"/>
+        <source>Your version of eric6 is not supported.</source>
+        <translation type="unfinished">Esta versión de eric5 no está soportada. {6 ?}</translation>
+    </message>
+    <message>
+        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <source>PyQt5.QtSql is not available.</source>
+        <translation type="unfinished">No está disponible PyQt4.QtSql. {5.?}</translation>
     </message>
 </context>
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configurar Autocompletar de Eric&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>Seleccionar si el soporte de autocompletar de eric debe ser habilitado.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
         <source>Enable autocompletion</source>
         <translation>Habilitar Autocompletar</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
         <source>Source</source>
         <translation>Origen</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>Seleccionar aquí para obtener autocompletar desde las APIs instaladas</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
         <source>from API files</source>
         <translation>desde archivos API </translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>Seleccionar aquí para obtener autocompletar desde el documento actual</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
         <source>from Document</source>
         <translation>desde Documento</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>Seleccionar aquí para obtener autocompletar desde el proyecto actual</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
         <source>from Project</source>
         <translation>desde Proyecto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation>Seleccionar para buscar a través de la jerarquía de clases completa para completados</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
         <source>Search class hierarchy</source>
         <translation>Buscar por jerarquía de clases</translation>
     </message>
@@ -117,47 +127,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configurar Consejos de Llamada (Calltips) de Eric&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>Seleccionar si el soporte para consejos de llamada debe ser habilitado.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
         <source>Enable calltips</source>
         <translation>Habilitar consejos de llamada (calltips)</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
         <source>Context display options</source>
         <translation>Opciones de visualización de contexto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
         <source>Select to display calltips with a context</source>
         <translation>Seleccionar para mostrar consejos de llamada con contexto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
         <source>Show context information</source>
         <translation>Mostrar información de contexto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation>Un contexto es cualquier ámbito (p. ej. un espacio de nombres C++ o un módulo Python) antepuesto al nombre de función/método.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="70"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation>Seleccionar para buscar a través de la jerarquía de clases completa para calltips</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
         <source>Search class hierarchy</source>
         <translation>Buscar por jerarquía de clases</translation>
     </message>
--- a/AssistantEric/i18n/assistant_fr.ts	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/i18n/assistant_fr.ts	Sat Jul 05 19:58:44 2014 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1175"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1184"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1178"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1187"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1181"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,85 +31,90 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="82"/>
+        <location filename="../../PluginAssistantEric.py" line="86"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="161"/>
+        <location filename="../../PluginAssistantEric.py" line="165"/>
         <source>The SQLite database driver is not available.</source>
         <translation>Le pilote SQLite n&apos;est pas disponible.</translation>
     </message>
     <message>
         <location filename="../../PluginAssistantEric.py" line="154"/>
         <source>PyQt4.QtSql is not available.</source>
-        <translation>PyQt4.QtSql n&apos;est pas disponible.</translation>
+        <translation type="obsolete">PyQt4.QtSql n&apos;est pas disponible.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="140"/>
-        <source>Your version of eric5 is not supported.</source>
+        <location filename="../../PluginAssistantEric.py" line="144"/>
+        <source>Your version of eric6 is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <source>PyQt5.QtSql is not available.</source>
+        <translation type="unfinished">PyQt4.QtSql n&apos;est pas disponible. {5.?}</translation>
+    </message>
 </context>
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configuration de l&apos;autocomplétion Eric&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
         <source>Enable autocompletion</source>
         <translation>Activer l&apos;autocomplétion</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>Cocher si l&apos;autocomplétion Eric doit être activée.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
         <source>Source</source>
         <translation>Source</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
         <source>from Document</source>
         <translation>à partir du document</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>Sélectionner pour utiliser l&apos;autocomplétion à partir des APIs installés</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
         <source>from API files</source>
         <translation>à partir des fichiers API</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>Sélectionner pour utiliser l&apos;autocomplétion à partir du document courant</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>Sélectionner pour utiliser l&apos;autocomplétion à partir du projet courant</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
         <source>from Project</source>
         <translation>à partir du projet</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,47 +122,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configuration des calltips Eric&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>Cocher si les calltips eric doivent être activés.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
         <source>Enable calltips</source>
         <translation>Activer les calltips</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
         <source>Context display options</source>
         <translation>Options d&apos;affichage des contextes</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
         <source>Select to display calltips with a context</source>
         <translation>Cocher pour afficher les calltips dans un contexte</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
         <source>Show context information</source>
         <translation>Afficher les informations du contexte</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation>Un contexte est un espace de nom (ex: espace de nom C++ ou module Python) étant mis en préfixe du nom de méthode ou de fonction.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="70"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/AssistantEric/i18n/assistant_it.ts	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/i18n/assistant_it.ts	Sat Jul 05 19:58:44 2014 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1175"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1184"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1178"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1187"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1181"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,85 +31,90 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="82"/>
+        <location filename="../../PluginAssistantEric.py" line="86"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
         <location filename="../../PluginAssistantEric.py" line="154"/>
         <source>PyQt4.QtSql is not available.</source>
-        <translation>PyQt4.QtSql non è disponibile.</translation>
+        <translation type="obsolete">PyQt4.QtSql non è disponibile.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="161"/>
+        <location filename="../../PluginAssistantEric.py" line="165"/>
         <source>The SQLite database driver is not available.</source>
         <translation>Il driver del database SQLite non è disponibile.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="140"/>
-        <source>Your version of eric5 is not supported.</source>
+        <location filename="../../PluginAssistantEric.py" line="144"/>
+        <source>Your version of eric6 is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <source>PyQt5.QtSql is not available.</source>
+        <translation type="unfinished">PyQt4.QtSql non è disponibile. {5.?}</translation>
+    </message>
 </context>
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configura Autocompeltamento di Eric&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>Select, se il supporto per l&apos;autocompletamento di eric deve essere installato.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
         <source>Enable autocompletion</source>
         <translation>Abilita autocompletamento</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
         <source>Source</source>
         <translation>Sorgente</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>Selezione per avere l&apos;autocompletamento dalle API installate</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
         <source>from API files</source>
         <translation>dai file delle API</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>Selezione per avere l&apos;autocompletamento dal documento corrente</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
         <source>from Document</source>
         <translation>da Documento</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>Selezione per avere l&apos;autocompletamento dal progetto corrente</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
         <source>from Project</source>
         <translation>da Progetto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,47 +122,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configura i Calltips di Eric&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>Seleziona, se il supporto ai calltips di eric deve essere installato.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
         <source>Enable calltips</source>
         <translation>Abilita calltips</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
         <source>Context display options</source>
         <translation>Opzioni di contesto del display</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
         <source>Select to display calltips with a context</source>
         <translation>Seleziona per mostrare i calltips con un contesto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
         <source>Show context information</source>
         <translation>Mostra informazioni di contesto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation>Un contesto è qualsiasi scopo (es. un namespace C++ o un modulo Python) precedente il nome della funzione/metodo.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="70"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/AssistantEric/i18n/assistant_ru.ts	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/i18n/assistant_ru.ts	Sat Jul 05 19:58:44 2014 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1175"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1184"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1178"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1187"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1181"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,85 +31,90 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="82"/>
+        <location filename="../../PluginAssistantEric.py" line="86"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="161"/>
+        <location filename="../../PluginAssistantEric.py" line="165"/>
         <source>The SQLite database driver is not available.</source>
         <translation>Драйвер для SQLite базы данных не доступен.</translation>
     </message>
     <message>
         <location filename="../../PluginAssistantEric.py" line="154"/>
         <source>PyQt4.QtSql is not available.</source>
-        <translation>Модуль PyQt4.QtSql недоступен.</translation>
+        <translation type="obsolete">Модуль PyQt4.QtSql недоступен.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="140"/>
-        <source>Your version of eric5 is not supported.</source>
+        <location filename="../../PluginAssistantEric.py" line="144"/>
+        <source>Your version of eric6 is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <source>PyQt5.QtSql is not available.</source>
+        <translation type="unfinished">Модуль PyQt4.QtSql недоступен. {5.?}</translation>
+    </message>
 </context>
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation>&lt;b&gt;Настройка автозавершения&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
         <source>Enable autocompletion</source>
         <translation>Включить автозавершение</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>Выберите включить-ли режим автозавершения.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
         <source>Source</source>
         <translation>Исходный текст</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
         <source>from Document</source>
         <translation>из документа</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>Использовать автозавершение из установленных API файлов</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
         <source>from API files</source>
         <translation>из API файлов</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>Использовать автозавершение из текущего документа</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>Использовать автозавершение из текущего проекта</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
         <source>from Project</source>
         <translation>из проекта</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,47 +122,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation>&lt;b&gt;Конфигурация подсказок&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>Разешить подсказки.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
         <source>Enable calltips</source>
         <translation>Разешить подсказки</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
         <source>Context display options</source>
         <translation>Опции показа контекста</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
         <source>Select to display calltips with a context</source>
         <translation>Показывать подсказки с контекстом</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
         <source>Show context information</source>
         <translation>Показывать контекст</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation>Контекст - это окружение функции или метода.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="70"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/AssistantEric/i18n/assistant_zh_CN.GB2312.ts	Sat Jul 05 18:58:03 2014 +0200
+++ b/AssistantEric/i18n/assistant_zh_CN.GB2312.ts	Sat Jul 05 19:58:44 2014 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1175"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1184"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1178"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1187"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1181"/>
+        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,85 +31,90 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="82"/>
+        <location filename="../../PluginAssistantEric.py" line="86"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
         <location filename="../../PluginAssistantEric.py" line="154"/>
         <source>PyQt4.QtSql is not available.</source>
-        <translation>PyQt4.QtSql 无效。</translation>
+        <translation type="obsolete">PyQt4.QtSql 无效。</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="161"/>
+        <location filename="../../PluginAssistantEric.py" line="165"/>
         <source>The SQLite database driver is not available.</source>
         <translation>SQLite 数据库驱动器无效。</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="140"/>
-        <source>Your version of eric5 is not supported.</source>
+        <location filename="../../PluginAssistantEric.py" line="144"/>
+        <source>Your version of eric6 is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <source>PyQt5.QtSql is not available.</source>
+        <translation type="unfinished">PyQt4.QtSql 无效。 {5.?}</translation>
+    </message>
 </context>
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation>&lt;b&gt;配置 Eric 自动完成功能&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>选择是否打开 Eric 自动完成功能</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
         <source>Enable autocompletion</source>
         <translation>允许自动完成</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
         <source>Source</source>
         <translation>源</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>选择通过已安装的 APIs 实现自动完成</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
         <source>from API files</source>
         <translation>根据 API 文件</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>选择通过当前文档实现自动完成</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
         <source>from Document</source>
         <translation>根据文档</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>选择通过当前项目实现自动完成</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
         <source>from Project</source>
         <translation>根据项目</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,47 +122,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation>&lt;b&gt;配置 Eric 调用提示&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>选择是否打开 Eric 调用提示功能</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
         <source>Enable calltips</source>
         <translation>允许调用提示</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
         <source>Context display options</source>
         <translation>上下文显示选项</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
         <source>Select to display calltips with a context</source>
         <translation>选择通过上下文显示调用提示</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
         <source>Show context information</source>
         <translation>显示上下文信息</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation>上下文为任意范围（如：C++命名空间或 Python 模块）优先于函数/方法名。</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="70"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- 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):
Binary file PluginAssistantEric.zip has changed
--- a/PluginEricAssistant.e4p	Sat Jul 05 18:58:03 2014 +0200
+++ b/PluginEricAssistant.e4p	Sat Jul 05 19:58:44 2014 +0200
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
-<!-- eric5 project file for project PluginEricAssistant -->
+<!-- eric6 project file for project PluginEricAssistant -->
+<!-- Copyright (C) 2014 Detlev Offenbach, detlev@die-offenbachs.de -->
 <Project version="5.1">
   <Language>en</Language>
   <Hash>3ad6504a180bc4770ebb6d0123dfcca5c4b21f8c</Hash>
   <ProgLanguage mixed="0">Python3</ProgLanguage>
-  <ProjectType>E4Plugin</ProjectType>
+  <ProjectType>E6Plugin</ProjectType>
   <Description>Plugin implementing an alternative autocompletion and calltips provider.</Description>
   <Version>2.6.x</Version>
   <Author>Detlev Offenbach</Author>
@@ -21,6 +22,8 @@
     <Source>AssistantEric/ConfigurationPages/AutoCompletionEricPage.py</Source>
     <Source>AssistantEric/ConfigurationPages/CallTipsEricPage.py</Source>
     <Source>AssistantEric/ConfigurationPages/__init__.py</Source>
+    <Source>AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py</Source>
+    <Source>AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py</Source>
   </Sources>
   <Forms>
     <Form>AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui</Form>
@@ -65,73 +68,97 @@
           <string>add</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>checkout</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>commit</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>diff</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>export</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>global</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>history</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>log</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>remove</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>status</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>tag</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
         <key>
           <string>update</string>
         </key>
         <value>
-          <list/>
+          <list>
+            <string></string>
+          </list>
         </value>
       </dict>
     </VcsOptions>
@@ -141,15 +168,15 @@
   </Vcs>
   <FiletypeAssociations>
     <FiletypeAssociation pattern="*.idl" type="INTERFACES"/>
-    <FiletypeAssociation pattern="*.ptl" type="SOURCES"/>
     <FiletypeAssociation pattern="*.py" type="SOURCES"/>
+    <FiletypeAssociation pattern="*.py3" type="SOURCES"/>
     <FiletypeAssociation pattern="*.pyw" type="SOURCES"/>
+    <FiletypeAssociation pattern="*.pyw3" type="SOURCES"/>
     <FiletypeAssociation pattern="*.qm" type="TRANSLATIONS"/>
     <FiletypeAssociation pattern="*.qrc" type="RESOURCES"/>
     <FiletypeAssociation pattern="*.ts" type="TRANSLATIONS"/>
     <FiletypeAssociation pattern="*.ui" type="FORMS"/>
     <FiletypeAssociation pattern="*.ui.h" type="FORMS"/>
-    <FiletypeAssociation pattern="Ui_*" type="__IGNORE__"/>
   </FiletypeAssociations>
   <Documentation>
     <DocumentationParams>
@@ -163,7 +190,7 @@
               <string>cssFile</string>
             </key>
             <value>
-              <string>%PYTHON%/eric5/CSSs/default.css</string>
+              <string>%PYTHON%/eric6/CSSs/default.css</string>
             </value>
             <key>
               <string>ignoreDirectories</string>
@@ -175,6 +202,8 @@
                 <string>.eric5project</string>
                 <string>_eric5project</string>
                 <string>_ropeproject</string>
+                <string>.eric6project</string>
+                <string>_eric6project</string>
               </list>
             </value>
             <key>
--- a/__init__.py	Sat Jul 05 18:58:03 2014 +0200
+++ b/__init__.py	Sat Jul 05 19:58:44 2014 +0200
@@ -4,5 +4,5 @@
 #

 """
-Package implementing the eric5 assistant plugin.
+Package implementing the eric6 assistant plugin.
 """
AssistantEric/APIsManager.py		file \| annotate \| diff \| comparison \| revisions
AssistantEric/Assistant.py		file \| annotate \| diff \| comparison \| revisions
AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.APIsManager.html		file \| annotate \| diff \| comparison \| revisions
AssistantEric/Documentation/source/Plugin_Assistant_Eric.PluginAssistantEric.html		file \| annotate \| diff \| comparison \| revisions
AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.html		file \| annotate \| diff \| comparison \| revisions
AssistantEric/Documentation/source/index.html		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_cs.ts		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_de.qm		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_de.ts		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_en.ts		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_es.ts		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_fr.ts		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_it.ts		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_ru.ts		file \| annotate \| diff \| comparison \| revisions
AssistantEric/i18n/assistant_zh_CN.GB2312.ts		file \| annotate \| diff \| comparison \| revisions
PluginAssistantEric.py		file \| annotate \| diff \| comparison \| revisions
PluginAssistantEric.zip		file \| annotate \| diff \| comparison \| revisions
PluginEricAssistant.e4p		file \| annotate \| diff \| comparison \| revisions
__init__.py		file \| annotate \| diff \| comparison \| revisions