eric: comparison Debugger/StartDialog.py

-:27ce01e44a5f
+:4bdc6503df81
 from __future__ import unicode_literals
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QComboBox, QInputDialog
 from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui.E5Application import e5App
 import Preferences
 class StartDialog(QDialog):
 It implements a dialog that is used to start an
 application for debugging. It asks the user to enter
 the commandline parameters, the working directory and
 whether exception reporting should be disabled.
 """
-def __init__(self, caption, interpreterList, argvList, wdList, envList,
+def __init__(self, caption, lastUsedVenvName, argvList, wdList, envList,
 exceptions,
 parent=None, dialogType=0, modfuncList=None,
 tracePython=False, autoClearShell=True, autoContinue=True,
 autoFork=False, forkChild=False):
 """
 Constructor
-@param caption the caption to be displayed (string)
+@param caption the caption to be displayed
-@param interpreterList list of interpreters (list of string)
+@type str
-@param argvList history list of commandline arguments (list of strings)
+@param lastUsedVenvName name of the most recently used virtual
-@param wdList history list of working directories (list of strings)
+environment
-@param envList history list of environment settings (list of strings)
+@type str
-@param exceptions exception reporting flag (boolean)
+@param argvList history list of command line arguments
-@param parent parent widget of this dialog (QWidget)
+@type list of str
+@param wdList history list of working directories
+@type list of str
+@param envList history list of environment parameter settings
+@type list of str
+@param exceptions exception reporting flag
+@type bool
+@param parent parent widget of this dialog
+@type QWidget
 @param dialogType type of the start dialog
 <ul>
 <li>0 = start debug dialog</li>
 <li>1 = start run dialog</li>
 <li>2 = start coverage dialog</li>
 <li>3 = start profile dialog</li>
 </ul>
+@type int (0 to 3)
 @keyparam modfuncList history list of module functions
-(list of strings)
+@type list of str
 @keyparam tracePython flag indicating if the Python library should
-be traced as well (boolean)
+be traced as well
+@type bool
 @keyparam autoClearShell flag indicating, that the interpreter window
-should be cleared automatically (boolean)
+should be cleared automatically
+@type bool
 @keyparam autoContinue flag indicating, that the debugger should not
-stop at the first executable line (boolean)
+stop at the first executable line
-@keyparam autoFork flag indicating the automatic fork mode (boolean)
+@type bool
+@keyparam autoFork flag indicating the automatic fork mode
+@type bool
 @keyparam forkChild flag indicating to debug the child after forking
-(boolean)
+@type bool
 """
 super(StartDialog, self).__init__(parent)
 self.setModal(True)
 self.dialogType = dialogType
 elif dialogType == 3:
 from .Ui_StartProfileDialog import Ui_StartProfileDialog
 self.ui = Ui_StartProfileDialog()
 self.ui.setupUi(self)
-self.ui.interpreterPicker.setMode(E5PathPickerModes.OpenFileMode)
+self.ui.venvComboBox.addItem("")
-self.ui.interpreterPicker.setInsertPolicy(QComboBox.InsertAtTop)
+self.ui.venvComboBox.addItems(
-self.ui.interpreterPicker.setSizeAdjustPolicy(
+sorted(e5App().getObject("VirtualEnvManager")
-QComboBox.AdjustToMinimumContentsLength)
+.getVirtualenvNames()))
 self.ui.workdirPicker.setMode(E5PathPickerModes.DirectoryMode)
 self.ui.workdirPicker.setDefaultDirectory(
 Preferences.getMultiProject("Workspace"))
 self.ui.workdirPicker.setInsertPolicy(QComboBox.InsertAtTop)
 self.ui.exceptionCheckBox.setChecked(exceptions)
 self.ui.clearShellCheckBox.setChecked(autoClearShell)
 self.ui.consoleCheckBox.setEnabled(
 Preferences.getDebugger("ConsoleDbgCommand") != "")
 self.ui.consoleCheckBox.setChecked(False)
-self.ui.interpreterPicker.clear()
+venvIndex = max(0, self.ui.venvComboBox.findText(lastUsedVenvName))
-self.ui.interpreterPicker.addItems(interpreterList)
+self.ui.venvComboBox.setCurrentIndex(venvIndex)
-if len(interpreterList) > 0:
-self.ui.interpreterPicker.setCurrentIndex(0)
 if dialogType == 0:        # start debug dialog
 self.ui.tracePythonCheckBox.setChecked(tracePython)
 self.ui.tracePythonCheckBox.show()
 self.ui.autoContinueCheckBox.setChecked(autoContinue)
 clear interpreter flag (boolean) and run in console flag (boolean)
 """
 cmdLine = self.ui.cmdlineCombo.currentText()
 workdir = self.ui.workdirPicker.currentText()
 environment = self.ui.environmentCombo.currentText()
