← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~raoul-snyman/openlp/bug-1265368-2.0 into lp:openlp/2.0

 

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-1265368-2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1265368 in OpenLP: "[regression] Traceback in web remote"
  https://bugs.launchpad.net/openlp/+bug/1265368

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-1265368-2.0/+merge/200344

Fix bug #1265368 by responding to clicks on both the item and the header, rather than the selection changing, which caused a harmless traceback when controlled from the remote.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-1265368-2.0/+merge/200344
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-1265368-2.0 into lp:openlp/2.0.
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2013-12-20 22:00:15 +0000
+++ openlp/core/ui/slidecontroller.py	2014-01-02 21:03:21 +0000
@@ -391,7 +391,9 @@
                 self._slideShortcutActivated)
         # Signals
         QtCore.QObject.connect(self.previewListWidget,
-            QtCore.SIGNAL(u'itemSelectionChanged()'), self.onSlideSelected)
+            QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
+        QtCore.QObject.connect(self.previewListWidget.verticalHeader(),
+            QtCore.SIGNAL(u'sectionClicked(int)'), self.onSlideSelected)
         if self.isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),
                 QtCore.SIGNAL(u'slidecontroller_live_spin_delay'),
@@ -1082,7 +1084,7 @@
             else:
                 Receiver.send_message(u'live_display_show')
 
-    def onSlideSelected(self):
+    def onSlideSelected(self, index):
         """
         Slide selected in controller
         """


Follow ups