summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-05-18 20:40:31 +0200
committerFlorian Bruhin <me@the-compiler.org>2022-05-18 20:40:31 +0200
commit72763b3ea01080707e1f6e55e523ef3f58591ede (patch)
tree076b86ca6528e1228f04f1d60fb7e57b1abeb761
parentbd99d2eaab01d025c07dae11240fda2d6ed737aa (diff)
downloadqutebrowser-72763b3ea01080707e1f6e55e523ef3f58591ede.tar.gz
qutebrowser-72763b3ea01080707e1f6e55e523ef3f58591ede.zip
settings: Don't show buttons for content.proxy
See https://www.reddit.com/r/qutebrowser/comments/usj5jr/how_do_i_specify_proxy_address_and_port/
-rw-r--r--qutebrowser/config/configtypes.py8
-rw-r--r--qutebrowser/html/settings.html5
2 files changed, 10 insertions, 3 deletions
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index d3d5e3fb8..97011b7cf 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -109,6 +109,8 @@ class ValidValues:
values: A list with the allowed untransformed values.
descriptions: A dict with value/desc mappings.
generate_docs: Whether to show the values in the docs.
+ others_permitted: Whether arbitrary values are permitted.
+ Used to show buttons in qute://settings.
"""
def __init__(
@@ -119,12 +121,14 @@ class ValidValues:
Tuple[str, Optional[str]],
],
generate_docs: bool = True,
+ others_permitted: bool = False
) -> None:
if not values:
raise ValueError("ValidValues with no values makes no sense!")
self.descriptions: DictType[str, str] = {}
self.values: ListType[str] = []
self.generate_docs = generate_docs
+ self.others_permitted = others_permitted
for value in values:
if isinstance(value, str):
# Value without description
@@ -1638,7 +1642,9 @@ class Proxy(BaseType):
super().__init__(none_ok=none_ok, completions=completions)
self.valid_values = ValidValues(
('system', "Use the system wide proxy."),
- ('none', "Don't use any proxy"))
+ ('none', "Don't use any proxy"),
+ others_permitted=True,
+ )
def to_py(
self,
diff --git a/qutebrowser/html/settings.html b/qutebrowser/html/settings.html
index b06917fd5..f89aaa610 100644
--- a/qutebrowser/html/settings.html
+++ b/qutebrowser/html/settings.html
@@ -179,9 +179,10 @@ summary::selection {
</div>
{% endif %}
</td>
- {% if option.typ.valid_values is not none %}
+ {% set valid_values = option.typ.valid_values %}
+ {% if valid_values is not none and not valid_values.others_permitted %}
<td class="valid-value">
- {% for value in option.typ.valid_values.values %}
+ {% for value in valid_values.values %}
<div class="radio-button">
<input type="radio" id="input-{{ option.name }}-{{ loop.index0 }}"
name="{{ option.name }}" value="{{ value }}"