openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/bug-957129 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #957129 in OpenLP: "Service item slide limits"
  https://bugs.launchpad.net/openlp/+bug/957129

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/bug-957129/+merge/98019

Fix the next slide keypress action to call its own routine, since the interface is different to the other next slide event. 
This will fix the problem when the end of song next slide action isn't working correctly.
-- 
https://code.launchpad.net/~j-corwin/openlp/bug-957129/+merge/98019
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/bug-957129 into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2012-03-05 10:09:07 +0000
+++ openlp/core/ui/slidecontroller.py	2012-03-16 23:14:22 +0000
@@ -186,7 +186,7 @@
             tooltip=translate('OpenLP.SlideController', 'Move to next.'),
             shortcuts=[QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown],
             context=QtCore.Qt.WidgetWithChildrenShortcut,
-            category=self.category, triggers=self.onSlideSelectedNext)
+            category=self.category, triggers=self.onSlideSelectedNextAction)
         self.toolbar.addAction(self.nextItem)
         self.toolbar.addSeparator()
         if self.isLive:
@@ -1139,6 +1139,13 @@
             rect.y(), rect.width(), rect.height())
         self.slidePreview.setPixmap(winimg)
 
+    def onSlideSelectedNextAction(self, checked):
+        """
+        Wrapper function from create_action so we can throw away the
+        incorrect parameter
+        """
+        self.onSlideSelectedNext()
+
     def onSlideSelectedNext(self, wrap=None):
         """
         Go to the next slide.