Fix serviceItem expansion on repaint

Add ALL to Images file filter
Add Icon overlay to serviceItem when we have notes.

bzr-revno: 727

openlp/core/ui/servicemanager.py

@@ -430,12 +430,21 @@ class ServiceManager(QtGui.QWidget):
             serviceitem = item[u'service_item']
             treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList)
             if len(serviceitem.notes) > 0:
-                title = u'%s - %s' % (self.trUtf8('(N)'), serviceitem.title)
+                icon = QtGui.QImage(serviceitem.icon)
+                icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
+                                    QtCore.Qt.SmoothTransformation)
+
+                overlay = QtGui.QImage(':/services/service_item_notes.png')
+                overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
+                                          QtCore.Qt.SmoothTransformation)
+                painter = QtGui.QPainter(icon)
+                painter.drawImage(0, 0, overlay)
+                painter.end()
+                treewidgetitem.setIcon(0, build_icon(icon))
             else:
-                title = serviceitem.title
-            treewidgetitem.setText(0, title)
+                treewidgetitem.setIcon(0, serviceitem.iconic_representation)
+            treewidgetitem.setText(0, serviceitem.title)
             treewidgetitem.setToolTip(0, serviceitem.notes)
-            treewidgetitem.setIcon(0, serviceitem.iconic_representation)
             treewidgetitem.setData(0, QtCore.Qt.UserRole,
                 QtCore.QVariant(item[u'order']))
             treewidgetitem.setExpanded(item[u'expanded'])
@@ -599,12 +608,12 @@ class ServiceManager(QtGui.QWidget):
             self.serviceItems = []
             self.isNew = True
             for item in tempServiceItems:
-                self.addServiceItem(item[u'service_item'], True)
+                self.addServiceItem(item[u'service_item'], False, item[u'expanded'])
             #Set to False as items may have changed rendering
             #does not impact the saved song so True may aslo be valid
             self.parent.serviceChanged(False, self.serviceName)
 
-    def addServiceItem(self, item, rebuild=False):
+    def addServiceItem(self, item, rebuild=False, expand=True):
         """
         Add a Service item to the list
 
@@ -624,12 +633,12 @@ class ServiceManager(QtGui.QWidget):
             if sitem == -1:
                 self.serviceItems.append({u'service_item': item,
                     u'order': len(self.serviceItems) + 1,
-                    u'expanded':True})
+                    u'expanded':expand})
                 self.repaintServiceList(len(self.serviceItems) + 1, 0)
             else:
                 self.serviceItems.insert(sitem + 1, {u'service_item': item,
                     u'order': len(self.serviceItems)+1,
-                    u'expanded':True})
+                    u'expanded':expand})
                 self.repaintServiceList(sitem + 1, 0)
             #if rebuilding list make sure live is fixed.
             if rebuild:

openlp/plugins/images/lib/mediaitem.py

@@ -61,7 +61,7 @@ class ImageMediaItem(MediaManagerItem):
     def retranslateUi(self):
         self.OnNewPrompt = self.trUtf8('Select Image(s)')
         self.OnNewFileMasks = \
-            self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp)')
+            self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*)')
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)

resources/images/openlp-2.qrc

@@ -78,6 +78,7 @@
   <qresource prefix="services">
     <file>service_edit.png</file>
     <file>service_notes.png</file>
+    <file>service_item_notes.png</file>
     <file>service_bottom.png</file>
     <file>service_down.png</file>
     <file>service_top.png</file>