Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Sat Nov 03 14:16:43 2018 +0100
+++ b/APIs/Python3/eric6.api	Sat Nov 03 14:19:21 2018 +0100
@@ -464,10 +464,10 @@
 eric6.Debugger.DebugServer.DebugServer.setCallTraceEnabled?4(on)
 eric6.Debugger.DebugServer.DebugServer.setDebugging?4(on)
 eric6.Debugger.DebugServer.DebugServer.shutdownServer?4()
-eric6.Debugger.DebugServer.DebugServer.signalClientBanner?4(version, platform, debugClient)
+eric6.Debugger.DebugServer.DebugServer.signalClientBanner?4(version, platform, debugClient, venvName)
 eric6.Debugger.DebugServer.DebugServer.signalClientBreakConditionError?4(filename, lineno)
 eric6.Debugger.DebugServer.DebugServer.signalClientCallTrace?4(isCall, fromFile, fromLine, fromFunction, toFile, toLine, toFunction)
-eric6.Debugger.DebugServer.DebugServer.signalClientCapabilities?4(capabilities, clientType)
+eric6.Debugger.DebugServer.DebugServer.signalClientCapabilities?4(capabilities, clientType, venvName)
 eric6.Debugger.DebugServer.DebugServer.signalClientClearBreak?4(filename, lineno)
 eric6.Debugger.DebugServer.DebugServer.signalClientClearWatch?4(condition)
 eric6.Debugger.DebugServer.DebugServer.signalClientCompletionList?4(completionList, text)
@@ -9217,10 +9217,10 @@
 eric6.QScintilla.Shell.Shell.setDebuggerUI?4(ui)
 eric6.QScintilla.Shell.Shell.showHistory?4()
 eric6.QScintilla.Shell.Shell.wheelEvent?4(evt)
-eric6.QScintilla.Shell.Shell?1(dbs, vm, windowedVariant, parent=None)
+eric6.QScintilla.Shell.Shell?1(dbs, vm, project, windowedVariant, parent=None)
 eric6.QScintilla.Shell.ShellAssembly.shell?4()
 eric6.QScintilla.Shell.ShellAssembly.showFind?4(txt="")
-eric6.QScintilla.Shell.ShellAssembly?1(dbs, vm, horizontal=True, parent=None)
+eric6.QScintilla.Shell.ShellAssembly?1(dbs, vm, project, horizontal=True, parent=None)
 eric6.QScintilla.Shell.ShellHistoryStyle.Disabled?7
 eric6.QScintilla.Shell.ShellHistoryStyle.LinuxStyle?7
 eric6.QScintilla.Shell.ShellHistoryStyle.WindowsStyle?7
@@ -10649,11 +10649,12 @@
 eric6.ViewManager.ViewManager.ViewManager?1()
 eric6.ViewManager.factory?4(parent, ui, dbs, pluginManager)
 eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.getData?4()
+eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_anacondaCheckBox_clicked?4(checked)
 eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_globalCheckBox_toggled?4(checked)
 eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_nameEdit_textChanged?4(txt)
 eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_pythonExecPicker_textChanged?4(txt)
 eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged?4(txt)
-eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog?1(manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, parent=None)
+eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog?1(manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, execPath="", parent=None)
 eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.getData?4()
 eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pythonExecPicker_textChanged?4(txt)
 eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pyvenvButton_toggled?4(checked)
@@ -10667,23 +10668,27 @@
 eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.VirtualenvInterpreterSelectionDialog.on_pythonExecPicker_textChanged?4(txt)
 eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.VirtualenvInterpreterSelectionDialog?1(venvName, venvDirectory, parent=None)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.DefaultKey?7
-eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.addVirtualEnv?4(venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.addVirtualEnv?4(venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, execPath="")
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.createVirtualEnv?4()
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.deleteVirtualEnvs?4(venvNames)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getDefaultEnvironment?4()
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getEnvironmentEntries?4()
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvDirectory?4(venvName)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvExecPath?4(venvName)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvInterpreter?4(venvName)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvNames?4()
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvNamesForVariant?4(variant)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isCondaEnvironment?4(venvName)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isGlobalEnvironment?4(venvName)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isUnique?4(venvName)
 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.renameVirtualEnv?4(oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, execPath)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.setVirtualEnv?4(venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, execPath)
 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.ExecPathRole?7
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.IsCondaRole?7
 eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.IsGlobalRole?7
 eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.PythonVariantRole?7
 eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_addButton_clicked?4()

--- a/Debugger/DebugServer.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/Debugger/DebugServer.py	Sat Nov 03 14:19:21 2018 +0100
@@ -81,8 +81,9 @@
         signaled a syntax error in a watch expression
     @signal clientRawInput(prompt, echo) emitted after a raw input request was
         received
-    @signal clientBanner(banner) emitted after the client banner was received
-    @signal clientCapabilities(int capabilities, string cltype) emitted after
+    @signal clientBanner(version, platform, dbgclient, venvname) emitted after
+        the client banner data was received
+    @signal clientCapabilities(capabilities, cltype, venvname) emitted after
         the clients capabilities were received
     @signal clientCompletionList(completionList, text) emitted after the client
         the commandline completion list and the reworked searchstring was
@@ -137,8 +138,8 @@
     clientBreakConditionError = pyqtSignal(str, int)
     clientWatchConditionError = pyqtSignal(str)
     clientRawInput = pyqtSignal(str, bool)
-    clientBanner = pyqtSignal(str, str, str)
-    clientCapabilities = pyqtSignal(int, str)
+    clientBanner = pyqtSignal(str, str, str, str)
+    clientCapabilities = pyqtSignal(int, str, str)
     clientCompletionList = pyqtSignal(list, str)
     clientInterpreterChanged = pyqtSignal(str)
     utPrepared = pyqtSignal(int, str, str)
@@ -1541,26 +1542,35 @@
         """
         self.clientRawInput.emit(prompt, echo)
         
-    def signalClientBanner(self, version, platform, debugClient):
+    def signalClientBanner(self, version, platform, debugClient, venvName):
         """
         Public method to process the client banner info.
         
-        @param version interpreter version info (string)
-        @param platform hostname of the client (string)
-        @param debugClient additional debugger type info (string)
+        @param version interpreter version info
+        @type str
+        @param platform hostname of the client
+        @type str
+        @param debugClient additional debugger type info
+        @type str
+        @param venvName name of the virtual environment
+        @type str
         """
-        self.clientBanner.emit(version, platform, debugClient)
-        
-    def signalClientCapabilities(self, capabilities, clientType):
+        self.clientBanner.emit(version, platform, debugClient, venvName)
+    
+    def signalClientCapabilities(self, capabilities, clientType, venvName):
         """
         Public method to process the client capabilities info.
         
-        @param capabilities bitmaks with the client capabilities (integer)
-        @param clientType type of the debug client (string)
+        @param capabilities bitmaks with the client capabilities
+        @type int
+        @param clientType type of the debug client
+        @type str
+        @param venvName name of the virtual environment
+        @type str
         """
         try:
             self.__debuggerInterfaceRegistry[clientType][0] = capabilities
-            self.clientCapabilities.emit(capabilities, clientType)
+            self.clientCapabilities.emit(capabilities, clientType, venvName)
         except KeyError:
             # ignore silently
             pass

--- a/Debugger/DebuggerInterfacePython.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/Debugger/DebuggerInterfacePython.py	Sat Nov 03 14:19:21 2018 +0100
@@ -55,6 +55,7 @@
         self.passive = passive
         self.process = None
         self.__variant = pythonVariant
+        self.__startedVenv = ""
         
         self.qsock = None
         self.queue = []
@@ -123,9 +124,7 @@
             for key, value in list(environment.items()):
                 env.insert(key, value)
             proc.setProcessEnvironment(env)
-        args = []
-        for arg in arguments:
-            args.append(arg)
+        args = arguments[:]
         proc.start(program, args)
         if not proc.waitForStarted(10000):
             proc = None
@@ -152,8 +151,9 @@
                 venvName = Preferences.getDebugger("Python2VirtualEnv")
             else:
                 venvName = Preferences.getDebugger("Python3VirtualEnv")
-        interpreter = e5App().getObject("VirtualEnvManager")\
-            .getVirtualenvInterpreter(venvName)
+        venvManager = e5App().getObject("VirtualEnvManager")
+        interpreter = venvManager.getVirtualenvInterpreter(venvName)
+        execPath = venvManager.getVirtualenvExecPath(venvName)
         if interpreter == "" and \
            int(self.__variant[-1]) == sys.version_info[0]:
             # use the interpreter used to run eric for identical variants
@@ -243,6 +243,12 @@
                 clientEnv[str(key)] = str(value)
             except ValueError:
                 pass
+        if execPath:
+            if "PATH" in clientEnv:
+                clientEnv["PATH"] = os.pathsep.join(
+                    [execPath, clientEnv["PATH"]])
+            else:
+                clientEnv["PATH"] = execPath
         
         ipaddr = self.debugServer.getHostAddress(True)
         if runInConsole or Preferences.getDebugger("ConsoleDbgEnabled"):
@@ -267,11 +273,15 @@
             [debugClient, noencoding, str(port), redirect, ipaddr],
             clientEnv)
         if process is None:
+            self.__startedVenv = ""
             E5MessageBox.critical(
                 None,
                 self.tr("Start Debugger"),
                 self.tr(
                     """<p>The debugger backend could not be started.</p>"""))
+        else:
+            self.__startedVenv = venvName
+        
         return process, self.__isNetworked, interpreter
 
     def startRemoteForProject(self, port, runInConsole, venvName):
@@ -294,16 +304,22 @@
             return None, self.__isNetworked, ""
         
         # start debugger with project specific settings
+        debugClient = project.getDebugProperty("DEBUGCLIENT")
         if not venvName:
             venvName = project.getDebugProperty("VIRTUALENV")
-        debugClient = project.getDebugProperty("DEBUGCLIENT")
+        if not venvName:
+            if project.getProjectLanguage() == "Python2":
+                venvName = Preferences.getDebugger("Python2VirtualEnv")
+            elif project.getProjectLanguage() == "Python3":
+                venvName = Preferences.getDebugger("Python3VirtualEnv")
         
         redirect = str(project.getDebugProperty("REDIRECT"))
         noencoding = \
             project.getDebugProperty("NOENCODING") and '--no-encoding' or ''
         
-        interpreter = e5App().getObject("VirtualEnvManager")\
-            .getVirtualenvInterpreter(venvName)
+        venvManager = e5App().getObject("VirtualEnvManager")
+        interpreter = venvManager.getVirtualenvInterpreter(venvName)
+        execPath = venvManager.getVirtualenvExecPath(venvName)
         if interpreter == "" and \
            project.getProjectLanguage().startswith("Python") and \
            sys.version_info[0] == int(project.getProjectLanguage()[-1]):
@@ -365,6 +381,12 @@
                 clientEnv[str(key)] = str(value)
             except ValueError:
                 pass
+        if execPath:
+            if "PATH" in clientEnv:
+                clientEnv["PATH"] = os.pathsep.join(
+                    [execPath, clientEnv["PATH"]])
+            else:
+                clientEnv["PATH"] = execPath
         
         ipaddr = self.debugServer.getHostAddress(True)
         if runInConsole or project.getDebugProperty("CONSOLEDEBUGGER"):
@@ -390,11 +412,15 @@
             [debugClient, noencoding, str(port), redirect, ipaddr],
             clientEnv)
         if process is None:
+            self.__startedVenv = ""
             E5MessageBox.critical(
                 None,
                 self.tr("Start Debugger"),
                 self.tr(
                     """<p>The debugger backend could not be started.</p>"""))
+        else:
+            self.__startedVenv = venvName
+        
         return process, self.__isNetworked, interpreter
 
     def getClientCapabilities(self):
@@ -996,13 +1022,18 @@
         elif method == "ResponseCapabilities":
             self.clientCapabilities = params["capabilities"]
             self.debugServer.signalClientCapabilities(
-                params["capabilities"], params["clientType"])
+                params["capabilities"],
+                params["clientType"],
+                self.__startedVenv,
+            )
         
         elif method == "ResponseBanner":
             self.debugServer.signalClientBanner(
                 params["version"],
                 params["platform"],
-                params["dbgclient"])
+                params["dbgclient"],
+                self.__startedVenv,
+            )
         
         elif method == "ResponseOK":
             self.debugServer.signalClientStatement(False)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Nov 03 14:16:43 2018 +0100
+++ b/Documentation/Help/source.qhp	Sat Nov 03 14:19:21 2018 +0100
@@ -14278,6 +14278,8 @@
       <keyword name="Shell.__isCursorOnLastLine" id="Shell.__isCursorOnLastLine" ref="eric6.QScintilla.Shell.html#Shell.__isCursorOnLastLine" />
       <keyword name="Shell.__isHistoryIndexValid" id="Shell.__isHistoryIndexValid" ref="eric6.QScintilla.Shell.html#Shell.__isHistoryIndexValid" />
       <keyword name="Shell.__middleMouseButton" id="Shell.__middleMouseButton" ref="eric6.QScintilla.Shell.html#Shell.__middleMouseButton" />
+      <keyword name="Shell.__projectClosed" id="Shell.__projectClosed" ref="eric6.QScintilla.Shell.html#Shell.__projectClosed" />
+      <keyword name="Shell.__projectOpened" id="Shell.__projectOpened" ref="eric6.QScintilla.Shell.html#Shell.__projectOpened" />
       <keyword name="Shell.__raw_input" id="Shell.__raw_input" ref="eric6.QScintilla.Shell.html#Shell.__raw_input" />
       <keyword name="Shell.__reset" id="Shell.__reset" ref="eric6.QScintilla.Shell.html#Shell.__reset" />
       <keyword name="Shell.__resetAndClear" id="Shell.__resetAndClear" ref="eric6.QScintilla.Shell.html#Shell.__resetAndClear" />
@@ -14294,7 +14296,7 @@
       <keyword name="Shell.__setMonospaced" id="Shell.__setMonospaced" ref="eric6.QScintilla.Shell.html#Shell.__setMonospaced" />
       <keyword name="Shell.__setTextDisplay" id="Shell.__setTextDisplay" ref="eric6.QScintilla.Shell.html#Shell.__setTextDisplay" />
       <keyword name="Shell.__showCompletions" id="Shell.__showCompletions" ref="eric6.QScintilla.Shell.html#Shell.__showCompletions" />
-      <keyword name="Shell.__showLanguageMenu" id="Shell.__showLanguageMenu" ref="eric6.QScintilla.Shell.html#Shell.__showLanguageMenu" />
+      <keyword name="Shell.__showStartMenu" id="Shell.__showStartMenu" ref="eric6.QScintilla.Shell.html#Shell.__showStartMenu" />
       <keyword name="Shell.__startDebugClient" id="Shell.__startDebugClient" ref="eric6.QScintilla.Shell.html#Shell.__startDebugClient" />
       <keyword name="Shell.__useHistory" id="Shell.__useHistory" ref="eric6.QScintilla.Shell.html#Shell.__useHistory" />
       <keyword name="Shell.__write" id="Shell.__write" ref="eric6.QScintilla.Shell.html#Shell.__write" />
@@ -14382,7 +14384,7 @@
       <keyword name="ShellWindow.__readSettings" id="ShellWindow.__readSettings" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__readSettings" />
       <keyword name="ShellWindow.__readShortcut" id="ShellWindow.__readShortcut" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__readShortcut" />
       <keyword name="ShellWindow.__showFind" id="ShellWindow.__showFind" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__showFind" />
-      <keyword name="ShellWindow.__showLanguageMenu" id="ShellWindow.__showLanguageMenu" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__showLanguageMenu" />
+      <keyword name="ShellWindow.__showStartMenu" id="ShellWindow.__showStartMenu" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__showStartMenu" />
       <keyword name="ShellWindow.__startShell" id="ShellWindow.__startShell" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__startShell" />
       <keyword name="ShellWindow.__whatsThis" id="ShellWindow.__whatsThis" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__whatsThis" />
       <keyword name="ShellWindow.__writeSettings" id="ShellWindow.__writeSettings" ref="eric6.QScintilla.ShellWindow.html#ShellWindow.__writeSettings" />
@@ -17516,6 +17518,7 @@
       <keyword name="VirtualenvAddEditDialog (Module)" id="VirtualenvAddEditDialog (Module)" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html" />
       <keyword name="VirtualenvAddEditDialog.__updateOk" id="VirtualenvAddEditDialog.__updateOk" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.__updateOk" />
       <keyword name="VirtualenvAddEditDialog.getData" id="VirtualenvAddEditDialog.getData" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.getData" />
+      <keyword name="VirtualenvAddEditDialog.on_anacondaCheckBox_clicked" id="VirtualenvAddEditDialog.on_anacondaCheckBox_clicked" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_anacondaCheckBox_clicked" />
       <keyword name="VirtualenvAddEditDialog.on_globalCheckBox_toggled" id="VirtualenvAddEditDialog.on_globalCheckBox_toggled" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_globalCheckBox_toggled" />
       <keyword name="VirtualenvAddEditDialog.on_nameEdit_textChanged" id="VirtualenvAddEditDialog.on_nameEdit_textChanged" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_nameEdit_textChanged" />
       <keyword name="VirtualenvAddEditDialog.on_pythonExecPicker_textChanged" id="VirtualenvAddEditDialog.on_pythonExecPicker_textChanged" ref="eric6.VirtualEnv.VirtualenvAddEditDialog.html#VirtualenvAddEditDialog.on_pythonExecPicker_textChanged" />
@@ -17565,9 +17568,11 @@
       <keyword name="VirtualenvManager.getDefaultEnvironment" id="VirtualenvManager.getDefaultEnvironment" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getDefaultEnvironment" />
       <keyword name="VirtualenvManager.getEnvironmentEntries" id="VirtualenvManager.getEnvironmentEntries" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getEnvironmentEntries" />
       <keyword name="VirtualenvManager.getVirtualenvDirectory" id="VirtualenvManager.getVirtualenvDirectory" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getVirtualenvDirectory" />
+      <keyword name="VirtualenvManager.getVirtualenvExecPath" id="VirtualenvManager.getVirtualenvExecPath" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getVirtualenvExecPath" />
       <keyword name="VirtualenvManager.getVirtualenvInterpreter" id="VirtualenvManager.getVirtualenvInterpreter" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getVirtualenvInterpreter" />
       <keyword name="VirtualenvManager.getVirtualenvNames" id="VirtualenvManager.getVirtualenvNames" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getVirtualenvNames" />
       <keyword name="VirtualenvManager.getVirtualenvNamesForVariant" id="VirtualenvManager.getVirtualenvNamesForVariant" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.getVirtualenvNamesForVariant" />
+      <keyword name="VirtualenvManager.isCondaEnvironment" id="VirtualenvManager.isCondaEnvironment" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.isCondaEnvironment" />
       <keyword name="VirtualenvManager.isGlobalEnvironment" id="VirtualenvManager.isGlobalEnvironment" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.isGlobalEnvironment" />
       <keyword name="VirtualenvManager.isUnique" id="VirtualenvManager.isUnique" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.isUnique" />
       <keyword name="VirtualenvManager.removeVirtualEnvs" id="VirtualenvManager.removeVirtualEnvs" ref="eric6.VirtualEnv.VirtualenvManager.html#VirtualenvManager.removeVirtualEnvs" />

--- a/Documentation/Source/eric6.Debugger.DebugServer.html	Sat Nov 03 14:16:43 2018 +0100
+++ b/Documentation/Source/eric6.Debugger.DebugServer.html	Sat Nov 03 14:19:21 2018 +0100
@@ -54,14 +54,15 @@
 emitted after the client reported the call trace
         data (isCall, fromFile, fromLine, fromFunction, toFile, toLine,
         toFunction)
-</dd><dt>clientBanner(banner)</dt>
+</dd><dt>clientBanner(version, platform, dbgclient, venvname)</dt>
 <dd>
-emitted after the client banner was received
+emitted after
+        the client banner data was received
 </dd><dt>clientBreakConditionError(fn, lineno)</dt>
 <dd>
 emitted after the client has
         signaled a syntax error in a breakpoint condition
-</dd><dt>clientCapabilities(int capabilities, string cltype)</dt>
+</dd><dt>clientCapabilities(capabilities, cltype, venvname)</dt>
 <dd>
 emitted after
         the clients capabilities were received
@@ -1611,19 +1612,22 @@
         the debug client. (Needed on Win OS)
 </p><a NAME="DebugServer.signalClientBanner" ID="DebugServer.signalClientBanner"></a>
 <h4>DebugServer.signalClientBanner</h4>
-<b>signalClientBanner</b>(<i>version, platform, debugClient</i>)
+<b>signalClientBanner</b>(<i>version, platform, debugClient, venvName</i>)
 <p>
         Public method to process the client banner info.
 </p><dl>
-<dt><i>version</i></dt>
+<dt><i>version</i> (str)</dt>
 <dd>
-interpreter version info (string)
-</dd><dt><i>platform</i></dt>
+interpreter version info
+</dd><dt><i>platform</i> (str)</dt>
 <dd>
-hostname of the client (string)
-</dd><dt><i>debugClient</i></dt>
+hostname of the client
+</dd><dt><i>debugClient</i> (str)</dt>
 <dd>
-additional debugger type info (string)
+additional debugger type info
+</dd><dt><i>venvName</i> (str)</dt>
+<dd>
+name of the virtual environment
 </dd>
 </dl><a NAME="DebugServer.signalClientBreakConditionError" ID="DebugServer.signalClientBreakConditionError"></a>
 <h4>DebugServer.signalClientBreakConditionError</h4>
@@ -1668,16 +1672,19 @@
 </dd>
 </dl><a NAME="DebugServer.signalClientCapabilities" ID="DebugServer.signalClientCapabilities"></a>
 <h4>DebugServer.signalClientCapabilities</h4>
-<b>signalClientCapabilities</b>(<i>capabilities, clientType</i>)
+<b>signalClientCapabilities</b>(<i>capabilities, clientType, venvName</i>)
 <p>
         Public method to process the client capabilities info.
 </p><dl>
-<dt><i>capabilities</i></dt>
+<dt><i>capabilities</i> (int)</dt>
+<dd>
+bitmaks with the client capabilities
+</dd><dt><i>clientType</i> (str)</dt>
 <dd>
-bitmaks with the client capabilities (integer)
-</dd><dt><i>clientType</i></dt>
+type of the debug client
+</dd><dt><i>venvName</i> (str)</dt>
 <dd>
-type of the debug client (string)
+name of the virtual environment
 </dd>
 </dl><a NAME="DebugServer.signalClientClearBreak" ID="DebugServer.signalClientClearBreak"></a>
 <h4>DebugServer.signalClientClearBreak</h4>

--- a/Documentation/Source/eric6.QScintilla.Shell.html	Sat Nov 03 14:16:43 2018 +0100
+++ b/Documentation/Source/eric6.QScintilla.Shell.html	Sat Nov 03 14:19:21 2018 +0100
@@ -239,6 +239,12 @@
 <td><a href="#Shell.__middleMouseButton">__middleMouseButton</a></td>
 <td>Private method to handle the middle mouse button press.</td>
 </tr><tr>
+<td><a href="#Shell.__projectClosed">__projectClosed</a></td>
+<td>Private slot to restart the default shell when the project is closed.</td>
+</tr><tr>
+<td><a href="#Shell.__projectOpened">__projectOpened</a></td>
+<td>Private slot to start the shell for the opened project.</td>
+</tr><tr>
 <td><a href="#Shell.__raw_input">__raw_input</a></td>
 <td>Private method to handle raw input.</td>
 </tr><tr>
@@ -287,8 +293,8 @@
 <td><a href="#Shell.__showCompletions">__showCompletions</a></td>
 <td>Private method to display the possible completions.</td>
 </tr><tr>
-<td><a href="#Shell.__showLanguageMenu">__showLanguageMenu</a></td>
-<td>Private slot to prepare the language submenu.</td>
+<td><a href="#Shell.__showStartMenu">__showStartMenu</a></td>
+<td>Private slot to prepare the start submenu.</td>
 </tr><tr>
 <td><a href="#Shell.__startDebugClient">__startDebugClient</a></td>
 <td>Private slot to start a debug client according to the action triggered.</td>
@@ -426,23 +432,25 @@
 </table>
 <a NAME="Shell.__init__" ID="Shell.__init__"></a>
 <h4>Shell (Constructor)</h4>
-<b>Shell</b>(<i>dbs, vm, windowedVariant, parent=None</i>)
+<b>Shell</b>(<i>dbs, vm, project, windowedVariant, parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>dbs</i></dt>
+<dt><i>dbs</i> (DebugServer)</dt>
 <dd>
 reference to the debug server object
-</dd><dt><i>vm</i></dt>
+</dd><dt><i>vm</i> (ViewManager)</dt>
 <dd>
 reference to the viewmanager object
-</dd><dt><i>windowedVariant</i></dt>
+</dd><dt><i>project</i> (Project)</dt>
+<dd>
+reference to the project object
+</dd><dt><i>windowedVariant</i> (bool)</dt>
 <dd>
 flag indicating the shell window variant
-            (boolean)
-</dd><dt><i>parent</i></dt>
+</dd><dt><i>parent</i> (QWidget)</dt>
 <dd>
-parent widget (QWidget)
+parent widget
 </dd>
 </dl><a NAME="Shell.__QScintillaAutoCompletionCommand" ID="Shell.__QScintillaAutoCompletionCommand"></a>
 <h4>Shell.__QScintillaAutoCompletionCommand</h4>
@@ -676,16 +684,19 @@
         Private method to clear the line containing the cursor.
 </p><a NAME="Shell.__clientCapabilities" ID="Shell.__clientCapabilities"></a>
 <h4>Shell.__clientCapabilities</h4>
-<b>__clientCapabilities</b>(<i>cap, clType</i>)
+<b>__clientCapabilities</b>(<i>cap, clType, venvName</i>)
 <p>
         Private slot to handle the reporting of the clients capabilities.
 </p><dl>
-<dt><i>cap</i></dt>
+<dt><i>cap</i> (int)</dt>
+<dd>
+client capabilities
+</dd><dt><i>clType</i> (str)</dt>
 <dd>
-client capabilities (integer)
-</dd><dt><i>clType</i></dt>
+type of the debug client
+</dd><dt><i>venvName</i> (str)</dt>
 <dd>
-type of the debug client (string)
+name of the virtual environment
 </dd>
 </dl><a NAME="Shell.__clientError" ID="Shell.__clientError"></a>
 <h4>Shell.__clientError</h4>
@@ -921,6 +932,16 @@
 <b>__middleMouseButton</b>(<i></i>)
 <p>
         Private method to handle the middle mouse button press.
+</p><a NAME="Shell.__projectClosed" ID="Shell.__projectClosed"></a>
+<h4>Shell.__projectClosed</h4>
+<b>__projectClosed</b>(<i></i>)
+<p>
+        Private slot to restart the default shell when the project is closed.
+</p><a NAME="Shell.__projectOpened" ID="Shell.__projectOpened"></a>
+<h4>Shell.__projectOpened</h4>
+<b>__projectOpened</b>(<i></i>)
+<p>
+        Private slot to start the shell for the opened project.
 </p><a NAME="Shell.__raw_input" ID="Shell.__raw_input"></a>
 <h4>Shell.__raw_input</h4>
 <b>__raw_input</b>(<i>s, echo</i>)
@@ -1075,11 +1096,11 @@
 <dd>
 text that is about to be completed (string)
 </dd>
-</dl><a NAME="Shell.__showLanguageMenu" ID="Shell.__showLanguageMenu"></a>
-<h4>Shell.__showLanguageMenu</h4>
-<b>__showLanguageMenu</b>(<i></i>)
+</dl><a NAME="Shell.__showStartMenu" ID="Shell.__showStartMenu"></a>
+<h4>Shell.__showStartMenu</h4>
+<b>__showStartMenu</b>(<i></i>)
 <p>
-        Private slot to prepare the language submenu.
+        Private slot to prepare the start submenu.
 </p><a NAME="Shell.__startDebugClient" ID="Shell.__startDebugClient"></a>
 <h4>Shell.__startDebugClient</h4>
 <b>__startDebugClient</b>(<i>action</i>)
@@ -1108,19 +1129,22 @@
 </dd>
 </dl><a NAME="Shell.__writeBanner" ID="Shell.__writeBanner"></a>
 <h4>Shell.__writeBanner</h4>
-<b>__writeBanner</b>(<i>version, platform, dbgclient</i>)
+<b>__writeBanner</b>(<i>version, platform, dbgclient, venvName</i>)
 <p>
         Private method to write a banner with info from the debug client.
 </p><dl>
-<dt><i>version</i></dt>
+<dt><i>version</i> (str)</dt>
 <dd>
-interpreter version string (string)
-</dd><dt><i>platform</i></dt>
+interpreter version string
+</dd><dt><i>platform</i> (str)</dt>
 <dd>
-platform of the remote interpreter (string)
-</dd><dt><i>dbgclient</i></dt>
+platform of the remote interpreter
+</dd><dt><i>dbgclient</i> (str)</dt>
 <dd>
-debug client variant used (string)
+debug client variant used
+</dd><dt><i>venvName</i> (str)</dt>
+<dd>
+name of the virtual environment
 </dd>
 </dl><a NAME="Shell.__writePrompt" ID="Shell.__writePrompt"></a>
 <h4>Shell.__writePrompt</h4>
@@ -1562,22 +1586,25 @@
 </table>
 <a NAME="ShellAssembly.__init__" ID="ShellAssembly.__init__"></a>
 <h4>ShellAssembly (Constructor)</h4>
-<b>ShellAssembly</b>(<i>dbs, vm, horizontal=True, parent=None</i>)
+<b>ShellAssembly</b>(<i>dbs, vm, project, horizontal=True, parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>dbs</i></dt>
+<dt><i>dbs</i> (DebugServer)</dt>
 <dd>
 reference to the debug server object
-</dd><dt><i>vm</i></dt>
+</dd><dt><i>vm</i> (ViewManager)</dt>
 <dd>
 reference to the viewmanager object
-</dd><dt><i>horizontal</i></dt>
+</dd><dt><i>project</i> (Project)</dt>
+<dd>
+reference to the project object
+</dd><dt><i>horizontal</i> (bool)</dt>
 <dd>
-flag indicating a horizontal layout (boolean)
-</dd><dt><i>parent</i></dt>
+flag indicating a horizontal layout
+</dd><dt><i>parent</i> (QWidget)</dt>
 <dd>
-parent widget (QWidget)
+parent widget
 </dd>
 </dl><a NAME="ShellAssembly.shell" ID="ShellAssembly.shell"></a>
 <h4>ShellAssembly.shell</h4>

--- a/Documentation/Source/eric6.QScintilla.ShellWindow.html	Sat Nov 03 14:16:43 2018 +0100
+++ b/Documentation/Source/eric6.QScintilla.ShellWindow.html	Sat Nov 03 14:19:21 2018 +0100
@@ -117,7 +117,7 @@
 <td><a href="#ShellWindow.__showFind">__showFind</a></td>
 <td>Private method to display the search widget.</td>
 </tr><tr>
-<td><a href="#ShellWindow.__showLanguageMenu">__showLanguageMenu</a></td>
+<td><a href="#ShellWindow.__showStartMenu">__showStartMenu</a></td>
 <td>Private slot to prepare the language menu.</td>
 </tr><tr>
 <td><a href="#ShellWindow.__startShell">__startShell</a></td>
@@ -293,9 +293,9 @@
 <b>__showFind</b>(<i></i>)
 <p>
         Private method to display the search widget.
-</p><a NAME="ShellWindow.__showLanguageMenu" ID="ShellWindow.__showLanguageMenu"></a>
-<h4>ShellWindow.__showLanguageMenu</h4>
-<b>__showLanguageMenu</b>(<i></i>)
+</p><a NAME="ShellWindow.__showStartMenu" ID="ShellWindow.__showStartMenu"></a>
+<h4>ShellWindow.__showStartMenu</h4>
+<b>__showStartMenu</b>(<i></i>)
 <p>
         Private slot to prepare the language menu.
 </p><a NAME="ShellWindow.__startShell" ID="ShellWindow.__startShell"></a>

--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvAddEditDialog.html	Sat Nov 03 14:16:43 2018 +0100
+++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvAddEditDialog.html	Sat Nov 03 14:19:21 2018 +0100
@@ -66,6 +66,9 @@
 <td><a href="#VirtualenvAddEditDialog.getData">getData</a></td>
 <td>Public method to retrieve the entered data.</td>
 </tr><tr>
+<td><a href="#VirtualenvAddEditDialog.on_anacondaCheckBox_clicked">on_anacondaCheckBox_clicked</a></td>
+<td>Private slot handling a user click on this check box.</td>
+</tr><tr>
 <td><a href="#VirtualenvAddEditDialog.on_globalCheckBox_toggled">on_globalCheckBox_toggled</a></td>
 <td>Private slot handling a change of the global check box state.</td>
 </tr><tr>
@@ -85,7 +88,7 @@
 </table>
 <a NAME="VirtualenvAddEditDialog.__init__" ID="VirtualenvAddEditDialog.__init__"></a>
 <h4>VirtualenvAddEditDialog (Constructor)</h4>
-<b>VirtualenvAddEditDialog</b>(<i>manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, parent=None</i>)
+<b>VirtualenvAddEditDialog</b>(<i>manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, execPath="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -107,6 +110,13 @@
 </dd><dt><i>isGlobal</i> (bool)</dt>
 <dd>
 flag indicating a global environment
+</dd><dt><i>isConda</i> (bool)</dt>
+<dd>
+flag indicating an Anaconda virtual environment
+</dd><dt><i>execPath</i> (str)</dt>
+<dd>
+search path string to be prepended to the PATH
+            environment variable
 </dd><dt><i>parent</i> (QWidget)</dt>
 <dd>
 reference to the parent widget
@@ -125,13 +135,25 @@
 <dt>Returns:</dt>
 <dd>
 tuple containing the logical name, the directory, the
-            interpreter of the virtual environment, the Python variant
-            and a flag indicating a global environment
+            interpreter of the virtual environment, the Python variant,
+            a flag indicating a global environment, a flag indicating an
+            Anaconda environment and a string to be prepended to the PATH
+            environment variable
 </dd>
 </dl><dl>
 <dt>Return Type:</dt>
 <dd>
-tuple of (str, str, str, int, bool)
+tuple of (str, str, str, int, bool,bool, str)
+</dd>
+</dl><a NAME="VirtualenvAddEditDialog.on_anacondaCheckBox_clicked" ID="VirtualenvAddEditDialog.on_anacondaCheckBox_clicked"></a>
+<h4>VirtualenvAddEditDialog.on_anacondaCheckBox_clicked</h4>
+<b>on_anacondaCheckBox_clicked</b>(<i>checked</i>)
+<p>
+        Private slot handling a user click on this check box.
+</p><dl>
+<dt><i>checked</i> (bool)</dt>
+<dd>
+state of the check box
 </dd>
 </dl><a NAME="VirtualenvAddEditDialog.on_globalCheckBox_toggled" ID="VirtualenvAddEditDialog.on_globalCheckBox_toggled"></a>
 <h4>VirtualenvAddEditDialog.on_globalCheckBox_toggled</h4>

--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html	Sat Nov 03 14:16:43 2018 +0100
+++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html	Sat Nov 03 14:19:21 2018 +0100
@@ -87,6 +87,9 @@
 <td><a href="#VirtualenvManager.getVirtualenvDirectory">getVirtualenvDirectory</a></td>
 <td>Public method to get the directory of a virtual environment.</td>
 </tr><tr>
+<td><a href="#VirtualenvManager.getVirtualenvExecPath">getVirtualenvExecPath</a></td>
+<td>Public method to get the search path prefix of a virtual environment.</td>
+</tr><tr>
 <td><a href="#VirtualenvManager.getVirtualenvInterpreter">getVirtualenvInterpreter</a></td>
 <td>Public method to get the interpreter for a virtual environment.</td>
 </tr><tr>
@@ -96,6 +99,9 @@
 <td><a href="#VirtualenvManager.getVirtualenvNamesForVariant">getVirtualenvNamesForVariant</a></td>
 <td>Public method to get a list of virtual environments for a given Python variant.</td>
 </tr><tr>
+<td><a href="#VirtualenvManager.isCondaEnvironment">isCondaEnvironment</a></td>
+<td>Public method to test, if a given environment is an Anaconda environment.</td>
+</tr><tr>
 <td><a href="#VirtualenvManager.isGlobalEnvironment">isGlobalEnvironment</a></td>
 <td>Public method to test, if a given environment is a global one.</td>
 </tr><tr>
@@ -165,7 +171,7 @@
         Private slot to save the virtual environments.
 </p><a NAME="VirtualenvManager.addVirtualEnv" ID="VirtualenvManager.addVirtualEnv"></a>
 <h4>VirtualenvManager.addVirtualEnv</h4>
-<b>addVirtualEnv</b>(<i>venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False</i>)
+<b>addVirtualEnv</b>(<i>venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False, isConda=False, execPath=""</i>)
 <p>
         Public method to add a virtual environment.
 </p><dl>
@@ -184,6 +190,13 @@
 </dd><dt><i>isGlobal</i> (bool)</dt>
 <dd>
 flag indicating a global environment
+</dd><dt><i>isConda</i> (bool)</dt>
+<dd>
+flag indicating an Anaconda virtual environment
+</dd><dt><i>execPath</i> (str)</dt>
+<dd>
+search path string to be prepended to the PATH
+            environment variable
 </dd>
 </dl><a NAME="VirtualenvManager.createVirtualEnv" ID="VirtualenvManager.createVirtualEnv"></a>
 <h4>VirtualenvManager.createVirtualEnv</h4>
@@ -257,6 +270,26 @@
 <dd>
 str
 </dd>
+</dl><a NAME="VirtualenvManager.getVirtualenvExecPath" ID="VirtualenvManager.getVirtualenvExecPath"></a>
+<h4>VirtualenvManager.getVirtualenvExecPath</h4>
+<b>getVirtualenvExecPath</b>(<i>venvName</i>)
+<p>
+        Public method to get the search path prefix of a virtual environment.
+</p><dl>
+<dt><i>venvName</i> (str)</dt>
+<dd>
+logical name for the virtual environment
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+search path prefix
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
 </dl><a NAME="VirtualenvManager.getVirtualenvInterpreter" ID="VirtualenvManager.getVirtualenvInterpreter"></a>
 <h4>VirtualenvManager.getVirtualenvInterpreter</h4>
 <b>getVirtualenvInterpreter</b>(<i>venvName</i>)
@@ -313,6 +346,27 @@
 <dd>
 list of str
 </dd>
+</dl><a NAME="VirtualenvManager.isCondaEnvironment" ID="VirtualenvManager.isCondaEnvironment"></a>
+<h4>VirtualenvManager.isCondaEnvironment</h4>
+<b>isCondaEnvironment</b>(<i>venvName</i>)
+<p>
+        Public method to test, if a given environment is an Anaconda
+        environment.
+</p><dl>
+<dt><i>venvName</i> (str)</dt>
+<dd>
+logical name of the virtual environment
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating an Anaconda environment
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="VirtualenvManager.isGlobalEnvironment" ID="VirtualenvManager.isGlobalEnvironment"></a>
 <h4>VirtualenvManager.isGlobalEnvironment</h4>
 <b>isGlobalEnvironment</b>(<i>venvName</i>)
@@ -365,7 +419,7 @@
 </dd>
 </dl><a NAME="VirtualenvManager.renameVirtualEnv" ID="VirtualenvManager.renameVirtualEnv"></a>
 <h4>VirtualenvManager.renameVirtualEnv</h4>
-<b>renameVirtualEnv</b>(<i>oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal</i>)
+<b>renameVirtualEnv</b>(<i>oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, execPath</i>)
 <p>
         Public method to substitute a virtual environment entry with a new
         name.
@@ -388,10 +442,17 @@
 </dd><dt><i>isGlobal</i> (bool)</dt>
 <dd>
 flag indicating a global environment
+</dd><dt><i>isConda</i> (bool)</dt>
+<dd>
+flag indicating an Anaconda virtual environment
+</dd><dt><i>execPath</i> (str)</dt>
+<dd>
+search path string to be prepended to the PATH
+            environment variable
 </dd>
 </dl><a NAME="VirtualenvManager.setVirtualEnv" ID="VirtualenvManager.setVirtualEnv"></a>
 <h4>VirtualenvManager.setVirtualEnv</h4>
-<b>setVirtualEnv</b>(<i>venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal</i>)
+<b>setVirtualEnv</b>(<i>venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal, isConda, execPath</i>)
 <p>
         Public method to change a virtual environment.
 </p><dl>
@@ -410,6 +471,13 @@
 </dd><dt><i>isGlobal</i> (bool)</dt>
 <dd>
 flag indicating a global environment
+</dd><dt><i>isConda</i> (bool)</dt>
+<dd>
+flag indicating an Anaconda virtual environment
+</dd><dt><i>execPath</i> (str)</dt>
+<dd>
+search path string to be prepended to the PATH
+            environment variable
 </dd>
 </dl><a NAME="VirtualenvManager.showVirtualenvManagerDialog" ID="VirtualenvManager.showVirtualenvManagerDialog"></a>
 <h4>VirtualenvManager.showVirtualenvManagerDialog</h4>

--- a/Documentation/Source/eric6.VirtualEnv.VirtualenvManagerDialog.html	Sat Nov 03 14:16:43 2018 +0100
+++ b/Documentation/Source/eric6.VirtualEnv.VirtualenvManagerDialog.html	Sat Nov 03 14:19:21 2018 +0100
@@ -50,7 +50,7 @@
 QDialog, Ui_VirtualenvManagerDialog
 <h3>Class Attributes</h3>
 <table>
-<tr><td>IsGlobalRole</td></tr><tr><td>PythonVariantRole</td></tr>
+<tr><td>ExecPathRole</td></tr><tr><td>IsCondaRole</td></tr><tr><td>IsGlobalRole</td></tr><tr><td>PythonVariantRole</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>

--- a/Preferences/ConfigurationPages/ProjectPage.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/Preferences/ConfigurationPages/ProjectPage.py	Sat Nov 03 14:19:21 2018 +0100
@@ -60,6 +60,8 @@
             Preferences.getProject("TasksProjectAutoSave"))
         self.rescanTasksCheckBox.setChecked(
             Preferences.getProject("TasksProjectRescanOnOpen"))
+        self.restartShellCheckBox.setChecked(
+            Preferences.getProject("RestartShellForProject"))
         
     def save(self):
         """
@@ -113,6 +115,9 @@
         Preferences.setProject(
             "TasksProjectRescanOnOpen",
             self.rescanTasksCheckBox.isChecked())
+        Preferences.setProject(
+            "RestartShellForProject",
+            self.restartShellCheckBox.isChecked())
     
 
 def create(dlg):

--- a/Preferences/ConfigurationPages/ProjectPage.ui	Sat Nov 03 14:16:43 2018 +0100
+++ b/Preferences/ConfigurationPages/ProjectPage.ui	Sat Nov 03 14:19:21 2018 +0100
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
     <width>604</width>
-    <height>732</height>
+    <height>905</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -216,6 +216,25 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_9">
+     <property name="title">
+      <string>Shell</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="restartShellCheckBox">
+        <property name="toolTip">
+         <string>Select to restart the shell with the interpreter of the project (if configured)</string>
+        </property>
+        <property name="text">
+         <string>Restart Shell for project upon opening</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_7">
      <property name="title">
       <string>Recent Projects</string>
@@ -318,6 +337,7 @@
   <tabstop>projectAutoCompileResourcesCheckBox</tabstop>
   <tabstop>projectAutoMakeCheckBox</tabstop>
   <tabstop>pythonVariantCheckBox</tabstop>
+  <tabstop>restartShellCheckBox</tabstop>
   <tabstop>projectRecentSpinBox</tabstop>
   <tabstop>autosaveTasksCheckBox</tabstop>
   <tabstop>rescanTasksCheckBox</tabstop>

--- a/Preferences/__init__.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/Preferences/__init__.py	Sat Nov 03 14:19:21 2018 +0100
@@ -779,6 +779,7 @@
         "TasksProjectRescanOnOpen": True,
         "DebugClientsHistory": [],
         "DebuggerInterpreterHistory": [],
+        "RestartShellForProject": True,
     }
     
     # defaults for the multi project settings

