diff -r 362360f9a979 -r b56735d36159 WebBrowser/WebBrowserWindow.py
--- a/WebBrowser/WebBrowserWindow.py Sun Mar 20 15:17:31 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py Sun Mar 20 20:13:29 2016 +0100
@@ -431,10 +431,6 @@
settings.setAttribute(
QWebEngineSettings.AutoLoadImages,
Preferences.getWebBrowser("AutoLoadImages"))
- # TODO: Qt 5.6
-## settings.setAttribute(
-## QWebSettings.JavaEnabled,
-## Preferences.getWebBrowser("JavaEnabled"))
settings.setAttribute(
QWebEngineSettings.JavascriptEnabled,
Preferences.getWebBrowser("JavaScriptEnabled"))
@@ -444,42 +440,10 @@
settings.setAttribute(
QWebEngineSettings.JavascriptCanAccessClipboard,
Preferences.getWebBrowser("JavaScriptCanAccessClipboard"))
- # TODO: Qt 5.6
-## settings.setAttribute(
-## QWebSettings.PluginsEnabled,
-## Preferences.getWebBrowser("PluginsEnabled"))
-
-## if hasattr(QWebSettings, "PrintElementBackgrounds"):
-## settings.setAttribute(
-## QWebSettings.PrintElementBackgrounds,
-## Preferences.getWebBrowser("PrintBackgrounds"))
-##
-## if hasattr(QWebSettings, "setOfflineStoragePath"):
-## settings.setAttribute(
-## QWebSettings.OfflineStorageDatabaseEnabled,
-## Preferences.getWebBrowser("OfflineStorageDatabaseEnabled"))
-## webDatabaseDir = os.path.join(
-## Utilities.getConfigDir(), "web_browser", "webdatabases")
-## if not os.path.exists(webDatabaseDir):
-## os.makedirs(webDatabaseDir)
-## settings.setOfflineStoragePath(webDatabaseDir)
-## settings.setOfflineStorageDefaultQuota(
-## Preferences.getWebBrowser("OfflineStorageDatabaseQuota") *
-## 1024 * 1024)
-##
-## if hasattr(QWebSettings, "OfflineWebApplicationCacheEnabled"):
-## settings.setAttribute(
-## QWebSettings.OfflineWebApplicationCacheEnabled,
-## Preferences.getWebBrowser("OfflineWebApplicationCacheEnabled"))
-## appCacheDir = os.path.join(
-## Utilities.getConfigDir(), "web_browser", "webappcaches")
-## if not os.path.exists(appCacheDir):
-## os.makedirs(appCacheDir)
-## settings.setOfflineWebApplicationCachePath(appCacheDir)
-## settings.setOfflineWebApplicationCacheQuota(
-## Preferences.getWebBrowser("OfflineWebApplicationCacheQuota") *
-## 1024 * 1024)
-##
+ settings.setAttribute(
+ QWebEngineSettings.PluginsEnabled,
+ Preferences.getWebBrowser("PluginsEnabled"))
+
if self.isPrivate():
settings.setAttribute(
QWebEngineSettings.LocalStorageEnabled, False)
@@ -487,18 +451,6 @@
settings.setAttribute(
QWebEngineSettings.LocalStorageEnabled,
Preferences.getWebBrowser("LocalStorageEnabled"))
- # TODO: Local Storage
-## localStorageDir = os.path.join(
-## Utilities.getConfigDir(), "web_browser", "weblocalstorage")
-## if not os.path.exists(localStorageDir):
-## os.makedirs(localStorageDir)
-## settings.setLocalStoragePath(localStorageDir)
-##
-## if hasattr(QWebSettings, "DnsPrefetchEnabled"):
-## settings.setAttribute(
-## QWebSettings.DnsPrefetchEnabled,
-## Preferences.getWebBrowser("DnsPrefetchEnabled"))
-##
settings.setDefaultTextEncoding(
Preferences.getWebBrowser("DefaultTextEncoding"))
@@ -3342,16 +3294,9 @@
shutil.rmtree(cachePath)
if cookies:
self.cookieJar().clear()
+ self.webProfile().cookieStore().deleteAllCookies()
if passwords:
self.passwordManager().clear()
- # TODO: Web Databases
-## if databases:
-## if hasattr(QWebDatabase, "removeAllDatabases"):
-## QWebDatabase.removeAllDatabases()
-## else:
-## for securityOrigin in QWebSecurityOrigin.allOrigins():
-## for database in securityOrigin.databases():
-## QWebDatabase.removeDatabase(database)
if flashCookies:
self.flashCookieManager().removeAllCookies()
if zoomValues:
