Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/__init__.py	Wed Oct 20 19:45:22 2021 +0200
+++ b/eric7/Preferences/__init__.py	Wed Oct 20 19:47:18 2021 +0200
@@ -909,6 +909,7 @@
         "PySide2DocDir": "",
         "PySide6DocDir": "",
         "EricDocDir": "",
+        "HelpViewerType": 0,    # internal help viewer
     }
     
     # defaults for the web browser settings
@@ -1042,12 +1043,6 @@
         "SafeBrowsingUpdateDateTime": QDateTime(),
         "SafeBrowsingUseLookupApi": False,
     }
-    # TODO: change default to internal help viewer (= 0) and move to
-    #       helpDefaults
-    if QWebEngineSettings:
-        webBrowserDefaults["HelpViewerType"] = 1      # eric browser
-    else:
-        webBrowserDefaults["HelpViewerType"] = 2      # Qt Assistant
     
     @classmethod
     def initWebEngineSettingsDefaults(cls):
@@ -2659,8 +2654,12 @@
     @param key the key of the value to get
     @return the requested help setting
     """
-    return Prefs.settings.value("Help/" + key,
-                                Prefs.helpDefaults[key])
+    if key in ("HelpViewerType", ):
+        return int(Prefs.settings.value(
+            "Help/" + key, Prefs.helpDefaults[key]))
+    else:
+        return Prefs.settings.value(
+            "Help/" + key, Prefs.helpDefaults[key])
 
 
 def setHelp(key, value):
@@ -2748,13 +2747,6 @@
         return pwConvert(Prefs.settings.value(
             "WebBrowser/" + key, Prefs.webBrowserDefaults[key]),
             encode=False)
-    elif key == "HelpViewerType":
-        # special treatment to adjust for missing QtWebEngine
-        value = int(Prefs.settings.value(
-            "WebBrowser/" + key, Prefs.webBrowserDefaults[key]))
-        if QWebEngineSettings is None:
-            value = Prefs.webBrowserDefaults[key]
-        return value
     elif key in ["StartupBehavior", "HistoryLimit",
                  "DownloadManagerRemovePolicy", "SyncType", "SyncFtpPort",
                  "SyncFtpIdleTimeout", "SyncEncryptionKeyLength",