--- a/Documentation/Source/eric6.install.html Sat Sep 05 13:49:08 2015 +0200 +++ b/Documentation/Source/eric6.install.html Sat Sep 05 15:13:13 2015 +0200 @@ -34,21 +34,18 @@ <h3>Functions</h3> <table> <tr> +<td><a href="#__pyName">__pyName</a></td> +<td>Local function to create the Python source file name for the compiled .ui file.</td> +</tr><tr> <td><a href="#cleanUp">cleanUp</a></td> <td>Uninstall the old eric files.</td> </tr><tr> <td><a href="#cleanupSource">cleanupSource</a></td> <td>Cleanup the sources directory to get rid of leftover files and directories.</td> </tr><tr> -<td><a href="#compileUiDir">compileUiDir</a></td> -<td>Creates Python modules from Qt Designer .ui files in a directory or directory tree.</td> -</tr><tr> <td><a href="#compileUiFiles">compileUiFiles</a></td> <td>Compile the .ui files to Python sources.</td> </tr><tr> -<td><a href="#compile_ui">compile_ui</a></td> -<td>Local function to compile a single .ui file.</td> -</tr><tr> <td><a href="#copyDesktopFile">copyDesktopFile</a></td> <td>Modify a desktop file and write it to its destination.</td> </tr><tr> @@ -94,9 +91,6 @@ <td><a href="#prepareInfoFile">prepareInfoFile</a></td> <td>Function to prepare an Info.py file when installing from source.</td> </tr><tr> -<td><a href="#pyName">pyName</a></td> -<td>Local function to create the Python source file name for the compiled .ui file.</td> -</tr><tr> <td><a href="#shutilCopy">shutilCopy</a></td> <td>Wrapper function around shutil.copy() to ensure the permissions.</td> </tr><tr> @@ -108,6 +102,28 @@ </tr> </table> <hr /><hr /> +<a NAME="__pyName" ID="__pyName"></a> +<h2>__pyName</h2> +<b>__pyName</b>(<i>py_dir, py_file</i>) +<p> + Local function to create the Python source file name for the compiled + .ui file. +</p><dl> +<dt><i>py_dir</i></dt> +<dd> +suggested name of the directory (string) +</dd><dt><i>py_file</i></dt> +<dd> +suggested name for the compile source file (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple of directory name (string) and source file name (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="cleanUp" ID="cleanUp"></a> <h2>cleanUp</h2> <b>cleanUp</b>(<i></i>) @@ -130,41 +146,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="compileUiDir" ID="compileUiDir"></a> -<h2>compileUiDir</h2> -<b>compileUiDir</b>(<i>dir, recurse=False, map=None, **compileUi_args</i>) -<p> - Creates Python modules from Qt Designer .ui files in a directory or - directory tree. -</p><p> - Note: This function is a modified version of the one found in - PyQt5. -</p><dl> -<dt><i>dir</i></dt> -<dd> -Name of the directory to scan for files whose name ends - with '.ui'. By default the generated Python module is created - in the same directory ending with '.py'. -</dd><dt><i>recurse</i></dt> -<dd> -flag indicating that any sub-directories should be - scanned. -</dd><dt><i>map</i></dt> -<dd> -an optional callable that is passed the name of the - directory containing the '.ui' file and the name of the Python - module that will be created. The callable should return a - tuple of the name of the directory in which the Python module - will be created and the (possibly modified) name of the module. -</dd><dt><i>compileUi_args</i></dt> -<dd> -any additional keyword arguments that are - passed to the compileUi() function that is called to create - each Python module. -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="compileUiFiles" ID="compileUiFiles"></a> <h2>compileUiFiles</h2> <b>compileUiFiles</b>(<i></i>) @@ -173,22 +154,6 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="compile_ui" ID="compile_ui"></a> -<h2>compile_ui</h2> -<b>compile_ui</b>(<i>ui_dir, ui_file</i>) -<p> - Local function to compile a single .ui file. -</p><dl> -<dt><i>ui_dir</i></dt> -<dd> -directory containing the .ui file (string) -</dd><dt><i>ui_file</i></dt> -<dd> -file name of the .ui file (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="copyDesktopFile" ID="copyDesktopFile"></a> <h2>copyDesktopFile</h2> <b>copyDesktopFile</b>(<i>src, dst, marker</i>) @@ -392,28 +357,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="pyName" ID="pyName"></a> -<h2>pyName</h2> -<b>pyName</b>(<i>py_dir, py_file</i>) -<p> - Local function to create the Python source file name for the compiled - .ui file. -</p><dl> -<dt><i>py_dir</i></dt> -<dd> -suggested name of the directory (string) -</dd><dt><i>py_file</i></dt> -<dd> -suggested name for the compile source file (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -tuple of directory name (string) and source file name (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="shutilCopy" ID="shutilCopy"></a> <h2>shutilCopy</h2> <b>shutilCopy</b>(<i>src, dst, perm=0o644</i>)