Mercurial Repositories > Pyramid Project / file comparison
comparison: ProjectPyramid/ConfigurationPage/PyramidPage.py
ProjectPyramid/ConfigurationPage/PyramidPage.py
- changeset 21
- e58828e9a847
- parent 19
- f4adfe6e51b0
- child 34
- d20f7218d53c
equal
deleted
inserted
replaced
| 20:3c98d944e673 | 21:e58828e9a847 |
|---|---|
| 39 consoleList = [] | 39 consoleList = [] |
| 40 if isWindowsPlatform(): | 40 if isWindowsPlatform(): |
| 41 consoleList.append("cmd.exe /c") | 41 consoleList.append("cmd.exe /c") |
| 42 elif isMacPlatform(): | 42 elif isMacPlatform(): |
| 43 consoleList.append("xterm -e") | 43 consoleList.append("xterm -e") |
| 44 consoleList.append("/opt/X11/bin/xterm -e") | |
| 44 else: | 45 else: |
| 45 consoleList.append("konsole -e") | 46 consoleList.append("konsole -e") |
| 46 consoleList.append("@konsole --workdir . -e") | 47 consoleList.append("@konsole --workdir . -e") |
| 47 # KDE4 konsole spawns | 48 # KDE4 konsole spawns |
| 48 consoleList.append("gnome-terminal -x") | 49 consoleList.append("gnome-terminal -x") |
| 49 consoleList.append("xterm -e") | 50 consoleList.append("xterm -e") |
| 50 | |
| 51 consoleNoCloseList = [] | |
| 52 if isWindowsPlatform(): | |
| 53 consoleNoCloseList.append("cmd.exe /k") | |
| 54 elif isMacPlatform(): | |
| 55 consoleNoCloseList.append("xterm -hold -e") | |
| 56 else: | |
| 57 consoleNoCloseList.append("konsole --noclose -e") | |
| 58 consoleNoCloseList.append("@konsole --noclose --workdir . -e") | |
| 59 # KDE4 konsole spawns | |
| 60 consoleNoCloseList.append("xterm -hold -e") | |
| 61 | |
| 62 self.consoleCommandCombo.addItems(consoleList) | 51 self.consoleCommandCombo.addItems(consoleList) |
| 63 self.consoleCommandNoCloseCombo.addItems(consoleNoCloseList) | |
| 64 | 52 |
| 65 self.virtualEnvPy2Completer = E5DirCompleter(self.virtualEnvPy2Edit) | 53 self.virtualEnvPy2Completer = E5DirCompleter(self.virtualEnvPy2Edit) |
| 66 self.virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit) | 54 self.virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit) |
| 67 | 55 |
| 68 self.py2ShellCombo.addItem(self.trUtf8("Plain Python"), "python") | 56 self.py2ShellCombo.addItem(self.trUtf8("Plain Python"), "python") |
| 74 self.py3ShellCombo.addItem(self.trUtf8("bpython"), "bpython") | 62 self.py3ShellCombo.addItem(self.trUtf8("bpython"), "bpython") |
| 75 | 63 |
| 76 # set initial values | 64 # set initial values |
| 77 self.consoleCommandCombo.setEditText( | 65 self.consoleCommandCombo.setEditText( |
| 78 self.__plugin.getPreferences("ConsoleCommand")) | 66 self.__plugin.getPreferences("ConsoleCommand")) |
| 79 self.consoleCommandNoCloseCombo.setEditText( | |
| 80 self.__plugin.getPreferences("ConsoleCommandNoClose")) | |
| 81 | 67 |
| 82 self.virtualEnvPy2Edit.setText( | 68 self.virtualEnvPy2Edit.setText( |
| 83 self.__plugin.getPreferences("VirtualEnvironmentPy2")) | 69 self.__plugin.getPreferences("VirtualEnvironmentPy2")) |
| 84 self.virtualEnvPy3Edit.setText( | 70 self.virtualEnvPy3Edit.setText( |
| 85 self.__plugin.getPreferences("VirtualEnvironmentPy3")) | 71 self.__plugin.getPreferences("VirtualEnvironmentPy3")) |
| 96 """ | 82 """ |
| 97 Public slot to save the Pyramid configuration. | 83 Public slot to save the Pyramid configuration. |
| 98 """ | 84 """ |
| 99 self.__plugin.setPreferences("ConsoleCommand", | 85 self.__plugin.setPreferences("ConsoleCommand", |
| 100 self.consoleCommandCombo.currentText()) | 86 self.consoleCommandCombo.currentText()) |
| 101 self.__plugin.setPreferences("ConsoleCommandNoClose", | |
| 102 self.consoleCommandNoCloseCombo.currentText()) | |
| 103 | 87 |
| 104 self.__plugin.setPreferences("VirtualEnvironmentPy2", | 88 self.__plugin.setPreferences("VirtualEnvironmentPy2", |
| 105 self.virtualEnvPy2Edit.text()) | 89 self.virtualEnvPy2Edit.text()) |
| 106 self.__plugin.setPreferences("VirtualEnvironmentPy3", | 90 self.__plugin.setPreferences("VirtualEnvironmentPy3", |
| 107 self.virtualEnvPy3Edit.text()) | 91 self.virtualEnvPy3Edit.text()) |
