From 8c2afe67e38a09a41192df35f0433cdd71f49ed6 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 8 Apr 2018 19:21:22 +0100 Subject: [PATCH] more bits --- openlp/core/common/i18n.py | 8 ++++++++ openlp/core/lib/serviceitem.py | 2 +- openlp/core/ui/servicemanager.py | 12 ++++++------ openlp/plugins/songs/lib/mediaitem.py | 2 +- resources/images/openlp-2.qrc | 5 ----- resources/images/service_bottom.png | Bin 711 -> 0 bytes resources/images/service_collapse_all.png | Bin 382 -> 0 bytes resources/images/service_expand_all.png | Bin 486 -> 0 bytes resources/images/service_top.png | Bin 675 -> 0 bytes resources/images/song_book_edit.png | Bin 561 -> 0 bytes 10 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 resources/images/service_bottom.png delete mode 100644 resources/images/service_collapse_all.png delete mode 100644 resources/images/service_expand_all.png delete mode 100644 resources/images/service_top.png delete mode 100644 resources/images/song_book_edit.png diff --git a/openlp/core/common/i18n.py b/openlp/core/common/i18n.py index d7e4a3673..a4abc01b7 100644 --- a/openlp/core/common/i18n.py +++ b/openlp/core/common/i18n.py @@ -577,7 +577,11 @@ class UiIcons(object): These are the font icons used in the code. """ self.add = qta.icon('fa.plus-circle') + self.arrow_down = qta.icon('fa.arrow-down') + self.arrow_up = qta.icon('fa.arrow-up') + self.address = qta.icon('fa.book') self.bible = qta.icon('fa.book') + self.bottom = qta.icon('fa.angle-double-down') self.clone = qta.icon('fa.clone') self.copy = qta.icon('fa.copy') self.copyright = qta.icon('fa.copyright') @@ -587,15 +591,19 @@ class UiIcons(object): self.edit = qta.icon('fa.edit') self.download = qta.icon('fa.cloud-download') self.live = qta.icon('fa.camera') + self.minus = qta.icon('fa.minus') self.music = qta.icon('fa.music') self.new = qta.icon('fa.file') self.notes = qta.icon('fa.sticky-note') self.open = qta.icon('fa.map') + self.plus = qta.icon('fa.plus') self.presentation = qta.icon("fa.bar-chart") self.preview = qta.icon('fa.laptop') self.picture = qta.icon("fa.picture-o") self.print = qta.icon('fa.print') + #self.remote = qta.icon('fa.podcast') self.save = qta.icon('fa.save') + self.top = qta.icon('fa.angle-double-up') self.upload = qta.icon('fa.cloud-upload') self.user = qta.icon('fa.user') self.video = qta.icon('fa.file-video-o') diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 2be9a4ad5..2b4d25d02 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -239,7 +239,7 @@ class ServiceItem(RegistryProperties): if self.name == 'songs': self.iconic_representation = UiIcons().music elif self.name == 'bibles': - self.iconic_representation = UiIcons().music + self.iconic_representation = UiIcons().bible elif self.name == 'presentations': self.iconic_representation = UiIcons().presentation elif self.name == 'images': diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 36b55245e..c1b78f75a 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -178,22 +178,22 @@ class Ui_ServiceManager(object): action_list.add_category(UiStrings().Service, CategoryOrder.standard_toolbar) self.move_top_action = self.order_toolbar.add_toolbar_action( 'moveTop', - text=translate('OpenLP.ServiceManager', 'Move to &top'), icon=':/services/service_top.png', + text=translate('OpenLP.ServiceManager', 'Move to &top'), icon=UiIcons().top, tooltip=translate('OpenLP.ServiceManager', 'Move item to the top of the service.'), can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_top) self.move_up_action = self.order_toolbar.add_toolbar_action( 'moveUp', - text=translate('OpenLP.ServiceManager', 'Move &up'), icon=':/services/service_up.png', + text=translate('OpenLP.ServiceManager', 'Move &up'), icon=UiIcons().arrow_up, tooltip=translate('OpenLP.ServiceManager', 'Move item up one position in the service.'), can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_up) self.move_down_action = self.order_toolbar.add_toolbar_action( 'moveDown', - text=translate('OpenLP.ServiceManager', 'Move &down'), icon=':/services/service_down.png', + text=translate('OpenLP.ServiceManager', 'Move &down'), icon=UiIcons().arrow_down, tooltip=translate('OpenLP.ServiceManager', 'Move item down one position in the service.'), can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_down) self.move_bottom_action = self.order_toolbar.add_toolbar_action( 'moveBottom', - text=translate('OpenLP.ServiceManager', 'Move to &bottom'), icon=':/services/service_bottom.png', + text=translate('OpenLP.ServiceManager', 'Move to &bottom'), icon=UiIcons().bottom, tooltip=translate('OpenLP.ServiceManager', 'Move item to the end of the service.'), can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_end) self.order_toolbar.addSeparator() @@ -205,12 +205,12 @@ class Ui_ServiceManager(object): self.order_toolbar.addSeparator() self.expand_action = self.order_toolbar.add_toolbar_action( 'expand', can_shortcuts=True, - text=translate('OpenLP.ServiceManager', '&Expand all'), icon=':/services/service_expand_all.png', + text=translate('OpenLP.ServiceManager', '&Expand all'), icon=UiIcons().plus, tooltip=translate('OpenLP.ServiceManager', 'Expand all the service items.'), category=UiStrings().Service, triggers=self.on_expand_all) self.collapse_action = self.order_toolbar.add_toolbar_action( 'collapse', can_shortcuts=True, - text=translate('OpenLP.ServiceManager', '&Collapse all'), icon=':/services/service_collapse_all.png', + text=translate('OpenLP.ServiceManager', '&Collapse all'), icon=UiIcons().minus, tooltip=translate('OpenLP.ServiceManager', 'Collapse all the service items.'), category=UiStrings().Service, triggers=self.on_collapse_all) self.order_toolbar.addSeparator() diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 754a399db..aef0a64ef 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -158,7 +158,7 @@ class SongMediaItem(MediaManagerItem): translate('SongsPlugin.MediaItem', 'Search Authors...')), (SongSearch.Topics, ':/songs/song_search_topic.png', SongStrings.Topics, translate('SongsPlugin.MediaItem', 'Search Topics...')), - (SongSearch.Books, ':/songs/song_book_edit.png', SongStrings.SongBooks, + (SongSearch.Books, UiIcons().address, SongStrings.SongBooks, translate('SongsPlugin.MediaItem', 'Search Songbooks...')), (SongSearch.Themes, ':/slides/slide_theme.png', UiStrings().Themes, UiStrings().SearchThemes), (SongSearch.Copyright, UiIcons().copyright, diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index 4e7266fa9..ec2025d7b 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -20,7 +20,6 @@ author_maintenance.png topic_maintenance.png song_author_edit.png - song_book_edit.png image_group.png @@ -91,12 +90,8 @@ wizard_duplicateremoval.bmp - service_collapse_all.png - service_expand_all.png service_item_notes.png - service_bottom.png service_down.png - service_top.png service_up.png diff --git a/resources/images/service_bottom.png b/resources/images/service_bottom.png deleted file mode 100644 index 468362c37479806fd778f77d6a0af728c5c8e50c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 711 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMsm#F$072dJtxelbR?46l5>) z^mS#w&LhXiVW~YkWdZ{OV@!Zgh$~QvRZy8#SUtOK-T(jp*=4NQB~2JvxtTbHc+|Xk zHT>8mjMzjpW%Mjua#vZT7IDhja7ddwWUb(qx8_%MR12M@7CM_pMvq@kM>%Mwa>!ie z(0QuCGgTv&0+E2an~=IwOwDTZ$R2rP7i9}~WxE75`#96^T(j_8IkQM5mjZQoe^HKD588xWXbf%irG;O+oKz{$JDNgZQc>vyfdzRdSdOI#JahOjq4NJ z_a@cNO>Wto(zPeGZA*Ih=Is9M*%J@tbgj;ra4cuyvAmwur8Cb}&b?GM?^6A;tBotJ zcdWiQY3uXJTb~01({8%>G+_8zmIV2M;)Rism0eI!NJ2%!$jI2i)5jkO5>x6yprN&I z;Q1cmV`2KYaT9<x&A7$R{wIe~#G zP1xK#JUm&9%|Kw%lxds0Jv({}Crq96keN$kXT@(8mbNywU%x9{wV7BgOxM1Vt!-}l zGsnrMcZWk2%b8qTC85cWn{;(q6qlWdwr)RqynXj=4Tm2*YgSE^ym@nGU{+25BU|3( zIZaJ5#&T>H0{)shUQ-=DNY0q@`BSLGL>38)E2cLj0~qY}wc@WF2;gybP}hzXcXiO# j^p$pXaPg0qIK;%TzDt&If1aH#(A^B4u6{1-oD!M<=}ZRa diff --git a/resources/images/service_collapse_all.png b/resources/images/service_collapse_all.png deleted file mode 100644 index 6e682fc4d800b95a27d9e473e7e8d685fff76a29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/resources/images/service_expand_all.png b/resources/images/service_expand_all.png deleted file mode 100644 index 09b4ba394dd7780d03276c67e04b255685ddd1fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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){Q(+j#zwdi~JI}V`rbo?b<{XV$qLq$BMU1E@@TQzsAru%yUDriF2>S6C zXkJwkT|{YJgcs#i2z6681=+laq8d8gac=GW@SHp&B*KCF!1v{W_vQ0E&r48($f=3J z6TRVao~3v;`(B40YwRdQf}PR)9PAwQLV068-q(Zg4EBiPTp4F@G6#4-%$z% zC9qj3Ndlh!l=dSx|K`=GseSv5ayftJW&7D%Gi`7wcZG(-*Zf|;IHd$Cr^BZo_{tKf zhb|%(QO9C?>YLi4!JW}&|Gn14l3T?4Tt;t z_CF8SD1u%v;Ks2n@EjS)RUd!4{BbH>aspp;kc+f7J_@X8wl4Fdeki(GC&W+gq+s*>a?>qx0ZIpt_c_oCuZ^ zz_0>9SvU@XX*sY=6FfEJ1ttDAlblU%P9TPQl%`$HlS;6TaXUIx0A(aF8zMoF!1EPg zS#d+ef@28rRgn8l$L^||f^cX1P03#$N^3e+^EUE2fnhSRZ2`K;LCXQ@RU3<|7Je=N z2Bqt2Y+(0g0ASrilI59&cXLa&X#$Q#4)h+q+SPLsUauD}giw5XKZ_4@uWxX&3Q1`| zO={&u@ecpdow!77Ue**jAWNc9d{WR2m?F)NT)E&It|AWp;Sb3o!0&!}+V%hd002ov JPDHLkV1iMDF+czS diff --git a/resources/images/song_book_edit.png b/resources/images/song_book_edit.png deleted file mode 100644 index 8fa59df19f2d14696013181e752b67de41f43bf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmV-10?z%3P)0PyXWdo40uU^cnxdtG&;>e7%1cXa#(Gcl7rChox@c@RLT5CK#W^t^%9 zhBQeS#4&wn)d)ffg0+1G#t?~+#*Q9V*C9x3Ux7B7JYO^q`FFwUTe~ShMdZtzWl?e( zO6fJhr<3^++0SF9vtvGd+~;2ub;Tmfz5@IL&W@B0O9bbJ00000NkvXXu0mjfyYTMk