Removed support for Python2. release-5.0.0

Mon, 22 Jun 2020 19:16:15 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 22 Jun 2020 19:16:15 +0200
changeset 163
842fce9b31ce
parent 162
db992524e3f5
child 164
2b230bd8ab53

Removed support for Python2.

AssistantEric/APIsManager.py file | annotate | diff | comparison | revisions
AssistantEric/Assistant.py file | annotate | diff | comparison | revisions
AssistantEric/ConfigurationPages/AutoCompletionEricPage.py file | annotate | diff | comparison | revisions
AssistantEric/ConfigurationPages/CallTipsEricPage.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.AssistantEric.Assistant.html file | annotate | diff | comparison | revisions
AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.AutoCompletionEricPage.html file | annotate | diff | comparison | revisions
AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.CallTipsEricPage.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.AssistantEric.ConfigurationPages.html file | annotate | diff | comparison | revisions
AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.AssistantEric.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.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_pt.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
ChangeLog 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
--- a/AssistantEric/APIsManager.py	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/APIsManager.py	Mon Jun 22 19:16:15 2020 +0200
@@ -11,8 +11,9 @@
 
 import os
 
-from PyQt5.QtCore import QTimer, QThread, QFileInfo, pyqtSignal, QDateTime, \
-    QObject, Qt
+from PyQt5.QtCore import (
+    QTimer, QThread, QFileInfo, pyqtSignal, QDateTime, QObject, Qt
+)
 try:
     from PyQt5.QtSql import QSqlDatabase, QSqlQuery
 except ImportError:
@@ -174,8 +175,10 @@
         finally:
             db.commit()
         if self.__projectPath:
-            modTime = QFileInfo(os.path.join(self.__projectPath, apiFile))\
+            modTime = (
+                QFileInfo(os.path.join(self.__projectPath, apiFile))
                 .lastModified()
+            )
         else:
             modTime = QFileInfo(apiFile).lastModified()
             basesFile = os.path.splitext(apiFile)[0] + ".bas"
@@ -255,8 +258,10 @@
             try:
                 basesFile = os.path.splitext(apiFile)[0] + ".bas"
                 if os.path.exists(basesFile):
-                    bases = Utilities.readEncodedFile(basesFile)[0]\
+                    bases = (
+                        Utilities.readEncodedFile(basesFile)[0]
                         .splitlines(True)
+                    )
             except (IOError, UnicodeError):
                 pass
             language = None
@@ -578,8 +583,9 @@
     create_context_idx = """CREATE INDEX context_idx on api (context)"""
     drop_context_idx = """DROP INDEX IF EXISTS context_idx"""
     
-    create_fullContext_idx = \
+    create_fullContext_idx = (
         """CREATE INDEX fullContext_idx on api (fullContext)"""
+    )
     drop_fullContext_idx = """DROP INDEX IF EXISTS fullContext_idx"""
     
     create_bases_idx = """CREATE INDEX base_idx on bases (class)"""
@@ -688,7 +694,7 @@
         """
         Private method to initialize as a language API object.
         """
-        if self.__language in ["Python", "Python2", "Python3"]:
+        if self.__language == "Python3":
             self.__discardFirst = ["self", "cls"]
         else:
             self.__discardFirst = []
@@ -732,8 +738,10 @@
             self.__worker.abort()
             if self.__worker is not None:
                 self.__worker.wait(5000)
-                if self.__worker is not None and \
-                   not self.__worker.isFinished():
+                if (
+                    self.__worker is not None and
+                    not self.__worker.isFinished()
+                ):
                     self.__worker.terminate()
                     if self.__worker is not None:
                         self.__worker.wait(5000)
@@ -755,9 +763,10 @@
             # the database connection is a new one
             db = QSqlDatabase.addDatabase("QSQLITE", self.__connectionName)
             dbName = self._apiDbName()
-            if self.__language == ApisNameProject and \
-                    not os.path.exists(
-                        self.__project.getProjectManagementDir()):
+            if (
+                self.__language == ApisNameProject and
+                not os.path.exists(self.__project.getProjectManagementDir())
+            ):
                 opened = False
             else:
                 db.setDatabaseName(dbName)
@@ -1036,8 +1045,7 @@
             (boolean)
         @return list of project form sources (list of strings)
         """
-        if self.__project.getProjectLanguage() in ["Python", "Python2",
-                                                   "Python3"]:
+        if self.__project.getProjectLanguage() == "Python3":
             sourceExt = ".py"
         elif self.__project.getProjectLanguage() == "Ruby":
             sourceExt = ".rb"
@@ -1170,8 +1178,7 @@
         """
         Private slot to perform actions after a project has been opened.
         """
-        if self.__project.getProjectLanguage() in ["Python", "Python2",
-                                                   "Python3"]:
+        if self.__project.getProjectLanguage() == "Python3":
             self.__discardFirst = ["self", "cls"]
         else:
             self.__discardFirst = []
@@ -1258,8 +1265,10 @@
         try:
             return self.__apis[(language, projectType)]
         except KeyError:
-            if language in self.__supportedApiLanguages() or \
-               language == ApisNameProject:
+            if (
+                language in self.__supportedApiLanguages() or
+                language == ApisNameProject
+            ):
                 # create the api object
                 api = DbAPIs(language, projectType=projectType)
                 api.apiPreparationStatus.connect(self.__apiPreparationStatus)
@@ -1328,3 +1337,6 @@
         elif status == WorkerStatusAborted:
             self.__showMessage(self.tr(
                 "Preparation of '{0}' APIs cancelled.").format(language))
+
+#
+# eflag: noqa = M523, M834, S608
--- a/AssistantEric/Assistant.py	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Assistant.py	Mon Jun 22 19:16:15 2020 +0200
@@ -159,8 +159,11 @@
         @rtype str
         """
         filename = editor.getFileName()
-        if self.__project.isOpen() and filename and \
-                self.__project.isProjectFile(filename):
+        if (
+            self.__project.isOpen() and
+            filename and
+            self.__project.isProjectFile(filename)
+        ):
             projectType = self.__project.getProjectType()
         else:
             projectType = ""
@@ -223,8 +226,10 @@
         
         completeFromDocumentOnly = False
         if language in ["", "Guessed"] or language.startswith("Pygments|"):
-            if self.__plugin.getPreferences("AutoCompletionSource") & \
-                    AcsDocument:
+            if (
+                self.__plugin.getPreferences("AutoCompletionSource") &
+                AcsDocument
+            ):
                 completeFromDocumentOnly = True
             else:
                 return []
@@ -245,8 +250,10 @@
                     break
             
             depth = 0
-            while col > 0 and \
-                    not pat.match(text[col - 1]):
+            while (
+                col > 0 and
+                not pat.match(text[col - 1])
+            ):
                 ch = text[col - 1]
                 if ch == ')':
                     depth = 1
@@ -297,7 +304,7 @@
                 if col > 0 and beg[col - 1] != " ":
                     col -= 1
             prefix = editor.getWordLeft(line, col)
-            if editor.isPy2File() or editor.isPy3File():
+            if editor.isPyFile():
                 from Utilities.ModuleParser import Module
                 src = editor.text()
                 fn = editor.getFileName()
@@ -307,7 +314,7 @@
                 mod.scan(src)
         
         importCompletion = False
-        if editor.isPy2File() or editor.isPy3File():
+        if editor.isPyFile():
             # check, if we are completing a from import statement
             maxLines = 10
             text = editor.text(line).strip()
@@ -374,14 +381,19 @@
                 apiCompletionsList = self.__getApiCompletions(
                     api, word, context, prefix, module, editor)
             
-            if self.__plugin.getPreferences("AutoCompletionSource") & \
-                    AcsProject:
+            if (
+                self.__plugin.getPreferences("AutoCompletionSource") &
+                AcsProject
+            ):
                 api = self.__apisManager.getAPIs(ApisNameProject)
                 projectCompletionList = self.__getApiCompletions(
                     api, word, context, prefix, module, editor)
         
-        if self.__plugin.getPreferences("AutoCompletionSource") & AcsDocument \
-                and not importCompletion:
+        if (
+            self.__plugin.getPreferences("AutoCompletionSource") &
+            AcsDocument and
+            not importCompletion
+        ):
             docCompletionsList = self.__getDocumentCompletions(
                 editor, word, context, sep, prefix, module)
         
@@ -409,8 +421,10 @@
             if prefix and module and prefix == "self":
                 line, col = editor.getCursorPosition()
                 for cl in module.classes.values():
-                    if line >= cl.lineno and \
-                       (cl.endlineno == -1 or line <= cl.endlineno):
+                    if (
+                        line >= cl.lineno and
+                        (cl.endlineno == -1 or line <= cl.endlineno)
+                    ):
                         completions = []
                         for superClass in cl.super:
                             if prefix == word:
@@ -523,8 +537,10 @@
             if prefix in ["cls", "self"]:
                 prefixFound = True
                 for cl in module.classes.values():
-                    if line >= cl.lineno and \
-                       (cl.endlineno == -1 or line <= cl.endlineno):
+                    if (
+                        line >= cl.lineno and
+                        (cl.endlineno == -1 or line <= cl.endlineno)
+                    ):
                         comps = []
                         for method in cl.methods.values():
                             if method.name == "__init__":
@@ -536,9 +552,11 @@
                                 iconID = Editor.MethodProtectedID
                             else:
                                 iconID = Editor.MethodID
-                            if (prefix == "cls" and
-                                method.modifier == method.Class) or \
-                               prefix == "self":
+                            if (
+                                (prefix == "cls" and
+                                 method.modifier == method.Class) or
+                                prefix == "self"
+                            ):
                                 comps.append((method.name, cl.name, iconID))
                         if prefix != "cls":
                             for attribute in cl.attributes.values():
@@ -590,8 +608,10 @@
                     for method in cl.methods.values():
                         if method.name == "__init__":
                             continue
-                        if doHierarchy or \
-                           method.modifier in [method.Class, method.Static]:
+                        if (
+                            doHierarchy or
+                            method.modifier in [method.Class, method.Static]
+                        ):
                             # determine icon type
                             if method.isPrivate():
                                 if doHierarchy:
@@ -655,8 +675,11 @@
                     line, index = editor.lineIndexFromPosition(pos)
                     curWord = editor.getWord(line, index, useWordChars=False)
                     completion += curWord[len(completion):]
-                    if completion and completion not in completionsList and \
-                            completion != word:
+                    if (
+                        completion and
+                        completion not in completionsList and
+                        completion != word
+                    ):
                         completionsList.append(
                             "{0}?{1}".format(
                                 completion, self.__fromDocumentID))
@@ -704,8 +727,10 @@
         
         completeFromDocumentOnly = False
         if language in ["", "Guessed"] or language.startswith("Pygments|"):
-            if self.__plugin.getPreferences("AutoCompletionSource") & \
-                    AcsDocument:
+            if (
+                self.__plugin.getPreferences("AutoCompletionSource") &
+                AcsDocument
+            ):
                 completeFromDocumentOnly = True
             else:
                 return []
@@ -716,8 +741,7 @@
         wc = re.sub("\w", "", editor.wordCharacters())
         pat = re.compile("\w{0}".format(re.escape(wc)))
         text = editor.text(line)
-        while col > 0 and \
-                not pat.match(text[col - 1]):
+        while col > 0 and not pat.match(text[col - 1]):
             col -= 1
         word = editor.getWordLeft(line, col)
         
@@ -738,7 +762,7 @@
                 if col >= 0:
                     col -= 1
             prefix = editor.getWordLeft(line, col)
-            if editor.isPy2File() or editor.isPy3File():
+            if editor.isPyFile():
                 from Utilities.ModuleParser import Module
                 src = editor.text()
                 fn = editor.getFileName()
@@ -759,8 +783,10 @@
                     apiCalltips = self.__getApiCalltips(
                         api, word, commas, prefix, mod, editor)
             
-            if self.__plugin.getPreferences("AutoCompletionSource") & \
-                    AcsProject:
+            if (
+                self.__plugin.getPreferences("AutoCompletionSource") &
+                AcsProject
+            ):
                 api = self.__apisManager.getAPIs(ApisNameProject)
                 projectCalltips = self.__getApiCalltips(
                     api, word, commas, prefix, mod, editor)
@@ -792,8 +818,10 @@
         if prefix and module and prefix == "self":
             line, col = editor.getCursorPosition()
             for cl in module.classes.values():
