From 8ab45c342e312293943fbb0133aded30662f149d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 6 May 2018 20:50:41 +0100 Subject: [PATCH] more bits --- openlp/core/ui/icons.py | 6 ++++++ openlp/plugins/bibles/lib/mediaitem.py | 12 ++++++------ .../plugins/songs/forms/songmaintenancedialog.py | 2 +- resources/images/author_maintenance.png | Bin 1810 -> 0 bytes resources/images/bibles_book_sort.png | Bin 632 -> 0 bytes resources/images/bibles_search_clear.png | Bin 802 -> 0 bytes resources/images/bibles_search_combined.png | Bin 720 -> 0 bytes resources/images/bibles_search_reference.png | Bin 2031 -> 0 bytes resources/images/bibles_search_text.png | Bin 335 -> 0 bytes resources/images/openlp-2.qrc | 6 ------ 10 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 resources/images/author_maintenance.png delete mode 100644 resources/images/bibles_book_sort.png delete mode 100644 resources/images/bibles_search_clear.png delete mode 100644 resources/images/bibles_search_combined.png delete mode 100644 resources/images/bibles_search_reference.png delete mode 100644 resources/images/bibles_search_text.png diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py index 9072454d5..c9ab20590 100644 --- a/openlp/core/ui/icons.py +++ b/openlp/core/ui/icons.py @@ -100,16 +100,22 @@ class UiIcons(object): 'repeat': {'icon': 'fa.repeat'}, 'save': {'icon': 'fa.save'}, 'search': {'icon': 'fa.search'}, + 'search_comb': {'icon': 'fa.columns'}, 'search_minus': {'icon': 'fa.search-minus'}, 'search_plus': {'icon': 'fa.search-plus'}, + 'search_ref': {'icon': 'fa.institution'}, 'settings': {'icon': 'fa.cogs'}, 'shortcuts': {'icon': 'fa.wrench'}, + 'sort': {'icon': 'fa.sort'}, 'stop': {'icon': 'fa.stop'}, + 'square': {'icon': 'fa.square'}, + 'text': {'icon': 'fa.file-text'}, 'theme': {'icon': 'fa.file-image-o'}, 'top': {'icon': 'fa.angle-double-up'}, 'undo': {'icon': 'fa.undo'}, 'upload': {'icon': 'fa.cloud-upload'}, 'user': {'icon': 'fa.user'}, + 'usermo': {'icon': 'fa.user-md'}, 'users': {'icon': 'fa.users'}, 'video': {'icon': 'fa.file-video-o'} } diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index a3f90f9c9..4fd533507 100755 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -31,7 +31,7 @@ from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext from openlp.core.lib.ui import set_case_insensitive_completer, create_horizontal_adjusting_combo_box, \ - critical_error_message_box, find_and_set_in_combo_box, build_icon + critical_error_message_box, find_and_set_in_combo_box from openlp.core.ui.icons import UiIcons from openlp.core.widgets.edits import SearchEdit from openlp.plugins.bibles.forms.bibleimportform import BibleImportForm @@ -105,9 +105,9 @@ class BibleMediaItem(MediaManagerItem): :param args: Positional arguments to pass to the super method. (tuple) :param kwargs: Keyword arguments to pass to the super method. (dict) """ - self.clear_icon = build_icon(':/bibles/bibles_search_clear.png') + self.clear_icon = UiIcons().square self.save_results_icon = UiIcons.save - self.sort_icon = build_icon(':/bibles/bibles_book_sort.png') + self.sort_icon = UiIcons().sort self.bible = None self.second_bible = None self.saved_results = [] @@ -315,13 +315,13 @@ class BibleMediaItem(MediaManagerItem): self.plugin.manager.media = self self.populate_bible_combo_boxes() self.search_edit.set_search_types([ - (BibleSearch.Combined, ':/bibles/bibles_search_combined.png', + (BibleSearch.Combined, UiIcons().search_comb, translate('BiblesPlugin.MediaItem', 'Text or Reference'), translate('BiblesPlugin.MediaItem', 'Text or Reference...')), - (BibleSearch.Reference, ':/bibles/bibles_search_reference.png', + (BibleSearch.Reference, UiIcons().search_ref, translate('BiblesPlugin.MediaItem', 'Scripture Reference'), translate('BiblesPlugin.MediaItem', 'Search Scripture Reference...')), - (BibleSearch.Text, ':/bibles/bibles_search_text.png', + (BibleSearch.Text, UiIcons().text, translate('BiblesPlugin.MediaItem', 'Text Search'), translate('BiblesPlugin.MediaItem', 'Search Text...')) ]) diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index 05cd92239..4df97ede1 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -48,7 +48,7 @@ class Ui_SongMaintenanceDialog(object): self.type_list_widget.setUniformItemSizes(True) self.type_list_widget.setObjectName('type_list_widget') self.authors_list_item = QtWidgets.QListWidgetItem(self.type_list_widget) - self.authors_list_item.setIcon(build_icon(':/songs/author_maintenance.png')) + self.authors_list_item.setIcon(UiIcons().usermo) self.topics_list_item = QtWidgets.QListWidgetItem(self.type_list_widget) self.topics_list_item.setIcon(build_icon(':/songs/topic_maintenance.png')) self.books_list_item = QtWidgets.QListWidgetItem(self.type_list_widget) diff --git a/resources/images/author_maintenance.png b/resources/images/author_maintenance.png deleted file mode 100644 index 9a1f551591b49dfc5a26094d7a5ce462856f93c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1810 zcmV+t2krQYP)-zF_X((qItbe2cR{zavT3;rz9e7v?YiPXye% zqrFGxr4#MU?#qf0@(u$C5uA&s-Z+=~EtY}e3xpHv1+LRRsZ!Kw92>ghpdJLz?A_kE z9m}9#1zvgX$7C)w{~bce{zxPZ`q1l zx9vptjr}GqlTs<9IeB;=9X^8lpXo(!riYw z|FZ{19{ZJp8kC_s5{=>q-+c@N16#oYF%YWa&U;3XN+xmQ#L0#=bs(KgjGCr73QD1A z65Mg%SQelHf{T%Iq4Yfff4n|?dq$cmb^c$Ls%8? zY973jg)j@aIx#Mvc>0&gRSUTA>Y?5(0~_N&4Ov@+0HlP+S8iC}D7n1>OK7^|iPL6b z@uaj$u7I2`!YO5O^!Q6ea?V#Rz=*^q!jW(ZQos+$YrC)k$$eh~x;7r|>AQr_kVqx2 z6f;RkuM6coCO;WRa%Ktv$)l?l&^NT76Jh@p+=g_jAYNf^LAv4Zb{U$k{k&^n1fQj& zv#Z&Jiqz~3=F%CgYwLpISO^ldtZ4`v>!U|Z%Y5ARaDWqeZ3qd0ur05(2}M(m!)0u2 ztkE!xq4oC1?Gc^qq`~L|4G|53*Moo{mn%V+4*GBY+LJ%}#pAaYjrfG*&YMGb3@@xW zgwbvLBpHjnW+ z^K9y!L$@&_dV~^66h(nl1E5}qT(OV<4aWSrNsWI54L~71i^OySjlF|_VnnGC`|JFv z!*Plg*mlppoQ%Y+iF6eoPb6{4jRo7ljT<-3Q$73;QFS5&hliA22v9u)q6Z-TnXxf5 zJp)TJR4oTnSI)yjat^8*bs%*2iUJbj?0%X!xR)2(eTlkfB3n=yY9D1xo=quCMVO>s1pzpV1TPT$Z;6kD_|0%TM zGzgI(OobF2j#=@2ubLK`J33)(xD7@igv5vM$a+njPc8D_To>^6sSEpCTk8JYP!|pu zy6P5Ypp*dqn?Nq}_sO$>3*Q3o#|hI@(K)lyCu?Cc@GwG{b@XKADjeXwiSeET~KvP+5 z@Rmo`R>u+7J2#ikXWTfm<_D8!55E>>R2k~+X&GKuAHF3V(tBJnb(9cINH8G;@jV9M zYLpV!hTC28w#}zYW%K+eSLaS;7E5D_sU;5_*!}sRjE)?AkJ#MQxp1OV%82doh>%hx z0QCw}5Qj2aR2VC`TJplOtC>_#96UILFZn$D7t@xWtlnb?Q~&?~07*qoM6N<$f@PCh A4gdfE diff --git a/resources/images/bibles_book_sort.png b/resources/images/bibles_book_sort.png deleted file mode 100644 index c199438d8e66f65c414247b55a2da96ee6fb0fd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmV-;0*C#HP)= z4<2tGydU5DF$_RV$$9jK&r-^UF|NoSu^$5xwr`Za*M5L82FtQYYcU|lfunIecveI1 zQys0nMwPjT&wYDxRa(X=;#hdMTtxY85mDDcdAX?U5@~Js9rEzzOC7U!E+H0=pXEF_ z0tE-qP);t!#>a_)mUKGZ#el$r0FAxhO1Ba4Ho6jc(FknYCZPnT6&);u06|s7PO}9m zI3?>&K+c6iA)G@tn?){{(+N_kRLJ00Gk_2Qc*vjwatv7zGMNlj?=TQ;^mzhIioY5B z^mnPU5z~qe=A7fiu>swJ!)Sf~VBkh<6qlC3EQZn16e^WUIDBL-baZJ=~rDfR`(4pk;Uw2G6yWhTng4?)`ta;5atc>pPenIfH8#Pl5}H zhqsgX_;nMH7t67(A?EXW3Nm+~w?J5!xsH+hFAxZUTSKQ%s%~KRX=%I7`9yfizVDmr zq|G^pN3^ls#O0aixN!P7@++$?#bj8#zE|n#GgWI_a_Z45iNPDw<})4mJO2SRUQSlI SFFUdT00001_ diff --git a/resources/images/bibles_search_clear.png b/resources/images/bibles_search_clear.png deleted file mode 100644 index 19a1665baf0a3d62cc5f72801c02ee31d832ef03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 802 zcmV+-1Ks?IP)DEsaU~GX3SIsdMei7bh)})pLEh`3!Xi^UM4W+LIZr$zxaOz7mw|A28X|&gK2(h zZfSoyEkX7Ar7SOshe$kJ@wtDv=f<5!bjpH@N4L9nR{6W;bYuBbX#H42w#$q|FGoYkR7TQxAVVC~AgvlcDbQ{K}v zz)cqHtE#WH+tMnPL>x$^K&cL@=%%l{d{cK)X)1KPX3v;gl4lwwgdERi@@M$WfsL{? zP3)eLTi{~|fOrH9%Ru@V9LpV0qngA+;sn5whQ6+jjvrr!>i^mx(;;26*la$T(-0mV zM6EV|5;_BFz$$UjH5GQd1)8dx zW$%Zmk#1*hIjlV+=?;EPa9k=7g`$b#;sWMW{kp}nRc!428shS@9j29Ip{OZjyKMj{ zG9;eH^E^zu)Bdikvh?_!mu@q(n3*v73Z?HG|HJ$KtcH9J10IQl4im gAunrc0{^W1Pl-0x$iEP)LoK~#9!l~YfM5>Xic&5W)(YLR#mcEJ#~&4>k|jR-tNU4(?f zLpQqy9inRy9rjRr=+d65`(E7DL#wCgvh;_=rHIsd3J6N>2w-0&s;1PK|M;PQjj<)zp){* z%lxh*;Of1;vUuU@W!dV0K}8~wpbR7+>{^xu5~os<$)s47Lk{G7kG57mzI?I&c6%8T z(-Db8D60_h`~4J7Q^VmfrXlmot<|;q{k?a6)GCkR^C)n;TtuRtP&ktyC)8j%+Yny# z0oz}?cpD$KzoYX00lz#UbUGbs9ue$t#%#mc#bOIsJbwc_Z$6>Avn*;i41h%%50V0Z0Mx&8a(zJk+;mo;9(0{d&&pkueSiqMb z8g~~%JRV1_Rug0FcD1hn_72;b=Z}POyNuR$yUp_JYwXFxENiuztkGz&LZQI={XToX zx!DE~Bp!wRGtKLUu`5rSnC=}NW%H=Y+_|HrxbF$a#wP3?`VDRjwX)^x) zMete~Z=~3B0xOkDWZQ3No_3%Dn8m;Gjo%$%3cmq`yeHklOn15f0000{l`45fF)Sd}nJobU8nr>0%Xr&{P;r+8i|24V%^3U#TJS7W63x!hkkSNJn zIpze}GN{xf>L$>l%JH}C4`Tq{oI9~OQ4aym%;nMmPXD;5TlKaJH--7m)nf3sPdgG= zGDSM=GXJpjp7c!I7Tz9v+Q{{}m0{WPpx$YbJT{Ceph2F$u;1A{=qzr%SixIs<1wv4 z^#MK}s`>l<>%5#5)#@zbNxD(Xlp7A2##z%HXiDqoe9;dOWuH=zcn%mEdDk#>FyY(Y z;g|KV*JkBxv*vF8ENYhL(g0;_xN7n@M!o)TT5qz-KGi6HmyBL(ukrBva(H7m!butm zxCB~6oo(rCC9{wzb&6=uS8o}(S?S1#F7V9Wl)?i5h=~>eq7P6PnauT?NDnZI+48fB zRDiy~8U(F)qYx;{LsuM^MmWvvfp{*|`N`C72XX%0`u7sud|qLz zs;#*5Eo!H{_aKmCzA4x|(^dn9)R1`c48RN;M5h6mL=KP?un0pG7H~!MIQ8LLSxhWZ z#E26U-Q!Y1w|VobfX76JWytW39PcJwk6eP^l=I0zpJ_*@R<))Ww^^ogoBia8QzPp= zPt#pXw#MdpoF_YU)h2JN1z>KIx!4ZSU^){~09(fXz*GT_C60C60UF4(5I@LC$D0<- z_lD%w09En6b2sMBRE_#L3O*R-lXz8pc6>IoUl1m!<9l;kJ8rgL>$q_4xpSzv&*k{% zzHS}PEA4%pXWr*aE2i?8e#a??kh>1hA8?ZH0Z21xCcgl@W9&uV9l)xwKDV~xJN9c< z%B;m2Lz9WM?d4Wn&%N*VtUEMM7$QhwceI3#Q3=jEwJ~DiqIc1|=-C9UL@MGOckN+z zcl+C{TCYN{2VT*qq76oaQXj#kY0WN5hx)0$VoQq!wHCbl+=He zfdxKM-uJu(O}lk-j1879zA&{oDpO{{&gk$zM2+piPW@HW9D6z-Hi>VD0s-@g>8|NG z;3#qIa%2Pi9Rjr=joWN5vjy8uFvYLG(#$X|te&yU>8r}G8%AODwu%^z4i z3U-w|T6WD%{p%6xV7BuA93q*rV7xQ4hx#rLnwLM}7U{P3+2=q5h;qewqGf>Yk?xkR z7GQ;}jP(En7XBsv7|0EB-N^7AyfY43lI_qeukfpj9Il$an*Wkl$ixpUV8n;Shs1|a z>~huRs>@a8f$P_5LW2tsJ4I}rs2&>G|4Oh~|$hcSq+nTE;Q)4mTZ z{-z9_8$i&59`pbti6oIE=01HvpV2lh7Fw8qr9NVb=&7jaa<^V*2rvpAgR1I3#ZLMM zxtl1NqY0h}GE}V($705dUn0_Q&Ce+ zi_f9#f2xjY*9CG606Y=#un`-v5uk0fjkeLlzkSO(HK*r{oJkkxljHlbua~4l^33Dvzm3P1q`6#sWTvdD9h=c0-1n-5vAgzOF39kR3LepX3VSys8B zN+npYRXJ5zm;Ji5E$!27n2<4Uo9tA~(NVp$^0x~hWKuL!1^_>9EpIq>iIDx1h^7~g&L@k=I#SQ%`fYc+ zAj^=i^J{lM<({nQ_tJ~ci(WcEbT^Qn$UIa?{yM66lCXbadKnKaW(>?e@)Gzj2$Uw1 z1OLb*0000YdQ@0+Q*UN;cVTj6004N}D=#nC%goCzPEIUH)ypqR2LLwM23QbN%3J^d N002ovPDHLkV1nG};fw$P diff --git a/resources/images/bibles_search_text.png b/resources/images/bibles_search_text.png deleted file mode 100644 index 1ab7145c6520bc770aedc33259b26d1df59f1361..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~)E9sxcf zuK)l42QsW(4WB}%e<@${og@7nN9H?@3?TWQBjY_sI*9D< z?gpxa10dJu!nw~tzF0|+UoeBTk&%ge1qf7DRoB$k)i*S??EDrrc?M8LxTlL_h=gS8 z!AQO)2L{#+TAvsMkL2$7@2jeJ^3TOh>n+2jc(j*irOC*oWysc)|Il#i*CwBG^$WflIelF{r5}E*( C9&~j8 diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index e0e52503c..0462b463f 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -6,17 +6,11 @@ song_search_title.png song_search_topic.png book_maintenance.png - author_maintenance.png topic_maintenance.png - bibles_book_sort.png - bibles_search_combined.png - bibles_search_text.png - bibles_search_reference.png - bibles_search_clear.png plugin_alerts.png