Mercurial Repositories > eric / file comparison
comparison: src/eric7/QScintilla/Shell.py
src/eric7/QScintilla/Shell.py
- branch
- eric7
- changeset 10985
- 91243eb0390d
- parent 10766
- d35d6f96c24b
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10984:21c0a3d40d69 | 10985:91243eb0390d |
|---|---|
| 2195 self.__currentWorkingDirectory = self.__project.getProjectPath() | 2195 self.__currentWorkingDirectory = self.__project.getProjectPath() |
| 2196 self.dbs.startClient( | 2196 self.dbs.startClient( |
| 2197 False, forProject=True, workingDir=self.__currentWorkingDirectory | 2197 False, forProject=True, workingDir=self.__currentWorkingDirectory |
| 2198 ) | 2198 ) |
| 2199 elif venvName == "<<eric-server>>": | 2199 elif venvName == "<<eric-server>>": |
| 2200 self.dbs.startClient(False, startRemote=True) | 2200 self.dbs.startClient(False, startViaServer=True) |
| 2201 elif venvName.startswith("<<eric-server>>:"): | 2201 elif venvName.startswith("<<eric-server>>:"): |
| 2202 venvName = venvName.split(":", 1)[1] | 2202 venvName = venvName.split(":", 1)[1] |
| 2203 self.dbs.startClient(False, venvName=venvName, startRemote=True) | 2203 self.dbs.startClient(False, venvName=venvName, startViaServer=True) |
| 2204 else: | 2204 else: |
| 2205 self.dbs.startClient(False, venvName=venvName) | 2205 self.dbs.startClient(False, venvName=venvName) |
| 2206 self.__getBanner() | 2206 self.__getBanner() |
| 2207 | 2207 |
| 2208 def handlePreferencesChanged(self): | 2208 def handlePreferencesChanged(self): |
| 2664 ppath = self.__project.getProjectPath() | 2664 ppath = self.__project.getProjectPath() |
| 2665 self.dbs.startClient( | 2665 self.dbs.startClient( |
| 2666 False, | 2666 False, |
| 2667 forProject=True, | 2667 forProject=True, |
| 2668 workingDir=ppath, | 2668 workingDir=ppath, |
| 2669 startRemote=FileSystemUtilities.isRemoteFileName(ppath), | 2669 startViaServer=FileSystemUtilities.isRemoteFileName(ppath), |
| 2670 ) | 2670 ) |
| 2671 self.__currentWorkingDirectory = self.__project.getProjectPath() | 2671 self.__currentWorkingDirectory = self.__project.getProjectPath() |
| 2672 self.__getBanner() | 2672 self.__getBanner() |
| 2673 | 2673 |
| 2674 def __projectClosed(self): | 2674 def __projectClosed(self): |
| 2709 @param connected flag indicating the connection state | 2709 @param connected flag indicating the connection state |
| 2710 @type bool | 2710 @type bool |
| 2711 """ | 2711 """ |
| 2712 if connected: | 2712 if connected: |
| 2713 if Preferences.getEricServer("AutostartShell"): | 2713 if Preferences.getEricServer("AutostartShell"): |
| 2714 self.dbs.startClient(False, startRemote=True) | 2714 self.dbs.startClient(False, startViaServer=True) |
| 2715 else: | 2715 else: |
| 2716 if self.__currentVenv == self.dbs.getEricServerEnvironmentString(): | 2716 if self.__currentVenv == self.dbs.getEricServerEnvironmentString(): |
| 2717 # start default backend | 2717 # start default backend |
| 2718 self.dbs.startClient(False) | 2718 self.dbs.startClient(False) |
| 2719 self.__getBanner() | 2719 self.__getBanner() |
