Mercurial Repositories > eric / file diff

--- a/QScintilla/ShellWindow.py	Sat Nov 03 14:16:43 2018 +0100
+++ b/QScintilla/ShellWindow.py	Sat Nov 03 14:19:21 2018 +0100
@@ -67,7 +67,7 @@
         
         # initialize the debug server and shell widgets
         self.__debugServer = DebugServer(preventPassiveDebugging=True)
-        self.__shell = Shell(self.__debugServer, self, True, self)
+        self.__shell = Shell(self.__debugServer, self, None, True, self)
         self.__searchWidget = SearchWidget(self.__shell, self, showLine=True)
         
         centralWidget = QWidget()
@@ -1151,7 +1151,7 @@
         self.__historyMenu.setEnabled(self.__shell.isHistoryEnabled())
         
         self.__startMenu = self.menuBar().addMenu(self.tr("&Start"))
-        self.__startMenu.aboutToShow.connect(self.__showLanguageMenu)
+        self.__startMenu.aboutToShow.connect(self.__showStartMenu)
         self.__startMenu.triggered.connect(self.__startShell)
         
         self.menuBar().addSeparator()
@@ -1163,16 +1163,13 @@
         self.__helpMenu.addSeparator()
         self.__helpMenu.addAction(self.whatsThisAct)
     
-    def __showLanguageMenu(self):
+    def __showStartMenu(self):
         """
         Private slot to prepare the language menu.
         """
         self.__startMenu.clear()
-        clientLanguages = self.__debugServer.getSupportedLanguages(
-            shellOnly=True)
-        for language in sorted(clientLanguages):
-            act = self.__startMenu.addAction(language)
-            act.setData(language)
+        for venvName in sorted(self.virtualenvManager.getVirtualenvNames()):
+            self.__startMenu.addAction(venvName)
     
     def __startShell(self, action):
         """
@@ -1180,8 +1177,9 @@
         
         @param action menu action that was triggered (QAction)
         """
-        language = action.data()
-        self.__debugServer.startClient(False, language)
+        venvName = action.text()
+        self.__debugServer.startClient(False, venvName=venvName)
+        self.__debugServer.remoteBanner()
     
     ##################################################################
     ## Below are the toolbar handling methods