-interpreter = self.ui.interpreterPicker.currentText()
+venvName = self.ui.venvComboBox.currentText()
-return (interpreter,
+return (venvName,
 cmdLine,
 workdir,
 environment,
 self.ui.exceptionCheckBox.isChecked(),
 self.ui.clearShellCheckBox.isChecked(),
 self.__historiesModified = False    # clear catches it all
 cmdLine = self.ui.cmdlineCombo.currentText()
 workdir = self.ui.workdirPicker.currentText()
 environment = self.ui.environmentCombo.currentText()
-interpreter = self.ui.interpreterPicker.currentText()
 self.ui.cmdlineCombo.clear()
 self.ui.workdirPicker.clear()
 self.ui.environmentCombo.clear()
-self.ui.interpreterPicker.clear()
 self.ui.cmdlineCombo.addItem(cmdLine)
 self.ui.workdirPicker.addItem(workdir)
 self.ui.environmentCombo.addItem(environment)
-self.ui.interpreterPicker.addItem(interpreter)
 def __editHistory(self):
 """
 Private slot to edit a history list.
 """
 histories = [
 "",
-self.tr("Interpreter"),
 self.tr("Command Line"),
 self.tr("Working Directory"),
 self.tr("Environment"),
 ]
 historyKind, ok = QInputDialog.getItem(
 self.tr("Select the history list to be edited:"),
 histories,
 0, False)
 if ok and historyKind:
 historiesIndex = histories.index(historyKind)
-if historiesIndex == 3:
+if historiesIndex == 2:
 history = self.ui.workdirPicker.getPathItems()
-elif historiesIndex == 1:
-history = self.ui.interpreterPicker.getPathItems()
 else:
 history = []
-if historiesIndex == 2:
+if historiesIndex == 1:
 combo = self.ui.cmdlineCombo
 else:
 combo = self.ui.environmentCombo
 for index in range(combo.count()):
 history.append(combo.itemText(index))
 from .StartHistoryEditDialog import StartHistoryEditDialog
 dlg = StartHistoryEditDialog(history, self)
 if dlg.exec_() == QDialog.Accepted:
 history = dlg.getHistory()
 if historiesIndex == 1:
-combo = self.ui.interpreterPicker
+combo = self.ui.cmdlineCombo
 elif historiesIndex == 2:
-combo = self.ui.cmdlineCombo
-elif historiesIndex == 3:
 combo = self.ui.workdirPicker
 else:
 combo = self.ui.environmentCombo
 combo.clear()
 combo.addItems(history)
 [self.ui.cmdlineCombo.itemText(index) for index in range(
 self.ui.cmdlineCombo.count())],
 self.ui.workdirPicker.getPathItems(),
 [self.ui.environmentCombo.itemText(index) for index in range(
 self.ui.environmentCombo.count())],
-self.ui.interpreterPicker.getPathItems(),
 )
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.

Mercurial Repositories > eric / file comparison

comparison: Debugger/StartDialog.py

Debugger/StartDialog.py