Mercurial Repositories > Pyramid Project / file diff

--- a/ProjectPyramid/ConfigurationPage/PyramidPage.py	Thu Dec 22 15:55:52 2016 +0100
+++ b/ProjectPyramid/ConfigurationPage/PyramidPage.py	Fri Dec 23 17:15:21 2016 +0100
@@ -19,6 +19,7 @@
 from .Ui_PyramidPage import Ui_PyramidPage
 
 import Utilities
+import UI.PixmapCache
 
 from Globals import isWindowsPlatform, isMacPlatform
 
@@ -46,14 +47,19 @@
             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")
+            # KDE4/5 konsole spawns
+            consoleList.append("gnome-terminal -e")
+            consoleList.append("mate-terminal -e")
             consoleList.append("xfce4-terminal -e")
             consoleList.append("xterm -e")
         self.consoleCommandCombo.addItems(consoleList)
         
+        self.virtualEnvPy3Button.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.virtualEnvPy2Button.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.translationsButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.urlResetButton.setIcon(UI.PixmapCache.getIcon("editUndo.png"))
+        
         self.virtualEnvPy2Completer = E5DirCompleter(self.virtualEnvPy2Edit)
         self.virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit)
         
@@ -69,6 +75,9 @@
         self.consoleCommandCombo.setEditText(
             self.__plugin.getPreferences("ConsoleCommand"))
         
+        self.externalBrowserCheckBox.setChecked(
+            self.__plugin.getPreferences("UseExternalBrowser"))
+        
         self.virtualEnvPy2Edit.setText(
             self.__plugin.getPreferences("VirtualEnvironmentPy2"))
         self.virtualEnvPy3Edit.setText(
@@ -93,6 +102,9 @@
             "ConsoleCommand", self.consoleCommandCombo.currentText())
         
         self.__plugin.setPreferences(
+            "UseExternalBrowser", self.externalBrowserCheckBox.isChecked())
+        
+        self.__plugin.setPreferences(
             "VirtualEnvironmentPy2", self.virtualEnvPy2Edit.text())
         self.__plugin.setPreferences(
             "VirtualEnvironmentPy3", self.virtualEnvPy3Edit.text())
@@ -161,3 +173,11 @@
             self.tr("All Files (*)"))
         if editor:
             self.translationsEdit.setText(Utilities.toNativeSeparators(editor))
+    
+    @pyqtSlot()
+    def on_urlResetButton_clicked(self):
+        """
+        Private slot to reset the Pyramid documentation URL.
+        """
+        self.urlEdit.setText(
+            self.__plugin.getDefaultPreference("PyramidDocUrl"))