Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Thu Oct 18 18:51:39 2018 +0200
+++ b/APIs/Python3/eric6.api	Thu Oct 18 18:53:23 2018 +0200
@@ -8214,6 +8214,9 @@
 eric6.Project.TranslationPropertiesDialog.TranslationPropertiesDialog.on_transPatternPicker_textChanged?4(txt)
 eric6.Project.TranslationPropertiesDialog.TranslationPropertiesDialog.storeData?4()
 eric6.Project.TranslationPropertiesDialog.TranslationPropertiesDialog?1(project, new, parent)
+eric6.Project.UicLoadUi.className?4(formFile, projectPath)
+eric6.Project.UicLoadUi.objectName?4(formFile, projectPath)
+eric6.Project.UicLoadUi.signatures?4(formFile, projectPath)
 eric6.Project.UserPropertiesDialog.UserPropertiesDialog.storeData?4()
 eric6.Project.UserPropertiesDialog.UserPropertiesDialog?1(project, parent=None, name=None)
 eric6.PyUnit.UnittestDialog.QtTestResult.addError?4(test, err)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Thu Oct 18 18:51:39 2018 +0200
+++ b/Documentation/Help/source.qhp	Thu Oct 18 18:53:23 2018 +0200
@@ -997,6 +997,7 @@
             <section title="eric6.Project.QuickFindFileDialog" ref="eric6.Project.QuickFindFileDialog.html" />
             <section title="eric6.Project.SpellingPropertiesDialog" ref="eric6.Project.SpellingPropertiesDialog.html" />
             <section title="eric6.Project.TranslationPropertiesDialog" ref="eric6.Project.TranslationPropertiesDialog.html" />
+            <section title="eric6.Project.UicLoadUi" ref="eric6.Project.UicLoadUi.html" />
             <section title="eric6.Project.UserPropertiesDialog" ref="eric6.Project.UserPropertiesDialog.html" />
           </section>
           <section title="eric6.PyUnit" ref="index-eric6.PyUnit.html">
@@ -3506,13 +3507,15 @@
       <keyword name="CreateDialogCodeDialog (Constructor)" id="CreateDialogCodeDialog (Constructor)" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__init__" />
       <keyword name="CreateDialogCodeDialog (Module)" id="CreateDialogCodeDialog (Module)" ref="eric6.Project.CreateDialogCodeDialog.html" />
       <keyword name="CreateDialogCodeDialog.__className" id="CreateDialogCodeDialog.__className" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__className" />
+      <keyword name="CreateDialogCodeDialog.__classNameExternal" id="CreateDialogCodeDialog.__classNameExternal" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__classNameExternal" />
       <keyword name="CreateDialogCodeDialog.__generateCode" id="CreateDialogCodeDialog.__generateCode" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__generateCode" />
       <keyword name="CreateDialogCodeDialog.__generatePythonCode" id="CreateDialogCodeDialog.__generatePythonCode" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__generatePythonCode" />
-      <keyword name="CreateDialogCodeDialog.__loadUi" id="CreateDialogCodeDialog.__loadUi" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__loadUi" />
       <keyword name="CreateDialogCodeDialog.__mapType" id="CreateDialogCodeDialog.__mapType" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__mapType" />
       <keyword name="CreateDialogCodeDialog.__objectName" id="CreateDialogCodeDialog.__objectName" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__objectName" />
+      <keyword name="CreateDialogCodeDialog.__objectNameExternal" id="CreateDialogCodeDialog.__objectNameExternal" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__objectNameExternal" />
       <keyword name="CreateDialogCodeDialog.__signatures" id="CreateDialogCodeDialog.__signatures" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__signatures" />
       <keyword name="CreateDialogCodeDialog.__updateSlotsModel" id="CreateDialogCodeDialog.__updateSlotsModel" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__updateSlotsModel" />
