Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/HelpViewersPage.py	Tue Mar 29 10:32:22 2016 +0200
+++ b/Preferences/ConfigurationPages/HelpViewersPage.py	Tue Mar 29 16:34:32 2016 +0200
@@ -9,7 +9,21 @@
 
 from __future__ import unicode_literals
 
+from PyQt5.QtCore import qVersion
 from PyQt5.QtWidgets import QButtonGroup
+try:
+    from PyQt5 import QtWebKit      # __IGNORE_WARNING__
+    WEBKIT_AVAILABLE = True
+except ImportError:
+    WEBKIT_AVAILABLE = False
+if qVersion() < "5.6.0":
+    WEBENGINE_AVAILABLE = False
+else:
+    try:
+        from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+        WEBENGINE_AVAILABLE = True
+    except ImportError:
+        WEBENGINE_AVAILABLE = False
 
 from E5Gui.E5PathPicker import E5PathPickerModes
 
@@ -40,14 +54,14 @@
         self.helpViewerGroup.addButton(self.customViewerButton)
         
         # set initial values
-        hvId = Preferences.getHelp("HelpViewerType")
-        # check availability of QtWebKit
-        try:
-            from PyQt5 import QtWebKit      # __IGNORE_WARNING__
-        except ImportError:
-            # not available, reset help viewer to default
+        if WEBENGINE_AVAILABLE:
+            hvId = Preferences.getWebBrowser("HelpViewerType")
+        else:
+            hvId = Preferences.getHelp("HelpViewerType")
+        if not WEBENGINE_AVAILABLE and not WEBKIT_AVAILABLE:
             if hvId == 1:
-                hvId = Preferences.Prefs.helpDefaults["HelpViewerType"]
+                hvId = Preferences.Prefs.webBrowserDefaultsDefaults[
+                    "HelpViewerType"]
             self.helpBrowserButton.setEnabled(False)
         
         if hvId == 1:
@@ -74,6 +88,7 @@
         elif self.customViewerButton.isChecked():
             hvId = 4
         Preferences.setHelp("HelpViewerType", hvId)
+        Preferences.setWebBrowser("HelpViewerType", hvId)
         Preferences.setHelp(
             "CustomViewer",
             self.customViewerPicker.text())