--- a/Project/Project.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/Project/Project.py	Sat Nov 03 14:19:21 2018 +0100
@@ -2953,6 +2953,11 @@
                     self.menuMakeAct.setEnabled(
                         self.pdata["MAKEPARAMS"]["MakeEnabled"])
                     
+                    # open a project debugger properties file being quiet
+                    # about errors
+                    if Preferences.getProject("AutoLoadDbgProperties"):
+                        self.__readDebugProperties(True)
+                    
                     self.__model.projectOpened()
                     self.projectOpenedHooks.emit()
                     self.projectOpened.emit()
@@ -2986,11 +2991,6 @@
                         elif Preferences.getProject("AutoLoadSession"):
                             self.__readSession(quiet=True)
                     
-                    # open a project debugger properties file being quiet
-                    # about errors
-                    if Preferences.getProject("AutoLoadDbgProperties"):
-                        self.__readDebugProperties(True)
-                    
                     # start the VCS monitor thread
                     if self.vcs is not None:
                         self.vcs.startStatusMonitor(self)

--- a/QScintilla/Shell.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/QScintilla/Shell.py	Sat Nov 03 14:19:21 2018 +0100
@@ -41,18 +41,24 @@
     """
     Class implementing the containing widget for the shell.
     """
-    def __init__(self, dbs, vm, horizontal=True, parent=None):
+    def __init__(self, dbs, vm, project, horizontal=True, parent=None):
         """
         Constructor
         
         @param dbs reference to the debug server object
+        @type DebugServer
         @param vm reference to the viewmanager object
-        @param horizontal flag indicating a horizontal layout (boolean)
-        @param parent parent widget (QWidget)
+        @type ViewManager
+        @param project reference to the project object
+        @type Project
+        @param horizontal flag indicating a horizontal layout
+        @type bool
+        @param parent parent widget
+        @type QWidget
         """
         super(ShellAssembly, self).__init__(parent)
         
