From ab5aa68b4fcef030833e133343fde2bebd3f4bc7 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Sun, 26 Jan 2020 17:29:16 +0100 Subject: [PATCH] Use standard key sequences instead of custom checks in keyPressEvent. Ensures platform specific shortcuts are used. --- picard/ui/__init__.py | 5 ++--- picard/ui/widgets/editablelistview.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/picard/ui/__init__.py b/picard/ui/__init__.py index 161a02304..77dd4b453 100644 --- a/picard/ui/__init__.py +++ b/picard/ui/__init__.py @@ -22,11 +22,11 @@ import uuid from PyQt5 import ( QtCore, + QtGui, QtWidgets, ) from picard import config -from picard.const.sys import IS_MACOS from picard.util import restore_method @@ -88,8 +88,7 @@ class PicardDialog(QtWidgets.QDialog, PreserveGeometry): super().__init__(parent, self.flags) def keyPressEvent(self, event): - if (IS_MACOS and event.modifiers() & QtCore.Qt.ControlModifier - and event.key() == QtCore.Qt.Key_W): + if event.matches(QtGui.QKeySequence.Close): self.close() else: super().keyPressEvent(event) diff --git a/picard/ui/widgets/editablelistview.py b/picard/ui/widgets/editablelistview.py index e5801e2d4..d2f9114ee 100644 --- a/picard/ui/widgets/editablelistview.py +++ b/picard/ui/widgets/editablelistview.py @@ -19,6 +19,7 @@ from PyQt5 import ( QtCore, + QtGui, QtWidgets, ) @@ -30,8 +31,7 @@ class EditableListView(QtWidgets.QListView): self.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove) def keyPressEvent(self, event): - if (event.modifiers() == QtCore.Qt.NoModifier - and event.key() == QtCore.Qt.Key_Delete): + if event.matches(QtGui.QKeySequence.Delete): self.remove_selected_rows() else: super().keyPressEvent(event)