Mercurial Repositories > eric / file diff

diff -r c33c1dbd0ee5 -r f04328aef87a eric6/Preferences/ConfigurationPages/QtPage.py
--- a/eric6/Preferences/ConfigurationPages/QtPage.py	Mon Mar 09 20:21:38 2020 +0100
+++ b/eric6/Preferences/ConfigurationPages/QtPage.py	Tue Mar 10 19:32:25 2020 +0100
@@ -16,6 +16,7 @@
 from .Ui_QtPage import Ui_QtPage
 
 import Preferences
+import Utilities
 
 
 class QtPage(ConfigurationPageBase, Ui_QtPage):
@@ -44,12 +45,20 @@
         self.qtPrefixEdit.setText(Preferences.getQt("QtToolsPrefix"))
         self.qtPostfixEdit.setText(Preferences.getQt("QtToolsPostfix"))
         self.__updateQtSample()
+        
         self.pyqtToolsDirPicker.setText(Preferences.getQt("PyQtToolsDir"))
-        self.pyside2ToolsDirPicker.setText(
-            Preferences.getQt("PySide2ToolsDir"))
         self.pyuicIndentSpinBox.setValue(Preferences.getQt("PyuicIndent"))
         self.pyuicImportsCheckBox.setChecked(
             Preferences.getQt("PyuicFromImports"))
+        self.pyuicExecuteCheckBox.setChecked(
+            Preferences.getQt("PyuicExecute"))
+        
+        self.pyside2ToolsDirPicker.setText(
+            Preferences.getQt("PySide2ToolsDir"))
+        self.pyside2uicImportsCheckBox.setChecked(
+            Preferences.getQt("PySide2FromImports"))
+        
+        self.pyside2Group.setEnabled(any(Utilities.checkPyside()))
         
     def save(self):
         """
@@ -59,11 +68,17 @@
         Preferences.setQt("QtToolsDir", self.qtToolsDirPicker.text())
         Preferences.setQt("QtToolsPrefix", self.qtPrefixEdit.text())
         Preferences.setQt("QtToolsPostfix", self.qtPostfixEdit.text())
+        
         Preferences.setQt("PyQtToolsDir", self.pyqtToolsDirPicker.text())
-        Preferences.setQt("PySide2ToolsDir", self.pyside2ToolsDirPicker.text())
         Preferences.setQt("PyuicIndent", self.pyuicIndentSpinBox.value())
         Preferences.setQt("PyuicFromImports",
                           self.pyuicImportsCheckBox.isChecked())
+        Preferences.setQt("PyuicExecute",
+                          self.pyuicExecuteCheckBox.isChecked())
+        
+        Preferences.setQt("PySide2ToolsDir", self.pyside2ToolsDirPicker.text())
+        Preferences.setQt("PySide2FromImports",
+                          self.pyside2uicImportsCheckBox.isChecked())
         
     def __updateQtSample(self):
         """