diff options
Diffstat (limited to 'qutebrowser/config/configutils.py')
| -rw-r--r-- | qutebrowser/config/configutils.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py index 480bbd85f..c03971077 100644 --- a/qutebrowser/config/configutils.py +++ b/qutebrowser/config/configutils.py @@ -28,9 +28,9 @@ from typing import ( TYPE_CHECKING, Any, Dict, Iterator, List, Optional, Sequence, Set, Union, MutableMapping) -from PyQt5.QtCore import QUrl -from PyQt5.QtGui import QFontDatabase -from PyQt5.QtWidgets import QApplication +from qutebrowser.qt.core import QUrl +from qutebrowser.qt.gui import QFontDatabase +from qutebrowser.qt.widgets import QApplication from qutebrowser.utils import utils, urlmatch, urlutils, usertypes, qtutils from qutebrowser.config import configexc @@ -294,7 +294,7 @@ class FontFamilies: @classmethod def from_system_default( cls, - font_type: QFontDatabase.SystemFont = QFontDatabase.FixedFont, + font_type: QFontDatabase.SystemFont = QFontDatabase.SystemFont.FixedFont, ) -> 'FontFamilies': """Get a FontFamilies object for the default system font. @@ -305,25 +305,25 @@ class FontFamilies: exist: 1) f = QFont() - f.setStyleHint(QFont.Monospace) + f.setStyleHint(QFont.StyleHint.Monospace) print(f.defaultFamily()) 2) f = QFont() - f.setStyleHint(QFont.TypeWriter) + f.setStyleHint(QFont.StyleHint.TypeWriter) print(f.defaultFamily()) - 3) f = QFontDatabase.systemFont(QFontDatabase.FixedFont) + 3) f = QFontDatabase.systemFont(QFontDatabase.SystemFont.FixedFont) print(f.family()) They yield different results depending on the OS: - QFont.Monospace | QFont.TypeWriter | QFontDatabase - ------------------------------------------------------ - Windows: Courier New | Courier New | Courier New - Linux: DejaVu Sans Mono | DejaVu Sans Mono | monospace - macOS: Menlo | American Typewriter | Monaco + QFont.StyleHint.Monospace | QFont.StyleHint.TypeWriter | QFontDatabase + ----------------------------------------------------------------------- + Win: Courier New | Courier New | Courier New + Linux: DejaVu Sans Mono | DejaVu Sans Mono | monospace + macOS: Menlo | American Typewriter | Monaco - Test script: https://p.cmpl.cc/d4dfe573 + Test script: https://p.cmpl.cc/076835c4 On Linux, it seems like both actually resolve to the same font. |