Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2025-12-06 20:14:48 +01:00
Code Issues Projects Releases Wiki Activity

More PyQt6 nonsense

Browse source
This commit is contained in:
Kovid Goyal 2021-12-06 20:24:25 +05:30
parent db0ad38f68
commit 73e3b8822f
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/calibre/gui2/keyboard.py
View file

@ -12,7 +12,7 @@
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))
# }}}