From 6f87c362d1ff54f42d76acb3c6fe35d65bf3e081 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 7 Mar 2010 20:45:27 +0000
Subject: [PATCH] Use Icon to show we have Notes

---
 openlp/core/ui/servicemanager.py        |  17 +++++++++++++----
 openlp/plugins/images/lib/mediaitem.py  |   2 +-
 resources/images/openlp-2.qrc           |   1 +
 resources/images/service_item_notes.png | Bin 0 -> 876 bytes
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 resources/images/service_item_notes.png

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index ba9269244..6765334dc 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/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'])
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 830459843..75f2fd981 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/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)
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index b6509b528..28af4c31a 100644
--- a/resources/images/openlp-2.qrc
+++ b/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>
diff --git a/resources/images/service_item_notes.png b/resources/images/service_item_notes.png
new file mode 100644
index 0000000000000000000000000000000000000000..59991dba85e745b69fbec46267c1e6414dc506c8
GIT binary patch
literal 876
zcmV-y1C#uTP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00LnE00LnF!7x?&00007bV*G`2igM%
z6A(GBp-}Ju00QhuL_t(I%k7lSYn)XS#((GB_nkL0X3VJ37<FYUghmC4*#uHST_`9P
zp>F&O1hM}?L0kxK6<jH<ESQB*sUJlbO>v3}W)Y)E)e@67Y1)`%(wR)=ejFDw3F%b9
zwe(yL&xLz<?)iA`h1+)9{#RzgbMF@aC35}D-DB6jxa-5U&#K4&Ek*z)CML8fit0k;
znbG{AC;h9FLs#b(Z)CIYys&BZiMAI`kD6Z{PoXnT?7WnG`>2JMM8ADK#>Uva&o|d^
zA-?j};~$mEgU8ywqODk!+VJ2&xiXaHna3$+2!e@;fEff&3cDn~Lu_6qwpM0p&;I#J
zKe3*l=bN(I7#gl_RY&eG57zD^E8H5I8d%&A!j@Rv1iyu(ZD14p6|D6W64p@V_~zLM
zkKK~-)YMcqb8>xoxF#bq;1Ed|h9%fb@*pB$(Xg0E!LVSY7*>$%NcE}TH}^BH*X!Zu
zMRz8VaJitFqPd_sXx5Ltvyz}C#qD{Pk1F=TO|1a<daihTcQ<+r#3||&%>>E%QMzZj
zpap25Xzp;iLv#0XbN0}Qn^XZXck1x`kumpZHjp7sFiT*)h}26VbuUH@NSGPc5mE=t
z8!4n+i#A=EzW9Ug5r6kf>HW_34!+$X?0RA+l0xcYOeCL3F<~)bsoQXIg5;pNqPgNS
zS2(9LJF|y|+#c~?{*k$-A8Wi`R$q>tL<$KDh9&C`D}i9Ww`BX}iYS622qFq-O|%%_
zCtg}wN=GN}n|OGnJ&pm%Fzc0T{iHpaq%M7TIYb=d?ztf42j0|!ll*q!j+4zcA;mz9
zkrX2-L@ey>(*d`hCt@r@qgDCs-2CWU)30@2%*H=GFa5&){JpUsCl6nHLdESXL{t#x
z&@3ZTiaxkz+h@&2t91E~mCE<0&hq7@Wxot;0N3mF`i-og`1FP0H_FxGW8d7`@zHIy
zI{8|om91_x%ZtA*l`bw^vL)auunIKm^>g-5pU~eVT7kkm>?h0s0000<MNUMnLSTX$
CcclIR

literal 0
HcmV?d00001