eric: comparison eric7/Debugger/StartDialog.py

-:2175f268ad9b
+:569623270e29
 exceptions,
 parent=None, dialogType=0, modfuncList=None,
 tracePython=False, autoClearShell=True, autoContinue=True,
 enableMultiprocess=False, multiprocessNoDebugHistory=None,
 configOverride=None,
-forProject=False, lastUsedScriptName="", scriptsList=None):
+forProject=False, scriptName="", scriptsList=None):
 """
 Constructor
 @param caption the caption to be displayed
 @type str
 data
 @type dict
 @param forProject flag indicating to get the parameters for a
 run/debug/... action for a project
 @type bool
-@param lastUsedScriptName name of the most recently used script
+@param scriptName name of the script
 @type str
 @param scriptsList history list of script names
 @type list of str
 """
 super().__init__(parent)
 self.ui.workdirPicker.setInsertPolicy(
 QComboBox.InsertPolicy.InsertAtTop)
 self.ui.workdirPicker.setSizeAdjustPolicy(
 QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
-# TODO: extend these History actions
 self.clearButton = self.ui.buttonBox.addButton(
 self.tr("Clear Histories"), QDialogButtonBox.ButtonRole.ActionRole)
 self.editButton = self.ui.buttonBox.addButton(
 self.tr("Edit History"), QDialogButtonBox.ButtonRole.ActionRole)
 venvIndex = max(0, self.ui.venvComboBox.findText(lastUsedVenvName))
 self.ui.venvComboBox.setCurrentIndex(venvIndex)
 self.ui.globalOverrideGroup.setChecked(configOverride["enable"])
 self.ui.redirectCheckBox.setChecked(configOverride["redirect"])
+self.ui.scriptnamePicker.addItems(scriptsList)
+self.ui.scriptnamePicker.setText(scriptName)
 if dialogType == 0:        # start debug dialog
 enableMultiprocessGlobal = Preferences.getDebugger(
 "MultiProcessEnabled")
 self.ui.tracePythonCheckBox.setChecked(tracePython)
 self.ui.tracePythonCheckBox.show()
 def getData(self):
 """
 Public method to retrieve the data entered into this dialog.
-@return a tuple of interpreter, argv, workdir, environment,
+@return a tuple of virtual environment, script name, argv, workdir,
-exceptions flag, clear interpreter flag and run in console flag
+environment, exceptions flag, clear interpreter flag and run in
-@rtype tuple of (str, str, str, str, bool, bool, bool)
+console flag
+@rtype tuple of (str, str, str, str, str, bool, bool, bool)
 """
 cmdLine = self.ui.cmdlineCombo.currentText()
 workdir = self.ui.workdirPicker.currentText(toNative=False)
 environment = self.ui.environmentCombo.currentText()
 venvName = self.ui.venvComboBox.currentText()
+scriptName = (
+self.ui.scriptnamePicker.currentText()
+if self.ui.scriptnamePicker.isEnabled() else
+""
+)
 return (venvName,
+scriptName,
 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()
+scriptName = self.ui.scriptnamePicker.currentText()
 self.ui.cmdlineCombo.clear()
 self.ui.workdirPicker.clear()
 self.ui.environmentCombo.clear()
+self.ui.scriptnamePicker.clear()
 self.ui.cmdlineCombo.addItem(cmdLine)
 self.ui.workdirPicker.addItem(workdir)
 self.ui.environmentCombo.addItem(environment)
+self.ui.scriptnamePicker.addItem("")
+self.ui.scriptnamePicker.setCurrentText(scriptName)
 if self.dialogType == 0:
 noDebugList = self.ui.multiprocessNoDebugCombo.currentText()
 self.ui.multiprocessNoDebugCombo.clear()
 self.ui.multiprocessNoDebugCombo.addItem(noDebugList)
 """
 Private slot to edit a history list.
 """
 histories = [
 "",
+self.tr("Script Name"),
 self.tr("Command Line"),
 self.tr("Working Directory"),
 self.tr("Environment"),
 ]
 combos = [
 None,
+self.ui.scriptnamePicker,
 self.ui.cmdlineCombo,
 self.ui.workdirPicker,
 self.ui.environmentCombo,
 ]
 if self.dialogType == 0:
 histories,
 0, False)
 if ok and historyKind:
 history = []
 historiesIndex = histories.index(historyKind)
-if historiesIndex == 2:
+if historiesIndex == 1:
+history = self.ui.scriptnamePicker.getPathItems()
+elif historiesIndex == 3:
 history = self.ui.workdirPicker.getPathItems()
 else:
 combo = combos[historiesIndex]
 if combo:
 for index in range(combo.count()):
 def getHistories(self):
 """
 Public method to get the lists of histories.
-@return tuple containing the histories of command line arguments,
+@return tuple containing the histories of script names, command line
-working directories, environment settings and no debug programs
+arguments, working directories, environment settings and no debug
-lists
+programs lists
-@rtype tuple of four list of str
+@rtype tuple of five list of str
 """
 noDebugHistory = (
 [
 self.ui.multiprocessNoDebugCombo.itemText(index)
 for index in range(self.ui.multiprocessNoDebugCombo.count())
 ]
 if self.dialogType == 0 else
 None
 )
 return (
+self.ui.scriptnamePicker.getPathNames(),
 [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())],

Mercurial Repositories > eric / file comparison

comparison: eric7/Debugger/StartDialog.py

eric7/Debugger/StartDialog.py