-                if line >= cl.lineno and \
-                   (cl.endlineno == -1 or line <= cl.endlineno):
+                if (
+                    line >= cl.lineno and
+                    (cl.endlineno == -1 or line <= cl.endlineno)
+                ):
                     for superClass in cl.super:
                         calltips.extend(api.getCalltips(
                             word, commas, superClass, None,
@@ -829,13 +857,17 @@
                 if prefix in ["self", "cls"]:
                     line, col = editor.getCursorPosition()
                     for cl in module.classes.values():
-                        if line >= cl.lineno and \
-                           (cl.endlineno == -1 or line <= cl.endlineno):
+                        if (
+                            line >= cl.lineno and
+                            (cl.endlineno == -1 or line <= cl.endlineno)
+                        ):
                             if word in cl.methods:
                                 method = cl.methods[word]
-                                if prefix == "self" or \
-                                   (prefix == "cls" and
-                                        method.modifier == method.Class):
+                                if (
+                                    prefix == "self" or
+                                    (prefix == "cls" and
+                                     method.modifier == method.Class)
+                                ):
                                     calltips.append(
                                         "{0}{1}{2}({3})".format(
                                             cl.name,
@@ -881,3 +913,6 @@
                             ', '.join(method.parameters[1:])))
         
         return calltips
+
+#
+# eflag: noqa = M834, W605
--- a/AssistantEric/ConfigurationPages/AutoCompletionEricPage.py	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/ConfigurationPages/AutoCompletionEricPage.py	Mon Jun 22 19:16:15 2020 +0200
@@ -11,8 +11,9 @@
 
 from AssistantEric.Assistant import AcsAPIs, AcsDocument, AcsProject
 
-from Preferences.ConfigurationPages.ConfigurationPageBase import \
+from Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase
+)
 from .Ui_AutoCompletionEricPage import Ui_AutoCompletionEricPage
 
 
--- a/AssistantEric/ConfigurationPages/CallTipsEricPage.py	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/ConfigurationPages/CallTipsEricPage.py	Mon Jun 22 19:16:15 2020 +0200
@@ -9,8 +9,9 @@
 
 from __future__ import unicode_literals
 
-from Preferences.ConfigurationPages.ConfigurationPageBase import \
+from Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase
+)
 from .Ui_CallTipsEricPage import Ui_CallTipsEricPage
 
 
--- a/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.APIsManager.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.APIsManager.html	Mon Jun 22 19:16:15 2020 +0200
@@ -18,35 +18,45 @@
 
 </style>
 </head>
-<body><a NAME="top" ID="top"></a>
+<body>
+<a NAME="top" ID="top"></a>
 <h1>Plugin_Assistant_Eric.AssistantEric.APIsManager</h1>
+
 <p>
 Module implementing the APIsManager.
 </p>
 <h3>Global Attributes</h3>
+
 <table>
 <tr><td>ApisNameProject</td></tr><tr><td>WorkerStatusAborted</td></tr><tr><td>WorkerStatusFile</td></tr><tr><td>WorkerStatusFinished</td></tr><tr><td>WorkerStatusStarted</td></tr>
 </table>
 <h3>Classes</h3>
+
 <table>
+
 <tr>
 <td><a href="#APIsManager">APIsManager</a></td>
 <td>Class implementing the APIsManager class, which is the central store for API information used by autocompletion and calltips.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs">DbAPIs</a></td>
 <td>Class implementing an API storage entity.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker">DbAPIsWorker</a></td>
 <td>Class implementing a worker thread to prepare the API database.</td>
 </tr>
 </table>
 <h3>Functions</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="APIsManager" ID="APIsManager"></a>
 <h2>APIsManager</h2>
+
 <p>
     Class implementing the APIsManager class, which is the central store for
     API information used by autocompletion and calltips.
@@ -54,145 +64,192 @@
 <h3>Derived from</h3>
 QObject
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
+
 <tr>
 <td><a href="#APIsManager.__init__">APIsManager</a></td>
 <td>Constructor</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#APIsManager.__apiPreparationStatus">__apiPreparationStatus</a></td>
 <td>Private slot handling the preparation status signal of an API object.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#APIsManager.__showMessage">__showMessage</a></td>
 <td>Private message to show a message in the main windows status bar.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#APIsManager.__supportedApiLanguages">__supportedApiLanguages</a></td>
 <td>Private method to build a list of supported API languages.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#APIsManager.deactivate">deactivate</a></td>
 <td>Public method to perform actions upon deactivation.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#APIsManager.getAPIs">getAPIs</a></td>
 <td>Public method to get an apis object for autocompletion/calltips.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#APIsManager.reloadAPIs">reloadAPIs</a></td>
 <td>Public slot to reload the api information.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <a NAME="APIsManager.__init__" ID="APIsManager.__init__"></a>
 <h4>APIsManager (Constructor)</h4>
 <b>APIsManager</b>(<i>mainWindow, parent=None</i>)
+
 <p>
         Constructor
-</p><dl>
+</p>
+<dl>
+
 <dt><i>mainWindow</i></dt>
 <dd>
 reference to the main eric6 window (QMainWindow)
-</dd><dt><i>parent</i></dt>
+</dd>
+<dt><i>parent</i></dt>
 <dd>
 reference to the parent object (QObject)
 </dd>
-</dl><a NAME="APIsManager.__apiPreparationStatus" ID="APIsManager.__apiPreparationStatus"></a>
+</dl>
+<a NAME="APIsManager.__apiPreparationStatus" ID="APIsManager.__apiPreparationStatus"></a>
 <h4>APIsManager.__apiPreparationStatus</h4>
 <b>__apiPreparationStatus</b>(<i>language, status, filename</i>)
+
 <p>
         Private slot handling the preparation status signal of an API object.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>language</i></dt>
 <dd>
 language of the API (string)
-</dd><dt><i>status</i></dt>
+</dd>
+<dt><i>status</i></dt>
 <dd>
 preparation status (integer, one of WorkerStatus...)
-</dd><dt><i>filename</i></dt>
+</dd>
+<dt><i>filename</i></dt>
 <dd>
 name of the file being processed (string)
 </dd>
-</dl><a NAME="APIsManager.__showMessage" ID="APIsManager.__showMessage"></a>
+</dl>
+<a NAME="APIsManager.__showMessage" ID="APIsManager.__showMessage"></a>
 <h4>APIsManager.__showMessage</h4>
 <b>__showMessage</b>(<i>msg</i>)
+
 <p>
         Private message to show a message in the main windows status bar.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>msg</i></dt>
 <dd>
 message to be shown (string)
 </dd>
-</dl><a NAME="APIsManager.__supportedApiLanguages" ID="APIsManager.__supportedApiLanguages"></a>
+</dl>
+<a NAME="APIsManager.__supportedApiLanguages" ID="APIsManager.__supportedApiLanguages"></a>
 <h4>APIsManager.__supportedApiLanguages</h4>
 <b>__supportedApiLanguages</b>(<i></i>)
+
 <p>
         Private method to build a list of supported API languages.
-</p><p>
+</p>
+<p>
         Note: This is a compatibility method to make this code work with
         older eric versions.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of supported API languages
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Return Type:</dt>
 <dd>
 list of str
 </dd>
-</dl><a NAME="APIsManager.deactivate" ID="APIsManager.deactivate"></a>
+</dl>
+<a NAME="APIsManager.deactivate" ID="APIsManager.deactivate"></a>
 <h4>APIsManager.deactivate</h4>
 <b>deactivate</b>(<i></i>)
+
 <p>
         Public method to perform actions upon deactivation.
-</p><a NAME="APIsManager.getAPIs" ID="APIsManager.getAPIs"></a>
+</p>
+<a NAME="APIsManager.getAPIs" ID="APIsManager.getAPIs"></a>
 <h4>APIsManager.getAPIs</h4>
 <b>getAPIs</b>(<i>language, projectType=""</i>)
+
 <p>
         Public method to get an apis object for autocompletion/calltips.
-</p><p>
+</p>
+<p>
         This method creates and loads an APIs object dynamically upon request.
         This saves memory for languages, that might not be needed at the
         moment.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>language</i> (str)</dt>
 <dd>
 language of the requested APIs object
-</dd><dt><i>projectType</i> (str)</dt>
+</dd>
+<dt><i>projectType</i> (str)</dt>
 <dd>
 type of the project
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 reference to the APIs object
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Return Type:</dt>
 <dd>
 APIs
 </dd>
-</dl><a NAME="APIsManager.reloadAPIs" ID="APIsManager.reloadAPIs"></a>
+</dl>
+<a NAME="APIsManager.reloadAPIs" ID="APIsManager.reloadAPIs"></a>
 <h4>APIsManager.reloadAPIs</h4>
 <b>reloadAPIs</b>(<i></i>)
+
 <p>
         Public slot to reload the api information.
 </p>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="DbAPIs" ID="DbAPIs"></a>
 <h2>DbAPIs</h2>
+
 <p>
     Class implementing an API storage entity.
-</p><h3>Signals</h3>
+</p>
+<h3>Signals</h3>
 <dl>
+
 <dt>apiPreparationStatus(language, status, file)</dt>
 <dd>
 emitted to indicate
@@ -202,326 +259,434 @@
 <h3>Derived from</h3>
 QObject
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>DB_VERSION</td></tr><tr><td>ac_context_stmt</td></tr><tr><td>ac_context_word_stmt</td></tr><tr><td>ac_stmt</td></tr><tr><td>api_files_stmt</td></tr><tr><td>bases_stmt</td></tr><tr><td>create_acWord_idx</td></tr><tr><td>create_api_stmt</td></tr><tr><td>create_bases_idx</td></tr><tr><td>create_bases_stmt</td></tr><tr><td>create_context_idx</td></tr><tr><td>create_file_idx</td></tr><tr><td>create_file_stmt</td></tr><tr><td>create_fullContext_idx</td></tr><tr><td>create_mgmt_stmt</td></tr><tr><td>ct_context_stmt</td></tr><tr><td>ct_fullContext_stmt</td></tr><tr><td>ct_stmt</td></tr><tr><td>drop_acWord_idx</td></tr><tr><td>drop_api_stmt</td></tr><tr><td>drop_bases_idx</td></tr><tr><td>drop_bases_stmt</td></tr><tr><td>drop_context_idx</td></tr><tr><td>drop_file_idx</td></tr><tr><td>drop_file_stmt</td></tr><tr><td>drop_fullContext_idx</td></tr><tr><td>drop_mgmt_stmt</td></tr><tr><td>format_select_stmt</td></tr><tr><td>mgmt_insert_stmt</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
+
 <tr>
 <td><a href="#DbAPIs.__init__">DbAPIs</a></td>
 <td>Constructor</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__createApiDB">__createApiDB</a></td>
 <td>Private method to create an API database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__enoughCommas">__enoughCommas</a></td>
 <td>Private method to determine, if the given string contains enough commas.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__getProjectFormSources">__getProjectFormSources</a></td>
 <td>Private method to get the source files for the project forms.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__initAsLanguage">__initAsLanguage</a></td>
 <td>Private method to initialize as a language API object.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__initAsProject">__initAsProject</a></td>
 <td>Private method to initialize as a project API object.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__isPrepared">__isPrepared</a></td>
 <td>Private method to check, if the database has been prepared.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__openAPIs">__openAPIs</a></td>
 <td>Private method to open the API database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__openApiDb">__openApiDb</a></td>
 <td>Private method to open the API database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__processQueue">__processQueue</a></td>
 <td>Private slot to process the queue of files to load.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__processingStatus">__processingStatus</a></td>
 <td>Private slot handling the processing signal of the API preparation thread.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__projectChanged">__projectChanged</a></td>
 <td>Private slot to handle the projectChanged signal.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__projectClosed">__projectClosed</a></td>
 <td>Private slot to perform actions after a project has been closed.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__projectFormCompiled">__projectFormCompiled</a></td>
 <td>Private slot to handle the projectFormCompiled signal.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.__projectOpened">__projectOpened</a></td>
 <td>Private slot to perform actions after a project has been opened.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs._apiDbName">_apiDbName</a></td>
 <td>Protected method to determine the name of the database file.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.autoCompletionWordSeparators">autoCompletionWordSeparators</a></td>
 <td>Public method to get the word separator characters.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.close">close</a></td>
 <td>Public method to close the database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.editorSaved">editorSaved</a></td>
 <td>Public slot to handle the editorSaved signal.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.getApiFiles">getApiFiles</a></td>
 <td>Public method to get a list of API files loaded into the database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.getCalltips">getCalltips</a></td>
 <td>Public method to determine the calltips.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.getCompletions">getCompletions</a></td>
 <td>Public method to determine the possible completions.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.getLexer">getLexer</a></td>
 <td>Public method to return a reference to our lexer object.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIs.prepareAPIs">prepareAPIs</a></td>
 <td>Public method to prepare the APIs if neccessary.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <a NAME="DbAPIs.__init__" ID="DbAPIs.__init__"></a>
 <h4>DbAPIs (Constructor)</h4>
 <b>DbAPIs</b>(<i>language, projectType="", parent=None</i>)
+
 <p>
         Constructor
-</p><dl>
+</p>
+<dl>
+
 <dt><i>language</i> (str)</dt>
 <dd>
 language of the APIs object
-</dd><dt><i>projectType</i> (str)</dt>
+</dd>
+<dt><i>projectType</i> (str)</dt>
 <dd>
 type of the project
-</dd><dt><i>parent</i> (QObject)</dt>
+</dd>
+<dt><i>parent</i> (QObject)</dt>
 <dd>
 reference to the parent object
 </dd>
-</dl><a NAME="DbAPIs.__createApiDB" ID="DbAPIs.__createApiDB"></a>
+</dl>
+<a NAME="DbAPIs.__createApiDB" ID="DbAPIs.__createApiDB"></a>
 <h4>DbAPIs.__createApiDB</h4>
 <b>__createApiDB</b>(<i></i>)
+
 <p>
         Private method to create an API database.
-</p><a NAME="DbAPIs.__enoughCommas" ID="DbAPIs.__enoughCommas"></a>
+</p>
+<a NAME="DbAPIs.__enoughCommas" ID="DbAPIs.__enoughCommas"></a>
 <h4>DbAPIs.__enoughCommas</h4>
 <b>__enoughCommas</b>(<i>s, commas</i>)
+
 <p>
         Private method to determine, if the given string contains enough
         commas.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>s</i></dt>
 <dd>
 string to check (string)
