From e1dc332be4c0256b0c957b5b61c5f0a177366bf2 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Thu, 23 Jun 2011 23:30:56 +0100 Subject: [PATCH] Trap meta key combinations for bug 743273. (Tested with Win key on Windows, don't have OS-X to test CMD key) --- openlp/core/ui/shortcutlistform.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py index 0be7fc85d..6bdcc46bc 100644 --- a/openlp/core/ui/shortcutlistform.py +++ b/openlp/core/ui/shortcutlistform.py @@ -98,6 +98,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog): if event.modifiers() & QtCore.Qt.ShiftModifier == \ QtCore.Qt.ShiftModifier: key_string = u'Shift+' + key_string + if event.modifiers() & QtCore.Qt.MetaModifier == \ + QtCore.Qt.MetaModifier: + key_string = u'Meta+' + key_string key_sequence = QtGui.QKeySequence(key_string) if self._validiate_shortcut(self._currentItemAction(), key_sequence): if self.primaryPushButton.isChecked():