raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix service path errors

Browse Source
This commit is contained in:
Tim Bentley 2010-03-30 20:01:23 +01:00
parent f44715ced8
commit 60d7416e69
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/lib/serviceitem.py
View File

@ -325,6 +325,12 @@ class ServiceItem(object):
""" """
return self._raw_frames[row][u'title'] 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): def request_audit(self):
if self.audit: if self.audit:
Receiver.send_message(u'songusage_live', self.audit) Receiver.send_message(u'songusage_live', self.audit)

5
openlp/core/ui/slidecontroller.py
View File

@ -466,7 +466,7 @@ class SlideController(QtGui.QWidget):
else: else:
blanked = False blanked = False
Receiver.send_message(u'%s_start' % serviceItem.name.lower(), \ 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]) serviceItem.get_frame_title(), slideno, self.isLive, blanked])
self.slideList = {} self.slideList = {}
width = self.parent.ControlSplitter.sizes()[self.split] width = self.parent.ControlSplitter.sizes()[self.split]
@ -517,6 +517,7 @@ class SlideController(QtGui.QWidget):
label.setPixmap(QtGui.QPixmap.fromImage(pixmap)) label.setPixmap(QtGui.QPixmap.fromImage(pixmap))
self.PreviewListWidget.setCellWidget(framenumber, 1, label) self.PreviewListWidget.setCellWidget(framenumber, 1, label)
slide_height = width * self.parent.RenderManager.screen_ratio slide_height = width * self.parent.RenderManager.screen_ratio
row += 1
rowitem.setText(unicode(row)) rowitem.setText(unicode(row))
self.PreviewListWidget.setItem(framenumber, 0, rowitem) self.PreviewListWidget.setItem(framenumber, 0, rowitem)
self.PreviewListWidget.setItem(framenumber, 1, item) self.PreviewListWidget.setItem(framenumber, 1, item)
@ -753,7 +754,7 @@ class SlideController(QtGui.QWidget):
def onMediaStart(self, item): def onMediaStart(self, item):
if self.isLive: if self.isLive:
Receiver.send_message(u'%s_start' % item.name.lower(), \ 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()]) item.get_frame_title(), self.isLive, self.blankButton.isChecked()])
else: else:
self.mediaObject.stop() self.mediaObject.stop()