openlp/core/lib/mediamanageritem.py

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

openlp/core/ui/servicemanager.py

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

openlp/plugins/media/lib/mediaitem.py

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