Mercurial Repositories > eric / file comparison
comparison: src/eric7/QScintilla/Shell.py
src/eric7/QScintilla/Shell.py
- branch
- eric7
- changeset 10701
- 56fce4058bf1
- parent 10692
- 9becf9ca115c
- child 10704
- 27d21e5163b8
equal
deleted
inserted
replaced
| 10700:5746c020c598 | 10701:56fce4058bf1 |
|---|---|
| 394 """ | 394 """ |
| 395 self.lmenu.clear() | 395 self.lmenu.clear() |
| 396 venvManager = ericApp().getObject("VirtualEnvManager") | 396 venvManager = ericApp().getObject("VirtualEnvManager") |
| 397 for venvName in sorted(venvManager.getVirtualenvNames()): | 397 for venvName in sorted(venvManager.getVirtualenvNames()): |
| 398 self.lmenu.addAction(venvName) | 398 self.lmenu.addAction(venvName) |
| 399 if self.__project.isOpen(): | 399 if self.__project and self.__project.isOpen(): |
| 400 self.lmenu.addSeparator() | 400 self.lmenu.addSeparator() |
| 401 self.lmenu.addAction(self.tr("Project")) | 401 self.lmenu.addAction(self.tr("Project")) |
| 402 | 402 |
| 403 def __resizeLinenoMargin(self): | 403 def __resizeLinenoMargin(self): |
| 404 """ | 404 """ |
| 1906 self.tr("Project"), | 1906 self.tr("Project"), |
| 1907 self.tr("Project").lower(), | 1907 self.tr("Project").lower(), |
| 1908 "Project", | 1908 "Project", |
| 1909 "project", | 1909 "project", |
| 1910 ): | 1910 ): |
| 1911 if self.__project.isOpen(): | 1911 if self.__project and self.__project.isOpen(): |
| 1912 self.dbs.startClient( | 1912 self.dbs.startClient( |
| 1913 False, | 1913 False, |
| 1914 forProject=True, | 1914 forProject=True, |
| 1915 workingDir=self.__project.getProjectPath(), | 1915 workingDir=self.__project.getProjectPath(), |
| 1916 ) | 1916 ) |
| 2152 Public slot to handle the 'restart' context menu entry. | 2152 Public slot to handle the 'restart' context menu entry. |
| 2153 """ | 2153 """ |
| 2154 venvName = ( | 2154 venvName = ( |
| 2155 self.dbs.getProjectEnvironmentString() | 2155 self.dbs.getProjectEnvironmentString() |
| 2156 if ( | 2156 if ( |
| 2157 self.__project.isOpen() | 2157 self.__project |
| 2158 and self.__project.isOpen() | |
| 2158 and self.__currentVenv | 2159 and self.__currentVenv |
| 2159 == self.__project.getProjectVenv(resolveDebugger=False) | 2160 == self.__project.getProjectVenv(resolveDebugger=False) |
| 2160 ) | 2161 ) |
| 2161 else self.__currentVenv | 2162 else self.__currentVenv |
| 2162 ) | 2163 ) |
| 2174 @param action context menu action that was triggered | 2175 @param action context menu action that was triggered |
| 2175 @type QAction | 2176 @type QAction |
| 2176 """ | 2177 """ |
| 2177 venvName = action.text() | 2178 venvName = action.text() |
| 2178 if venvName == self.tr("Project"): | 2179 if venvName == self.tr("Project"): |
| 2179 if self.__project.isOpen(): | 2180 if self.__project and self.__project.isOpen(): |
| 2180 self.__currentWorkingDirectory = self.__project.getProjectPath() | 2181 self.__currentWorkingDirectory = self.__project.getProjectPath() |
| 2181 self.dbs.startClient( | 2182 self.dbs.startClient( |
| 2182 False, forProject=True, workingDir=self.__currentWorkingDirectory | 2183 False, forProject=True, workingDir=self.__currentWorkingDirectory |
| 2183 ) | 2184 ) |
| 2184 else: | 2185 else: |