+      <keyword name="CreateDialogCodeDialog.__updateSlotsModelExternal" id="CreateDialogCodeDialog.__updateSlotsModelExternal" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.__updateSlotsModelExternal" />
       <keyword name="CreateDialogCodeDialog.initError" id="CreateDialogCodeDialog.initError" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.initError" />
       <keyword name="CreateDialogCodeDialog.on_buttonBox_clicked" id="CreateDialogCodeDialog.on_buttonBox_clicked" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.on_buttonBox_clicked" />
       <keyword name="CreateDialogCodeDialog.on_classNameCombo_activated" id="CreateDialogCodeDialog.on_classNameCombo_activated" ref="eric6.Project.CreateDialogCodeDialog.html#CreateDialogCodeDialog.on_classNameCombo_activated" />
@@ -16593,6 +16596,7 @@
       <keyword name="UMLSceneSizeDialog (Module)" id="UMLSceneSizeDialog (Module)" ref="eric6.Graphics.UMLSceneSizeDialog.html" />
       <keyword name="UMLSceneSizeDialog.getData" id="UMLSceneSizeDialog.getData" ref="eric6.Graphics.UMLSceneSizeDialog.html#UMLSceneSizeDialog.getData" />
       <keyword name="UiExtensionPlugins (Package)" id="UiExtensionPlugins (Package)" ref="index-eric6.Plugins.UiExtensionPlugins.html" />
+      <keyword name="UicLoadUi (Module)" id="UicLoadUi (Module)" ref="eric6.Project.UicLoadUi.html" />
       <keyword name="Uid" id="Uid" ref="eric6.Utilities.binplistlib.html#Uid" />
       <keyword name="Uid.__repr__" id="Uid.__repr__" ref="eric6.Utilities.binplistlib.html#Uid.__repr__" />
       <keyword name="UniqueNamespace" id="UniqueNamespace" ref="eric6.E5Network.E5RFC6266.html#UniqueNamespace" />
@@ -18523,6 +18527,7 @@
       <keyword name="__init___3" id="__init___3" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#__init___3" />
       <keyword name="__init___4" id="__init___4" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#__init___4" />
       <keyword name="__jsSyntaxCheck" id="__jsSyntaxCheck" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html#__jsSyntaxCheck" />
+      <keyword name="__mapType" id="__mapType" ref="eric6.Project.UicLoadUi.html#__mapType" />
       <keyword name="__messageBox" id="__messageBox" ref="eric6.E5Gui.E5MessageBox.html#__messageBox" />
       <keyword name="__pyName" id="__pyName" ref="eric6.Utilities.uic.html#__pyName" />
       <keyword name="__pyName" id="__pyName" ref="eric6.compileUiFiles.html#__pyName" />
@@ -18577,6 +18582,7 @@
       <keyword name="check_files" id="check_files" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_files" />
       <keyword name="check_logical" id="check_logical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_logical" />
       <keyword name="check_physical" id="check_physical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_physical" />
+      <keyword name="className" id="className" ref="eric6.Project.UicLoadUi.html#className" />
       <keyword name="cleanUp" id="cleanUp" ref="eric6.install-debugclients.html#cleanUp" />
       <keyword name="cleanUp" id="cleanUp" ref="eric6.install.html#cleanUp" />
       <keyword name="cleanUpLinuxSpecifics" id="cleanUpLinuxSpecifics" ref="eric6.install.html#cleanUpLinuxSpecifics" />
@@ -19133,6 +19139,7 @@
       <keyword name="normcaseabspath" id="normcaseabspath" ref="eric6.Utilities.__init__.html#normcaseabspath" />
       <keyword name="normcasepath" id="normcasepath" ref="eric6.Utilities.__init__.html#normcasepath" />
       <keyword name="normjoinpath" id="normjoinpath" ref="eric6.Utilities.__init__.html#normjoinpath" />
+      <keyword name="objectName" id="objectName" ref="eric6.Project.UicLoadUi.html#objectName" />
       <keyword name="okToClearData" id="okToClearData" ref="eric6.E5Gui.E5MessageBox.html#okToClearData" />
       <keyword name="open" id="open" ref="eric6.Globals.compatibility_fixes.html#open" />
       <keyword name="parseContentDisposition" id="parseContentDisposition" ref="eric6.Helpviewer.HelpUtilities.html#parseContentDisposition" />
