Some changes to the changes sent by Tobias.

Sun, 18 Aug 2013 13:04:29 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 18 Aug 2013 13:04:29 +0200
changeset 57
ddf3165e3d62
parent 56
c8a47a8536b0
child 58
b0c675ba5b2b

Some changes to the changes sent by Tobias.

ChangeLog file | annotate | diff | comparison | revisions
CxFreeze/CxfreezeConfigDialog.py file | annotate | diff | comparison | revisions
CxFreeze/CxfreezeConfigDialog.ui file | annotate | diff | comparison | revisions
CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.CxFreeze.CxfreezeConfigDialog.html file | annotate | diff | comparison | revisions
CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.CxFreeze.CxfreezeExecDialog.html file | annotate | diff | comparison | revisions
CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.PluginCxFreeze.html file | annotate | diff | comparison | revisions
PluginCxFreeze.py file | annotate | diff | comparison | revisions
PluginCxFreeze.zip file | annotate | diff | comparison | revisions
--- a/ChangeLog	Sun Aug 11 22:17:02 2013 +0200
+++ b/ChangeLog	Sun Aug 18 13:04:29 2013 +0200
@@ -16,7 +16,6 @@
 - filedialog to add distribution dependent files, e.g. *.ui, readme, which
   are copied after the freeze process
 
-
 Version 5.1.2:
 - bug fix
 
--- a/CxFreeze/CxfreezeConfigDialog.py	Sun Aug 11 22:17:02 2013 +0200
+++ b/CxFreeze/CxfreezeConfigDialog.py	Sun Aug 18 13:04:29 2013 +0200
@@ -34,14 +34,17 @@
     Derived QFileDialog to select files and folders at once.
     For this purpose the none native filedialog is used.
     """
-    def __init__(self, parent=None, caption="", directory="",
-                             filter=""):
+    def __init__(self, parent=None, caption="", directory="", filter=""):
         """
-        Extend the normal none native filedialog to select files and folders at once.
+        Extend the normal none native file dialog to select files and folders at once.
         
-        @param args same argument list like QFileDialog
+        @param parent parent widget of the dialog (QWidget)
+        @param caption window title of the dialog (string)
+        @param directory working directory of the dialog (string)
+        @param filter filter string for the dialog (string)
         """
         self.selectedFilesFolders = []
+        
         QFileDialog.__init__(self, parent, caption, directory, filter)
         self.setFileMode(QFileDialog.ExistingFiles)
         btns = self.findChildren(QPushButton)
@@ -76,7 +79,7 @@
         """
         Reset selections if another directory was entered.
         
-        @param dir name of the directory entered
+        @param dir name of the directory entered (string)
         """
         self.tree.selectionModel().clear()
         self.fileNameEdit.clear()
@@ -86,8 +89,8 @@
         """
         Determine the selected files and folders and update the lineedit.
         
-        @param selected newly selected entries
-        @param deselected deselected entries
+        @param selected newly selected entries (QItemSelection)
+        @param deselected deselected entries (QItemSelection)
         """
         selectedItems = self.tree.selectionModel().selectedIndexes()
         if self.tree.rootIndex() in selectedItems or selectedItems == []:
@@ -102,25 +105,26 @@
         """
         Set the state of the open button.
         
-        @param text text written into the lineedit.
+        @param text text written into the line edit (string)
         """
-        self.openBtn.setEnabled(text!='')
+        self.openBtn.setEnabled(text != '')
 
     @staticmethod
     def getOpenFileNames(parent=None, caption="", directory="",
-                             filter="", options=QFileDialog.Options()):
+                         filter="", options=QFileDialog.Options()):
         """
-        Module function to get the names of files and folders for opening it.
+        Static method to get the names of files and folders for opening it.
         
         @param parent parent widget of the dialog (QWidget)
         @param caption window title of the dialog (string)
         @param directory working directory of the dialog (string)
         @param filter filter string for the dialog (string)
         @param options various options for the dialog (QFileDialog.Options)
