Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Sat Jun 30 13:59:56 2018 +0200
+++ b/APIs/Python3/eric6.api	Sat Jun 30 14:01:25 2018 +0200
@@ -7185,12 +7185,16 @@
 eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.DebuggerGeneralPage.save?4()
 eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.DebuggerGeneralPage?1()
 eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page.on_refreshButton_clicked?4()
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page.on_venvDlgButton_clicked?4()
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page.save?4()
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page?1()
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.create?4(dlg)
+eric6.Preferences.ConfigurationPages.DebuggerPython3Page.DebuggerPython3Page.on_refreshButton_clicked?4()
+eric6.Preferences.ConfigurationPages.DebuggerPython3Page.DebuggerPython3Page.on_venvDlgButton_clicked?4()
 eric6.Preferences.ConfigurationPages.DebuggerPython3Page.DebuggerPython3Page.save?4()
 eric6.Preferences.ConfigurationPages.DebuggerPython3Page.DebuggerPython3Page?1()
 eric6.Preferences.ConfigurationPages.DebuggerPython3Page.create?4(dlg)
-eric6.Preferences.ConfigurationPages.DebuggerPythonPage.DebuggerPythonPage.save?4()
-eric6.Preferences.ConfigurationPages.DebuggerPythonPage.DebuggerPythonPage?1()
-eric6.Preferences.ConfigurationPages.DebuggerPythonPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.DiffColoursPage.DiffColoursPage.save?4()
 eric6.Preferences.ConfigurationPages.DiffColoursPage.DiffColoursPage?1()
 eric6.Preferences.ConfigurationPages.DiffColoursPage.create?4(dlg)
@@ -7221,7 +7225,7 @@
 eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.EditorCalltipsQScintillaPage?1()
 eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage.save?4()
-eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage?1()
 eric6.Preferences.ConfigurationPages.EditorDocViewerPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.on_exportersCombo_activated?4(exporter)
 eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.on_rtfFontButton_clicked?4()
@@ -7304,7 +7308,7 @@
 eric6.Preferences.ConfigurationPages.EditorStylesPage.EditorStylesPage?1()
 eric6.Preferences.ConfigurationPages.EditorStylesPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.EditorSyntaxPage.EditorSyntaxPage.save?4()
-eric6.Preferences.ConfigurationPages.EditorSyntaxPage.EditorSyntaxPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.EditorSyntaxPage.EditorSyntaxPage?1()
 eric6.Preferences.ConfigurationPages.EditorSyntaxPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage.on_languageCombo_activated?4(language)
 eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage.save?4()
@@ -7347,7 +7351,7 @@
 eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage.on_testButton_clicked?4()
 eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage.on_vtServiceKeyEdit_textChanged?4(txt)
 eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage.save?4()
-eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage?1()
 eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.HelpWebBrowserPage.HelpWebBrowserPage.on_defaultHomeButton_clicked?4()
 eric6.Preferences.ConfigurationPages.HelpWebBrowserPage.HelpWebBrowserPage.on_noCacheHostsButton_clicked?4()
@@ -7393,7 +7397,7 @@
 eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog?1(oldPasswordHash, parent=None)
 eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage.on_resetButton_clicked?4()
 eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage.save?4()
-eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage?1()
 eric6.Preferences.ConfigurationPages.MimeTypesPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage.save?4()
 eric6.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage?1()
@@ -7429,6 +7433,7 @@
 eric6.Preferences.ConfigurationPages.ProtobufPage.ProtobufPage.save?4()
 eric6.Preferences.ConfigurationPages.ProtobufPage.ProtobufPage?1()
 eric6.Preferences.ConfigurationPages.ProtobufPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.PythonPage.PythonPage.on_refreshButton_clicked?4()
 eric6.Preferences.ConfigurationPages.PythonPage.PythonPage.save?4()
 eric6.Preferences.ConfigurationPages.PythonPage.PythonPage?1()
 eric6.Preferences.ConfigurationPages.PythonPage.create?4(dlg)
@@ -7457,7 +7462,7 @@
 eric6.Preferences.ConfigurationPages.TemplatesPage.TemplatesPage?1()
 eric6.Preferences.ConfigurationPages.TemplatesPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage.save?4()
