Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py	Tue May 15 18:25:26 2018 +0200
+++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py	Tue May 15 19:39:46 2018 +0200
@@ -58,18 +58,27 @@
         self.pysideDocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
         self.pysideDocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;All Files (*)"))
+        self.pyside2DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pyside2DocDirPicker.setFilters(self.tr(
+            "HTML Files (*.html *.htm);;All Files (*)"))
         
         try:
             import PyQt5        # __IGNORE_WARNING__
         except ImportError:
             self.pyqt5Group.setEnabled(False)
         
-        pyside2, pyside3 = Utilities.checkPyside()
-        if pyside2 or pyside3:
+        pyside_py2, pyside_py3 = Utilities.checkPyside("1")
+        if pyside_py2 or pyside_py3:
             self.pysideGroup.setEnabled(True)
         else:
             self.pysideGroup.setEnabled(False)
         
+        pyside2_py2, pyside2_py3 = Utilities.checkPyside("2")
+        if pyside2_py2 or pyside2_py3:
+            self.pyside2Group.setEnabled(True)
+        else:
+            self.pyside2Group.setEnabled(False)
+        
         # set initial values
         self.ericDocDirPicker.setText(
             Preferences.getHelp("EricDocDir"), toNative=False)
@@ -87,6 +96,8 @@
             Preferences.getHelp("PyQt5DocDir"), toNative=False)
         self.pysideDocDirPicker.setText(
             Preferences.getHelp("PySideDocDir"), toNative=False)
+        self.pysideDocDirPicker.setText(
+            Preferences.getHelp("PySide2DocDir"), toNative=False)
         
     def save(self):
         """
@@ -116,6 +127,9 @@
         Preferences.setHelp(
             "PySideDocDir",
             self.pysideDocDirPicker.text(toNative=False))
+        Preferences.setHelp(
+            "PySide2DocDir",
+            self.pyside2DocDirPicker.text(toNative=False))
     
 
 def create(dlg):