diff -r a2a9ef2da98a -r 4782d2b8e1bd Documentation/Source/eric6.VirtualEnv.VirtualenvConfigurationDialog.html
--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvConfigurationDialog.html Sat Feb 16 15:41:03 2019 +0100
+++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvConfigurationDialog.html Sat Feb 16 15:41:33 2019 +0100
@@ -68,6 +68,9 @@
<td><a href="#VirtualenvConfigurationDialog.__generateTargetDir">__generateTargetDir</a></td>
<td>Private method to generate a valid target directory path.</td>
</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.__setCondaVersion">__setCondaVersion</a></td>
+<td>Private method to determine the conda version and set the respective label.</td>
+</tr><tr>
<td><a href="#VirtualenvConfigurationDialog.__setPyvenvVersion">__setPyvenvVersion</a></td>
<td>Private method to determine the pyvenv version and set the respective label.</td>
</tr><tr>
@@ -83,6 +86,33 @@
<td><a href="#VirtualenvConfigurationDialog.getData">getData</a></td>
<td>Public method to retrieve the dialog data.</td>
</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaButton_toggled">on_condaButton_toggled</a></td>
+<td>Private slot to react to the selection of 'conda'.</td>
+</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaCloneButton_clicked">on_condaCloneButton_clicked</a></td>
+<td>Private slot handling the selection of the clone button.</td>
+</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaCloneDirectoryPicker_textChanged">on_condaCloneDirectoryPicker_textChanged</a></td>
+<td>Private slot handling a change of the cloned from directory.</td>
+</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaCloneNameEdit_textChanged">on_condaCloneNameEdit_textChanged</a></td>
+<td>Private slot handling a change of the conda source environment name.</td>
+</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaNameEdit_textChanged">on_condaNameEdit_textChanged</a></td>
+<td>Private slot handling a change of the conda environment name.</td>
+</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaRequirementsButton_clicked">on_condaRequirementsButton_clicked</a></td>
+<td>Private slot handling the selection of the requirements button.</td>
+</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaRequirementsFilePicker_textChanged">on_condaRequirementsFilePicker_textChanged</a></td>
+<td>Private slot handling a change of the requirements file entry.</td>
+</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaSpecialsGroup_clicked">on_condaSpecialsGroup_clicked</a></td>
+<td>Private slot handling the selection of the specials group.</td>
+</tr><tr>
+<td><a href="#VirtualenvConfigurationDialog.on_condaTargetDirectoryPicker_textChanged">on_condaTargetDirectoryPicker_textChanged</a></td>
+<td>Private slot handling a change of the conda target directory.</td>
+</tr><tr>
<td><a href="#VirtualenvConfigurationDialog.on_pythonExecPicker_textChanged">on_pythonExecPicker_textChanged</a></td>
<td>Private slot to react to a change of the Python executable.</td>
</tr><tr>
@@ -140,7 +170,13 @@
<dd>
str
</dd>
-</dl><a NAME="VirtualenvConfigurationDialog.__setPyvenvVersion" ID="VirtualenvConfigurationDialog.__setPyvenvVersion"></a>
+</dl><a NAME="VirtualenvConfigurationDialog.__setCondaVersion" ID="VirtualenvConfigurationDialog.__setCondaVersion"></a>
+<h4>VirtualenvConfigurationDialog.__setCondaVersion</h4>
+<b>__setCondaVersion</b>(<i></i>)
+<p>
+ Private method to determine the conda version and set the respective
+ label.
+</p><a NAME="VirtualenvConfigurationDialog.__setPyvenvVersion" ID="VirtualenvConfigurationDialog.__setPyvenvVersion"></a>
<h4>VirtualenvConfigurationDialog.__setPyvenvVersion</h4>
<b>__setPyvenvVersion</b>(<i></i>)
<p>
@@ -171,17 +207,98 @@
</p><dl>
<dt>Returns:</dt>
<dd>
-tuple containing a flag indicating the pyvenv selection, the
- process arguments, a name for the virtual environment, a flag
- indicating to open the target directory after creation, a flag
- indicating to write a log file, a flag indicating to write a
- script, the name of the target directory and the name of the
- Python interpreter to use
+dictionary containing the data for the two environment
+ variants. The keys for both variants are 'arguments' containing the
+ command line arguments, 'logicalName' containing the environment
+ name to be used with the virtual env manager and 'envType'
+ containing the environment type (virtualenv, pyvenv or conda). The
+ virtualenv/pyvenv specific keys are 'openTarget' containg a flag to
+ open the target directory after creation, 'createLog' containing a
+ flag to write a log file, 'createScript' containing a flag to write
+ a script, 'targetDirectory' containing the target directory and
+ 'pythonExe' containing the Python interpreter to be used. The
+ conda specific key is 'command' giving the conda command to be
+ executed (always 'create').
</dd>
</dl><dl>
<dt>Return Type:</dt>
<dd>
-tuple of (bool, list of str, str, bool, bool, bool, str, str)
+dict
+</dd>
+</dl><a NAME="VirtualenvConfigurationDialog.on_condaButton_toggled" ID="VirtualenvConfigurationDialog.on_condaButton_toggled"></a>
+<h4>VirtualenvConfigurationDialog.on_condaButton_toggled</h4>
+<b>on_condaButton_toggled</b>(<i>checked</i>)
+<p>
+ Private slot to react to the selection of 'conda'.
+</p><dl>
+<dt><i>checked</i> (bool)</dt>
+<dd>
+state of the checkbox
+</dd>
+</dl><a NAME="VirtualenvConfigurationDialog.on_condaCloneButton_clicked" ID="VirtualenvConfigurationDialog.on_condaCloneButton_clicked"></a>
+<h4>VirtualenvConfigurationDialog.on_condaCloneButton_clicked</h4>
+<b>on_condaCloneButton_clicked</b>(<i></i>)
+<p>
+ Private slot handling the selection of the clone button.
+</p><a NAME="VirtualenvConfigurationDialog.on_condaCloneDirectoryPicker_textChanged" ID="VirtualenvConfigurationDialog.on_condaCloneDirectoryPicker_textChanged"></a>
+<h4>VirtualenvConfigurationDialog.on_condaCloneDirectoryPicker_textChanged</h4>
+<b>on_condaCloneDirectoryPicker_textChanged</b>(<i>txt</i>)
+<p>
+ Private slot handling a change of the cloned from directory.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+target directory
+</dd>
+</dl><a NAME="VirtualenvConfigurationDialog.on_condaCloneNameEdit_textChanged" ID="VirtualenvConfigurationDialog.on_condaCloneNameEdit_textChanged"></a>
+<h4>VirtualenvConfigurationDialog.on_condaCloneNameEdit_textChanged</h4>
+<b>on_condaCloneNameEdit_textChanged</b>(<i>txt</i>)
+<p>
+ Private slot handling a change of the conda source environment name.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+name of the environment to be cloned
+</dd>
+</dl><a NAME="VirtualenvConfigurationDialog.on_condaNameEdit_textChanged" ID="VirtualenvConfigurationDialog.on_condaNameEdit_textChanged"></a>
+<h4>VirtualenvConfigurationDialog.on_condaNameEdit_textChanged</h4>
+<b>on_condaNameEdit_textChanged</b>(<i>txt</i>)
+<p>
+ Private slot handling a change of the conda environment name.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+environment name
+</dd>
+</dl><a NAME="VirtualenvConfigurationDialog.on_condaRequirementsButton_clicked" ID="VirtualenvConfigurationDialog.on_condaRequirementsButton_clicked"></a>
+<h4>VirtualenvConfigurationDialog.on_condaRequirementsButton_clicked</h4>
+<b>on_condaRequirementsButton_clicked</b>(<i></i>)
+<p>
+ Private slot handling the selection of the requirements button.
+</p><a NAME="VirtualenvConfigurationDialog.on_condaRequirementsFilePicker_textChanged" ID="VirtualenvConfigurationDialog.on_condaRequirementsFilePicker_textChanged"></a>
+<h4>VirtualenvConfigurationDialog.on_condaRequirementsFilePicker_textChanged</h4>
+<b>on_condaRequirementsFilePicker_textChanged</b>(<i>txt</i>)
+<p>
+ Private slot handling a change of the requirements file entry.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+current text of the requirements file entry
+</dd>
+</dl><a NAME="VirtualenvConfigurationDialog.on_condaSpecialsGroup_clicked" ID="VirtualenvConfigurationDialog.on_condaSpecialsGroup_clicked"></a>
+<h4>VirtualenvConfigurationDialog.on_condaSpecialsGroup_clicked</h4>
+<b>on_condaSpecialsGroup_clicked</b>(<i></i>)
+<p>
+ Private slot handling the selection of the specials group.
+</p><a NAME="VirtualenvConfigurationDialog.on_condaTargetDirectoryPicker_textChanged" ID="VirtualenvConfigurationDialog.on_condaTargetDirectoryPicker_textChanged"></a>
+<h4>VirtualenvConfigurationDialog.on_condaTargetDirectoryPicker_textChanged</h4>
+<b>on_condaTargetDirectoryPicker_textChanged</b>(<i>txt</i>)
+<p>
+ Private slot handling a change of the conda target directory.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+target directory
</dd>
</dl><a NAME="VirtualenvConfigurationDialog.on_pythonExecPicker_textChanged" ID="VirtualenvConfigurationDialog.on_pythonExecPicker_textChanged"></a>
<h4>VirtualenvConfigurationDialog.on_pythonExecPicker_textChanged</h4>
