From b9cd9ca5a52c1ff3f08a64c1d8b18da89483c7db Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 22 Jan 2011 11:19:48 +0000 Subject: [PATCH] Merge Fix ups --- openlp/core/ui/slidecontroller.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index b1a02dea3..8b1614977 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -33,7 +33,6 @@ from PyQt4.phonon import Phonon from openlp.core.ui import HideMode, MainDisplay from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \ ItemCapabilities, translate -from openlp.core.utils import ActionList log = logging.getLogger(__name__) @@ -392,7 +391,7 @@ class SlideController(QtGui.QWidget): self.previousService = QtGui.QAction(translate( 'OpenLP.SlideController', 'Previous Service'), parent) self.previousService.setShortcuts([QtCore.Qt.Key_Left, 0]) - self.previousService.setShortcutContext( \ + self.previousService.setShortcutContext( QtCore.Qt.WidgetWithChildrenShortcut) QtCore.QObject.connect(self.previousService, QtCore.SIGNAL(u'triggered()'), self.servicePrevious) @@ -400,7 +399,7 @@ class SlideController(QtGui.QWidget): self.nextService = QtGui.QAction(translate( 'OpenLP.SlideController', 'Next Service'), parent) self.nextService.setShortcuts([QtCore.Qt.Key_Right, 0]) - self.nextService.setShortcutContext( \ + self.nextService.setShortcutContext( QtCore.Qt.WidgetWithChildrenShortcut) QtCore.QObject.connect(self.nextService, QtCore.SIGNAL(u'triggered()'), self.serviceNext)