-        self.__shell = Shell(dbs, vm, False, self)
+        self.__shell = Shell(dbs, vm, project, False, self)
         
         from UI.SearchWidget import SearchWidget
         self.__searchWidget = SearchWidget(self.__shell, self, horizontal)
@@ -116,15 +122,20 @@
     historyStyleChanged = pyqtSignal(ShellHistoryStyle)
     queueText = pyqtSignal(str)
     
-    def __init__(self, dbs, vm, windowedVariant, parent=None):
+    def __init__(self, dbs, vm, project, windowedVariant, parent=None):
         """
         Constructor
         
         @param dbs reference to the debug server object
+        @type DebugServer
         @param vm reference to the viewmanager object
+        @type ViewManager
+        @param project reference to the project object
+        @type Project
         @param windowedVariant flag indicating the shell window variant
-            (boolean)
-        @param parent parent widget (QWidget)
+        @type bool
+        @param parent parent widget
+        @type QWidget
         """
         super(Shell, self).__init__(parent)
         self.setUtf8(True)
@@ -133,6 +144,7 @@
         self.__mainWindow = parent
         self.__lastSearch = ()
         self.__windowed = windowedVariant
+        self.__currentVenv = ""
         
         self.linesepRegExp = r"\r\n|\n|\r"
         
@@ -266,7 +278,7 @@
         if not self.__windowed:
             # Create a little language context menu
             self.lmenu = QMenu(self.tr('Start'))
-            self.lmenu.aboutToShow.connect(self.__showLanguageMenu)
+            self.lmenu.aboutToShow.connect(self.__showStartMenu)
             self.lmenu.triggered.connect(self.__startDebugClient)
             
             # Create the history context menu
@@ -351,17 +363,24 @@
         self.__blockTextProcessing = False
         self.queueText.connect(self.__concatenateText, Qt.QueuedConnection)
         
+        self.__project = project
+        if self.__project:
+            self.__project.projectOpened.connect(self.__projectOpened)
+            self.__project.projectClosed.connect(self.__projectClosed)
+        
         self.grabGesture(Qt.PinchGesture)
     
-    def __showLanguageMenu(self):
+    def __showStartMenu(self):
         """
-        Private slot to prepare the language submenu.
+        Private slot to prepare the start submenu.
         """
         self.lmenu.clear()
-        clientLanguages = self.dbs.getSupportedLanguages(shellOnly=True)
-        for language in sorted(clientLanguages):
-            act = self.lmenu.addAction(language)
-            act.setData(language)
+        venvManager = e5App().getObject("VirtualEnvManager")
+        for venvName in sorted(venvManager.getVirtualenvNames()):
+            self.lmenu.addAction(venvName)
+        if self.__project.isOpen():
+            self.lmenu.addSeparator()
+            self.lmenu.addAction(self.tr("Project"))
         
     def __resizeLinenoMargin(self):
         """
@@ -579,14 +598,19 @@
         self.inCommandExecution = False
         self.interruptCommandExecution = False
         
-    def __clientCapabilities(self, cap, clType):
+    def __clientCapabilities(self, cap, clType, venvName):
         """
         Private slot to handle the reporting of the clients capabilities.
         
-        @param cap client capabilities (integer)
-        @param clType type of the debug client (string)
+        @param cap client capabilities
+        @type int
+        @param clType type of the debug client
+        @type str
+        @param venvName name of the virtual environment
+        @type str
         """
         self.clientCapabilities = cap
+        self.__currentVenv = venvName
         if clType != self.clientType:
             self.clientType = clType
             self.__bindLexer(self.clientType)
@@ -767,19 +791,25 @@
         else:
             self.dbs.remoteBanner()
         
-    def __writeBanner(self, version, platform, dbgclient):
+    def __writeBanner(self, version, platform, dbgclient, venvName):
         """
         Private method to write a banner with info from the debug client.
         
-        @param version interpreter version string (string)
-        @param platform platform of the remote interpreter (string)
-        @param dbgclient debug client variant used (string)
+        @param version interpreter version string
+        @type str
+        @param platform platform of the remote interpreter
+        @type str
+        @param dbgclient debug client variant used
+        @type str
+        @param venvName name of the virtual environment
+        @type str
         """
         super(Shell, self).clear()
         if self.passive and not self.dbs.isConnected():
             self.__write(self.tr('Passive Debug Mode'))
             self.__write(self.tr('\nNot connected'))
         else:
+            self.__currentVenv = venvName
             version = version.replace("#", self.tr("No."))
             if platform != "" and dbgclient != "":
                 self.__write(
@@ -787,6 +817,8 @@
                         .format(version, platform, dbgclient))
             else:
                 self.__write(version)
+            if venvName:
+                self.__write("\n[{0}]".format(venvName))
         self.__write('\n')
         
         self.__write(sys.ps1)
@@ -1710,36 +1742,24 @@
                     else:
                         self.__setHistoryIndex(historyIndex)
             
-            if cmd.startswith('start '):
+            if cmd == 'start' or cmd.startswith('start '):
                 if not self.passive:
                     cmdList = cmd.split(None, 1)
                     if len(cmdList) < 2:
-                        self.dbs.startClient(False)  # same as reset
+                        self.dbs.startClient(False)  # start default backend
                     else:
-                        clientLanguages = self.dbs.getSupportedLanguages(
-                            shellOnly=True)
-                        language = cmdList[1]
-                        if language not in clientLanguages:
-                            language = cmdList[1].capitalize()
-                            if language not in clientLanguages:
-                                language = ""
-                        if language:
-                            self.dbs.startClient(False, language)
+                        venvName = cmdList[1]
+                        if venvName == self.tr("Project"):
+                            if self.__project.isOpen():
+                                self.dbs.startClient(False, forProject=True)
+                            else:
+                                self.dbs.startClient(
+                                    False, venvName=self.__currentVenv)
+                                # same as reset
                         else:
-                            # language not supported or typo
-                            self.__write(
-                                self.tr(
-                                    'Shell language "{0}" not supported.\n')
-                                .format(cmdList[1]))
-                            self.__clientStatement(False)
-                        return
-                    cmd = ''
-            elif cmd == 'languages':
-                s = '{0}\n'.format(', '.join(sorted(
-                    self.dbs.getSupportedLanguages(shellOnly=True))))
-                self.__write(s)
-                self.__clientStatement(False)
-                return
+                            self.dbs.startClient(False, venvName=venvName)
+                    self.__getBanner()
+                    return
             elif cmd == 'clear':
                 # Display the banner.
                 self.__getBanner()
@@ -1748,7 +1768,7 @@
                 else:
                     cmd = ''
             elif cmd == 'reset':
-                self.dbs.startClient(False)
+                self.dbs.startClient(False, venvName=self.__currentVenv)
                 if self.passive:
                     return
                 else:
@@ -1903,8 +1923,11 @@
         
         @param action context menu action that was triggered (QAction)
         """
-        language = action.data()
-        self.dbs.startClient(False, language)
+        venvName = action.text()
+        if venvName == self.tr("Project"):
+            self.dbs.startClient(False, forProject=True)
+        else:
+            self.dbs.startClient(False, venvName=venvName)
         self.__getBanner()
         
     def handlePreferencesChanged(self):
