From 206decbb7ecf55dedc8b6c3ac6d5d087157d1ecb Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 16 Jun 2018 07:09:15 +0100 Subject: [PATCH] finish projector --- openlp/core/projectors/manager.py | 22 ++-- openlp/core/ui/fonts/OpenLP.ttf | Bin 166496 -> 166796 bytes openlp/core/ui/fonts/openlp-charmap.json | 3 +- openlp/core/ui/fonts/openlp.sfd | 106 +++++++++++++++++- openlp/core/ui/icons.py | 3 + resources/images/openlp-2.qrc | 7 -- resources/images/projector_connect.png | Bin 928 -> 0 bytes resources/images/projector_disconnect.png | Bin 855 -> 0 bytes resources/images/projector_hdmi.png | Bin 351 -> 0 bytes .../images/projector_not_connected_error.png | Bin 1416 -> 0 bytes resources/images/projector_power_off.png | Bin 851 -> 0 bytes resources/images/projector_power_on.png | Bin 889 -> 0 bytes resources/images/projector_show.png | Bin 744 -> 0 bytes 13 files changed, 119 insertions(+), 22 deletions(-) delete mode 100644 resources/images/projector_connect.png delete mode 100644 resources/images/projector_disconnect.png delete mode 100644 resources/images/projector_hdmi.png delete mode 100644 resources/images/projector_not_connected_error.png delete mode 100644 resources/images/projector_power_off.png delete mode 100644 resources/images/projector_power_on.png delete mode 100644 resources/images/projector_show.png diff --git a/openlp/core/projectors/manager.py b/openlp/core/projectors/manager.py index 22cacdc20..609b8b000 100644 --- a/openlp/core/projectors/manager.py +++ b/openlp/core/projectors/manager.py @@ -87,7 +87,7 @@ class UiProjectorManager(object): # Show source/view when projector connected self.one_toolbar.add_toolbar_action('source_view_projector', text=translate('OpenLP.ProjectorManager', 'Select Input Source'), - icon=':/projector/projector_hdmi.png', + icon=UiIcons().projector_hdmi, tooltip=translate('OpenLP.ProjectorManager', 'Choose input source on selected projector.'), triggers=self.on_select_input) @@ -211,29 +211,29 @@ class UiProjectorManager(object): self.connect_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', '&Connect Projector'), - icon=':/projector/projector_connect.png', + icon=UiIcons().projector_connect, triggers=self.on_connect_projector) self.disconnect_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', 'D&isconnect Projector'), - icon=':/projector/projector_disconnect.png', + icon=UiIcons().projector_off, triggers=self.on_disconnect_projector) self.menu.addSeparator() self.poweron_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', 'Power &On Projector'), - icon=':/projector/projector_power_on.png', + icon=UiIcons().projector_on, triggers=self.on_poweron_projector) self.poweroff_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', 'Power O&ff Projector'), - icon=':/projector/projector_power_off.png', + icon=UiIcons().projector_off, triggers=self.on_poweroff_projector) self.menu.addSeparator() self.select_input_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', 'Select &Input'), - icon=':/projector/projector_hdmi.png', + icon=UiIcons().projector_hdmi, triggers=self.on_select_input) self.edit_input_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', @@ -248,7 +248,7 @@ class UiProjectorManager(object): self.show_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', '&Show Projector Screen'), - icon=':/projector/projector_show.png', + icon=UiIcons().projector, triggers=self.on_show_projector) self.menu.addSeparator() self.delete_action = create_widget_action(self.menu, @@ -288,10 +288,10 @@ class ProjectorManager(QtWidgets.QWidget, RegistryBase, UiProjectorManager, LogM S_ON: UiIcons().projector_off, S_COOLDOWN: UiIcons().projector_cooldown, E_ERROR: UiIcons().projector_error, - E_NETWORK: ':/projector/projector_not_connected_error.png', - E_AUTHENTICATION: ':/projector/projector_not_connected_error.png', - E_UNKNOWN_SOCKET_ERROR: ':/projector/projector_not_connected_error.png', - E_NOT_CONNECTED: ':/projector/projector_not_connected_error.png' + E_NETWORK: UiIcons().error, + E_AUTHENTICATION: UiIcons().authentication, + E_UNKNOWN_SOCKET_ERROR: UiIcons().error, + E_NOT_CONNECTED: UiIcons().projector_disconnect } def bootstrap_initialise(self): diff --git a/openlp/core/ui/fonts/OpenLP.ttf b/openlp/core/ui/fonts/OpenLP.ttf index c52fe31f11d626f527272f6f5b4724a66f376ba2..4e74c63bbfbac587c03fa81bd0fe1edf5b32d5f5 100644 GIT binary patch delta 3574 zcma)t2@!{ms~FDx!89vOa><~txLpkVouTtDk>0Z)_WafP`hMSck`O6y6A zkGVCsaB0HsF$Zu3%J+Y+X!#w*TLNo`;ffR=x$^YGF??h6FW+2ygD3fWf(9uK-kz5n ze`?%6+b!I>-X;&)c`DNFt-91kT0vE|mD}K|BQ~n)m<4R}bDsrTTGbc9pO0O9a?#0a zPNtuneCX?g-yPiQ9p)YC^?E(tP;ZDg*c;>x^bYn0curLP5OUs#PR}Qvqn;xkpXadW zkmsPM!}GD{BhP`57OZM|=xtRmhR#)y>7luUgM+*wfkQ(*Lo~~(+T|Ht=3l3$`4tTC zhXJc$V6f0GV$^Jq`lNw-(=2Ij-r3Wq^FJxc552h+-s+vrW66HcVm&A!?xK!h%9WX5i zQW8a3CrlT=*#a}v*$geFs(5M>%#_f~dPtLaS}R;uAXGfvDt8oe?dGGm3Bx+)6Fu4;gVVWM34;A#bC1q%gSBhlTdNPmrT*JKGFtW}){)%-(=+W&_o@cU#~uY~nltWr{SH9V3i zTHw)gA>X6DutB~JMWPLAlv7h88sV`#(E}T6;PHJ>+X_#tgFozmC&xpbiaix3q_;_H zPZvPFSClE>nLY4q9XuByHbX;{Xoo*a=mmdxu@tsQ?4=yos`=Jzp<>%Ap)po8!Cx{( zH~ck4REsXyo-A5nN51HUzZDDV{#{x-)1fI&Z?Y**h7w;^!Yc)^O9KC;ISQJ4VRs|E zS^|3{_<9n&Q4Vh+)L@H>?Tr@|@YZT1|Me&pRV>MI2b47JEX=AwZLID zakvtED&lK|BgsOsNA;jbd*KtUb;iJ_YWh>3_W!d^_`DjrvP2Jjp@c6Jg#x>C;4AsR z&VXa$xcDX=zD~mk6z$qr@>v z7^C2^YHq9#i__XT6*;d1n~;s2-;BjeBSGUuUD%|2Y;vZk*NUiGBnOrLzh=$^Rlq{ z>DYoWQHfpAh-C_0YIb#|*r88|YU~;{cWoPXono(3jqC>O`Y?TzEGiLw*bVJijuLY8 z)QdB)C1Kdo0HI(o-11v|!aL_{eIkM)@@wA1lE&7GaM|yH>GJ9LJuNUY+8eD#bQssG&`A zK3$2`XJgMKVb7Lh&oy8T-PrRg{Cp4gCl%Se4%201FXa3Wt=OMyu@|ecEh*SbG1%59 zq50N6Y?~Tr)V#4#XudOE_^_8VMHlu;iS~b20Jf_JYmN}5LWOrXW3P(W|j22I7Ud+Cyq!=mxdjc;3v)4r#;x`O6*c2|I*qQTd*(HSa+1D z!M;itKJ051Jtq6OnmpcseKTI?sDCSO^27VgX~xCkW-7y9IKBkFNcn{gv+aM69Zvt*Bo6D_#WDY)3< zxN{^vHU<~hj2ox;bDMDIDRx3W?tFxN7tF`S2jC`ZOpw-vIk<~X(TkhZh?`tQnM)dv zOX|W+QNUCsUs8>mCV^?`qFhKcr52~V!A)<#r7C`AFfL6`k{*VeRfL=(N|yubyS-$W*D z7**)TxrvjuXB4_wI#I6bso>~vw^xmuPMROF`luemSmGGBy=A$Z7db*J`rns3-FUF# V!ihdTGuN^qevO;pH+$jM{{SZTKiU8Q delta 3519 zcmb7{e^k}=8OLAG2ULDsxK|@3MZ-j;!u&;w4vi@))-`cbvBHGJqC}<1DcsmDE0&hj zv7jJlg+*n>3e!zyWHc#hQKNE2ii$;LMP_D;iehgXJ7@cAXP)!o^L(Bk@8|h^zn9O& zvdXZIim(6%L{LHy>GS7jELuPD`d-`}sq)4wNS!yI@$Q87G1`w?ymaD}JE#0|4p^r4 z*(+A(6y&@d77m^UaNk~+v#y}GS4!@VD8)mr%U^%(q44hx!|--odQ{%ZoZPSnmM1IL zE~e$>tqkNueiODwf_(*Xd8-SHR*f8bnfCP%9-O~+MUMNSUBh_$_HnCoiVA`zI}Kw= z%8y->vwG#F!4+5FZa4|SH3e(e6;>~Mssy*TLQVg5IL_KK{i?Km%e~285k5#|@ap2^ zNqy@(GhE~Pdu;lkJ$;YCHJ8t}k+!Nl%Sv{3SVXwZD?j1+XlzdJvfj+z1-;Xbe0KQM z;T^sqzQI1PFVYv`^Z3GjVZKmbh;LANPsI5nKJdQpeb0N$+u=RxJ>os=ZTBAX9`wHJ zZHw4no)Xzuz9jOR(C{#?Cv3C^iYPiL3D;t z!?Vit5c6P!3S;6#GmNYjT`;N`&Xzw`b)&OI3!I~7V>S3xr6;ty?4Tat$;b2Y>t9+)qJi5 zQYDnS5#~vJULDL&7ivELG%S!D%N0#_eD}7)ee&IxA?l%0 zHI-SS3aZjX8{A(ETXwtJgkJg^lW^a(Y4s2i%Kw@tB!)5U3cMDd!yc6hW@^uS}A z;c-L*Y?she$KmO0ct&D%sY3f5DMHPjEr6XNq8fH3iB|YyoG214@TXW&2fO{E8R|2I zbpI@^JqhrfN2KXVKBvM46+E8~dnNF1UI1QbhsG*+F$?xduqg&!$`zgPvIg9*X3bF| z4_@(!F5PY$p(RPE*=y2!T{^F~!QbR-^$X>^p`LH1z*`}D|8Gg`K&j|}zh?`rZ|4g6 z-$@mlp-u6&)9`LR98}@KCOA~Bi`*mRJFLMD*TNAEail<~$i#GUJ1)oF zg=)LY;F~<5LBCb~cXiMst)61|Ud?*dw6{cey-(zdddvbI{m90goK9;{J{Brpm>&yI z$2{?(0gK2JC$Y!^%$p^8FkdM)I1?Mvp>HtRQQg?kII$TUmMo5A(P|j2+_UPi;ThP7 zXwiHJu1K_92FG!-lq7dK;vvk($biaxfI$W{zf8B}wMl}JgC555~yG3=k1WsbN zri&)5RKmYg!EI$i2^%GFdx(&|NwG2&-?5-y-b2c(&c?P)67mHeF2Ej1!D?c#M{}{q%CN^HF>H~ zNVqojKd8h0P=Y;Oggq07)dgca5ZdqPz@F6rJGI|gCA8lYC7Q5?B+-IBulVy_djETi zvAsRm3)w=A8*8u^`;hN165CgeHEGC~Vz8I9u>HxR8*8q`UMa!;nu@)ei?xW?)aZ4^ zTGO#NH1wNY*jr85fd=gDM6n%vN3phc>|OObsNa7(l!3MTu_M7kqDMuC#B^!cF$um` zgLSrHAFA-90_?bAA6H{I(-X2k*N~r=VJCgUk9{GnQ`w>i`!WkV z9Vc|SuXO+0KUDa23f3**Z%VOmqlKpXE=e?FJ@S38{SPfzuX1`DaJoPooj5DQ>E3Wb z@wi~w0}62iOL2o5aiIygu-<={^E(dJ8T|2{TokT!fn?f!PTnS4i}t5}fV^mr{nC>k}t& z^K_E=-MBP~EY$vzdYoVNi{kqJ(*J*u;C~nF>>R!!=++HqZ`g3Q?cQ*>A^tlQmjtheme_new.png - projector_connect.png - projector_hdmi.png - projector_disconnect.png - projector_not_connected_error.png - projector_power_off.png - projector_power_on.png - projector_show.png app_qr.svg diff --git a/resources/images/projector_connect.png b/resources/images/projector_connect.png deleted file mode 100644 index cc3540629985b9435ff42b4f14abd1959733dc13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 928 zcmX|9dq`7p6u#QS8b$qML=pI>Mbd*P5Tyqb9hH@C>P&RryWP!QYn$7y^RB5qagvtR zrnWRmBq}!*6frbXX^+hJ+fk|D11uQ4}n2JSb49RC2kTC#kBca=YDwgM&aQhOt;I^c9rQYF3Lfg+igaswylj zL_4WerlZ@)$W0kELpL=wjf{+7Vs>`6QmGsm7+_fzp~++dC&1j?T%H*SQalMjjNp6W zKtFUsB%l2+=CWR%nVFfQlcNUhe7)Ih=F2c^dU~3?YmgeLWP`%#bar)hfrqkYfuXgv zm7m+z)&{VF0aY9j)DNuc@g46;?*-;M3%TRmowM$wwS1kv3VRJzZSP zNLETEf6F9mBQ<$ zgpm1z5%s87q#g-dQIASH)VoZzjdw<7-7#Ns?mg$^-tT_j$z^+!-3$$`86XH^NOULo z!hZ2I^l`A>y>CQ8kaND?o>UadprD}U=4P!{3ptC$GB-DGX=yPtGpnnsGd4ChH8su2 z$tf!-_Xzijs^z@Ei5c7 zEiJ9BtwFr4t*yPiJ;-x%a&mET0e%!kU0q#CBodiS_VV)b@$sQhC{!xd-`_v*1tBz; z6d8^JGdvd^9sPzzjiHfZVq#)rW9f7{SV)Kq`M~f`PEH0fsi~F=0=ZmnNl6Kh$EySkX{)QN zYc^`Y2uul#@cI1K*4DPRw)XaRfk4pH)6>`2CzJ~N`}+q*Cx!t_!y_Xj-$jzKv9a;- zaTx5>)YSC!v_vAAnVFGFr81dpc6N4dZf<^lUM`m}0Mt8+V)5eQ;?mO6^78V^%F62M z>e||xLZMh+U*7<19sH8XHa9nwO6Atpma4Z`rBbQYYK=y-y}iA=ySu-?e{gVcczAep zbaZ@t{O3gbcVYs5QH!ij3O`9F(U(j?oYrNu)8dtf8v)6|Uw4P%{CoF627=&{PD3Yc z1{;N@ULx^1s<&WZpkse?crW(^T1+CrnR;b9B20+qYUW$xv0*`o z87S`@_6#R@kbU7^zztr-RYCZz;4qEyTaX|&Zjs$p?G#^Ph9AjwHdxj!G3c2^KT`cs2)kxH8P37zwRr%jeCh8J5Mc5@2qWK0wo9$ KB@>!l!mxky)3ta2 diff --git a/resources/images/projector_hdmi.png b/resources/images/projector_hdmi.png deleted file mode 100644 index b4a64cb282c381e9eba371bb435b3038665cd197..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPq7eAwbIcpyiNaq_*7sn8b({Cr}_B98HxSfCeT=l#_ z*#*-Ck5}3o{Dow?6{m(qlpSE&ux0^YZ&r{yhln-qT7b#ZvDysx@c;`qelj~msMo>cnX|ITyx!0WG0E;qja4KO)oaNgK8P~f=X zz3`~ZCLJ8tqHNCpR_x}8%D%PjY2E(dX{rqOw&hABdt9EfYu(Nmy*00^ED~><9V>iN zVs)|fZo2mILYHjcX{jonhrU+1X7_f;ytAKwULtwN-8`SmElfuWWxmxOkMb6A)j8et rdRIH|yz}azp&Qq|emMW$pGN)<-C4}v99o=!{$}uW^>bP0l+XkKeeRBR diff --git a/resources/images/projector_not_connected_error.png b/resources/images/projector_not_connected_error.png deleted file mode 100644 index 0a170e2d92f9977881d9acb78c5f986884167d4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1416 zcmX9+3pCSv9RHW{jG~t$MRRm6r?`Z0vpJh=+ta?QXs@%26AtC+>B-@6c6WC{ol2z|7#O^M{Tc>?6&4n%tE=nj=_Mp2WM^kv zSXfXf6e5vmWn~o|9c^Z2Mk0}Zy^V^BVzb${wzjdcu{Jg~fCPa+fIYbE=;#PGPEJlC zAt8Brc^w@c9v&W`URG8n5D0iY-Yi zp`jtr*x}(}p-?z7GBP?kIyN>Y5{bsg$KSnsH!(3WIXO86AYGg0@usJzXJ%$*XJ_Z; z=EP$0{QSH`B3W2iSOi#>y%&j=mX^7`KYjYNzP`S(u_2Sm zHa9o7x3_n8cD{Yz{lVvh6m?JRR{=@d6Y7R_hu{k$-=Bxuj#rRS!v0eZ;Gh)ja6JTq zJ+T(r4F;bFh?^+9wU zFAXsP=jFPnbhaH4?Dmp&l5TF__d>l!QTO~l8QeybP1Ot!xbv@1_V(DqA1|}|ytqY! zu+J?itZ$e3W5>qx@}gTEV&jO~ytagwRnK}n~J-64$dZ|u7V)Y-< zkv2Mv2%FRd8)zU3YV-aG@di}4zN@GRg$%~ShwF0M;lVSXDd@#7Un4mjZG(e{)JzWy z(AwrAGSU?kwO%=GZ1$Ta^ndUOP*N8dE_74zC5Tt1Ll#IT@f;^0_8KQ@H zp5@0Ff~}2>EizH}D7AZ%kd8^kJa;Q?xj}=tgyI(xpQcG)(`+4`)sH;h^Sx=9YO>Mt znoCLkla?Eac8>HY?`&LncwL>J-!KHtSfWZsH8Y%)#hURM>e4Q$r^Tz%QlWbQ^qh5u z?;T=7yZe3~X+?zzP@xnimFy+5gWE^H z*Ndq&-&YVTaW6TfdzwG4r8r}$$45j)ARJ2siV7Mn7cTOLH56Aqaw?Sf?Tq6ZlSpuw zizlP|@lf`O(BIoGNWP-;+SL-|F^&rI6RR>Aoi6?-X6qdL=pofmlA3CRm#z1sM^#lP zPoB0;oxONQnC9m8_J)Sd&8exKo#bQ|D<{Xu_9o25h1%WJq@rT@ zTYvxMHE(^b7Zvv6hK46m)rVD&9LHakEHcRTM^wKpewVLD$oK1qotXfEhR`T1vck@r F_8;KV&6ofH diff --git a/resources/images/projector_power_off.png b/resources/images/projector_power_off.png deleted file mode 100644 index c2fc02ad1ca188c58df6ba33f74de614f3c7e070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 851 zcmV-Z1FZasP)#%9qDe^B@B7wfaoYvc6*ybDbj-n zQN~bOT_vs8aX_ivCaKr4K|pDF8P7S=I93A?WkJ$77Srv*fde#-9;I>Y7^dH+(QMLa zHc5v0v6&g{;tVIywmG-MPc<%a=ugDC;S9R_@Bm_jBk{ z37MF{w65b8=P9}y4}+w(U_*4pfS>S@|D z&k|hu2L0)4;Gn$u59JqM;-Q)2n6*{9^EZ&NOdcnwTmAmnOCNbRY zo74TdU(c@>Y}v-~S(Ee=TM3}a`W_sIP%QVzFz(>5z4b`BiGKZ6jW5Vva?%LwWvb9wLwR!NJ^)v zMHP%P7-gtM6|^$sybkKED)p#B7zHX0ohYr01hFr*R+XOolMMHcGkRzOKdv)cnqagv zfgjfxE1lv*?>Gl?C2G+oQPLExv?y>AHQG}5YaHu2N!E1m#r*q(%@F4t4roRZ=jT5l z?-dy8IZ55$CX5>*Rz!&sLO+s&#Y5~*J;KfHYm`^ZB(bHL1T@>qai_basFyAvUqueR9+MLF}m2B?euc` zv~7{|)fU73FZ0~tL8RnUUcXJ0gq#>T&g(C{Lq1jDqi;Us*6cmJj0)l)`P2X?tq@6= zn!G~ak#mdnSYBJgWG)~I z;-;hJx3Qtd+5~GI%7_ysn9fJDJ6%tATtyf*o)+y1Nz2mQiBSy!z$Rd0i_$`-)8OT_ zOXtni&Bex!06c!|;f`RtRdlh#T8Fc4FT8)U6c7Os0R<+l0d^`24|e|sAOvA@7Tiuq P00000NkvXXu0mjf+Ml6i diff --git a/resources/images/projector_show.png b/resources/images/projector_show.png deleted file mode 100644 index 6ac732d7b3987ddc50ff918cb1071feae4c4df5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmVP)hND&{~sa8A*~5$1x)#Bh1duwp|fne}A7R)At!28@s@31F42Ig0(f`bnHc?9&p#*id{0i7c@CC|qPfO7@u*k_JBiyZc;P2NPRG1&irF1Q^+ zFQlD>Aey*b#M&P&0OfL-r_BQ@VTtf{2gmMV(>~Ejm&4LI280000