summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-01-20 21:06:13 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-01-20 21:06:13 +0100
commitd6fe18edd74436fbf2d0fddcd3f35ec89467d848 (patch)
tree1b4acb642d7104a2289b6be4d85ade22a560654e
parentf8aec212c8df15d5e3062176430b804467dbb2c4 (diff)
downloadqutebrowser-d6fe18edd74436fbf2d0fddcd3f35ec89467d848.tar.gz
qutebrowser-d6fe18edd74436fbf2d0fddcd3f35ec89467d848.zip
Fix docs/lint
-rw-r--r--doc/help/settings.asciidoc35
-rw-r--r--qutebrowser/config/configinit.py1
-rw-r--r--tests/unit/config/test_configutils.py4
3 files changed, 25 insertions, 15 deletions
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 27aff77d3..280ce72bc 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -192,6 +192,7 @@
|<<fonts.contextmenu,fonts.contextmenu>>|Font used for the context menu.
|<<fonts.debug_console,fonts.debug_console>>|Font used for the debugging console.
|<<fonts.default_family,fonts.default_family>>|Default font families to use.
+|<<fonts.default_size,fonts.default_size>>|Default font size to use.
|<<fonts.downloads,fonts.downloads>>|Font used for the downloadbar.
|<<fonts.hints,fonts.hints>>|Font used for the hints.
|<<fonts.keyhint,fonts.keyhint>>|Font used in the keyhint widget.
@@ -2449,7 +2450,7 @@ Font used in the completion categories.
Type: <<types,Font>>
-Default: +pass:[bold 10pt default_family]+
+Default: +pass:[bold default_size default_family]+
[[fonts.completion.entry]]
=== fonts.completion.entry
@@ -2457,7 +2458,7 @@ Font used in the completion widget.
Type: <<types,Font>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.contextmenu]]
=== fonts.contextmenu
@@ -2474,7 +2475,7 @@ Font used for the debugging console.
Type: <<types,QtFont>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.default_family]]
=== fonts.default_family
@@ -2486,13 +2487,23 @@ Type: <<types,List of Font&#44; or Font>>
Default: empty
+[[fonts.default_size]]
+=== fonts.default_size
+Default font size to use.
+Whenever "default_size" is used in a font setting, it's replaced with the size listed here.
+Valid values are either a float value with a "pt" suffix, or an integer value with a "px" suffix.
+
+Type: <<types,String>>
+
+Default: +pass:[10pt]+
+
[[fonts.downloads]]
=== fonts.downloads
Font used for the downloadbar.
Type: <<types,Font>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.hints]]
=== fonts.hints
@@ -2500,7 +2511,7 @@ Font used for the hints.
Type: <<types,Font>>
-Default: +pass:[bold 10pt default_family]+
+Default: +pass:[bold default_size default_family]+
[[fonts.keyhint]]
=== fonts.keyhint
@@ -2508,7 +2519,7 @@ Font used in the keyhint widget.
Type: <<types,Font>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.messages.error]]
=== fonts.messages.error
@@ -2516,7 +2527,7 @@ Font used for error messages.
Type: <<types,Font>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.messages.info]]
=== fonts.messages.info
@@ -2524,7 +2535,7 @@ Font used for info messages.
Type: <<types,Font>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.messages.warning]]
=== fonts.messages.warning
@@ -2532,7 +2543,7 @@ Font used for warning messages.
Type: <<types,Font>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.prompts]]
=== fonts.prompts
@@ -2540,7 +2551,7 @@ Font used for prompts.
Type: <<types,Font>>
-Default: +pass:[10pt sans-serif]+
+Default: +pass:[default_size sans-serif]+
[[fonts.statusbar]]
=== fonts.statusbar
@@ -2548,7 +2559,7 @@ Font used in the statusbar.
Type: <<types,Font>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.tabs]]
=== fonts.tabs
@@ -2556,7 +2567,7 @@ Font used in the tab bar.
Type: <<types,QtFont>>
-Default: +pass:[10pt default_family]+
+Default: +pass:[default_size default_family]+
[[fonts.web.family.cursive]]
=== fonts.web.family.cursive
diff --git a/qutebrowser/config/configinit.py b/qutebrowser/config/configinit.py
index 176bbbddc..f487a1de3 100644
--- a/qutebrowser/config/configinit.py
+++ b/qutebrowser/config/configinit.py
@@ -128,7 +128,6 @@ def _update_font_defaults(setting: str) -> None:
if not isinstance(opt.typ, configtypes.Font):
continue
-
value = config.instance.get_obj(name)
if value is None or not (value.endswith(' default_family') or
value.startswith('default_size ')):
diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
index 1046a1de6..8dfa75609 100644
--- a/tests/unit/config/test_configutils.py
+++ b/tests/unit/config/test_configutils.py
@@ -230,9 +230,9 @@ def test_get_equivalent_patterns(empty_values):
def test_get_trailing_dot(values):
- """A domain with a trailing dot is equivalent to the same without:
+ """A domain with a trailing dot should be equivalent to the same without.
- http://www.dns-sd.org/trailingdotsindomainnames.html
+ See http://www.dns-sd.org/trailingdotsindomainnames.html
Thus, we expect to get the same setting for both.
"""