diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-04-16 22:19:54 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-04-16 22:20:38 +0200 |
| commit | 71ffe8f656a7d506739e5810538e4dbedc3524c7 (patch) | |
| tree | 3f58460dce2d097a8deccf00a3969e4fa5651ade | |
| parent | cc738fa846f3c83466f6d51d953ed5d9957efc12 (diff) | |
| download | qutebrowser-71ffe8f656a7d506739e5810538e4dbedc3524c7.tar.gz qutebrowser-71ffe8f656a7d506739e5810538e4dbedc3524c7.zip | |
Use config.get() for qute:settings.
Fixes #628.
| -rw-r--r-- | qutebrowser/browser/network/qutescheme.py | 5 | ||||
| -rw-r--r-- | qutebrowser/html/settings.html | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qutebrowser/browser/network/qutescheme.py b/qutebrowser/browser/network/qutescheme.py index 864f64345..0432fa6fc 100644 --- a/qutebrowser/browser/network/qutescheme.py +++ b/qutebrowser/browser/network/qutescheme.py @@ -29,6 +29,7 @@ Module attributes: pyeval_output: The output of the last :pyeval command. """ +import functools import configparser from PyQt5.QtCore import pyqtSlot, QObject @@ -171,8 +172,10 @@ def qute_help(win_id, request): def qute_settings(win_id, _request): """Handler for qute:settings. View/change qute configuration.""" + config_getter = functools.partial(objreg.get('config').get, raw=True) html = jinja.env.get_template('settings.html').render( - win_id=win_id, title='settings', config=configdata) + win_id=win_id, title='settings', config=configdata, + confget=config_getter) return html.encode('UTF-8', errors='xmlcharrefreplace') diff --git a/qutebrowser/html/settings.html b/qutebrowser/html/settings.html index 2bf6c6fc2..c4fbdcc59 100644 --- a/qutebrowser/html/settings.html +++ b/qutebrowser/html/settings.html @@ -24,11 +24,11 @@ th pre { color: grey; text-align: left; } <tr><th colspan="2"><h3>{{ section }}</h3><pre>{{ config.SECTION_DESC.get(section)|wordwrap(width=120) }}</pre></th></tr> {% for d, e in config.DATA.get(section).items() %} <tr> - <td>{{ d }} (Current: {{ e.value()|truncate(100) }})</td> + <td>{{ d }} (Current: {{ confget(section, d)|truncate(100) }})</td> <td> <input type="input" onblur="cset('{{ section }}', '{{ d }}', this)" - value="{{ e.value() }}"> + value="{{ confget(section, d) }}"> </input> </td> </tr> |