Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Tue Mar 29 10:32:22 2016 +0200
+++ b/Preferences/__init__.py	Tue Mar 29 16:34:32 2016 +0200
@@ -1075,6 +1075,10 @@
         # PIM:                  identical to helpDefaults
         # VirusTotal:           identical to helpDefaults
     }
+    if QWebEngineSettings:
+        webBrowserDefaults["HelpViewerType"] = 1      # eric browser
+    else:
+        webBrowserDefaults["HelpViewerType"] = 2      # Qt Assistant
     
     @classmethod
     def initWebEngineSettingsDefaults(cls):
@@ -2773,17 +2777,14 @@
         from Utilities.crypto import pwConvert
         return pwConvert(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.helpDefaults[key]), encode=False)
-    # TODO: QtHelp
-##    elif key == "HelpViewerType":
-##        # special treatment to adjust for missing QtWebKit
-##        value = int(prefClass.settings.value(
-##            "WebBrowser/" + key, prefClass.helpDefaults[key]))
-##        if QWebSettings is None:
-##            value = prefClass.helpDefaults[key]
-##        return value
-##    elif key in ["StartupBehavior",
-##                 "OfflineStorageDatabaseQuota",
-##                 "OfflineWebApplicationCacheQuota", "CachePolicy",
+    elif key == "HelpViewerType":
+        # special treatment to adjust for missing QtWebEngine
+        value = int(prefClass.settings.value(
+            "WebBrowser/" + key, prefClass.helpDefaults[key]))
+        if QWebEngineSettings is None:
+            value = prefClass.helpDefaults[key]
+        return value
+##    elif key in [ "CachePolicy",
 ##                  ]:
     elif key in ["StartupBehavior", "HistoryLimit",
                  "DownloadManagerRemovePolicy","SyncType", "SyncFtpPort",
@@ -2796,9 +2797,7 @@
                  ]:
         return int(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
-##    elif key in ["PrintBackgrounds",
-##                 "JavaEnabled",
-##                 "JavaScriptCanCloseWindows",
+##    elif key in ["JavaScriptCanCloseWindows",
 ##                 "DnsPrefetchEnabled",
 ##                 "OfflineStorageDatabaseEnabled",
 ##                 "OfflineWebApplicationCacheEnabled", "LocalStorageEnabled",