-</dd><dt><i>commas</i></dt>
+</dd>
+<dt><i>commas</i></dt>
 <dd>
 number of commas to check for (integer)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 flag indicating, that there are enough commas (boolean)
 </dd>
-</dl><a NAME="DbAPIs.__getProjectFormSources" ID="DbAPIs.__getProjectFormSources"></a>
+</dl>
+<a NAME="DbAPIs.__getProjectFormSources" ID="DbAPIs.__getProjectFormSources"></a>
 <h4>DbAPIs.__getProjectFormSources</h4>
 <b>__getProjectFormSources</b>(<i>normalized=False</i>)
+
 <p>
         Private method to get the source files for the project forms.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>normalized=</i></dt>
 <dd>
 flag indicating a normalized filename is wanted
             (boolean)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of project form sources (list of strings)
 </dd>
-</dl><a NAME="DbAPIs.__initAsLanguage" ID="DbAPIs.__initAsLanguage"></a>
+</dl>
+<a NAME="DbAPIs.__initAsLanguage" ID="DbAPIs.__initAsLanguage"></a>
 <h4>DbAPIs.__initAsLanguage</h4>
 <b>__initAsLanguage</b>(<i></i>)
+
 <p>
         Private method to initialize as a language API object.
-</p><a NAME="DbAPIs.__initAsProject" ID="DbAPIs.__initAsProject"></a>
+</p>
+<a NAME="DbAPIs.__initAsProject" ID="DbAPIs.__initAsProject"></a>
 <h4>DbAPIs.__initAsProject</h4>
 <b>__initAsProject</b>(<i></i>)
+
 <p>
         Private method to initialize as a project API object.
-</p><a NAME="DbAPIs.__isPrepared" ID="DbAPIs.__isPrepared"></a>
+</p>
+<a NAME="DbAPIs.__isPrepared" ID="DbAPIs.__isPrepared"></a>
 <h4>DbAPIs.__isPrepared</h4>
 <b>__isPrepared</b>(<i></i>)
+
 <p>
         Private method to check, if the database has been prepared.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 flag indicating the prepared status (boolean)
 </dd>
-</dl><a NAME="DbAPIs.__openAPIs" ID="DbAPIs.__openAPIs"></a>
+</dl>
+<a NAME="DbAPIs.__openAPIs" ID="DbAPIs.__openAPIs"></a>
 <h4>DbAPIs.__openAPIs</h4>
 <b>__openAPIs</b>(<i></i>)
+
 <p>
         Private method to open the API database.
-</p><a NAME="DbAPIs.__openApiDb" ID="DbAPIs.__openApiDb"></a>
+</p>
+<a NAME="DbAPIs.__openApiDb" ID="DbAPIs.__openApiDb"></a>
 <h4>DbAPIs.__openApiDb</h4>
 <b>__openApiDb</b>(<i></i>)
+
 <p>
         Private method to open the API database.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 flag indicating the database status (boolean)
 </dd>
-</dl><a NAME="DbAPIs.__processQueue" ID="DbAPIs.__processQueue"></a>
+</dl>
+<a NAME="DbAPIs.__processQueue" ID="DbAPIs.__processQueue"></a>
 <h4>DbAPIs.__processQueue</h4>
 <b>__processQueue</b>(<i></i>)
+
 <p>
         Private slot to process the queue of files to load.
-</p><a NAME="DbAPIs.__processingStatus" ID="DbAPIs.__processingStatus"></a>
+</p>
+<a NAME="DbAPIs.__processingStatus" ID="DbAPIs.__processingStatus"></a>
 <h4>DbAPIs.__processingStatus</h4>
 <b>__processingStatus</b>(<i>status, filename</i>)
+
 <p>
         Private slot handling the processing signal of the API preparation
         thread.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>status</i></dt>
 <dd>
 preparation status (integer, one of WorkerStatus...)
-</dd><dt><i>filename</i></dt>
+</dd>
+<dt><i>filename</i></dt>
 <dd>
 name of the file being processed (string)
 </dd>
-</dl><a NAME="DbAPIs.__projectChanged" ID="DbAPIs.__projectChanged"></a>
+</dl>
+<a NAME="DbAPIs.__projectChanged" ID="DbAPIs.__projectChanged"></a>
 <h4>DbAPIs.__projectChanged</h4>
 <b>__projectChanged</b>(<i></i>)
+
 <p>
         Private slot to handle the projectChanged signal.
-</p><a NAME="DbAPIs.__projectClosed" ID="DbAPIs.__projectClosed"></a>
+</p>
+<a NAME="DbAPIs.__projectClosed" ID="DbAPIs.__projectClosed"></a>
 <h4>DbAPIs.__projectClosed</h4>
 <b>__projectClosed</b>(<i></i>)
+
 <p>
         Private slot to perform actions after a project has been closed.
-</p><a NAME="DbAPIs.__projectFormCompiled" ID="DbAPIs.__projectFormCompiled"></a>
+</p>
+<a NAME="DbAPIs.__projectFormCompiled" ID="DbAPIs.__projectFormCompiled"></a>
 <h4>DbAPIs.__projectFormCompiled</h4>
 <b>__projectFormCompiled</b>(<i>filename</i>)
+
 <p>
         Private slot to handle the projectFormCompiled signal.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>filename</i></dt>
 <dd>
 name of the form file that was compiled (string)
 </dd>
-</dl><a NAME="DbAPIs.__projectOpened" ID="DbAPIs.__projectOpened"></a>
+</dl>
+<a NAME="DbAPIs.__projectOpened" ID="DbAPIs.__projectOpened"></a>
 <h4>DbAPIs.__projectOpened</h4>
 <b>__projectOpened</b>(<i></i>)
+
 <p>
         Private slot to perform actions after a project has been opened.
-</p><a NAME="DbAPIs._apiDbName" ID="DbAPIs._apiDbName"></a>
+</p>
+<a NAME="DbAPIs._apiDbName" ID="DbAPIs._apiDbName"></a>
 <h4>DbAPIs._apiDbName</h4>
 <b>_apiDbName</b>(<i></i>)
+
 <p>
         Protected method to determine the name of the database file.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 name of the database file (string)
 </dd>
-</dl><a NAME="DbAPIs.autoCompletionWordSeparators" ID="DbAPIs.autoCompletionWordSeparators"></a>
+</dl>
+<a NAME="DbAPIs.autoCompletionWordSeparators" ID="DbAPIs.autoCompletionWordSeparators"></a>
 <h4>DbAPIs.autoCompletionWordSeparators</h4>
 <b>autoCompletionWordSeparators</b>(<i></i>)
+
 <p>
         Public method to get the word separator characters.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 word separator characters (list of strings)
 </dd>
-</dl><a NAME="DbAPIs.close" ID="DbAPIs.close"></a>
+</dl>
+<a NAME="DbAPIs.close" ID="DbAPIs.close"></a>
 <h4>DbAPIs.close</h4>
 <b>close</b>(<i></i>)
+
 <p>
         Public method to close the database.
-</p><a NAME="DbAPIs.editorSaved" ID="DbAPIs.editorSaved"></a>
+</p>
+<a NAME="DbAPIs.editorSaved" ID="DbAPIs.editorSaved"></a>
 <h4>DbAPIs.editorSaved</h4>
 <b>editorSaved</b>(<i>filename</i>)
+
 <p>
         Public slot to handle the editorSaved signal.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>filename</i></dt>
 <dd>
 name of the file that was saved (string)
 </dd>
-</dl><a NAME="DbAPIs.getApiFiles" ID="DbAPIs.getApiFiles"></a>
+</dl>
+<a NAME="DbAPIs.getApiFiles" ID="DbAPIs.getApiFiles"></a>
 <h4>DbAPIs.getApiFiles</h4>
 <b>getApiFiles</b>(<i></i>)
+
 <p>
         Public method to get a list of API files loaded into the database.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of API filenames (list of strings)
 </dd>
-</dl><a NAME="DbAPIs.getCalltips" ID="DbAPIs.getCalltips"></a>
+</dl>
+<a NAME="DbAPIs.getCalltips" ID="DbAPIs.getCalltips"></a>
 <h4>DbAPIs.getCalltips</h4>
 <b>getCalltips</b>(<i>acWord, commas, context=None, fullContext=None, showContext=True, followHierarchy=False</i>)
+
 <p>
         Public method to determine the calltips.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>acWord</i></dt>
 <dd>
 function to get calltips for (string)
-</dd><dt><i>commas</i></dt>
+</dd>
+<dt><i>commas</i></dt>
 <dd>
 minimum number of commas contained in the calltip
             (integer)
-</dd><dt><i>context</i></dt>
+</dd>
+<dt><i>context</i></dt>
 <dd>
 string giving the context (e.g. classname) (string)
-</dd><dt><i>fullContext</i></dt>
+</dd>
+<dt><i>fullContext</i></dt>
 <dd>
 string giving the full context (string)
-</dd><dt><i>showContext</i></dt>
+</dd>
+<dt><i>showContext</i></dt>
 <dd>
 flag indicating to show the calltip context
             (boolean)
-</dd><dt><i>followHierarchy=</i></dt>
+</dd>
+<dt><i>followHierarchy=</i></dt>
 <dd>
 flag indicating to follow the hierarchy of
             base classes (boolean)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of calltips (list of string)
 </dd>
-</dl><a NAME="DbAPIs.getCompletions" ID="DbAPIs.getCompletions"></a>
+</dl>
+<a NAME="DbAPIs.getCompletions" ID="DbAPIs.getCompletions"></a>
 <h4>DbAPIs.getCompletions</h4>
 <b>getCompletions</b>(<i>start=None, context=None, followHierarchy=False</i>)
+
 <p>
         Public method to determine the possible completions.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>start=</i></dt>
 <dd>
 string giving the start of the word to be
             completed (string)
-</dd><dt><i>context=</i></dt>
+</dd>
+<dt><i>context=</i></dt>
 <dd>
 string giving the context (e.g. classname)
             to be completed (string)
-</dd><dt><i>followHierarchy=</i></dt>
+</dd>
+<dt><i>followHierarchy=</i></dt>
 <dd>
 flag indicating to follow the hierarchy of
             base classes (boolean)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of dictionaries with possible completions
@@ -529,35 +694,46 @@
             key 'context' contains the context (string) and
             key 'pictureId' contains the ID of the icon to be shown (string))
 </dd>
-</dl><a NAME="DbAPIs.getLexer" ID="DbAPIs.getLexer"></a>
+</dl>
+<a NAME="DbAPIs.getLexer" ID="DbAPIs.getLexer"></a>
 <h4>DbAPIs.getLexer</h4>
 <b>getLexer</b>(<i></i>)
+
 <p>
         Public method to return a reference to our lexer object.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 reference to the lexer object (QScintilla.Lexers.Lexer)
 </dd>
-</dl><a NAME="DbAPIs.prepareAPIs" ID="DbAPIs.prepareAPIs"></a>
+</dl>
+<a NAME="DbAPIs.prepareAPIs" ID="DbAPIs.prepareAPIs"></a>
 <h4>DbAPIs.prepareAPIs</h4>
 <b>prepareAPIs</b>(<i>rawList=None</i>)
+
 <p>
         Public method to prepare the APIs if neccessary.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>rawList=</i></dt>
 <dd>
 list of raw API files (list of strings)
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="DbAPIsWorker" ID="DbAPIsWorker"></a>
 <h2>DbAPIsWorker</h2>
+
 <p>
     Class implementing a worker thread to prepare the API database.
-</p><h3>Signals</h3>
+</p>
+<h3>Signals</h3>
 <dl>
+
 <dt>processing(status, file)</dt>
 <dd>
 emitted to indicate the processing status
@@ -567,199 +743,266 @@
 <h3>Derived from</h3>
 QThread
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>api_files_stmt</td></tr><tr><td>file_delete_id_stmt</td></tr><tr><td>file_id_stmt</td></tr><tr><td>file_loaded_stmt</td></tr><tr><td>populate_api_stmt</td></tr><tr><td>populate_bases_stmt</td></tr><tr><td>populate_del_api_stmt</td></tr><tr><td>populate_del_bases_stmt</td></tr><tr><td>populate_file_stmt</td></tr><tr><td>update_file_stmt</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
+
 <tr>
 <td><a href="#DbAPIsWorker.__init__">DbAPIsWorker</a></td>
 <td>Constructor</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.__autoCompletionWordSeparators">__autoCompletionWordSeparators</a></td>
 <td>Private method to get the word separator characters for a language.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.__classesAttributesApi">__classesAttributesApi</a></td>
 <td>Private method to generate class api section for class attributes.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.__deleteApiFile">__deleteApiFile</a></td>
 <td>Private method to delete all references to an api file.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.__getApiFiles">__getApiFiles</a></td>
 <td>Private method to get a list of API files loaded into the database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.__loadApiFile">__loadApiFile</a></td>
 <td>Private method to read a raw API file into the database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.__loadApiFileIfNewer">__loadApiFileIfNewer</a></td>
 <td>Private method to load an API file, if it is newer than the one read into the database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.__storeApis">__storeApis</a></td>
 <td>Private method to put the API entries into the database.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.__storeFileInfoOnly">__storeFileInfoOnly</a></td>
 <td>Private method to store file info only.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.abort">abort</a></td>
 <td>Public method to ask the thread to stop.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#DbAPIsWorker.run">run</a></td>
 <td>Public method to perform the threads work.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <a NAME="DbAPIsWorker.__init__" ID="DbAPIsWorker.__init__"></a>
 <h4>DbAPIsWorker (Constructor)</h4>
 <b>DbAPIsWorker</b>(<i>proxy, language, apiFiles, dbName, projectPath="", refresh=False, projectType=""</i>)
