From dcc4608f3c35e0b478706f86226dcc8f1817f201 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sat, 18 Aug 2012 11:55:57 +0100 Subject: [PATCH] fixes issue 1045 and bug 1037076 "Short cut keys do not work for background audio" --- openlp/core/ui/slidecontroller.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index c59ea9afe..faa9e1a52 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -286,19 +286,20 @@ class SlideController(Controller): text=translate('OpenLP.SlideController', 'Pause Audio'), tooltip=translate('OpenLP.SlideController', 'Pause audio.'), checked=False, visible=False, category=self.category, - triggers=self.onAudioPauseClicked) + context=QtCore.Qt.WindowShortcut, + shortcuts=[], triggers=self.onAudioPauseClicked) self.audioMenu = QtGui.QMenu( - translate('OpenLP.SlideController', 'Background Audio'), self) + translate('OpenLP.SlideController', 'Background Audio'), self.toolbar) self.audioPauseItem.setMenu(self.audioMenu) - self.audioPauseItem.setParent(self) + self.audioPauseItem.setParent(self.toolbar) self.toolbar.widgetForAction(self.audioPauseItem).setPopupMode( QtGui.QToolButton.MenuButtonPopup) self.nextTrackItem = create_action(self, u'nextTrackItem', text=UiStrings().NextTrack, icon=u':/slides/media_playback_next.png', tooltip=translate( 'OpenLP.SlideController', 'Go to next audio track.'), - category=self.category, context=QtCore.Qt.WindowShortcut, - triggers=self.onNextTrackClicked) + category=self.category, + shortcuts=[], triggers=self.onNextTrackClicked) self.audioMenu.addAction(self.nextTrackItem) self.trackMenu = self.audioMenu.addMenu( translate('OpenLP.SlideController', 'Tracks'))