From 0f7653347067dfe19040af5b2114c4126be8c736 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 4 Nov 2010 17:26:30 +0100 Subject: [PATCH 1/2] clean up --- openlp/core/lib/mediamanageritem.py | 1 - openlp/core/lib/serviceitem.py | 28 ++++++++++++++-------------- openlp/plugins/media/lib/mediatab.py | 2 -- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 3752ffc4d..2d563962e 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -541,4 +541,3 @@ class MediaManagerItem(QtGui.QWidget): individual service items need to be processed by the plugins """ pass - diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 9e5b6ef6e..ab57e4328 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -212,7 +212,7 @@ class ServiceItem(object): self.service_item_type = ServiceItemType.Text title = title.split(u'\n')[0] self._raw_frames.append( - {u'title': title, u'raw_slide': raw_slide, u'verseTag':verse_tag}) + {u'title': title, u'raw_slide': raw_slide, u'verseTag': verse_tag}) self._new_item() def add_from_command(self, path, file_name, image): @@ -230,7 +230,7 @@ class ServiceItem(object): """ self.service_item_type = ServiceItemType.Command self._raw_frames.append( - {u'title': file_name, u'image':image, u'path': path}) + {u'title': file_name, u'image': image, u'path': path}) self._new_item() def get_service_repr(self): @@ -241,17 +241,17 @@ class ServiceItem(object): service_header = { u'name': self.name.lower(), u'plugin': self.name, - u'theme':self.theme, - u'title':self.title, - u'icon':self.icon, - u'footer':self.raw_footer, - u'type':self.service_item_type, - u'audit':self.audit, - u'notes':self.notes, - u'from_plugin':self.from_plugin, - u'capabilities':self.capabilities, - u'search':self.search_string, - u'data':self.data_string + u'theme': self.theme, + u'title': self.title, + u'icon': self.icon, + u'footer': self.raw_footer, + u'type': self.service_item_type, + u'audit': self.audit, + u'notes': self.notes, + u'from_plugin': self.from_plugin, + u'capabilities': self.capabilities, + u'search': self.search_string, + u'data': self.data_string } service_data = [] if self.service_item_type == ServiceItemType.Text: @@ -263,7 +263,7 @@ class ServiceItem(object): elif self.service_item_type == ServiceItemType.Command: for slide in self._raw_frames: service_data.append( - {u'title':slide[u'title'], u'image':slide[u'image']}) + {u'title': slide[u'title'], u'image': slide[u'image']}) return {u'header': service_header, u'data': service_data} def set_from_service(self, serviceitem, path=None): diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index cc8a34705..e67da62df 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -80,5 +80,3 @@ class MediaTab(SettingsTab): QtCore.QSettings().setValue(self.settingsSection + u'/use phonon', QtCore.QVariant(self.usePhonon)) Receiver.send_message(u'config_screen_changed') - - From fb5a14610410b41513fb139827b054955224fa1e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 7 Nov 2010 23:01:02 +0200 Subject: [PATCH 2/2] Added and changed the expand all and collapse all icons. --- openlp/core/ui/servicemanager.py | 4 ++-- resources/images/openlp-2.qrc | 2 ++ resources/images/service_collapse_all.png | Bin 0 -> 382 bytes resources/images/service_expand_all.png | Bin 0 -> 486 bytes 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 resources/images/service_collapse_all.png create mode 100644 resources/images/service_expand_all.png diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 3e7feafd3..98494861a 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -203,13 +203,13 @@ class ServiceManager(QtGui.QWidget): self.orderToolbar.addSeparator() self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', '&Expand all'), - u':/services/service_top.png', + u':/services/service_expand_all.png', translate('OpenLP.ServiceManager', 'Expand all the service items.'), self.onExpandAll) self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', '&Collapse all'), - u':/services/service_bottom.png', + u':/services/service_collapse_all.png', translate('OpenLP.ServiceManager', 'Collapse all the service items.'), self.onCollapseAll) diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index 7e8645441..0ecb87bca 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -83,6 +83,8 @@ wizard_importbible.bmp + service_collapse_all.png + service_expand_all.png service_notes.png service_item_notes.png service_bottom.png diff --git a/resources/images/service_collapse_all.png b/resources/images/service_collapse_all.png new file mode 100644 index 0000000000000000000000000000000000000000..6e682fc4d800b95a27d9e473e7e8d685fff76a29 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85o$$K$x-iYSS5@AbW|YuPgg4ZgvrK3$vJhcc9QePZ!4!i_>c- z2YMYb5NO+<>Ai5HVNSyRqt+br67(O~+O&NC=qYgLaz&HQ((EI*EbMORX_qd%F?aa~ z_5b$9|9uh?IU2t2<5A3Ms8Y*+zxRHdz%C|*mJOM=zul8ie$0JU|I?lq3_-8FC%!q* zXSix>Si|z916j#ECcdBRlpgEfu?%MvXSf-}FUBo$+;+WQ_}o|h8q2fgUy{{#ECN85{PWFh5{gVESPF@+gm$`ten@GN;*I*fGeS zVskvmJuB$F8k3Ub?zHf8hUY@x)dXAImiTVyCTo^+O^Z37o$>wOYf-1|?S#7@OMC80 VPCT5GbORU?44$rjF6*2UngE1Jlb8Si literal 0 HcmV?d00001 diff --git a/resources/images/service_expand_all.png b/resources/images/service_expand_all.png new file mode 100644 index 0000000000000000000000000000000000000000..09b4ba394dd7780d03276c67e04b255685ddd1fc GIT binary patch literal 486 zcmV@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00VXa00VXbebs`@00007bV*G`2igk< z6gMA}Ryr&I00Cx6L_t(I%cYY+PUAojMPE5>$7#D`+$%T(_h600f(0YZ4Q4yy1k8T! zfMAgo5)1CZH9Cp{PU6^8vq&7mWD+5$RjKRu@A~zt;fo;v-uonka0cWby!Yb0e+nVg z1|WoRHl0p?SZk$2sQ#hXGc`clHi<~Ixm{J2I_Cs<}4Bvb(tuaiAtwl$Z-vhH3J!?K@3J_Lzb=4rW_ zx}d7fV27aBGxh1YTy$-l1ddP8YzW_e$z|M!D1zA>Zhz|I4#B_XW)7?acLcG8e)>l6 zUkPp7B+nxqZA-Yik;^25-{19qF(*b>656&Yb_hfwwynz3k|YJ2!D2>SEywZ3#zFBh z7ouo23q6F{TM+cMg82gE07oa`rK&1jZ`j(_W^i}Cns(bZMPZ9~s|>tu2)y@C&N)8u cnfP-21^PCDj3t)