eric: comparison QScintilla/Shell.py

-:9b01b4004314
+:f81d0eca2c62
 @param horizontal flag indicating a horizontal layout (boolean)
 @param parent parent widget (QWidget)
 """
 super(ShellAssembly, self).__init__(parent)
-self.__shell = Shell(dbs, vm, self)
+self.__shell = Shell(dbs, vm, False, self)
 from UI.SearchWidget import SearchWidget
 self.__searchWidget = SearchWidget(self.__shell, self, horizontal)
 self.__searchWidget.hide()
 @signal searchStringFound(found) emitted to indicate the search
 result (boolean)
 """
 searchStringFound = pyqtSignal(bool)
-def __init__(self, dbs, vm, parent=None):
+def __init__(self, dbs, vm, windowedVariant, parent=None):
 """
 Constructor
 @param dbs reference to the debug server object
 @param vm reference to the viewmanager object
 @param parent parent widget (QWidget)
+@param windowedVariant flag indicating the shell window variant
+(boolean)
 """
 super(Shell, self).__init__(parent)
 self.setUtf8(True)
 self.vm = vm
 self.__mainWindow = parent
 self.__lastSearch = ()
+self.__windowed = windowedVariant
 self.linesepRegExp = r"\r\n|\n|\r"
+# TODO: change this for Shell Window
 self.passive = Preferences.getDebugger("PassiveDbgEnabled")
 if self.passive:
 self.setWindowTitle(self.tr('Shell - Passive'))
 else:
 self.setWindowTitle(self.tr('Shell'))
-self.setWhatsThis(self.tr(
+if self.__windowed:
-"""<b>The Shell Window</b>"""
+self.setWhatsThis(self.tr(
-"""<p>This is simply an interpreter running in a window. The"""
+"""<b>The Shell Window</b>"""
-""" interpreter is the one that is used to run the program"""
+"""<p>You can use the cursor keys while entering commands."""
-""" being debugged. This means that you can execute any command"""
+""" There is also a history of commands that can be recalled"""
-""" while the program being debugged is running.</p>"""
+""" using the up and down cursor keys. Pressing the up or"""
-"""<p>You can use the cursor keys while entering commands. There"""
+""" down key after some text has been entered will start an"""
-""" is also a history of commands that can be recalled using the"""
+""" incremental search.</p>"""
-""" up and down cursor keys. Pressing the up or down key after"""
+"""<p>The shell has some special commands. 'reset' kills the"""
-""" some text has been entered will start an incremental search."""
+""" shell and starts a new one. 'clear' clears the display"""
-"""</p>"""
+""" of the shell window. 'start' is used to switch the shell"""
-"""<p>The shell has some special commands. 'reset' kills the"""
+""" language and must be followed by a supported language."""
-""" shell and starts a new one. 'clear' clears the display of"""
+""" Supported languages are listed by the 'languages'"""
-""" the shell window. 'start' is used to switch the shell"""
+""" command. These commands (except 'languages') are"""
-""" language and must be followed by a supported language."""
+""" available through the context menu as well.</p>"""
-""" Supported languages are listed by the 'languages' command."""
+"""<p>Pressing the Tab key after some text has been entered"""
-""" These commands (except 'languages') are available through"""
+""" will show a list of possible completions. The relevant"""
-""" the context menu as well.</p>"""
+""" entry may be selected from this list. If only one entry"""
-"""<p>Pressing the Tab key after some text has been entered will"""
+""" is available, this will be inserted automatically.</p>"""
-""" show a list of possible commandline completions. The"""
+))
-""" relevant entry may be selected from this list. If only one"""
+else:
-""" entry is available, this will inserted automatically.</p>"""
+self.setWhatsThis(self.tr(
-"""<p>In passive debugging mode the shell is only available"""
+"""<b>The Shell Window</b>"""
-""" after the program to be debugged has connected to the IDE"""
+"""<p>This is simply an interpreter running in a window. The"""
-""" until it has finished. This is indicated by a different"""
+""" interpreter is the one that is used to run the program"""
-""" prompt and by an indication in the window caption.</p>"""
+""" being debugged. This means that you can execute any"""
-))
+""" command while the program being debugged is running.</p>"""
+"""<p>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. Pressing the up or"""
+""" down key after some text has been entered will start an"""
+""" incremental search.</p>"""
+"""<p>The shell has some special commands. 'reset' kills the"""
+""" shell and starts a new one. 'clear' clears the display"""
+""" of the shell window. 'start' is used to switch the shell"""
+""" language and must be followed by a supported language."""
+""" Supported languages are listed by the 'languages'"""
+""" command. These commands (except 'languages') are"""
+""" available through the context menu as well.</p>"""
+"""<p>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.</p>"""
+"""<p>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.</p>"""
+))
 self.userListActivated.connect(self.__completionListSelected)
 self.linesChanged.connect(self.__resizeLinenoMargin)
-self.__showStdOutErr = Preferences.getShell("ShowStdOutErr")
+if self.__windowed:
+self.__showStdOutErr = True
+else:
+self.__showStdOutErr = Preferences.getShell("ShowStdOutErr")
 if self.__showStdOutErr:
 dbs.clientProcessStdout.connect(self.__writeStdOut)
 dbs.clientProcessStderr.connect(self.__writeStdErr)
 dbs.clientOutput.connect(self.__write)
 dbs.clientStatement.connect(self.__clientStatement)
 self.menu.addAction(self.tr('Reset'), self.__reset)
 self.menu.addAction(
 self.tr('Reset and Clear'), self.__resetAndClear)
 self.menu.addSeparator()
 self.menu.addMenu(self.lmenu)
-self.menu.addSeparator()
+if not self.__windowed:
-self.menu.addAction(self.tr("Configure..."), self.__configure)
+self.menu.addSeparator()
+self.menu.addAction(self.tr("Configure..."), self.__configure)
 self.__bindLexer()
 self.__setTextDisplay()
 self.__setMargin0()
 @param exceptionMessage message given by the exception (string)
 @param stackTrace list of stack entries (list of string)
 """
 self .__clientError()
-if Preferences.getDebugger("ShowExceptionInShell"):
+if not self.__windowed and \
+Preferences.getDebugger("ShowExceptionInShell"):
 if exceptionType:
 if stackTrace:
 self.__write(
 self.tr('Exception "{0}"\n{1}\nFile: {2}, Line: {3}\n')
 .format(
 @param characterNo character number of the syntax error position
 (integer)
 """
 self .__clientError()
-if Preferences.getDebugger("ShowExceptionInShell"):
+if not self.__windowed and \
+Preferences.getDebugger("ShowExceptionInShell"):
 if message is None:
 self.__write(self.tr("Unspecified syntax error.\n"))
 else:
 self.__write(
 self.tr('Syntax error "{1}" in file {0} at line {2},'
 self.dbs.startClient(False)
 if self.passive:
 return
 else:
 cmd = ''
+elif cmd in ["quit", "quit()"] and self.__windowed:
+# call main window quit()
+self.vm.quit()
+return
 self.dbs.remoteStatement(cmd)
 while self.inCommandExecution:
 try:
 QApplication.processEvents()

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Shell.py

QScintilla/Shell.py