← Back to team overview

openlp-core team mailing list archive

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

 

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

Requested reviews:
  OpenLP Core (openlp-core)

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

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/+merge/198191
Your team OpenLP Core is requested to review the proposed merge of lp:~springermac/openlp/shortcut-event-fix into lp:openlp.
=== modified file 'openlp/core/ui/shortcutlistform.py'
--- openlp/core/ui/shortcutlistform.py	2013-10-13 20:36:42 +0000
+++ openlp/core/ui/shortcutlistform.py	2013-12-09 02:16:08 +0000
@@ -74,7 +74,7 @@
         if event.key() == QtCore.Qt.Key_Space:
             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