From 1932ed886e0893b40051ec483422376bea628c14 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 6 Mar 2010 08:00:36 +0000 Subject: [PATCH 1/5] Fix up service notes --- openlp/core/ui/servicemanager.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index ad0da357b..0c955f392 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -42,7 +42,6 @@ class ServiceManagerList(QtGui.QTreeWidget): def __init__(self, parent=None, name=None): QtGui.QTreeWidget.__init__(self,parent) self.parent = parent - self.setExpandsOnDoubleClick(False) def keyPressEvent(self, event): if type(event) == QtGui.QKeyEvent: @@ -250,6 +249,7 @@ class ServiceManager(QtGui.QWidget): if self.serviceItemNoteForm.exec_(): self.serviceItems[item][u'service_item'].notes = \ self.serviceItemNoteForm.textEdit.toPlainText() + self.repaintServiceList(item, 0) def nextItem(self): """ @@ -429,15 +429,20 @@ class ServiceManager(QtGui.QWidget): for itemcount, item in enumerate(self.serviceItems): serviceitem = item[u'service_item'] treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList) - treewidgetitem.setText(0,serviceitem.title) - treewidgetitem.setIcon(0,serviceitem.iconic_representation) + if len(serviceitem.notes) > 0: + title = self.trUtf8(u'(N) - %s' % serviceitem.title) + else: + title = serviceitem.title + treewidgetitem.setText(0, 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']) for count, frame in enumerate(serviceitem.get_frames()): treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem) text = frame[u'title'] - treewidgetitem1.setText(0,text[:40]) + treewidgetitem1.setText(0, text[:40]) treewidgetitem1.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(count)) if serviceItem == itemcount and serviceItemCount == count: From d3564b2df7b122bd760caf60cbf42a62b00fb05e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 6 Mar 2010 14:08:51 +0000 Subject: [PATCH 2/5] Fix translation --- openlp/core/ui/servicemanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 0c955f392..4b29fd7e7 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -430,7 +430,7 @@ class ServiceManager(QtGui.QWidget): serviceitem = item[u'service_item'] treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList) if len(serviceitem.notes) > 0: - title = self.trUtf8(u'(N) - %s' % serviceitem.title) + title = u'%s - %s' % (self.trUtf8('(N)'), serviceitem.title) else: title = serviceitem.title treewidgetitem.setText(0, title) From 77e671bd78192072d8d1435cfb3adeebcac658ab Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 7 Mar 2010 06:42:22 +0000 Subject: [PATCH 3/5] Remove unneeded version tagging --- openlp/core/utils/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index e85b2d939..256d5a090 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -33,13 +33,12 @@ log = logging.getLogger(__name__) def check_latest_version(config, current_version): version_string = current_version #set to prod in the distribution confif file. - environment = config.get_config(u'run environment', u'dev') last_test = config.get_config(u'last version test', datetime.now().date()) this_test = unicode(datetime.now().date()) config.set_config(u'last version test', this_test) if last_test != this_test: version_string = u'' - req = urllib2.Request(u'http://www.openlp.org/files/%s_version.txt' % environment) + req = urllib2.Request(u'http://www.openlp.org/files/version.txt') req.add_header(u'User-Agent', u'OpenLP/%s' % current_version) try: handle = urllib2.urlopen(req, None) From 5560aac57580502e0388199953422fcda13d5a1b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 7 Mar 2010 19:22:54 +0000 Subject: [PATCH 4/5] Fix expanding service items --- openlp/core/ui/servicemanager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 4b29fd7e7..ba9269244 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -599,12 +599,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 +624,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: From 6f87c362d1ff54f42d76acb3c6fe35d65bf3e081 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 7 Mar 2010 20:45:27 +0000 Subject: [PATCH 5/5] 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 @@ service_edit.png service_notes.png + service_item_notes.png service_bottom.png service_down.png service_top.png 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)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00LnE00LnF!7x?&00007bV*G`2igM% z6A(GBp-}Ju00QhuL_t(I%k7lSYn)XS#((GB_nkL0X3VJ37F&O1hM}?L0kxK6v3}W)Y)E)e@67Y1)`%(wR)=ejFDw3F%b9 zwe(yL&xLz2JMM8ADK#>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>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