-        @return names of the selected files and folders (list)
+        @return names of the selected files and folders (list of strings)
         """
         options |= QFileDialog.DontUseNativeDialog
         dlg = DirFileDialog(parent, caption, directory, filter)
+        dlg.setOptions(options)
         dlg.exec_()
         return dlg.selectedFilesFolders
 
@@ -303,7 +307,7 @@
         
         # 2.3 additional files tab
         if self.parameters['additionalFiles'] != []:
-            parms['additionalFiles'] = self.parameters['additionalFiles']
+            parms['additionalFiles'] = self.parameters['additionalFiles'][:]
         
         return (args, parms)
 
@@ -380,6 +384,11 @@
     
     @pyqtSlot(str)
     def on_cxfreezeExecCombo_currentIndexChanged(self, text):
+        """
+        Private slot to handle the selection of a cxfreeze executable.
+        
+        @param text selected cxfreeze executable (string)
+        """
         # version specific setup
         if Utilities.isWindowsPlatform():
             # remove "\Scripts\cx_Freeze.bat" from path
@@ -461,13 +470,14 @@
     @pyqtSlot(QListWidgetItem)
     def on_fileOrFolderList_itemDoubleClicked(self, itm):
         """
-        Private slot to handle the currentRowChanged signal of the fileOrFolderList.
+        Private slot to handle the itemDoubleClicked signal of the fileOrFolderList.
         
-        @param itm the selected row
+        @param itm the selected row (QListWidgetItem)
         """
         self.fileOrFolderEdit.setText(itm.text())
         row = self.fileOrFolderList.currentRow()
-        self.fileOrFolderList.takeItem(row)
+        itm = self.fileOrFolderList.takeItem(row)
+        del itm
     
     @pyqtSlot()
     def on_addFileOrFolderButton_clicked(self):
@@ -496,7 +506,8 @@
         Private slot to delete the selected entry from the list view.
         """
         row = self.fileOrFolderList.currentRow()
-        self.fileOrFolderList.takeItem(row)
+        itm = self.fileOrFolderList.takeItem(row)
+        del itm
         row = self.fileOrFolderList.currentRow()
         self.on_fileOrFolderList_currentRowChanged(row)
 
@@ -513,10 +524,8 @@
             None,
             self.trUtf8("Select files and folders"))
 
-        ppath = self.project.ppath.replace(os.sep, '/') + '/'
         for itm in items:
-            if itm.startswith(ppath):
-                itm = itm.replace(ppath, '')
+            itm = self.project.getRelativePath(itm)
             self.fileOrFolderList.addItem(Utilities.toNativeSeparators(itm))
         row = self.fileOrFolderList.currentRow()
         self.on_fileOrFolderList_currentRowChanged(row)
--- a/CxFreeze/CxfreezeConfigDialog.ui	Sun Aug 11 22:17:02 2013 +0200
+++ b/CxFreeze/CxfreezeConfigDialog.ui	Sun Aug 18 13:04:29 2013 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>324</height>
+    <height>367</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,7 +25,16 @@
    <property name="spacing">
     <number>6</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>5</number>
+   </property>
+   <property name="topMargin">
+    <number>5</number>
+   </property>
+   <property name="rightMargin">
+    <number>5</number>
+   </property>
+   <property name="bottomMargin">
     <number>5</number>
    </property>
    <item>
@@ -187,7 +196,16 @@
           <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
+           <number>9</number>
+          </property>
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
            <number>9</number>
           </property>
           <item>
@@ -387,7 +405,7 @@
        <item>
         <widget class="QLabel" name="headerLabel">
          <property name="text">
-          <string>&lt;b&gt;Add depending files or folders to copy into the distribution folder:&lt;/b&gt;</string>
+          <string>Add depending files or folders to copy into the distribution folder:</string>
          </property>
         </widget>
        </item>
--- a/CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.CxFreeze.CxfreezeConfigDialog.html	Sun Aug 11 22:17:02 2013 +0200
+++ b/CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.CxFreeze.CxfreezeConfigDialog.html	Sun Aug 18 13:04:29 2013 +0200
@@ -32,6 +32,9 @@
 <tr>
 <td><a href="#CxfreezeConfigDialog">CxfreezeConfigDialog</a></td>
 <td>Class implementing a dialog to enter the parameters for cxfreeze.</td>
