eric: comparison QScintilla/Shell.py

-:40a11619ee77
+:ea60ea85067a
 class ShellAssembly(QWidget):
 """
 Class implementing the containing widget for the shell.
 """
-def __init__(self, dbs, vm, horizontal=True, parent=None):
+def __init__(self, dbs, vm, project, horizontal=True, parent=None):
 """
 Constructor
 @param dbs reference to the debug server object
+@type DebugServer
 @param vm reference to the viewmanager object
-@param horizontal flag indicating a horizontal layout (boolean)
+@type ViewManager
-@param parent parent widget (QWidget)
+@param project reference to the project object
+@type Project
+@param horizontal flag indicating a horizontal layout
+@type bool
+@param parent parent widget
+@type QWidget
 """
 super(ShellAssembly, self).__init__(parent)
-self.__shell = Shell(dbs, vm, False, self)
+self.__shell = Shell(dbs, vm, project, False, self)
 from UI.SearchWidget import SearchWidget
 self.__searchWidget = SearchWidget(self.__shell, self, horizontal)
 self.__searchWidget.setSizePolicy(QSizePolicy.Fixed,
 QSizePolicy.Preferred)
 """
 searchStringFound = pyqtSignal(bool)
 historyStyleChanged = pyqtSignal(ShellHistoryStyle)
 queueText = pyqtSignal(str)
-def __init__(self, dbs, vm, windowedVariant, parent=None):
+def __init__(self, dbs, vm, project, windowedVariant, parent=None):
 """
 Constructor
 @param dbs reference to the debug server object
+@type DebugServer
 @param vm reference to the viewmanager object
+@type ViewManager
+@param project reference to the project object
+@type Project
 @param windowedVariant flag indicating the shell window variant
-(boolean)
+@type bool
-@param parent parent widget (QWidget)
+@param parent parent widget
+@type QWidget
 """
 super(Shell, self).__init__(parent)
 self.setUtf8(True)
 self.vm = vm
 self.__mainWindow = parent
 self.__lastSearch = ()
 self.__windowed = windowedVariant
+self.__currentVenv = ""
 self.linesepRegExp = r"\r\n|\n|\r"
 self.passive = ((not self.__windowed) and
 Preferences.getDebugger("PassiveDbgEnabled"))
 self.__getBanner()
 if not self.__windowed:
 # Create a little language context menu
 self.lmenu = QMenu(self.tr('Start'))
-self.lmenu.aboutToShow.connect(self.__showLanguageMenu)
+self.lmenu.aboutToShow.connect(self.__showStartMenu)
 self.lmenu.triggered.connect(self.__startDebugClient)
 # Create the history context menu
 self.hmenu = QMenu(self.tr('History'))
 self.hmenu.addAction(self.tr('Select entry'), self.selectHistory)
 self.__queuedText = ''
 self.__blockTextProcessing = False
 self.queueText.connect(self.__concatenateText, Qt.QueuedConnection)
+self.__project = project
+if self.__project:
+self.__project.projectOpened.connect(self.__projectOpened)
+self.__project.projectClosed.connect(self.__projectClosed)
 self.grabGesture(Qt.PinchGesture)
-def __showLanguageMenu(self):
+def __showStartMenu(self):
 """
-Private slot to prepare the language submenu.
+Private slot to prepare the start submenu.
 """
 self.lmenu.clear()
-clientLanguages = self.dbs.getSupportedLanguages(shellOnly=True)
+venvManager = e5App().getObject("VirtualEnvManager")
-for language in sorted(clientLanguages):
+for venvName in sorted(venvManager.getVirtualenvNames()):
-act = self.lmenu.addAction(language)
+self.lmenu.addAction(venvName)
-act.setData(language)
+if self.__project.isOpen():
+self.lmenu.addSeparator()
+self.lmenu.addAction(self.tr("Project"))
 def __resizeLinenoMargin(self):
 """
 Private slot to resize the line numbers margin.
 """
 self.echoInput = True
 self.clientCapabilities = 0
 self.inCommandExecution = False
 self.interruptCommandExecution = False
-def __clientCapabilities(self, cap, clType):
+def __clientCapabilities(self, cap, clType, venvName):
 """
 Private slot to handle the reporting of the clients capabilities.
