From 8a3704fbe48bd2ebab9801fb776ec428a1715285 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 4 Oct 2018 19:33:02 +0200 Subject: [PATCH] Update docs --- doc/changelog.asciidoc | 1 + doc/help/settings.asciidoc | 4 ++-- qutebrowser/config/configtypes.py | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 936d4448c..cc0b17d80 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -23,6 +23,7 @@ Changed - Completion highlighting is now done differently (using QSyntaxHighlither), which should fix some highlighting corner-cases. +- The `QtColor` config type now also understands colors like `rgb(...)`. v1.5.1 (unreleased) ------------------- diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 60257de62..a401242aa 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -794,7 +794,7 @@ Default: +pass:[black]+ === colors.completion.match.fg Foreground color of the matched text in the completion. -Type: <> +Type: <> Default: +pass:[#ff4444]+ @@ -3530,7 +3530,7 @@ When setting from a string, pass a json-like list, e.g. `["one", "two"]`. A value can be in one of the following formats: * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` * An SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. * transparent (no color) * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or percentages) * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359) * A gradient as explained in http://doc.qt.io/qt-5/stylesheet-reference.html#list-of-property-types[the Qt documentation] under ``Gradient'' |QtColor|A color value. -A value can be in one of the following formats: * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` * An SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. * transparent (no color) +A value can be in one of the following formats: * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` * An SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. * transparent (no color) * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or percentages) * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359) |QtFont|A font family, with optional style/weight/size. * Style: `normal`/`italic`/`oblique` * Weight: `normal`, `bold`, `100`..`900` * Size: _number_ `px`/`pt` diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py index 4eca47521..d5696d249 100644 --- a/qutebrowser/config/configtypes.py +++ b/qutebrowser/config/configtypes.py @@ -920,6 +920,8 @@ class QtColor(BaseType): * An SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. * transparent (no color) + * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or percentages) + * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359) """ def _parse_value(self, val):