eric: comparison eric6/Debugger/DebugUI.py

-:e01ae92db699
+:31965986ecd1
 """
 Module implementing the debugger UI.
 """
 import os
+import copy
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, Qt
 from PyQt5.QtGui import QKeySequence
 from PyQt5.QtWidgets import QMenu, QToolBar, QApplication, QDialog
 Preferences.Prefs.settings.value(
 'DebugInfo/EnableMultiprocess', False))
 self.multiprocessNoDebugHistory = Preferences.toList(
 Preferences.Prefs.settings.value(
 'DebugInfo/MultiprocessNoDebugHistory'))
+self.overrideGlobalConfig = {
+"enable": Preferences.toBool(Preferences.Prefs.settings.value(
+'DebugInfo/OverrideGlobal', False)),
+"redirect": Preferences.toBool(Preferences.Prefs.settings.value(
+'DebugInfo/RedirectStdinStdout', True)),
+}
 self.lastDebuggedFile = None
 self.lastStartAction = 0    # 0=None, 1=Script, 2=Project
 self.clientType = ""
 self.lastAction = -1
 self.runAct = E5Action(
 self.tr('Run Script'),
 UI.PixmapCache.getIcon("runScript"),
 self.tr('&Run Script...'),
-Qt.Key_F2, 0, self, 'dbg_run_script')
+Qt.Key.Key_F2, 0, self, 'dbg_run_script')
 self.runAct.setStatusTip(self.tr('Run the current Script'))
 self.runAct.setWhatsThis(self.tr(
 """<b>Run Script</b>"""
 """<p>Set the command line arguments and run the script outside"""
 """ the debugger. If the file has unsaved changes it may be"""
 self.actions.append(self.runAct)
 self.runProjectAct = E5Action(
 self.tr('Run Project'),
 UI.PixmapCache.getIcon("runProject"),
-self.tr('Run &Project...'), Qt.SHIFT + Qt.Key_F2, 0, self,
+self.tr('Run &Project...'),
-'dbg_run_project')
+Qt.Modifier.SHIFT + Qt.Key.Key_F2,
+0, self, 'dbg_run_project')
 self.runProjectAct.setStatusTip(self.tr('Run the current Project'))
 self.runProjectAct.setWhatsThis(self.tr(
 """<b>Run Project</b>"""
 """<p>Set the command line arguments and run the current project"""
 """ outside the debugger."""
 self.actions.append(self.profileProjectAct)
 self.debugAct = E5Action(
 self.tr('Debug Script'),
 UI.PixmapCache.getIcon("debugScript"),
-self.tr('&Debug Script...'), Qt.Key_F5, 0, self,
+self.tr('&Debug Script...'), Qt.Key.Key_F5, 0, self,
 'dbg_debug_script')
 self.debugAct.setStatusTip(self.tr('Debug the current Script'))
 self.debugAct.setWhatsThis(self.tr(
 """<b>Debug Script</b>"""
 """<p>Set the command line arguments and set the current line"""
 self.actions.append(self.debugAct)
 self.debugProjectAct = E5Action(
 self.tr('Debug Project'),
 UI.PixmapCache.getIcon("debugProject"),
-self.tr('Debug &Project...'), Qt.SHIFT + Qt.Key_F5, 0, self,
+self.tr('Debug &Project...'),
-'dbg_debug_project')
+Qt.Modifier.SHIFT + Qt.Key.Key_F5,
+0, self, 'dbg_debug_project')
 self.debugProjectAct.setStatusTip(self.tr(
 'Debug the current Project'))
 self.debugProjectAct.setWhatsThis(self.tr(
 """<b>Debug Project</b>"""
 """<p>Set the command line arguments and set the current line"""
 self.actions.append(self.debugProjectAct)
 self.restartAct = E5Action(
 self.tr('Restart'),
 UI.PixmapCache.getIcon("debugRestart"),
-self.tr('Restart'), Qt.Key_F4, 0, self, 'dbg_restart_script')
+self.tr('Restart'), Qt.Key.Key_F4, 0, self, 'dbg_restart_script')
 self.restartAct.setStatusTip(self.tr(
 'Restart the last debugged script'))
 self.restartAct.setWhatsThis(self.tr(
 """<b>Restart</b>"""
 """<p>Set the command line arguments and set the current line"""
 self.actions.append(self.restartAct)
 self.stopAct = E5Action(
 self.tr('Stop'),
 UI.PixmapCache.getIcon("stopScript"),
-self.tr('Stop'), Qt.SHIFT + Qt.Key_F10, 0,
+self.tr('Stop'), Qt.Modifier.SHIFT + Qt.Key.Key_F10, 0,
 self, 'dbg_stop_script')
 self.stopAct.setStatusTip(self.tr("""Stop the running script."""))
 self.stopAct.setWhatsThis(self.tr(
 """<b>Stop</b>"""
 """<p>This stops the script running in the debugger backend.</p>"""
 self.debugActGrp = createActionGroup(self)
 act = E5Action(
 self.tr('Continue'),
 UI.PixmapCache.getIcon("continue"),
-self.tr('&Continue'), Qt.Key_F6, 0,
+self.tr('&Continue'), Qt.Key.Key_F6, 0,
 self.debugActGrp, 'dbg_continue')
 act.setStatusTip(
 self.tr('Continue running the program from the current line'))
 act.setWhatsThis(self.tr(
 """<b>Continue</b>"""
 self.actions.append(act)
 act = E5Action(
 self.tr('Continue to Cursor'),
 UI.PixmapCache.getIcon("continueToCursor"),
-self.tr('Continue &To Cursor'), Qt.SHIFT + Qt.Key_F6, 0,
+self.tr('Continue &To Cursor'),
-self.debugActGrp, 'dbg_continue_to_cursor')
+Qt.Modifier.SHIFT + Qt.Key.Key_F6,
+0, self.debugActGrp, 'dbg_continue_to_cursor')
 act.setStatusTip(self.tr(
 """Continue running the program from the"""
 """ current line to the current cursor position"""))
 act.setWhatsThis(self.tr(
 """<b>Continue To Cursor</b>"""
 self.actions.append(act)
 act = E5Action(
 self.tr('Continue Until'),
 UI.PixmapCache.getIcon("continueUntil"),
-self.tr('Continue &Until'), Qt.CTRL + Qt.Key_F6, 0,
+self.tr('Continue &Until'), Qt.Modifier.CTRL + Qt.Key.Key_F6, 0,
 self.debugActGrp, 'dbg_continue_until')
 act.setStatusTip(self.tr(
 """Continue running the program from the current line to the"""
 """ current cursor position or until leaving the current frame"""))
 act.setWhatsThis(self.tr(
 self.actions.append(act)
 act = E5Action(
 self.tr('Move Instruction Pointer to Cursor'),
 UI.PixmapCache.getIcon("moveInstructionPointer"),
-self.tr('&Jump To Cursor'), Qt.Key_F12, 0,
+self.tr('&Jump To Cursor'), Qt.Key.Key_F12, 0,
 self.debugActGrp, 'dbg_jump_to_cursor')
 act.setStatusTip(self.tr(
 """Skip the code from the"""
 """ current line to the current cursor position"""))
 act.setWhatsThis(self.tr(
 self.actions.append(act)
 act = E5Action(
 self.tr('Single Step'),
 UI.PixmapCache.getIcon("step"),
-self.tr('Sin&gle Step'), Qt.Key_F7, 0,
+self.tr('Sin&gle Step'), Qt.Key.Key_F7, 0,
 self.debugActGrp, 'dbg_single_step')
 act.setStatusTip(self.tr('Execute a single Python statement'))
 act.setWhatsThis(self.tr(
 """<b>Single Step</b>"""
 """<p>Execute a single Python statement. If the statement"""
 self.actions.append(act)
 act = E5Action(
 self.tr('Step Over'),
 UI.PixmapCache.getIcon("stepOver"),
-self.tr('Step &Over'), Qt.Key_F8, 0,
+self.tr('Step &Over'), Qt.Key.Key_F8, 0,
 self.debugActGrp, 'dbg_step_over')
 act.setStatusTip(self.tr(
 """Execute a single Python statement staying"""
 """ in the current frame"""))
 act.setWhatsThis(self.tr(
 self.actions.append(act)
 act = E5Action(
 self.tr('Step Out'),
 UI.PixmapCache.getIcon("stepOut"),
-self.tr('Step Ou&t'), Qt.Key_F9, 0,
+self.tr('Step Ou&t'), Qt.Key.Key_F9, 0,
 self.debugActGrp, 'dbg_step_out')
 act.setStatusTip(self.tr(
 """Execute Python statements until leaving"""
 """ the current frame"""))
 act.setWhatsThis(self.tr(
 self.actions.append(act)
 act = E5Action(
 self.tr('Stop'),
 UI.PixmapCache.getIcon("stepQuit"),
-self.tr('&Stop'), Qt.Key_F10, 0,
+self.tr('&Stop'), Qt.Key.Key_F10, 0,
 self.debugActGrp, 'dbg_stop')
 act.setStatusTip(self.tr('Stop debugging'))
 act.setWhatsThis(self.tr(
 """<b>Stop</b>"""
 """<p>Stop the running debugging session.</p>"""
 Preferences.Prefs.settings.setValue(
 'DebugInfo/EnableMultiprocess', self.enableMultiprocess)
 Preferences.Prefs.settings.setValue(
 'DebugInfo/MultiprocessNoDebugHistory',
 self.multiprocessNoDebugHistory)
+Preferences.Prefs.settings.setValue(
+'DebugInfo/OverrideGlobal',
+self.overrideGlobalConfig["enable"])
+Preferences.Prefs.settings.setValue(
+'DebugInfo/RedirectStdinStdout',
+self.overrideGlobalConfig["redirect"])
 def shutdownServer(self):
 """
 Public method to shut down the debug server.
 from .EditBreakpointDialog import EditBreakpointDialog
 dlg = EditBreakpointDialog(
 (fn, line), (cond, temp, enabled, count),
 [], self.ui, modal=True)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 cond, temp, enabled, count = dlg.getData()
 model.setBreakPointByIndex(index, fn, line,
 (cond, temp, enabled, count))
 def __clientWatchConditionError(self, cond, debuggerId):
 cond, special, temp, enabled, count = wp[:5]
 from .EditWatchpointDialog import EditWatchpointDialog
 dlg = EditWatchpointDialog(
 (cond, temp, enabled, count, special), self.ui)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 cond, temp, enabled, count, special = dlg.getData()
 # check for duplicates
 idx = model.getWatchPointIndex(cond, special)
 duplicate = (idx.isValid() and
 """
 from .VariablesFilterDialog import VariablesFilterDialog
 dlg = VariablesFilterDialog(self.ui, 'Filter Dialog', True)
 dlg.setSelection(self.__localsVarFilterList,
 self.__globalsVarFilterList)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 self.__localsVarFilterList, self.__globalsVarFilterList = (
 dlg.getSelection()
 )
 self.debugViewer.setVariablesFilter(
 self.__globalsVarFilterList, self.__localsVarFilterList)
 """
 Private slot for displaying the exception filter dialog.
 """
 from .ExceptionsFilterDialog import ExceptionsFilterDialog
 dlg = ExceptionsFilterDialog(self.excList, ignore=False)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 self.excList = dlg.getExceptionsList()[:]   # keep a copy
 def __configureIgnoredExceptions(self):
 """
 Private slot for displaying the ignored exceptions dialog.
 """
 from .ExceptionsFilterDialog import ExceptionsFilterDialog
 dlg = ExceptionsFilterDialog(self.excIgnoreList, ignore=True)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 self.excIgnoreList = dlg.getExceptionsList()[:]   # keep a copy
 def __toggleBreakpoint(self):
 """
 Private slot to handle the 'Set/Reset breakpoint' action.
 else:
 cap = self.tr("Coverage of Script")
 dlg = StartDialog(
 cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
 self.envHistory, self.exceptions, self.ui, 2,
-autoClearShell=self.autoClearShell)
+autoClearShell=self.autoClearShell,
-if dlg.exec() == QDialog.Accepted:
+configOverride=self.overrideGlobalConfig)
+if dlg.exec() == QDialog.DialogCode.Accepted:
 (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
 console) = dlg.getData()
+configOverride = dlg.getGlobalOverrideData()
 eraseCoverage = dlg.getCoverageData()
 if runProject:
 fn = self.project.getMainScript(True)
 if fn is None:
 doNotStart = True
 # save the info for later use
 self.project.setDbgInfo(
 lastUsedVenvName, argv, wd, env, exceptions, self.excList,
-self.excIgnoreList, clearShell
+self.excIgnoreList, clearShell,
+configOverride=configOverride
 )
 self.lastStartAction = 6
 self.clientType = self.project.getProjectLanguage()
 else:
 self.autoClearShell = clearShell
 # Save the run in console flag
 self.runInConsole = console
+# Save the global config override data
+self.overrideGlobalConfig = copy.deepcopy(configOverride)
 # Hide all error highlights
 self.viewmanager.unhighlight()
 if not doNotStart:
 if runProject and self.project.getProjectType() in [
 # Ask the client to open the new program.
 self.debugServer.remoteCoverage(
 lastUsedVenvName, fn, argv, wd, env,
 autoClearShell=self.autoClearShell, erase=eraseCoverage,
 forProject=runProject, runInConsole=console,
-clientType=self.clientType)
+clientType=self.clientType,
+configOverride=self.overrideGlobalConfig)
 self.stopAct.setEnabled(True)
 if dlg.clearHistories():
 self.setArgvHistory("", clearHistories=True)
 else:
 cap = self.tr("Profile of Script")
 dlg = StartDialog(
 cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
 self.envHistory, self.exceptions, self.ui, 3,
-autoClearShell=self.autoClearShell)
+autoClearShell=self.autoClearShell,
-if dlg.exec() == QDialog.Accepted:
+configOverride=self.overrideGlobalConfig)
+if dlg.exec() == QDialog.DialogCode.Accepted:
 (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
 console) = dlg.getData()
+configOverride = dlg.getGlobalOverrideData()
 eraseTimings = dlg.getProfilingData()
 if runProject:
 fn = self.project.getMainScript(True)
 if fn is None:
 doNotStart = True
 # save the info for later use
 self.project.setDbgInfo(
 lastUsedVenvName, argv, wd, env, exceptions, self.excList,
-self.excIgnoreList, clearShell
+self.excIgnoreList, clearShell,
+configOverride=configOverride
 )
 self.lastStartAction = 8
 self.clientType = self.project.getProjectLanguage()
 else:
 self.autoClearShell = clearShell
 # Save the run in console flag
 self.runInConsole = console
+# Save the global config override data
+self.overrideGlobalConfig = copy.deepcopy(configOverride)
 # Hide all error highlights
 self.viewmanager.unhighlight()
 if not doNotStart:
 if runProject and self.project.getProjectType() in [
 # Ask the client to open the new program.
 self.debugServer.remoteProfile(
 lastUsedVenvName, fn, argv, wd, env,
 autoClearShell=self.autoClearShell, erase=eraseTimings,
 forProject=runProject, runInConsole=console,
-clientType=self.clientType)
+clientType=self.clientType,
+configOverride=self.overrideGlobalConfig)
 self.stopAct.setEnabled(True)
 if dlg.clearHistories():
 self.setArgvHistory("", clearHistories=True)
 else:
 cap = self.tr("Run Script")
 dlg = StartDialog(
 cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
 self.envHistory, self.exceptions, self.ui, 1,
-autoClearShell=self.autoClearShell)
+autoClearShell=self.autoClearShell,
-if dlg.exec() == QDialog.Accepted:
+configOverride=self.overrideGlobalConfig)
+if dlg.exec() == QDialog.DialogCode.Accepted:
 (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
 console) = dlg.getData()
+configOverride = dlg.getGlobalOverrideData()
 if runProject:
 fn = self.project.getMainScript(True)
 if fn is None:
 E5MessageBox.critical(
 doNotStart = True
 # save the info for later use
 self.project.setDbgInfo(
 lastUsedVenvName, argv, wd, env, exceptions, self.excList,
-self.excIgnoreList, clearShell
+self.excIgnoreList, clearShell,
+configOverride=configOverride
 )
 self.lastStartAction = 4
 self.clientType = self.project.getProjectLanguage()
 else:
 self.autoClearShell = clearShell
 # Save the run in console flag
 self.runInConsole = console
+# Save the global config override data
+self.overrideGlobalConfig = copy.deepcopy(configOverride)
 # Hide all error highlights
 self.viewmanager.unhighlight()
 if not doNotStart:
 if runProject and self.project.getProjectType() in [
 # Ask the client to open the new program.
 self.debugServer.remoteRun(
 lastUsedVenvName, fn, argv, wd, env,
 autoClearShell=self.autoClearShell, forProject=runProject,
-runInConsole=console, clientType=self.clientType)
+runInConsole=console, clientType=self.clientType,
+configOverride=self.overrideGlobalConfig)
 self.stopAct.setEnabled(True)
 if dlg.clearHistories():
 self.setArgvHistory("", clearHistories=True)
 cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
 self.envHistory, self.exceptions, self.ui, 0,
 tracePython=self.tracePython, autoClearShell=self.autoClearShell,
 autoContinue=self.autoContinue,
 enableMultiprocess=self.enableMultiprocess,
-multiprocessNoDebugHistory=self.multiprocessNoDebugHistory)
+multiprocessNoDebugHistory=self.multiprocessNoDebugHistory,
-if dlg.exec() == QDialog.Accepted:
+configOverride=self.overrideGlobalConfig)
+if dlg.exec() == QDialog.DialogCode.Accepted:
 (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
 console) = dlg.getData()
+configOverride = dlg.getGlobalOverrideData()
 (tracePython, autoContinue, enableMultiprocess,
 multiprocessNoDebug) = dlg.getDebugData()
 if debugProject:
 fn = self.project.getMainScript(True)
 self.project.setDbgInfo(
 lastUsedVenvName, argv, wd, env, exceptions, self.excList,
 self.excIgnoreList, clearShell, tracePython=tracePython,
 autoContinue=autoContinue,
 enableMultiprocess=enableMultiprocess,
-multiprocessNoDebug=multiprocessNoDebug
+multiprocessNoDebug=multiprocessNoDebug,
+configOverride=configOverride
 )
 self.lastStartAction = 2
 self.clientType = self.project.getProjectLanguage()
 else:
 # Save the multiprocess debugging data
 self.enableMultiprocess = enableMultiprocess
 self.setMultiprocessNoDebugHistory(multiprocessNoDebug)
+# Save the global config override data
+self.overrideGlobalConfig = copy.deepcopy(configOverride)
 # Hide all error highlights
 self.viewmanager.unhighlight()
 if not doNotStart:
 if debugProject and self.project.getProjectType() in [
 tracePython=tracePython,
 autoContinue=autoContinue, forProject=debugProject,
 runInConsole=console, clientType=self.clientType,
 enableCallTrace=enableCallTrace,
 enableMultiprocess=enableMultiprocess,
-multiprocessNoDebug=multiprocessNoDebug)
+multiprocessNoDebug=multiprocessNoDebug,
+configOverride=self.overrideGlobalConfig)
 if (
 self.debugServer.isClientProcessUp() and
 self.debugServer.getClientType() == self.clientType
 ):
 forProject=forProject,
 runInConsole=self.runInConsole,
 clientType=self.clientType,
 enableCallTrace=enableCallTrace,
 enableMultiprocess=self.enableMultiprocess,
-multiprocessNoDebug=multiprocessNoDebug)
+multiprocessNoDebug=multiprocessNoDebug,
+configOverride=self.overrideGlobalConfig)
 # Signal that we have started a debugging session
 self.debuggingStarted.emit(fn)
 elif self.lastStartAction in [3, 4]:
 self.debugServer.remoteRun(
 venvName, fn, argv, wd, env,
 autoClearShell=self.autoClearShell,
 forProject=forProject,
 runInConsole=self.runInConsole,
-clientType=self.clientType)
+clientType=self.clientType,
+configOverride=self.overrideGlobalConfig)
 elif self.lastStartAction in [5, 6]:
 # Ask the client to coverage run the new program.
 self.debugServer.remoteCoverage(
 venvName, fn, argv, wd, env,
 autoClearShell=self.autoClearShell,
 erase=self.eraseCoverage,
 forProject=forProject,
 runInConsole=self.runInConsole,
-clientType=self.clientType)
+clientType=self.clientType,
+configOverride=self.overrideGlobalConfig)
 elif self.lastStartAction in [7, 8]:
 # Ask the client to profile run the new program.
 self.debugServer.remoteProfile(
 venvName, fn, argv, wd, env,
 autoClearShell=self.autoClearShell,
 erase=self.eraseTimings,
 forProject=forProject,
 runInConsole=self.runInConsole,
-clientType=self.clientType)
+clientType=self.clientType,
+configOverride=self.overrideGlobalConfig)
 self.stopAct.setEnabled(True)
 def __stopScript(self):
 """
 @param enableMultiprocess flag indicating, that the debugger should be
 run in multi process mode
 @type bool
 """
 self.enableMultiprocess = enableMultiprocess
+def setEnableGlobalConfigOverride(self, overrideData):
+"""
+Public method to initialize the global config override data.
+@param overrideData dictionary containing a flag indicating to enable
+global config override and a flag indicating to redirect
+stdin/stdout/stderr
+@type dict
+"""
+self.overrideGlobalConfig = copy.deepcopy(overrideData)

Mercurial Repositories > eric / file comparison

comparison: eric6/Debugger/DebugUI.py

eric6/Debugger/DebugUI.py