+</tr><tr>
+<td><a href="#DirFileDialog">DirFileDialog</a></td>
+<td>Derived QFileDialog to select files and folders at once.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -72,15 +75,33 @@
 <td><a href="#CxfreezeConfigDialog.generateParameters">generateParameters</a></td>
 <td>Public method that generates the commandline parameters.</td>
 </tr><tr>
+<td><a href="#CxfreezeConfigDialog.on_addFileOrFolderButton_clicked">on_addFileOrFolderButton_clicked</a></td>
+<td>Private slot to add the entered file or directory to the list view.</td>
+</tr><tr>
 <td><a href="#CxfreezeConfigDialog.on_cxfreezeExecCombo_currentIndexChanged">on_cxfreezeExecCombo_currentIndexChanged</a></td>
-<td></td>
+<td>Private slot to handle the selection of a cxfreeze executable.</td>
+</tr><tr>
+<td><a href="#CxfreezeConfigDialog.on_deleteSelectedButton_clicked">on_deleteSelectedButton_clicked</a></td>
+<td>Private slot to delete the selected entry from the list view.</td>
 </tr><tr>
 <td><a href="#CxfreezeConfigDialog.on_extListFileButton_clicked">on_extListFileButton_clicked</a></td>
 <td>Private slot to select the external list file.</td>
 </tr><tr>
+<td><a href="#CxfreezeConfigDialog.on_fileOrFolderEdit_textChanged">on_fileOrFolderEdit_textChanged</a></td>
+<td>Private slot to handle the textChanged signal of the directory edit.</td>
+</tr><tr>
+<td><a href="#CxfreezeConfigDialog.on_fileOrFolderList_currentRowChanged">on_fileOrFolderList_currentRowChanged</a></td>
+<td>Private slot to handle the currentRowChanged signal of the fileOrFolderList.</td>
+</tr><tr>
+<td><a href="#CxfreezeConfigDialog.on_fileOrFolderList_itemDoubleClicked">on_fileOrFolderList_itemDoubleClicked</a></td>
+<td>Private slot to handle the itemDoubleClicked signal of the fileOrFolderList.</td>
+</tr><tr>
 <td><a href="#CxfreezeConfigDialog.on_iconFileButton_clicked">on_iconFileButton_clicked</a></td>
 <td>Private slot to select an icon.</td>
 </tr><tr>
+<td><a href="#CxfreezeConfigDialog.on_selectFileOrFolderButton_clicked">on_selectFileOrFolderButton_clicked</a></td>
+<td>Private slot to select files or folders.</td>
+</tr><tr>
 <td><a href="#CxfreezeConfigDialog.on_targetDirButton_clicked">on_targetDirButton_clicked</a></td>
 <td>Private slot to select the target directory.</td>
 </tr>
@@ -156,10 +177,27 @@
 a tuple of the commandline parameters and non default parameters
             (list of strings, dictionary)
 </dd>
-</dl><a NAME="CxfreezeConfigDialog.on_cxfreezeExecCombo_currentIndexChanged" ID="CxfreezeConfigDialog.on_cxfreezeExecCombo_currentIndexChanged"></a>
+</dl><a NAME="CxfreezeConfigDialog.on_addFileOrFolderButton_clicked" ID="CxfreezeConfigDialog.on_addFileOrFolderButton_clicked"></a>
+<h4>CxfreezeConfigDialog.on_addFileOrFolderButton_clicked</h4>
+<b>on_addFileOrFolderButton_clicked</b>(<i></i>)
+<p>
+        Private slot to add the entered file or directory to the list view.
+</p><a NAME="CxfreezeConfigDialog.on_cxfreezeExecCombo_currentIndexChanged" ID="CxfreezeConfigDialog.on_cxfreezeExecCombo_currentIndexChanged"></a>
 <h4>CxfreezeConfigDialog.on_cxfreezeExecCombo_currentIndexChanged</h4>
 <b>on_cxfreezeExecCombo_currentIndexChanged</b>(<i>text</i>)
