From 75cc1c62c05b8c9e6b52d8b4166fda533c72bbe6 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 10 Aug 2018 16:53:34 -0700 Subject: [PATCH] mostly done interstitial page --- .../resources/images/loadingBar_placard.png | Bin 0 -> 2737 bytes .../resources/images/loadingBar_progress.png | Bin 0 -> 20396 bytes interface/resources/images/loadingBar_v1.png | Bin 20323 -> 0 bytes interface/src/Application.cpp | 11 ++++-- interface/src/Application.h | 2 +- interface/src/Menu.cpp | 1 + scripts/defaultScripts.js | 3 +- scripts/system/interstitialPage.js | 37 ++++++++++-------- 8 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 interface/resources/images/loadingBar_placard.png create mode 100644 interface/resources/images/loadingBar_progress.png delete mode 100644 interface/resources/images/loadingBar_v1.png diff --git a/interface/resources/images/loadingBar_placard.png b/interface/resources/images/loadingBar_placard.png new file mode 100644 index 0000000000000000000000000000000000000000..9fd4c9e71f433d71be2c220d29e30e938abc3a8c GIT binary patch literal 2737 zcmbVOYgAL&6+S_Mk%u^n;AkCU5C;bH4hac)pahUA6fsj&#E{%vBm>C}Nq_(%_&}tH zTA3+ON5Nu!R*$r%{NYL|Ba#!@Hz%4sN7g zi^EDK99*ld+XHJ@JMVBqJ*)21Ueof(eDQXT5Hy46T5gz^>v0U{oQ4k^{YD5Ym znLr}SWN2L0fK}=!_x<=`;o-{A_~laDI(?^ z&-?JyAbN=ZdMb?>#OIUA!TwAV&7U6X8c_-mBx$Y+A`=ibqDnv%*q|V+ceGS4LDEz{=n1_Im=7zZsjwtOiO8_l6tkr7 zF)yZxDRdEuil;#o2A)c$#p6XJKR>*P?hi?*P`p2dPQtyzOa9-~5xH145v`N|sGGU1 zD1HdK{H_bQ*zfxYmPt5$$OaBaWtl?@bIaIu`Ww7wkM>TkZk1gtC(Wj24*_J1TZ#ahTl8wL3ZEH66R1oH| zWLiy!7l2E$afSq4eo1%q!YcefedhrHN{+SjUZynX-6x+Dx87dcnYHKfMi8 zbT7!69fpcH9-#TyV&tH1JkVY|~ZKbPSH$6b68j77A8h zmA;#0kmxM`x*DFmq;Yj4&tpP1IMP;@*i(59M4}nK@@T(h`_5=Kfg+FfiHv^=jhQ+h z-td^N3$1SLvJG^bA-2p6vtKeeatGr+E*jRao&IiV);{d|64PI8slL9fK2N;87*tFV zLEG)G@Hexy&xFyyNwo$&BKDEsz~$x+oARD2rf*!@U|Hc%40)2?01nx@b(=jB9Ly=6 z=6L{+hP(pxXR3T_#`ofVCwr#Pf0l}5E@><+ExlD;K9PQ9B(?t4r@$3W>n7!>FcA}} z8y{EdU-joGq2?T=k zge4}{W>J&n7S4Qb9oJW}@?K@DW07`nE+?`XwhS$U>Kz zgYx^6qsbqeFSQH9wNx+;q4kj8b-cj7f8cNVr@KjmULYWK@ZnNN)8!g*r_kJy>vpt* z(KV81t%LJIV+1l&d}>C>t~3_)C)$UMk;5DJlUcaU4ZXbjPH*c()HB=GMBmxU{ zBB#MJPI{V{SP*=Jl(6|Gngu5U=6HaG_j(7bKYQUrrfyQIvTLl}lV)mjcLD&=ib2Y> z^VR7`$?hP_T`xfIXwcWzA(Pu^>b4)Ne=`q&#tI+X&s(p}X8y@G&=mB{9)O%NH=E~E ze{swaPOU`|2_D8*X7;env*SX00Kj4WWFG;vHoqR<->D^_j0d}qRb|2-dk8U#S6!Dc zRhM{}e+dAHOZsDDKkn$!uYq^gX4>KbRMpeboNnOy4R(JX1HQ^Hz3(1fhmM7*JPRg0 zqf+<0j|k+w4Od+qfB&Ej+;zWzJ}z>ao@*!j0dGZDv)NsmW5SN?V1Nb~MRRBc0p zIc{%f?LfHoSnOx7jg}b(lmSA+Q09uAV0Gc`p{-9&R9}x;dC4u-eabS4GM&Ybx_onI z+mRblhQY@bcOS%rj;(QM#?|YG%c?o9^<^!6Q0G|0xrz1{{dc}V0h_k0Y8Nd0BDis& zq-e~vC*xq&ii&IVu_v>|$## z4d)zx(|l?qwSHQhNjp_mn2wg<3)hR*V!7uPIOD&-R18Hl?_R>p7}#uXYUnT)JkaUb zAB=Vi_Hu8|UhE^+i+c;0%W6K^X%r`w6$}+!aucYoqBhyXr?szzznJ!|?S=x}RX&FL zlEjorn++TH<>ux-*bL4*=Qz%MU6hyA rCh-3_{NLiN_rMP*e&o{V7|zDn0e-CSeh1(ji#iw<9Ko+#AGhz{XO8;| literal 0 HcmV?d00001 diff --git a/interface/resources/images/loadingBar_progress.png b/interface/resources/images/loadingBar_progress.png new file mode 100644 index 0000000000000000000000000000000000000000..2b1fb089d97f0acce5cfe62a07075328ee6316f2 GIT binary patch literal 20396 zcmb@qWl)^avMxLjB0v%x0tBBygS)#7Zi7pZ!C`Q>1b3LhT|;npOK^AB;KAMPtG&UH5ga!ZrK7eH;Q~>}K0002cefI_c02~qD z&Ks!$_S4~GG$008jH!BSnzSxZ5l&je=6 zWb}_1CU;x=e{cZ=gx&3pOst{Kxja!XS|N=;4$76p58sD-7Brz2F& zQ&HW-)7pgBlu}rTT)>^r-PYa~>TE>rZfj%b#OE$Z`A=RxJ14$>xS1)*{~6+JElBxa zMQJH0lZ(R~q2!!QT#P2H9Bky=yiBZIEWB(SU&z^5Sh<;5xS3hm8Ch8QSh)DudCC9V zD22!c98JymR3)VTJC~!WnINTwv$H)PGqanU8O`-M@xHWOPC$`KNyXSVJ^;sl$8H!!PZ_u;eQd^IsLa#CNNuO zcO!ddRwfo^Tibv1_0NW#oK>O!F5`cUc2f7Shcc@|onS7GCQwzV8P&hQ?zZ;-`$Yc; zv{z8zQ*yL4x3n{|k${=F*h1}`!4iU$?zZ+!rk19BJRHV6oLt7-jK~|A+L(9L8*1Ml9@%942hsjO?r&W{gHG zoSckCTs$VG>?USBY+Njq|BW~Ozm<+zh+KgAA9L~_bMr5ks)W=(mjCM(2$BE$9zpF) z1t}dVg@qmlS*ZX3xe2g@sJi>&p^seYj|IreYD4k;k!ynkx9{r~(faRLQOfBdxPh2| z2wB7kL1N*Q&{$fvH!8XE1LTo#Q8Sfz6=hshP&jTrOW5bLcVMbt-3~UD4&n_COHaqe z&E~s)>3zN#7d|%{2_JfN$~sQU9&S%w{9>H04ZM!(v?bpC^OFD5{6mNdc>ei-{I?Uq5rQe{1o_C{SLger$V;0qGZ06D%fT z>*8?tKaXYauXZJU6#SSl;FyhTC;%E%Kd)tFGT8LVn!T_R`M*Q`Lul`4lKvPL$0Q{H zEXd@<-Ys)e{_({I5bWnEUczSk7;jF9!*Nf;|3htetx*45q5AF@JD<u z=;cGgA2PBSGSZmYn7%%ftF@Tvn5Zwwb^js7uPk$95xEy#)fWSW%NVjXL4nnxn4A5+ zrEv0bD?l>=_8(tN0OK8u%`f9r*u!1G!Ce3%?57%s9QAG-1+e($Tz-Zj6`)YlElg!5CdHK+*1fJr1DRtz+PctOWI0?dq)7tF}ToM+R{8*5C5q9KX6^ zZyRD3PfyBapV!L4FK1`Xp0%@g=+%V=B?26rQyqflF(fd+5KtWnBP_rv66tx!N$g$n8=q?LiDh7VPS8nLfGK?Mc3RC zg^jS^Gf`H%{e9Kc35josU|wxjg70M$DXU!;YmAfAv(&@acC(JZ?b4c$zPAh4H&@n^ zbHj(88(V8<8L7KQK6=YaCCsTw#nEA*p1l`)Xnq^+2BU_2WZP5BS7f8B!9u4yhv}m< z+b2Muq*jOcb1yi7-@5PGOY517HSXX(+VM@`b9poK@Ix64#Lsn=2xd;XU<4f-_s1xC zMPGXxAAe~Q3YdF|{7V3hA*}eQuS*Lz;p6{sG=vQkM`c!+R{QIw$X_nx;XkM0`0k+t zbO-i&x)gWnS;{WMc&hzt4L@?&CUJWOW6XRWqP$BxW@fs3-oNl|)nWvzCRNo}L(R3g zX43|mTlA((52JQql@WAi(yHYiCruBPwwRt{cy$$y{05$)pKd5x1m` zr)V9WELi^;sM01;tnr=4fv$P9)_Aw>##}w?Zg?N}$!Y7++MLX|E`&~BxhQ$Nk5zSN zYN?dB;SMWi2`{$ZER>U2HGP$Q%W==QC3w~n`D9ehdPX^!>60m$uz)ZGNo{NuUwiQx zn$RuE8f_?zbDHdw?M@*5&zG9SP@H2flI!gPh)D+U^K^+%Ff|wK_;|1oYt`FZ2!%z+Ef8 z`3qve?POY;a%5V^w^Aqi!>4ivu4tqk&%870zm5R8fya$U`Ocl3d9UK{_Is}GCs`{O zRF=mKnO)=c=|lwr4x%!-v2`+(%}YEo|He{vsxRuFRBf+j%P=Wv?B@$b$?@@7^6>T$dT>4%$u)$3(6G?_;T`qFP(babNeTo$C8EEZ z>%BC_8ltU~+n7EuArN*pcv$4#ae3EyfHPB*cX%Sv;x&Aeq;Jh}m!G+r+KRTMj@fx1 ze@0I+Vz>AB^!MS|TMUFNJNd5LL9hGzN`dQmfUnv`=;lZITnM#>bDWJH4qKBB=eJsy z0$V-t^iyFzi9fP$nmahc)!7m+Ez`F*S`6qWhy(S)hIO%I;_}TJj)4(L?ax|gMAW5m z>3@DSa_2LYNo@E&`$DBJ75K-VBh?2``yU7%^tk)r46QZRTUPnKNa^ofa=6f&%RZ1OBi{Z9ID$EFRC-904LnsN-joa?C4k$RaII<^wOR zXD`QHo8pi2IAk98C(np6p}Q{O`>-?ug2L{X@1x%uFm81)?bOmrK)%&^lhq+uL$9(Q z8nD);c6<|rn^M%928-nkM$x-@!wBlp{6*1t1|_68`;+h`BLI4e`2=}36oW89aLP+L zktOj}^)hvPzNs6DBXKs-Xg|PpayYur1JuT; zPaE|!S6}x*EhSLRm?~&r`%bQz-$!?Iy;($DF)hbg>zvV12XpchC!LWeO%?D1Q#AJR@s7E)xc7eugQQyl+nZlyN9^&02TR7fsZ7YjVnr-wX zak{sI8xL)P(04bcEGcGRD;+v+Q{2X3G8lx-_rJ>p79|930omlz2@t(}YS+D*5UF;w z6yFXLVWsL*=MRH&2*Lyt)H_?`XR8~bGO^mjit0cwdndo21i6vqih?2X``*M`n;PHj z#8L3)pjQD_C-t0TDz|Y&A&FgnZgM$uzDIt3cMLE4Yfp3M$6ki~-VZStF~UU>B2vhD zsvB=l$=~^FJi&tf`nFzZAA|=Vvq}bDr0*7X4c*Vlo+7e*FY}lMye>}Pj19cpscz9@ zG3OGnc#**)0-kqW z))ge$RRC%dL_+%p%5W&H^pdcbvS=}OWa@RTJvpW1oHHa0-Ud3UUJ)Jo($CE1XCQd* z%rOR3;+<|Zg1yzb1e-54mvSI>Kyj5WT{D|beb#$O!__2gMC%$K@MFo(M*9;uRzAVSMDR+f z>|ke0r^Q_ixh$x&^|!8GRN!fyhvL$k5wA%fYxYi~5LMpQzt6d`M~o)BZT$N8?zvpq z4x=#@VPWT96Ida;iIoC_CWKq`AOQpj-wZe!K$~n^W>?b~Pr%yiYFgj+Lu!$uo~xP1 z7A`-Eo3yo<3tG6gnHZtTClMvg9?&PeL3n)@9 zQHLKYqmM}X`PDIIVkfbs7vjUgy;6lC-nqL z;e}GzsGVBMa>Rkr6~Skv`=n}qkr${oHMF%#U?N(9)v)~#20n3{j!@V;aWkYAi*w*4 z4g!w6uvS)!MoI*mS!12`EcM)PinsZaq~lBMRanPm%}X{yJe&7_8<4a!KYrn~_7UJ5 zDDo4&td>=6OD+F$;OEq4DE4t|%LXX*T`YW>FC-t@@}2-_5AHZH*s%7@HJ`J*eg>Td zTHG`ozN5Tp#aD$4e;U8vot>N9(Y?`@&=}@8dfPLjPIu;K0ancMp?owIU#6PlM5>Ya zkYnJ%kHvu7INdw%#wKQADE(;qq~uNJ391w7;I-S+(fmQ!LZKKam0(MCXE3N+6KKou zn>{SUruKIzr(i4mkqM8pS*p<-~YtECw);-SJq#4 z;+2fl=(2_Hw<;{#Wj;V+`K+Z=$aM1@6^nCN6Bo%T*(T@JEnJ|<(g!1lprNfcTheG- zLbk%WKX?Ou8K$eLjcc<#r8tUp)pcS)5277`X&YU$L(auiWhfaSVcn>yw*dZBg^pZw73x>gq3 zT~{A5*~77U$HVT+>R9XJ*z-1XLcpAtlP9-vqK(0)O{LJ6KXQOFSl`@Fv*}F z*~k$CCv}?hjTE+&15bmg8U*q~NnS^0YH)Qfj`^0!4jRFfKegtpCF{5|sn<-8>ea?`$-wwFPU+g~l`?}@U&N&(?!Y^^I#e=wIPlxI%ZF@ zP@d-6tsxUF@>w;V2JapeY>kl^q{xHL4IbA7F#9Xgo?a)mb6vId#EbVxBt0#x>_yL! zwg9{_kjO1N_rm}ND;GJPNuSDp2mzQ(18c!L#uPVA~{zFhT{VCFK6PdnQM0-}u}{_G=4dNQRZ zxCn%e#u+vEhqcEbeNxQ>J*N6+Yk)+ib7*JFBc*(Cq6AaoxgCBrZFA^>hGE@j8$!l4 zr9(Brz?qz(LcximT+woHR@@n5K=A;ty|?LZFi7jg5&O3dz9Re8dOpMuo9=WPHW=Cl zO#1GHCZFyyCPB!r=I2PBvK*cYo`g=`uP5RTpuCa~3-fT4Ol$L0&n&|j8MWrD?UxVN zN~cS&zfWeHT)HCj3Z_lCtI_V@*Y5QYWZ$-UY?f?d4&Vk{F8e&(p(8GxuDVPlQ@J?( z$G6Wge72g*S6^;kX3Y&Bdi*ZP_5|qu-10=f_STF;a;xYvTy5mhL)##Bc z`XJPDTg!xnz1Nc;!r*|c(j~4K*(Y~Y&`}R~JD+LKP$i^DrMlR7DLe?9Y1YuR@Z+hh ziOP(d8sXSy`+&`U8$^MA8ifLU>nUN)MlDNoeYfoz4(E3I8LsxChacvCt+O9I#KCnV z5*@X&*($<|=+r(jQKh$@bY`X2hSOStKAB6OTO~-2UpCwJjk*iS!?T4bC~VYA#2PQH z>QEF!YWs69Gxcbyeh4nS=GZ-fVEezZ9*eRucKGePgF+KQTT)tboFiKnze^l`f%&fiD4f;sK zxJdmIBTY~2r`;vl?XSdx`^}q7z1*h8@>d{g{$Y71W5+d}j&;7Q6o>L^3^F&fiZ*=u zd4{);4(C}DYnjCESHC)Lr@JRhcXtnFOC4$zmsrEQ6O1??l;X1+t$H?8KLeVt}&iF(Sv7+msY z_7k9o(7k=8QzUSvc{uc}j9#y=-7zj>m^>(6VV2FQM2m=cU2<` z=nE8s?JV0qPD+jh0REyXlp5qqnObef2pYgy=526L1_+Opb2e;DTr@N0fAz7iwL{KZ zDdaXn7}Kcfod#+SiG3s!MLzwORH=3)s5PZ(lUJ>vfA*v>PC6XzC8tK(Z`Z)giY@tC z+W@{Dp{mII5#>@mLg|u-`czR8*rjQAagJ6v*KrvHm*LN$5v;nuC8!cqV{fq;k*I+y zlOZNG5?p!nKYk}N;xL_`cooIH6{Gvg{IQL0h~8qhp1lLnc}t*_U-a+|NZ4n#XfDO6 zuC*ifCV}K;7ectk0&zSMrOQ<1U(-hZxrkm}WhIr%Q05Yzx7#_Wi~wZ~_iJ<7F--K! zZ-2haa~?5cobg$UFV&7lD6hQUSkoRY0!_6FSAg;NkMzFL+Riyw zO|JdyH>9yl@l)U_KEzJ&{XE2iZe#cbfnzWnp(=+{m|q{&Xc{7Gqgu~c4>>JmE3U}1 zpv)JtR$&YX%Ai!*a4esbE&Mt!u3EY_)TVKI<17GEq8yxdWoP($4tdFUTb?ZjUiaps zLbynzkyW@L==uvv=6N7m$mByVitgr2E&cHVy5f^l{TI1<6xb{7%sDrmS)P@neqOUl)RO+P!`@?UnV&K<4)#zV>j~Q}7wvuiWQl zkfrF_Ke6*Fog=Z!Za#PSZG_F2GVEzUTX<4GmJ*>nMs1BX|I~$y{BsXzqI^*>OKcLk zKp?vc@(G-tV3L%hu;XDUDIiaV<)S9TK~ZHb;~mv}q6h!Qx|qql<$ZUX0}+!6?!$%D zDd2Cj_-1eQjieRUp~VV?>?RaG|1693V)~ujaK&8ON(7t^mg*TTVtNvqU2UrcBq!MD zx?UpPOI0_X_F!2D(YATAV?3^gBRrM5K_&vAM1D6yf>3TJTJH*+^DN-h&}yMwKu%icO5K9?VN}3c9@+ zQ-iS<(Yfte$*V*gb-)4xx;talpCzeclt)n;;reTrKF!UiY@FqvgrwDTr=L?LK+R+f z+w`YT@}ci9Mwo!{xru zQ$MrGq%{JqoQxgdyUXNbaGE75c5_)Y@NhrRp2 zyeXw0mGQRFGpX z9h6eKoj<3sR=fCa^uH4L_RIK72=3;;tc@XWc-f|WZ6l3Qj)KPi@xjHZ_zyQyMiJwDM1|CSoG5a3iv-iC00_l@SX{0iD^(Up{5} zZpLyAtyC3~wY#a95SEAg&tkG%dh8+(tGp&B^EuYOeJWV8u<01a29 zITf-*x;Gf!1~M@RsoH#dQiX5feJf&sY}QG85xhu0{o;3wM`C^r<*g}#bqg8y)>_iw zb(a1rW_Z|pKjTW({GnD^&t0-+%)x2oHH5F{i;CbxK*z=>D?E!zE@bt#iD2AyC!}cU z?;^5IVm>O^I1eaIDOM!!a82Ji^U!iNZFN(Ens( z^{Zwg)An<^4nbHB1=|}#dbZms5Jl9*bCb9ddpx;3s}4XJt`yr{>3&F%{^d3vwSe^( zwHDU72yt0grREQla-Zsctm4qJspbBi`%?29E^!777Y9#&EPf6Bsen7N&aI~!RtipM z$5u2H1eH8d?_*21(?(!YNUPF=JBsv(OvY0vQh^x?pi(JI4^e7DBHEu z5#?5Bfqs^AH{D1aXj?6khr^?Q03Q0r+qs|aJ5bx!7aS%#>T-7Os!!jeeLx^bg? zd*Zmu?qO)}Cm9@557~BQ^fz}CX*>KzvEx3u%7~R-CXZvK?ty;Jp@z-4m?Xv5o6L*J z=nT9+O26Zq-;=CzupOkdlC;&v{SzQ#`OG&TXQe8YZUh=lA?wW_8LrF@t5>W0cIh56 zk6S!nx)vUeIXGe%bohGaW}a>LRCm3vk2T}7Is+nhsVnTeUdT*4qWH6vfTGV6bKR9g z^$onl?QeKTCH-n>R6uv!$wp|=20=!yCD(;CFEKg=vQ zbsnh?kiI!1Po+=`Jl2S2b6;yN zbE02Lp5NI0UJcTpEF*j;!w^70)@HbYh4DEnvBZI~?AaTkeXW!9;4OYammvG})H1s1 zeQU|@!}`r%!ZIe}8j(=LN{YaX8qhh$^!&+OTqOuWd49yVC&5_HO36E~eLnHc zCj>&a!iMz`IfeV-_EyBx8c9wi5VGZvtC<9hU~77ob`Wd`w}|_qtU2)GAgppV8oR)e zQG`CT|1x3L>6a+Be!Lf6cO41}VIDCdEj^1h4*O`I+||$xAp5z6XX6*{zFv!TNq%s5 zgw$AdG1tP^Fl-lP@b__v4_o~~cHuLWnUpHeU;|Fk0e=F1NHAncLu+#Zi-)>WLF)Z| z80VFi7u%RX2u5v$W_cXv4~Wp49}W85GalwwmTsdK8v=Ew=~ww}jHP^q1^UJ719g)z z)_Y;$adZ(daZCcF>JOiIb%C~jI`k?e>v3jSYDEV_<353ioQTm%Kl#nHt+ou=Mi(ZnzZCAl9-KK>{iaZzRra&~nP@luUK*2&Bmy zGkUv~aj;C93-=%TZ(~vbJcgqm99GbpMlPha=oa;`8eoR>!mG%Ya@4CAd1*N5lMu9WZh-?gxLT+7TDPDr@toDEqtvgw9MtK*{J5~%48A(LB7wR|le?%^9B}y?6TglfNS(%p-^4{(0&7?_;ypOv zaNHJ~vYf_#D&@W6Ewd?%Cvob=0aG?{@2*6;u$19%wqMruB%2r}qF#n`j^&YH4^<8m zX&6Qpcf@#~O^O;Nk%QuXHmGyAJ+dX+8;iR}4$@;OP`j3Twpzkin_tIB%5~u69dGP( z*2wEPLXcIvGY!MbV&W?oiW~7$tV#JC5Iwr$tP0~s4=hRs z9p;>dHcc*|%51uUW0fd#%Nz@xjzeyHbnX8BuSH6Km0nuLS#>M^!$qig(z6B20v69&Lzf<$mw^M+UlGLO8ll#56M3MXV%uN~ zapP$v#RUA>IU)isN6Iw+g3aaJn4*&Q+uU;Q*Bl2_QC40Tyr`db2Jp;Fc>F=738gxm zQU~8&I604-Jho*Xj<6G@$>PJp2IN}54!5ZfuP!Rsgi$r&@^R!7#A@|ltxbK^@9xXs zN;~w54V0jr_uD&i`l%MKN*o?#&Hj5M(tEo#b`v98_@a~s{R+~0d6gH%PM}#9Qw-3& zhy{+SZiO;ej>KCuqY1>5=1yyZ1%A=*$iA^jj;1DZU~o%#?l--3Sv5XT^YUiw<**j^ zU7J#x@z$kzVI+I0mq$8{QG630(FdFGnq2;%Xej7G`uW+%gVi?xf|OJB>l+Jek_Ou= z-r9_!ro_W(!JN3csLT-#K|)%Wf7 zbX41mDT5nqPrtroC-#4imUVzQ;6m0nuu47Fa2-&iWIk8#x{)1WuG=p47Lk0*`=Ly9 zrKS`34CsYrTIVm78N+N*!<0INn8@&q7+Pk-kmt$f~9 zyX98Z4YK@+m!RsxnJ}066~4sblaM40@sPp6>&q?7=8zPBaR|Hf{c5;!Dl(P2^+iqc zt-MWuzCIF0uN*c>E{Ubp?9M%Rc!^_D&zq5;`p7CeVwrJU1Y zl>&*>uZ~ZpI*c6X=dH!Vkc%UqgW_)E!XNKER0W2}fUVJ0$0gpi2sr(thRNijH+0fu zLSm!IZZ351U^)nG230W8)NOS%(%YR9!<*t8exf|pLh!Ge7xY{7rjTu8sZmYRTp=k|-San{-Iyl@<;WwY zpG3lEu;((9La&{PwOa5O>gq$Ov9D04Q25yf?Ou$Oo`wkpoY`_!w!yL$7X(+w=>{IVeEf&5h#EA)dhrzTrtq}jIn7<{WT9P%FSk` zG&DW(dWWvx_aHl4(?S!sG6X?IEO#H>mV#nKe|>(1uNMN1MJY2+DjCj~76nD)(rrnz zM(4+NYxISuxX9Kzx?B^dXH=zpSi1Oto#;areW^%4B);nHy918WDYY_AuW+~sKd_)L zuBfHi$_2Um+SRp71(_k!sGtTWT3YSJgFE-nn3_o$HBv;uJ$>rKGY@~gs!VYUL6H)z zT0V)RPz@OT%Vk;TXvQ*egK>*NorLzvE6EYz<31_Kml^lGAACe-<=sLRfu(UNQ!T)1 z?jL{S*00BZ@5vnIT1vcqxaB5V3Pt!8)76+|8?8$)?VpSdQ_rDG4Tipvq;*NxM7&Rs z{mwX+syH~PRx~fK7QhxA&ZuN?jnWm1edjUF0j7|f4b9Q(#bZiIHG;niuc&T5D~|eV z%z0ln=6HPootT-AOGn*hus8b(F$Mj0NXyXHO!xwy{~6n@tCW1;n}dP9_9FicpD9O7 zVbix{x5S;QqqCPvq~Yj)&VhRX+@}h}%z_J=m#Nj4HV>yhnI-;F6qRcaN z@K`)e`vx}N2ZyZJA02V3!t!;CUhk-yBn?ravV^O6-}ovpHjyHc59CevZTFhOU|`?vTD&TvFBRM4p0T z?$gouc5`t=_i@9>k=nNNw+VYT1x=M>x=Pa@)A~X~#xhGp(qZL7tIY^V@x(M70qAUA zjymm6ZKTB!W+bT*f_#P-{c>gxN`WgmK-j=Q7zj)uv=Bq;kJcjlUhh z$Ytxjw(^cY{S-lSzj%T6a-Z3F>y-`4-82nNtT~^T2fBV}`k?UIrHzq>P|zy+Bsn=} zEgu7kH!b_maOJ|vspn(vY?l*XkI(T}JI!>{QdM%P45Yk+Ba)z3ptl-F*y0qi`%a}_ zrVq^AfoX?ZArt`Dya8jUYPE;IdJVD7*YnX|)8VNba=D^SW{nBP{hUFYK$(5mq`L50NT|-Hy{>I+8Hf`DbiS$dlyLMGv)PwkF zd*bhhjg&jD%&E6g%Q&E_qqDk$1;idL6A3}JzS1&iH8k&-AP2N4Fdb3-S1xBbbzVjicPTQp<^tKI->tQ()Et;N4FX_|}^%GPZ*B1EVL@sCisuIQPkIj~m zn!haHGYfqlFb+SI3x3HP^WH;~#tOplh2eanp(mM6QNM2CP%B$y`=Bsx1q$x z3tnlvw|`e|j?+7qE{@^;}HMU-V#1s5_~w)cwNfb$IHLOjd4O2K={@Bp06olVKT7?~bNc_TD#_mF)uDrVOm zeGHz#Ui}2H>Jm|my2>Zs1XoWi><1}x^@ZTHTQpWzHxCrJwKyYK94=ncTX@_&NS2DH z{H&Y-(;vd5#A`&29UwwUtkPxSt4rqe*G36@48(e*t+3-*@V9E^d;PH4^%;dbx~GP9$4@M;IceRhQ}1W_E$X8ya$6+14z_OuNB$N8ZvNJR)B8K<^!GGq!&xwS|)!CN3w z7|h?x^+1u#GX}2!A>n1i$Fjw)*{hjU!4eZrAwa^Zv?JHMkz~5Wj9kHb3#`JOzh)$b z7S0TO4!<@pbAg+nZ8{=8s7xzR(+6MW z$%JXRW~rRTl19d-tGkgR_OO)rP1QMd)|S{$z<5iMd zTkF`VTrxa}vXb(B%le}360E^L==%os21lp9IuCa{qg!_%+4wI6AZ!ri^*%gy`V$cq zz=R>5z-fpgf{|~DFIVMj`iEE=bDNS0U$eT8)ARhqG1}!-nhPD$n%nr9i`z;k#*o*O zzjGlTjz3lHlg#BVM`a2KjP+axUb~fpzF6>XxPQr{Ri{qNYDol5qaHp%VN-FZTU4mt zyyK>B`Fu#7XqBmM@;NN2x)fFyEDlVQPrQ)x8rf|hWPXK$nZxBs@>8K?{a(R57>~8X zhW!Wp@E;Phn=;>PBMbA@ahK9K6Z)L4=g8|{%iVwCcyh40|M5KFVc!g|t0ohTvm?BJ z*QBevmestgTEr{G42whx&~J!z@L)sz_T*0O6J*b|wVbxxIH*m2&_*d!SI#QeuU(j) zLlpyDIpX;%dAT+@_5O`$j|xTqaXC)eGbOv_Z=mvqb~Eq+?Iv2Qsg+(a5V=EDq~Q7; zVOMr^i%T_i*YH9|7O_?{-Z0(qa=|YvJzX{T@YL_!Yzxos)aL23BsB>XYJyM=)%fy- zjcLMgcldlT=MUofI^Fnh<&6(4CSg#~fro($xN>w8UhNkXEpX)h&b_Q~p?*3UjvL#k zp?J{jk6#bP8 z6yY?6lAqu8E|BPtlkwPvl<|I89L9-_k_{Z;q|1&Q|KYhf7?gQDHj-5FSn1PHJ$#Sj zD40?-t&;@{>wKM9N?IIUGD-)H^>nz^mmSi`yU$1k+VTB4F~AF?b!{hFFh~UL9o`-DL?I@%xHQ* z(aej<%lBpVV*e?V;o@4SCYl))h-76ctmJ+D>ZVup3V1vC(m9)$xa?bOJBCxioIt*mS!Ht}7VODGQzUR^BNpOoB}f zx;V{=YL*2*qha-cl&jTc=i^MOGaWGx%yAq{)NO1Om1P22mf_I~JouKQTCu0mAF$2v z5Ozb^Rla7VcBRq;^yiW0`@td|z;MMGv#-6pd}_0Cw~!FK@@Q-;W(q~P5Ket;0 zl%Bs zs8g!?(#|c*V7j9>yT)jOfz}X}8`#K0$V7)jPl)Hly)LN-QIbChr*-_9jL%V0<2)DK zXuXJIO|LPT7^t#OK5CQL<&sJaFf-wUs)pHSC2bqnA*6_h?p%2n^rmfx49eFKvCf}T zRa4scd4BH2B8;_VhT#qsd&fm~BG(UIwQ8YXqEtRL#d*^E zViD~A#Sd+N<6w{scjiuHIcIXKrUOS(P|RFjM#S32*W_+i8SE#3y$@m41Zybq6Bh=_ zhK^7)4;Qzpo|R{MS(^F?Re-K&AaJJ=+>#Mfu);yPg1ir*-Z*wrd0kN6>L^`3ELXmR zMh<;kXoE-lew0>1*Sty^y1onj5hHsiE&OuF{MpG?5_!3u0Q(Ogihtq@8DXd!Moa@n z40o32o!|3slM3InI=8IncJl{RzIvq3h6W{%YdoLB)B47?AETM#4T3;zmo@gXaN-p` z3jw{Z3-p3jc}kq3@)vyiY_jWX6up$l z20f(tBr@ZmDk@Q-Ae@$LEsk?>-rxPVdI)_}(%3crebP^2=eh z%CoI^7;ZkWM7o+ak`6TsQ~Q(N=hb1rbB{FdYE-`&%X6M~$fdNNZ=@K7Rz1rc{c~Wo z!*z$+`V;qeZPscVS853zM(Vp%pVj-Qrl0nG)9i!;%@i}S7l$rcS6)2#z# z(hdoxpulYomQCfWE7G@IMsW&KJX728mI@{imt0Gqe$orAJxhp`E*1f|5%~S)Nq~%N zUXiqW&GCI<{I7IcIs~b+D;Ph-wZPqGcyWJdf|0@%joEcC){tzfn6HF)l2RjyQ;iig zm=n*xn@$=r$B{A}Ai!IubJ1;)25HF|PU((L05V$(nEMzCg0QShsIKk1mOU{56G>n1=xSY;Jx4P&A`)|{iWR)FK! zuIr*Q%?4)0R>(+k#ldW>DmkoPJ@BPD=YvGmbhNSA<|aJ5S#w)8t{>j@Q>~Wc*Va{#fiNDM-)Dp{;+Z=BN=@xE)$d_PTGG`DM6>DHw~FoE(rB(UE6M2 zWKPmU_({H@bzR?SFz`8wtMIccS)^INGz?3TbXcba& z{b5!jMQp&VE%XEt)N|X_3?L7MtSnnue+5-3u@%M}DJ-I3$fA0Am73p|TN7Zse5~Mx^Q3y&PEZ_T`Y;EL3y9$^%a_ z=Jkhyw`}{!D#wjmH;jD+VF%KQcyW1e-Q~Edm2MuYC>czy zpkm+qDN{I01Vc25U2xmqFeAc0V==nQ`q@Ru^|GAuajK7UOjUih;Yth| zR>7|2l4TSbz%LHYeRW9#MSjf2_ ziif*q#-%up-Oes%N1TI==4ImPsp*zb?b&4a3i1703hDvsqE;$MBNT?d=iI_K zX?>qtb`}+0+qdj&Kn*+HPEh>0URw0ELpLMtX4lW6Zv3`2{ciR!Ub<=4+>fP&D4I{6 z;}6v`-YK^M6kp0U>8;%)2Qn-WBLF{w2dBE+U2?Nhod4?V*IjKWfl4!o2KdCN|~ zssiCW)NpE_<`QCN#DR8+92%Y}Szp9Lci-O>r&v0UGg39YB^aGiW2Frtg4_tpUGIFgbWBu%t2;@qc ztEDVLb~>9OR)vVcZvTK;T_+j!U5-@`!%BtG84Fzjv-b2nh6rfj0wf0~MIto0r#~jF zbJ$WRiVL1mQXc3r&6s>+qz0}Arqlv&ky5k^TAu9ABAd}#0%^Ic*d>q@=-CE%Gx5=7 zZHiJ2sJ5oxV{ZlF(!br$ypDd#KpB6!9BGZET=+bx1m?gN`aDjTDlcY)2DB^R4z26j zm=-ihH!mr)9wTz4u)!En?Q^Tj`K&bRP#m9T12|M@WZUo`h!O7xj_Z71jimEv4&jQy zL^TUr6-}?hGWoCwIs<%VWY>6pgTvn}F;`f888ML#kDbc>Zbn=<%s_mNPulHD&BrAA zyY5Y@P zrbhWzpnlfF+g>c)T5V3Jl(5Z(b!|d%{)2Ep@uPS64k82JlLKIK^+|h zvCBc}_i%N+f?f}FGTz(!&wst?{k>}CXqpi24O3BQjVU!5|OPc<4R~)ry?Hi6A_Rw3;tv% z!I7pZ&(C$2ev|aoXArRysNFdTj^cA#nqlO&61*e@m@Y}a_W<85+K!HN{-$^`Fjj{m z>yz3|FMI;3npDiwknW6t<*Ae2V1uJZ>fE45Zx^xjf5;{CBy9niK}*t2K2h51HD4xW z9PVRFQ~RfM9tE_M@_(ebG0Np)oB>OUha=eZrZ)xXQcl@y@-O^Tj9(8;`KAJ{G9<_Dw|UU*}~r_3sOrmHy@Z2%Rxh zY^N{jZxNi3ofZZs$3hV+?nlA1tSNELwylS!ug;hCVIJ8U33XSe8#8uO&$b^=7|Qzw z8j*2^WFjZJu5(9~7+40>sbj|pR)d|n)MrYB$_&2A6J@CgR@3tRO>UE~O{pIe-v4^u z=EihRkgAlZ(^FYer0zi3*IyL4!}wav^}2RRuhfabHoVqZj>SAU#0p54WYwxAmF59M ze3;T4p#>iUUF1%i%%@a!krb283X*TU56UY1E>d33vV6BsD>SX6pFG6?-nxYV4m^Kq z0BKo_wB54D#VmTq^F_yF0on7eu+PKU|5wYs|1-h2aR6VaoR1~atuW^tLpjV!R%qr> z8J4+Yj!QMiFzl`nQ_Ge!qmrCu<=9v!=VNF&#FT~Qoa1QQ^SWQp>#4h6o}ZrQ`t`cL z*Y$aQ|A03EtYU@>(rGaRkL<(I7(!CE0uJEY4qwpdBUVqSR#muo=b6Exq{HtoMsI#$qC49&)9e+@bv%#B zzsQh6w8bD@i*`x`NSeopjiMdIS=e)+v^Qb!sjH;v2-b)&C3(zAzqh9~)rRP3LwA=Q zc!3gAIiBqZmsM2{h8o1@Ilrm#W1E->i9c$@4)7X*a1Ak!F+KHt%TGyK8E*ME);_5VSvkg^c$25L(r@x%O6@|t z|EEBSM^TBny3W!%u-sr3nQvjp51(9R-VV0`CNLn=@-$1quj^|CuWfkp-Qdm7dI3DWq*}?lIbbmo~_qfxFLY1i}hk>QJ6QcS3=E zk%n=Puwk2{_5BHWTcf%j=#H0(0&I>S?q=_1q!L^9(}%U+fJZRF6ue$ zsz@!;ZowS~+IwD`W!FADtnMyNLQoJ-fofJ?WV)HF*Ez}L^SUI>g84iW8_tA5UHG+`~0!isy8}WGuHZvX*>S=j8S@4hJ8#^ zH3|*&3Z+`=!G#>)(X$_3cS^*QSl$pXNaK#IW<%7Wv4fjZqsHk3qN%x|)1Ut5q3&uB zGfS~(OI9Ea+}8Lt!8v3!>wQ=(jNW$A>OwV$j0i^}!U=0{I5&EM??-H%?@IXgTPYai ztPUR;ZJpTh=mhUN{V)ABIHNQYozb}HgDoxarv37X@zX`VVmwy z!;sPbZ}!!=Ge(-Eqm|%lW>O}oI?yQjpl220t~h>Lrs_w&Ufg6HXU4OkKE#g88t7)x$Ofkuuh(468%fyuLxy)&oX{ptP?sP)l_2UD-F+?lR2qWs(SB zv6J6tjp(ebgNoHIz7hoy=_CHj{}yPac#h8+n8zsw$0>tJDZ8EJR-rnfa?^iM19M2!<$SH22vQ%xNU3HNfbb4!Ya>$Kx_JeEHnKZm8qT zZ^s((>YaN$!=^lLGn$YL(h-x~?37D2y1luS@{s1?X<16@-28pGAE@L|%4w|8<>(xr zBCX|+!*C80m6CPCK*=9+KdA0jMQgyoO`WD`klGyDK-90JG7OaG7qz5DN_HviuAv)w zhTN+O4-f5W)ON1C;jpN0wlS|<0e#agCtveN^5#6WaJkguY@JSNbtYy&rpkNQ##Hge zD?W>$PLL^OW}U-{MWW>fFP}Bg4GIgz8hhYfb~G7@=#@s)`$m*3NJsWDQWO1=`f)Qn zZ)eSHDKeVVwQ%ZKjMbTsLmT!^ZO;3J*Nnu1(Ms%%9O{at>?`NAM8dOC$qX-ZjTU?Zo7elD_gHAMeD{%J05Xd8+o+S#+agqZ(H&6n)7126|MA&smk9d^(nV2RKDK z6MgHb*i>a_=rz5sV>FuIF3+ysR>J~Q-)nk)3&oTugzP-az$Rw8{xW)))f&EUpKq(q zQTV0XKF0#?aeP85lTY(%Pw+pi2+`7}FDRPGB5%)0)BSDro?dPa_@jSZ^RhWnU+%+` z4$eHt_oM!`3wxjE_hd0IYBdlmJB{w&8M2~UJ(8;2Z{UMYg3>)fFq^*eI&`LnUgk3- zTb3XuT?Gx4BAcYzMz@eBlLmJJzQXJujPwTG-8M`J9Vu;pJ*>>Ol-gbDtyrM%b{h0j z*(~gqEm!@+;q*y92kEmb@yT6*`Iz7^G~iq_Ht6WlcRC$_D3srOzDOV&zM?&Rm_uTBwh#xR_A^4=vmK2Rjt;fuc9c>+$^tOkoeYN&-8ZaOS zaW;utBh7Xlc8WWbGeMHEO`|fKzMc4mH;^@2LCd?_^P7g_u2(H8)E(ul&Uo>AZp47| zuuwY^Y^%E$UonF*jP;(^)DBAPw}@LDH2%b`923;6b`dVaMn8;2+1a`d4XHy?16!(N z8r-tePU2MZh}3HAjGZ`nm67Zj^pAJ330A6oNGgE=yeSA zN7%Y20YFVheM1TYU^W1I@fRDox;c@!?WB)!GauegttR&67krk#juop2!?BR-?!Um5 z<-GXgw;F+CXBfd>>jH_q#%QYB;Wj4EBjd+lT@IjNJ5lcfrHaIJ_MBYUF1n}p<3!`+ zu-fv8Jj5Qw5<-p^n|AVx#LsmW*48JL<{n4nBs}DrrwJ?*BHCTJHLGzAi};4f{0Y$y z2Y{&kfQWDSScEEM zO>+P7J5(U9z7MY=0A$NIF!ZLU`LU$fFJD$LEFu=j`5EMur;#B}11@Oc`00m9v(sz# z-)7vu3%4Yyd;K3+)8yy9_yYZ37XT9G1^=1-yZ)~<)Nl6EZ)ntSo&R}=U&ayu@L%Mr h-$LM)j&NxJet@A}oR^fXMc&^}Z6Pr0N~=F_{tLa0XDa{z literal 0 HcmV?d00001 diff --git a/interface/resources/images/loadingBar_v1.png b/interface/resources/images/loadingBar_v1.png deleted file mode 100644 index b5c77054c4b2e185da0992a2237d2eb80d9033fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20323 zcmb@nbyS?+vMt&WA`n7wf&>UO?(VLQ26qV1xVvj`r*U_;;O_43F2Nldr+H)VbARXT zH^zN;yz$1XzpB=%nlzaTvXzznZ(wVO|8-D?HdYL- z`nC*A^o$HvR{zrVZ@~_ZibnrKIB@XEx$6V%F#S2j_oR&%`Fg!on=f#U;YT%)}(d$tf_Y%FbQ zX<0q99$dd71r0V>hLCcHF@A+3p$wJSium;*EFk8a?>7i2COJsxTet6z5X3N4MFe3I z^c2CLgb3XB28IzCOLi3NQLXFe#}X>*?VJahuj*CpZ*Lo=$H0V(+NiS9lZEz!mp9nG z?upjs6L$C~xPM>uf7_+$E^^ZUgaE<+@Bsk$|BO)oGw}V-;J@CXe~kDa=il}py#Rnu z|GD-5yz~DziGM$n|JeUqdjB^Pm#B7L7dRacJK;^5{{R61mlCK9?YA@gi-P~D#RuN@ zmG6m5TkmOdx#~ZXDTT>98#YIY)Zl$}>^F5yhA(QXKK}QfU8Ni|t1jbWs2u!MEz+1o&3H=adIq=@2hN z_yqiKPJqi#WN)GkEt}}CJZx8;ac!))Kg~NlH_d&Y$pCG0Z>dt3(N$W(i{noxS5Vj2 z8$;-#IQE$4{}2UiMYF(V7rfDx_%xC~4eD)jwQW>ZxtvtFUQg4a$Y>L$^ zG6YDqfSqcci?}+|7+a+X02=h{VHiW{t4~) zV$fyF+lL;e%YGRA@#-EYE9D5L$q8QjqJQ6eQbn8ejCQM!rT#6;8ijgZQs(Q z=tCUWnq*n!^d|J$(b%YSf%SJWcpc;K+w(DY`T`uq_f`h9rF!Ffk3QRl~Pu^*{;6k29fi# zhKKul{jxg3UDd0@}QAo!mumAhYpGbW*jh{RQG(Q0&3G zNpuKX#5*xD^T547SwKOozq<7rw&6M^3bt5z>pgv{c879)VK@pdgo^8GnQb2#Juifu8y~eJ5kWVT&|42JZaSNLSH1{ozo=f;(e;*e?yqe}b zTgq8n1-2ecrn4P)pX2yA?K(w}Zd=@)uJNuXyt3V#*wO6AA9>AEv}_Q8cWG0^K53oU zJfG~DpD1ThZ0}I`ot&m0d>_raX`Iedv%e54lF3IY3n#EgSX|~?)Y?){q|1unX>J zNzWQxU$xovdcN;`+;8l>^wIN%cD^1bZM@8=b$UOHE*_s~u_FC7Iajh^-j*5$hMzuj zFmycR!txSd8%N&a*sgpE$zO?h+cJ6DGCQFM-lwyZFlg4xSOpIM<7vMDc>Z$oM3zEt z3c{ zJ`>0G7B)MHSDm9&p*X#Dr|bqMpPjoq9Quuj_t>YLHtOAYjxS$YP5~W{pzeXZzn&~3 zT)KyOI+bl9XufTGLJ*FEMZDH7{p*zc*uY#!r;7bPKU`~oF(er3aq`IJ9PH&K_oQMa z8Vyqi`}jQa?bg8UbvV^Tbg#+IDQ_c^tw+}81KSCgYa};i5*=mWBWMxZu35;21*)>5 z*Hz~;%fly4?`=ekCJnEh@5;cCaqYN<@-FO)T_leC4&; zo}zJpxdA69+R#N&q~@DBoh3xXIw-p-I!DX+ z68aZwx9HvC^KqFVRwv%>hoSUK{3vF2qHv?D@-r{kIl~7d36O?4r8prI^d8|51!BHS zm)7YFW@$~9{qWB0ZDWlR`b(+i1J3a7Z<-h29;;mqiVpACZz?N~n4j7c+(kO*X|;Kg zx81QXhF4-Zy8KyTQ5iV3bDbkYq{~|tM4mb4-V?2(?_Y5E;GCkVf)`yno}h~zR~K(L zRULQIov^gvPWQi;?$FC8W3qR;MRC+yOC+|pNTwhBRxq~U|MgQ6`2na~^+|jo!g#yj zZ{zQa7PyKndOMf*xf>>e#a?uJJ3GfdWX<~q#eL$E&soa9)T)od!e}_SyDorF{8){s zXP>ifg3NBOld%o6Pjnmf>uqtF>q52RdCh#c?p#*613$ljYMV*>?GZn zy*c@AjMsO{nHg5Vb!49s(*IFG3oHK! zM*Ev+%Wc}c@seV+N&6RFoMeJdzc8e9A=6}-8lUyCx>N&PudJy`NuOk`ow2v)SkTYL z*1&e&-Kr48R3V0WtRI1yCL>qWa-(hezD@FuVK_VBI6>y#xHUB9)qR7)cMELOzSi-> z8V6!#=>;_}*1o>r>cmO6kx+$Gtn#}I{WOKd>D3wmFs?t6M82fs;Hp$toMY8~qUAtA z5G(8(U09eO+VS%AML97N+8H$#uBNz7t*kX<(jgleSr$Wf}j)JJmu$wUuc9c%rXvgfou;WRx+KRu>R!;kvKu!wWq`eFaa zvu?VZ+dvOFcK$FI>oeG(rlk0nCudgwjG!h31wD4P%FUliTxQu*lEcRcCDfR)udUKq z-D;efGo=lrBgf133KK~fh_+Rj?q_PSd$rCxhPN{xDx1#d$X>nIjcw?2!lxlgUt?s- zuW10&`8VSS7a3S|&0F5sTXX7*Pkfda%upVdm-V_f9_{_IoHz6q|57UjlOUl^DrJd` zeA($~mhFyFK83H{vv5^>#hT20l=9oK@^mthhi}rrkx*mSF zDtLV$J^I*B2y`y)bs~{yMxzRwjPeo2N#)ydbMlF3wuRze_ld$({7>b6(HjFtF4t-{v(-_mW6K zm-X(f70@!k8B{G>t4yAttI_$PB}c7W2*U_)sKjDV%BvW*)tefwDsjwpN>{j!L2heM zM)#PwC{uAup;wUpROWi(-egjAKxDv9;1%?lhD4Hq4W+q|j{VjdTMm@@my11ADJlBr zdUS1&g>JQBOM+wbo9uZQgLUQ3DP8D6!cN>HPOW;6Oe3-xTNfYI?ZTq2_t}ZSO_eun zgQyLb(5v@qO$HYg=4aNIQi{B&6ss#M5~qm-&!r+dGlSL8n`o5xnIGHq4aZk-$TtYOe~Pe| z+VxkQLMn0eBv5gD%R`FC1IS+R5lb9YYgZJB|H@7~!=3DLdMG#Z19}uvj~qYlw}qr|i*R0t7nA+g8QW+X(^gW{UsaKjy&imIdD zNoDw<16!z_AJ-OELeCJjZM3k%=K!YFFX1l zSp?1^ns0Erfq4X(*lm$mYq|is3qTi*i zhCI&4-$TV|BbV_wDsT5f>XEuQT#vLcC7G&2<(A%omtRIoF&9wyeYQT#mS^9G^USCp z)5GnfnFfEMDF0=L*wL}EL-6^oXgA4 zV&n8=GF3xS^(+23&Y=7+q42{x(&$V>H_DJ+iu08LZ5FF5e72rfum9m*j>go zyPjVa<|x0~kCYXs-orVB2356DG|8c?tK6ed%vgGvo+3RNx98THWH<+Wu4O08bT=&z zi*Y8>#<0B_CYV$M%EX0ukR+qq5NcugcbtdXFP~rk9vGn{3)S^ml;SQe;b}!7pRRNJ zUBd{uL|DsDEyH=s&7EY4N{B;HEnlvrSl)4CnxlrT9GH~>ouCPWW1Ixg#gVazKoJF& z0YLu5A~5wXlWLl02vUD_v+ps&4tGi1#-NI5lPSFPT`N6AGsW86e^7;ZfLqdlV}vW* z)SA3RkA;i$m!7|tYA3_;nR%n`W?tq)9%tYvCkeD0jA57AK=S;}^bPNt9^}R|HQB9@TWhFyc#>#l^~674KNb7G`4FMh^z65NmmofVMYDz}oXR(d%tH(aR`SeA(gYb8w1|6-t=WK#zMQ zEEDPCm71z!#{@rwJ2Dt`x6W@5TM=?s^h}odJWeG{57|N_CWxA<+V8|uHSg?)kq#MZ zlijUDbfL+pmeTb5u^)Omhj9Q(yHeeZK#cDg7i?iIo4uT0Cs?dAA;fuPb=6<#Td@Nh z&SK37&)IvMN`#J+QDfX=YGl02Wnh`>jzP=$$Yf9)3q@nCA3!~P4e`ZFoH8(9Y6L^- zXQ1+LFC%$V-XwB7oTThv1gZ2yv)@1U+cPBTyY%f}?a0hDK-6BX@hBetYAI?}{)){~ zXtLL&#!tbQqV+Klj@8MAU8U>#3kd2>o;tdk8K1^Lvu7~1;d7M{DJbifq?FA{QOn8K zmg1M2HF|@QGz%B&(z*%L38zQZxi-j0QW?%wnu+`+{_oLOyy7`^pg6w?q07to{bVLVX9D5ZKNVCH)*f<47D^Ltvq&3M(X2R zzP1vIPhkl3{63d-5Ig0lI2yqEDKug4O-?zo`*PF+xd+=rD*ADL zC01H?BZL}jW7<9j2YeU%)1ytt{++t!5d41qx#iP9P0#t=eEAZ2RM{|pHgH2$BPpEG zil^h_&Ekq&`6pBxd-^(^Is$EtQ7-v6=t{r$1diKvzX|{B&S(BdID(0|TB0W z;&sFE7?JD4&x0Ao4b==Hr-^gV)6zGlCBy!x`qFfRm}OicTr#pjr0a6EDaOFmFEl^& zp@dlbqw`@<2+#3M6C|k9;jvRxqsfrNi`Wwh+{YiFDU|CTZ6uuBFp^IR-zyyx$f3Ta zBh(qtyI|9kZvKuOL0;VDUQ}9wIdm_cLRgq@-M6-5zpt4p`QwNx*NpPh!Woko8TGlz z1L0z>e}ngLL$VAqv%GV?8GmVZV3*2J>Szmy(JBGs{@YS)T*nA=7R24_IaMzqZ&-zp zf{asDB_U3~EBT24Td`x0=I;h)hTUN0`3g)A+>ssMXmyI*^Z> z>uGMR?+I&o*lX931`|vSprP!TE|zh|kC~yLMA#;$1q7xc3*rA|u73H+Y+jbtSFyB} zCH>m*O4vLa=(HABZpLY0MeGh(Ae}u?tSrag8g7;YX(ve)==eFOlifu~Y2^zyhUU|` zm{|qQbI->y7xrb4^MbKj#_M zv0>_UDOxo85Va?v5Va&q+~HN+L9S}+bZq`ST>0`%s|D^hh>x0f|Kgv2ojhJ`A$~V; zR?kz_eD%0JuJ?@Z17-Qwymm+ynE~V%)}Ecm`#0N13LO%#eOU_Nn-s7B@&vl_?a#vk z&pld1PY<;w2f~Z=PcZpa#f$sWvTN5YsdhFol{}9ZT8Of`;rt}Qka_GX;xDm&*WW3! zWS*j{vM=p6+7i8FYE8C@T@pf5SDW`t@;nlxp-eZ~`5HR=yJt1UVq8Y|@6$^xWZq9T z|7r%*bInyoimtw*6z7`^`=JsbaYm|24*zEW2Xo&Y*%_8VPzU;g{ja&%UcME0jS6%|k_W<4$caD=yx${~2wH)%JO@s?4{ zg~u73E_+9=!fcNqK_ZeVp`3^?MR%wH+)!h1XeY}Z5;Jk*)o4{6`q3S^h+3dQLZQHi zX{}{$OHx802Y$&&+6pd7U7;cAlRX9>BJ6*A*Z=f*F!RV~rC9L$-9{;8Ev3@5Mix^u zb&E87Lpsfg%1V%rB=a8E#>#g+`MNhUTW?e(}K5M*;)i^iR63L#ZTMx}GCmE@MMmiA&gc&&mxO z2{jc5f@1xlvQhkLU93j^=p5aF%)T5Gacd+BkebY~VMvP9sz*WoPSCd6oM8o|L~$-e z7sO99_{U*jvawdl!O&#>Tl%D&sNmk799i3qA=7@|B%idvWi`%WW5>1Bcr#HI*8^KZ zQkLF+U32M2Uu(FgWo5vo_mzaeqa0V{6HnQ-kFgyn#xd?U#*eO7<7js!@S>7g@CJw2 z>u0;}U`n`T@Y$=J=8=oJ&Ih%(KOgsNy=3kP<~892k4&N~ZgnsE5nB(b5r%nKb7)(A zL+T$BzWorznCP*QOCsIo zKzMi7GAB|?6cwKq^Tp>QsHalnR2h=eCLABdJ+>3Fv$l@WpjDgATEkW$lM}&+gQxcn(%WjX z==#0IkIivX)Cs|)5#Yh%lE59{=aK%`K=O}IwW-Yt!^PYm20fQ8Ywsw^?o6{0uZ#jy z$y7NbG$}~UPT33pw&#(P$0g8&Ud>xl_ubWVK+Fy1)#QhVMxy&Toi%l4c#c+(E1M znCfq*TG-4#5Quceso*TV$Uk!{pt4IZm4Ai{kv16DRkti(&`QOTMI&KPQS(Sk_E)6~ zGOkxcV^OV%zQ&Y3*I+}7y(g`?C@Wt3`IlIDPm5lC;D^y2LC#U%x6R$%-JQGLiKzbT z@KM)&gYel&^B`ZGx9731p4U${UVk|(CcJ9*w<_Lm<#+(VKtcSE4-YQE3KMY_#193Co0pDNp^e;RYR)ZM2^bNrcdP#6?aD5p-W$Q5G_HI2D2t}D!s zm}}7zZy%(FLsSu+K3|SYZt|*+JsU7km`E><6gqL~|7e_mNSF8s6-slhdN(s5G9!kO zT8_vpz3pb_9eXKiqgRhs>PvmNP{YqmcX~L{&&_D-)gqR1X)4_NXb~8oKwE$D+)a{H zx*(^njIM6zQL^+wNzDIkF-BSg-HB6salC!6G)P=BbSOS1IYo8FL!;bLmQq<*+#pXN zNi#aEkNcd=(%o;A6AG07B;gT(k((cySw$PVPSR(sS)ngROV^zMqCsoTPaiG+ zmZ&-+yc+viopqH=cEk*lmw&OOCaY-?i$W<)e-9?|Er3df29-h1-i7~C(tf|HoTkM* zG-4=xfze<@Q+6x*^%PxxY|Dg-T^);pd3N4@AxkI$A-w5J5$q3%f~RoeVfb(zk3-vX z;!)N24L)*HdtIa!^X1KG@Xd|Xj-%7dih=*3(s*{C!aew%9)#17d&6F5K5Q0nx;XXA zyC^yd81@C{OTYrss|)u}>?F>WdJ?hgZNh!@#EoOlJ4Bmw=FHHCQ_1x7t#A@l8d=SVRPwbBdaD4Sr` z8gtOJFyM?3yv5FPC~?TE$CkR|m5WH2gZ~!luI%<#3zD_ad*1d3C!H-P2N5yx8wW*D zU&a=eL}~tPQhuX_sI~VRjcP#fAvSXCQu9Gr9L2S-M;dY&MfeFGKiS*;*fWh4?N*>- z2SlF1^YHP6^s&=UVEFBo65xn0ND4>jabNOPz{xx5Fuir(Z(>3Y=TW8}{?^&oJucrQ zehufum6)tpVNjjr_!Zm|$@5LGbiME6J%33glAIcx!+@#g1~U!3=JHXS=~$VJK3;f}-4f{~qg3OBau&Qa2v-Wpm`WQsEBv>8+Pbo>%C?G6TRWb{ zy;R7)tA>=?aW|KXSh+xP?bHU3x@J3@&Th%CZv=SsPHY5)tB3~Wiu9Z$UOTM@|% zPKn4%DDY?2rs-!i`z?(W=b-&ZgMg=hn2CB)B@$gSs~JvcqiSc_x|7&uK7S~*;U5V!O9 z0of~x7@mWf^zlx_wd4R3ex98WyZQ~eKGxMz3AD5&7pUHj-yTN(&L`3oTyb)`($Xgb zErbs_w5g`xjDXhhWvZaMW!!s`K)OQc!IA)}%%2(IOko(S7zv`iZgW~=k-7D6VT%D33SHS>UXrBY~ zlv1vH)>nP%HQgk)rcU1w_9&Eln6b&d>!+zGsD!a~UK|yfcT~i^B}R8rC;?u|;^6+C zE_`usG)t9xQ<;#Hdpj_JBK<+JQ2yGf#Xb0?LV2K-Q%Miy^Uf{H%C@#>p)7(yDQ}{3 z7`S62d-!{$K|#O44gDD$qkH8sgsL3d_`)|*q@|Uu+fQpN__b~O^ej^_V&`x>Ws2`gWpWm#+tyX=ir? zITZD5K~6uOLM+0dp{36&{Vr5dbEJPUz#(p%@FYsn-g%`8$Hls6i84RHgd?%O*i{c; zHCs|Aey#!yt!V0QXDn(YLKbGO;9kiq^y5PIo~R0iK>sz?rLRm9-3e7k%k1UC`+_si zkR`X!6`8fV(BfX13fclp{Tny2e!`9GKGR6$R-Miwoa4ePmM7LyX8W&PRhxBnSx&R} zFIi+uB}6J8~QB?#*`mDY7wNg*tuC(r3RLDsAKY44vo|A?XZb>jp5 z+pRZ%AdSVNkHa9T67o@DO>7p3V6FZ`yUx8MN-)GkZBfS5&U(W<*_8}uv-M|ug&=izw)W|7$R^;KUGgsyr*hq zxUAXK#(S=O_Ao;jBJ&aeS2d!14sSZ4EJ1Fr?{@Xe6y3FU=vvwFO`?>S6ywvZ$0B9Z z(ozA;Xx1ywwDQ;FT2w`Te(5O6m@uhLT(%z3|H&2TXV8+X^VEkeWw{cO7UHCh4Rsh_ zjNtouyEmviRL_bDeNFJ!RznR+n zT)|^02+yG^OTJk4_(jYQ8z|?5TL>-qTaOe`-ag)x>PVk{qp4CRSgX6Gc2GE3xs@3m zqg2O8)D#;LDpKJd<_u|@fpx5lR3Ut!My4~v3r$=`KXDl04Y?RIN%iVi75L6~qR)ZS zN{tw{I@*esjjy-zDXT{ck*zd({6IV$&odmoq+PR$6tn{Di#h9{BX#IJ_(n>h?1MGJ7zA}fynzB6pYPO>zm?W zH{t}Le4n>pANp`00Y1j8H0p8pCKvl~?*{LK9Y%h>8cMd~| zdH(L^?StS8tWwlFFtO=yx_{Z9jfRTZo#g`#$Ke-`sZYQF{6|!(K?{_&)X%lb^J_{J4Ry4lq zAu3_J++VpHDT5_dqM?3V;HY%u@4w1`sm=Ds)AWTGOU+rwC*{lLvt(oZ>Ff@j8a3OM zrSM?0R=k&fSj9%L3Jx~TsjldqTe=LZ|I#4H{!1FlSTc}f~=CR zCaJ`EJCYg4ESK_U`heQHO+Lml=nfz?M-SFX=%Yb>drevEAXzg z$jowqfvaA7Kd#riRD%3rNS%R0X?>1io?E{l(R^_ep?;)S;{Il+bT@SPw#b3}6it?j zN|EHuXKSj5DQlcgAG>MqX_$*^91_8h$KM|yW3-lmL7%NOsUgo zj3m~ponTz6 zBow**_F>2DUmjaas`pMCEN+{S2+I01UCSY9Ch>tt4m6g``3Qhx1x_C?EiU=lGur+MrKeDrqxdq@wS1M$c0~X}zb1a(7d&v#`H4e%y?Gl@g`nwtO$nRDdVC^j`D;nHIu8|Hp zIODTeG2yl5>;U7O*w2tTb%xC+6^PSPyXCE|MGmT@v78-bh~?dME~N1rW62GWGdQX@ zhcbn_`AQDFU?}c$d457;jTD%fx;0;KOc!t@(CyhriThN%qwywO*)oOS^~8lLV+dkP(NRs*dzYffcAczAg2oZr#Re+vV+DX@FXEu3Y*IY zlGrjb2L5Dc{xqbizLD)i{F#qq21@?tX8uYghgIma0Y|BfzqokA;X)Hbji{a$Mq*SK zD1_2TE+yisx}$W*<9xWpdWH{(*HLK@)u9?!J!))XaF%2+T5}qv%Bmo_?3VwuVI0S- zo>84%{3cF2h%pbLSX%n~S%~^b>-~HV>AGZGdP?Jxro=ZN&K-pBg9isy@+zFufkq$? z)%-d%)5)`dNa2K2CEZ#MreM-fA3VS@knasjqem|r5 zuc=k*<;;}aQrMv0#XPpJ$KYO;MX3Ph7)QtBKpNX-hnB;Ig9HMv@_XM7RqjWh`%CwO zg;71vzi0Pe$M0Ut+@WumC+)q#&Ghr^F(1Ep7M4cP`a$=8W$lx%;cCQ0j#+wf;@Q>-qN4^Qa{;itQ;lp&r0+I{WnJ$ z_OHfMWuq48K#_#reh-D&3Ng91@qF5un*mSbDk0WQZk|)h#-PoxfXtwJ@ikniH*|{GxA{iyg6Y9`6Pa6B8 z4$@mk&3V+OL{CUp#}@>(eRY)n%2N=JSec@NdWeN0^+UM`&lI9|yJ*sWbMBi648iz`V2uIVBupz~-1DDM@Rd)LMn&g1bsYAHan_2aH8o%{W9 zrEOfDsUS6LuGFp)!BVv!T&X<}E$FF4vb%Xd3G|v@u&gJLqhMG;sR$^Q zEtlWl25Xut1#+tRQq4U$2r>5ub&fpw%c-pc?*?-k3nPT$7&#soRWmf)t;wrGA~A3i6-8nCEA2yjo~t??+uW z98sb?4e**Sf(mODpnwh`Q&B^CRznys;_Jj9Pa=t~zBPJGXT$2rWZ7D4{AvWtOQ*ag zLV|!I%dU(KThiM}QU|np^3`lt)LYeOzdhvX<50hx(GBCB(+CciBx&NkYURMwPM_^VuZA}h z;iCGzt^*uc?vmP9z?>ki3fD=`OrJ_`iCsdcgydrez(MK28%%hc* z3CjT)@k~=Q)&Xg1fcJ1_$h4tD-CUXbXW$^4KAGY=0GY2#Js}WXsZ1X&8=mIaA)K?C8kHsYZF2G_J() zq$f-x;v0jcP;|WWRz(Bsp;DYQ$Xdkuu(kqWAa%C?)pxN+2n+j|vY^2o3wsboPwmN} zBH=WWAR_ekYB-FHgwlC8Ab`cJlQp_k?azFzo~OKnc?NJh0*8gyhMz%VF6!5uASnEt z_^Zr?jV#L9#!ciQ*;$5FPRcO{eJ1U)NchyG zQ1wvXa--ZUXjd!Sa?`@^tnEXKONyn6rDxwh8M<%8Oc5_)6AMX1_$b6z&_-N6+0#(TyueAUO=vIfG<8lo>+9RK#u6g*OMSL zkzc$Y5H&g%J;ZX9yX2`=J7W?89)Z^ht+OuzP9%tJmU6wR?N*kc`o+An``9q7jWzp{fIM7S-ujr)kxX6w<_C`2 z8FrsL1fojf-rr?JZQb!SqBNq0?TBHeY~?VY!I!s8h1@1QnRPAttcfe4<@^M@FTvbhSxT{=7>*s7WX~Jv ztz$U)>r#^}_r>C1-XmM$EA_8P-H!4nhR}*3%CbpqZH(75SoliVjj}%!2_Rde&y$qgeEkpo40ne${ zgl|ozXfc@;jyD|6=qz$b5@rcB_Ih4_XSd#?2?HW>xwq(gpcFZGge$_*(2*$|AA);^jE za~ADihNq}vdu0xy!V^`|u?hu~4u`Hs#g&aeJWTV)^QM}QC9B?oE&Vj!f%-#2w9}Nt zB`5Bijj1V^ikuUJa0vF=L_@};y)U@CMyYs5=qH(T zwv#_gpfcX*LC(6q=slBrOm*m8gALS_SK8D}eJ-dV&pkD$3bQ$j6w!Pd?T< z*dHY4aVs-@1yQl}w2YpH@U1u}1^FI(!Lt7@@%+?vWXO363C{SxbPtfgmO5g6b=7 z+T3GA9?3y^em^ef1USENQ~esrg?f0e1f8sEJ)qkt{CsQXcN8Q);#nAKT0Hc5WT2AN zCaJ&FsVCAmH-b3fu>~oAwSyb;Os3!|+XJ0uwtzOr+0$^JOw>8d(527C&_cSDEwzAD z;|~x~$gm)Or9x;n^ zvd-IgjV+WAHdU@5ZAMKH=@|E)rRnJGK&M&!@!;5gIGU+rC1>e=e0EAO%fC(OoJl3S z&%tgdy`7)QcQI5DT0yIztYKLK%bf{AzY(&>h&M&!A$yPZT0-$G#rk#qd^8%nqmpi> zUN1S|r?N`I$K`M7>#vR&7hU@iMr0L8UmIf0>L*Rg$>i7e&CJVV1I>Xp{K~T~d9N5#btr22$x={r3d`!4Vsep;24+Pg6ho+%i)yiw zM>Wj6x0H4QSrL(HrnyCrxHAU7ZG7}Cn*H9RLE-F+NfU@iB}P>c;N5Y95$O*us`z?k zG07m6F*5bZ_a;tM=s2r2^)-fP^JyTd!~KM&6Z&WvrQ>k6%67j%2S{RvZ_AZ)8vSxquwu zG@j`-*~B5)!#Jf`nM|fQ7MgF&?dx15E&~Y(q)0pAmB$_KNL4G9C|m(z zoZ@rwhqPtmKRkCCM<`eZNGTfQr!WO`4E`AS8)=Y5>uf(Sozfoak;M=I^LHv6)xOml za%fN~pTam;cx$>FG6$tF1JNPmeJ96ms%NP|J^Pj+=U*4L7THHI!$vY69*_}f9UM=w zNY~T(ZXsFZ`z?P+c{uqfWu4Sn#`a`;+;$XreQ(Hhs)tm-dkt5Gr^XY3+i&xqMPXZgY3P`q@sPd-N-b8%;31 z`FS(&`Z8U)A@3c1Dt z=fd9FpI9cWv^F9+-nO77utA@fz+NBE`u!yvAVQZ1_xtP;04tnrZ3khi^ZhtJ(Q|^& z%Z=XSw$EKNPh-ag?)0#jgkdOIlm;@K|jo5~RuOOe|9?@vEmB8Wt{UjyBB9p0^)f-hOy{_Uzfu_nv$I=icwX ztl)kn=c(j%{b1I%FKGPQs~;gF>>OPm(3?ZI&|^le%jg5TYTgi47|>D&-lfc{1Ysy7 zK1*u!2skgknf(vEQtBiP7FquGY;SCCv7GXuTS-H{cXV=c;)sn$Vu%%_wlwBC2+nG5 z;=jj{Bx)m2KD_&Z5j)-C49Q->D_Sh91}p~+(M3;QXRGL#sR))-m#{1x9YE(p_!Tsa zKe0F_-mT1VBBa|E2=+N6g)v=1@7j}2_`S?)b&sV zdC7?}yw6a)^78b{NxWEfHZ5l&Pnm`}Z=7om0|ESzp3}B8dRp>Lwe*lz zbS(5vRA%$>UNK(_aR387RVVMP4(%Y%TT%d?F{+mz2ml7x8HnVQLcnkm09%1uJuR;M zf{8(xPW4 zP}1tL(4Z|j*A`Rql7sk3*JR?Oq>zfM@LV*Pe7#oIPo{KKS8|9t+zMJ}b#0Kj)P9<) z?m|+0$8V*hg&|LN%D_5^)SnhT&}nfTR=#w1!=v&Is8wg&N?~#G(q7Srh}t9YH)@f~ zn#BG%Ci^Oz|c--B|y$Z*yg zOb&t&7#;bg5ww+SRZ5vD+-LasHde>s?9OpHgPeRo1FcYBY#xN!n@Pp0$CmL{mz>#* zn2E+hyCJb7J=st4Y?7_87jO4OP0x+NPRqsVIBiQ-$!qZtE%lAXRg7W_#2Nl#p5Cx4 zTo^TB@0=nb317}PdE{j#YQ3asotJU87(#Kd&c-pw!*8g!B6~adeNkY5YW?7SO?@ku zj&fdQ5NutS+f<@HwED3%^UFIhrWfD~Ua01mFw0lx2dtx1Oi& zd@r3BM_a`BmsnfJ_fn%`$a=p9EeJZi>b28j*#KShR7YX7qK-nPANxo#Fn73Sq^7NH zak8y=2|K?GTHZtio6LWwolDPEs;-nD29sxYxICrUBKsFRKVdvl=ud;p2EMU zlU&`gx!vO`kSx)MBT%rN;1RyL6O!tNYA@_=Mss$5}1Y zrjbSZKn(X)i5}xFDl2K7?u46JM~bHn^E?|8*Su=EkVNFZlup_QoCK4_!~txo$vQ%J zaRL;|xsLj7!5h16Gd7Fpi}kNvGMjcoHG=MEw}^7jxF6i#^47u>ZX9f;IaOi+Si;br`9z1f`@IGdrBlPZ%?*~ z`)CcXWSEZzZPx`Zcki&$G)X^A{$1We%9*>M3za6McFxYGk#5(&<03gkZ$hi*dgdn< z<&sF*>kW=`(Y#(~*^&~vjuF)9-5PxFvYO+5{nf(sCbLlg|Ry% zW$!Z#VRV1mYj3pxS9cD~^dC7PIl-P1^EGmrMy^BH=K54W<{F#iv>%u1kh{Ud){-eI z1vaAmsoP5pHVd|pS9SzpFQ?uqY+sZ4w$Q>7X-j>l%60L$><@E=cw*|az-@Z!t4T1G zL!w~9XXFv;*AtXxI)HykAwErZmjk7#kcQ9>PWZTzJIyi;~Jo+ z0=bPu6bICGb)OjuubgY<=P0C*4M^4v`b1xlNTtNQyUoPMYQ^hwex^5+a5z=V_+(=9 zleeyrx|-ffa+Z_8=Dd@kRvpO)i>}YM5&#&_?%#> z-Hit+)$FTHR37^BWqnlIyZTFWtC(q8IBK+|$4K#RL*_Ofns!62-uqkPeFG3zy};ng zS?bb5{d&;Hcji-`IG?vyvH1J(Po{qI-k$VeuG9_}fpg~=J>^`F9YRM;rMO2;wC-DU z7Y%?tv0gdG!XC$8Am}{HwmnVty6Wc{UlAJ+#RykLy=m*Bfp&)BOA`^P(F3-VUAGO0 z5=oeDOL#Gwo5rpB6uB>$mZ(+?OUw$j5vkT)=@$o;?YQXAxCx-X?;ya6c42X-8yw(D zAUF5N)bw2it- z(>8lDlfs~Zft;hZepRr;gB#-7hOmo#K{?}X8#M%xwTc~HH~G#WCWp>kRlRg%)nI>% z5uDir1gm1T9xRG-<~M!R#0&D9JTIwPkB2x&TF$H)R{FMp&YT-DnMdv#B%BKx+KQnDjNkArPV~#ZNF~tjjxoFYF7}Mj^hgI8 zzOm!|6shiPQeLM1OJOCE%~T7cSZtN4sAvP=XPtR01@tMdqi2Jo} zFDzKn=r2H%C;rhDARedRxdm}dr(O#>+a X0pQ4zmm92`e;f&>qNQA^X!iD>8RVDV diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index cac201f34b..12a3ebf887 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2973,6 +2973,9 @@ void Application::initializeUi() { if (_window && _window->isFullScreen()) { setFullscreen(nullptr, true); } + + + setIsInterstitialMode(true); } @@ -3451,13 +3454,15 @@ bool Application::isServerlessMode() const { } bool Application::isInterstitialMode() const { - return _interstitialMode; + bool interstitialModeEnabled = Menu::getInstance()->isOptionChecked("Enable Interstitial"); + return interstitialModeEnabled ? _interstitialMode : false; } void Application::setIsInterstitialMode(bool interstitialMode) { - if (_interstitialMode != interstitialMode) { - qDebug() << "-------> interstitial mode changed: " << _interstitialMode << " ------------> "; + bool interstitialModeEnabled = Menu::getInstance()->isOptionChecked("Enable Interstitial"); + if (_interstitialMode != interstitialMode && interstitialModeEnabled) { _interstitialMode = interstitialMode; + qDebug() << "-------> interstitial mode changed: " << _interstitialMode << " ------------> "; emit interstitialModeChanged(_interstitialMode); } } diff --git a/interface/src/Application.h b/interface/src/Application.h index 88aea0379f..856e2d199e 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -631,7 +631,7 @@ private: QSet _keysPressed; bool _enableProcessOctreeThread; - bool _interstitialMode { true }; + bool _interstitialMode { false }; OctreePacketProcessor _octreeProcessor; EntityEditPacketSender _entityEditSender; diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 130c2c0b89..9b0e8d83c1 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -781,6 +781,7 @@ Menu::Menu() { // Developer > Show Overlays addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Overlays, 0, true); + addCheckableActionToQMenuAndActionHash(developerMenu, "Enable Interstitial", 0, false); #if 0 /// -------------- REMOVED FOR NOW -------------- addDisabledActionAndSeparator(navigateMenu, "History"); diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 31510831c8..c333a0c8c2 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -34,8 +34,7 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/emote.js" ]; var DEFAULT_SCRIPTS_SEPARATE = [ - "system/controllers/controllerScripts.js", - "system/interstitialPage.js" + "system/controllers/controllerScripts.js" //"system/chat.js" ]; diff --git a/scripts/system/interstitialPage.js b/scripts/system/interstitialPage.js index 149e1e141b..87f415130f 100644 --- a/scripts/system/interstitialPage.js +++ b/scripts/system/interstitialPage.js @@ -15,8 +15,8 @@ (function() { Script.include("/~/system/libraries/Xform.js"); var DEBUG = true; - var MAX_X_SIZE = 4; - var EPSILON = 0.25; + var MAX_X_SIZE = 3.8; + var EPSILON = 0.01; var isVisible = false; var STABILITY = 3.0; var VOLUME = 0.4; @@ -149,8 +149,8 @@ var loadingBarPlacard = Overlays.addOverlay("image3d", { name: "Loading-Bar-Placard", - localPosition: { x: 0.0, y: -0.99, z: 0.0 }, - url: "http://hifi-content.s3.amazonaws.com/alexia/LoadingScreens/loadingBar_placard.png", + localPosition: { x: 0.0, y: -0.99, z: 0.3 }, + url: Script.resourcesPath() + "images/loadingBar_placard.png", alpha: 1, dimensions: { x: 4, y: 2.8}, visible: isVisible, @@ -164,10 +164,10 @@ var loadingBarProgress = Overlays.addOverlay("image3d", { name: "Loading-Bar-Progress", - localPosition: { x: 0.0, y: -0.99, z: 0.0 }, - url: Script.resourcesPath() + "images/loadingBar_v1.png", + localPosition: { x: 0.0, y: -0.90, z: 0.0 }, + url: Script.resourcesPath() + "images/loadingBar_progress.png", alpha: 1, - dimensions: {x: 4, y: 2.8}, + dimensions: {x: 3.8, y: 2.8}, visible: isVisible, emissive: true, ignoreRayIntersection: false, @@ -285,7 +285,7 @@ } } - var THE_PLACE = "hifi://TheSpot"; + var THE_PLACE = "hifi://TheSpot-dev"; function clickedOnOverlay(overlayID, event) { print(overlayID + " other: " + loadingToTheSpotID); if (loadingToTheSpotID === overlayID) { @@ -309,6 +309,11 @@ visible: !physicsEnabled }; + var loadingBarProperties = { + dimensions: { x: 0.0, y: 2.8 }, + visible: !physicsEnabled + }; + // Menu.setIsOptionChecked("Show Overlays", physicsEnabled); if (!HMD.active) { @@ -324,7 +329,7 @@ Overlays.editOverlay(domainDescription, domainTextProperties); Overlays.editOverlay(domainToolTip, properties); Overlays.editOverlay(loadingBarPlacard, properties); - Overlays.editOverlay(loadingBarProgress, properties); + Overlays.editOverlay(loadingBarProgress, loadingBarProperties); Camera.mode = "first person"; } @@ -349,13 +354,13 @@ lastInterval = thisInterval; timeElapsed += deltaTime; - progress += MAX_X_SIZE * (deltaTime / 1000); - print(progress); + progress += (deltaTime / 1000); if (progress > MAX_X_SIZE) { - progress = 4; + progress = MAX_X_SIZE; } + var properties = { - localPosition: { x: 2.0 - (progress / 2), y: -0.99, z: -0.3 }, + localPosition: { x: (1.85 - (progress / 2) - (-0.029 * (progress / MAX_X_SIZE))), y: -0.935, z: 0.0 }, dimensions: { x: progress, y: 2.8 @@ -402,7 +407,7 @@ } currentProgress = lerp(currentProgress, target, 0.2); var properties = { - localPosition: { x: 2 - (currentProgress / 2), y: -0.99, z: -0.3 }, + localPosition: { x: (1.85 - (progress / 2) - (-0.029 * (progress / MAX_X_SIZE))), y: -0.935, z: 0.0 }, dimensions: { x: currentProgress, y: 2.8 @@ -410,7 +415,7 @@ }; print("progress: " + currentProgress); Overlays.editOverlay(loadingBarProgress, properties); - if (((physicsEnabled && (currentProgress >= (MAX_X_SIZE - EPSILON))) || connectionToDomainFailed)) { + if ((physicsEnabled && (currentProgress >= (MAX_X_SIZE - EPSILON)))) { print("----------> ending <--------"); updateOverlays((physicsEnabled || connectionToDomainFailed)); endAudio(); @@ -441,7 +446,7 @@ updateOverlays(toggle); if (!toggle) { - //Script.setTimeout(updateProgress, BASIC_TIMER_INTERVAL_MS); + // Script.setTimeout(updateProgress, BASIC_TIMER_INTERVAL_MS); } }); }