@@ -2213,3 +2236,23 @@
         @rtype bool
         """
         return self.__historyStyle != ShellHistoryStyle.Disabled
+    
+    #################################################################
+    ## Project Support
+    #################################################################
+    
+    def __projectOpened(self):
+        """
+        Private slot to start the shell for the opened project.
+        """
+        if Preferences.getProject("RestartShellForProject"):
+            self.dbs.startClient(False, forProject=True)
+            self.__getBanner()
+    
+    def __projectClosed(self):
+        """
+        Private slot to restart the default shell when the project is closed.
+        """
+        if Preferences.getProject("RestartShellForProject"):
+            self.dbs.startClient(False)
+            self.__getBanner()

--- a/QScintilla/ShellWindow.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/QScintilla/ShellWindow.py	Sat Nov 03 14:19:21 2018 +0100
@@ -67,7 +67,7 @@
         
         # initialize the debug server and shell widgets
         self.__debugServer = DebugServer(preventPassiveDebugging=True)
-        self.__shell = Shell(self.__debugServer, self, True, self)
+        self.__shell = Shell(self.__debugServer, self, None, True, self)
         self.__searchWidget = SearchWidget(self.__shell, self, showLine=True)
         
         centralWidget = QWidget()
@@ -1151,7 +1151,7 @@
         self.__historyMenu.setEnabled(self.__shell.isHistoryEnabled())
         
         self.__startMenu = self.menuBar().addMenu(self.tr("&Start"))
-        self.__startMenu.aboutToShow.connect(self.__showLanguageMenu)
+        self.__startMenu.aboutToShow.connect(self.__showStartMenu)
         self.__startMenu.triggered.connect(self.__startShell)
         
         self.menuBar().addSeparator()
@@ -1163,16 +1163,13 @@
         self.__helpMenu.addSeparator()
         self.__helpMenu.addAction(self.whatsThisAct)
     
-    def __showLanguageMenu(self):
+    def __showStartMenu(self):
         """
         Private slot to prepare the language menu.
         """
         self.__startMenu.clear()
-        clientLanguages = self.__debugServer.getSupportedLanguages(
-            shellOnly=True)
-        for language in sorted(clientLanguages):
-            act = self.__startMenu.addAction(language)
-            act.setData(language)
+        for venvName in sorted(self.virtualenvManager.getVirtualenvNames()):
+            self.__startMenu.addAction(venvName)
     
     def __startShell(self, action):
         """
@@ -1180,8 +1177,9 @@
         
         @param action menu action that was triggered (QAction)
         """
-        language = action.data()
-        self.__debugServer.startClient(False, language)
+        venvName = action.text()
+        self.__debugServer.startClient(False, venvName=venvName)
+        self.__debugServer.remoteBanner()
     
     ##################################################################
     ## Below are the toolbar handling methods

--- a/UI/UserInterface.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/UI/UserInterface.py	Sat Nov 03 14:19:21 2018 +0100
@@ -890,7 +890,7 @@
         logging.debug("Creating Shell...")
         from QScintilla.Shell import ShellAssembly
         self.shellAssembly = \
-            ShellAssembly(debugServer, self.viewmanager, True)
+            ShellAssembly(debugServer, self.viewmanager, self.project, True)
         self.shell = self.shellAssembly.shell()
         self.hToolbox.insertItem(0, self.shellAssembly,
                                  UI.PixmapCache.getIcon("shell.png"),
@@ -1031,7 +1031,7 @@
         logging.debug("Creating Shell...")
         from QScintilla.Shell import ShellAssembly
         self.shellAssembly = \
-            ShellAssembly(debugServer, self.viewmanager, True)
+            ShellAssembly(debugServer, self.viewmanager, self.project, True)
         self.shell = self.shellAssembly.shell()
         self.bottomSidebar.insertTab(0, self.shellAssembly,
                                      UI.PixmapCache.getIcon("shell.png"),

--- a/VirtualEnv/VirtualenvAddEditDialog.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/VirtualEnv/VirtualenvAddEditDialog.py	Sat Nov 03 14:19:21 2018 +0100
@@ -28,7 +28,7 @@
     """
     def __init__(self, manager, venvName="", venvDirectory="",
                  venvInterpreter="", venvVariant=3, isGlobal=False,
-                 parent=None):
+                 isConda=False, execPath="", parent=None):
         """
         Constructor
         
@@ -44,6 +44,11 @@
         @type int
         @param isGlobal flag indicating a global environment
         @type bool
+        @param isConda flag indicating an Anaconda virtual environment
+        @type bool
+        @param execPath search path string to be prepended to the PATH
+            environment variable
+        @type str
         @param parent reference to the parent widget
         @type QWidget
         """
@@ -65,11 +70,19 @@
         self.pythonExecPicker.setDefaultDirectory(
             sys.executable.replace("w.exe", ".exe"))
         
+        self.execPathEdit.setToolTip(self.tr(
+            "Enter the executable search path to be prepended to the PATH"
+            " environment variable. Use '{0}' as the separator.").format(
+            os.pathsep)
+        )
+        
         self.nameEdit.setText(venvName)
         self.targetDirectoryPicker.setText(venvDirectory)
         self.pythonExecPicker.setText(venvInterpreter)
         self.variantComboBox.setCurrentIndex(3 - venvVariant)
         self.globalCheckBox.setChecked(isGlobal)
+        self.anacondaCheckBox.setChecked(isConda)
+        self.execPathEdit.setText(execPath)
         
         self.__updateOk()
     
@@ -150,14 +163,40 @@
         """
         self.__updateOk()
     
+    @pyqtSlot(bool)
+    def on_anacondaCheckBox_clicked(self, checked):
+        """
+        Private slot handling a user click on this check box.
+        
+        @param checked state of the check box
+        @type bool
+        """
+        if checked and not bool(self.execPathEdit.text()):
+            # prepopulate the execPathEdit widget
+            if Utilities.isWindowsPlatform():
+                self.execPathEdit.setText(os.pathsep.join([
+                    self.targetDirectoryPicker.text(),
+                    os.path.join(self.targetDirectoryPicker.text(),
+                                 "Scripts"),
+                    os.path.join(self.targetDirectoryPicker.text(),
+                                 "Library", "bin"),
+                ]))
+            else:
+                self.execPathEdit.setText(
+                    os.path.join(self.targetDirectoryPicker.text(),
+                                 "bin"),
+                )
+    
     def getData(self):
         """
         Public method to retrieve the entered data.
         
         @return tuple containing the logical name, the directory, the
-            interpreter of the virtual environment, the Python variant
-            and a flag indicating a global environment
-        @rtype tuple of (str, str, str, int, bool)
+            interpreter of the virtual environment, the Python variant,
+            a flag indicating a global environment, a flag indicating an
+            Anaconda environment and a string to be prepended to the PATH
+            environment variable
+        @rtype tuple of (str, str, str, int, bool,bool, str)
         """
         return (
             self.nameEdit.text(),
@@ -165,4 +204,6 @@
             self.pythonExecPicker.text(),
             3 - self.variantComboBox.currentIndex(),
             self.globalCheckBox.isChecked(),
+            self.anacondaCheckBox.isChecked(),
+            self.execPathEdit.text(),
         )

--- a/VirtualEnv/VirtualenvAddEditDialog.ui	Sat Nov 03 14:16:43 2018 +0100
+++ b/VirtualEnv/VirtualenvAddEditDialog.ui	Sat Nov 03 14:19:21 2018 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>186</height>
+    <height>220</height>
    </rect>
   </property>
   <property name="sizeGripEnabled">
@@ -22,7 +22,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QLineEdit" name="nameEdit">
+    <widget class="E5ClearableLineEdit" name="nameEdit">
      <property name="toolTip">
       <string>Enter a unique name for the virtual environment</string>
      </property>
@@ -74,7 +74,14 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Python Variant:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
     <widget class="QComboBox" name="variantComboBox">
      <property name="toolTip">
       <string>Select the Python variant</string>
@@ -92,16 +99,53 @@
     </widget>
    </item>
    <item row="4" column="0" colspan="2">
-    <widget class="QCheckBox" name="globalCheckBox">
-     <property name="toolTip">
-      <string>Select to denote a global environment (i.e. no virtual environment directory to be given)</string>
-     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QCheckBox" name="globalCheckBox">
+       <property name="toolTip">
+        <string>Select to denote a global environment (i.e. no virtual environment directory to be given)</string>
+       </property>
+       <property name="text">
+        <string>Global Environment</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="anacondaCheckBox">
+       <property name="toolTip">
+        <string>Select, if this is an Anaconda environment</string>
+       </property>
+       <property name="text">
+        <string>Anaconda Environment</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>Global Environment</string>
+      <string>PATH Prefix:</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2">
+   <item row="5" column="1">
+    <widget class="E5ClearableLineEdit" name="execPathEdit"/>
+   </item>
+   <item row="6" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -120,6 +164,11 @@
    <header>E5Gui/E5PathPicker.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>E5ClearableLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>E5Gui/E5LineEdit.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>nameEdit</tabstop>

--- a/VirtualEnv/VirtualenvManager.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/VirtualEnv/VirtualenvManager.py	Sat Nov 03 14:19:21 2018 +0100
@@ -59,6 +59,9 @@
         #   interpreter:    the path of the Python interpreter
         #   variant:        Python variant (2 or 3)
         #   is_global:      a flag indicating a global environment
+        #   is_conda:       a flag indicating an Anaconda environment
+        #   exec_path:      a string to be prefixed to the PATH environment
+        #                   setting
         #
         for venvName in environments:
             interpreter = environments[venvName]["interpreter"]
@@ -66,6 +69,10 @@
                 environment = environments[venvName]
                 if "is_global" not in environment:
                     environment["is_global"] = environment["path"] == ""
+                if "is_conda" not in environment:
+                    environment["is_conda"] = False
+                if "exec_path" not in environment:
+                    environment["exec_path"] = ""
                 self.__virtualEnvironments[venvName] = environment
         
         # check, if the interpreter used to run eric is in the environments
@@ -83,6 +90,8 @@
                 "interpreter": defaultPy,
                 "variant": sys.version_info[0],
                 "is_global": True,
+                "is_conda": False,
+                "exec_path": "",
             }
         
         self.__saveSettings()
@@ -150,7 +159,8 @@
             dia.exec_()
     
     def addVirtualEnv(self, venvName, venvDirectory, venvInterpreter="",
-                      venvVariant=3, isGlobal=False):
+                      venvVariant=3, isGlobal=False, isConda=False,
+                      execPath=""):
         """
         Public method to add a virtual environment.
         
@@ -164,6 +174,11 @@
         @type int
         @param isGlobal flag indicating a global environment
         @type bool
+        @param isConda flag indicating an Anaconda virtual environment
+        @type bool
+        @param execPath search path string to be prepended to the PATH
+            environment variable
+        @type str
         """
         if venvName in self.__virtualEnvironments:
             ok = E5MessageBox.yesNo(
@@ -190,6 +205,8 @@
                 "interpreter": venvInterpreter,
                 "variant": venvVariant,
                 "is_global": isGlobal,
+                "is_conda": isConda,
+                "exec_path": execPath,
             }
             
             self.__saveSettings()
@@ -198,7 +215,7 @@
                 self.__virtualenvManagerDialog.refresh()
     
     def setVirtualEnv(self, venvName, venvDirectory, venvInterpreter,
-                      venvVariant, isGlobal):
+                      venvVariant, isGlobal, isConda, execPath):
         """
         Public method to change a virtual environment.
         
@@ -212,6 +229,11 @@
         @type int
         @param isGlobal flag indicating a global environment
         @type bool
+        @param isConda flag indicating an Anaconda virtual environment
+        @type bool
+        @param execPath search path string to be prepended to the PATH
+            environment variable
+        @type str
         """
         if venvName not in self.__virtualEnvironments:
             E5MessageBox.yesNo(
@@ -228,6 +250,8 @@
             "interpreter": venvInterpreter,
             "variant": venvVariant,
             "is_global": isGlobal,
+            "is_conda": isConda,
+            "exec_path": execPath,
         }
         
         self.__saveSettings()
@@ -236,7 +260,8 @@
             self.__virtualenvManagerDialog.refresh()
     
     def renameVirtualEnv(self, oldVenvName, venvName, venvDirectory,
-                         venvInterpreter, venvVariant, isGlobal):
+                         venvInterpreter, venvVariant, isGlobal, isConda,
+                         execPath):
         """
         Public method to substitute a virtual environment entry with a new
         name.
@@ -253,6 +278,11 @@
         @type int
         @param isGlobal flag indicating a global environment
         @type bool
+        @param isConda flag indicating an Anaconda virtual environment
+        @type bool
+        @param execPath search path string to be prepended to the PATH
+            environment variable
+        @type str
         """
         if oldVenvName not in self.__virtualEnvironments:
             E5MessageBox.yesNo(
@@ -266,7 +296,7 @@
         
         del self.__virtualEnvironments[oldVenvName]
         self.addVirtualEnv(venvName, venvDirectory, venvInterpreter,
-                           venvVariant, isGlobal)
+                           venvVariant, isGlobal, isConda, execPath)
     
     def deleteVirtualEnvs(self, venvNames):
         """
@@ -468,4 +498,36 @@
         @return flag indicating a global environment
         @rtype bool
         """
-        return self.__virtualEnvironments[venvName]["is_global"]
+        if venvName in self.__virtualEnvironments:
+            return self.__virtualEnvironments[venvName]["is_global"]
+        else:
+            return False
+    
+    def isCondaEnvironment(self, venvName):
+        """
+        Public method to test, if a given environment is an Anaconda
+        environment.
+        
+        @param venvName logical name of the virtual environment
+        @type str
+        @return flag indicating an Anaconda environment
+        @rtype bool
+        """
+        if venvName in self.__virtualEnvironments:
+            return self.__virtualEnvironments[venvName]["is_conda"]
+        else:
+            return False
+    
+    def getVirtualenvExecPath(self, venvName):
+        """
+        Public method to get the search path prefix of a virtual environment.
+        
+        @param venvName logical name for the virtual environment
+        @type str
+        @return search path prefix
+        @rtype str
+        """
+        if venvName in self.__virtualEnvironments:
+            return self.__virtualEnvironments[venvName]["exec_path"]
+        else:
+            return ""

--- a/VirtualEnv/VirtualenvManagerDialog.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/VirtualEnv/VirtualenvManagerDialog.py	Sat Nov 03 14:19:21 2018 +0100
@@ -23,6 +23,8 @@
     """
     PythonVariantRole = Qt.UserRole
     IsGlobalRole = Qt.UserRole + 1