-<a NAME="CxfreezeConfigDialog.on_extListFileButton_clicked" ID="CxfreezeConfigDialog.on_extListFileButton_clicked"></a>
+<p>
+        Private slot to handle the selection of a cxfreeze executable.
+</p><dl>
+<dt><i>text</i></dt>
+<dd>
+selected cxfreeze executable (string)
+</dd>
+</dl><a NAME="CxfreezeConfigDialog.on_deleteSelectedButton_clicked" ID="CxfreezeConfigDialog.on_deleteSelectedButton_clicked"></a>
+<h4>CxfreezeConfigDialog.on_deleteSelectedButton_clicked</h4>
+<b>on_deleteSelectedButton_clicked</b>(<i></i>)
+<p>
+        Private slot to delete the selected entry from the list view.
+</p><a NAME="CxfreezeConfigDialog.on_extListFileButton_clicked" ID="CxfreezeConfigDialog.on_extListFileButton_clicked"></a>
 <h4>CxfreezeConfigDialog.on_extListFileButton_clicked</h4>
 <b>on_extListFileButton_clicked</b>(<i></i>)
 <p>
@@ -167,7 +205,37 @@
 </p><p>
         It displays a file selection dialog to select the external list file,
         the list of include modules is written to.
-</p><a NAME="CxfreezeConfigDialog.on_iconFileButton_clicked" ID="CxfreezeConfigDialog.on_iconFileButton_clicked"></a>
+</p><a NAME="CxfreezeConfigDialog.on_fileOrFolderEdit_textChanged" ID="CxfreezeConfigDialog.on_fileOrFolderEdit_textChanged"></a>
+<h4>CxfreezeConfigDialog.on_fileOrFolderEdit_textChanged</h4>
+<b>on_fileOrFolderEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle the textChanged signal of the directory edit.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+the text of the directory edit (string)
+</dd>
+</dl><a NAME="CxfreezeConfigDialog.on_fileOrFolderList_currentRowChanged" ID="CxfreezeConfigDialog.on_fileOrFolderList_currentRowChanged"></a>
+<h4>CxfreezeConfigDialog.on_fileOrFolderList_currentRowChanged</h4>
+<b>on_fileOrFolderList_currentRowChanged</b>(<i>row</i>)
+<p>
+        Private slot to handle the currentRowChanged signal of the fileOrFolderList.
+</p><dl>
+<dt><i>row</i></dt>
+<dd>
+the current row (integer)
+</dd>
+</dl><a NAME="CxfreezeConfigDialog.on_fileOrFolderList_itemDoubleClicked" ID="CxfreezeConfigDialog.on_fileOrFolderList_itemDoubleClicked"></a>
+<h4>CxfreezeConfigDialog.on_fileOrFolderList_itemDoubleClicked</h4>
+<b>on_fileOrFolderList_itemDoubleClicked</b>(<i>itm</i>)
+<p>
+        Private slot to handle the itemDoubleClicked signal of the fileOrFolderList.
+</p><dl>
+<dt><i>itm</i></dt>
+<dd>
+the selected row (QListWidgetItem)
+</dd>
+</dl><a NAME="CxfreezeConfigDialog.on_iconFileButton_clicked" ID="CxfreezeConfigDialog.on_iconFileButton_clicked"></a>
 <h4>CxfreezeConfigDialog.on_iconFileButton_clicked</h4>
 <b>on_iconFileButton_clicked</b>(<i></i>)
 <p>
@@ -175,6 +243,15 @@
 </p><p>
         It displays a file selection dialog to select an icon to
         include into the executable.
+</p><a NAME="CxfreezeConfigDialog.on_selectFileOrFolderButton_clicked" ID="CxfreezeConfigDialog.on_selectFileOrFolderButton_clicked"></a>
+<h4>CxfreezeConfigDialog.on_selectFileOrFolderButton_clicked</h4>
+<b>on_selectFileOrFolderButton_clicked</b>(<i></i>)
+<p>
+        Private slot to select files or folders.
+</p><p>
+        It displays a file and directory selection dialog to
+        select the files and directorys which should copied into
+        the distribution folder..
 </p><a NAME="CxfreezeConfigDialog.on_targetDirButton_clicked" ID="CxfreezeConfigDialog.on_targetDirButton_clicked"></a>
 <h4>CxfreezeConfigDialog.on_targetDirButton_clicked</h4>
 <b>on_targetDirButton_clicked</b>(<i></i>)
@@ -185,5 +262,134 @@
         select the directory the files are written to.
 </p>
 <div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="DirFileDialog" ID="DirFileDialog"></a>
