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

Browse Source
This commit is contained in:
Andreas Preikschat 2011-01-31 18:00:56 +01:00
parent ce49a8fe20
commit e8dce46cf9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/lib/mediamanageritem.py
View File

@ -103,7 +103,6 @@ class MediaManagerItem(QtGui.QWidget):
self.icon = build_icon(icon) self.icon = build_icon(icon)
self.toolbar = None self.toolbar = None
self.remoteTriggered = None self.remoteTriggered = None
self.serviceItemIconName = None
self.singleServiceItem = True self.singleServiceItem = True
self.pageLayout = QtGui.QVBoxLayout(self) self.pageLayout = QtGui.QVBoxLayout(self)
self.pageLayout.setSpacing(0) self.pageLayout.setSpacing(0)
@ -525,10 +524,7 @@ class MediaManagerItem(QtGui.QWidget):
Common method for generating a service item Common method for generating a service item
""" """
serviceItem = ServiceItem(self.parent) serviceItem = ServiceItem(self.parent)
if self.serviceItemIconName: serviceItem.add_icon(self.parent.icon_path)
serviceItem.add_icon(self.serviceItemIconName)
else:
serviceItem.add_icon(self.parent.icon_path)
if self.generateSlideData(serviceItem, item, xmlVersion): if self.generateSlideData(serviceItem, item, xmlVersion):
return serviceItem return serviceItem
else: else:

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

@ -1197,19 +1197,24 @@ class ServiceManager(QtGui.QWidget):
'Service Order Sheet') 'Service Order Sheet')
for item in self.serviceItems: for item in self.serviceItems:
item = item[u'service_item'] item = item[u'service_item']
# add the title
text += u'<h2><img src="%s"></img> %s</h2>' % (item.icon, text += u'<h2><img src="%s"></img> %s</h2>' % (item.icon,
item.get_display_title()) item.get_display_title())
if item.is_text(): if item.is_text():
# Add the text of the service item.
for slide in item.get_frames(): for slide in item.get_frames():
text += u'<p>' + slide[u'text'] + u'</p>' text += u'<p>' + slide[u'text'] + u'</p>'
elif item.is_image(): elif item.is_image():
# Add the image names of the service item.
text += u'<ol>' text += u'<ol>'
for slide in range(len(item.get_frames())): for slide in range(len(item.get_frames())):
text += u'<li><p>%s</p></li>' % item.get_frame_title(slide) text += u'<li><p>%s</p></li>' % item.get_frame_title(slide)
text += u'</ol>' text += u'</ol>'
if item.foot_text: if item.foot_text:
# add footer
text += u'<p>%s</p>' % item.foot_text text += u'<p>%s</p>' % item.foot_text
if item.notes: if item.notes:
# add notes
text += u'<p><b>%s</b> %s</p>' % (translate( text += u'<p><b>%s</b> %s</p>' % (translate(
'OpenLP.ServiceManager', 'Notes:'), item.notes) 'OpenLP.ServiceManager', 'Notes:'), item.notes)
serviceDocument = QtGui.QTextDocument() serviceDocument = QtGui.QTextDocument()

1
openlp/plugins/media/lib/mediaitem.py
View File

@ -57,7 +57,6 @@ class MediaMediaItem(MediaManagerItem):
u':/media/media_video.png').toImage() u':/media/media_video.png').toImage()
MediaManagerItem.__init__(self, parent, self, icon) MediaManagerItem.__init__(self, parent, self, icon)
self.singleServiceItem = False self.singleServiceItem = False
self.serviceItemIconName = u':/media/image_clapperboard.png'
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'video_background_replaced'), QtCore.SIGNAL(u'video_background_replaced'),
self.videobackgroundReplaced) self.videobackgroundReplaced)