diff -r 396fc1508450 -r 641304b46f08 eric7/Preferences/__init__.py
--- a/eric7/Preferences/__init__.py Sun Aug 29 20:21:41 2021 +0200
+++ b/eric7/Preferences/__init__.py Mon Aug 30 20:02:39 2021 +0200
@@ -22,7 +22,6 @@
import shutil
import json
import sys
-import contextlib
from PyQt6.QtCore import (
QDir, QPoint, QLocale, QSettings, QFileInfo, QCoreApplication, QByteArray,
@@ -1055,9 +1054,9 @@
if QWebEngineSettings is None:
return
-## webEngineSettings = QWebEngineSettings.defaultSettings()
webEngineSettings = QWebEngineProfile.defaultProfile().settings()
cls.webBrowserDefaults.update({
+ # fonts
"StandardFontFamily": webEngineSettings.fontFamily(
QWebEngineSettings.FontFamily.StandardFont),
"FixedFontFamily": webEngineSettings.fontFamily(
@@ -1070,6 +1069,10 @@
QWebEngineSettings.FontFamily.CursiveFont),
"FantasyFontFamily": webEngineSettings.fontFamily(
QWebEngineSettings.FontFamily.FantasyFont),
+ "PictographFontFamily": webEngineSettings.fontFamily(
+ QWebEngineSettings.FontFamily.PictographFont),
+
+ # font sizes
"DefaultFontSize": webEngineSettings.fontSize(
QWebEngineSettings.FontSize.DefaultFontSize),
"DefaultFixedFontSize": webEngineSettings.fontSize(
@@ -1078,6 +1081,11 @@
QWebEngineSettings.FontSize.MinimumFontSize),
"MinimumLogicalFontSize": webEngineSettings.fontSize(
QWebEngineSettings.FontSize.MinimumLogicalFontSize),
+
+ # text encoding
+ "DefaultTextEncoding": webEngineSettings.defaultTextEncoding(),
+
+ # web attributes
"AutoLoadImages": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.AutoLoadImages),
"JavaScriptEnabled": webEngineSettings.testAttribute(
@@ -1086,34 +1094,36 @@
QWebEngineSettings.WebAttribute.JavascriptCanOpenWindows),
"JavaScriptCanAccessClipboard": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.JavascriptCanAccessClipboard),
- "PluginsEnabled": webEngineSettings.testAttribute(
- QWebEngineSettings.WebAttribute.PluginsEnabled),
+ "LinksIncludedInFocusChain": webEngineSettings.testAttribute(
+ QWebEngineSettings.WebAttribute.LinksIncludedInFocusChain),
"LocalStorageEnabled": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.LocalStorageEnabled),
- "DefaultTextEncoding": webEngineSettings.defaultTextEncoding(),
- "SpatialNavigationEnabled": webEngineSettings.testAttribute(
- QWebEngineSettings.WebAttribute.SpatialNavigationEnabled),
- "LinksIncludedInFocusChain": webEngineSettings.testAttribute(
- QWebEngineSettings.WebAttribute.LinksIncludedInFocusChain),
"LocalContentCanAccessRemoteUrls": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute
.LocalContentCanAccessRemoteUrls),
+ "XSSAuditingEnabled": webEngineSettings.testAttribute(
+ QWebEngineSettings.WebAttribute.XSSAuditingEnabled),
+ "SpatialNavigationEnabled": webEngineSettings.testAttribute(
+ QWebEngineSettings.WebAttribute.SpatialNavigationEnabled),
"LocalContentCanAccessFileUrls": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.LocalContentCanAccessFileUrls),
- "XSSAuditingEnabled": webEngineSettings.testAttribute(
- QWebEngineSettings.WebAttribute.XSSAuditingEnabled),
"ScrollAnimatorEnabled": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.ScrollAnimatorEnabled),
"ErrorPageEnabled": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.ErrorPageEnabled),
+ "PluginsEnabled": webEngineSettings.testAttribute(
+ QWebEngineSettings.WebAttribute.PluginsEnabled),
"FullScreenSupportEnabled": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.FullScreenSupportEnabled),
- "PictographFontFamily": webEngineSettings.fontFamily(
- QWebEngineSettings.FontFamily.PictographFont),
"ScreenCaptureEnabled": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.ScreenCaptureEnabled),
"WebGLEnabled": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.WebGLEnabled),
+ # TODO: add support for these attributes
+ "Accelerated2dCanvasEnabled": webEngineSettings.testAttribute(
+ QWebEngineSettings.WebAttribute.Accelerated2dCanvasEnabled),
+ "AutoLoadIconsForPage": webEngineSettings.testAttribute(
+ QWebEngineSettings.WebAttribute.AutoLoadIconsForPage),
"FocusOnNavigationEnabled": webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.FocusOnNavigationEnabled),
"PrintElementBackgrounds": webEngineSettings.testAttribute(
@@ -1144,18 +1154,10 @@
"DnsPrefetchEnabled":
webEngineSettings.testAttribute(
QWebEngineSettings.WebAttribute.DnsPrefetchEnabled),
- # TODO: add support for these attributes
-# "HyperlinkAuditingEnabled"
-# "Accelerated2dCanvasEnabled"
-# "AutoLoadIconsForPage"
+ "PdfViewerEnabled":
+ webEngineSettings.testAttribute(
+ QWebEngineSettings.WebAttribute.PdfViewerEnabled),
})
- with contextlib.suppress(AttributeError):
- # Qt 5.13
- cls.webBrowserDefaults.update({
- "PdfViewerEnabled":
- webEngineSettings.testAttribute(
- QWebEngineSettings.WebAttribute.PdfViewerEnabled),
- })
cls.webEngineSettingsIntitialized = True
@@ -2830,6 +2832,7 @@
"WebRTCPublicInterfacesOnly", "DnsPrefetchEnabled",
"VirusTotalEnabled", "VirusTotalSecure",
"PdfViewerEnabled", "AlwaysRejectFaultyCertificates",
+ "Accelerated2dCanvasEnabled", "AutoLoadIconsForPage",
]:
return toBool(prefClass.settings.value(
"WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
