--- a/eric6/Preferences/__init__.py Sat Jan 02 17:28:57 2021 +0100
+++ b/eric6/Preferences/__init__.py Sun Jan 03 15:33:39 2021 +0100
@@ -944,8 +944,6 @@
"ImageSearchEngine": "Google",
"RssFeeds": [],
"ShowPreview": True,
- "WebInspectorPort": 42024,
- "WebInspectorEnabled": False,
"DiskCacheEnabled": True,
"DiskCacheSize": 50, # 50 MB
"SslExceptionsDB": "{}", # empty JSON dictionary
@@ -1085,7 +1083,6 @@
QWebEngineSettings.MinimumFontSize),
"MinimumLogicalFontSize": webEngineSettings.fontSize(
QWebEngineSettings.MinimumLogicalFontSize),
-
"AutoLoadImages": webEngineSettings.testAttribute(
QWebEngineSettings.AutoLoadImages),
"JavaScriptEnabled": webEngineSettings.testAttribute(
@@ -1115,78 +1112,41 @@
QWebEngineSettings.ErrorPageEnabled),
"FullScreenSupportEnabled": webEngineSettings.testAttribute(
QWebEngineSettings.FullScreenSupportEnabled),
+ "PictographFontFamily": webEngineSettings.fontFamily(
+ QWebEngineSettings.PictographFont),
+ "ScreenCaptureEnabled": webEngineSettings.testAttribute(
+ QWebEngineSettings.ScreenCaptureEnabled),
+ "WebGLEnabled": webEngineSettings.testAttribute(
+ QWebEngineSettings.WebGLEnabled),
+ "FocusOnNavigationEnabled": webEngineSettings.testAttribute(
+ QWebEngineSettings.FocusOnNavigationEnabled),
+ "PrintElementBackgrounds": webEngineSettings.testAttribute(
+ QWebEngineSettings.PrintElementBackgrounds),
+ "AllowRunningInsecureContent": webEngineSettings.testAttribute(
+ QWebEngineSettings.AllowRunningInsecureContent),
+ "AllowGeolocationOnInsecureOrigins":
+ webEngineSettings.testAttribute(
+ QWebEngineSettings.AllowGeolocationOnInsecureOrigins),
+ "AllowWindowActivationFromJavaScript":
+ webEngineSettings.testAttribute(
+ QWebEngineSettings.AllowWindowActivationFromJavaScript
+ ),
+ "ShowScrollBars": webEngineSettings.testAttribute(
+ QWebEngineSettings.ShowScrollBars),
+ "PlaybackRequiresUserGesture":
+ webEngineSettings.testAttribute(
+ QWebEngineSettings.PlaybackRequiresUserGesture),
+ "JavaScriptCanPaste":
+ webEngineSettings.testAttribute(
+ QWebEngineSettings.JavascriptCanPaste),
+ "WebRTCPublicInterfacesOnly":
+ webEngineSettings.testAttribute(
+ QWebEngineSettings.WebRTCPublicInterfacesOnly),
+ "DnsPrefetchEnabled":
+ webEngineSettings.testAttribute(
+ QWebEngineSettings.DnsPrefetchEnabled),
})
try:
- # Qt 5.7+
- cls.webBrowserDefaults.update({
- "PictographFontFamily": webEngineSettings.fontFamily(
- QWebEngineSettings.PictographFont),
-
- "ScreenCaptureEnabled": webEngineSettings.testAttribute(
- QWebEngineSettings.ScreenCaptureEnabled),
- "WebGLEnabled": webEngineSettings.testAttribute(
- QWebEngineSettings.WebGLEnabled),
- })
- except AttributeError:
- pass
- try:
- # Qt 5.8+
- cls.webBrowserDefaults.update({
- "FocusOnNavigationEnabled": webEngineSettings.testAttribute(
- QWebEngineSettings.FocusOnNavigationEnabled),
- "PrintElementBackgrounds": webEngineSettings.testAttribute(
- QWebEngineSettings.PrintElementBackgrounds),
- "AllowRunningInsecureContent": webEngineSettings.testAttribute(
- QWebEngineSettings.AllowRunningInsecureContent),
- })
- except AttributeError:
- pass
- try:
- # Qt 5.9+
- cls.webBrowserDefaults.update({
- "AllowGeolocationOnInsecureOrigins":
- webEngineSettings.testAttribute(
- QWebEngineSettings.AllowGeolocationOnInsecureOrigins),
- })
- except AttributeError:
- pass
- try:
- # Qt 5.10+
- cls.webBrowserDefaults.update({
- "AllowWindowActivationFromJavaScript":
- webEngineSettings.testAttribute(
- QWebEngineSettings.AllowWindowActivationFromJavaScript
- ),
- "ShowScrollBars": webEngineSettings.testAttribute(
- QWebEngineSettings.ShowScrollBars),
- })
- except AttributeError:
- pass
- try:
- # Qt 5.11+
- cls.webBrowserDefaults.update({
- "PlaybackRequiresUserGesture":
- webEngineSettings.testAttribute(
- QWebEngineSettings.PlaybackRequiresUserGesture),
- "JavaScriptCanPaste":
- webEngineSettings.testAttribute(
- QWebEngineSettings.JavascriptCanPaste),
- "WebRTCPublicInterfacesOnly":
- webEngineSettings.testAttribute(
- QWebEngineSettings.WebRTCPublicInterfacesOnly),
- })
- except AttributeError:
- pass
- try:
- # Qt 5.12+
- cls.webBrowserDefaults.update({
- "DnsPrefetchEnabled":
- webEngineSettings.testAttribute(
- QWebEngineSettings.DnsPrefetchEnabled),
- })
- except AttributeError:
- pass
- try:
# Qt 5.13
cls.webBrowserDefaults.update({
"PdfViewerEnabled":
@@ -2746,15 +2706,6 @@
@param prefClass preferences class used as the storage area
@return the requested help setting
"""
- # Web inspector stuff must come before initializing web engine settings
- # because that starts the chromium web process
- if key == "WebInspectorPort":
- return int(prefClass.settings.value(
- "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
- elif key == "WebInspectorEnabled":
- return toBool(prefClass.settings.value(
- "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
-
if not prefClass.webEngineSettingsIntitialized:
prefClass.initWebEngineSettingsDefaults()
@@ -2833,8 +2784,7 @@
elif key in ["StartupBehavior", "HistoryLimit",
"DownloadManagerRemovePolicy", "SyncType", "SyncFtpPort",
"SyncFtpIdleTimeout", "SyncEncryptionKeyLength",
- "SearchLanguage", "WebInspectorPort",
- "DefaultFontSize", "DefaultFixedFontSize",
+ "SearchLanguage", "DefaultFontSize", "DefaultFixedFontSize",
"MinimumFontSize", "MinimumLogicalFontSize",
"DiskCacheSize", "AcceptCookies", "KeepCookiesUntil",
"AdBlockUpdatePeriod", "TabManagerGroupByType",
@@ -2857,7 +2807,7 @@
"SyncEnabled", "SyncBookmarks", "SyncHistory",
"SyncPasswords", "SyncUserAgents", "SyncSpeedDial",
"SyncEncryptData", "SyncEncryptPasswordsOnly",
- "ShowPreview", "WebInspectorEnabled", "DiskCacheEnabled",
+ "ShowPreview", "DiskCacheEnabled",
"DoNotTrack", "FilterTrackingCookies",
"AdBlockEnabled", "AdBlockUseLimitedEasyList",
"PluginsEnabled", "FullScreenSupportEnabled",
