eric: comparison QScintilla/Shell.py

-:082d58e2415e
+:8eb6220f2bb7
 @signal searchStringFound(bool) emitted to indicate the search
 result
 @signal historyStyleChanged(ShellHistoryStyle) emitted to indicate a
 change of the history style
 @signal queueText(str) emitted to queue some text for processing
+@signal virtualEnvironmentChanged(str) emitted to signal the new virtual
+environment of the shell
 """
 searchStringFound = pyqtSignal(bool)
 historyStyleChanged = pyqtSignal(ShellHistoryStyle)
 queueText = pyqtSignal(str)
+virtualEnvironmentChanged = pyqtSignal(str)
 def __init__(self, dbs, vm, project, windowedVariant, parent=None):
 """
 Constructor
 """ using the up and down cursor keys while holding down the"""
 """ Ctrl-key. This can be switched to just the up and down"""
 """ cursor keys on the Shell page of the configuration"""
 """ dialog. Pressing these keys after some text has been"""
 """ entered will start an incremental search.</p>"""
-"""<p>The shell has some special commands. 'reset' kills the"""
+"""<p>The shell has some special commands. 'restart' kills"""
-""" shell and starts a new one. 'clear' clears the display"""
+""" the shell and starts a new one. 'clear' clears the"""
-""" of the shell window. 'start' is used to switch the shell"""
+""" display of the shell window. 'start' is used to start a"""
-""" language and must be followed by a supported language."""
+""" shell for a virtual environment and should be followed"""
-""" Supported languages are listed by the 'languages'"""
+""" by a virtual environment name. start' without a virtual"""
-""" command. 'quit' is used to exit the application.These"""
+""" environment name starts the default shell. Available"""
-""" commands (except 'languages') are available through the"""
+""" virtual environments may be listed with the 'envs' or"""
-""" window menus as well.</p>"""
+""" 'environments' commands. The active virtual environment"""
+""" can be questioned by the 'which' command. 'quit' or"""
+""" 'exit' is used to exit the application. These commands"""
+""" (except environments', 'envs' and 'which') are available"""
+""" through the window menus 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>"""
 ))
 """ using the up and down cursor keys while holding down the"""
 """ Ctrl-key. This can be switched to just the up and down"""
 """ cursor keys on the Shell page of the configuration"""
 """ dialog. Pressing these keys after some text has been"""
 """ entered will start an incremental search.</p>"""
-"""<p>The shell has some special commands. 'reset' kills the"""
+"""<p>The shell has some special commands. 'restart' kills"""
-""" shell and starts a new one. 'clear' clears the display"""
+""" the shell and starts a new one. 'clear' clears the"""
-""" of the shell window. 'start' is used to switch the shell"""
+""" display of the shell window. 'start' is used to start a"""
-""" language and must be followed by a supported language."""
+""" shell for a virtual environment and should be followed"""
-""" Supported languages are listed by the 'languages'"""
+""" by a virtual environment name. start' without a virtual"""
-""" command. These commands (except 'languages') are"""
+""" environment name starts the default shell. Available"""
-""" available through the context menu as well.</p>"""
+""" virtual environments may be listed with the 'envs' or"""
+""" 'environments' commands. The active virtual environment"""
+""" can be questioned by the 'which' command. These commands"""
+""" (except environments' and 'envs') 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"""
 self.menu.addSeparator()
 self.menu.addAction(self.tr('Find'), self.__find)
 self.menu.addSeparator()
 self.menu.addAction(self.tr('Clear'), self.clear)
-self.menu.addAction(self.tr('Reset'), self.__reset)
+self.menu.addAction(self.tr('Restart'), self.doRestart)
 self.menu.addAction(
-self.tr('Reset and Clear'), self.__resetAndClear)
+self.tr('Restart and Clear'), self.doClearRestart)
 self.menu.addSeparator()
 self.menu.addMenu(self.lmenu)
+self.menu.addAction(self.tr('Active Name'), self.__showVenvName)
 self.menu.addSeparator()
 self.menu.addAction(self.tr("Configure..."), self.__configure)
 self.__bindLexer()
 self.__setTextDisplay()
 if self.clientType not in self.__historyLists:
 # load history list
 self.loadHistory(self.clientType)
 self.__history = self.__historyLists[self.clientType]
 self.__setHistoryIndex()
+self.virtualEnvironmentChanged.emit(venvName)
+Preferences.setShell("LastVirtualEnvironment", venvName)
 def __setHistoryIndex(self, index=None):
 """
 Private method to set the initial history index.
 .format(version, platform, dbgclient))
 else:
 self.__write(version)
 if venvName:
 self.__write("\n[{0}]".format(venvName))
+self.virtualEnvironmentChanged.emit(venvName)
+Preferences.setShell("LastVirtualEnvironment", venvName)
 self.__write('\n')
 self.__write(sys.ps1)
 def __writePrompt(self):
 self.__getBanner()
 if not self.passive:
 return
 else:
 cmd = ''
-elif cmd == 'reset':
+elif cmd in ['reset', 'restart']:
 self.dbs.startClient(False, venvName=self.__currentVenv)
 if self.passive:
 return
 else:
 cmd = ''
-elif cmd in ["quit", "quit()"] and self.__windowed:
+elif cmd in ['envs', 'environments']:
+venvs = e5App().getObject("VirtualEnvManager")\
+.getVirtualenvNames()
+s = self.tr('Available Virtual Environments:\n{0}\n').format(
+'\n'.join("- {0}".format(venv) for venv in sorted(venvs))
+)
+self.__write(s)
+self.__clientStatement(False)
+return
+elif cmd == 'which':
+s = self.tr("Current Virtual Environment: '{0}'\n").format(
+self.__currentVenv)
+self.__write(s)
+self.__clientStatement(False)
+return
+elif cmd in ["quit", "quit()", "exit", "exit()"] and \
+self.__windowed:
 # call main window quit()
 self.vm.quit()
 return
 self.dbs.remoteStatement(cmd)
 self.inRawMode = False
 self.echoInput = True
 self.dbs.remoteRawInput(cmd)
+def __showVenvName(self):
+"""
+Private method to show the name of the active virtual environment.
+"""
+s = "\n" + self.tr("Current Virtual Environment: '{0}'\n").format(
+self.__currentVenv)
+self.__write(s)
+self.__clientStatement(False)
 def __useHistory(self):
 """
 Private method to display a command from the history.
 """
 if self.__isHistoryIndexValid():
 Public slot to clear the display.
 """
 # Display the banner.
 self.__getBanner()
-def __resetAndClear(self):
+def doClearRestart(self):
 """
-Private slot to handle the 'reset and clear' context menu entry.
+Public slot to handle the 'restart and clear' context menu entry.
 """
-self.__reset()
+self.doRestart()
 self.clear()
-def __reset(self):
+def doRestart(self):
 """
-Private slot to handle the 'reset' context menu entry.
+Public slot to handle the 'restart' context menu entry.
 """
-self.dbs.startClient(False)
+self.dbs.startClient(False, venvName=self.__currentVenv)
 def __startDebugClient(self, action):
 """
 Private slot to start a debug client according to the action
 triggered.

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Shell.py

QScintilla/Shell.py