From 7c28360d716a755d3d42e772e4cf1ce63c681b52 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 6 Dec 2021 20:24:25 +0530 Subject: [PATCH] More PyQt6 nonsense --- src/calibre/gui2/keyboard.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/keyboard.py b/src/calibre/gui2/keyboard.py index 76825d9c01..c58564276a 100644 --- a/src/calibre/gui2/keyboard.py +++ b/src/calibre/gui2/keyboard.py @@ -12,7 +12,7 @@ from gettext import pgettext from qt.core import (QObject, QKeySequence, QAbstractItemModel, QModelIndex, QItemSelectionModel, Qt, QStyledItemDelegate, QTextDocument, QStyle, pyqtSignal, QFrame, QAbstractItemView, QMenu, QApplication, QSize, QRectF, QWidget, QTreeView, QHBoxLayout, QVBoxLayout, QAbstractItemDelegate, - QGridLayout, QLabel, QRadioButton, QPushButton, QToolButton, QIcon, QEvent, sip) + QGridLayout, QLabel, QRadioButton, QPushButton, QToolButton, QIcon, QEvent, sip, QKeyCombination) from calibre.utils.config import JSONConfig from calibre.constants import DEBUG @@ -31,7 +31,7 @@ class NameConflict(ValueError): def keysequence_from_event(ev): # {{{ - k, mods = ev.key(), ev.modifiers() + k, mods = ev.keyCombination().key(), ev.modifiers() if k in ( 0, Qt.Key.Key_unknown, Qt.Key.Key_Shift, Qt.Key.Key_Control, Qt.Key.Key_Alt, Qt.Key.Key_Meta, Qt.Key.Key_AltGr, Qt.Key.Key_CapsLock, Qt.Key.Key_NumLock, @@ -42,7 +42,7 @@ def keysequence_from_event(ev): # {{{ # Something like Shift+* or Shift+> we have to remove the shift, # since it is included in keycode. mods = mods & ~Qt.KeyboardModifier.ShiftModifier - return QKeySequence(k | int(mods)) + return QKeySequence(QKeyCombination(mods, k)) # }}}