+
 <p>
         Constructor
-</p><dl>
+</p>
+<dl>
+
 <dt><i>proxy</i> (DbAPIs)</dt>
 <dd>
 reference to the object that is proxied
-</dd><dt><i>language</i> (str)</dt>
+</dd>
+<dt><i>language</i> (str)</dt>
 <dd>
 language of the APIs object
-</dd><dt><i>apiFiles</i> (list of str)</dt>
+</dd>
+<dt><i>apiFiles</i> (list of str)</dt>
 <dd>
 list of API files to process
-</dd><dt><i>dbName</i> (str)</dt>
+</dd>
+<dt><i>dbName</i> (str)</dt>
 <dd>
 path name of the database file
-</dd><dt><i>projectPath</i> (str)</dt>
+</dd>
+<dt><i>projectPath</i> (str)</dt>
 <dd>
 path of the project. Only needed, if the APIs
             are extracted out of the sources of a project.
-</dd><dt><i>refresh</i> (bool)</dt>
+</dd>
+<dt><i>refresh</i> (bool)</dt>
 <dd>
 flag indicating a refresh of the APIs of one file
-</dd><dt><i>projectType</i> (str)</dt>
+</dd>
+<dt><i>projectType</i> (str)</dt>
 <dd>
 type of the project
 </dd>
-</dl><a NAME="DbAPIsWorker.__autoCompletionWordSeparators" ID="DbAPIsWorker.__autoCompletionWordSeparators"></a>
+</dl>
+<a NAME="DbAPIsWorker.__autoCompletionWordSeparators" ID="DbAPIsWorker.__autoCompletionWordSeparators"></a>
 <h4>DbAPIsWorker.__autoCompletionWordSeparators</h4>
 <b>__autoCompletionWordSeparators</b>(<i>language</i>)
+
 <p>
         Private method to get the word separator characters for a language.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>language</i></dt>
 <dd>
 language of the APIs object (string)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 word separator characters (list of strings)
 </dd>
-</dl><a NAME="DbAPIsWorker.__classesAttributesApi" ID="DbAPIsWorker.__classesAttributesApi"></a>
+</dl>
+<a NAME="DbAPIsWorker.__classesAttributesApi" ID="DbAPIsWorker.__classesAttributesApi"></a>
 <h4>DbAPIsWorker.__classesAttributesApi</h4>
 <b>__classesAttributesApi</b>(<i>module</i>)
+
 <p>
         Private method to generate class api section for class attributes.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>module</i></dt>
 <dd>
 module object to get the info from (Module)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 API information (list of strings)
 </dd>
-</dl><a NAME="DbAPIsWorker.__deleteApiFile" ID="DbAPIsWorker.__deleteApiFile"></a>
+</dl>
+<a NAME="DbAPIsWorker.__deleteApiFile" ID="DbAPIsWorker.__deleteApiFile"></a>
 <h4>DbAPIsWorker.__deleteApiFile</h4>
 <b>__deleteApiFile</b>(<i>apiFile</i>)
+
 <p>
         Private method to delete all references to an api file.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>apiFile</i></dt>
 <dd>
 filename of the raw API file (string)
 </dd>
-</dl><a NAME="DbAPIsWorker.__getApiFiles" ID="DbAPIsWorker.__getApiFiles"></a>
+</dl>
+<a NAME="DbAPIsWorker.__getApiFiles" ID="DbAPIsWorker.__getApiFiles"></a>
 <h4>DbAPIsWorker.__getApiFiles</h4>
 <b>__getApiFiles</b>(<i></i>)
+
 <p>
         Private method to get a list of API files loaded into the database.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of API filenames
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Return Type:</dt>
 <dd>
 list of str
 </dd>
-</dl><a NAME="DbAPIsWorker.__loadApiFile" ID="DbAPIsWorker.__loadApiFile"></a>
+</dl>
+<a NAME="DbAPIsWorker.__loadApiFile" ID="DbAPIsWorker.__loadApiFile"></a>
 <h4>DbAPIsWorker.__loadApiFile</h4>
 <b>__loadApiFile</b>(<i>apiFile</i>)
+
 <p>
         Private method to read a raw API file into the database.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>apiFile</i></dt>
 <dd>
 filename of the raw API file (string)
 </dd>
-</dl><a NAME="DbAPIsWorker.__loadApiFileIfNewer" ID="DbAPIsWorker.__loadApiFileIfNewer"></a>
+</dl>
+<a NAME="DbAPIsWorker.__loadApiFileIfNewer" ID="DbAPIsWorker.__loadApiFileIfNewer"></a>
 <h4>DbAPIsWorker.__loadApiFileIfNewer</h4>
 <b>__loadApiFileIfNewer</b>(<i>apiFile</i>)
+
 <p>
         Private method to load an API file, if it is newer than the one read
         into the database.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>apiFile</i></dt>
 <dd>
 filename of the raw API file (string)
 </dd>
-</dl><a NAME="DbAPIsWorker.__storeApis" ID="DbAPIsWorker.__storeApis"></a>
+</dl>
+<a NAME="DbAPIsWorker.__storeApis" ID="DbAPIsWorker.__storeApis"></a>
 <h4>DbAPIsWorker.__storeApis</h4>
 <b>__storeApis</b>(<i>apis, bases, apiFile, language</i>)
+
 <p>
         Private method to put the API entries into the database.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>apis</i></dt>
 <dd>
 list of api entries (list of strings)
-</dd><dt><i>bases</i></dt>
+</dd>
+<dt><i>bases</i></dt>
 <dd>
 list of base class entries (list of strings)
-</dd><dt><i>apiFile</i></dt>
+</dd>
+<dt><i>apiFile</i></dt>
 <dd>
 filename of the file read to get the APIs (string)
-</dd><dt><i>language</i></dt>
+</dd>
+<dt><i>language</i></dt>
 <dd>
 programming language of the file of the APIs (string)
 </dd>
-</dl><a NAME="DbAPIsWorker.__storeFileInfoOnly" ID="DbAPIsWorker.__storeFileInfoOnly"></a>
+</dl>
+<a NAME="DbAPIsWorker.__storeFileInfoOnly" ID="DbAPIsWorker.__storeFileInfoOnly"></a>
 <h4>DbAPIsWorker.__storeFileInfoOnly</h4>
 <b>__storeFileInfoOnly</b>(<i>apiFile</i>)
+
 <p>
         Private method to store file info only.
-</p><p>
+</p>
+<p>
         Doing this avoids rereading the file whenever the API is initialized
         in case the given file doesn't contain API data.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>apiFile</i></dt>
 <dd>
 file name of the API file (string)
 </dd>
-</dl><a NAME="DbAPIsWorker.abort" ID="DbAPIsWorker.abort"></a>
+</dl>
+<a NAME="DbAPIsWorker.abort" ID="DbAPIsWorker.abort"></a>
 <h4>DbAPIsWorker.abort</h4>
 <b>abort</b>(<i></i>)
+
 <p>
         Public method to ask the thread to stop.
-</p><a NAME="DbAPIsWorker.run" ID="DbAPIsWorker.run"></a>
+</p>
+<a NAME="DbAPIsWorker.run" ID="DbAPIsWorker.run"></a>
 <h4>DbAPIsWorker.run</h4>
 <b>run</b>(<i></i>)
+
 <p>
         Public method to perform the threads work.
 </p>
--- a/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.Assistant.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.Assistant.html	Mon Jun 22 19:16:15 2020 +0200
@@ -18,456 +18,609 @@
 
 </style>
 </head>
-<body><a NAME="top" ID="top"></a>
+<body>
+<a NAME="top" ID="top"></a>
 <h1>Plugin_Assistant_Eric.AssistantEric.Assistant</h1>
+
 <p>
 Module implementing the eric assistant, an alternative autocompletion and
 calltips system.
 </p>
 <h3>Global Attributes</h3>
+
 <table>
 <tr><td>AcsAPIs</td></tr><tr><td>AcsDocument</td></tr><tr><td>AcsProject</td></tr>
 </table>
 <h3>Classes</h3>
+
 <table>
+
 <tr>
 <td><a href="#Assistant">Assistant</a></td>
 <td>Class implementing the autocompletion and calltips system.</td>
 </tr>
 </table>
 <h3>Functions</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="Assistant" ID="Assistant"></a>
 <h2>Assistant</h2>
+
 <p>
     Class implementing the autocompletion and calltips system.
 </p>
 <h3>Derived from</h3>
 QObject
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
+
 <tr>
 <td><a href="#Assistant.__init__">Assistant</a></td>
 <td>Constructor</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__editorClosed">__editorClosed</a></td>
 <td>Private slot called, when an editor was closed.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__editorOpened">__editorOpened</a></td>
 <td>Private slot called, when a new editor was opened.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__getApiCalltips">__getApiCalltips</a></td>
 <td>Private method to determine calltips from APIs.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__getApiCompletions">__getApiCompletions</a></td>
 <td>Private method to determine a list of completions from an API object.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__getCompletions">__getCompletions</a></td>
 <td>Private method to get the list of possible completions.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__getDocumentCalltips">__getDocumentCalltips</a></td>
 <td>Private method to determine calltips from the document.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__getDocumentCompletions">__getDocumentCompletions</a></td>
 <td>Private method to determine autocompletion proposals from the document.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__getProjectType">__getProjectType</a></td>
 <td>Private method to determine the project type to be used.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__preferencesChanged">__preferencesChanged</a></td>
 <td>Private method to handle a change of the global configuration.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__recordSelectedContext">__recordSelectedContext</a></td>
 <td>Private slot to handle the selection from the completion list to record the selected completion context.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__setAutoCompletionHook">__setAutoCompletionHook</a></td>
 <td>Private method to set the autocompletion hook.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__setCalltipsHook">__setCalltipsHook</a></td>
 <td>Private method to set the calltip hook.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__shutdown">__shutdown</a></td>
 <td>Private slot to handle the shutdown signal.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__unsetAutoCompletionHook">__unsetAutoCompletionHook</a></td>
 <td>Private method to unset the autocompletion hook.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.__unsetCalltipsHook">__unsetCalltipsHook</a></td>
 <td>Private method to unset the calltip hook.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.activate">activate</a></td>
 <td>Public method to perform actions upon activation.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.calltips">calltips</a></td>
 <td>Public method to return a list of calltips.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.deactivate">deactivate</a></td>
 <td>Public method to perform actions upon deactivation.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.getCompletionsList">getCompletionsList</a></td>
 <td>Public method to get a list of possible completions.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#Assistant.setEnabled">setEnabled</a></td>
 <td>Public method to enable or disable a feature.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <a NAME="Assistant.__init__" ID="Assistant.__init__"></a>
 <h4>Assistant (Constructor)</h4>
 <b>Assistant</b>(<i>plugin, parent=None</i>)
+
 <p>
         Constructor
-</p><dl>
+</p>
+<dl>
+
 <dt><i>plugin</i></dt>
 <dd>
 reference to the plugin object
-</dd><dt><i>parent</i></dt>
+</dd>
+<dt><i>parent</i></dt>
 <dd>
 parent (QObject)
 </dd>
-</dl><a NAME="Assistant.__editorClosed" ID="Assistant.__editorClosed"></a>
+</dl>
+<a NAME="Assistant.__editorClosed" ID="Assistant.__editorClosed"></a>
 <h4>Assistant.__editorClosed</h4>
 <b>__editorClosed</b>(<i>editor</i>)
+
 <p>
         Private slot called, when an editor was closed.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the editor (QScintilla.Editor)
 </dd>
-</dl><a NAME="Assistant.__editorOpened" ID="Assistant.__editorOpened"></a>
+</dl>
+<a NAME="Assistant.__editorOpened" ID="Assistant.__editorOpened"></a>
 <h4>Assistant.__editorOpened</h4>
 <b>__editorOpened</b>(<i>editor</i>)
+
 <p>
         Private slot called, when a new editor was opened.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the new editor (QScintilla.Editor)
 </dd>
-</dl><a NAME="Assistant.__getApiCalltips" ID="Assistant.__getApiCalltips"></a>
+</dl>
+<a NAME="Assistant.__getApiCalltips" ID="Assistant.__getApiCalltips"></a>
 <h4>Assistant.__getApiCalltips</h4>
 <b>__getApiCalltips</b>(<i>api, word, commas, prefix, module, editor</i>)
+
 <p>
         Private method to determine calltips from APIs.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>api</i></dt>
 <dd>
 reference to the API object to be used (APIsManager.DbAPIs)
-</dd><dt><i>word</i></dt>
+</dd>
+<dt><i>word</i></dt>
 <dd>
 function to get calltips for (string)
-</dd><dt><i>commas</i></dt>
+</dd>
+<dt><i>commas</i></dt>
 <dd>
 minimum number of commas contained in the calltip
             (integer)
-</dd><dt><i>prefix</i></dt>
+</dd>
+<dt><i>prefix</i></dt>
 <dd>
 prefix of the word to be completed (string)
-</dd><dt><i>module</i></dt>
+</dd>
+<dt><i>module</i></dt>
 <dd>
 reference to the scanned module info (Module)
