diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 9c576a283..3828c1257 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -2292,9 +2292,9 @@ Type: <> Valid values: - * +disallow-unknown-url-schemes+: Disallows all navigation requests to URLs with unknown schemes. - * +allow-unknown-url-schemes-from-user-interaction+: Allows navigation requests to URLs with unknown schemes that are issued from user-interaction (like a mouse-click), whereas other navigation requests (for example from JavaScript) are suppressed. - * +allow-all-unknown-url-schemes+: Allows all navigation requests to URLs with unknown schemes. + * +disallow+: Disallows all navigation requests to URLs with unknown schemes. + * +allow-from-user-interaction+: Allows navigation requests to URLs with unknown schemes that are issued from user-interaction (like a mouse-click), whereas other navigation requests (for example from JavaScript) are suppressed. + * +allow-all+: Allows all navigation requests to URLs with unknown schemes. Default: +pass:[allow-unknown-url-schemes-from-user-interaction]+ diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index 4e295ce81..f02b80061 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -161,11 +161,11 @@ class WebEngineSettings(websettings.AbstractSettings): # Only Qt >= 5.11 support UnknownUrlSchemePolicy try: _UNKNOWN_URL_SCHEME_POLICY = { - 'disallow-unknown-url-schemes': + 'disallow': QWebEngineSettings.DisallowUnknownUrlSchemes, - 'allow-unknown-url-schemes-from-user-interaction': + 'allow-from-user-interaction': QWebEngineSettings.AllowUnknownUrlSchemesFromUserInteraction, - 'allow-all-unknown-url-schemes': + 'allow-all': QWebEngineSettings.AllowAllUnknownUrlSchemes, } except AttributeError: diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml index e7fe20c21..0a44a9be3 100644 --- a/qutebrowser/config/configdata.yml +++ b/qutebrowser/config/configdata.yml @@ -384,14 +384,14 @@ content.unknown_url_scheme_policy: type: name: String valid_values: - - disallow-unknown-url-schemes: "Disallows all navigation requests to - URLs with unknown schemes." - - allow-unknown-url-schemes-from-user-interaction: "Allows navigation - requests to URLs with unknown schemes that are issued from - user-interaction (like a mouse-click), whereas other navigation - requests (for example from JavaScript) are suppressed." - - allow-all-unknown-url-schemes: "Allows all navigation requests to - URLs with unknown schemes." + - disallow: "Disallows all navigation requests to URLs with unknown + schemes." + - allow-from-user-interaction: "Allows navigation requests to URLs with + unknown schemes that are issued from user-interaction (like a + mouse-click), whereas other navigation requests (for example from + JavaScript) are suppressed." + - allow-all: "Allows all navigation requests to URLs with unknown + schemes." default: allow-unknown-url-schemes-from-user-interaction backend: QtWebEngine: Qt 5.11