+    IsCondaRole = Qt.UserRole + 2
+    ExecPathRole = Qt.UserRole + 3
     
     def __init__(self, manager, parent=None):
         """
@@ -90,11 +92,11 @@
         dlg = VirtualenvAddEditDialog(self.__manager)
         if dlg.exec_() == QDialog.Accepted:
             (venvName, venvDirectory, venvInterpreter, venvVariant,
-             isGlobal) = dlg.getData()
+             isGlobal, isConda, execPath) = dlg.getData()
             
             self.__manager.addVirtualEnv(venvName, venvDirectory,
                                          venvInterpreter, venvVariant,
-                                         isGlobal)
+                                         isGlobal, isConda, execPath)
     
     @pyqtSlot()
     def on_newButton_clicked(self):
@@ -116,19 +118,21 @@
             self.__manager, selectedItem.text(0),
             selectedItem.text(1), selectedItem.text(2),
             selectedItem.data(0, VirtualenvManagerDialog.PythonVariantRole),
-            selectedItem.data(0, VirtualenvManagerDialog.IsGlobalRole)
+            selectedItem.data(0, VirtualenvManagerDialog.IsGlobalRole),
+            selectedItem.data(0, VirtualenvManagerDialog.IsCondaRole),
+            selectedItem.data(0, VirtualenvManagerDialog.ExecPathRole),
         )
         if dlg.exec_() == QDialog.Accepted:
             (venvName, venvDirectory, venvInterpreter, venvVariant,
-             isGlobal) = dlg.getData()
+             isGlobal, isConda, execPath) = dlg.getData()
             if venvName != oldVenvName:
                 self.__manager.renameVirtualEnv(
                     oldVenvName, venvName, venvDirectory, venvInterpreter,
-                    venvVariant, isGlobal)
+                    venvVariant, isGlobal, isConda, execPath)
             else:
                 self.__manager.setVirtualEnv(
                     venvName, venvDirectory, venvInterpreter, venvVariant,
-                    isGlobal)
+                    isGlobal, isConda, execPath)
     
     @pyqtSlot()
     def on_removeButton_clicked(self):
@@ -226,6 +230,24 @@
                         environments[venvName]["variant"])
             itm.setData(0, VirtualenvManagerDialog.IsGlobalRole,
                         environments[venvName]["is_global"])
+            itm.setData(0, VirtualenvManagerDialog.IsCondaRole,
+                        environments[venvName]["is_conda"])
+            itm.setData(0, VirtualenvManagerDialog.ExecPathRole,
+                        environments[venvName]["exec_path"])
+            
+            # show global environments with bold font
+            if environments[venvName]["is_global"]:
+                font = itm.font(0)
+                font.setBold(True)
+                for column in range(itm.columnCount()):
+                    itm.setFont(column, font)
+            
+            # show Anaconda environments with italic font
+            elif environments[venvName]["is_conda"]:
+                font = itm.font(0)
+                font.setItalic(True)
+                for column in range(itm.columnCount()):
+                    itm.setFont(column, font)
         
         self.__resizeSections()
     

--- a/changelog	Sat Nov 03 14:16:43 2018 +0100
+++ b/changelog	Sat Nov 03 14:19:21 2018 +0100
@@ -11,6 +11,12 @@
 - Shell, ShellWindow
   -- added the capability to search for a regular expression with QScintilla's
      POSIX mode
+  -- changed the start menu to give a list of defined environments
+  -- added capability to start the shell for the environment defined by the
+     open project
+- VirtualEnv Manager
+  -- extended the environment definition by a flag indicating an Anaconda
+     environment and a string to be prepended to the PATH environment variable
 
 Version 18.11:
 - bug fixes

--- a/i18n/eric6_cs.ts	Sat Nov 03 14:16:43 2018 +0100
+++ b/i18n/eric6_cs.ts	Sat Nov 03 14:19:21 2018 +0100
@@ -5594,24 +5594,24 @@
 <context>
     <name>DebugServer</name>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="180"/>
+        <location filename="../Debugger/DebugServer.py" line="181"/>
         <source>created</source>
         <comment>must be same as in EditWatchpointDialog</comment>
         <translation>vytvořeno</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="182"/>
+        <location filename="../Debugger/DebugServer.py" line="183"/>
         <source>changed</source>
         <comment>must be same as in EditWatchpointDialog</comment>
         <translation>změněno</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="781"/>
+        <location filename="../Debugger/DebugServer.py" line="782"/>
         <source>Connection from illegal host</source>
         <translation>Spojení z ilegálního hosta</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1502"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>
 Not connected
 </source>
@@ -5620,39 +5620,39 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="781"/>
+        <location filename="../Debugger/DebugServer.py" line="782"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Pokus o spojení z ilegálního hosta &lt;b&gt;{0}&lt;/b&gt;. Přijmout toto spojení?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1686"/>
+        <location filename="../Debugger/DebugServer.py" line="1696"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1700"/>
+        <location filename="../Debugger/DebugServer.py" line="1710"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="330"/>
+        <location filename="../Debugger/DebugServer.py" line="331"/>
         <source>Register Debugger Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="330"/>
+        <location filename="../Debugger/DebugServer.py" line="331"/>
         <source>&lt;p&gt;The debugger interface &lt;b&gt;{0}&lt;/b&gt; has already been registered. Ignoring this request.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1327"/>
+        <location filename="../Debugger/DebugServer.py" line="1328"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Spustit debuger</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1327"/>
+        <location filename="../Debugger/DebugServer.py" line="1328"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6887,27 +6887,27 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="402"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="428"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Spustit debuger</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="894"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="923"/>
         <source>Parent Process</source>
         <translation type="unfinished">Rodičovský proces</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="895"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="924"/>
         <source>Child process</source>
         <translation type="unfinished">Dětský proces</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="896"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="925"/>
         <source>Client forking</source>
         <translation type="unfinished">Větvení klienta</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="896"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="925"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished">Pokračovat ve fork větvi.</translation>
     </message>
@@ -6917,22 +6917,22 @@
         <translation type="obsolete">&lt;p&gt;Python2 interpreter není nakonfigurován.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="402"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="428"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Debugovací backend nelze spustit.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="941"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="970"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="941"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="970"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="319"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="337"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51563,17 +51563,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1709"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1736"/>
+        <location filename="../Preferences/__init__.py" line="1737"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1736"/>
+        <location filename="../Preferences/__init__.py" line="1737"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54265,17 +54265,17 @@
         <translation>Vyhledávat nové rekurzivně</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="221"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="240"/>
         <source>Recent Projects</source>
         <translation>Poslední projekty</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="227"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="246"/>
         <source>Number of recent projects:</source>
         <translation>Počet nedávných projektů:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="234"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="253"/>
         <source>Enter the number of recent projects to remember</source>
         <translation>Zadejte počet nedávných projektů k zapamatování</translation>
     </message>
@@ -54310,27 +54310,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="266"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="285"/>
         <source>Tasks</source>
         <translation type="unfinished">Úlohy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="272"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="291"/>
         <source>Select to save the project tasks automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="275"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="294"/>
         <source>Save tasks automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="282"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="301"/>
         <source>Select to rescan the project tasks when a project is opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="285"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="304"/>
         <source>Rescan tasks upon opening</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54344,6 +54344,21 @@
         <source>execute make</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="221"/>
+        <source>Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="227"/>
+        <source>Select to restart the shell with the interpreter of the project (if configured)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="230"/>
+        <source>Restart Shell for project upon opening</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectProtocolsBrowser</name>
@@ -62113,32 +62128,32 @@
 <context>
     <name>SearchReplaceWidget</name>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="794"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="793"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; nebyl nalezen.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="925"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="924"/>
         <source>Replaced {0} occurrences.</source>
         <translation>Nahrazeno {0} výskytů.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="930"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="929"/>
         <source>Nothing replaced because &apos;{0}&apos; was not found.</source>
         <translation>Nebylo nic nahrazeno, protože &apos;{0}&apos; nebyl nalezen.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="151"/>
         <source>Find Next</source>
         <translation>Najít další</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="159"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="158"/>
         <source>Find Prev</source>
         <translation>Najít předchozí</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="59"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="58"/>
         <source>&lt;b&gt;Find and Replace&lt;/b&gt;
 &lt;p&gt;This dialog is used to find some text and replace it with another text.
 By checking the various checkboxes, the search can be made more specific.
@@ -62148,7 +62163,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="70"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="69"/>
         <source>&lt;b&gt;Find&lt;/b&gt;
 &lt;p&gt;This dialog is used to find some text. By checking the various checkboxes,
 the search can be made more specific. The search string might be a regular
@@ -62157,22 +62172,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="167"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="166"/>
         <source>Replace and Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="177"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="176"/>
         <source>Replace Occurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="187"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="186"/>
         <source>Replace All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="81"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="80"/>
         <source>&lt;table border=&quot;0&quot;&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;.&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Matches any character&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;(&lt;/code&gt;&lt;/td&gt;&lt;td&gt;This marks the start of a region for tagging a
@@ -63140,57 +63155,57 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="142"/>
+        <location filename="../QScintilla/Shell.py" line="155"/>
         <source>Shell - Passive</source>
         <translation>Shell - pasivní</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="144"/>
+        <location filename="../QScintilla/Shell.py" line="157"/>
         <source>Shell</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="254"/>
+        <location filename="../QScintilla/Shell.py" line="267"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Pasivní &gt;&gt;&gt; </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="270"/>
-        <source>Start</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="283"/>
+        <source>Start</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="284"/>
+        <location filename="../QScintilla/Shell.py" line="297"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="290"/>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Clear</source>
         <translation>Vyčistit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="291"/>
+        <location filename="../QScintilla/Shell.py" line="304"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="292"/>
+        <location filename="../QScintilla/Shell.py" line="305"/>
         <source>Reset and Clear</source>
         <translation>Reset a vyčistit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="788"/>
+        <location filename="../QScintilla/Shell.py" line="819"/>
         <source>No.</source>
         <translation>Č.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2059"/>
+        <location filename="../QScintilla/Shell.py" line="2081"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
@@ -63200,63 +63215,63 @@
         <translation type="obsolete">&lt;b&gt;Okno Shellu&lt;/b&gt;&lt;p&gt;Toto je jednoduchý interpretr běžící v okně. Interpretr běží nezávisle na programu, který je debugován. To znamená, že můžete spustit jakýkoliv příkaz i během debugování.&lt;/p&gt;&lt;p&gt;Během vkládání příkazu můžete použít kurzorové klávesy. Je zde také historie příkazů, která se aktivuje klávesami up a down. Stisknutím up nebo down klávesy po textu, který byl zadán se spustí inkrementální vyhledávání.&lt;/p&gt;&lt;p&gt;Shell má několik speciálních příkazů. &apos;reset&apos; zabije shell a spustí nový. &apos;clear&apos; vyčistí obsah shell okna.&apos;start&apos; se používá pro přepnutí shell jazyka a musí za ním následovat jméno podporovaného jazyka. Podporované jazyky jsou zobrazeny v seznamu, který vrací příkaz &apos;languages&apos;. Tyto příkazy (kromě &apos;languages&apos;) jsou také dostupné přes kontextové menu.&lt;/p&gt;&lt;p&gt;Stisknutím tab klávesy po nějakém vloženém textu se zobrazí seznam s nabídkou možných zakončení výrazu. Odpovídající zadání pak může být vybráno z tohoto listu. Pokud je existuje jen jedna možnost, je vložena automaticky.&lt;/p&gt;&lt;p&gt;Dokud se program neukončí, je shell v pasivním módu dostupný jen pokud se debugovaný program připojil k IDE. To je oznámeno odlišným promptem a dále v názvu titulku okna.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="815"/>
         <source>Passive Debug Mode</source>
         <translation>Pasivní debug mód</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="275"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="276"/>
+        <location filename="../QScintilla/Shell.py" line="289"/>
         <source>Select entry</source>
         <translation>Vybrat vstupy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="277"/>
+        <location filename="../QScintilla/Shell.py" line="290"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="722"/>
+        <location filename="../QScintilla/Shell.py" line="747"/>
         <source>Select History</source>
         <translation>Vybrat historii</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="722"/>
+        <location filename="../QScintilla/Shell.py" line="747"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Vybrat vstup historie pro vykonání (nejaktuálnější zobrazen poslední).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="786"/>
+        <location filename="../QScintilla/Shell.py" line="816"/>
         <source>
 Not connected</source>
         <translation>Nepřipojen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="297"/>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Configure...</source>
         <translation>Konfigurovat...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="282"/>
+        <location filename="../QScintilla/Shell.py" line="295"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="790"/>
+        <location filename="../QScintilla/Shell.py" line="821"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} na {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="964"/>
+        <location filename="../QScintilla/Shell.py" line="997"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="972"/>
+        <location filename="../QScintilla/Shell.py" line="1005"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
@@ -63264,20 +63279,20 @@
         <location filename="../QScintilla/Shell.py" line="1743"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
-        <translation>Shell jazyk &quot;{0}&quot; není podporován.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="2059"/>
+        <translation type="obsolete">Shell jazyk &quot;{0}&quot; není podporován.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="2081"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="288"/>
+        <location filename="../QScintilla/Shell.py" line="301"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="833"/>
+        <location filename="../QScintilla/Shell.py" line="866"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -63285,40 +63300,45 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="866"/>
+        <location filename="../QScintilla/Shell.py" line="899"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="876"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="868"/>
+        <location filename="../QScintilla/Shell.py" line="901"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
+        <location filename="../QScintilla/Shell.py" line="924"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="170"/>
+        <location filename="../QScintilla/Shell.py" line="183"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1945"/>
+        <source>Project</source>
+        <translation type="unfinished">Projekt</translation>
+    </message>
 </context>
 <context>
     <name>ShellHistoryDialog</name>
@@ -63783,37 +63803,37 @@
         <translation type="unfinished">&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1192"/>
         <source>File</source>
         <translation type="unfinished">Soubor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1201"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1210"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1208"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1216"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1214"/>
         <source>View</source>
         <translation type="unfinished">Pohled</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1223"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1221"/>
         <source>History</source>
         <translation type="unfinished">Historie</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1229"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1227"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1250"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1248"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -82862,28 +82882,53 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="58"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/>
         <source>Virtualenv Target Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="68"/>
         <source>Python Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="97"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="106"/>
         <source>Select to denote a global environment (i.e. no virtual environment directory to be given)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="100"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/>
         <source>Global Environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="87"/>
+        <source>Select the Python variant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/>
+        <source>Select, if this is an Anaconda environment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/>
+        <source>Anaconda Environment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/>
+        <source>PATH Prefix:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="73"/>
+        <source>Enter the executable search path to be prepended to the PATH environment variable. Use &apos;{0}&apos; as the separator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="80"/>
-        <source>Select the Python variant</source>
+        <source>Python Variant:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -83306,52 +83351,52 @@
 <context>
     <name>VirtualenvManager</name>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="170"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="186"/>
         <source>Add Virtual Environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="170"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="186"/>
         <source>A virtual environment named &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be replaced?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="218"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="241"/>
         <source>Change Virtual Environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="259"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="290"/>
         <source>A virtual environment named &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="259"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="290"/>
         <source>Rename Virtual Environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="368"/>
         <source>{0} - {1}</source>
         <translation type="unfinished">{0} - {1}</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="288"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="319"/>
         <source>Delete Virtual Environments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="288"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="319"/>
         <source>Do you really want to delete these virtual environments?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="342"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="373"/>
         <source>Remove Virtual Environments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="342"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="373"/>
         <source>Do you really want to remove these virtual environments?</source>
         <translation type="unfinished"></translation>
     </message>

Binary file i18n/eric6_de.qm has changed

--- a/i18n/eric6_de.ts	Sat Nov 03 14:16:43 2018 +0100
+++ b/i18n/eric6_de.ts	Sat Nov 03 14:19:21 2018 +0100
@@ -5471,24 +5471,24 @@
 <context>
     <name>DebugServer</name>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="180"/>
+        <location filename="../Debugger/DebugServer.py" line="181"/>
         <source>created</source>
         <comment>must be same as in EditWatchpointDialog</comment>
         <translation>erzeugt</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="182"/>
+        <location filename="../Debugger/DebugServer.py" line="183"/>
         <source>changed</source>
         <comment>must be same as in EditWatchpointDialog</comment>
         <translation>geändert</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="781"/>
+        <location filename="../Debugger/DebugServer.py" line="782"/>
         <source>Connection from illegal host</source>
         <translation>Verbindung von ungültigem Rechner</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1502"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>
 Not connected
 </source>
@@ -5497,41 +5497,41 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="781"/>
+        <location filename="../Debugger/DebugServer.py" line="782"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Es wurde versucht, eine Verbindung von dem nicht zugelassenen Rechner &lt;b&gt;{0}&lt;/b&gt; aufzubauen. Soll die Verbindung angenommen werden?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1686"/>
+        <location filename="../Debugger/DebugServer.py" line="1696"/>
         <source>Passive debug connection received
 </source>
         <translation>Verbindung für passives Debuggen empfangen
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1700"/>
+        <location filename="../Debugger/DebugServer.py" line="1710"/>
         <source>Passive debug connection closed
 </source>
         <translation>Verbindung für passives Debuggen geschlossen
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="330"/>
+        <location filename="../Debugger/DebugServer.py" line="331"/>
         <source>Register Debugger Interface</source>
         <translation>Debuggerschnittstelle registrieren</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="330"/>
+        <location filename="../Debugger/DebugServer.py" line="331"/>
         <source>&lt;p&gt;The debugger interface &lt;b&gt;{0}&lt;/b&gt; has already been registered. Ignoring this request.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Debuggerschnittstelle &lt;b&gt;{0}&lt;/b&gt; wurde bereits registriert. Anfrage wird ignoriert.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1327"/>
+        <location filename="../Debugger/DebugServer.py" line="1328"/>
         <source>Start Debugger</source>
         <translation>Debugger starten</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1327"/>
+        <location filename="../Debugger/DebugServer.py" line="1328"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Debuggertyp &lt;b&gt;{0}&lt;/b&gt; wird nicht unterstützt oder ist nicht konfiguriert.&lt;/p&gt;</translation>
     </message>
@@ -6660,47 +6660,47 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="402"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="428"/>
         <source>Start Debugger</source>
         <translation>Debugger starten</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="402"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="428"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Debugger konnte nicht gestartet werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="894"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="923"/>
         <source>Parent Process</source>
         <translation>Vaterprozess</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="895"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="924"/>
         <source>Child process</source>
         <translation>Kindprozess</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="896"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="925"/>
         <source>Client forking</source>
         <translation>Client forkt</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="896"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="925"/>
         <source>Select the fork branch to follow.</source>
         <translation>Wähle den zu folgenden Forkpfad.</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="941"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="970"/>
         <source>Debug Protocol Error</source>
         <translation>Fehler im Debugprotokoll</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="941"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="970"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die vom Debugger empfangene Antwort konnte nicht dekodiert werden. Bitte berichten sie diesen Fehler zusammen mit den empfangenen Daten an die eric Bugs Emailadresse.&lt;/p&gt;&lt;p&gt;Fehler: {0}&lt;/p&gt;&lt;p&gt;Daten:&lt;br/&gt;{0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="319"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="337"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Keine geeignete {0} Umgebung konfiguriert.&lt;/p&gt;</translation>
     </message>
@@ -50301,17 +50301,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1709"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1736"/>
+        <location filename="../Preferences/__init__.py" line="1737"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1736"/>
+        <location filename="../Preferences/__init__.py" line="1737"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
@@ -52952,17 +52952,17 @@
         <translation>Rekursive Suche nach neuen Dateien</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="221"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="240"/>
         <source>Recent Projects</source>
         <translation>Zuletzt geöffnete Projekte</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="227"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="246"/>
         <source>Number of recent projects:</source>
         <translation>Anzahl zuletzt geöffneter Projekte:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="234"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="253"/>
         <source>Enter the number of recent projects to remember</source>
         <translation>Gib die zu merkende Anzahl an zuletzt geöffneter Projekte ein</translation>
     </message>
@@ -52997,27 +52997,27 @@
         <translation>Python-Variante über Projektsprache bestimmen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="266"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="285"/>
         <source>Tasks</source>
         <translation>Aufgaben</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="272"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="291"/>
         <source>Select to save the project tasks automatically</source>
         <translation>Auswählen, um Projektaufgaben automatisch zu speichern</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="275"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="294"/>
         <source>Save tasks automatically</source>
         <translation>Aufgaben automatisch speichern</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="282"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="301"/>
         <source>Select to rescan the project tasks when a project is opened</source>
         <translation>Auswählen, um nach dem Öffnen eines Projektes Projektaufgaben neu zu ermitteln</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="285"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="304"/>
         <source>Rescan tasks upon opening</source>
         <translation>Aufgaben beim Öffnen regenerieren</translation>
     </message>
@@ -53031,6 +53031,21 @@
         <source>execute make</source>
         <translation>make ausführen</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="221"/>
+        <source>Shell</source>
+        <translation>Shell</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="227"/>
+        <source>Select to restart the shell with the interpreter of the project (if configured)</source>
+        <translation>Auswählen, um die Shell mit dem für das Projekt festgelegten Interpreter zu starten</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="230"/>
+        <source>Restart Shell for project upon opening</source>
+        <translation>Shell neu starten, wenn Projekt geöffnet wird</translation>
+    </message>
 </context>
 <context>
     <name>ProjectProtocolsBrowser</name>
@@ -60788,32 +60803,32 @@
 <context>
     <name>SearchReplaceWidget</name>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="794"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="793"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>„{0}“ wurde nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="925"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="924"/>
         <source>Replaced {0} occurrences.</source>
         <translation>{0} Vorkommen ersetzt.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="930"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="929"/>
         <source>Nothing replaced because &apos;{0}&apos; was not found.</source>
         <translation>Es wurde nichts ersetzt, da „{0}“ nicht gefunden wurde.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="151"/>
         <source>Find Next</source>
         <translation>Weitersuchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="159"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="158"/>
         <source>Find Prev</source>
         <translation>Rückwärtssuchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="59"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="58"/>
         <source>&lt;b&gt;Find and Replace&lt;/b&gt;
 &lt;p&gt;This dialog is used to find some text and replace it with another text.
 By checking the various checkboxes, the search can be made more specific.
@@ -60827,7 +60842,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="70"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="69"/>
         <source>&lt;b&gt;Find&lt;/b&gt;
 &lt;p&gt;This dialog is used to find some text. By checking the various checkboxes,
 the search can be made more specific. The search string might be a regular
@@ -60840,22 +60855,22 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="167"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="166"/>
         <source>Replace and Search</source>
         <translation>Ersetzen und Suchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="177"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="176"/>
         <source>Replace Occurrence</source>
         <translation>Fundstelle ersetzen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="187"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="186"/>
         <source>Replace All</source>
         <translation>Alle ersetzen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="81"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="80"/>
         <source>&lt;table border=&quot;0&quot;&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;.&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Matches any character&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;(&lt;/code&gt;&lt;/td&gt;&lt;td&gt;This marks the start of a region for tagging a
@@ -61849,141 +61864,134 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="144"/>
+        <location filename="../QScintilla/Shell.py" line="157"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="290"/>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="291"/>
+        <location filename="../QScintilla/Shell.py" line="304"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="142"/>
+        <location filename="../QScintilla/Shell.py" line="155"/>
         <source>Shell - Passive</source>
         <translation>Shell – Passiv</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="254"/>
+        <location filename="../QScintilla/Shell.py" line="267"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Passiv &gt;&gt;&gt; </translation>
     </message>
     <message>
+        <location filename="../QScintilla/Shell.py" line="296"/>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="297"/>
+        <source>Paste</source>
+        <translation>Einfügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="305"/>
+        <source>Reset and Clear</source>
+        <translation>Zurücksetzen und Löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="2081"/>
+        <source>Drop Error</source>
+        <translation>Drop Fehler</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="819"/>
+        <source>No.</source>
+        <translation>Nr.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="2081"/>
+        <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Shell.py" line="283"/>
-        <source>Copy</source>
-        <translation>Kopieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="284"/>
-        <source>Paste</source>
-        <translation>Einfügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="292"/>
-        <source>Reset and Clear</source>
-        <translation>Zurücksetzen und Löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="2059"/>
-        <source>Drop Error</source>
-        <translation>Drop Fehler</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="788"/>
-        <source>No.</source>
-        <translation>Nr.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="2059"/>
-        <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="270"/>
         <source>Start</source>
         <translation>Starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="790"/>
+        <location filename="../QScintilla/Shell.py" line="821"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} auf {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1743"/>
-        <source>Shell language &quot;{0}&quot; not supported.
-</source>
-        <translation>Die Shell-Sprache „{0}“ wird nicht unterstützt.
-</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="815"/>
         <source>Passive Debug Mode</source>
         <translation>Passiver Debugmodus</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="964"/>
+        <location filename="../QScintilla/Shell.py" line="997"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="972"/>
+        <location filename="../QScintilla/Shell.py" line="1005"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="275"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="276"/>
+        <location filename="../QScintilla/Shell.py" line="289"/>
         <source>Select entry</source>
         <translation>Eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="277"/>
+        <location filename="../QScintilla/Shell.py" line="290"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="722"/>
+        <location filename="../QScintilla/Shell.py" line="747"/>
         <source>Select History</source>
         <translation>Eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="722"/>
+        <location filename="../QScintilla/Shell.py" line="747"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Wähle den auszuführenden Eintrag aus (aktuellster ist zuletzt dargestellt).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="786"/>
+        <location filename="../QScintilla/Shell.py" line="816"/>
         <source>
 Not connected</source>
         <translation>
 nicht verbunden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="297"/>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Configure...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="282"/>
+        <location filename="../QScintilla/Shell.py" line="295"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="288"/>
+        <location filename="../QScintilla/Shell.py" line="301"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="833"/>
+        <location filename="../QScintilla/Shell.py" line="866"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -61994,14 +62002,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="866"/>
+        <location filename="../QScintilla/Shell.py" line="899"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Unspezifischer Syntaxfehler.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
+        <location filename="../QScintilla/Shell.py" line="876"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -62010,29 +62018,34 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="868"/>
+        <location filename="../QScintilla/Shell.py" line="901"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Syntaxfehler &quot;{1}&quot; in Datei {0}, Zeile {2}, Zeichen {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
+        <location filename="../QScintilla/Shell.py" line="924"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Signal &quot;{0}&quot; in der Datei {1} in Zeile {2} erzeugt.
 Funktion: {3}({4})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter unter Halten der Strg-Taste bedient wird. Dies kann über die Shell Seite des Konfigurationsdialoges auf Cursortasten Hoch und Runter alleine umgeschaltet werden. Eine inkrementelle Suche wird gestartet, indem diese Tasten nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. &quot;quit&quot; beendet die Anwendung. Diese Befehle (Ausnahme „languages“) sind auch über die Anwendungsmenüs verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="170"/>
+        <location filename="../QScintilla/Shell.py" line="183"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Dies ist ein Interpreter Ihres Systems. Es ist derjenige, der benutzt wird, um das zu untersuchende Programm auszuführen. Dies bedeutet, dass Sie jedes Pythonkommando ausführen können, auch während Ihr Programm läuft.&lt;/p&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter unter Halten der Strg-Taste bedient wird. Dies kann über die Shell Seite des Konfigurationsdialoges auf Cursortasten Hoch und Runter alleine umgeschaltet werden. Eine inkrementelle Suche wird gestartet, indem diese Tasten nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. Diese Befehle (Ausnahme „languages“) sind auch über das Kontextmenu verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;&lt;p&gt;Im passiven Debugmodus ist die Shell nur dann verfügbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1945"/>
+        <source>Project</source>
+        <translation>Projekt</translation>
+    </message>
 </context>
 <context>
     <name>ShellHistoryDialog</name>
@@ -62498,37 +62511,37 @@
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1192"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1201"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1210"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1208"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1216"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1214"/>
         <source>View</source>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1223"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1221"/>
         <source>History</source>
         <translation>Chronik</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1229"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1227"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1250"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1248"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Dieser Teil der Statusleiste ermöglicht das Zoomen der Shell.&lt;/p&gt;</translation>
     </message>
@@ -81259,29 +81272,54 @@
         <translation>Gib den Python Interpreter der virtuellen Umgebung ein</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="58"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/>
         <source>Virtualenv Target Directory</source>
         <translation>Zielverzeichnis der virtullen Umgebung</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="68"/>
         <source>Python Interpreter</source>
         <translation>Python Interpreter</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="97"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="106"/>
         <source>Select to denote a global environment (i.e. no virtual environment directory to be given)</source>
         <translation>Auswählen, um eine globale Umgebung anzudeuten (d.h. es wird keine Verzeichnis für die virtuelle Umgebung angegeben)</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="100"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/>
         <source>Global Environment</source>
         <translation>Globale Umgebung</translation>
     </message>
     <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="87"/>
+        <source>Select the Python variant</source>
+        <translation>Wähle die Pythonvariante</translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/>
+        <source>Select, if this is an Anaconda environment</source>
+        <translation>Auswählen, wenn dies eine Anaconda Umgebung ist</translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/>
+        <source>Anaconda Environment</source>
+        <translation>Anaconda Umgebung</translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/>
+        <source>PATH Prefix:</source>
+        <translation>PATH Präfix:</translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="73"/>
+        <source>Enter the executable search path to be prepended to the PATH environment variable. Use &apos;{0}&apos; as the separator.</source>
+        <translation>Gib den Suchpfad ein, der der PATH Umgebungsvariablen vorangestellt werden soll. Verwende &apos;{0}&apos; als Trenner.</translation>
+    </message>
+    <message>
         <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="80"/>
-        <source>Select the Python variant</source>
-        <translation>Wähle die Pythonvariante</translation>
+        <source>Python Variant:</source>
+        <translation>Python-Variante:</translation>
     </message>
 </context>
 <context>
@@ -81725,52 +81763,52 @@
 <context>
     <name>VirtualenvManager</name>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="170"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="186"/>
         <source>Add Virtual Environment</source>
         <translation>Virtuelle Umgebung hinzufügen</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="170"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="186"/>
         <source>A virtual environment named &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be replaced?</source>
         <translation>Eine virtuelle Umgebung mit Namen &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Soll sie ersetzt werden?</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="218"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="241"/>
         <source>Change Virtual Environment</source>
         <translation>Virtuelle Umgebung ändern</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="259"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="290"/>
         <source>A virtual environment named &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting!</source>
         <translation>Eine virtuelle Umgebung mit Namen &lt;b&gt;{0}&lt;/b&gt; existiert nicht. Abbruch!</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="259"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="290"/>
         <source>Rename Virtual Environment</source>
         <translation>Virtuelle Umgebung umbenennen</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="368"/>
         <source>{0} - {1}</source>
         <translation>{0} – {1}</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="288"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="319"/>
         <source>Delete Virtual Environments</source>
         <translation>Virtuelle Umgebung löschen</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="288"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="319"/>
         <source>Do you really want to delete these virtual environments?</source>
         <translation>Sollen diese virtuellen Umgebungen wirklich gelöscht werden?</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="342"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="373"/>
         <source>Remove Virtual Environments</source>
         <translation>Virtuelle Umgebung entfernen</translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="342"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="373"/>
         <source>Do you really want to remove these virtual environments?</source>
         <translation>Sollen diese virtuellen Umgebungen wirklich entfernt werden?</translation>
     </message>

--- a/i18n/eric6_empty.ts	Sat Nov 03 14:16:43 2018 +0100
+++ b/i18n/eric6_empty.ts	Sat Nov 03 14:19:21 2018 +0100
@@ -5420,63 +5420,63 @@
 <context>
     <name>DebugServer</name>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="180"/>
+        <location filename="../Debugger/DebugServer.py" line="181"/>
         <source>created</source>
         <comment>must be same as in EditWatchpointDialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="182"/>
+        <location filename="../Debugger/DebugServer.py" line="183"/>
         <source>changed</source>
         <comment>must be same as in EditWatchpointDialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="330"/>
+        <location filename="../Debugger/DebugServer.py" line="331"/>
         <source>Register Debugger Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="330"/>
+        <location filename="../Debugger/DebugServer.py" line="331"/>
         <source>&lt;p&gt;The debugger interface &lt;b&gt;{0}&lt;/b&gt; has already been registered. Ignoring this request.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="781"/>
+        <location filename="../Debugger/DebugServer.py" line="782"/>
         <source>Connection from illegal host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="781"/>
+        <location filename="../Debugger/DebugServer.py" line="782"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1502"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>
 Not connected
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1686"/>
+        <location filename="../Debugger/DebugServer.py" line="1696"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1700"/>
+        <location filename="../Debugger/DebugServer.py" line="1710"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1327"/>
+        <location filename="../Debugger/DebugServer.py" line="1328"/>
         <source>Start Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1327"/>
+        <location filename="../Debugger/DebugServer.py" line="1328"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6592,47 +6592,47 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="402"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="428"/>
         <source>Start Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="402"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="428"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="894"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="923"/>
         <source>Parent Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="895"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="924"/>
         <source>Child process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="896"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="925"/>
         <source>Client forking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="896"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="925"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="941"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="970"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="941"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="970"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="319"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="337"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50053,17 +50053,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1708"/>
+        <location filename="../Preferences/__init__.py" line="1709"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1736"/>
+        <location filename="../Preferences/__init__.py" line="1737"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1736"/>
+        <location filename="../Preferences/__init__.py" line="1737"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52733,42 +52733,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="221"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="240"/>
         <source>Recent Projects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="227"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="246"/>
         <source>Number of recent projects:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="234"/>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="253"/>
         <source>Enter the number of recent projects to remember</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="266"/>
-        <source>Tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="272"/>
-        <source>Select to save the project tasks automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="275"/>
-        <source>Save tasks automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="282"/>
-        <source>Select to rescan the project tasks when a project is opened</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="285"/>
+        <source>Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="291"/>
+        <source>Select to save the project tasks automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="294"/>
+        <source>Save tasks automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="301"/>
+        <source>Select to rescan the project tasks when a project is opened</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="304"/>
         <source>Rescan tasks upon opening</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52782,6 +52782,21 @@
         <source>execute make</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="221"/>
+        <source>Shell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="227"/>
+        <source>Select to restart the shell with the interpreter of the project (if configured)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/ProjectPage.ui" line="230"/>
+        <source>Restart Shell for project upon opening</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectProtocolsBrowser</name>
@@ -60343,7 +60358,7 @@
 <context>
     <name>SearchReplaceWidget</name>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="59"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="58"/>
         <source>&lt;b&gt;Find and Replace&lt;/b&gt;
 &lt;p&gt;This dialog is used to find some text and replace it with another text.
 By checking the various checkboxes, the search can be made more specific.
@@ -60353,7 +60368,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="70"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="69"/>
         <source>&lt;b&gt;Find&lt;/b&gt;
 &lt;p&gt;This dialog is used to find some text. By checking the various checkboxes,
 the search can be made more specific. The search string might be a regular
@@ -60362,47 +60377,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="151"/>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="159"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="158"/>
         <source>Find Prev</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="794"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="793"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="925"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="924"/>
         <source>Replaced {0} occurrences.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="930"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="929"/>
         <source>Nothing replaced because &apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="167"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="166"/>
         <source>Replace and Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="177"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="176"/>
         <source>Replace Occurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="187"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="186"/>
         <source>Replace All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/SearchReplaceWidget.py" line="81"/>
+        <location filename="../QScintilla/SearchReplaceWidget.py" line="80"/>
         <source>&lt;table border=&quot;0&quot;&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;.&lt;/code&gt;&lt;/td&gt;&lt;td&gt;Matches any character&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;code&gt;(&lt;/code&gt;&lt;/td&gt;&lt;td&gt;This marks the start of a region for tagging a
@@ -61365,180 +61380,179 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="142"/>
+        <location filename="../QScintilla/Shell.py" line="155"/>
         <source>Shell - Passive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="144"/>
+        <location filename="../QScintilla/Shell.py" line="157"/>
         <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="254"/>
+        <location filename="../QScintilla/Shell.py" line="267"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="270"/>
+        <location filename="../QScintilla/Shell.py" line="283"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="275"/>
+        <location filename="../QScintilla/Shell.py" line="288"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="276"/>
+        <location filename="../QScintilla/Shell.py" line="289"/>
         <source>Select entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="277"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="290"/>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="282"/>
+        <location filename="../QScintilla/Shell.py" line="295"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="283"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="284"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="288"/>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="291"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="292"/>
-        <source>Reset and Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="297"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="304"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="305"/>
+        <source>Reset and Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="722"/>
+        <location filename="../QScintilla/Shell.py" line="747"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="722"/>
+        <location filename="../QScintilla/Shell.py" line="747"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="815"/>
         <source>Passive Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="786"/>
+        <location filename="../QScintilla/Shell.py" line="816"/>
         <source>
 Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="788"/>
+        <location filename="../QScintilla/Shell.py" line="819"/>
         <source>No.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="790"/>
+        <location filename="../QScintilla/Shell.py" line="821"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="833"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-File: {2}, Line: {3}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="843"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="866"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+File: {2}, Line: {3}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="876"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="899"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="868"/>
+        <location filename="../QScintilla/Shell.py" line="901"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
+        <location filename="../QScintilla/Shell.py" line="924"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="964"/>
+        <location filename="../QScintilla/Shell.py" line="997"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="972"/>
+        <location filename="../QScintilla/Shell.py" line="1005"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1743"/>
-        <source>Shell language &quot;{0}&quot; not supported.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="2059"/>
+        <location filename="../QScintilla/Shell.py" line="2081"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2059"/>
+        <location filename="../QScintilla/Shell.py" line="2081"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="147"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. &apos;quit&apos; is used to exit the application.These commands (except &apos;languages&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="170"/>
+        <location filename="../QScintilla/Shell.py" line="183"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;reset&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the &apos;languages&apos; command. These commands (except &apos;languages&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1945"/>
+        <source>Project</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShellHistoryDialog</name>
@@ -62003,37 +62017,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1194"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1192"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1203"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1201"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1210"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1208"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1216"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1214"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1223"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1221"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1229"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1227"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/ShellWindow.py" line="1250"/>
+        <location filename="../QScintilla/ShellWindow.py" line="1248"/>
         <source>&lt;p&gt;This part of the status bar allows zooming the  shell.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -80619,28 +80633,53 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="58"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/>
         <source>Virtualenv Target Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="63"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="68"/>
         <source>Python Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="97"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="106"/>
         <source>Select to denote a global environment (i.e. no virtual environment directory to be given)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="100"/>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/>
         <source>Global Environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="87"/>
+        <source>Select the Python variant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/>
+        <source>Select, if this is an Anaconda environment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/>
+        <source>Anaconda Environment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/>
+        <source>PATH Prefix:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../VirtualEnv/VirtualenvAddEditDialog.py" line="73"/>
+        <source>Enter the executable search path to be prepended to the PATH environment variable. Use &apos;{0}&apos; as the separator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="80"/>
-        <source>Select the Python variant</source>
+        <source>Python Variant:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81063,52 +81102,52 @@
 <context>
     <name>VirtualenvManager</name>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="170"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="186"/>
         <source>Add Virtual Environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="170"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="186"/>
         <source>A virtual environment named &lt;b&gt;{0}&lt;/b&gt; exists already. Shall it be replaced?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="218"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="241"/>
         <source>Change Virtual Environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="259"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="290"/>
         <source>A virtual environment named &lt;b&gt;{0}&lt;/b&gt; does not exist. Aborting!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="259"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="290"/>
         <source>Rename Virtual Environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="337"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="368"/>
         <source>{0} - {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="288"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="319"/>
         <source>Delete Virtual Environments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="288"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="319"/>
         <source>Do you really want to delete these virtual environments?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="342"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="373"/>
         <source>Remove Virtual Environments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../VirtualEnv/VirtualenvManager.py" line="342"/>
+        <location filename="../VirtualEnv/VirtualenvManager.py" line="373"/>
         <source>Do you really want to remove these virtual environments?</source>
         <translation type="unfinished"></translation>
     </message>