-</dd><dt><i>editor</i></dt>
+</dd>
+<dt><i>editor</i></dt>
 <dd>
 reference to the editor object (QScintilla.Editor)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of calltips (list of string)
 </dd>
-</dl><a NAME="Assistant.__getApiCompletions" ID="Assistant.__getApiCompletions"></a>
+</dl>
+<a NAME="Assistant.__getApiCompletions" ID="Assistant.__getApiCompletions"></a>
 <h4>Assistant.__getApiCompletions</h4>
 <b>__getApiCompletions</b>(<i>api, word, context, prefix, module, editor</i>)
+
 <p>
         Private method to determine a list of completions from an API object.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>api</i></dt>
 <dd>
 reference to the API object to be used (APIsManager.DbAPIs)
-</dd><dt><i>word</i></dt>
+</dd>
+<dt><i>word</i></dt>
 <dd>
 word (or wordpart) to complete (string)
-</dd><dt><i>context</i></dt>
+</dd>
+<dt><i>context</i></dt>
 <dd>
 flag indicating to autocomplete a context (boolean)
-</dd><dt><i>prefix</i></dt>
+</dd>
+<dt><i>prefix</i></dt>
 <dd>
 prefix of the word to be completed (string)
-</dd><dt><i>module</i></dt>
+</dd>
+<dt><i>module</i></dt>
 <dd>
 reference to the scanned module info (Module)
-</dd><dt><i>editor</i></dt>
+</dd>
+<dt><i>editor</i></dt>
 <dd>
 reference to the editor object (QScintilla.Editor.Editor)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of possible completions (list of strings)
 </dd>
-</dl><a NAME="Assistant.__getCompletions" ID="Assistant.__getCompletions"></a>
+</dl>
+<a NAME="Assistant.__getCompletions" ID="Assistant.__getCompletions"></a>
 <h4>Assistant.__getCompletions</h4>
 <b>__getCompletions</b>(<i>word, context, prefix, language, projectType, module, editor, importCompletion, documentOnly, sep</i>)
+
 <p>
         Private method to get the list of possible completions.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>word</i></dt>
 <dd>
 word (or wordpart) to complete (string)
-</dd><dt><i>context</i></dt>
+</dd>
+<dt><i>context</i></dt>
 <dd>
 flag indicating to autocomplete a context (boolean)
-</dd><dt><i>prefix</i></dt>
+</dd>
+<dt><i>prefix</i></dt>
 <dd>
 prefix of the word to be completed (string)
-</dd><dt><i>language</i></dt>
+</dd>
+<dt><i>language</i></dt>
 <dd>
 programming language of the source (string)
-</dd><dt><i>projectType</i></dt>
+</dd>
+<dt><i>projectType</i></dt>
 <dd>
 type of the project (string)
-</dd><dt><i>module</i></dt>
+</dd>
+<dt><i>module</i></dt>
 <dd>
 reference to the scanned module info (Module)
-</dd><dt><i>editor</i></dt>
+</dd>
+<dt><i>editor</i></dt>
 <dd>
 reference to the editor object (QScintilla.Editor.Editor)
-</dd><dt><i>importCompletion</i></dt>
+</dd>
+<dt><i>importCompletion</i></dt>
 <dd>
 flag indicating an import completion (boolean)
-</dd><dt><i>documentOnly</i></dt>
+</dd>
+<dt><i>documentOnly</i></dt>
 <dd>
 flag indicating to complete from the document only
             (boolean)
-</dd><dt><i>sep</i></dt>
+</dd>
+<dt><i>sep</i></dt>
 <dd>
 separator string (string)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of possible completions (list of strings)
 </dd>
-</dl><a NAME="Assistant.__getDocumentCalltips" ID="Assistant.__getDocumentCalltips"></a>
+</dl>
+<a NAME="Assistant.__getDocumentCalltips" ID="Assistant.__getDocumentCalltips"></a>
 <h4>Assistant.__getDocumentCalltips</h4>
 <b>__getDocumentCalltips</b>(<i>word, prefix, module, editor, doHierarchy=False</i>)
+
 <p>
         Private method to determine calltips from the document.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>word</i></dt>
 <dd>
 function to get calltips for (string)
-</dd><dt><i>prefix</i></dt>
+</dd>
+<dt><i>prefix</i></dt>
 <dd>
 prefix of the word to be completed (string)
-</dd><dt><i>module</i></dt>
+</dd>
+<dt><i>module</i></dt>
 <dd>
 reference to the scanned module info (Module)
-</dd><dt><i>editor</i></dt>
+</dd>
+<dt><i>editor</i></dt>
 <dd>
 reference to the editor object (QScintilla.Editor)
-</dd><dt><i>doHierarchy=</i></dt>
+</dd>
+<dt><i>doHierarchy=</i></dt>
 <dd>
 flag indicating a hierarchical search (boolean)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of calltips (list of string)
 </dd>
-</dl><a NAME="Assistant.__getDocumentCompletions" ID="Assistant.__getDocumentCompletions"></a>
+</dl>
+<a NAME="Assistant.__getDocumentCompletions" ID="Assistant.__getDocumentCompletions"></a>
 <h4>Assistant.__getDocumentCompletions</h4>
 <b>__getDocumentCompletions</b>(<i>editor, word, context, sep, prefix, module, doHierarchy=False</i>)
+
 <p>
         Private method to determine autocompletion proposals from the document.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the editor object (QScintilla.Editor.Editor)
-</dd><dt><i>word</i></dt>
+</dd>
+<dt><i>word</i></dt>
 <dd>
 string to be completed (string)
-</dd><dt><i>context</i></dt>
+</dd>
+<dt><i>context</i></dt>
 <dd>
 flag indicating to autocomplete a context (boolean)
-</dd><dt><i>sep</i></dt>
+</dd>
+<dt><i>sep</i></dt>
 <dd>
 separator string (string)
-</dd><dt><i>prefix</i></dt>
+</dd>
+<dt><i>prefix</i></dt>
 <dd>
 prefix of the word to be completed (string)
-</dd><dt><i>module</i></dt>
+</dd>
+<dt><i>module</i></dt>
 <dd>
 reference to the scanned module info (Module)
-</dd><dt><i>doHierarchy=</i></dt>
+</dd>
+<dt><i>doHierarchy=</i></dt>
 <dd>
 flag indicating a hierarchical search (boolean)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of possible completions (list of strings)
 </dd>
-</dl><a NAME="Assistant.__getProjectType" ID="Assistant.__getProjectType"></a>
+</dl>
+<a NAME="Assistant.__getProjectType" ID="Assistant.__getProjectType"></a>
 <h4>Assistant.__getProjectType</h4>
 <b>__getProjectType</b>(<i>editor</i>)
+
 <p>
         Private method to determine the project type to be used.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i> (Editor)</dt>
 <dd>
 reference to the editor to check
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 project type
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Return Type:</dt>
 <dd>
 str
 </dd>
-</dl><a NAME="Assistant.__preferencesChanged" ID="Assistant.__preferencesChanged"></a>
+</dl>
+<a NAME="Assistant.__preferencesChanged" ID="Assistant.__preferencesChanged"></a>
 <h4>Assistant.__preferencesChanged</h4>
 <b>__preferencesChanged</b>(<i></i>)
+
 <p>
         Private method to handle a change of the global configuration.
-</p><a NAME="Assistant.__recordSelectedContext" ID="Assistant.__recordSelectedContext"></a>
+</p>
+<a NAME="Assistant.__recordSelectedContext" ID="Assistant.__recordSelectedContext"></a>
 <h4>Assistant.__recordSelectedContext</h4>
 <b>__recordSelectedContext</b>(<i>userListId, txt</i>)
+
 <p>
         Private slot to handle the selection from the completion list to
         record the selected completion context.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>userListId</i></dt>
 <dd>
 the ID of the user list (should be 1) (integer)
-</dd><dt><i>txt</i></dt>
+</dd>
+<dt><i>txt</i></dt>
 <dd>
 the selected text (string)
 </dd>
-</dl><a NAME="Assistant.__setAutoCompletionHook" ID="Assistant.__setAutoCompletionHook"></a>
+</dl>
+<a NAME="Assistant.__setAutoCompletionHook" ID="Assistant.__setAutoCompletionHook"></a>
 <h4>Assistant.__setAutoCompletionHook</h4>
 <b>__setAutoCompletionHook</b>(<i>editor</i>)
+
 <p>
         Private method to set the autocompletion hook.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the editor (QScintilla.Editor)
 </dd>
-</dl><a NAME="Assistant.__setCalltipsHook" ID="Assistant.__setCalltipsHook"></a>
+</dl>
+<a NAME="Assistant.__setCalltipsHook" ID="Assistant.__setCalltipsHook"></a>
 <h4>Assistant.__setCalltipsHook</h4>
 <b>__setCalltipsHook</b>(<i>editor</i>)
+
 <p>
         Private method to set the calltip hook.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the editor (QScintilla.Editor)
 </dd>
-</dl><a NAME="Assistant.__shutdown" ID="Assistant.__shutdown"></a>
+</dl>
+<a NAME="Assistant.__shutdown" ID="Assistant.__shutdown"></a>
 <h4>Assistant.__shutdown</h4>
 <b>__shutdown</b>(<i></i>)
+
 <p>
         Private slot to handle the shutdown signal.
-</p><a NAME="Assistant.__unsetAutoCompletionHook" ID="Assistant.__unsetAutoCompletionHook"></a>
+</p>
+<a NAME="Assistant.__unsetAutoCompletionHook" ID="Assistant.__unsetAutoCompletionHook"></a>
 <h4>Assistant.__unsetAutoCompletionHook</h4>
 <b>__unsetAutoCompletionHook</b>(<i>editor</i>)
+
 <p>
         Private method to unset the autocompletion hook.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the editor (QScintilla.Editor)
 </dd>
-</dl><a NAME="Assistant.__unsetCalltipsHook" ID="Assistant.__unsetCalltipsHook"></a>
+</dl>
+<a NAME="Assistant.__unsetCalltipsHook" ID="Assistant.__unsetCalltipsHook"></a>
 <h4>Assistant.__unsetCalltipsHook</h4>
 <b>__unsetCalltipsHook</b>(<i>editor</i>)
+
 <p>
         Private method to unset the calltip hook.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the editor (QScintilla.Editor)
 </dd>
-</dl><a NAME="Assistant.activate" ID="Assistant.activate"></a>
+</dl>
+<a NAME="Assistant.activate" ID="Assistant.activate"></a>
 <h4>Assistant.activate</h4>
 <b>activate</b>(<i></i>)
+
 <p>
         Public method to perform actions upon activation.
-</p><a NAME="Assistant.calltips" ID="Assistant.calltips"></a>
+</p>
+<a NAME="Assistant.calltips" ID="Assistant.calltips"></a>
 <h4>Assistant.calltips</h4>
 <b>calltips</b>(<i>editor, pos, commas</i>)
+
 <p>
         Public method to return a list of calltips.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the editor (QScintilla.Editor)
-</dd><dt><i>pos</i></dt>
+</dd>
+<dt><i>pos</i></dt>
 <dd>
 position in the text for the calltip (integer)
-</dd><dt><i>commas</i></dt>
+</dd>
+<dt><i>commas</i></dt>
 <dd>
 minimum number of commas contained in the calltip
             (integer)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of possible calltips (list of strings)
 </dd>
-</dl><a NAME="Assistant.deactivate" ID="Assistant.deactivate"></a>
+</dl>
+<a NAME="Assistant.deactivate" ID="Assistant.deactivate"></a>
 <h4>Assistant.deactivate</h4>
 <b>deactivate</b>(<i></i>)
+
 <p>
         Public method to perform actions upon deactivation.
-</p><a NAME="Assistant.getCompletionsList" ID="Assistant.getCompletionsList"></a>
+</p>
+<a NAME="Assistant.getCompletionsList" ID="Assistant.getCompletionsList"></a>
 <h4>Assistant.getCompletionsList</h4>
 <b>getCompletionsList</b>(<i>editor, context</i>)
+
 <p>
         Public method to get a list of possible completions.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>editor</i></dt>
 <dd>
 reference to the editor object, that called this method
             (QScintilla.Editor)
-</dd><dt><i>context</i></dt>
+</dd>
+<dt><i>context</i></dt>
 <dd>
 flag indicating to autocomplete a context (boolean)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of possible completions (list of strings)
 </dd>
-</dl><a NAME="Assistant.setEnabled" ID="Assistant.setEnabled"></a>
+</dl>
+<a NAME="Assistant.setEnabled" ID="Assistant.setEnabled"></a>
 <h4>Assistant.setEnabled</h4>
 <b>setEnabled</b>(<i>key, enabled</i>)
+
 <p>
         Public method to enable or disable a feature.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>key</i></dt>
 <dd>
 feature to set (string)
-</dd><dt><i>enabled</i></dt>
+</dd>
+<dt><i>enabled</i></dt>
 <dd>
 flag indicating the status (boolean)
 </dd>
--- a/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.AutoCompletionEricPage.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.AutoCompletionEricPage.html	Mon Jun 22 19:16:15 2020 +0200
@@ -18,69 +18,89 @@
 
 </style>
 </head>
-<body><a NAME="top" ID="top"></a>
+<body>
+<a NAME="top" ID="top"></a>
 <h1>Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.AutoCompletionEricPage</h1>
+
 <p>
 Module implementing the Eric Autocompletion configuration page.
 </p>
 <h3>Global Attributes</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Classes</h3>
