From 7645f4fdea7965d0fd7ed0503734d81b621eab21 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 22 Apr 2014 08:26:46 +0200 Subject: [PATCH] Revert "Use "Monospace" only as monospace font" This reverts commit 1442b1e35f0ec669c1c21a4b0d590f1b24ce06c6. For true CSS fonts (hints), we can use "Monospace" as generic family and it'll work. However, for Qt fonts, this will get us a non-monospace font on Windows. Conflicts: qutebrowser/config/configdata.py --- qutebrowser/config/configdata.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index 5794c911d..9ec0065de 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -511,16 +511,23 @@ DATA = OrderedDict([ )), ('fonts', sect.KeyValue( + ('_monospace', + SettingValue(types.Font(), 'Monospace, "DejaVu Sans Mono", Consolas, ' + 'Monaco, "Bitstream Vera Sans Mono", "Andale Mono", ' + '"Liberation Mono", "Courier New", Courier, monospace, ' + 'Fixed, Terminal'), + "Default monospace fonts."), + ('completion', - SettingValue(types.Font(), "8pt Monospace"), + SettingValue(types.Font(), "8pt ${_monospace}"), "Font used in the completion widget."), ('tabbar', - SettingValue(types.Font(), "8pt Monospace"), + SettingValue(types.Font(), "8pt ${_monospace}"), "Font used in the tabbar."), ('statusbar', - SettingValue(types.Font(), "8pt Monospace"), + SettingValue(types.Font(), "8pt ${_monospace}"), "Font used in the statusbar."), ('hints',