Mercurial Repositories > eric / file comparison
comparison: src/eric7/QScintilla/Shell.py
src/eric7/QScintilla/Shell.py
- branch
- server
- changeset 10766
- d35d6f96c24b
- parent 10704
- 27d21e5163b8
- child 10985
- 91243eb0390d
equal
deleted
inserted
replaced
| 10765:b0632e55ec9a | 10766:d35d6f96c24b |
|---|---|
| 393 """ | 393 """ |
| 394 Private slot to prepare the start submenu. | 394 Private slot to prepare the start submenu. |
| 395 """ | 395 """ |
| 396 self.lmenu.clear() | 396 self.lmenu.clear() |
| 397 venvManager = ericApp().getObject("VirtualEnvManager") | 397 venvManager = ericApp().getObject("VirtualEnvManager") |
| 398 for venvName in sorted(venvManager.getVirtualenvNames()): | 398 for venvName in sorted(venvManager.getVirtualenvNames(noServer=True)): |
| 399 act = self.lmenu.addAction(venvName) | 399 act = self.lmenu.addAction(venvName) |
| 400 act.setData(venvName) | 400 act.setData(venvName) |
| 401 if self.__project and self.__project.isOpen(): | 401 if self.__project and self.__project.isOpen(): |
| 402 self.lmenu.addSeparator() | 402 self.lmenu.addSeparator() |
| 403 act = self.lmenu.addAction(self.tr("Project")) | 403 act = self.lmenu.addAction(self.tr("Project")) |
| 404 act.setData("<<project>>") | 404 act.setData("<<project>>") |
| 405 if ericApp().getObject("EricServer").isServerConnected(): | 405 if ericApp().getObject("EricServer").isServerConnected(): |
| 406 self.lmenu.addSeparator() | 406 self.lmenu.addSeparator() |
| 407 for venvName in sorted( | |
| 408 venvManager.getEricServerEnvironmentNames( | |
| 409 ericApp().getObject("EricServer").getHostName() | |
| 410 ) | |
| 411 ): | |
| 412 act = self.lmenu.addAction(venvName) | |
| 413 act.setData(f"<<eric-server>>:{venvName}") | |
| 407 act = self.lmenu.addAction(self.tr("eric-ide Server")) | 414 act = self.lmenu.addAction(self.tr("eric-ide Server")) |
| 408 act.setData("<<eric-server>>") | 415 act.setData("<<eric-server>>") |
| 409 | 416 |
| 410 def __resizeLinenoMargin(self): | 417 def __resizeLinenoMargin(self): |
| 411 """ | 418 """ |
| 2189 self.dbs.startClient( | 2196 self.dbs.startClient( |
| 2190 False, forProject=True, workingDir=self.__currentWorkingDirectory | 2197 False, forProject=True, workingDir=self.__currentWorkingDirectory |
| 2191 ) | 2198 ) |
| 2192 elif venvName == "<<eric-server>>": | 2199 elif venvName == "<<eric-server>>": |
| 2193 self.dbs.startClient(False, startRemote=True) | 2200 self.dbs.startClient(False, startRemote=True) |
| 2201 elif venvName.startswith("<<eric-server>>:"): | |
| 2202 venvName = venvName.split(":", 1)[1] | |
| 2203 self.dbs.startClient(False, venvName=venvName, startRemote=True) | |
| 2194 else: | 2204 else: |
| 2195 self.dbs.startClient(False, venvName=venvName) | 2205 self.dbs.startClient(False, venvName=venvName) |
| 2196 self.__getBanner() | 2206 self.__getBanner() |
| 2197 | 2207 |
| 2198 def handlePreferencesChanged(self): | 2208 def handlePreferencesChanged(self): |