-@param cap client capabilities (integer)
+@param cap client capabilities
-@param clType type of the debug client (string)
+@type int
+@param clType type of the debug client
+@type str
+@param venvName name of the virtual environment
+@type str
 """
 self.clientCapabilities = cap
+self.__currentVenv = venvName
 if clType != self.clientType:
 self.clientType = clType
 self.__bindLexer(self.clientType)
 self.__setTextDisplay()
 self.__setMargin0()
 if self.passive:
 self.__writeBanner('', '', '')
 else:
 self.dbs.remoteBanner()
-def __writeBanner(self, version, platform, dbgclient):
+def __writeBanner(self, version, platform, dbgclient, venvName):
 """
 Private method to write a banner with info from the debug client.
-@param version interpreter version string (string)
+@param version interpreter version string
-@param platform platform of the remote interpreter (string)
+@type str
-@param dbgclient debug client variant used (string)
+@param platform platform of the remote interpreter
+@type str
+@param dbgclient debug client variant used
+@type str
+@param venvName name of the virtual environment
+@type str
 """
 super(Shell, self).clear()
 if self.passive and not self.dbs.isConnected():
 self.__write(self.tr('Passive Debug Mode'))
 self.__write(self.tr('\nNot connected'))
 else:
+self.__currentVenv = venvName
 version = version.replace("#", self.tr("No."))
 if platform != "" and dbgclient != "":
 self.__write(
 self.tr('{0} on {1}, {2}')
 .format(version, platform, dbgclient))
 else:
 self.__write(version)
+if venvName:
+self.__write("\n[{0}]".format(venvName))
 self.__write('\n')
 self.__write(sys.ps1)
 def __writePrompt(self):
 cmd != self.__history[self.__histidx - 1]:
 self.__setHistoryIndex(index=-1)
 else:
 self.__setHistoryIndex(historyIndex)
-if cmd.startswith('start '):
+if cmd == 'start' or cmd.startswith('start '):
 if not self.passive:
 cmdList = cmd.split(None, 1)
 if len(cmdList) < 2:
-self.dbs.startClient(False)  # same as reset
+self.dbs.startClient(False)  # start default backend
 else:
-clientLanguages = self.dbs.getSupportedLanguages(
+venvName = cmdList[1]
-shellOnly=True)
+if venvName == self.tr("Project"):
-language = cmdList[1]
+if self.__project.isOpen():
-if language not in clientLanguages:
+self.dbs.startClient(False, forProject=True)
-language = cmdList[1].capitalize()
+else:
-if language not in clientLanguages:
+self.dbs.startClient(
-language = ""
+False, venvName=self.__currentVenv)
-if language:
+# same as reset
-self.dbs.startClient(False, language)
 else:
-# language not supported or typo
+self.dbs.startClient(False, venvName=venvName)
-self.__write(
+self.__getBanner()
-self.tr(
+return
-'Shell language "{0}" not supported.\n')
-.format(cmdList[1]))
-self.__clientStatement(False)
-return
-cmd = ''
-elif cmd == 'languages':
-s = '{0}\n'.format(', '.join(sorted(
-self.dbs.getSupportedLanguages(shellOnly=True))))
-self.__write(s)
-self.__clientStatement(False)
-return
 elif cmd == 'clear':
 # Display the banner.
 self.__getBanner()
 if not self.passive:
 return
 else:
 cmd = ''
 elif cmd == 'reset':
-self.dbs.startClient(False)
+self.dbs.startClient(False, venvName=self.__currentVenv)
 if self.passive:
 return
 else:
 cmd = ''
 elif cmd in ["quit", "quit()"] and self.__windowed:
 Private slot to start a debug client according to the action
 triggered.
 @param action context menu action that was triggered (QAction)
 """
-language = action.data()
+venvName = action.text()
-self.dbs.startClient(False, language)
+if venvName == self.tr("Project"):
+self.dbs.startClient(False, forProject=True)
+else:
+self.dbs.startClient(False, venvName=venvName)
 self.__getBanner()
 def handlePreferencesChanged(self):
 """
 Public slot to handle the preferencesChanged signal.
 @return flag indicating if history is enabled
 @rtype bool
 """
 return self.__historyStyle != ShellHistoryStyle.Disabled
+#################################################################
+## Project Support
+#################################################################
+def __projectOpened(self):
+"""
+Private slot to start the shell for the opened project.
+"""
+if Preferences.getProject("RestartShellForProject"):
+self.dbs.startClient(False, forProject=True)
+self.__getBanner()
+def __projectClosed(self):
+"""
+Private slot to restart the default shell when the project is closed.
+"""
+if Preferences.getProject("RestartShellForProject"):
+self.dbs.startClient(False)
+self.__getBanner()

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Shell.py

QScintilla/Shell.py