diff -r 40a11619ee77 -r ea60ea85067a APIs/Python3/eric6.api --- 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()