@@ -19309,6 +19316,7 @@
       <keyword name="shouldResetLayout" id="shouldResetLayout" ref="eric6.Preferences.__init__.html#shouldResetLayout" />
       <keyword name="shutilCopy" id="shutilCopy" ref="eric6.install-debugclients.html#shutilCopy" />
       <keyword name="shutilCopy" id="shutilCopy" ref="eric6.install.html#shutilCopy" />
+      <keyword name="signatures" id="signatures" ref="eric6.Project.UicLoadUi.html#signatures" />
       <keyword name="simpleAppStartup" id="simpleAppStartup" ref="eric6.Toolbox.Startup.html#simpleAppStartup" />
       <keyword name="sort" id="sort" ref="eric6.Graphics.GraphicsUtilities.html#sort" />
       <keyword name="speedString" id="speedString" ref="eric6.WebBrowser.Download.DownloadUtilities.html#speedString" />
@@ -20197,6 +20205,7 @@
       <file>eric6.Project.QuickFindFileDialog.html</file>
       <file>eric6.Project.SpellingPropertiesDialog.html</file>
       <file>eric6.Project.TranslationPropertiesDialog.html</file>
+      <file>eric6.Project.UicLoadUi.html</file>
       <file>eric6.Project.UserPropertiesDialog.html</file>
       <file>eric6.PyUnit.UnittestDialog.html</file>
       <file>eric6.QScintilla.APIsManager.html</file>

--- a/Documentation/Source/eric6.Project.CreateDialogCodeDialog.html	Thu Oct 18 18:51:39 2018 +0200
+++ b/Documentation/Source/eric6.Project.CreateDialogCodeDialog.html	Thu Oct 18 18:53:23 2018 +0200
@@ -61,7 +61,10 @@
 <td>Constructor</td>
 </tr><tr>
 <td><a href="#CreateDialogCodeDialog.__className">__className</a></td>
-<td>Private method to get the class name of the dialog.</td>
+<td>Private method to get the class name of a form.</td>
+</tr><tr>
+<td><a href="#CreateDialogCodeDialog.__classNameExternal">__classNameExternal</a></td>
+<td>Private method to get the class name of a form via an external interpreter.</td>
 </tr><tr>
 <td><a href="#CreateDialogCodeDialog.__generateCode">__generateCode</a></td>
 <td>Private slot to generate the code as requested by the user.</td>
@@ -69,14 +72,14 @@
 <td><a href="#CreateDialogCodeDialog.__generatePythonCode">__generatePythonCode</a></td>
 <td>Private slot to generate Python code as requested by the user.</td>
 </tr><tr>
-<td><a href="#CreateDialogCodeDialog.__loadUi">__loadUi</a></td>
-<td>Private method to load a form file and instantiate the defined form.</td>
-</tr><tr>
 <td><a href="#CreateDialogCodeDialog.__mapType">__mapType</a></td>
 <td>Private method to map a type as reported by Qt's meta object to the correct Python type.</td>
 </tr><tr>
 <td><a href="#CreateDialogCodeDialog.__objectName">__objectName</a></td>
-<td>Private method to get the object name of the dialog.</td>
+<td>Private method to get the object name of a form.</td>
+</tr><tr>
+<td><a href="#CreateDialogCodeDialog.__objectNameExternal">__objectNameExternal</a></td>
+<td>Private method to get the object name of a form via an external interpreter.</td>
 </tr><tr>
 <td><a href="#CreateDialogCodeDialog.__signatures">__signatures</a></td>
 <td>Private slot to get the signatures.</td>
@@ -84,6 +87,9 @@
 <td><a href="#CreateDialogCodeDialog.__updateSlotsModel">__updateSlotsModel</a></td>
 <td>Private slot to update the slots tree display.</td>
 </tr><tr>
+<td><a href="#CreateDialogCodeDialog.__updateSlotsModelExternal">__updateSlotsModelExternal</a></td>
+<td>Private slot to update the slots tree display getting the data via an external interpreter.</td>
+</tr><tr>
 <td><a href="#CreateDialogCodeDialog.initError">initError</a></td>
 <td>Public method to determine, if there was an initialzation error.</td>
 </tr><tr>