+<h2>DirFileDialog</h2>
+<p>
+    Derived QFileDialog to select files and folders at once.
+    For this purpose the none native filedialog is used.
+</p>
+<h3>Derived from</h3>
+QFileDialog
+<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="#DirFileDialog.__init__">DirFileDialog</a></td>
+<td>Extend the normal none native file dialog to select files and folders at once.</td>
+</tr><tr>
+<td><a href="#DirFileDialog.on_directoryEntered">on_directoryEntered</a></td>
+<td>Reset selections if another directory was entered.</td>
+</tr><tr>
+<td><a href="#DirFileDialog.on_openClicked">on_openClicked</a></td>
+<td>Update the list with the selected files and folders.</td>
+</tr><tr>
+<td><a href="#DirFileDialog.on_selectionChanged">on_selectionChanged</a></td>
+<td>Determine the selected files and folders and update the lineedit.</td>
+</tr><tr>
+<td><a href="#DirFileDialog.on_textChanged">on_textChanged</a></td>
+<td>Set the state of the open button.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr>
+<td><a href="#DirFileDialog.getOpenFileNames">getOpenFileNames</a></td>
+<td>Static method to get the names of files and folders for opening it.</td>
+</tr>
+</table>
+<a NAME="DirFileDialog.__init__" ID="DirFileDialog.__init__"></a>
+<h4>DirFileDialog (Constructor)</h4>
+<b>DirFileDialog</b>(<i>parent=None, caption="", directory="", filter=""</i>)
+<p>
+        Extend the normal none native file dialog to select files and folders at once.
+</p><dl>
+<dt><i>parent</i></dt>
+<dd>
+parent widget of the dialog (QWidget)
+</dd><dt><i>caption</i></dt>
+<dd>
+window title of the dialog (string)
+</dd><dt><i>directory</i></dt>
+<dd>
+working directory of the dialog (string)
+</dd><dt><i>filter</i></dt>
+<dd>
+filter string for the dialog (string)
+</dd>
+</dl><a NAME="DirFileDialog.on_directoryEntered" ID="DirFileDialog.on_directoryEntered"></a>
+<h4>DirFileDialog.on_directoryEntered</h4>
+<b>on_directoryEntered</b>(<i>dir</i>)
+<p>
+        Reset selections if another directory was entered.
+</p><dl>
+<dt><i>dir</i></dt>
+<dd>
+name of the directory entered (string)
+</dd>
+</dl><a NAME="DirFileDialog.on_openClicked" ID="DirFileDialog.on_openClicked"></a>
+<h4>DirFileDialog.on_openClicked</h4>
+<b>on_openClicked</b>(<i></i>)
+<p>
+        Update the list with the selected files and folders.
+</p><a NAME="DirFileDialog.on_selectionChanged" ID="DirFileDialog.on_selectionChanged"></a>
+<h4>DirFileDialog.on_selectionChanged</h4>
+<b>on_selectionChanged</b>(<i>selected, deselected</i>)
+<p>
+        Determine the selected files and folders and update the lineedit.
+</p><dl>
+<dt><i>selected</i></dt>
+<dd>
+newly selected entries (QItemSelection)
+</dd><dt><i>deselected</i></dt>
+<dd>
+deselected entries (QItemSelection)
+</dd>
+</dl><a NAME="DirFileDialog.on_textChanged" ID="DirFileDialog.on_textChanged"></a>
+<h4>DirFileDialog.on_textChanged</h4>
+<b>on_textChanged</b>(<i>text</i>)
+<p>
+        Set the state of the open button.
+</p><dl>
+<dt><i>text</i></dt>
+<dd>
+text written into the line edit (string)
+</dd>
+</dl><a NAME="DirFileDialog.getOpenFileNames" ID="DirFileDialog.getOpenFileNames"></a>
+<h4>DirFileDialog.getOpenFileNames (static)</h4>
+<b>getOpenFileNames</b>(<i>caption="", directory="", filter="", options=QFileDialog.Options()</i>)
+<p>
+        Static method to get the names of files and folders for opening it.
+</p><dl>
+<dt><i>parent</i></dt>
+<dd>
+parent widget of the dialog (QWidget)
+</dd><dt><i>caption</i></dt>
+<dd>
+window title of the dialog (string)
+</dd><dt><i>directory</i></dt>
+<dd>
+working directory of the dialog (string)
+</dd><dt><i>filter</i></dt>
+<dd>
+filter string for the dialog (string)
+</dd><dt><i>options</i></dt>
+<dd>
+various options for the dialog (QFileDialog.Options)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+names of the selected files and folders (list of strings)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file
--- a/CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.CxFreeze.CxfreezeExecDialog.html	Sun Aug 11 22:17:02 2013 +0200
+++ b/CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.CxFreeze.CxfreezeExecDialog.html	Sun Aug 18 13:04:29 2013 +0200
@@ -32,6 +32,9 @@
 <tr>
 <td><a href="#CxfreezeExecDialog">CxfreezeExecDialog</a></td>
 <td>Module implementing a dialog to show the output of the cxfreeze process.</td>
