openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)


More fall out from last set of changes.
Fix change in path location.
-- 
https://code.launchpad.net/~trb143/openlp/bugs1/+merge/22480
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2010-03-28 15:56:49 +0000
+++ openlp/core/lib/serviceitem.py	2010-03-30 19:21:25 +0000
@@ -325,6 +325,12 @@
         """
         return self._raw_frames[row][u'title']
 
+    def get_frame_path(self, row=0):
+        """
+        Returns the title of the raw frame
+        """
+        return self._raw_frames[row][u'path']
+
     def request_audit(self):
         if self.audit:
-            Receiver.send_message(u'songusage_live', self.audit)
\ No newline at end of file
+            Receiver.send_message(u'songusage_live', self.audit)

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-03-28 15:56:49 +0000
+++ openlp/core/ui/slidecontroller.py	2010-03-30 19:21:25 +0000
@@ -466,7 +466,7 @@
             else:
                 blanked = False
             Receiver.send_message(u'%s_start' % serviceItem.name.lower(), \
-                [serviceItem.title, serviceItem.service_item_path,
+                [serviceItem.title, serviceItem.get_frame_path(),
                 serviceItem.get_frame_title(), slideno, self.isLive, blanked])
         self.slideList = {}
         width = self.parent.ControlSplitter.sizes()[self.split]
@@ -517,6 +517,7 @@
                 label.setPixmap(QtGui.QPixmap.fromImage(pixmap))
                 self.PreviewListWidget.setCellWidget(framenumber, 1, label)
                 slide_height = width * self.parent.RenderManager.screen_ratio
+                row += 1
             rowitem.setText(unicode(row))
             self.PreviewListWidget.setItem(framenumber, 0, rowitem)
             self.PreviewListWidget.setItem(framenumber, 1, item)
@@ -753,7 +754,7 @@
     def onMediaStart(self, item):
         if self.isLive:
             Receiver.send_message(u'%s_start' % item.name.lower(), \
-                [item.title, item.service_item_path,
+                [item.title, item.get_frame_path(),
                 item.get_frame_title(), self.isLive, self.blankButton.isChecked()])
         else:
             self.mediaObject.stop()