diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index d1878d4e3..01fa5a837 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -940,7 +940,7 @@ DATA = OrderedDict([ "Font used in the completion widget."), ('tabbar', - SettingValue(types.Font(), '8pt ${_monospace}'), + SettingValue(types.QtFont(), '8pt ${_monospace}'), "Font used in the tabbar."), ('statusbar', diff --git a/qutebrowser/config/conftypes.py b/qutebrowser/config/conftypes.py index 9d63fed60..f25d140b0 100644 --- a/qutebrowser/config/conftypes.py +++ b/qutebrowser/config/conftypes.py @@ -25,13 +25,30 @@ import os.path from sre_constants import error as RegexError from PyQt5.QtCore import QUrl, QStandardPaths -from PyQt5.QtGui import QColor +from PyQt5.QtGui import QColor, QFont from PyQt5.QtNetwork import QNetworkProxy import qutebrowser.commands.utils as cmdutils from qutebrowser.utils.misc import get_standard_dir +QSS_FONT_REGEX = re.compile(r""" + ^( + ( + # style + (?P