+</tr><tr>
+<td><a href="#copyAdditionalFiles">copyAdditionalFiles</a></td>
+<td>Thread to copy the distribution dependend files.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -63,9 +66,15 @@
 <td><a href="#CxfreezeExecDialog.__init__">CxfreezeExecDialog</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#CxfreezeExecDialog.__enableButtons">__enableButtons</a></td>
+<td>Private slot called when all processes finished.</td>
+</tr><tr>
 <td><a href="#CxfreezeExecDialog.__finish">__finish</a></td>
 <td>Private slot called when the process finished.</td>
 </tr><tr>
+<td><a href="#CxfreezeExecDialog.__finishedFreeze">__finishedFreeze</a></td>
+<td>Private slot called when the process finished.</td>
+</tr><tr>
 <td><a href="#CxfreezeExecDialog.__readStderr">__readStderr</a></td>
 <td>Private slot to handle the readyReadStandardError signal.</td>
 </tr><tr>
@@ -96,7 +105,15 @@
 <dd>
 parent widget of this dialog (QWidget)
 </dd>
-</dl><a NAME="CxfreezeExecDialog.__finish" ID="CxfreezeExecDialog.__finish"></a>
+</dl><a NAME="CxfreezeExecDialog.__enableButtons" ID="CxfreezeExecDialog.__enableButtons"></a>
+<h4>CxfreezeExecDialog.__enableButtons</h4>
+<b>__enableButtons</b>(<i></i>)
+<p>
+        Private slot called when all processes finished.
+</p><p>
+        It is called when the process finished or
+        the user pressed the cancel button.
+</p><a NAME="CxfreezeExecDialog.__finish" ID="CxfreezeExecDialog.__finish"></a>
 <h4>CxfreezeExecDialog.__finish</h4>
 <b>__finish</b>(<i></i>)
 <p>
@@ -104,6 +121,14 @@
 </p><p>
         It is called when the process finished or
         the user pressed the cancel button.
+</p><a NAME="CxfreezeExecDialog.__finishedFreeze" ID="CxfreezeExecDialog.__finishedFreeze"></a>
+<h4>CxfreezeExecDialog.__finishedFreeze</h4>
+<b>__finishedFreeze</b>(<i></i>)
+<p>
+        Private slot called when the process finished.
+</p><p>
+        It is called when the process finished or
+        the user pressed the cancel button.
 </p><a NAME="CxfreezeExecDialog.__readStderr" ID="CxfreezeExecDialog.__readStderr"></a>
 <h4>CxfreezeExecDialog.__readStderr</h4>
 <b>__readStderr</b>(<i></i>)
@@ -132,13 +157,19 @@
 </dd>
 </dl><a NAME="CxfreezeExecDialog.start" ID="CxfreezeExecDialog.start"></a>
 <h4>CxfreezeExecDialog.start</h4>
-<b>start</b>(<i>args, script</i>)
+<b>start</b>(<i>args, parms, ppath, mainscript</i>)
 <p>
         Public slot to start the packager command.
 </p><dl>
 <dt><i>args</i></dt>
 <dd>
 commandline arguments for packager program (list of strings)
+</dd><dt><i>parms</i></dt>
+<dd>
+parameters got from the config dialog (dict)
+</dd><dt><i>ppath</i></dt>
+<dd>
+project path (string)
 </dd><dt><i>script</i></dt>
 <dd>
 main script name to be processed by by the packager (string)