@@ -124,11 +130,32 @@
 <h4>CreateDialogCodeDialog.__className</h4>
 <b>__className</b>(<i></i>)
 <p>
-        Private method to get the class name of the dialog.
+        Private method to get the class name of a form.
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-class name (sting)
+class name
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="CreateDialogCodeDialog.__classNameExternal" ID="CreateDialogCodeDialog.__classNameExternal"></a>
+<h4>CreateDialogCodeDialog.__classNameExternal</h4>
+<b>__classNameExternal</b>(<i></i>)
+<p>
+        Private method to get the class name of a form via an external
+        interpreter.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+class name
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl><a NAME="CreateDialogCodeDialog.__generateCode" ID="CreateDialogCodeDialog.__generateCode"></a>
 <h4>CreateDialogCodeDialog.__generateCode</h4>
@@ -140,30 +167,7 @@
 <b>__generatePythonCode</b>(<i></i>)
 <p>
         Private slot to generate Python code as requested by the user.
-</p><a NAME="CreateDialogCodeDialog.__loadUi" ID="CreateDialogCodeDialog.__loadUi"></a>
-<h4>CreateDialogCodeDialog.__loadUi</h4>
-<b>__loadUi</b>(<i>formFile, package=""</i>)
-<p>
-        Private method to load a form file and instantiate the defined form.
-</p><dl>
-<dt><i>formFile</i> (str)</dt>
-<dd>
-path of the form file to be loaded
-</dd><dt><i>package</i> (str)</dt>
-<dd>
-base path to be used for relative imports
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-instantiated form
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-QWidget
-</dd>
-</dl><a NAME="CreateDialogCodeDialog.__mapType" ID="CreateDialogCodeDialog.__mapType"></a>
+</p><a NAME="CreateDialogCodeDialog.__mapType" ID="CreateDialogCodeDialog.__mapType"></a>
 <h4>CreateDialogCodeDialog.__mapType</h4>
 <b>__mapType</b>(<i>type_</i>)
 <p>
@@ -183,11 +187,32 @@
 <h4>CreateDialogCodeDialog.__objectName</h4>
 <b>__objectName</b>(<i></i>)
 <p>
-        Private method to get the object name of the dialog.
+        Private method to get the object name of a form.
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-object name (string)
+object name
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="CreateDialogCodeDialog.__objectNameExternal" ID="CreateDialogCodeDialog.__objectNameExternal"></a>
+<h4>CreateDialogCodeDialog.__objectNameExternal</h4>
+<b>__objectNameExternal</b>(<i></i>)
+<p>
+        Private method to get the object name of a form via an external
+        interpreter.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+object name
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl><a NAME="CreateDialogCodeDialog.__signatures" ID="CreateDialogCodeDialog.__signatures"></a>
 <h4>CreateDialogCodeDialog.__signatures</h4>
@@ -204,6 +229,12 @@
 <b>__updateSlotsModel</b>(<i></i>)
 <p>
         Private slot to update the slots tree display.
+</p><a NAME="CreateDialogCodeDialog.__updateSlotsModelExternal" ID="CreateDialogCodeDialog.__updateSlotsModelExternal"></a>
+<h4>CreateDialogCodeDialog.__updateSlotsModelExternal</h4>
+<b>__updateSlotsModelExternal</b>(<i></i>)
+<p>
+        Private slot to update the slots tree display getting the data via an
+        external interpreter.
 </p><a NAME="CreateDialogCodeDialog.initError" ID="CreateDialogCodeDialog.initError"></a>
 <h4>CreateDialogCodeDialog.initError</h4>
 <b>initError</b>(<i></i>)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Project.UicLoadUi.html	Thu Oct 18 18:53:23 2018 +0200
