← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~springermac/openlp/shortcut-event-fix-2.0 into lp:openlp/2.0

 

Jonathan Springer has proposed merging lp:~springermac/openlp/shortcut-event-fix-2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~springermac/openlp/shortcut-event-fix-2.0/+merge/198244

Fix shortcutlistform to pass all keyboard events to the keyReleaseEvent handler because on Mac OS X when the Command key is pressed together with another key a keyReleaseEvent isn't generated.
-- 
https://code.launchpad.net/~springermac/openlp/shortcut-event-fix-2.0/+merge/198244
Your team OpenLP Core is requested to review the proposed merge of lp:~springermac/openlp/shortcut-event-fix-2.0 into lp:openlp/2.0.
=== modified file 'openlp/core/ui/shortcutlistform.py'
--- openlp/core/ui/shortcutlistform.py	2012-12-30 19:41:24 +0000
+++ openlp/core/ui/shortcutlistform.py	2013-12-09 12:30:06 +0000
@@ -79,7 +79,7 @@
             self.keyReleaseEvent(event)
         elif self.primaryPushButton.isChecked() or \
             self.alternatePushButton.isChecked():
-            event.ignore()
+            self.keyReleaseEvent(event)
         elif event.key() == QtCore.Qt.Key_Escape:
             event.accept()
             self.close()


Follow ups