diff options
author | Florian Bruhin <me@the-compiler.org> | 2020-01-24 15:25:48 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2020-01-24 15:25:48 +0100 |
commit | 94235defe358555171b399af5e686674f519b7c1 (patch) | |
tree | 7ab4a6af498a5d0be62f5f2e3a9faa6504ae28a1 | |
parent | b8866e69faca373f3ed92ae43ef845087d20b2b6 (diff) | |
download | qutebrowser-94235defe358555171b399af5e686674f519b7c1.tar.gz qutebrowser-94235defe358555171b399af5e686674f519b7c1.zip |
Rename force_dark_color_scheme to prefers_color_scheme_dark
See #4840
-rw-r--r-- | doc/changelog.asciidoc | 4 | ||||
-rw-r--r-- | doc/help/settings.asciidoc | 8 | ||||
-rw-r--r-- | qutebrowser/config/configdata.yml | 5 | ||||
-rw-r--r-- | qutebrowser/config/configinit.py | 2 | ||||
-rw-r--r-- | tests/unit/config/test_configinit.py | 8 |
5 files changed, 15 insertions, 12 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index d4503d5f0..42095c89e 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -21,8 +21,8 @@ v1.10.0 (unreleased) Added ~~~~~ -- New `colors.webpage.force_dark_color_scheme` setting which allows forcing - `prefer-color-scheme: dark` colors for websites (QtWebEngine with Qt 5.14 or +- New `colors.webpage.prefers_color_scheme_dark` setting which allows forcing + `prefers-color-scheme: dark` colors for websites (QtWebEngine with Qt 5.14 or newer). - New `fonts.default_size` setting which can be used to set a bigger font size for all UI fonts. diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 280ce72bc..ffee2c7c6 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -109,7 +109,7 @@ |<<colors.tabs.selected.odd.bg,colors.tabs.selected.odd.bg>>|Background color of selected odd tabs. |<<colors.tabs.selected.odd.fg,colors.tabs.selected.odd.fg>>|Foreground color of selected odd tabs. |<<colors.webpage.bg,colors.webpage.bg>>|Background color for webpages if unset (or empty to use the theme's color). -|<<colors.webpage.force_dark_color_scheme,colors.webpage.force_dark_color_scheme>>|Force `prefer-color-scheme: dark` colors for websites. +|<<colors.webpage.prefers_color_scheme_dark,colors.webpage.prefers_color_scheme_dark>>|Force `prefers-color-scheme: dark` colors for websites. |<<completion.cmd_history_max_items,completion.cmd_history_max_items>>|Number of commands to save in the command history. |<<completion.delay,completion.delay>>|Delay (in milliseconds) before updating completions after typing a character. |<<completion.height,completion.height>>|Height (in pixels or as percentage of the window) of the completion. @@ -1506,9 +1506,9 @@ Type: <<types,QtColor>> Default: +pass:[white]+ -[[colors.webpage.force_dark_color_scheme]] -=== colors.webpage.force_dark_color_scheme -Force `prefer-color-scheme: dark` colors for websites. +[[colors.webpage.prefers_color_scheme_dark]] +=== colors.webpage.prefers_color_scheme_dark +Force `prefers-color-scheme: dark` colors for websites. Type: <<types,Bool>> diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml index cf66bd0cb..31504ced3 100644 --- a/qutebrowser/config/configdata.yml +++ b/qutebrowser/config/configdata.yml @@ -2500,9 +2500,12 @@ colors.webpage.bg: color)." colors.webpage.force_dark_color_scheme: + renamed: colors.webpage.prefers_color_scheme_dark + +colors.webpage.prefers_color_scheme_dark: default: false type: Bool - desc: "Force `prefer-color-scheme: dark` colors for websites." + desc: "Force `prefers-color-scheme: dark` colors for websites." backend: QtWebEngine: Qt 5.14 QtWebKit: false diff --git a/qutebrowser/config/configinit.py b/qutebrowser/config/configinit.py index f487a1de3..88f987c7a 100644 --- a/qutebrowser/config/configinit.py +++ b/qutebrowser/config/configinit.py @@ -272,7 +272,7 @@ def _qtwebengine_args(namespace: argparse.Namespace) -> typing.Iterator[str]: } if qtutils.version_check('5.14'): - settings['colors.webpage.force_dark_color_scheme'] = { + settings['colors.webpage.prefers_color_scheme_dark'] = { True: '--force-dark-mode', False: None, } diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py index bbe5820e1..395af3677 100644 --- a/tests/unit/config/test_configinit.py +++ b/tests/unit/config/test_configinit.py @@ -659,22 +659,22 @@ class TestQtArgs: else: assert arg in args - @pytest.mark.parametrize('force, new_qt, added', [ + @pytest.mark.parametrize('dark, new_qt, added', [ (True, True, True), (True, False, False), (False, True, False), (False, False, False), ]) @utils.qt514 - def test_force_dark_color_scheme(self, config_stub, monkeypatch, parser, - force, new_qt, added): + def test_prefers_color_scheme_dark(self, config_stub, monkeypatch, parser, + dark, new_qt, added): monkeypatch.setattr(configinit.objects, 'backend', usertypes.Backend.QtWebEngine) monkeypatch.setattr(configinit.qtutils, 'version_check', lambda version, exact=False, compiled=True: new_qt) - config_stub.val.colors.webpage.force_dark_color_scheme = force + config_stub.val.colors.webpage.prefers_color_scheme_dark = dark parsed = parser.parse_args([]) args = configinit.qt_args(parsed) |