+
 <table>
+
 <tr>
 <td><a href="#AutoCompletionEricPage">AutoCompletionEricPage</a></td>
 <td>Class implementing the Eric Autocompletion configuration page.</td>
 </tr>
 </table>
 <h3>Functions</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="AutoCompletionEricPage" ID="AutoCompletionEricPage"></a>
 <h2>AutoCompletionEricPage</h2>
+
 <p>
     Class implementing the Eric Autocompletion configuration page.
 </p>
 <h3>Derived from</h3>
 ConfigurationPageBase, Ui_AutoCompletionEricPage
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
+
 <tr>
 <td><a href="#AutoCompletionEricPage.__init__">AutoCompletionEricPage</a></td>
 <td>Constructor</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#AutoCompletionEricPage.save">save</a></td>
 <td>Public slot to save the Eric Autocompletion configuration.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <a NAME="AutoCompletionEricPage.__init__" ID="AutoCompletionEricPage.__init__"></a>
 <h4>AutoCompletionEricPage (Constructor)</h4>
 <b>AutoCompletionEricPage</b>(<i>plugin</i>)
+
 <p>
         Constructor
-</p><dl>
+</p>
+<dl>
+
 <dt><i>plugin</i></dt>
 <dd>
 reference to the plugin object
 </dd>
-</dl><a NAME="AutoCompletionEricPage.save" ID="AutoCompletionEricPage.save"></a>
+</dl>
+<a NAME="AutoCompletionEricPage.save" ID="AutoCompletionEricPage.save"></a>
 <h4>AutoCompletionEricPage.save</h4>
 <b>save</b>(<i></i>)
+
 <p>
         Public slot to save the Eric Autocompletion configuration.
 </p>
--- a/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.CallTipsEricPage.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.CallTipsEricPage.html	Mon Jun 22 19:16:15 2020 +0200
@@ -18,69 +18,89 @@
 
 </style>
 </head>
-<body><a NAME="top" ID="top"></a>
+<body>
+<a NAME="top" ID="top"></a>
 <h1>Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.CallTipsEricPage</h1>
+
 <p>
 Module implementing the Eric Calltips configuration page.
 </p>
 <h3>Global Attributes</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Classes</h3>
+
 <table>
+
 <tr>
 <td><a href="#CallTipsEricPage">CallTipsEricPage</a></td>
 <td>Class implementing the Eric Calltips configuration page.</td>
 </tr>
 </table>
 <h3>Functions</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="CallTipsEricPage" ID="CallTipsEricPage"></a>
 <h2>CallTipsEricPage</h2>
+
 <p>
     Class implementing the Eric Calltips configuration page.
 </p>
 <h3>Derived from</h3>
 ConfigurationPageBase, Ui_CallTipsEricPage
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
+
 <tr>
 <td><a href="#CallTipsEricPage.__init__">CallTipsEricPage</a></td>
 <td>Constructor</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#CallTipsEricPage.save">save</a></td>
 <td>Public slot to save the Eric Calltips configuration.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <a NAME="CallTipsEricPage.__init__" ID="CallTipsEricPage.__init__"></a>
 <h4>CallTipsEricPage (Constructor)</h4>
 <b>CallTipsEricPage</b>(<i>plugin</i>)
+
 <p>
         Constructor
-</p><dl>
+</p>
+<dl>
+
 <dt><i>plugin</i></dt>
 <dd>
 reference to the plugin object
 </dd>
-</dl><a NAME="CallTipsEricPage.save" ID="CallTipsEricPage.save"></a>
+</dl>
+<a NAME="CallTipsEricPage.save" ID="CallTipsEricPage.save"></a>
 <h4>CallTipsEricPage.save</h4>
 <b>save</b>(<i></i>)
+
 <p>
         Public slot to save the Eric Calltips configuration.
 </p>
--- a/AssistantEric/Documentation/source/Plugin_Assistant_Eric.PluginAssistantEric.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/Plugin_Assistant_Eric.PluginAssistantEric.html	Mon Jun 22 19:16:15 2020 +0200
@@ -18,214 +18,279 @@
 
 </style>
 </head>
-<body><a NAME="top" ID="top"></a>
+<body>
+<a NAME="top" ID="top"></a>
 <h1>Plugin_Assistant_Eric.PluginAssistantEric</h1>
+
 <p>
 Module implementing the Eric assistant plugin.
 </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>python2Compatible</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>shortDescription</td></tr><tr><td>version</td></tr>
 </table>
 <h3>Classes</h3>
+
 <table>
+
 <tr>
 <td><a href="#AssistantEricPlugin">AssistantEricPlugin</a></td>
 <td>Class implementing the Eric assistant plugin.</td>
 </tr>
 </table>
 <h3>Functions</h3>
+
 <table>
+
 <tr>
 <td><a href="#createAutoCompletionPage">createAutoCompletionPage</a></td>
 <td>Module function to create the autocompletion configuration page.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#createCallTipsPage">createCallTipsPage</a></td>
 <td>Module function to create the calltips configuration page.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#getConfigData">getConfigData</a></td>
 <td>Module function returning data as required by the configuration dialog.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#prepareUninstall">prepareUninstall</a></td>
 <td>Module function to prepare for an uninstallation.</td>
 </tr>
 </table>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="AssistantEricPlugin" ID="AssistantEricPlugin"></a>
 <h2>AssistantEricPlugin</h2>
+
 <p>
     Class implementing the Eric assistant plugin.
 </p>
 <h3>Derived from</h3>
 QObject
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>PreferencesKey</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
+
 <tr>
 <td><a href="#AssistantEricPlugin.__init__">AssistantEricPlugin</a></td>
 <td>Constructor</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#AssistantEricPlugin.__checkQSql">__checkQSql</a></td>
 <td>Private method to perform some checks on QSql.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#AssistantEricPlugin.__initialize">__initialize</a></td>
 <td>Private slot to (re)initialize the plugin.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#AssistantEricPlugin.__loadTranslator">__loadTranslator</a></td>
 <td>Private method to load the translation file.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#AssistantEricPlugin.activate">activate</a></td>
 <td>Public method to activate this plugin.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#AssistantEricPlugin.deactivate">deactivate</a></td>
 <td>Public method to deactivate this plugin.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#AssistantEricPlugin.getPreferences">getPreferences</a></td>
 <td>Public method to retrieve the various refactoring settings.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#AssistantEricPlugin.setPreferences">setPreferences</a></td>
 <td>Public method to store the various refactoring settings.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <a NAME="AssistantEricPlugin.__init__" ID="AssistantEricPlugin.__init__"></a>
 <h4>AssistantEricPlugin (Constructor)</h4>
 <b>AssistantEricPlugin</b>(<i>ui</i>)
+
 <p>
         Constructor
-</p><dl>
+</p>
+<dl>
+
 <dt><i>ui</i></dt>
 <dd>
 reference to the user interface object (UI.UserInterface)
 </dd>
-</dl><a NAME="AssistantEricPlugin.__checkQSql" ID="AssistantEricPlugin.__checkQSql"></a>
+</dl>
+<a NAME="AssistantEricPlugin.__checkQSql" ID="AssistantEricPlugin.__checkQSql"></a>
 <h4>AssistantEricPlugin.__checkQSql</h4>
 <b>__checkQSql</b>(<i></i>)
+
 <p>
         Private method to perform some checks on QSql.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 flag indicating QSql is ok (boolean)
 </dd>
-</dl><a NAME="AssistantEricPlugin.__initialize" ID="AssistantEricPlugin.__initialize"></a>
+</dl>
+<a NAME="AssistantEricPlugin.__initialize" ID="AssistantEricPlugin.__initialize"></a>
 <h4>AssistantEricPlugin.__initialize</h4>
 <b>__initialize</b>(<i></i>)
+
 <p>
         Private slot to (re)initialize the plugin.
-</p><a NAME="AssistantEricPlugin.__loadTranslator" ID="AssistantEricPlugin.__loadTranslator"></a>
+</p>
+<a NAME="AssistantEricPlugin.__loadTranslator" ID="AssistantEricPlugin.__loadTranslator"></a>
 <h4>AssistantEricPlugin.__loadTranslator</h4>
 <b>__loadTranslator</b>(<i></i>)
+
 <p>
         Private method to load the translation file.
-</p><a NAME="AssistantEricPlugin.activate" ID="AssistantEricPlugin.activate"></a>
+</p>
+<a NAME="AssistantEricPlugin.activate" ID="AssistantEricPlugin.activate"></a>
 <h4>AssistantEricPlugin.activate</h4>
 <b>activate</b>(<i></i>)
+
 <p>
         Public method to activate this plugin.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 tuple of None and activation status (boolean)
 </dd>
-</dl><a NAME="AssistantEricPlugin.deactivate" ID="AssistantEricPlugin.deactivate"></a>
+</dl>
+<a NAME="AssistantEricPlugin.deactivate" ID="AssistantEricPlugin.deactivate"></a>
 <h4>AssistantEricPlugin.deactivate</h4>
 <b>deactivate</b>(<i></i>)
+
 <p>
         Public method to deactivate this plugin.
-</p><a NAME="AssistantEricPlugin.getPreferences" ID="AssistantEricPlugin.getPreferences"></a>
+</p>
+<a NAME="AssistantEricPlugin.getPreferences" ID="AssistantEricPlugin.getPreferences"></a>
 <h4>AssistantEricPlugin.getPreferences</h4>
 <b>getPreferences</b>(<i>key</i>)
+
 <p>
         Public method to retrieve the various refactoring settings.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>key</i></dt>
 <dd>
 the key of the value to get
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 the requested refactoring setting
 </dd>
-</dl><a NAME="AssistantEricPlugin.setPreferences" ID="AssistantEricPlugin.setPreferences"></a>
+</dl>
+<a NAME="AssistantEricPlugin.setPreferences" ID="AssistantEricPlugin.setPreferences"></a>
 <h4>AssistantEricPlugin.setPreferences</h4>
 <b>setPreferences</b>(<i>key, value</i>)
+
 <p>
         Public method to store the various refactoring settings.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>key</i></dt>
 <dd>
 the key of the setting to be set (string)
-</dd><dt><i>value</i></dt>
+</dd>
+<dt><i>value</i></dt>
 <dd>
 the value to be set
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="createAutoCompletionPage" ID="createAutoCompletionPage"></a>
 <h2>createAutoCompletionPage</h2>
 <b>createAutoCompletionPage</b>(<i>configDlg</i>)
+
 <p>
     Module function to create the autocompletion configuration page.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>configDlg</i></dt>
 <dd>
 reference to the configuration dialog
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 reference to the configuration page
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="createCallTipsPage" ID="createCallTipsPage"></a>
 <h2>createCallTipsPage</h2>
 <b>createCallTipsPage</b>(<i>configDlg</i>)
+
 <p>
     Module function to create the calltips configuration page.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>configDlg</i></dt>
 <dd>
 reference to the configuration dialog
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 reference to the configuration page
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="getConfigData" ID="getConfigData"></a>
 <h2>getConfigData</h2>
 <b>getConfigData</b>(<i></i>)
+
 <p>
     Module function returning data as required by the configuration dialog.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 dictionary containing the relevant data
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="prepareUninstall" ID="prepareUninstall"></a>
 <h2>prepareUninstall</h2>
 <b>prepareUninstall</b>(<i></i>)
+
 <p>
     Module function to prepare for an uninstallation.
 </p>
--- a/AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.html	Mon Jun 22 19:16:15 2020 +0200
@@ -20,6 +20,7 @@
 </head>
 <body>
 <h1>Plugin_Assistant_Eric.AssistantEric.ConfigurationPages</h1>
+
 <p>
 Package implementing the various pages of the configuration dialog.
 </p>
@@ -27,10 +28,12 @@
 
 <h3>Modules</h3>
 <table>
+
 <tr>
 <td><a href="Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.AutoCompletionEricPage.html">AutoCompletionEricPage</a></td>
 <td>Module implementing the Eric Autocompletion configuration page.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.CallTipsEricPage.html">CallTipsEricPage</a></td>
 <td>Module implementing the Eric Calltips configuration page.</td>
 </tr>
--- a/AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.AssistantEric.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.AssistantEric.html	Mon Jun 22 19:16:15 2020 +0200
@@ -20,12 +20,14 @@
 </head>
 <body>
 <h1>Plugin_Assistant_Eric.AssistantEric</h1>
+
 <p>
 Package implementing an alternative autocompletion and calltips system.
 </p>
 
 <h3>Packages</h3>
 <table>
+
 <tr>
 <td><a href="index-Plugin_Assistant_Eric.AssistantEric.ConfigurationPages.html">ConfigurationPages</a></td>
 <td>Package implementing the various pages of the configuration dialog.</td>
@@ -34,10 +36,12 @@
 
 <h3>Modules</h3>
 <table>
+
 <tr>
 <td><a href="Plugin_Assistant_Eric.AssistantEric.APIsManager.html">APIsManager</a></td>
 <td>Module implementing the APIsManager.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="Plugin_Assistant_Eric.AssistantEric.Assistant.html">Assistant</a></td>
 <td>Module implementing the eric assistant, an alternative autocompletion and calltips system.</td>
 </tr>
--- a/AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/index-Plugin_Assistant_Eric.html	Mon Jun 22 19:16:15 2020 +0200
@@ -20,12 +20,14 @@
 </head>
 <body>
 <h1>Plugin_Assistant_Eric</h1>
