Mercurial Repositories > Pyramid Project / file diff

--- a/ProjectPyramid/ConfigurationPage/PyramidPage.py	Thu Aug 30 17:19:35 2012 +0200
+++ b/ProjectPyramid/ConfigurationPage/PyramidPage.py	Fri Aug 31 17:44:10 2012 +0200
@@ -41,26 +41,14 @@
             consoleList.append("cmd.exe /c")
         elif isMacPlatform():
             consoleList.append("xterm -e")
+            consoleList.append("/opt/X11/bin/xterm -e")
         else:
             consoleList.append("konsole -e")
             consoleList.append("@konsole --workdir . -e")
             # KDE4 konsole spawns
             consoleList.append("gnome-terminal -x")
             consoleList.append("xterm -e")
-        
-        consoleNoCloseList = []
-        if isWindowsPlatform():
-            consoleNoCloseList.append("cmd.exe /k")
-        elif isMacPlatform():
-            consoleNoCloseList.append("xterm -hold -e")
-        else:
-            consoleNoCloseList.append("konsole --noclose -e")
-            consoleNoCloseList.append("@konsole --noclose --workdir . -e")
-            # KDE4 konsole spawns
-            consoleNoCloseList.append("xterm -hold -e")
-        
         self.consoleCommandCombo.addItems(consoleList)
-        self.consoleCommandNoCloseCombo.addItems(consoleNoCloseList)
         
         self.virtualEnvPy2Completer = E5DirCompleter(self.virtualEnvPy2Edit)
         self.virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit)
@@ -76,8 +64,6 @@
         # set initial values
         self.consoleCommandCombo.setEditText(
             self.__plugin.getPreferences("ConsoleCommand"))
-        self.consoleCommandNoCloseCombo.setEditText(
-            self.__plugin.getPreferences("ConsoleCommandNoClose"))
         
         self.virtualEnvPy2Edit.setText(
             self.__plugin.getPreferences("VirtualEnvironmentPy2"))
@@ -98,8 +84,6 @@
         """
         self.__plugin.setPreferences("ConsoleCommand",
             self.consoleCommandCombo.currentText())
-        self.__plugin.setPreferences("ConsoleCommandNoClose",
-            self.consoleCommandNoCloseCombo.currentText())
         
         self.__plugin.setPreferences("VirtualEnvironmentPy2",
             self.virtualEnvPy2Edit.text())