← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~trb143/openlp/b1 into lp:openlp

 

Tim Bentley has proposed merging lp:~trb143/openlp/b1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #738694 in OpenLP: "Clicking verse in slide controller doesn't scroll enough compared to v1"
  https://bugs.launchpad.net/openlp/+bug/738694

For more details, see:
https://code.launchpad.net/~trb143/openlp/b1/+merge/54124

All activity advanced the list so the next item was shown completely except where the verse was selected by a direct click.  This fixes that.
-- 
https://code.launchpad.net/~trb143/openlp/b1/+merge/54124
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/b1 into lp:openlp.
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-03-18 19:15:45 +0000
+++ openlp/core/ui/slidecontroller.py	2011-03-20 14:15:57 +0000
@@ -46,7 +46,6 @@
         QtGui.QTableWidget.__init__(self, parent.controller)
         self.parent = parent
 
-
 class SlideController(QtGui.QWidget):
     """
     SlideController is the slide controller widget. This widget is what the
@@ -858,6 +857,7 @@
                     self.serviceItem.bg_image_bytes = None
                 self.slidePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
             self.selectedRow = row
+            self.__checkUpdateSelectedSlide(row)
         Receiver.send_message(u'slidecontroller_%s_changed' % self.typePrefix,
             row)
 


Follow ups