diff options
Diffstat (limited to 'qutebrowser/misc/miscwidgets.py')
| -rw-r--r-- | qutebrowser/misc/miscwidgets.py | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py index 4354ed2ab..5d56f7fcf 100644 --- a/qutebrowser/misc/miscwidgets.py +++ b/qutebrowser/misc/miscwidgets.py @@ -21,14 +21,13 @@ from typing import Optional -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QSize, QTimer -from PyQt5.QtWidgets import (QLineEdit, QWidget, QHBoxLayout, QLabel, - QStyleOption, QStyle, QLayout, QApplication, - QSplitter) -from PyQt5.QtGui import QValidator, QPainter, QResizeEvent +from qutebrowser.qt.core import pyqtSlot, pyqtSignal, Qt, QSize, QTimer +from qutebrowser.qt.widgets import (QLineEdit, QWidget, QHBoxLayout, QLabel, + QStyleOption, QStyle, QLayout, QSplitter) +from qutebrowser.qt.gui import QValidator, QPainter, QResizeEvent from qutebrowser.config import config, configfiles -from qutebrowser.utils import utils, log, usertypes +from qutebrowser.utils import utils, log, usertypes, debug from qutebrowser.misc import cmdhistory from qutebrowser.browser import inspector from qutebrowser.keyinput import keyutils, modeman @@ -49,11 +48,11 @@ class MinimalLineEditMixin: """ ) self.setAttribute( # type: ignore[attr-defined] - Qt.WA_MacShowFocusRect, False) + Qt.WidgetAttribute.WA_MacShowFocusRect, False) def keyPressEvent(self, e): """Override keyPressEvent to paste primary selection on Shift + Ins.""" - if e.key() == Qt.Key_Insert and e.modifiers() == Qt.ShiftModifier: + if e.key() == Qt.Key.Key_Insert and e.modifiers() == Qt.KeyboardModifier.ShiftModifier: try: text = utils.get_clipboard(selection=True, fallback=True) except utils.ClipboardError: @@ -137,9 +136,9 @@ class _CommandValidator(QValidator): A tuple (status, string, pos) as a QValidator should. """ if self.prompt is None or string.startswith(self.prompt): - return (QValidator.Acceptable, string, pos) + return (QValidator.State.Acceptable, string, pos) else: - return (QValidator.Invalid, string, pos) + return (QValidator.State.Invalid, string, pos) class DetailFold(QWidget): @@ -181,7 +180,7 @@ class DetailFold(QWidget): Args: e: The QMouseEvent. """ - if e.button() == Qt.LeftButton: + if e.button() == Qt.MouseButton.LeftButton: e.accept() self.toggle() else: @@ -219,9 +218,9 @@ class _FoldArrow(QWidget): opt.initFrom(self) painter = QPainter(self) if self._folded: - elem = QStyle.PE_IndicatorArrowRight + elem = QStyle.PrimitiveElement.PE_IndicatorArrowRight else: - elem = QStyle.PE_IndicatorArrowDown + elem = QStyle.PrimitiveElement.PE_IndicatorArrowDown self.style().drawPrimitive(elem, opt, painter, self) def minimumSizeHint(self): @@ -309,7 +308,7 @@ class FullscreenNotification(QLabel): if config.val.content.fullscreen.window: geom = self.parentWidget().geometry() else: - geom = QApplication.desktop().screenGeometry(self) + geom = self.window().windowHandle().screen().geometry() self.move((geom.width() - self.sizeHint().width()) // 2, 30) def set_timeout(self, timeout): @@ -387,10 +386,10 @@ class InspectorSplitter(QSplitter): self._inspector_idx = 0 self._main_idx = 1 - self.setOrientation(Qt.Horizontal + self.setOrientation(Qt.Orientation.Horizontal if position in [inspector.Position.left, inspector.Position.right] - else Qt.Vertical) + else Qt.Orientation.Vertical) self.insertWidget(self._inspector_idx, inspector_widget) self._position = position self._load_preferred_size() @@ -405,7 +404,7 @@ class InspectorSplitter(QSplitter): def _load_preferred_size(self) -> None: """Load the preferred size of the inspector widget.""" assert self._position is not None - full = (self.width() if self.orientation() == Qt.Horizontal + full = (self.width() if self.orientation() == Qt.Orientation.Horizontal else self.height()) # If we first open the inspector with a window size of < 300px @@ -489,7 +488,7 @@ class KeyTesterWidget(QWidget): def __init__(self, parent=None): super().__init__(parent) - self.setAttribute(Qt.WA_DeleteOnClose) + self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose) self._layout = QHBoxLayout(self) self._label = QLabel(text="Waiting for keypress...") self._layout.addWidget(self._label) @@ -499,8 +498,8 @@ class KeyTesterWidget(QWidget): lines = [ str(keyutils.KeyInfo.from_event(e)), '', - 'key: 0x{:x}'.format(int(e.key())), - 'modifiers: 0x{:x}'.format(int(e.modifiers())), + f"key: {debug.qenum_key(Qt.Key, e.key(), klass=Qt.Key)}", + f"modifiers: {debug.qflags_key(Qt.KeyboardModifier, e.modifiers())}", 'text: {!r}'.format(e.text()), ] self._label.setText('\n'.join(lines)) |