From a40bc8fa76c2e510498944b0de222cd843c6672a Mon Sep 17 00:00:00 2001 From: titer Date: Thu, 16 Mar 2006 07:14:27 +0000 Subject: [PATCH] Renamed HB Portable to HB Express git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@35 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../{Portable.nib => Express.nib}/classes.nib | 28 ++++++++ .../{Portable.nib => Express.nib}/info.nib | 8 +-- .../Express.nib/keyedobjects.nib | Bin 0 -> 34408 bytes .../Portable.nib/keyedobjects.nib | Bin 34398 -> 0 bytes macosx/{Portable.plist => Express.plist} | 4 +- ...rtableController.h => ExpressController.h} | 4 +- ...rtableController.m => ExpressController.m} | 8 +-- macosx/HandBrake.xcodeproj/project.pbxproj | 60 +++++++++--------- 8 files changed, 68 insertions(+), 44 deletions(-) rename macosx/English.lproj/{Portable.nib => Express.nib}/classes.nib (77%) rename macosx/English.lproj/{Portable.nib => Express.nib}/info.nib (81%) create mode 100644 macosx/English.lproj/Express.nib/keyedobjects.nib delete mode 100644 macosx/English.lproj/Portable.nib/keyedobjects.nib rename macosx/{Portable.plist => Express.plist} (90%) rename macosx/{PortableController.h => ExpressController.h} (94%) rename macosx/{PortableController.m => ExpressController.m} (98%) diff --git a/macosx/English.lproj/Portable.nib/classes.nib b/macosx/English.lproj/Express.nib/classes.nib similarity index 77% rename from macosx/English.lproj/Portable.nib/classes.nib rename to macosx/English.lproj/Express.nib/classes.nib index c9525762f..28084023a 100644 --- a/macosx/English.lproj/Portable.nib/classes.nib +++ b/macosx/English.lproj/Express.nib/classes.nib @@ -27,6 +27,34 @@ }; SUPERCLASS = NSObject; }, + { + ACTIONS = { + convertGo = id; + openBrowse = id; + openGo = id; + openMatrixChanged = id; + openShow = id; + }; + CLASS = ExpressController; + LANGUAGE = ObjC; + OUTLETS = { + fConvertFolderPopUp = NSPopUpButton; + fConvertIndicator = NSProgressIndicator; + fConvertTableView = NSTableView; + fConvertView = NSView; + fEmptyView = NSView; + fOpenBrowseButton = NSButton; + fOpenFolderField = NSTextField; + fOpenGoButton = NSButton; + fOpenIndicator = NSProgressIndicator; + fOpenMatrix = NSMatrix; + fOpenPopUp = NSPopUpButton; + fOpenProgressField = NSTextField; + fOpenView = NSView; + fWindow = NSWindow; + }; + SUPERCLASS = NSObject; + }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { ACTIONS = { diff --git a/macosx/English.lproj/Portable.nib/info.nib b/macosx/English.lproj/Express.nib/info.nib similarity index 81% rename from macosx/English.lproj/Portable.nib/info.nib rename to macosx/English.lproj/Express.nib/info.nib index ff2bd783c..6dbd31c86 100644 --- a/macosx/English.lproj/Portable.nib/info.nib +++ b/macosx/English.lproj/Express.nib/info.nib @@ -9,7 +9,7 @@ 248 483 424 408 321 0 0 1440 878 259 - 484 331 408 508 0 0 1440 878 + 417 300 408 508 0 0 1280 832 29 33 298 338 44 0 0 1280 832 303 @@ -17,11 +17,7 @@ IBFramework Version 443.0 - IBOpenObjects - - 259 - IBSystem Version - 8F1111g + 8H14 diff --git a/macosx/English.lproj/Express.nib/keyedobjects.nib b/macosx/English.lproj/Express.nib/keyedobjects.nib new file mode 100644 index 0000000000000000000000000000000000000000..0e4089422833cd3a603fca595a92f2491914aa21 GIT binary patch literal 34408 zcmbq+2Vhi1(D0Ub_wI7{lDqWIrBEcjcS0}H5<&?zhU7>BAqgpTIj;^D>(BJ4ERF5fk!LHa1 zTd)WA!NIr*w&5_`97p4LoPZN?3eLc7aVOjvcg49l9}mVuZ~-2QOK=6Q#MO8Vo{Uw@ z@Kbmio(V@U;#v4r{1%>v-^L5@`}hO=Azp@8;`MkV{tSPPzrx?*AMlTO2i}GE;UoAc zK8An6r|~6x8UKc_;v4uMd5q!q~~ zZAnMco%A3*NiWiu3?@TJ0VyKG$p}(Ts>m2JmW(5l$W$_&%plK`7szb#I++VcZ;-di z67n7#EhWpy8uBq5ttFq5P2?-GnS4#QksV|w`HAcz`^h14nEXtRkzdJWa)V+@s5|wb z{xpCF(-!nG+LA`oSeitWX&TLm?%TB!gs@JS0!4 znbbl`lv1TMDP78v+DYBusJqk`e)p65OM|5+q!OuAs*%P@2v7|=_~15X}k23vAniLSY>g|4M8P8Y9B)1~tf>N@Hk*X8I2>xy-DU6rm{ zH$gX9O4F&jr*u8#xrcqIc7K!QW7Q1pJQFC+HLP+4?s6$Mrqnyr(`_-$y@4 zKUiO^x9iLGBlWfVI{ifbB>l7c>H3%TbD+)Z`Zx6N=$FFL`}z;0xAh-Ni}kDYYou@W z8}wi4zt`{7@6#XB|E9kwOR_-@mBZwga)O*Fr^uOdmfTwIBoCAa$wTE5xl|r0SIDE} zaq^S$WcexidHDtT75P>9b@^?1srv@*0av^R7yJZ|V|$T9RW^fe4L3^EiNh8ju?rG}A)3PX*d z)-cX6o*XtzHaugPVl*1fMt@_7G1M4lY-x-zMjDfiDaKS|y0Mip+t}II)0kt-HRc=p z8wVH*jYEwijOE7h#;1+bjWdkT8(%fP4XxiXE;24LzHj`%xW@RI@pI!Q<4?vz#*@a2 zaPN}wH{(rXJsj1$AQ!!hn=!@3&Bfy4}z)OmCRxp|hs9;q#7Zp6OlFeA5EcLenCdnU#D@|)m>*R3Lr|5IIx&f}NFl~fhUzomx-^*w=z*}P4 zZ2B6Vg??L2+v#vR-1Hr)cF952beL%gswRiv&iAIJrXQi@Po`bagHyBHw8ymHbij1T zbjg(*)dPb<&R6Ur22sxnP^R(VdD zuFO!LS6)zNDlaOtl-bHl%FD_t%B#w2${gi&Wv=pu@}}~ZGEaG1c}IDd9#!Tm3zUV* zB4x3%M0rnHs=Tj!pnRw-QS*xs5)+?WoDaxnH24$o2new^v zh4Q7cN%>0ItbDC(QNB^OD%+HAmF>!R%J<3-%8$wpWvB9!vP;>m>{0eA`;`640p*}_ zNI9(htQ=8}D#w)L$_eEc<)rc}%2!S)r>E^Ub&!LR4yr(mEV-#l`G0s<(hI` z`9ry(+*EEUe=4_?zm&g~f0R4QU8UX?xnfu1N?j#aovYqeb~U&fUCpj;uI_!pE9%P2 zk6YZ4f?SasvLGvRM;^!%c_DA)gM5)6@<#zE5Cx%N)CAd32nt1EC>%9K%}{gH0zHOW zq6id;qEIx7L9xOe_tac--@@`bJ2+^+9(iqwitIHtWkbu#%WB89tE{L1*IikyIq!Dm zg*7$y8m;w!9(g^>ifh23*9`2D*Q0QxT^tYYk>_Z}?>r2W_t5|h(f~MdTYBX6Ed#{m z_I_m*#g$`f`i2*Ad>o)g21FG6OrX+w!I@(O8Zw^;=x;<|$7-N(Ol9>5=+m*XqPBZs zMPZ4(x+3ys#EE1lnl30P%7YvuBojqt0)27ZK@!EDk`jn!Kl)1 zl#Vh`Cd$g!#%iw_pdC~IjD;u*wL;lKPTlKj3xP9v0!n_5yoLj9_!^uxsO@01ZTg&|owK6`&_jAsSj>vG&N*q?cDauH4?eux5lH zU%S?}uxJD@0oc*KtRk;$ydBt~-RWIcTYm3Ma1pdayVna85Ki)ns_pg)e!}|~j^+Iu z+Vm~6kAchmdUq@@EaB?NF9Y|!dqiRvzRmHuk1wyKaYA&$&PM8oE8yjhZ zUy~wj6XN3%_;JdlNidMkg%!nZs|!ciZ5_r|Rl}43u4@EoaxFory*UK5zRug(M#xM^a^?vy@uwX*U?<`26_{{h328R(L3l} zG#@QM3(+F97%f5Xp{3}3^a1)1Ekn!EM`#6FiB_T2Xbt*U^;W~x$J7`#QB7B~)edSG zwTGIg_EQI`g=&dfu8vYis}odJouW=xUsPXK=csS0^VKElhw4got-3+|lHnwVZ!vtE z;d(|eBa{&xBQhgKMof$-jJPpkWyFIKnBqQ+_%RZ|NDw1U)XRI&dJyj?=u@--Z3J<4 zD;#Ps=aaCquDZyshN@wz&q4G#`T~84HleT3X7n|*--5nDThTW3E!vL0L*Ii$yW1=3 zK;^qv*hf}YlofTWED{q2Ojn0db!DTwR~GXL0|>-)0DbOR(PbnUDVUkgHe4oUW9`M_ zy6WpbxxT*M9ee>&{nP-}Uu~j>>;)Qr1pGVDPV^Jng?0mGZjwNkI00R1?IUX#sbHjv zVGARb`7jyFM#5~$9k~bXhmP^+06K^cffWJW6GIdhEl3Sk1A#b!S~E%ju3f3UXvE0E z>Jggu97V?#qGRZ|L%}pN&8uxt%`@oi0tjBR zfgjG1XmjyAw{0F(_Ud7k)g$?E3Tx}CVMOUp3wsG&UWhKE-#A%bz>cz^;8JRj{8N?XTj zz?Y*@dxul&R#;tKSW#l{QXy^ur4E!Bp$(X*(SWk$LnyJtl?v<7w^$Y^Bh*Mh8O2fV z0l9c2`5bT!CtB&2p;*1=xyG`&I#YwT;kv0$Oi10no<&8(Kd= z8{j}22WaCt+7W=D5S2h$ZUYBl7fE>)pwb45Ls06F>bi;?P~&ce<0|VKqYMX>&D1nN zne;Hq7Gk820m=x0GFeRll&OtJ8UrJZW29D$v<@_&hkZ;V_iF2GFR#kY)`pw}Zn&nj zaty!LXw<1dLb}=tNXU4YgiJv~R)c&q)hwrc8zvcUhuZ@g9T|yYBt}pYJ)m8=y|CKG zbyP#%g-hJ4h+hQIe7&xugy@9`~wIzbXA-+ zL6z0uD8)p8>0VJ>SY0f7E*tx9OZtGcF3Kgo{(gKTjDV&SbMw(NT-gwl{0LH0+u@_+M`ACc~C7%O~GaO>b z0c5!x8E{&lyPwm2ILiAlyaX6t0StWsL+^jXFsBi3`#5=xni2FIS-ps0B{CoyO`DP|gjE^b?wy5AloeC$_vQdwDrGpM^EH{*`sM-s7t5 z1(x92%94_DJ2%~B6?K($HKLj50c{&-`T}U$qz(g`hCWQwWZEBq(DXecT?I|udiQ~3BzL@~tvgX_pE@{iWI=WVw!P{Iz*hQi*bV@;Lk?_ZfNeO( z*1KJ0)wtXu4eoJ(TLkBg;GP7yr_?HdJMv+;8fVV}-17qN5VZo}R&uyQ?&n}`hKAvH zu){^%S36nT2-P(}^@myqsHz`Er7`Rlpt|iCLJgp*6{?X_SW|1y9j#%g=T3!RxCfaK zw1G(Kcz`_SA;?6}MM2~S^%$#;1IWUCIz&Mfw2KF3gM=ss56**fGS`hlo<BBOx{j?TZ?FDiQ`zo2t(M zRQ51bAq>(2ptf`f<0*jpG>2LSF0l%nVmbV9A6x>CFi`W$Yf!6dIBz78b^y17Iuqc|_&2zn z0q)}txX%OJ7dYGjdG>P1y|}5#E!3drfTyStSK(qK6nTK6kNOgznDr0}htTsI34J!8 z5JDdUw!gZzLB2z3_~}CeegdEmRbK<>uRH|ZAz*t0^dj|DC-lDUfz(=izhd#HL0?7! zxJva60QdSs;It5)R5yV0Rp&av^&U`JIdYK0Ci3G3h~oj`MD<;O_|~BZlLGQ2nJlzk z1s*@ec}%82X4Si}M4hL;4Y1$gytZJc{!at_e~yt}LjUvZum-}ls2H?pSb@dIfxRP? zON9EgDdJUy20~^6A+yxQK*)lBC*)-y=xaM)vOb4#2m`6j@d zr+xtN-uriW?*hC9Vql8_-co?~z8Df6EFk7o+eepy<<9Nog!(=}{ZL&2P?!BX)Q|OR^6z6u71%_k|GD84D}iGbW|`LIZrvP(D7MN;!Lc_5pr}PIjW^co+1(ISqBA~ z+J@|?Asiyd$qBNT>{d51oCv5k?kA_nX*8Ui;fW(TOU|Kaa)DeVmmuBjFt*lS!PfyH zVaux2zR1t72!wC$>iRuFR4Xs^FekWJRRdS77S2wGB)FTYH zU^q&>d;l=rL?g&8@+a~pw}G1D;a@v2E2RDcdrN+qhJdMYDtYM@5yLQT|6 z74kcEqZVovsXMP|l~h+kNYJjbys{c7;DQmyKmkxwRaspNqvxFG;XZ`+4k0+IJDegx z9VGS*$MNcRb%(lD{RRfV%U!~Ek-MceLJ&=AYG*67weQ>Brj;M|Qcs@lQ!naGeW)+> zgK=`^!nlVC$f0d=AOPN`erq-O0@2;-ipq)$J3;bUY>#SNSzas>cN$287SJG3c;eO3 zeY6R+(GVI6ki%#=ZAzQb=8*h5hbjK@vH+)>4?VA{u!vXi+QIT|d1Z;H82q4qZ_%sY zsXzA38wYX0$U#K_StQ-iVGoUQ0UUY6cGA4FYf?NZ|S{s4G5up z-Vow;dt;3)0F5nF4}x+^o`V{zX0DxdBU4}ndMq7B$I}UPBAotJYa(YfR%eFMO~N#COLXb`33Px>}}2j$auLHPhLxkDGxNpuN) zk1nO}(+@x~UC3SF3TKGm0gS9i-N;_BoWso^T;;Y&y9jophMN?)$lXFtb!BZOKLHih z?3`W9NKvul*B>ypz(Mek)n#LaCJRLt3S7jIfHi^?LH$*|qW-3yQcoDwtH7hvYQ1{b zy*;o0{|>6UT}(e-^iPZv#y=@O(v}=M2}lm1lpNc8Dk$z0as29|;far{R(!FzLF3bioF`fa7u3i|NQ#!5&R)Wg8F;Cx3zXX(< z=vTlAF;RsDJ*S?BVfHF4F00fOS<~_@^qU3r8*aW}B5F58AI&3(=p44Yq^i;}up>DS zS`zZ4!;*XqmV*=i!#%=5td>TEUs6x1ht&&!hdZ2(;4SRcwiug026+rDUeVoj&qBI~ z?iI^Uj`e~zP}>{_q7{GpPl)4ujZ2->Z$ct>w3B`YiVh0v)&s1Y)3zCbmcu~J5qcEZ zcnp|$0%#cnLd8Gk9vZa@TR}gQ}i@FL(kH4 z^gQ^&UiPXQn8l*E&=mC#^&j<)dc)ne35?Q&IPUOM9U{NPXVYc%rg~XZfh+X-0(zBR zQ*Wt%s(J)8O@tF-yRVWaV04!=}K5w*!IA{z!|XVA=3f-fo}Jm>b$(X>T+^& zPApxzwEpLxf3ClM`*!_bfBjW|`0(NS4?g&yzIX55Cz>>AQU|?s_w~GYqVx0f8&_9X zckAn~zpnr1pMSXBf9T)dy?g5?PMmnFY15|T9s!HOI64j=KK#tuwQK7yU%p&__wL<> z&z(DW>Yblkw{F#M*|Md6%$PA}0B=Wt#rfd;=hC)q+xg3vFR$Oab!+{_ix=y!UAtC) zT_SFZbLGkvK_jR0R7X8WZA3AiX z{=|tBqW$U9r|Zw0Ia7c3?AdyL%wZfmc1-a6r=NbRU$$)7pS&-8oVpRca^=du_V3>> z+MPOes{Z`>^J09LE?sIk=J5DEj)&u0vu4d-03*6FoO$!+UE=pSUOpzy2RHdz{8!e)*+-?%cVT9)J^GQBkpz!{BsqzHpx2ym?dT4%Z#mB+r!}~UtJwN{Y@4toIIE}n*WMt&aye|jf_{U|}uArb` zH{iMJgz=CP!Ue9MFs{42E$;)L#&YNU=5XyphYmdg`f=w`F!;57`}W-_E-pU8+dBI2 zzK#F!`O*YF_Jo9l&9E|g1@!43t~30@kNGuzkGFBO{nt4L_c>jh-ZAib2R>^YAAZcQ z@q4_@zrlc8;vc7zkD0gSvf%o`Km3?q^G_M||?6Nf7*jPc{f|{5d*H zb0sgD1HR5Ec~co;2%Y3Zdq}=CPx2>IqyQ;U3PQJl)Duz@$p%5-i&7ZPgTF_~6fIq- zwhyycL+P=+iID^(8|8-+VRYxOqiF<1(PWq7G2Ux=3?q(D(~n<7Q=N}lA- zt1eOk#3zCvND_J%R+rdo;Xq6M1TH<)WB?oCWf_KLM@3FbLc63Ch7G(ThmC#sAmSja zE~u)k>Qlwf97Q-mm6QP`Qn9$igZvuDW*ey$TDwpRl3Gh`U`PzRFs!JT4>ztA-cPyI zp%LA%ECHM_-AA2S&=LP%AbK_e(MN!Ay$^(&0FfY6SjtDAF9332=@cS7X@E5FJ!zmc z=w2EoY9Bd##P{+qh}xZt@;q4Ax(<;FmPiHn5;9PQM%^BzxkXwvM;fMSuBTDm&9IlF zOauF761D9w$*}t+9unn4_sTR<87M3iYNX-P2$}~8@hnhCH))hqEy!(OT{x!ZUJAjm zH^aUVN`j0%jOs3-ZLf^F+XhN45^7v)SSr;yY7KW8_R)$B9<@+2xCcyBKpOXnlO{Op z6Ab(DKK*$Q(e6>BeoCtiNK>>?2S9OvVb}-(dxheYV2+B}%6I(4r~YSgKzdesPMR*w zptJ8U4oELDY-6|y!@&#(@qF(v&&t87mY}v!)u;p~QiJTaW(~Qy^b&>KTzWOMO)Nqp zK{p3JcylhlZm~3)fP!L>l1Qf#5_w%CE{Sia@_~T>`EgKMgDP7>A`iNGnXRw3qv?QC zj13~355rg}Ds5wgsG14Vo2t8b>g%+Y?{RC{9ZYLW~cM;}| zDXfCp;6YwMl$N6r(nsV^X$2G!p@b-{mexogOKYWd(t1cutI9;40EQj5nTdUdkUwzs z(d@0r&td*YgthK3duhXQg;oQkdO-0#;2q~g2ZI)&CQl}<}%q_fgF>AZA7x+q;@IF;c{hQW-sXSfT)-5LIX;pGq2i2?mV z>8gWIe+VLgjx@ok^o9~}BJ7|OCE&FGVwG9?OFG?%Ra+U(07BGVATdXIR^-Zdz6Z%( z^MJ%SB|5Clb{*J$AOrqqiTU12$SgjUOG>K-!i@PJs)0HgGUhy;i*)Ax2~T0kv^7|_ z0}N*akN9-&2lY32E~oaPDImDBTIbHEfX+i&@1&|7!)+TW^`l1O?-&V~6m29O#7H`7 z+Sf3UxD?Ry|7j#PF_JLp+`}X3tc|1-$eE9%(qe@@seE0v0@+~mQ3cqqT2u<>)o|V( z_NTVDHEU#*9z}VSrVTn+deA6;TxdhrhItd8DzqW#zm-9kESsssD(22TsVAP(}bznHhN!oi1_hfi6!%M*Ik9MZg02UuV7Ql<6)-UtIVym9NyVelL;Gd$;^Ii+g{KTmKjN>*KwpbJRrtwoxBgvF2J z;bmNcR$Kdj3^jEny3)p>CQv@o8ESIv&S$uvhzbEQ(BJoe6%gu5w17}o%cCM)5f2D; z;{`Cj?*;hVM+^G~IKn>NM6^ryB*VZY2>S*VI@F8DcaES=#|yE#Qclf-t5kwh&pGt% zc_*ia2z@IM)+dR(!vx_P<6=3_{&fK=Pxq28uaUw52c7__aqDA&wN)+XwiVVv!7%*+ zwHIW}b&&CvlZ>H)4A_VYp++jWixfdc3LO0x5esy^?3BpS}@GPqUy zSgu6F87^}w5$JyD|4xateIHYFUkD{yCX{H405(EXq7qGs%AHEI6_n^(hDQn|f}P@) zvYg6dTT&;esCLik&?zdhA!%?b)sIku*6q-(X1J1*_~;}-CkWB)X+*{$K}OYmWQ>Bb z-$U3rIzBn^Q5tg0p&`FGMN}g+1lE#Z`+1xeMQ|^f#KXD&(9^TJzW1w09T*j^r@ncG zqwTgL%^BH?ZNorkYG9rHkqYyhLt(BusTrdw%-DMh6ZfFP{9mQAx*NKi_bE$1-QP}S z;i@r#;qgw@0E0O0f2SHZH2b0_LMB(aYUsgs1F(sjOvY-eG0CACdKa`yZ)O-w4A_^+ z59)#50vV(3rrure0pu{O!t5jue$HYI;c?tpm{=*b;@2rq-z zv@fd>>*A1#b*ag-!)g={EP*!Igadg8*gioUu$etFpVWZs!yApPr5M@M_l@kCVc?=2 zPTAJ%5sIdd(L}3{cZznZCfaF@d`Im6mu&UP`jq=*o3GDoEZgY}Kj)M!c)Dl*SF+V7 zJ7n9Ab3h+2WZQ*d05(J8z%)&^&pTz?6=Vwz_yr-`nL};OknJG>_X6*sPvP`D%6sVZ zwMnT5{{v1I{?8JVa<-TS3EX4AQ!9K{#&b{d@3T^0sOx|Ktb7SPJfD@G_q<0<-OyUT zs9E!<8L2OIkTSwa$}57DSA_@RPCik@O?)N$zX%zn8*o1%uR)x_331CQE8>y!f4C9- zScmGseA3wQx~4jF?^y-Mc8>qYs6#(luimFQ1NBoHYYw>2H=UX@hv7H=cbcPZ{hFeG zUTDq)p*g^R05(t4oVl9jyzSJSS3q-sFYgG=d3QiZcmS|QJO=fU{=5l}La*xQ0bLBX z`99iF=mi1#`Hj#+XbI>S+=qT)eox0L_9N2y6v$TZrSq{u)>=BB0_B*8@_7AnX}W%e zkn|Xl$Gb+Y*Xp-{DDkKUUDIjnTCu}*OTeW30- z(s=E^@yfq`voreEf1}^3-$p0ux0A*C?->5biST!ZFEjibnC=w}UlTF6{s%r)x5JhD zVs8CU(k1DVeh-hiS3(Xd{$Fy$-1_~z4|tPR>Saelpg*ktS$_nL&>tm#>W}G<(`w|c zKcW9cza4%~=}+s==+ElUk-Pfy`U`M=Nq?CyghCAoHhA#VnrGaV)fM(?ej>`!o$ZCN zI@_+itcqWPW#rEA$XsPP-|f{SuSS$K;9_6rMF5~3wi#Jl!|-Y`L>T27hBq?&3Bwl{ zK5cPl7y<#fcCn|$(#D36_`D8(;iK{6ci6856kgDu1Da2Z#?S>00LDhpM2-D0-dp-V z^|xX37Hr+p|D`_wKX>$Z^><_>W0}a5?}6wfDr9g34@mG)z)_L5dyCM*35-x9mgi$bN7XAP3Sh`qOf-+(fp~rQ|LsJ9tXIGp5nTf_`PiwWYv8jpv#O z{J2EQ>qb_zsRM^QFfA( z`kzviXxfu))y;@bin zw~UjA-z$oLqZQKKw6=T;otXNX6e{Ja#d6iXO?vQDaU&`7(K(5AY|hl*r6!uEhkCy} zMji|5qwe6r`&!sO=^1jjwbgK6ML$e-R_A|Uc)Lc3HzXu{Z{h<*eT^P?_IrWMP&Sxg zL5DV#{!8M|$W!F0@-!jw>0IJM20wssGsO&3v)P9`88e)hYgglstnql#y3zpVg8R?`mdq9 zE6!f*;De!Uw{UGgz-c`UwD#sZ(H>3dmWL>XgnBD@S>DCg z!cj=I7eD6g{y);&XdcKr;^J0%-0>d#oJHBwt@~7;J~h{8>J-NIs$&HLwuQ5J4*hx72K-$@i{%SW+JOq^{X=3!Mo^(Y1`hfj9lyi2?kPaYRry*Y{AW1+?8;f27(NScmzXdi zN<6~Pe~Y1~@PaL@IcfI#2E+uiCpZ)JGSuhAllNLP&LN(kh#^G5Nt8%6MJSsly2FZ$ z{I~qiBKaSUb6{vSnl*lFz#N?*?MX}Ez+g8yU*}4IwMi}qzRty=IrYRbA*A63EKN7i zMse{~5f@*1C@vNT$Y7vs5xnk2Y(I9a$s{HxH(rw&G|ZuuoVtc}7u3bzCbsKC1p6mn zcIh`vd*;8Pg~8L{rLD~T#qeF;WFPG42QSZe#v1$#{;;3_q9KT32(12AVg4jA{10sD zO8`+PCruhKti#BvS`m>pfF!#Oq44~}6?G#c2p)mh)2|ZNgF00g3o7*%)0S06W8h={c~>0gmEQW0cZaL%KH3 zHjEfJI0zn`JZo5AYYenC+5lT*0jLWH>OYWE*cNsu)HHf_6NcImn$6_R%rMlGu)Be` z(^d-GmGURNi|-AI&Ng(@i125`)k#Fp2Ef{CdIJ%3mZ6u{99~Oc(VANX6SSR}Vh4Id zYjVwyueEN$h&yjRM6`W)aCD|&2yY4de~Bk=I8Zdyh;D#KUo;eJ@DL;3yx9QJOf29x zw9?-(4A)w%WyDvbv4O9`S>C6Rx_*W#t@&t1{I%vDPBCbsx*tApcr@9ozr#5ksD1%% zbO3)toa5OC?09qe5>kRA3butl@VWVybsWf~+cFS!I zUrB+wUicNmH-@c-ZNv+8(e;CTaFgEkZSW-XbiK*%xP|@>*=o1}kKk?5-Owk) z!c!meq3))1TAw0aAlK*;BPB!mdW){F8Uc|l>>O{ySKN5krOr@`U=@g$9!ab^l#$MA zYrc7f41vAT`D#nPPDFZ$^&>kJCq+;^1*$V@Pjv_*JsIh(4rZi4ohlY=T~r^~=m5{m z_h%%IZ{#82>f?;q)p?9$G6Kc2C>6>QFiA?G@~ytkNOO=sgxe%hY+cDydowbMkr9k! zsS{N&ZlguM4ShaPnW%y6hn>qAup$njQx`^BGLphb7d44*wJB9cLU~+m$_NahOkKc8 z8oYf9swSCYsSE5w8?{<&i(diH9>p^JmkQ3V5FW;XD#TiK9V6}4v8t~qdQOK*fjUct z^$aM>rb7KrEVs2#Pct%9eMMWI;&t!8Ma9PG0#BCmH4;aC->9Iq9~xF0z5toNgy$Pp z8omPAp2Xgm083!hg7R23pR) zi%L*B7?WG^Z=IS#r{>O1EqJHLcqhAamDScPx6)AzHb!ZCtF)a}SbK0h(-_NZN*sbQ z38Dsg*bClnP^U%!OGyMTE{Vbxi5$pnolScO!Vsu4@>Y#EOc|3K7SxOx;JV@63>n;W zdqXPrz?&2JW}`+0YF+{7H0gabnw-^dP7}EUlxWp$PKWW|*zh>8p_`Kp@th3_ynS!J zV3Aw%Z@u6J3`Xq*48ZXu-Yc2+DuqXX3*q&Y{Jj`$Pz|s!@4+`F0P~E4oQ&i0N_DcT zZ!bGvs{el+-;n#?Hy})#aU`f3n4)!tZHD89b707(;?ZDk4&od>5kXE_d_EA+{?0II zALlcyi`x3WN@61(i+4{vz~eUm&12EUI0d*hP4E~nwc^~$=G-b5uPL#^t3CN5K3~`` zg5R8Lk&kA=|46{2^;L8;+%UfGWV>-57&+3O5&rHBhnlv7)q8k~5Z;5<@E#50yT#?MxHl^Rbr?Ky$weNCmbpvg6Lil$z{ojs&&$s^@&JP0Y{0$Ixj#{Jf z3otvpMBp?#U!k?j@g|Z4j>rp~$RA`Y8A>`B-r~;7utFUQW}0*d!&<6VtLxNP)EV5i z3o8yL``=VTJe2-`N)$C#iAM|af7|T=!y~$p$;Q(Sg1n#>asRvkhPTcQxHpV}eF3(;s8oY&g-Sm- zZV9~3mj>Jym#7{Pg>Pd~H0ZTU6BirW(8^9RAe!GBaD&Y2U*uB0b|J8T1OPhwiVB88Ib|L)58xFk~{vUnO78h^>4!jVz z6o8{A<@frI?Az!iaPa0#=l&0u-cT7t8zG#V122s7;W5h)wW)e}2+T&UM@=JB@JMd8 za2e8o83-xEycxpIcDfr_!kcj~2yz3_76>jSEI|OfS!@!yp}(VRCtbk3Ae7wG}YKUbUWnJ`@x>e9Fa(#m zeBnC+rd%5y>*`cr2pc0n)gW?(co**S2BLNc2i>{;_J+nV`{8Xp&;SBL-Uk9@xE291 zZ3J&p0Jc(G*#vJCIKj^$-1LQegi`^)A&t&;G=w<;UEv162WSvsCxdC>i*joLTqdA_ za%M882^tD?-1J~OzypGZ1A+)1|Gvc|MFB&=JHdBBZsHjEU~~D%NAV~g1`YH<)ICDm z-o?T57BEDBErQuiJS*fghHt0J=ba&T<;rxGD^o9E`#gM#u7X`D1N9!T6LKcb(e>pS z6Rfr$fPABwKE<$-T!)O~sxD8uU|0e>HZPIir8e|MOmGXsSD;)23?JiFW9 zja5*ESPBmnT%@yft6@h*f5QPONOuz=<89IzI$Jug-wu_GIs8deJs19Ny=pjV_(D2o zcu7|RYSl+-O`7UTK|Q>6{qTG-*!f^~FN%FLz*9&_QbDp1?^kpFe=o+m3Zi>R2;lu1 zagcEE2>*ykV7h~l8Q)a8T-^-$0*DI&ZkUUSLJwXBW#STOA$G^*foTWf4TmH_$XO?L zpn5=FA(#qDQHt2(KVHQ1St9%K7kgD#fY`u9z(c7*+POTzc@x5W9`(a^Rswkka37=s zs_Vj&ntmWqxHuZpElnb(jzS`)PNvSLE~dv#T}|Cg-Az4AJxw{LTvIPoo~gH~kEt&l z<(vAO2ABq#2AKw%hL{RWPnZf#Lrq1dVw2r8%v543HI+fD5vFp}NK=KW(o|&{WvVvS zm}*URrqQM`rm?1Rrtzi;rirFWrYB94O{$5Ro-#cReWsYEnx>haH9cpVZkhq-FPLVU zUNp@z%{IMcdfD`f=~dHfra2}shQNRcj7(%?5+hGCGMN#T5yr?AjC{h#r;Kc1WTUwL86%%F@&zN1mcsn{ijmEXe9g!fM!sQWDw55SCbjA9E)?G+d6#J&x%r>Rn2T>SkbabN^Woh^4j%M_4Cqk8H6 zM8@UwER~n7G+OpTha^Enqmek+0ixw_!9JP}!?VIrN4d)V#1ZEdJq{Oj9q44(v8x_+ zUOdI;?RqqWT!HX=D!f5;m2?T5>~p-@gWiRAqJE6#V~I4C+hK16E*9RP`XPFrTt(Bt z?kxeQ>M5Or_o==rcL3}848%*bM0F?$>P>Hvd9W4yIImlwsc1HOpLEdmhBvBi)p{js7XMD36Dlg;Ek?x z(M)j5dc29(n+&gj15<}Td#!mak)IUzM%xF?1C53H(So?>|c zi} zU4*ye=BwW7W5QWQsVck-SDg>ekyqbdO@M=`K*az`J%usf)X*Qjrv5 zh;;ep)Kql?_(WbugAy1xuED$z#$B0KR^wi-p1U|Z<1rYR%tT%u1AgkbcZR40!VP%u zE_k_Wt+>aR)u(7xI1#Sog6|fu=mjS_S~WQ4lKE{hm(1^&-!;!SFEB4OFETGSFEPJo zUTS{d{DJvH^D^^t^GD_t=9T7E=GEpk=8w&5&FjqT&7YV*HE%F)G=FCP-28?4OY&qE}?apcoYw#iW=OMR8T!6pLb2 z+!YVSQ}I%~6(7Y{@l*Vj03}cfQi7ExicJYoLX|KjTxqH_Q<^I+l*g2oN`w-rL@Ciq zj1sHFDe+2zlBgsp$x4cns-!9DN`{iDWGStbY^Al*Mro_GQ`##Xl#WU#rL)pSd0gqL zbW^%3J(QkGj*_eNQu37EN*_jkVB|+eb}+J&k)IgZ#o*B%vIpwyjO=4%KO+YiImpN% zMh-LbGb2YBIm*Z}MvgNA%Kr-^CmH#bkyDJEX5~9yxqX4kx>^$O^liuRTy<;)QwRKqgF=U8TDY)lTj~5y&3gk)R$2|M*SHLU^I}? zAVz~3ZNjLHQF#A*D5GJFhBMlf(PoS`XS4;Qk1^Vk(FjH(8I58zn$Z|WV;PNOG@j7} zMiUuLVl1SO=C2j(F{g28O>s}6{FdVwq~>qqiq>&$7p*-J22Xj(N2tZX0!{V zk2Bhp(Qb@(XS4^SJsHhmG?&p{jOH=go6$au_GPpmqxp>XXLJCg0~tIGLhMF8mM~h%Xc?o!86ClBIin*Ptzfj0(JDqqFfe^HtoSj@Hp^5?KP!ICif3A0x8mol z_ysEtx8i12JlBewT5>HvSn5{;=$`Vw>ep%WlgI%db{E%(B&r$69fj#mDls6_2#s zw&EU^iI#NB6)P^c47XySVz%X`rOL9$@~Y)WD}L7Ul%>*&2U(h1@eoTdD`u7(mY$Yx zEZZ%!t+<`#xaF$lgcXms?6vH)=qxWyvK z%O%TsE1qN7VZ{S2w=7*OO)Y(`c(N5gZ#iSdC6;Se{ETIn6;HMFuwrV(v6d}XJk)aC z@{{Ey%P*FrR;*ecw;ZzUx8gRI->rC}6-!neX2r!;JjIIZtaywSS6Dh*@eIo(E1qV> z1FX2U6^B~!I7_M(zhud=d}qZWRy^2>pRzn{#kE%asuhp6d~bQpQewrgSTS5IwBi>n z9##wk2PnfW%!;41c!@~H)kV}XwPS@|f7fAaT`i7dSQ&TqaP?f^>M5SD?9x{Io&mn| z2%gOLLt*eG6LIk9a5wnYfWD|04U@;hH^*$3f0l2-x4n46H@if`H@NgO3^$B|Z)thK z@TOrcEPU)V95S3R{AxI3IB&RQ_}y^LaKrGY;V;7-L%oq0bw&exhl<(gX0*chximAj zfNyh2FlHIM8oL|&8ViiWjicaOTeNR%S!i5s+-Te(zNO`q@vQN@@uEwhORP&F2U?=shAq00)FRW55>*1D{B`P5~j%jYg%x_srb)#Y24?_5s1+%^%D$z(CP zo0^#7OlhVJQ=7Ymp49@C(a8%2|Nv#40 zwH92{MsP`Afh*buF6c*aJ$u0A90FH!99+z4a4i?XrCc>%2d7~Gx8MOT!3PX_Hkj%{ z_}-No_(qi(@U1B?!MCK$g>Oii2j7k|AHMnIQ}|YsZ{gcacEGoo9ER^KIS=1H@)vyb z$X!>xtFLQ_YYW#5*PgC}T!*+m;X2f{&h<&xr(I{d&T(Dty2AAn*DqZUxSnyn?s~)Z zmg{Xdf44xlU^kmvs9U&OGq()4Ot%hh{oMMy4Rb4X8}3%__JZ4sZnNE9c6-%rj@w+f zC2sG#EpuDp_L(_Eh{XmEE_CaEL&j?@3S0$>GGH5AIn`UvJ$Ig z)mwe6{?;I?%^GHnwx(EnT63*KtyR`)Ypr#(b*y!+^-b$M>pRx@)`ix^)^*lTt)E%H zv~IQ@v>vwpYW>Z6#T~m-cb&WJZgg+v-om}5d!&1`d#roBdl&a!?$z$K?o-^Sxj*MV z!~F&KkK9+fuXSJV{;B&$_s`wGbpPJ{NB1-Cx7=^L|LuOqz23v-5$X}{(afWTM@x@L zkG3A2J^FhL^cd_>;8E!Dl*cn3Q$3#bnC|hs$4rko9xFXQ_xRG|E03=|PI;X1IOlP} zO4Jm`7Y^Q`9u&&!@yJa2g3@x$H&XhE5Iw$tCd%4 zueM(8y*hez_Ui7{(<|R=h}RQdBfToUMtRkEz2fzn*Xv$yc)jKIw%5B}E4)^DZSdOe z^}W|YuftwPypDO*dt-0vt@D<>jov12tG9=Dpm&&eQ}1~1MDJwpRPX-Y1HA`(7kC$X z7kS>G(;I$9hlje$IQ2_ag5l-b=kd@c!QWNAI29yS(>!@AE$3{j>K`?=#*Py)S$J z<^7NMT_5BV;uGf6)Tg=6V?Gf+Q9iAG+WK_$8SGQwQ|?pYQ{_|b^RmyYK68BL`n>5g z&*vSVMLtV>R`{&-S?{yOXRFV*KHvFV^ttTwyU$gh>pnMpZut^l$yf39_4W5{?)#W; zgm08@58oW$UcSA3`}*el4)87W9qT*Acbe~WzB7E6`F`ZP(s#A*$G+=)Kk@z2cbo5C z-~GM^eGmKo?R&?!-VggxKb@cKXNDIMHS=rX*U~T2FW0Z1Uw^-WeuMoA{0jYw{Oo?! zesz9h{U-QL^?TNDf!_+hReo#y*7_axJK}fD?}Xn;zf*o^{I2+2^Q-sA{?uRR-_k$Q zKiWUmKi)slKiNOkzoUO=|33cx{QLV4^jH0#@_)vEs{gb8)BT_KU+n*$|HuC8{6F#E z;QzD#QUBxqzxe;^f7<`7|KI+10)hfs21Eu#2gC;C2IK|w3FsHlKVV?M;DEY-F#$6I z-U@g-;N5@)0gD2b2doHK74S{Kj(`IJ#{zBy>H`gdra&doEwDvkVqkV)*T5cuIf1~tPC6#SQA(mI5u!X;H1De0+$4?4E!{3Q{d*nErDADw*`I|_(R~1z_USy zpunIOLGeLZL0yCT1r-Mk3n~p79#kGw5mXga7c@R-R?z&Qr9rEL)&+eMv?1v8pj|tpL@8(=H3mD#FolWfy% zuiNI^mf6!YQWRnjDG3=KQXWznQXNtgQWr8dWPHfe zAX+#}pS{IT%3@QmD|7s6i*e<}R+ z@a5qjhkq6Rb@(^o+rqbp?+8B-ej@zW@YCUE!>@$j2)`A6JN)maQqzE@K~0;qyxj6; z%R3R4h=7Rjh{qz5BQhegB05HNkLVjw6frEKG-6c5lM&M*W=DJ!u`*(H#M+2;5uZkU z7O^kV78xJeINn}}Mb>x`H@sX1vCr3UNIW6+p$Qh9{BWFdyCM%q z{u+5E@_gjQ$jgyeBCkdM5qT?0ijt#TqLe6)sOC|zQ5jKLQ5~bYN99E2MfHu!k77~J zL`{o&E^0>9%&1vWFGal?^=8zTsBKZ-Mg0)9BWhRFo~V6M2cwQfosGH_bt77e_Kj{H z9UGk$-8H&2dU$ksbY*l^baixH^vvir(c7ZGi~ccsXY{Viv! z%+8o&F~7(B5py%<&zQes&9SbrmRR@LfY_ke#MmCOePXL)>te^oPKbRnR*iioc6RJL zvGZd;h+Pr;MeOm|^Ra)#;W!$ni<9GA;ymKK6xTyNwbn(PI@ir^`zxVE0fkFtxNheX=Bosq(ezZl8z^xOgf!( zF6m;@Z%J2^{z$r&bUWEQ*)KUTxk<7uIV`zZa_i(7$uA_&N`5){)#TTc=O(|E{7&-x zXU#gvy)UQL;k@e3o0PUB z?ftZ6X&{hO{5j&Zk{U`#tSi+V!*>X@90$(&N$-(v#9t($mwk(zDYC zq>o7-pFSyFO=s!Pq)$tKH~nJz<@77**VAvL|CxR}{h##u44gqSOc_c>dPY`8>x{M; z?K3)Mbjj$N(IaDE#*mD{jN*)u8I>7hGbU#|l`$pb*^KEK8#BJm*q?DIeMVVO-cTVy6>_R8#&nV&f@b5LeM=FrTEncFhA zXa116Gjmtw-pqZO2Qz=pJeqkd^K9n%EblD8tiY_`EL&DsR@1EJSuL|tveL7%vRY?# z$m)@mlhr?KP*y=!Vb+sbEbE!9X<5%^P0xBEYf09&tnFFfXZ@J#>T2DKW}s;bost!A})xz%f}=CpdF)x1{gvT-)e z)@K{DP1&y5ZrSeHUfDj`zS$w!Vc9v^dD(rl^RowJ56&*gF3c{@9+h32Jtlj6_LS_I z*|W0eX1|?1KYLO3lI)$?yR-LYAILuRe`-4K_o%9cjT#Is(xgfaaB0#)uL9HO%*>g| zK6B=jnLVdu_FDbhiDhr}RWp6@>2`@_5b zi?xQF8}i4Hi$ksqxnq0X*4#G0HpphPIc**rXOnD-ZH#T4E!&o3n`E0}%d;)Bt+1`K zt+st{`_Z=EcG-5#_NVQ(?VjzS?TPKFt;|+oPqtUJr`T)QTiM&#+uJ+ZyV%q0{p#}r4NW4dFO<0Ho>j?WxlIu<$>IhHz>J03VwoQ<44 zokN_j(iF}-=W^$I=QihVXQ^|)^RV-%^O*Cr^Q`lt^NRDj^QQBT^S<+;v%*#1)zbAZ zS3B3+uFkGBm+FEp-Id|8T*Q^>de=3=mF>!N&2}wv{p|Y1RpcshZFik^U2@%WmARAL zDeju?I_`SzhVHlAZg<3;;m&f8ap$_{xEH!txi`2A+=cEE_fGd7_g;6Yd%ydz`orR(V!?)_Q*Q zZ1imM{N_36IpR6yIpMkIdG2}PP4V{i4)6~0I=o)5-y87q-gIx+t9r+J$9pGwCwX(d zQ@yjipLz4WtG(ZQ_j!Nw9`qje9`l~yDsh#$YFtgOF4ur-$Ti}caLu_koSk!VUe3=2 zIlyULHkZRq=5o2I+;naOSHKl=CERvy2e*^k!|me^a<{pA+(YgO_niC7SJT(g*Tt9S z>+b92>*EXfLO#JK`Xry>%kqu%jrP6oo8_D9Tk9+EZT0=?yX|}GEAv(OUiy>#$^Pp8 z8vZu^?*0LOw;%Y&`p5ex`X~8w{Zsw3{ImV5{OkQ2{hR!S{zLv7{s;c@K$SqVK<_{} zAO+L_4Cnzf@NQsuV0<7qFgx&7;OoG$z|VnAfz5&9KuKUv;8fsD;C$dh;8NgOpgiy* z@RCpBllfYFW4iz7F-$pF1RMRIk-P~Ab2=iXe=}n zQiaw+TcN$sQRpnB2|a|~LSMlqxCO5O1R`V#?+PP?(ZX0^yf9IiB;*Qt!Zcxquu51h ztQCF~eiAkc1;S>bSU4|S5H1T>g&V?6;kNKhC=0g=cM5k2r-gfjdxiUi`-KOD2ZeoM zHJlMf;jHlR@W}A!@a*u<;Z5Pfa8bB8ToT?E-Vxpzz8bzBz8St9z88KFeiVKlE*G1K z&BRo(mDomXCw36~ivvYfjES0Ph#4Xhhl*L^SK`;=Jn>s`ftW8Y5|@Ze#h=6?@u+xQ zJSCnH&x;quE8;crhImuFBi<7qL>fn$Mw&-bBP}DXBW)t>BJCqw#2*Pp(j(zl5?whm zJTfveKe8Z_A6XPx99bG!9$6V#6*&?)7C9ODJ#sd3K5`*)DRMP(H}XPbn_xk|`x5Bn_2_#H38=3+XHAYiXV|Us@pLON*q%(ht%msaPtJ_DYwf ztI~DprgU4nE8UkKN{^+dQkhgCy_A#W*X7P~SGk+qL+&Z}mix;60y$q^EH9Op%PZyYal_ zN*$%HQeSDLv{c?!x+y)BUP>ROpOT>L zusiGp`@;TkARGj3&;i|$gMJu<0ES@%$}kG!(0~bOK>{;j790jgz)^5490w=Bi7*FF zfgixBa0Z+OKZ2jYIq-A%CHxxBhYR5%xCAbPE8ur<4O|OB#UV>NPb@(T|4e!B+@G*Q5Um9N#|1Q2JzBaxtz9C)^FN_z( zx5T%_cf@zcOXK_F2jYj~N8=~rr{ibi=i?XSSK`;>H{*BW_u>!ZPvXzwW$}vmOD#!D z)~aaLwHjJ&?M>PwgVssws&&_TX??W;+91uQIW>>w(*jyZ16o*< zG*ydfnr3Q9!y41FwBgz)ZLBs<%hul4CTY1^o;FSUMDMNl(+BEOdED zS&!;*-Ov;IP@U@k)`#gM^)dQ5JzLMwr|5b5bbXdSTmMx5T>nb{M*mjN*B9%{^p*N* zeXYJu-=G)hg?h2RRo|iS)=TyM`a%7Oeq2ALpV80j7xgRpb^WG(N58K>(x2*OdWHVd zNHUU*sz!=Y)2L(AGa4F=jb=uw(b{NhbTB#@U5q|PKVyL5F(L*wMjJWC2gV#@p7E`* z+}L1jG4>dx#;?X{O=gZV$C!EM zZ1Yp|GjqPVz|1$7nCr|!v&h_K?lDWvN=E{UAO%HH92qEqEJRQy%0k1@NHhkGL)jDJ$x61WS}9gd ztBzIIYGA!(HL;posa9*Nt<}NmWOcQ=TRp8lRzGW?HOR7APRnEYtbi4=1S?`GR?N~Y z(@MP3MiVR3de<6ZjkeyiCRp!VldTV|Y1RyDmi0M)9aq8CaSdD>*ToI+TevB1fm`7= zxIONOyWnoPC+>s$<9F~7?7(i!;Q$U{0Y|WcV_3r`Mi^s;v+!^{3XjF(@kBfc=i;e& z2L2F#jOXAl@LW6(FTnr7OYm~M3a`OG;PrST-h?;fEqEK=iTB`r_&0nAAH^r|X?zy{ zfiK~!_y)d(@8SpeF@A>2@eBM9sYEK1YUB-4i@ZtdlSZToX--;_f01_NZPJ;fkshQs z=|={V!Ng8n#7q1nNB|LuOrj)C43Z#22_^p~!^lW7hKwWGB!^5Pd1N}7MP`#v$>-!N z@(uZx1AAUQ&glT+jjIZrNvwrJ!x;+j}D}RsEsZx(MrYCw>1_Hb{fvG= z=hAQJe7b<<)5UZtT|vL2Yv@|Kj{Zb{rkiLXEutlK8{J9w&{Fy<{f!=^hv_kTf}Wyh z=s9|UUZPj&b^0g0Meopi^dWsrpVH^_FZzPMWUsMGESXhd)mRFv!D_R*tUhbV-eOHz zbJmizW^Gt|_BQLxy0UJp2kXW9vH|QJHiX%ki+Pxj1z3m)Ok^@sS&YS*&P;~bD>(&Y zubS_}*vMC9lX0))6*+7Q%VX2oO!g7`n9X5du(@m=Tfp+!Vz!hmXRFv6_5)kTHn0L# z$coq&ww3K*yICpQ&knG|>=--APP4P@JiE?ru$$}=d(57)m+YU+q|B7e+OPfJDpmR) NYc=>E|Nk>v{1;HXNR9vi literal 0 HcmV?d00001 diff --git a/macosx/English.lproj/Portable.nib/keyedobjects.nib b/macosx/English.lproj/Portable.nib/keyedobjects.nib deleted file mode 100644 index cdb138437f7d03b6883816bcdbde0352ef57edd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34398 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 Z&ri$$e>r)jN@@RlHS7N0|L^A4`5*7rD!Kpw diff --git a/macosx/Portable.plist b/macosx/Express.plist similarity index 90% rename from macosx/Portable.plist rename to macosx/Express.plist index bb5a8597f..7dbd1012e 100644 --- a/macosx/Portable.plist +++ b/macosx/Express.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - org.m0k.handbrake.portable + org.m0k.handbrake.express CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -17,7 +17,7 @@ CFBundleVersion 1.0 NSMainNibFile - Portable + Express NSPrincipalClass NSApplication diff --git a/macosx/PortableController.h b/macosx/ExpressController.h similarity index 94% rename from macosx/PortableController.h rename to macosx/ExpressController.h index 6ebcfa8b6..040728745 100644 --- a/macosx/PortableController.h +++ b/macosx/ExpressController.h @@ -1,9 +1,9 @@ -/* PortableController */ +/* ExpressController */ #import #import "hb.h" -@interface PortableController : NSObject +@interface ExpressController : NSObject { hb_handle_t * fHandle; diff --git a/macosx/PortableController.m b/macosx/ExpressController.m similarity index 98% rename from macosx/PortableController.m rename to macosx/ExpressController.m index a807753a9..6a56072bc 100644 --- a/macosx/PortableController.m +++ b/macosx/ExpressController.m @@ -1,6 +1,6 @@ -#import "PortableController.h" +#import "ExpressController.h" -@interface PortableController (Private) +@interface ExpressController (Private) - (void) openBrowseDidEnd: (NSOpenPanel *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo; @@ -12,7 +12,7 @@ @end -@implementation PortableController +@implementation ExpressController /*********************************************************************** * Application delegate methods @@ -213,7 +213,7 @@ * Private methods **********************************************************************/ -@implementation PortableController (Private) +@implementation ExpressController (Private) - (void) openBrowseDidEnd: (NSOpenPanel *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 240f92229..d62cb1f21 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -9,8 +9,8 @@ /* Begin PBXBuildFile section */ 4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; }; 4D1EA2F60993B0CA00FDC1A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 4D1EA3010993B13700FDC1A2 /* Portable.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA3000993B13700FDC1A2 /* Portable.nib */; }; - 4D1EA31C0993B24700FDC1A2 /* PortableController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1EA31B0993B24700FDC1A2 /* PortableController.m */; }; + 4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA3000993B13700FDC1A2 /* Express.nib */; }; + 4D1EA31C0993B24700FDC1A2 /* ExpressController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1EA31B0993B24700FDC1A2 /* ExpressController.m */; }; 4D3ECC2709A4917000B2E45F /* WhiteBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3ECC2609A4917000B2E45F /* WhiteBox.m */; }; 4DD93F8F082036E8008E1322 /* Controller.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; }; 4DD93F90082036E8008E1322 /* PictureGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D85758F052B78E300C39CA9 /* PictureGLView.h */; }; @@ -70,11 +70,11 @@ 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 4D118405053054CD00C39CA9 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = ""; }; - 4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HandBrake Portable.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4D1EA2DC0993B01000FDC1A2 /* Portable.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Portable.plist; sourceTree = ""; }; - 4D1EA3000993B13700FDC1A2 /* Portable.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Portable.nib; path = English.lproj/Portable.nib; sourceTree = ""; }; - 4D1EA31A0993B24700FDC1A2 /* PortableController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PortableController.h; sourceTree = ""; }; - 4D1EA31B0993B24700FDC1A2 /* PortableController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PortableController.m; sourceTree = ""; }; + 4D1EA2DA0993B01000FDC1A2 /* HandBrake Express.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HandBrake Express.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 4D1EA2DC0993B01000FDC1A2 /* Express.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Express.plist; sourceTree = ""; }; + 4D1EA3000993B13700FDC1A2 /* Express.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Express.nib; path = English.lproj/Express.nib; sourceTree = ""; }; + 4D1EA31A0993B24700FDC1A2 /* ExpressController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ExpressController.h; sourceTree = ""; }; + 4D1EA31B0993B24700FDC1A2 /* ExpressController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ExpressController.m; sourceTree = ""; }; 4D1FD381073D19CE00E46515 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = ""; }; 4D1FD382073D19CE00E46515 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = ""; }; 4D3ECC2509A4917000B2E45F /* WhiteBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WhiteBox.h; sourceTree = ""; }; @@ -120,8 +120,8 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( - 4D1EA31A0993B24700FDC1A2 /* PortableController.h */, - 4D1EA31B0993B24700FDC1A2 /* PortableController.m */, + 4D1EA31A0993B24700FDC1A2 /* ExpressController.h */, + 4D1EA31B0993B24700FDC1A2 /* ExpressController.m */, 4D1FD381073D19CE00E46515 /* PictureController.h */, 4D1FD382073D19CE00E46515 /* PictureController.mm */, 4DF3C8CB052889CD00A80101 /* Controller.h */, @@ -163,7 +163,7 @@ isa = PBXGroup; children = ( 4DD93FA6082036E8008E1322 /* HandBrake.app */, - 4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */, + 4D1EA2DA0993B01000FDC1A2 /* HandBrake Express.app */, ); name = Products; sourceTree = ""; @@ -177,7 +177,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, 4DE09E62082038A400FB751F /* HandBrake.plist */, - 4D1EA2DC0993B01000FDC1A2 /* Portable.plist */, + 4D1EA2DC0993B01000FDC1A2 /* Express.plist */, ); name = HandBrake; sourceTree = ""; @@ -195,7 +195,7 @@ children = ( 29B97318FDCFA39411CA2CEA /* MainMenu.nib */, 4D118405053054CD00C39CA9 /* HandBrake.icns */, - 4D1EA3000993B13700FDC1A2 /* Portable.nib */, + 4D1EA3000993B13700FDC1A2 /* Express.nib */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, ); name = Resources; @@ -229,9 +229,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 4D1EA2D90993B01000FDC1A2 /* HandBrake Portable */ = { + 4D1EA2D90993B01000FDC1A2 /* HandBrake Express */ = { isa = PBXNativeTarget; - buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Portable" */; + buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Express" */; buildPhases = ( 4D1EA2D60993B01000FDC1A2 /* Resources */, 4D1EA2D70993B01000FDC1A2 /* Sources */, @@ -244,7 +244,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INFOPLIST_FILE = "HandBrake Portable.plist"; + INFOPLIST_FILE = "HandBrake Express.plist"; INSTALL_PATH = "$(HOME)/Applications"; OTHER_LDFLAGS = ( "-framework", @@ -253,15 +253,15 @@ AppKit, ); PREBINDING = NO; - PRODUCT_NAME = "HandBrake Portable"; + PRODUCT_NAME = "HandBrake Express"; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; dependencies = ( ); - name = "HandBrake Portable"; - productName = "HandBrake Portable"; - productReference = 4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */; + name = "HandBrake Express"; + productName = "HandBrake Express"; + productReference = 4D1EA2DA0993B01000FDC1A2 /* HandBrake Express.app */; productSettingsXML = " @@ -271,7 +271,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.yourcompany.HandBrake Portable + com.yourcompany.HandBrake Express CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -361,7 +361,7 @@ projectDirPath = ""; targets = ( 4DD93F8D082036E8008E1322 /* HandBrake */, - 4D1EA2D90993B01000FDC1A2 /* HandBrake Portable */, + 4D1EA2D90993B01000FDC1A2 /* HandBrake Express */, ); }; /* End PBXProject section */ @@ -371,7 +371,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4D1EA3010993B13700FDC1A2 /* Portable.nib in Resources */, + 4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -394,7 +394,7 @@ buildActionMask = 2147483647; files = ( 4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */, - 4D1EA31C0993B24700FDC1A2 /* PortableController.m in Sources */, + 4D1EA31C0993B24700FDC1A2 /* ExpressController.m in Sources */, 4D3ECC2709A4917000B2E45F /* WhiteBox.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -447,7 +447,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; HEADER_SEARCH_PATHS = ../libhb; - INFOPLIST_FILE = Portable.plist; + INFOPLIST_FILE = Express.plist; INSTALL_PATH = "$(HOME)/Applications"; OTHER_LDFLAGS = ( ../libhb/libhb.a, @@ -468,7 +468,7 @@ ../contrib/lib/libxvidcore.a, ); PREBINDING = NO; - PRODUCT_NAME = "HandBrake Portable"; + PRODUCT_NAME = "HandBrake Express"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; @@ -484,7 +484,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; HEADER_SEARCH_PATHS = ../libhb; - INFOPLIST_FILE = Portable.plist; + INFOPLIST_FILE = Express.plist; INSTALL_PATH = "$(HOME)/Applications"; OTHER_LDFLAGS = ( ../libhb/libhb.a, @@ -505,7 +505,7 @@ ../contrib/lib/libxvidcore.a, ); PREBINDING = NO; - PRODUCT_NAME = "HandBrake Portable"; + PRODUCT_NAME = "HandBrake Express"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; @@ -519,7 +519,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; HEADER_SEARCH_PATHS = ../libhb; - INFOPLIST_FILE = Portable.plist; + INFOPLIST_FILE = Express.plist; INSTALL_PATH = "$(HOME)/Applications"; OTHER_LDFLAGS = ( ../libhb/libhb.a, @@ -540,7 +540,7 @@ ../contrib/lib/libxvidcore.a, ); PREBINDING = NO; - PRODUCT_NAME = "HandBrake Portable"; + PRODUCT_NAME = "HandBrake Express"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; @@ -693,7 +693,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Portable" */ = { + 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Express" */ = { isa = XCConfigurationList; buildConfigurations = ( 4D1EA2DE0993B01100FDC1A2 /* Development */, -- 2.40.0