Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sat Apr 02 19:44:09 2016 +0200
+++ b/Preferences/__init__.py	Sun Apr 03 16:22:18 2016 +0200
@@ -1117,15 +1117,13 @@
                 QWebEngineSettings.JavascriptEnabled),
             "JavaScriptCanOpenWindows": webEngineSettings.testAttribute(
                 QWebEngineSettings.JavascriptCanOpenWindows),
+            # TODO: Qt 5.7?
 ##            "JavaScriptCanCloseWindows": webEngineSettings.testAttribute(
 ##                QWebEngineSettings.JavascriptCanCloseWindows),
             "JavaScriptCanAccessClipboard": webEngineSettings.testAttribute(
                 QWebEngineSettings.JavascriptCanAccessClipboard),
             "PluginsEnabled": webEngineSettings.testAttribute(
                 QWebEngineSettings.PluginsEnabled),
-##            "OfflineStorageDatabaseEnabled":
-##            websettings.testAttribute(
-##                QWebSettings.OfflineStorageDatabaseEnabled),
             "LocalStorageEnabled": webEngineSettings.testAttribute(
                 QWebEngineSettings.LocalStorageEnabled),
             "DefaultTextEncoding": webEngineSettings.defaultTextEncoding(),
@@ -2707,8 +2705,8 @@
     @param prefClass preferences class used as the storage area
     @return the requested help setting
     """
-    # the following entries are identical to the ones of the help viewer
-    # and are being redirected there
+    # the following entries are identical to the ones of the QtWebKit based
+    # help viewer and are being redirected there
     if key.startswith(("FlashCookie", "Pim", "VirusTotal")):
         return getHelp(key, prefClass)
     
@@ -2784,8 +2782,6 @@
         if QWebEngineSettings is None:
             value = prefClass.helpDefaults[key]
         return value
-##    elif key in [ "CachePolicy",
-##                  ]:
     elif key in ["StartupBehavior", "HistoryLimit",
                  "DownloadManagerRemovePolicy","SyncType", "SyncFtpPort",
                  "SyncFtpIdleTimeout", "SyncEncryptionKeyLength",
@@ -2797,14 +2793,6 @@
                  ]:
         return int(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
-##    elif key in ["JavaScriptCanCloseWindows",
-##                 "DnsPrefetchEnabled",
-##                 "OfflineStorageDatabaseEnabled",
-##                 "OfflineWebApplicationCacheEnabled", "LocalStorageEnabled",
-##                 "AccessKeysEnabled",
-##                 "SiteSpecificQuirksEnabled",
-##                 "ClickToFlashEnabled",
-##                 ]:
     elif key in ["SingleWebBrowserWindow", "SaveGeometry", "JavaScriptEnabled",
                  "JavaScriptCanOpenWindows", "JavaScriptCanAccessClipboard",
                  "AutoLoadImages", "LocalStorageEnabled",
@@ -2823,8 +2811,6 @@
                  ]:
         return toBool(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
-##    elif key in ["ClickToFlashWhitelist",
-##                 "NoCacheHosts",
     elif key in ["GreaseMonkeyDisabledScripts", "SendRefererWhitelist",
                  "AdBlockSubscriptions", "AdBlockExceptions",
                  ]:
@@ -2843,8 +2829,8 @@
     @param value the value to be set
     @param prefClass preferences class used as the storage area
     """
-    # the following entries are identical to the ones of the help viewer
-    # and are being redirected there
+    # the following entries are identical to the ones of the QtWebKit based
+    # help viewer and are being redirected there
     if key.startswith(("FlashCookie", "Pim", "VirusTotal")):
         setHelp(key, value, prefClass)