@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Project.UicLoadUi</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Project.UicLoadUi</h1>
+<p>
+Module to get sys.path of an external interpreter.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#__mapType">__mapType</a></td>
+<td>Private function to map a type as reported by Qt's meta object to the correct Python type.</td>
+</tr><tr>
+<td><a href="#className">className</a></td>
+<td>Function to get the class name of a form.</td>
+</tr><tr>
+<td><a href="#objectName">objectName</a></td>
+<td>Function to get the object name of a form.</td>
+</tr><tr>
+<td><a href="#signatures">signatures</a></td>
+<td>Function to get the signatures of form elements.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="__mapType" ID="__mapType"></a>
+<h2>__mapType</h2>
+<b>__mapType</b>(<i>type_</i>)
+<p>
+    Private function to map a type as reported by Qt's meta object to the
+    correct Python type.
+</p><dl>
+<dt><i>type_</i> (QByteArray or bytes)</dt>
+<dd>
+type as reported by Qt
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+mapped Python type
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="className" ID="className"></a>
+<h2>className</h2>
+<b>className</b>(<i>formFile, projectPath</i>)
+<p>
+    Function to get the class name of a form.
+</p><dl>
+<dt><i>formFile</i> (str)</dt>
+<dd>
+file name of the form
+</dd><dt><i>projectPath</i> (str)</dt>
+<dd>
+directory name of the project
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="objectName" ID="objectName"></a>
+<h2>objectName</h2>
+<b>objectName</b>(<i>formFile, projectPath</i>)
+<p>
+    Function to get the object name of a form.
+</p><dl>
+<dt><i>formFile</i> (str)</dt>
+<dd>
+file name of the form
+</dd><dt><i>projectPath</i> (str)</dt>
+<dd>
+directory name of the project
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="signatures" ID="signatures"></a>
+<h2>signatures</h2>
+<b>signatures</b>(<i>formFile, projectPath</i>)
+<p>
+    Function to get the signatures of form elements.
+</p><dl>
+<dt><i>formFile</i> (str)</dt>
+<dd>
+file name of the form
+</dd><dt><i>projectPath</i> (str)</dt>
+<dd>
+directory name of the project
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/Documentation/Source/eric6.Utilities.GetSysPath.html	Thu Oct 18 18:51:39 2018 +0200
+++ b/Documentation/Source/eric6.Utilities.GetSysPath.html	Thu Oct 18 18:53:23 2018 +0200
@@ -21,7 +21,7 @@
 <body><a NAME="top" ID="top"></a>
 <h1>eric6.Utilities.GetSysPath</h1>
 <p>
-Module to check for the presence of PySide/PySide2 by importing it.
+Module to get sys.path of an external interpreter.
 </p>
 <h3>Global Attributes</h3>
 <table>

--- a/Documentation/Source/index-eric6.Project.html	Thu Oct 18 18:51:39 2018 +0200
+++ b/Documentation/Source/index-eric6.Project.html	Thu Oct 18 18:53:23 2018 +0200
@@ -125,6 +125,9 @@
 <td><a href="eric6.Project.TranslationPropertiesDialog.html">TranslationPropertiesDialog</a></td>
 <td>Module implementing the Translations Properties dialog.</td>
 </tr><tr>
+<td><a href="eric6.Project.UicLoadUi.html">UicLoadUi</a></td>
+<td>Module to get sys.path of an external interpreter.</td>
+</tr><tr>
 <td><a href="eric6.Project.UserPropertiesDialog.html">UserPropertiesDialog</a></td>
 <td>Module implementing the user specific project properties dialog.</td>
 </tr>

--- a/Documentation/Source/index-eric6.Utilities.html	Thu Oct 18 18:51:39 2018 +0200
+++ b/Documentation/Source/index-eric6.Utilities.html	Thu Oct 18 18:53:23 2018 +0200
@@ -51,7 +51,7 @@
 <td>Module implementing some FTP related utilities.</td>
 </tr><tr>
 <td><a href="eric6.Utilities.GetSysPath.html">GetSysPath</a></td>
-<td>Module to check for the presence of PySide/PySide2 by importing it.</td>
+<td>Module to get sys.path of an external interpreter.</td>
 </tr><tr>
 <td><a href="eric6.Utilities.MimeTypes.html">MimeTypes</a></td>
 <td>Module implementing mimetype dependent functions.</td>