+
 <p>
 Package implementing the eric6 assistant plugin.
 </p>
 
 <h3>Packages</h3>
 <table>
+
 <tr>
 <td><a href="index-Plugin_Assistant_Eric.AssistantEric.html">AssistantEric</a></td>
 <td>Package implementing an alternative autocompletion and calltips system.</td>
@@ -34,6 +36,7 @@
 
 <h3>Modules</h3>
 <table>
+
 <tr>
 <td><a href="Plugin_Assistant_Eric.PluginAssistantEric.html">PluginAssistantEric</a></td>
 <td>Module implementing the Eric assistant plugin.</td>
--- a/AssistantEric/Documentation/source/index.html	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/Documentation/source/index.html	Mon Jun 22 19:16:15 2020 +0200
@@ -24,6 +24,7 @@
 
 <h3>Packages</h3>
 <table>
+
 <tr>
 <td><a href="index-Plugin_Assistant_Eric.html">Plugin_Assistant_Eric</a></td>
 <td>Package implementing the eric6 assistant plugin.</td>
--- a/AssistantEric/i18n/assistant_cs.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_cs.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,12 +31,12 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="86"/>
+        <location filename="../../PluginAssistantEric.py" line="97"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <location filename="../../PluginAssistantEric.py" line="161"/>
         <source>The SQLite database driver is not available.</source>
         <translation>Ovladač SQLite databáze není dostupný.</translation>
     </message>
@@ -46,12 +46,7 @@
         <translation type="obsolete">PyQt4.QtSql není dostupné.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="../../PluginAssistantEric.py" line="156"/>
         <source>PyQt5.QtSql is not available.</source>
         <translation type="unfinished">PyQt4.QtSql není dostupné. {5.?}</translation>
     </message>
@@ -59,62 +54,62 @@
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
         <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/Ui_AutoCompletionEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
         <source>Enable autocompletion</source>
         <translation>Zapnout autodoplňování</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
         <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/Ui_AutoCompletionEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
         <source>Source</source>
         <translation>Zdroj</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
         <source>from Document</source>
         <translation>z dokumentu</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
         <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/Ui_AutoCompletionEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
         <source>from API files</source>
         <translation>z API souborů</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
         <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/Ui_AutoCompletionEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
         <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/Ui_AutoCompletionEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
         <source>from Project</source>
         <translation>z projektu</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="17"/>
         <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/Ui_CallTipsEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="37"/>
         <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/Ui_CallTipsEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="40"/>
         <source>Enable calltips</source>
         <translation>Zapnout Rychlé tipy</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="47"/>
         <source>Context display options</source>
         <translation>Nastavení kontextu zobrazování</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="59"/>
         <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/Ui_CallTipsEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="62"/>
         <source>Show context information</source>
         <translation>Zobrazit kontextové informace</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="76"/>
         <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/Ui_CallTipsEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="89"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="92"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/AssistantEric/i18n/assistant_de.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_de.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <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="1230"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <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="1240"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <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="1233"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation></translation>
     </message>
@@ -31,22 +31,22 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="86"/>
+        <location filename="../../PluginAssistantEric.py" line="97"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <location filename="../../PluginAssistantEric.py" line="161"/>
         <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="144"/>
         <source>Your version of eric6 is not supported.</source>
-        <translation>Ihre eric6 Version wird nicht unterstützt.</translation>
+        <translation type="obsolete">Ihre eric6 Version wird nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <location filename="../../PluginAssistantEric.py" line="156"/>
         <source>PyQt5.QtSql is not available.</source>
         <translation>PyQt5.QtSql ist nicht verfügbar.</translation>
     </message>
@@ -54,62 +54,62 @@
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
         <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/Ui_AutoCompletionEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
         <source>Enable autocompletion</source>
         <translation>Autom. Vervollständigung aktivieren</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
         <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/Ui_AutoCompletionEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
         <source>Source</source>
         <translation>Quelle</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
         <source>from Document</source>
         <translation>vom Dokument</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
         <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/Ui_AutoCompletionEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
         <source>from API files</source>
         <translation>von API Dateien</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
         <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/Ui_AutoCompletionEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
         <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/Ui_AutoCompletionEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
         <source>from Project</source>
         <translation>vom Projekt</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
         <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/Ui_AutoCompletionEricPage.py" line="73"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
         <source>Search class hierarchy</source>
         <translation>Klassenhierarchie durchsuchen</translation>
     </message>
@@ -117,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="17"/>
         <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/Ui_CallTipsEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="37"/>
         <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/Ui_CallTipsEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="40"/>
         <source>Enable calltips</source>
         <translation>Calltipps aktivieren</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="47"/>
         <source>Context display options</source>
         <translation>Anzeige Optionen für Kontext</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="59"/>
         <source>Select to display calltips with a context</source>
         <translation>Auswählen, um Calltips mit Kontext anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="62"/>
         <source>Show context information</source>
         <translation>Kontextinformationen anzeigen</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="76"/>
         <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/Ui_CallTipsEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="89"/>
         <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/Ui_CallTipsEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="92"/>
         <source>Search class hierarchy</source>
         <translation>Klassenhierarchie durchsuchen</translation>
     </message>
--- a/AssistantEric/i18n/assistant_en.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_en.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
+<!DOCTYPE TS><TS version="2.0" language="en_US" sourcelanguage="">
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -32,22 +31,17 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="86"/>
+        <location filename="../../PluginAssistantEric.py" line="97"/>
         <source>Eric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <location filename="../../PluginAssistantEric.py" line="161"/>
         <source>The SQLite database driver is not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"/>
+        <location filename="../../PluginAssistantEric.py" line="156"/>
         <source>PyQt5.QtSql is not available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55,62 +49,62 @@
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
         <source>&lt;b&gt;Configure Eric  Autocompletion&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
         <source>Enable autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
         <source>from API files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
         <source>Select this to get autocompletion from current document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
         <source>from Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
         <source>Select this to get autocompletion from current project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
         <source>from Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -118,47 +112,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="17"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="37"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="40"/>
         <source>Enable calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="47"/>
         <source>Context display options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="59"/>
         <source>Select to display calltips with a context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="62"/>
         <source>Show context information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="76"/>
         <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/Ui_CallTipsEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="89"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="92"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/AssistantEric/i18n/assistant_es.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_es.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="es">
+<!DOCTYPE TS><TS version="2.0" language="es" sourcelanguage="">
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1224"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation>Proyecto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1234"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <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="1227"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <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="1237"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <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="1230"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation>&apos;{0}&apos; APIs: Procesando &apos;{1}&apos;</translation>
     </message>
@@ -32,22 +31,22 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="86"/>
+        <location filename="../../PluginAssistantEric.py" line="97"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <location filename="../../PluginAssistantEric.py" line="161"/>
         <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="144"/>
         <source>Your version of eric6 is not supported.</source>
-        <translation>Esta versión de eric6 no está soportada.</translation>
+        <translation type="obsolete">Esta versión de eric6 no está soportada.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <location filename="../../PluginAssistantEric.py" line="156"/>
         <source>PyQt5.QtSql is not available.</source>
         <translation>No está disponible PyQt5.QtSql.</translation>
     </message>
@@ -55,62 +54,62 @@
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
         <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="../ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
         <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="../ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
         <source>Enable autocompletion</source>
         <translation>Habilitar Autocompletar</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
         <source>Source</source>
         <translation>Origen</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
         <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="../ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
         <source>from API files</source>
         <translation>desde archivos API</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
         <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="../ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
         <source>from Document</source>
         <translation>desde Documento</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
         <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="../ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
         <source>from Project</source>
         <translation>desde Proyecto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
         <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="../ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
         <source>Search class hierarchy</source>
         <translation>Buscar por jerarquía de clases</translation>
     </message>
@@ -118,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="17"/>
         <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="../ConfigurationPages/CallTipsEricPage.ui" line="37"/>
         <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="../ConfigurationPages/CallTipsEricPage.ui" line="40"/>
         <source>Enable calltips</source>
         <translation>Habilitar consejos de llamada (calltips)</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="47"/>
         <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="../ConfigurationPages/CallTipsEricPage.ui" line="59"/>
         <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="../ConfigurationPages/CallTipsEricPage.ui" line="62"/>
         <source>Show context information</source>
         <translation>Mostrar información de contexto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="76"/>
         <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="../ConfigurationPages/CallTipsEricPage.ui" line="89"/>
         <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="../ConfigurationPages/CallTipsEricPage.ui" line="92"/>
         <source>Search class hierarchy</source>
         <translation>Buscar por jerarquía de clases</translation>
     </message>
--- a/AssistantEric/i18n/assistant_fr.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_fr.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,12 +31,12 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="86"/>
+        <location filename="../../PluginAssistantEric.py" line="97"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <location filename="../../PluginAssistantEric.py" line="161"/>
         <source>The SQLite database driver is not available.</source>
         <translation>Le pilote SQLite n&apos;est pas disponible.</translation>
     </message>
@@ -46,12 +46,7 @@
         <translation type="obsolete">PyQt4.QtSql n&apos;est pas disponible.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="../../PluginAssistantEric.py" line="156"/>
         <source>PyQt5.QtSql is not available.</source>
         <translation type="unfinished">PyQt4.QtSql n&apos;est pas disponible. {5.?}</translation>
     </message>
@@ -59,62 +54,62 @@
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
         <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/Ui_AutoCompletionEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
         <source>Enable autocompletion</source>
         <translation>Activer l&apos;autocomplétion</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
         <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/Ui_AutoCompletionEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
         <source>Source</source>
         <translation>Source</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
         <source>from Document</source>
         <translation>à partir du document</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
         <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/Ui_AutoCompletionEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
         <source>from API files</source>
         <translation>à partir des fichiers API</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
         <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/Ui_AutoCompletionEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
         <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/Ui_AutoCompletionEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
         <source>from Project</source>
         <translation>à partir du projet</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="17"/>
         <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/Ui_CallTipsEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="37"/>
         <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/Ui_CallTipsEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="40"/>
         <source>Enable calltips</source>
         <translation>Activer les calltips</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="47"/>
         <source>Context display options</source>
         <translation>Options d&apos;affichage des contextes</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="59"/>
         <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/Ui_CallTipsEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="62"/>
         <source>Show context information</source>
         <translation>Afficher les informations du contexte</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="76"/>
         <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/Ui_CallTipsEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="89"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="92"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/AssistantEric/i18n/assistant_it.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_it.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,7 +31,7 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="86"/>
+        <location filename="../../PluginAssistantEric.py" line="97"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
@@ -41,17 +41,12 @@
         <translation type="obsolete">PyQt4.QtSql non è disponibile.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <location filename="../../PluginAssistantEric.py" line="161"/>
         <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="144"/>
-        <source>Your version of eric6 is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <location filename="../../PluginAssistantEric.py" line="156"/>
         <source>PyQt5.QtSql is not available.</source>
         <translation type="unfinished">PyQt4.QtSql non è disponibile. {5.?}</translation>
     </message>
@@ -59,62 +54,62 @@
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
         <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/Ui_AutoCompletionEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
         <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/Ui_AutoCompletionEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
         <source>Enable autocompletion</source>
         <translation>Abilita autocompletamento</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
         <source>Source</source>
         <translation>Sorgente</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
         <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/Ui_AutoCompletionEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
         <source>from API files</source>
         <translation>dai file delle API</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
         <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/Ui_AutoCompletionEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
         <source>from Document</source>
         <translation>da Documento</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
         <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/Ui_AutoCompletionEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
         <source>from Project</source>
         <translation>da Progetto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="17"/>
         <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/Ui_CallTipsEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="37"/>
         <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/Ui_CallTipsEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="40"/>
         <source>Enable calltips</source>
         <translation>Abilita calltips</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="47"/>
         <source>Context display options</source>
         <translation>Opzioni di contesto del display</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="59"/>
         <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/Ui_CallTipsEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="62"/>
         <source>Show context information</source>
         <translation>Mostra informazioni di contesto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="76"/>
         <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/Ui_CallTipsEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="89"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="92"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/AssistantEric/i18n/assistant_pt.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_pt.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1224"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation>Projeto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1234"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation>Terminada a preparação de &apos;{0}&apos; APIs.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation>Iniciada a preparação de &apos;{0}&apos; APIs.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation>Cancelada a preparação de &apos;{0}&apos; APIs.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation>&apos;{0}&apos; APIs: A processar &apos;{1}&apos;</translation>
     </message>
@@ -31,22 +31,22 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="86"/>
+        <location filename="../../PluginAssistantEric.py" line="97"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
     <message>
         <location filename="../../PluginAssistantEric.py" line="144"/>
         <source>Your version of eric6 is not supported.</source>
-        <translation>Esta versão de eric6 não é suportada.</translation>
+        <translation type="obsolete">Esta versão de eric6 não é suportada.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="158"/>
+        <location filename="../../PluginAssistantEric.py" line="156"/>
         <source>PyQt5.QtSql is not available.</source>
         <translation>Não está disponível PyQt5.QtSql.</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <location filename="../../PluginAssistantEric.py" line="161"/>
         <source>The SQLite database driver is not available.</source>
         <translation>O driver da bases de dados SQLite não está disponível.</translation>
     </message>
