Mercurial Repositories > eric / file diff

diff -r 939ff20f712d -r 1e3d61349671 UI/UserInterface.py
--- a/UI/UserInterface.py	Tue Mar 29 10:32:22 2016 +0200
+++ b/UI/UserInterface.py	Tue Mar 29 16:34:32 2016 +0200
@@ -4864,7 +4864,10 @@
         if home.endswith(".chm"):
             self.__chmViewer(home)
         else:
-            hvType = Preferences.getHelp("HelpViewerType")
+            if WEBENGINE_AVAILABLE:
+                hvType = Preferences.getWebBrowser("HelpViewerType")
+            else:
+                hvType = Preferences.getHelp("HelpViewerType")
             if hvType == 1:
                 self.launchHelpViewer(home)
             elif hvType == 2:
@@ -4923,7 +4926,10 @@
         if home.endswith(".chm"):
             self.__chmViewer(home)
         else:
-            hvType = Preferences.getHelp("HelpViewerType")
+            if WEBENGINE_AVAILABLE:
+                hvType = Preferences.getWebBrowser("HelpViewerType")
+            else:
+                hvType = Preferences.getHelp("HelpViewerType")
             if hvType == 1:
                 self.launchHelpViewer(home)
             elif hvType == 2:
@@ -4989,7 +4995,10 @@
             else:
                 home = "file://" + home
         
-        hvType = Preferences.getHelp("HelpViewerType")
+        if WEBENGINE_AVAILABLE:
+            hvType = Preferences.getWebBrowser("HelpViewerType")
+        else:
+            hvType = Preferences.getHelp("HelpViewerType")
         if hvType == 1:
             self.launchHelpViewer(home)
         elif hvType == 2:
@@ -5051,7 +5060,10 @@
         else:
             home = pyqt4DocDir
         
-        hvType = Preferences.getHelp("HelpViewerType")
+        if WEBENGINE_AVAILABLE:
+            hvType = Preferences.getWebBrowser("HelpViewerType")
+        else:
+            hvType = Preferences.getHelp("HelpViewerType")
         if hvType == 1:
             self.launchHelpViewer(home)
         elif hvType == 2:
@@ -5115,7 +5127,10 @@
         else:
             home = pyqt5DocDir
         
-        hvType = Preferences.getHelp("HelpViewerType")
+        if WEBENGINE_AVAILABLE:
+            hvType = Preferences.getWebBrowser("HelpViewerType")
+        else:
+            hvType = Preferences.getHelp("HelpViewerType")
         if hvType == 1:
             self.launchHelpViewer(home)
         elif hvType == 2:
@@ -5152,7 +5167,10 @@
             else:
                 home = "file://" + home
         
-        hvType = Preferences.getHelp("HelpViewerType")
+        if WEBENGINE_AVAILABLE:
+            hvType = Preferences.getWebBrowser("HelpViewerType")
+        else:
+            hvType = Preferences.getHelp("HelpViewerType")
         if hvType == 1:
             self.launchHelpViewer(home)
         elif hvType == 2:
@@ -5204,7 +5222,10 @@
         else:
             home = pysideDocDir
         
-        hvType = Preferences.getHelp("HelpViewerType")
+        if WEBENGINE_AVAILABLE:
+            hvType = Preferences.getWebBrowser("HelpViewerType")
+        else:
+            hvType = Preferences.getHelp("HelpViewerType")
         if hvType == 1:
             self.launchHelpViewer(home)
         elif hvType == 2: