Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/ConfigurationPages/QtPage.py	Wed Dec 23 16:28:35 2020 +0100
+++ b/eric6/Preferences/ConfigurationPages/QtPage.py	Thu Dec 24 16:17:57 2020 +0100
@@ -16,6 +16,7 @@
 from .Ui_QtPage import Ui_QtPage
 
 import Preferences
+import UI.PixmapCache
 
 
 class QtPage(ConfigurationPageBase, Ui_QtPage):
@@ -36,14 +37,21 @@
             from VirtualEnv.VirtualenvManager import VirtualenvManager
             self.__virtualenvManager = VirtualenvManager()
         
+        for button in (
+            self.pyqt5VenvDlgButton, self.pyqt6VenvDlgButton,
+            self.pyside2VenvDlgButton, self.pyside6VenvDlgButton,
+        ):
+            button.setIcon(UI.PixmapCache.getIcon("virtualenv"))
+        
         self.qtTransPicker.setMode(E5PathPickerModes.DirectoryMode)
-        self.qtToolsDirPicker.setMode(E5PathPickerModes.DirectoryShowFilesMode)
-        self.pyqtToolsDirPicker.setMode(
-            E5PathPickerModes.DirectoryShowFilesMode)
-        self.pyqt6ToolsDirPicker.setMode(
-            E5PathPickerModes.DirectoryShowFilesMode)
-        self.pyside2ToolsDirPicker.setMode(
-            E5PathPickerModes.DirectoryShowFilesMode)
+        for picker in (
+            self.qtToolsDirPicker,
+            self.pyqtToolsDirPicker,
+            self.pyqt6ToolsDirPicker,
+            self.pyside2ToolsDirPicker,
+            self.pyside6ToolsDirPicker,
+        ):
+            picker.setMode(E5PathPickerModes.DirectoryShowFilesMode)
         
         self.__populateAndSetVenvComboBoxes(True)
         
@@ -76,6 +84,12 @@
             Preferences.getQt("PySide2ToolsDir"))
         self.pyside2uicImportsCheckBox.setChecked(
             Preferences.getQt("PySide2FromImports"))
+        
+        # PySide 6
+        self.pyside6ToolsDirPicker.setText(
+            Preferences.getQt("PySide6ToolsDir"))
+        self.pyside6uicImportsCheckBox.setChecked(
+            Preferences.getQt("PySide6FromImports"))
     
     def save(self):
         """
@@ -106,6 +120,12 @@
         Preferences.setQt("PySide2ToolsDir", self.pyside2ToolsDirPicker.text())
         Preferences.setQt("PySide2FromImports",
                           self.pyside2uicImportsCheckBox.isChecked())
+        
+        Preferences.setQt("PySide6VenvName",
+                          self.pyside6VenvComboBox.currentText())
+        Preferences.setQt("PySide6ToolsDir", self.pyside6ToolsDirPicker.text())
+        Preferences.setQt("PySide6FromImports",
+                          self.pyside6uicImportsCheckBox.isChecked())
     
     def __updateQtSample(self):
         """
@@ -174,6 +194,8 @@
             self.pyqt6VenvComboBox, "PyQt6VenvName", initial)
         self.__populateAndSetVenvComboBox(
             self.pyside2VenvComboBox, "PySide2VenvName", initial)
+        self.__populateAndSetVenvComboBox(
+            self.pyside6VenvComboBox, "PySide6VenvName", initial)
     
     def __showVirtualEnvManager(self):
         """
@@ -205,6 +227,13 @@
         """
         self.__showVirtualEnvManager()
     
+    @pyqtSlot()
+    def on_pyside6VenvDlgButton_clicked(self):
+        """
+        Private slot to show the virtual environment manager dialog.
+        """
+        self.__showVirtualEnvManager()
+
 
 def create(dlg):
     """