@@ -54,62 +54,62 @@
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
         <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="../ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>Selecionar para habilitar apoio de autocompletar de eric.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
         <source>Enable autocompletion</source>
         <translation>Habilitar autocompletar</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
         <source>Source</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>Selecionar para autocompletar a partir das APIs instaladas</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
         <source>from API files</source>
         <translation>de ficheiros API</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>Selecionar para autocompletar a partir do documento atual</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
         <source>from Document</source>
         <translation>do Documento</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>Selecionar para autocompletar a partir do projeto atual</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
         <source>from Project</source>
         <translation>do Projeto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation>Selecionar para buscar a completação nas hierarquia completa da classe</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
         <source>Search class hierarchy</source>
         <translation>Procurar hierarquia de classe</translation>
     </message>
@@ -117,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="17"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="17"/>
         <source>&lt;b&gt;Configure Eric Calltips&lt;/b&gt;</source>
         <translation>&lt;b&gt;Configurar Dicas de Eric&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="37"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="37"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>Selecionar para habilitar apoio das dicas de eric.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="40"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="40"/>
         <source>Enable calltips</source>
         <translation>Habilitar dicas</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="47"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="47"/>
         <source>Context display options</source>
         <translation>Opções de exibição contextual</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="59"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="59"/>
         <source>Select to display calltips with a context</source>
         <translation>Selecionar para exibir dicas dentro de contexto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="62"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="62"/>
         <source>Show context information</source>
         <translation>Mostrar informação de contexto</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="76"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="76"/>
         <source>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</source>
         <translation>Um contexto é qualquer âmbito (ex: um espaço de nomes C++ ou um módulo Python) prévio ao nome de função/método.</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="89"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="89"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation>Selecionar para procurar a dica na hierarquia completa da classe</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/CallTipsEricPage.ui" line="92"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="92"/>
         <source>Search class hierarchy</source>
         <translation>Buscar hierarquia de classe</translation>
     </message>
--- a/AssistantEric/i18n/assistant_ru.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_ru.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../APIsManager.py" line="1316"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation>Project</translation>
     </message>
     <message>
-        <location filename="../APIsManager.py" line="1319"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation>Подготовка APIs для &apos;{0}&apos; начата.</translation>
     </message>
     <message>
-        <location filename="../APIsManager.py" line="1322"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation>&apos;{0}&apos; APIs: Обработка &apos;{1}&apos;</translation>
     </message>
     <message>
-        <location filename="../APIsManager.py" line="1326"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation>Подготовка APIs для &apos;{0}&apos; завершена.</translation>
     </message>
     <message>
-        <location filename="../APIsManager.py" line="1329"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation>Подготовка APIs для &apos;{0}&apos; прервана.</translation>
     </message>
--- a/AssistantEric/i18n/assistant_zh_CN.GB2312.ts	Sat May 02 14:52:03 2020 +0200
+++ b/AssistantEric/i18n/assistant_zh_CN.GB2312.ts	Mon Jun 22 19:16:15 2020 +0200
@@ -3,27 +3,27 @@
 <context>
     <name>APIsManager</name>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1227"/>
+        <location filename="../APIsManager.py" line="1325"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1237"/>
+        <location filename="../APIsManager.py" line="1335"/>
         <source>Preparation of &apos;{0}&apos; APIs finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1230"/>
+        <location filename="../APIsManager.py" line="1328"/>
         <source>Preparation of &apos;{0}&apos; APIs started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1240"/>
+        <location filename="../APIsManager.py" line="1338"/>
         <source>Preparation of &apos;{0}&apos; APIs cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/APIsManager.py" line="1233"/>
+        <location filename="../APIsManager.py" line="1331"/>
         <source>&apos;{0}&apos; APIs: Processing &apos;{1}&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31,7 +31,7 @@
 <context>
     <name>AssistantEricPlugin</name>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="86"/>
+        <location filename="../../PluginAssistantEric.py" line="97"/>
         <source>Eric</source>
         <translation>Eric</translation>
     </message>
@@ -41,17 +41,12 @@
         <translation type="obsolete">PyQt4.QtSql 无效。</translation>
     </message>
     <message>
-        <location filename="../../PluginAssistantEric.py" line="165"/>
+        <location filename="../../PluginAssistantEric.py" line="161"/>
         <source>The SQLite database driver is not available.</source>
         <translation>SQLite 数据库驱动器无效。</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="../../PluginAssistantEric.py" line="156"/>
         <source>PyQt5.QtSql is not available.</source>
         <translation type="unfinished">PyQt4.QtSql 无效。 {5.?}</translation>
     </message>
@@ -59,62 +54,62 @@
 <context>
     <name>AutoCompletionEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="62"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="17"/>
         <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/Ui_AutoCompletionEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="37"/>
         <source>Select, whether the eric autocompletion support shall be enabled.</source>
         <translation>选择是否打开 Eric 自动完成功能</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="40"/>
         <source>Enable autocompletion</source>
         <translation>允许自动完成</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="47"/>
         <source>Source</source>
         <translation>源</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="59"/>
         <source>Select this to get autocompletion from installed APIs</source>
         <translation>选择通过已安装的 APIs 实现自动完成</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="62"/>
         <source>from API files</source>
         <translation>根据 API 文件</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="69"/>
         <source>Select this to get autocompletion from current document</source>
         <translation>选择通过当前文档实现自动完成</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="72"/>
         <source>from Document</source>
         <translation>根据文档</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="79"/>
         <source>Select this to get autocompletion from current project</source>
         <translation>选择通过当前项目实现自动完成</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="82"/>
         <source>from Project</source>
         <translation>根据项目</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="72"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="92"/>
         <source>Select to search the complete class hierarchy for completions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_AutoCompletionEricPage.py" line="73"/>
+        <location filename="../ConfigurationPages/AutoCompletionEricPage.ui" line="95"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,47 +117,47 @@
 <context>
     <name>CallTipsEricPage</name>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="63"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="17"/>
         <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/Ui_CallTipsEricPage.py" line="64"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="37"/>
         <source>Select, whether the eric calltips support shall be enabled.</source>
         <translation>选择是否打开 Eric 调用提示功能</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="65"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="40"/>
         <source>Enable calltips</source>
         <translation>允许调用提示</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="66"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="47"/>
         <source>Context display options</source>
         <translation>上下文显示选项</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="67"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="59"/>
         <source>Select to display calltips with a context</source>
         <translation>选择通过上下文显示调用提示</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="68"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="62"/>
         <source>Show context information</source>
         <translation>显示上下文信息</translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="69"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="76"/>
         <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/Ui_CallTipsEricPage.py" line="70"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="89"/>
         <source>Select to search the complete class hierarchy for calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../AssistantEric/ConfigurationPages/Ui_CallTipsEricPage.py" line="71"/>
+        <location filename="../ConfigurationPages/CallTipsEricPage.ui" line="92"/>
         <source>Search class hierarchy</source>
         <translation type="unfinished"></translation>
     </message>
--- a/ChangeLog	Sat May 02 14:52:03 2020 +0200
+++ b/ChangeLog	Mon Jun 22 19:16:15 2020 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 5.0.0:
+- removed support for Python2
+
 Version 4.2.1:
 - updated Russian translations
 
--- a/PluginAssistantEric.py	Sat May 02 14:52:03 2020 +0200
+++ b/PluginAssistantEric.py	Mon Jun 22 19:16:15 2020 +0200
@@ -24,16 +24,16 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "4.2.1"
+version = "5.0.0"
 className = "AssistantEricPlugin"
 packageName = "AssistantEric"
 shortDescription = "Alternative autocompletion and calltips provider."
-longDescription = \
-    """This plugin implements an alternative autocompletion and""" \
+longDescription = (
+    """This plugin implements an alternative autocompletion and"""
     """ calltips provider."""
+)
 needsRestart = True
 pyqtApi = 2
-python2Compatible = True
 # End-Of-Header
 
 error = ""
@@ -49,10 +49,10 @@
     @return reference to the configuration page
     """
     global assistantEricPluginObject
-    from AssistantEric.ConfigurationPages.AutoCompletionEricPage \
-        import AutoCompletionEricPage
-    page = AutoCompletionEricPage(assistantEricPluginObject)
-    return page
+    from AssistantEric.ConfigurationPages.AutoCompletionEricPage import (
+        AutoCompletionEricPage
+    )
+    return AutoCompletionEricPage(assistantEricPluginObject)
     
 
 def createCallTipsPage(configDlg):
@@ -63,10 +63,10 @@
     @return reference to the configuration page
     """
     global assistantEricPluginObject
-    from AssistantEric.ConfigurationPages.CallTipsEricPage \
-        import CallTipsEricPage
-    page = CallTipsEricPage(assistantEricPluginObject)
-    return page
+    from AssistantEric.ConfigurationPages.CallTipsEricPage import (
+        CallTipsEricPage
+    )
+    return CallTipsEricPage(assistantEricPluginObject)
     
 
 def getConfigData():
Binary file PluginAssistantEric.zip has changed
--- a/PluginEricAssistant.e4p	Sat May 02 14:52:03 2020 +0200
+++ b/PluginEricAssistant.e4p	Mon Jun 22 19:16:15 2020 +0200
@@ -234,6 +234,34 @@
         <value>
           <dict>
             <key>
+              <string>AnnotationsChecker</string>
+            </key>
+            <value>
+              <dict>
+                <key>
+                  <string>MaximumComplexity</string>
+                </key>
+                <value>
+                  <int>3</int>
+                </value>
+                <key>
+                  <string>MinimumCoverage</string>
+                </key>
+                <value>
+                  <int>75</int>
+                </value>
+              </dict>
+            </value>
+            <key>
+              <string>BlankLines</string>
+            </key>
+            <value>
+              <tuple>
+                <int>2</int>
+                <int>1</int>
+              </tuple>
+            </value>
+            <key>
               <string>BuiltinsChecker</string>
             </key>
             <value>
@@ -265,6 +293,19 @@
               </dict>
             </value>
             <key>
+              <string>CommentedCodeChecker</string>
+            </key>
+            <value>
+              <dict>
+                <key>
+                  <string>Aggressive</string>
+                </key>
+                <value>
+                  <bool>False</bool>
+                </value>
+              </dict>
+            </value>
+            <key>
               <string>CopyrightAuthor</string>
             </key>
             <value>
@@ -283,6 +324,12 @@
               <string>eric</string>
             </value>
             <key>
+              <string>EnabledCheckerCategories</string>
+            </key>
+            <value>
+              <string>C, D, E, M, N, S, W</string>
+            </value>
+            <key>
               <string>ExcludeFiles</string>
             </key>
             <value>
@@ -292,7 +339,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>C101, E265, E266, E305, E402, M811, N802, N803, N807, N808, N821, W293, M201</string>
+              <string>C101,E265,E266,E305,E402,M811,N802,N803,N807,N808,N821,W293,M201,W504</string>
             </value>
             <key>
               <string>FixCodes</string>
@@ -343,6 +390,12 @@
               <int>10</int>
             </value>
             <key>
+              <string>MaxDocLineLength</string>
+            </key>
+            <value>
+              <int>79</int>
+            </value>
+            <key>
               <string>MaxLineLength</string>
             </key>
             <value>
@@ -361,6 +414,91 @@
               <bool>True</bool>
             </value>
             <key>
+              <string>SecurityChecker</string>
+            </key>
+            <value>
+              <dict>
+                <key>
+                  <string>CheckTypedException</string>
+                </key>
+                <value>
+                  <bool>False</bool>
+                </value>
+                <key>
+                  <string>HardcodedTmpDirectories</string>
+                </key>
+                <value>
+                  <list>
+                    <string>/tmp</string>
+                    <string>/var/tmp</string>
+                    <string>/dev/shm</string>
+                    <string>~/tmp</string>
+                  </list>
+                </value>
+                <key>
+                  <string>InsecureHashes</string>
+                </key>
+                <value>
+                  <list>
+                    <string>md4</string>
+                    <string>md5</string>
+                    <string>sha</string>
+                    <string>sha1</string>
+                  </list>
+                </value>
+                <key>
+                  <string>InsecureSslProtocolVersions</string>
+                </key>
+                <value>
+                  <list>
+                    <string>PROTOCOL_SSLv2</string>
+                    <string>SSLv2_METHOD</string>
+                    <string>SSLv23_METHOD</string>
+                    <string>PROTOCOL_SSLv3</string>
+                    <string>PROTOCOL_TLSv1</string>
+                    <string>SSLv3_METHOD</string>
+                    <string>TLSv1_METHOD</string>
+                  </list>
+                </value>
+                <key>
+                  <string>WeakKeySizeDsaHigh</string>
+                </key>
+                <value>
+                  <string>1024</string>
+                </value>
+                <key>
+                  <string>WeakKeySizeDsaMedium</string>
+                </key>
+                <value>
+                  <string>2048</string>
+                </value>
+                <key>
+                  <string>WeakKeySizeEcHigh</string>
+                </key>
+                <value>
+                  <string>160</string>
+                </value>
+                <key>
+                  <string>WeakKeySizeEcMedium</string>
+                </key>
+                <value>
+                  <string>224</string>
+                </value>
+                <key>
+                  <string>WeakKeySizeRsaHigh</string>
+                </key>
+                <value>
+                  <string>1024</string>
+                </value>
+                <key>
+                  <string>WeakKeySizeRsaMedium</string>
+                </key>
+                <value>
+                  <string>2048</string>
+                </value>
+              </dict>
+            </value>
+            <key>
               <string>ShowIgnored</string>
             </key>
             <value>

eric ide

mercurial