@@ -150,5 +181,99 @@
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="copyAdditionalFiles" ID="copyAdditionalFiles"></a>
+<h2>copyAdditionalFiles</h2>
+<p>
+    Thread to copy the distribution dependend files.
+</p><h3>Signals</h3>
+<dl>
+<dt>insertPlainText(text)</dt>
+<dd>
+emitted to inform user about the copy progress
+</dd>
+</dl>
+<h3>Derived from</h3>
+QThread
+<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="#copyAdditionalFiles.__init__">copyAdditionalFiles</a></td>
+<td>Constructor, which stores the needed variables.</td>
+</tr><tr>
+<td><a href="#copyAdditionalFiles.__copytree">__copytree</a></td>
+<td>Copies a file or folder.</td>
+</tr><tr>
+<td><a href="#copyAdditionalFiles.run">run</a></td>
+<td>QThread entry point to copy the selected additional files and folders.</td>
+</tr><tr>
+<td><a href="#copyAdditionalFiles.src2dst">src2dst</a></td>
+<td>Combines the relativ path of the source (srcname) with the destination folder.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="copyAdditionalFiles.__init__" ID="copyAdditionalFiles.__init__"></a>
+<h4>copyAdditionalFiles (Constructor)</h4>
+<b>copyAdditionalFiles</b>(<i>main</i>)
+<p>
+        Constructor, which stores the needed variables.
+</p><dl>
+<dt><i>main</i></dt>
+<dd>
+self-object of the caller
+</dd>
+</dl><a NAME="copyAdditionalFiles.__copytree" ID="copyAdditionalFiles.__copytree"></a>
+<h4>copyAdditionalFiles.__copytree</h4>
+<b>__copytree</b>(<i>src, dst</i>)
+<p>
+        Copies a file or folder. Wildcards allowed. Existing files are overwitten.
+</p><dl>
+<dt><i>src</i></dt>
+<dd>
+source file or folder to copy. Wildcards allowed. (str)
+</dd><dt><i>dst</i></dt>
+<dd>
+destination (str)
+</dd>
+</dl><a NAME="copyAdditionalFiles.run" ID="copyAdditionalFiles.run"></a>
+<h4>copyAdditionalFiles.run</h4>
+<b>run</b>(<i></i>)
+<p>
+        QThread entry point to copy the selected additional files and folders.
+</p><a NAME="copyAdditionalFiles.src2dst" ID="copyAdditionalFiles.src2dst"></a>
+<h4>copyAdditionalFiles.src2dst</h4>
+<b>src2dst</b>(<i>base, dst</i>)
+<p>
+            Combines the relativ path of the source (srcname) with the
+            destination folder.
+</p><dl>
+<dt><i>srcname</i></dt>
+<dd>
+actual file or folder to copy
+</dd><dt><i>base</i></dt>
+<dd>
+basename of the source folder
+</dd><dt><i>dst</i></dt>
+<dd>
+basename of the destination folder
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+destination path
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file
--- a/CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.PluginCxFreeze.html	Sun Aug 11 22:17:02 2013 +0200
+++ b/CxFreeze/Documentation/source/Plugin_Packager_CxFreeze.PluginCxFreeze.html	Sun Aug 18 13:04:29 2013 +0200
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<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>exePy2</td></tr><tr><td>exePy3</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr>
+<tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>exePy2</td></tr><tr><td>exePy3</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>
--- a/PluginCxFreeze.py	Sun Aug 11 22:17:02 2013 +0200
+++ b/PluginCxFreeze.py	Sun Aug 18 13:04:29 2013 +0200
@@ -56,8 +56,7 @@
     dataList = []
     data = {
         "programEntry": True,
-        "header": QCoreApplication.translate("CxFreezePlugin",
-                                "Packagers - cx_freeze"),
+        "header": QCoreApplication.translate("CxFreezePlugin", "Packagers - cx_freeze"),
         "exe": 'dummyfreeze',
         "versionCommand": '--version',
         "versionStartsWith": 'dummyfreeze',
Binary file PluginCxFreeze.zip has changed

eric ide

mercurial