-eric6.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage?1()
 eric6.Preferences.ConfigurationPages.TrayStarterPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.VcsPage.VcsPage.save?4()
 eric6.Preferences.ConfigurationPages.VcsPage.VcsPage?1()
@@ -7485,7 +7490,7 @@
 eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage.on_testButton_clicked?4()
 eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage.on_vtServiceKeyEdit_textChanged?4(txt)
 eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage.save?4()
-eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage?1()
 eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.create?4(dlg)
 eric6.Preferences.MouseClickDialog.MouseClickDialog.eventFilter?4(watched, event)
 eric6.Preferences.MouseClickDialog.MouseClickDialog.getClick?4()
@@ -10605,7 +10610,7 @@
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.removeVirtualEnvs?4(venvNames)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.renameVirtualEnv?4(oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.setVirtualEnv?4(venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal)
-eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.showVirtualenvManagerDialog?4()
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.showVirtualenvManagerDialog?4(modal=False)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.shutdown?4()
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager?1(parent=None)
 eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.IsGlobalRole?7

--- a/APIs/Python3/eric6.bas	Sat Jun 30 13:59:56 2018 +0200
+++ b/APIs/Python3/eric6.bas	Sat Jun 30 14:01:25 2018 +0200
@@ -127,8 +127,8 @@
 DebuggerPropertiesDialog QDialog Ui_DebuggerPropertiesDialog
 DebuggerPropertiesReader XMLStreamReaderBase
 DebuggerPropertiesWriter XMLStreamWriterBase
+DebuggerPython2Page ConfigurationPageBase Ui_DebuggerPython2Page
 DebuggerPython3Page ConfigurationPageBase Ui_DebuggerPython3Page
-DebuggerPythonPage ConfigurationPageBase Ui_DebuggerPythonPage
 DeepLEngine TranslationEngine
 DefaultResolver BaseResolver
 DelayedFileWatcher QFileSystemWatcher

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Help/source.qhp	Sat Jun 30 14:01:25 2018 +0200
@@ -890,8 +890,8 @@
               <section title="eric6.Preferences.ConfigurationPages.CooperationPage" ref="eric6.Preferences.ConfigurationPages.CooperationPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.CorbaPage" ref="eric6.Preferences.ConfigurationPages.CorbaPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html" />
+              <section title="eric6.Preferences.ConfigurationPages.DebuggerPython2Page" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html" />
               <section title="eric6.Preferences.ConfigurationPages.DebuggerPython3Page" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html" />
-              <section title="eric6.Preferences.ConfigurationPages.DebuggerPythonPage" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.DiffColoursPage" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorAPIsPage" ref="eric6.Preferences.ConfigurationPages.EditorAPIsPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html" />
@@ -3950,14 +3950,20 @@
       <keyword name="DebuggerPropertiesWriter (Constructor)" id="DebuggerPropertiesWriter (Constructor)" ref="eric6.E5XML.DebuggerPropertiesWriter.html#DebuggerPropertiesWriter.__init__" />
       <keyword name="DebuggerPropertiesWriter (Module)" id="DebuggerPropertiesWriter (Module)" ref="eric6.E5XML.DebuggerPropertiesWriter.html" />
       <keyword name="DebuggerPropertiesWriter.writeXML" id="DebuggerPropertiesWriter.writeXML" ref="eric6.E5XML.DebuggerPropertiesWriter.html#DebuggerPropertiesWriter.writeXML" />
+      <keyword name="DebuggerPython2Page" id="DebuggerPython2Page" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html#DebuggerPython2Page" />
+      <keyword name="DebuggerPython2Page (Constructor)" id="DebuggerPython2Page (Constructor)" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html#DebuggerPython2Page.__init__" />
+      <keyword name="DebuggerPython2Page (Module)" id="DebuggerPython2Page (Module)" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html" />
+      <keyword name="DebuggerPython2Page.__populateAndSetVenvComboBox" id="DebuggerPython2Page.__populateAndSetVenvComboBox" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html#DebuggerPython2Page.__populateAndSetVenvComboBox" />
+      <keyword name="DebuggerPython2Page.on_refreshButton_clicked" id="DebuggerPython2Page.on_refreshButton_clicked" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html#DebuggerPython2Page.on_refreshButton_clicked" />
+      <keyword name="DebuggerPython2Page.on_venvDlgButton_clicked" id="DebuggerPython2Page.on_venvDlgButton_clicked" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html#DebuggerPython2Page.on_venvDlgButton_clicked" />
+      <keyword name="DebuggerPython2Page.save" id="DebuggerPython2Page.save" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html#DebuggerPython2Page.save" />
       <keyword name="DebuggerPython3Page" id="DebuggerPython3Page" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#DebuggerPython3Page" />
       <keyword name="DebuggerPython3Page (Constructor)" id="DebuggerPython3Page (Constructor)" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#DebuggerPython3Page.__init__" />
       <keyword name="DebuggerPython3Page (Module)" id="DebuggerPython3Page (Module)" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html" />
+      <keyword name="DebuggerPython3Page.__populateAndSetVenvComboBox" id="DebuggerPython3Page.__populateAndSetVenvComboBox" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#DebuggerPython3Page.__populateAndSetVenvComboBox" />
+      <keyword name="DebuggerPython3Page.on_refreshButton_clicked" id="DebuggerPython3Page.on_refreshButton_clicked" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#DebuggerPython3Page.on_refreshButton_clicked" />
+      <keyword name="DebuggerPython3Page.on_venvDlgButton_clicked" id="DebuggerPython3Page.on_venvDlgButton_clicked" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#DebuggerPython3Page.on_venvDlgButton_clicked" />
       <keyword name="DebuggerPython3Page.save" id="DebuggerPython3Page.save" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#DebuggerPython3Page.save" />
-      <keyword name="DebuggerPythonPage" id="DebuggerPythonPage" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html#DebuggerPythonPage" />
-      <keyword name="DebuggerPythonPage (Constructor)" id="DebuggerPythonPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html#DebuggerPythonPage.__init__" />
-      <keyword name="DebuggerPythonPage (Module)" id="DebuggerPythonPage (Module)" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html" />
-      <keyword name="DebuggerPythonPage.save" id="DebuggerPythonPage.save" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html#DebuggerPythonPage.save" />
       <keyword name="DeepLEngine" id="DeepLEngine" ref="eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.html#DeepLEngine" />
       <keyword name="DeepLEngine (Constructor)" id="DeepLEngine (Constructor)" ref="eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.html#DeepLEngine.__init__" />
       <keyword name="DeepLEngine (Module)" id="DeepLEngine (Module)" ref="eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.html" />
@@ -13212,6 +13218,7 @@
       <keyword name="PythonPage" id="PythonPage" ref="eric6.Preferences.ConfigurationPages.PythonPage.html#PythonPage" />
       <keyword name="PythonPage (Constructor)" id="PythonPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.PythonPage.html#PythonPage.__init__" />
       <keyword name="PythonPage (Module)" id="PythonPage (Module)" ref="eric6.Preferences.ConfigurationPages.PythonPage.html" />
+      <keyword name="PythonPage.on_refreshButton_clicked" id="PythonPage.on_refreshButton_clicked" ref="eric6.Preferences.ConfigurationPages.PythonPage.html#PythonPage.on_refreshButton_clicked" />
       <keyword name="PythonPage.save" id="PythonPage.save" ref="eric6.Preferences.ConfigurationPages.PythonPage.html#PythonPage.save" />
       <keyword name="QRegExpWizard" id="QRegExpWizard" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard" />
       <keyword name="QRegExpWizard (Constructor)" id="QRegExpWizard (Constructor)" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard.__init__" />
@@ -18501,8 +18508,8 @@
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.CooperationPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.CorbaPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#create" />
+      <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#create" />
-      <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAPIsPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html#create" />
@@ -19963,8 +19970,8 @@
       <file>eric6.Preferences.ConfigurationPages.CooperationPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.CorbaPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html</file>
+      <file>eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html</file>
       <file>eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html</file>
-      <file>eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.DiffColoursPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorAPIsPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html</file>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html	Sat Jun 30 14:01:25 2018 +0200
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Preferences.ConfigurationPages.DebuggerPython2Page</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.Preferences.ConfigurationPages.DebuggerPython2Page</h1>
+<p>
+Module implementing the Debugger Python2 configuration page.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#DebuggerPython2Page">DebuggerPython2Page</a></td>
+<td>Class implementing the Debugger Python2 configuration page.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#create">create</a></td>
+<td>Module function to create the configuration page.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="DebuggerPython2Page" ID="DebuggerPython2Page"></a>
+<h2>DebuggerPython2Page</h2>
+<p>
+    Class implementing the Debugger Python2 configuration page.
+</p>
+<h3>Derived from</h3>
+ConfigurationPageBase, Ui_DebuggerPython2Page
+<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="#DebuggerPython2Page.__init__">DebuggerPython2Page</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#DebuggerPython2Page.__populateAndSetVenvComboBox">__populateAndSetVenvComboBox</a></td>
+<td>Private method to populate and set the virtual environment combo box.</td>
+</tr><tr>
+<td><a href="#DebuggerPython2Page.on_refreshButton_clicked">on_refreshButton_clicked</a></td>
+<td>Private slot handling a click of the refresh button.</td>
+</tr><tr>
+<td><a href="#DebuggerPython2Page.on_venvDlgButton_clicked">on_venvDlgButton_clicked</a></td>
+<td>Slot documentation goes here.</td>
+</tr><tr>
+<td><a href="#DebuggerPython2Page.save">save</a></td>
+<td>Public slot to save the Debugger Python configuration.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="DebuggerPython2Page.__init__" ID="DebuggerPython2Page.__init__"></a>
+<h4>DebuggerPython2Page (Constructor)</h4>
+<b>DebuggerPython2Page</b>(<i></i>)
+<p>
+        Constructor
+</p><a NAME="DebuggerPython2Page.__populateAndSetVenvComboBox" ID="DebuggerPython2Page.__populateAndSetVenvComboBox"></a>
+<h4>DebuggerPython2Page.__populateAndSetVenvComboBox</h4>
+<b>__populateAndSetVenvComboBox</b>(<i></i>)
+<p>
+        Private method to populate and set the virtual environment combo box.
+</p><a NAME="DebuggerPython2Page.on_refreshButton_clicked" ID="DebuggerPython2Page.on_refreshButton_clicked"></a>
+<h4>DebuggerPython2Page.on_refreshButton_clicked</h4>
+<b>on_refreshButton_clicked</b>(<i></i>)
+<p>
+        Private slot handling a click of the refresh button.
+</p><a NAME="DebuggerPython2Page.on_venvDlgButton_clicked" ID="DebuggerPython2Page.on_venvDlgButton_clicked"></a>
+<h4>DebuggerPython2Page.on_venvDlgButton_clicked</h4>
+<b>on_venvDlgButton_clicked</b>(<i></i>)
+<p>
+        Slot documentation goes here.
+</p><a NAME="DebuggerPython2Page.save" ID="DebuggerPython2Page.save"></a>
+<h4>DebuggerPython2Page.save</h4>
+<b>save</b>(<i></i>)
+<p>
+        Public slot to save the Debugger Python configuration.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="create" ID="create"></a>
+<h2>create</h2>
+<b>create</b>(<i>dlg</i>)
+<p>
+    Module function to create the configuration page.
+</p><dl>
+<dt><i>dlg</i></dt>
+<dd>
+reference to the configuration dialog
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+reference to the instantiated page (ConfigurationPageBase)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html	Sat Jun 30 14:01:25 2018 +0200
@@ -63,6 +63,15 @@
 <td><a href="#DebuggerPython3Page.__init__">DebuggerPython3Page</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#DebuggerPython3Page.__populateAndSetVenvComboBox">__populateAndSetVenvComboBox</a></td>
+<td>Private method to populate and set the virtual environment combo box.</td>
+</tr><tr>
+<td><a href="#DebuggerPython3Page.on_refreshButton_clicked">on_refreshButton_clicked</a></td>
+<td>Private slot handling a click of the refresh button.</td>
+</tr><tr>
+<td><a href="#DebuggerPython3Page.on_venvDlgButton_clicked">on_venvDlgButton_clicked</a></td>
+<td>Slot documentation goes here.</td>
+</tr><tr>
 <td><a href="#DebuggerPython3Page.save">save</a></td>
 <td>Public slot to save the Debugger Python configuration.</td>
 </tr>
@@ -76,6 +85,21 @@
 <b>DebuggerPython3Page</b>(<i></i>)
 <p>
         Constructor
+</p><a NAME="DebuggerPython3Page.__populateAndSetVenvComboBox" ID="DebuggerPython3Page.__populateAndSetVenvComboBox"></a>
+<h4>DebuggerPython3Page.__populateAndSetVenvComboBox</h4>
+<b>__populateAndSetVenvComboBox</b>(<i></i>)
+<p>
+        Private method to populate and set the virtual environment combo box.
+</p><a NAME="DebuggerPython3Page.on_refreshButton_clicked" ID="DebuggerPython3Page.on_refreshButton_clicked"></a>
+<h4>DebuggerPython3Page.on_refreshButton_clicked</h4>
+<b>on_refreshButton_clicked</b>(<i></i>)
+<p>
+        Private slot handling a click of the refresh button.
+</p><a NAME="DebuggerPython3Page.on_venvDlgButton_clicked" ID="DebuggerPython3Page.on_venvDlgButton_clicked"></a>
+<h4>DebuggerPython3Page.on_venvDlgButton_clicked</h4>
+<b>on_venvDlgButton_clicked</b>(<i></i>)
+<p>
+        Slot documentation goes here.
 </p><a NAME="DebuggerPython3Page.save" ID="DebuggerPython3Page.save"></a>
 <h4>DebuggerPython3Page.save</h4>
 <b>save</b>(<i></i>)

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html	Sat Jun 30 13:59:56 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<title>eric6.Preferences.ConfigurationPages.DebuggerPythonPage</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.Preferences.ConfigurationPages.DebuggerPythonPage</h1>
-<p>
-Module implementing the Debugger Python configuration page.
-</p>
-<h3>Global Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Classes</h3>
-<table>
-<tr>
-<td><a href="#DebuggerPythonPage">DebuggerPythonPage</a></td>
-<td>Class implementing the Debugger Python configuration page.</td>
-</tr>
-</table>
-<h3>Functions</h3>
-<table>
-<tr>
-<td><a href="#create">create</a></td>
-<td>Module function to create the configuration page.</td>
-</tr>
-</table>
-<hr /><hr />
-<a NAME="DebuggerPythonPage" ID="DebuggerPythonPage"></a>
-<h2>DebuggerPythonPage</h2>
-<p>
-    Class implementing the Debugger Python configuration page.
-</p>
-<h3>Derived from</h3>
-ConfigurationPageBase, Ui_DebuggerPythonPage
-<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="#DebuggerPythonPage.__init__">DebuggerPythonPage</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#DebuggerPythonPage.save">save</a></td>
-<td>Public slot to save the Debugger Python configuration.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="DebuggerPythonPage.__init__" ID="DebuggerPythonPage.__init__"></a>
-<h4>DebuggerPythonPage (Constructor)</h4>
-<b>DebuggerPythonPage</b>(<i></i>)
-<p>
-        Constructor
-</p><a NAME="DebuggerPythonPage.save" ID="DebuggerPythonPage.save"></a>
-<h4>DebuggerPythonPage.save</h4>
-<b>save</b>(<i></i>)
-<p>
-        Public slot to save the Debugger Python configuration.
-</p>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="create" ID="create"></a>
-<h2>create</h2>
-<b>create</b>(<i>dlg</i>)
-<p>
-    Module function to create the configuration page.
-</p><dl>
-<dt><i>dlg</i></dt>
-<dd>
-reference to the configuration dialog
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-reference to the instantiated page (ConfigurationPageBase)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
-</body></html>
\ No newline at end of file

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html	Sat Jun 30 14:01:25 2018 +0200
@@ -73,15 +73,10 @@
 </table>
 <a NAME="EditorDocViewerPage.__init__" ID="EditorDocViewerPage.__init__"></a>
 <h4>EditorDocViewerPage (Constructor)</h4>
-<b>EditorDocViewerPage</b>(<i>parent=None</i>)
+<b>EditorDocViewerPage</b>(<i></i>)
 <p>
         Constructor
-</p><dl>
-<dt><i>parent</i> (QWidget)</dt>
-<dd>
-reference to the parent widget
-</dd>
-</dl><a NAME="EditorDocViewerPage.save" ID="EditorDocViewerPage.save"></a>
+</p><a NAME="EditorDocViewerPage.save" ID="EditorDocViewerPage.save"></a>
 <h4>EditorDocViewerPage.save</h4>
 <b>save</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorSyntaxPage.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorSyntaxPage.html	Sat Jun 30 14:01:25 2018 +0200
@@ -73,15 +73,10 @@
 </table>
 <a NAME="EditorSyntaxPage.__init__" ID="EditorSyntaxPage.__init__"></a>
 <h4>EditorSyntaxPage (Constructor)</h4>
-<b>EditorSyntaxPage</b>(<i>parent=None</i>)
+<b>EditorSyntaxPage</b>(<i></i>)
 <p>
         Constructor
-</p><dl>
-<dt><i>parent</i></dt>
-<dd>
-reference to the parent widget (QWidget)
-</dd>
-</dl><a NAME="EditorSyntaxPage.save" ID="EditorSyntaxPage.save"></a>
+</p><a NAME="EditorSyntaxPage.save" ID="EditorSyntaxPage.save"></a>
 <h4>EditorSyntaxPage.save</h4>
 <b>save</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.html	Sat Jun 30 14:01:25 2018 +0200
@@ -82,15 +82,10 @@
 </table>
 <a NAME="HelpVirusTotalPage.__init__" ID="HelpVirusTotalPage.__init__"></a>
 <h4>HelpVirusTotalPage (Constructor)</h4>
-<b>HelpVirusTotalPage</b>(<i>parent=None</i>)
+<b>HelpVirusTotalPage</b>(<i></i>)
 <p>
         Constructor
-</p><dl>
-<dt><i>parent</i></dt>
-<dd>
-reference to the parent widget (QWidget)
-</dd>
-</dl><a NAME="HelpVirusTotalPage.__checkServiceKeyFinished" ID="HelpVirusTotalPage.__checkServiceKeyFinished"></a>
+</p><a NAME="HelpVirusTotalPage.__checkServiceKeyFinished" ID="HelpVirusTotalPage.__checkServiceKeyFinished"></a>
 <h4>HelpVirusTotalPage.__checkServiceKeyFinished</h4>
 <b>__checkServiceKeyFinished</b>(<i>result, msg</i>)
 <p>

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.MimeTypesPage.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.MimeTypesPage.html	Sat Jun 30 14:01:25 2018 +0200
@@ -79,15 +79,10 @@
 </table>
 <a NAME="MimeTypesPage.__init__" ID="MimeTypesPage.__init__"></a>
 <h4>MimeTypesPage (Constructor)</h4>
-<b>MimeTypesPage</b>(<i>parent=None</i>)
+<b>MimeTypesPage</b>(<i></i>)
 <p>
         Constructor
-</p><dl>
-<dt><i>parent</i></dt>
-<dd>
-reference to the parent widget (QWidget)
-</dd>
-</dl><a NAME="MimeTypesPage.__setToDefault" ID="MimeTypesPage.__setToDefault"></a>
+</p><a NAME="MimeTypesPage.__setToDefault" ID="MimeTypesPage.__setToDefault"></a>
 <h4>MimeTypesPage.__setToDefault</h4>
 <b>__setToDefault</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.PythonPage.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.PythonPage.html	Sat Jun 30 14:01:25 2018 +0200
@@ -63,6 +63,9 @@
 <td><a href="#PythonPage.__init__">PythonPage</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#PythonPage.on_refreshButton_clicked">on_refreshButton_clicked</a></td>
+<td>Private slot handling a click of the refresh button.</td>
+</tr><tr>
 <td><a href="#PythonPage.save">save</a></td>
 <td>Public slot to save the Python configuration.</td>
 </tr>
@@ -76,6 +79,11 @@
 <b>PythonPage</b>(<i></i>)
 <p>
         Constructor
+</p><a NAME="PythonPage.on_refreshButton_clicked" ID="PythonPage.on_refreshButton_clicked"></a>
+<h4>PythonPage.on_refreshButton_clicked</h4>
+<b>on_refreshButton_clicked</b>(<i></i>)
+<p>
+        Private slot handling a click of the refresh button.
 </p><a NAME="PythonPage.save" ID="PythonPage.save"></a>
 <h4>PythonPage.save</h4>
 <b>save</b>(<i></i>)

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.TrayStarterPage.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.TrayStarterPage.html	Sat Jun 30 14:01:25 2018 +0200
@@ -73,15 +73,10 @@
 </table>
 <a NAME="TrayStarterPage.__init__" ID="TrayStarterPage.__init__"></a>
 <h4>TrayStarterPage (Constructor)</h4>
-<b>TrayStarterPage</b>(<i>parent=None</i>)
+<b>TrayStarterPage</b>(<i></i>)
 <p>
         Constructor
-</p><dl>
-<dt><i>parent</i></dt>
-<dd>
-reference to the parent widget (QWidget)
-</dd>
-</dl><a NAME="TrayStarterPage.save" ID="TrayStarterPage.save"></a>
+</p><a NAME="TrayStarterPage.save" ID="TrayStarterPage.save"></a>
 <h4>TrayStarterPage.save</h4>
 <b>save</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.html	Sat Jun 30 14:01:25 2018 +0200
@@ -82,15 +82,10 @@
 </table>
 <a NAME="WebBrowserVirusTotalPage.__init__" ID="WebBrowserVirusTotalPage.__init__"></a>
 <h4>WebBrowserVirusTotalPage (Constructor)</h4>
-<b>WebBrowserVirusTotalPage</b>(<i>parent=None</i>)
+<b>WebBrowserVirusTotalPage</b>(<i></i>)
 <p>
         Constructor
-</p><dl>
-<dt><i>parent</i></dt>
-<dd>
-reference to the parent widget (QWidget)
-</dd>
-</dl><a NAME="WebBrowserVirusTotalPage.__checkServiceKeyFinished" ID="WebBrowserVirusTotalPage.__checkServiceKeyFinished"></a>
+</p><a NAME="WebBrowserVirusTotalPage.__checkServiceKeyFinished" ID="WebBrowserVirusTotalPage.__checkServiceKeyFinished"></a>
 <h4>WebBrowserVirusTotalPage.__checkServiceKeyFinished</h4>
 <b>__checkServiceKeyFinished</b>(<i>result, msg</i>)
 <p>

--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html	Sat Jun 30 14:01:25 2018 +0200
@@ -390,10 +390,16 @@
 </dd>
 </dl><a NAME="VirtualenvManager.showVirtualenvManagerDialog" ID="VirtualenvManager.showVirtualenvManagerDialog"></a>
 <h4>VirtualenvManager.showVirtualenvManagerDialog</h4>
-<b>showVirtualenvManagerDialog</b>(<i></i>)
+<b>showVirtualenvManagerDialog</b>(<i>modal=False</i>)
 <p>
         Public slot to show the virtual environment manager dialog.
-</p><a NAME="VirtualenvManager.shutdown" ID="VirtualenvManager.shutdown"></a>
+</p><dl>
+<dt><i>modal</i></dt>
+<dd>
+flag indicating that the dialog should be shown in
+            a blocking mode
+</dd>
+</dl><a NAME="VirtualenvManager.shutdown" ID="VirtualenvManager.shutdown"></a>
 <h4>VirtualenvManager.shutdown</h4>
 <b>shutdown</b>(<i></i>)
 <p>

--- a/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html	Sat Jun 30 13:59:56 2018 +0200
+++ b/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html	Sat Jun 30 14:01:25 2018 +0200
@@ -43,12 +43,12 @@
 <td><a href="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html">DebuggerGeneralPage</a></td>
 <td>Module implementing the Debugger General configuration page.</td>
 </tr><tr>
+<td><a href="eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html">DebuggerPython2Page</a></td>
+<td>Module implementing the Debugger Python2 configuration page.</td>
+</tr><tr>
 <td><a href="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html">DebuggerPython3Page</a></td>
 <td>Module implementing the Debugger Python3 configuration page.</td>
 </tr><tr>
-<td><a href="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html">DebuggerPythonPage</a></td>
-<td>Module implementing the Debugger Python configuration page.</td>
-</tr><tr>
 <td><a href="eric6.Preferences.ConfigurationPages.DiffColoursPage.html">DiffColoursPage</a></td>
 <td>Module implementing the Diff colours configuration page.</td>
 </tr><tr>