diff options
Diffstat (limited to 'qutebrowser/misc/keyhintwidget.py')
| -rw-r--r-- | qutebrowser/misc/keyhintwidget.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/qutebrowser/misc/keyhintwidget.py b/qutebrowser/misc/keyhintwidget.py index c93ce5d4b..cdfed8392 100644 --- a/qutebrowser/misc/keyhintwidget.py +++ b/qutebrowser/misc/keyhintwidget.py @@ -27,8 +27,9 @@ It is intended to help discoverability of keybindings. import html import re -from PyQt5.QtWidgets import QLabel, QSizePolicy -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt +from qutebrowser.qt.widgets import QLabel, QSizePolicy +from qutebrowser.qt.core import pyqtSlot, pyqtSignal, Qt +from qutebrowser.qt.gui import QKeySequence from qutebrowser.config import config, stylesheet from qutebrowser.utils import utils, usertypes @@ -64,9 +65,9 @@ class KeyHintView(QLabel): def __init__(self, win_id, parent=None): super().__init__(parent) - self.setTextFormat(Qt.RichText) + self.setTextFormat(Qt.TextFormat.RichText) self._win_id = win_id - self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Minimum) + self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum) self.hide() self._show_timer = usertypes.Timer(self, 'keyhint_show') self._show_timer.timeout.connect(self.show) @@ -109,10 +110,13 @@ class KeyHintView(QLabel): return cmd and cmd.takes_count() bindings_dict = config.key_instance.get_bindings_for(mode.name) - bindings = [(k, v) for (k, v) in sorted(bindings_dict.items()) - if keyutils.KeySequence.parse(prefix).matches(k) and - not blacklisted(str(k)) and - (takes_count(v) or not countstr)] + bindings = [ + (k, v) + for (k, v) in sorted(bindings_dict.items()) + if keyutils.KeySequence.parse(prefix).matches(k) != QKeySequence.SequenceMatch.NoMatch + and not blacklisted(str(k)) + and (takes_count(v) or not countstr) + ] if not bindings: self._show_timer.stop() |