From 7b0ce2dae1de402fa371933b3254bf19b81a89eb Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sat, 2 Aug 2008 00:07:34 +0000 Subject: [PATCH] Added settings and sources to manage and fixed a few small nits. --- Cydia.app/Repositories.png | Bin 2455 -> 0 bytes Cydia.app/{ => Sections}/Administration.png | Bin Cydia.app/{ => Sections}/Archiving.png | Bin Cydia.app/{ => Sections}/Data Storage.png | Bin Cydia.app/{ => Sections}/Development.png | Bin Cydia.app/{ => Sections}/Games.png | Bin Cydia.app/{ => Sections}/Java.png | Bin Cydia.app/{ => Sections}/Localization.png | Bin Cydia.app/{ => Sections}/Multimedia.png | Bin Cydia.app/{ => Sections}/Networking.png | Bin Cydia.app/{ => Sections}/Packaging.png | Bin Cydia.app/Sections/Planet-iPhones Mods.png | Bin 0 -> 2097 bytes Cydia.app/Sections/Productivity.png | Bin 0 -> 2872 bytes Cydia.app/Sections/Repositories.png | Bin 0 -> 2621 bytes Cydia.app/{ => Sections}/Scripting.png | Bin Cydia.app/{ => Sections}/Security.png | Bin Cydia.app/{ => Sections}/System.png | Bin Cydia.app/{ => Sections}/Terminal Support.png | Bin Cydia.app/{ => Sections}/Text Editors.png | Bin Cydia.app/{ => Sections}/Themes.png | Bin Cydia.app/{ => Sections}/Toys.png | Bin Cydia.app/{ => Sections}/Tweaks.png | Bin Cydia.app/{ => Sections}/Utilities.png | Bin Cydia.app/{ => Sections}/X Window.png | Bin Cydia.app/Sources/apt.bigboss.us.com.png | Bin 0 -> 6405 bytes Cydia.app/Sources/apt.saurik.com.png | Bin 0 -> 1952 bytes Cydia.app/Sources/iphone.hackndev.org.png | Bin 0 -> 1655 bytes Cydia.app/Sources/iphonehe. | Bin 0 -> 10770 bytes Cydia.app/Sources/modmyifone.com.png | Bin 0 -> 3285 bytes Cydia.app/Sources/repo.smxy.org.png | Bin 0 -> 737 bytes Cydia.app/Sources/urbanfanatics.com.png | Bin 0 -> 7057 bytes Cydia.app/Sources/www.zodttd.com.png | Bin 0 -> 2482 bytes Cydia.app/{home.html => error.html} | 0 Cydia.app/manage.html | 114 ++ Cydia.app/packages.png | Bin 0 -> 8884 bytes Cydia.app/sections.txt | 1 + Cydia.app/sources.png | Bin 0 -> 22251 bytes Cydia.app/storage.png | Bin 0 -> 14343 bytes Cydia.mm | 1805 +++++++++++------ UICaboodle/RVBook.mm | 13 +- UICaboodle/RVPage.h | 10 + UICaboodle/RVPage.mm | 8 + makefile | 2 +- 43 files changed, 1319 insertions(+), 634 deletions(-) delete mode 100644 Cydia.app/Repositories.png rename Cydia.app/{ => Sections}/Administration.png (100%) rename Cydia.app/{ => Sections}/Archiving.png (100%) rename Cydia.app/{ => Sections}/Data Storage.png (100%) rename Cydia.app/{ => Sections}/Development.png (100%) rename Cydia.app/{ => Sections}/Games.png (100%) rename Cydia.app/{ => Sections}/Java.png (100%) rename Cydia.app/{ => Sections}/Localization.png (100%) rename Cydia.app/{ => Sections}/Multimedia.png (100%) rename Cydia.app/{ => Sections}/Networking.png (100%) rename Cydia.app/{ => Sections}/Packaging.png (100%) create mode 100644 Cydia.app/Sections/Planet-iPhones Mods.png create mode 100644 Cydia.app/Sections/Productivity.png create mode 100644 Cydia.app/Sections/Repositories.png rename Cydia.app/{ => Sections}/Scripting.png (100%) rename Cydia.app/{ => Sections}/Security.png (100%) rename Cydia.app/{ => Sections}/System.png (100%) rename Cydia.app/{ => Sections}/Terminal Support.png (100%) rename Cydia.app/{ => Sections}/Text Editors.png (100%) rename Cydia.app/{ => Sections}/Themes.png (100%) rename Cydia.app/{ => Sections}/Toys.png (100%) rename Cydia.app/{ => Sections}/Tweaks.png (100%) rename Cydia.app/{ => Sections}/Utilities.png (100%) rename Cydia.app/{ => Sections}/X Window.png (100%) create mode 100644 Cydia.app/Sources/apt.bigboss.us.com.png create mode 100644 Cydia.app/Sources/apt.saurik.com.png create mode 100644 Cydia.app/Sources/iphone.hackndev.org.png create mode 100644 Cydia.app/Sources/iphonehe. create mode 100644 Cydia.app/Sources/modmyifone.com.png create mode 100644 Cydia.app/Sources/repo.smxy.org.png create mode 100644 Cydia.app/Sources/urbanfanatics.com.png create mode 100644 Cydia.app/Sources/www.zodttd.com.png rename Cydia.app/{home.html => error.html} (100%) create mode 100644 Cydia.app/manage.html create mode 100644 Cydia.app/packages.png create mode 100644 Cydia.app/sections.txt create mode 100644 Cydia.app/sources.png create mode 100644 Cydia.app/storage.png diff --git a/Cydia.app/Repositories.png b/Cydia.app/Repositories.png deleted file mode 100644 index 29c9db0df918020bcbed2c016ba2c1f91d6edabf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2455 zcmV;I3263-P)D?Nz4yAWJ`6KK@Sgt3e%LE3|M#u$ z|JV0t5$7B}Z(KNg_60rFYAs2UDgfW8KZ2a@)BA=DO<(FM{)!NmoH(Yb& zmDkR{WN@I|*Vi3H5h!DD#-QD9H;%k>6E#@F3I!fd_~O z@g6V+)H+Z?Kq&_gI0&Vn^uyo)uyW`Hq_3E!a{`lj=X`04oud_{?HqHEG zg??z&+I4H|%~PNRaMZ$KO7egLgm{1f+y{twfGCL(rYV9r250Aka|6B8^Izd*K2QFpN)3=2<&G z27^XYsg$E6nVY6*cl0S_w6&;ID*TSy@3A$fW;a% z$&geimdqW5=?FhLc4}95SKrH(uC6=?0yyWWbFL@Lvc&*~dU|?#$(buS9Ug$Q7S=jg zXYtOv?=@C_R_z-1K+E?9!1Fn;`G{i%V0 zMLW8yRYnNuGRBmxwIySWs#GffNz-(DyPtlw9Bc%!IW6iyT0}J-C9|k&(v+2M6DpJ$v>`qobqS07Ov~39Yr|oR4d*VYG%2Q=nOvBg--rMUEoR z(be76A184)=bR@|9L0nHgmExJKnMZn9AU`87{IyDIp@Y&3jo2y#KeJ>D_6>Cne#k< z(>eD|&N&xCNNatg(aHcg6h#iL6tvbb#=$uYV;!O>N;wZw3cy+C9p@bEjFoaeWh#sZ z@ZN(l7CUFzbWc^Q)g?Q3?wo1$X0th;QW_a!80W0r=?HOhOyJaHj&?goQAkKBA+>^3 zQ(uwi)>>=15Tes;)LU$Du;#o6qh}^t7$AycD5U|A-l7maNs?sNTFja?Ywq&p%WoSQ z8QE7Zm#fQ{FJA?~bUK~1ueYZ$IoX+;+Y^{89WHUI0L5)(}vbn zEj9FtXC4`_*)%W_rJ-1}8wOD&V@fLI#K<6Qp0Gx5~ zUV|_TAsRSv;J}WVS+INeKVH20nrjZrG5==@^HAO;e0YTd+*d%-;aOlw9|GxFs$d>7xGvl}@ ziqp%Mefh3e_wE}`;`pN(0I<%%IR`=rNF0F#46ZGpq(u=KXl`JY0#^z|X(+8Bm4ams zj7sZIGYZTt1jH{X2E z#KeRnz?5|sIfRgqT0=+)Q4~{C&UqBhK`9MW284U~!Tz~Jq_x)!5E$c6%l%v&Y!zhJz)XgmqJVY|zCPP%U;n(c zRIVDMeY1YLK5=5~*wN$14;()+`p;&wdFZp|{9FXi4$e6xghT}J&U diff --git a/Cydia.app/Administration.png b/Cydia.app/Sections/Administration.png similarity index 100% rename from Cydia.app/Administration.png rename to Cydia.app/Sections/Administration.png diff --git a/Cydia.app/Archiving.png b/Cydia.app/Sections/Archiving.png similarity index 100% rename from Cydia.app/Archiving.png rename to Cydia.app/Sections/Archiving.png diff --git a/Cydia.app/Data Storage.png b/Cydia.app/Sections/Data Storage.png similarity index 100% rename from Cydia.app/Data Storage.png rename to Cydia.app/Sections/Data Storage.png diff --git a/Cydia.app/Development.png b/Cydia.app/Sections/Development.png similarity index 100% rename from Cydia.app/Development.png rename to Cydia.app/Sections/Development.png diff --git a/Cydia.app/Games.png b/Cydia.app/Sections/Games.png similarity index 100% rename from Cydia.app/Games.png rename to Cydia.app/Sections/Games.png diff --git a/Cydia.app/Java.png b/Cydia.app/Sections/Java.png similarity index 100% rename from Cydia.app/Java.png rename to Cydia.app/Sections/Java.png diff --git a/Cydia.app/Localization.png b/Cydia.app/Sections/Localization.png similarity index 100% rename from Cydia.app/Localization.png rename to Cydia.app/Sections/Localization.png diff --git a/Cydia.app/Multimedia.png b/Cydia.app/Sections/Multimedia.png similarity index 100% rename from Cydia.app/Multimedia.png rename to Cydia.app/Sections/Multimedia.png diff --git a/Cydia.app/Networking.png b/Cydia.app/Sections/Networking.png similarity index 100% rename from Cydia.app/Networking.png rename to Cydia.app/Sections/Networking.png diff --git a/Cydia.app/Packaging.png b/Cydia.app/Sections/Packaging.png similarity index 100% rename from Cydia.app/Packaging.png rename to Cydia.app/Sections/Packaging.png diff --git a/Cydia.app/Sections/Planet-iPhones Mods.png b/Cydia.app/Sections/Planet-iPhones Mods.png new file mode 100644 index 0000000000000000000000000000000000000000..e64197088103944cb50d806b9dd6158f73aec174 GIT binary patch literal 2097 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 GN&f@*jC^bW literal 0 HcmV?d00001 diff --git a/Cydia.app/Sections/Repositories.png b/Cydia.app/Sections/Repositories.png new file mode 100644 index 0000000000000000000000000000000000000000..bed4a4a10466335723384c0e902c9414b1b8eef5 GIT binary patch literal 2621 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 literal 0 HcmV?d00001 diff --git a/Cydia.app/Scripting.png b/Cydia.app/Sections/Scripting.png similarity index 100% rename from Cydia.app/Scripting.png rename to Cydia.app/Sections/Scripting.png diff --git a/Cydia.app/Security.png b/Cydia.app/Sections/Security.png similarity index 100% rename from Cydia.app/Security.png rename to Cydia.app/Sections/Security.png diff --git a/Cydia.app/System.png b/Cydia.app/Sections/System.png similarity index 100% rename from Cydia.app/System.png rename to Cydia.app/Sections/System.png diff --git a/Cydia.app/Terminal Support.png b/Cydia.app/Sections/Terminal Support.png similarity index 100% rename from Cydia.app/Terminal Support.png rename to Cydia.app/Sections/Terminal Support.png diff --git a/Cydia.app/Text Editors.png b/Cydia.app/Sections/Text Editors.png similarity index 100% rename from Cydia.app/Text Editors.png rename to Cydia.app/Sections/Text Editors.png diff --git a/Cydia.app/Themes.png b/Cydia.app/Sections/Themes.png similarity index 100% rename from Cydia.app/Themes.png rename to Cydia.app/Sections/Themes.png diff --git a/Cydia.app/Toys.png b/Cydia.app/Sections/Toys.png similarity index 100% rename from Cydia.app/Toys.png rename to Cydia.app/Sections/Toys.png diff --git a/Cydia.app/Tweaks.png b/Cydia.app/Sections/Tweaks.png similarity index 100% rename from Cydia.app/Tweaks.png rename to Cydia.app/Sections/Tweaks.png diff --git a/Cydia.app/Utilities.png b/Cydia.app/Sections/Utilities.png similarity index 100% rename from Cydia.app/Utilities.png rename to Cydia.app/Sections/Utilities.png diff --git a/Cydia.app/X Window.png b/Cydia.app/Sections/X Window.png similarity index 100% rename from Cydia.app/X Window.png rename to Cydia.app/Sections/X Window.png diff --git a/Cydia.app/Sources/apt.bigboss.us.com.png b/Cydia.app/Sources/apt.bigboss.us.com.png new file mode 100644 index 0000000000000000000000000000000000000000..8c79a38db9706aea63976571ce3fc9371ded7fff GIT binary patch literal 6405 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 TcQl4m00000NkvXXu0mjfA~hBp literal 0 HcmV?d00001 diff --git a/Cydia.app/Sources/apt.saurik.com.png b/Cydia.app/Sources/apt.saurik.com.png new file mode 100644 index 0000000000000000000000000000000000000000..f2bfcab3cf1701b8c0d25dfa57b7ea6e23ee8947 GIT binary patch literal 1952 zcmV;R2VeM!P)Px+T1iAfR9M5smu;wJRT;;B&$C|kKIhzf=iV7-6ip!##Y6(L5)rIGVQQiwg8a~j z4D(A=G!;rOph1L*jNylrtU>c7QV2}VBFZu{(o6}GsZ7j9n`yi=_nv$1IeV{{rw>;} z9n80^^=0n`Yw!PWJT!Z_~%ZzaJjns zjz917`M(0N`|>Zk&GSp=`EGni+wIf&*s*zGiA{q!7Dpo%0)(bTG-CpYtS916CuWyV z^7{S9pZn$Vnp1GojW_7l#iP!%^@Drr%46!%m^tkjsnKX9h~WGHd;@-f#33}Jp^stb zLa^JHV*J?Oetc8kJmxoskFgLethbH-MnjG31`za$jS@4yCDgzIr5C|yh8q941 zzX)LnVFb+_66cXP8VuX!;^T&+PagWoH{=xq-1W;}pVsDdrA?PdZ7vLC%CMPZ)HKY; zNUK5&1Eh(Vf+#>moCgiy0)&8s7Ku@ZgYa4Lqj$U_fM4AEz+hXP|B9_FpXj2o6(BORl3Xl-*F{gmXBy0$aBHCc;Kn45&AM{;AuOIo309Rdm zjm*dPb9CziO=|?3GStk1CK-B<(?AF|)@#yA0->PXA>)qM}TXEpt^FSq>g`>m6*-SPzO4$?5e`Hmn)8(V@3UIk?e zNiYXO0m)D*NQ-F&^N1;CdE=Sa5PHO(nX7TelYe}00Ia#P5SeoX5! z8b`R2a4sWtLrm0w9xDNpgyux8Ye?LJNI)iQm~*IlOg&P2s2zyMO2X&$urOXfG6GxY zhi#rL57lN+Cs-a+@)U0~L@Vk7lE;`D;v&L2wHB(4FkhiRgqVXcL{bF>D+VJx=O8wpM>cFN?yZB!Kp{fnA#VrwNyGJ4w2d*r69FJ^_WhP z60x)bRiX5#glEo$fa0*!K{u0rmhFfL>_4zK587cz8dJ*}t`^i1sZQ~>MiP&69+wJI zr{Dr69?~i{8zD`Dxm9ol@k6kNYKr6;B7tfG{S52615O7|9073X@bdVCV@7|VPp8!` zp=C<0iCTILL1c#71gT1F8ia(0f*~EKjGG(f4O*zjjh6Q;KF9sW=1mnW`Pu71}1ybz_1EK^?8{$+^R+;#8@586<&g znUu)5=dt}EeDlS6M*uwC`NxO7zrgo?PhZ_hRx=tZrh-im(A7fc1Fa>zdV&-Nw#HNn z&Se_cZdgstR4G&uR_bWqKgwv=doKRL-dAi&cYo@foxUGm7yFgXtt4rsqE^5vtp=o7 zq-lpNbWh>b5Go-kP6a_x6_Q1pu=wPDwqEqRynOf9cHdWDHUiJKC;Y;lOVe&w?Bf-o zrftz|!-Q60#S*No;08it13ZSyQ+#lkILibxM<;P`Qyqle_pju=S6p|b_{-Yz3qE?b zZn5roO;3L{%<@hzXiJb^c>JkFF691lDyywdA+;!j$D^Ab7@N}6!Afb&G m%zX5NX8OGw@14D#^8DWyC4j<{ZZI7H0000^@R9J=WmtAZeR~5&9=g!XTuI~Mx|8D?syS<^_Y`jrA@gm{jeISYmAcCgJ7fm${rh-}p zgr2YehKrSTtR5O#G0%#B)N1wJrBd;U#;*0w%g_ZND?m2{P;oz4(Dd1iY=W=6K)GBV z_B`+1%K}hasC}y^FnemdHz1~yJo}cekpiNU1E7}9w-vD9Klv6xA-LKrc+>9*AZkaO zJ>#9IkB@?JN&QdUMX+TDvg%sIcq8s>&nx%unR(PVma}+Tk zMi5Uae(u|tfsrdp?xL%UlTv67e2uB8Y3+6?biZ7fz3^(`*i*ztQ3GOJx#Nk0_?y3+ zi{1R`c68=-vM$h+cMD<#RRyoJIzUO@{xd_SK^TTxi^bwmSVBPX1>YUzYzZFONgjTpn|BPRyt+3f+j!$nur6IK>N|x7#tjw90l_W3;Xns z&t$W9o$pGBhJ-JF6}vE%0r1v+8vm9DprA+r#8cD*JohYKI$ly53|UVN^c1ja%Q*n; zC>)QDJnaZG+DR^e5opX19lRfnTOIyBIgVL#6BHDDMLg|PPEzhY=}bsKL}~tVoa$Wl zr5u31zKR=>k|K-GMzgBenNzfnKAZs%Qy|#>W2Cn~P3~qY#Xfo-d57{Nr!x)7CL=;T zc?4_i9l0j-8y5(Lj@Y1>Yc>*m=6jfHHX?-*%b8TJ#lQV2+K0!SGAd|XbN_jMmu5J1 zR1`!gm&#-nh}zMndjbBopP+?aypMkov+h=+KRo87 zo6g)8L#h)8*8_eK{M}xB7u7}K&`YY3S-QqGw#2VKh=1o1#0%VPR$WJM$1gC0A0_78PQ_p8F^9$sgva7`~b0%%8CTI_}0; z_Yuu+-K}Ob51>}7rCVs)wsxi23nb#sByAx%`5bm?BIj24*yl0pZ$qr43Yp4rI=*nj zHjL*T$^i(1U|(_T4%Z}hN%M38&;*FV#-OpF5!j1o(RMTETKw#OwEW=?m70-H>F)jX z_xInO15l|{9_F?k={ijLYF2YW&B&)x5Q4-8rG&rbaZLYOT0h%{Hs>;5>Ai~5ozJ4h zen*+@oD=4n3C5T_Vu0D%+2hUMeMjdX8qxV(Yc-lUr0-`oYG~uRTeP-!SX&1lSkZ5O zd_?CTTC2&-X$`~H)@)MU00ssIw#2vZ1S^PDqThd)_|0Q(=`CX#E)X7i5WVmpBoUH- z93ndUI9fZuEPaLRZ{@u9QY@B^W|dm%7e&!#&+|^ycaFNP*mP}90&2vmTlcXnm0(oT zW=l(+Hl8G)Rxo=e>8rfYi6{tyzc!oA$12}{6B0oa&GvV-k_PKEBMA^2G%>C>62NM9 z48sa)1^>`u5b@_M5%?|Ly2VBu%iGSTa4(cu^nJ{T4f4QqAzz z+=$uxI)NVydtUxPx-13V7RT|1dcFQe>2C)JU->~wfo8|?Zl!iQldk#fUhp!rA6m!I z>eW|%FX*3usm>BFqQcQ+I8oU~A3Sc{X6<-MWjjyJjwXdVK z7>G$m8e0-3{seXgLxBu1XD1gAahMd--*k#U-T$cuFfsg11nMZoB=^S{gOP?dgMupr z%pl0a_tKhIK#)ODn1^44Ura=po8b)*%J3TK!oV-Wz|YJ3bm150;}aL;duq(z5|cFc zQz;1n*@){ZzWRsFrza^UJ1Epm902h4_U7>x;Bkf60{Fzl!~nef0Dk_LPZBRZd|aSF z*h?1==D#cXA3cg-4{M0M8`R#_h2f80pp~m9REmk|kD-62e{>G$_D@4D9{(WkiADen z=my~9;RXCt^Ak|=sZv}40tP}|A$qQ^PSStx{wsS3*xME2=)s`yMnLip@;`+BW%XZp zup$r&mVV+x^d+zGOI}euK2dQ&F>wKYlYhhiUFd(oHC#dVHa`CW=M&cB6BZZX73UTG z2mIfJ{sET+{2}7si1{1qfBN*l>i>U)fvo?@mzyWV>2I$EWDNj2ft|rFP>(0h`2LeK zkhQptE5sQHm9}>V+JXUYF1C_@e^vfJ+xPcYKe@$|TLS*+m;clBf4<89%FVxc|F5Y3 zyVC!rk>n)VgQti=^CvjGakYVZ10i6f|BJ__PrpKak|X^i_c!PMGi>zioxw=L08s$1 z=#br7G7=I4lB%Md9xQt}%RAeA%JaCRG;ekDMD0avnqE?;f>_A zv-|Ac>YOz_iHP12wVrC3`Ux6dxNH@kN-+B#IN{ZEjfo5CtC2Qu7b$Ru%+dFJWFTAK zm5=K5cCFC1olTy{wCm&LPscB9^}P}*1=`w>rtH*Vo3@DzT@B0W1`+$aOVSq}U$_hG zM5&B1j8Tk}5|C7VOG|%0k{Jdgg%B!f)RY#!evtL!ee`EpQN=(BX`R`B>6p1?QGPrx z-K58<`c7UhD?J-KH^-~qo5C?j0`RO7zhcv@yMLRQZe9sfHStA)th{`Zf%HxXF{X}A zJA{LU&s1--tcES2{#QcY_o4awiH?TypOO^#ksc91qX^(%F?W^MlV&_@qr<})*4EbJ z6gJPLvnKa~z_GS2{)S=1f4yQ_C8I4?lU(UA=9zX13=DkOX-qx@gcs_o2OdWJykHg* z65^2=DBb&(hdU~nU;f*2u?na_T$PfWOIOy? zGVfhg+Ys>eHdWarDmHcci$nBCX%a5M<>^Y~QqQ~g+HCP#?717`!A+)m{cm2}Amb)X zR2`pRFJy`2g9$NL*TnJb^}B0c$H<<={eD;uNgyPnIk~%!NTSlrVHZB;jl2pN6&!w7 z8F1(b{?+{sXD~y+7Nu=(+Rs1Q`e12+h!o|=IR}RCC~`~F@5}kQI4O5B#Kp1%$Yt<+QDL`B$k3*jG96wwU{@jGDw+58=>pi@P(@8t<8*^@8jx+ zhwVp4L3_Kq9G|vFawhzIeVLjLk6V88dw$)B=4H@f-^j?#&DY}uQeuqTeMr5mQ*_uH z6N-g$Dmi#XH&s)G6K>$3gQmg|6p9nLvTsw=W(|lCoJ?vc@rbbHl_`$hd7Wj0M5!RdRVq#`9#RbxG+zaZSo)H#adG&~ zccYN|YkSf%S>NXPkR$64U-&I5qu~3Lbb#@4ljn}>q#od{tu4x3vF@FBF5<$LO6)WW zI(2zHC<$ndn9~TdQMCc1`OZ#RQBrJ;as>qiU;d1XJC>=>YI;~R?ulgRJ?nkzzs45> z0;z(ho5`UQHgDfzP(^_tE>ywaBA&AvR${P#jK9@5?~(9{o6H;df4@FJTh&IY+>hyhwpP*Are>`jBHR#on| zYlEX-mVbetrTPi7vaz8`Nl7(ltFxv!2|J3$CE)fHHNrbR(Mxvwwh8!!1Y%=r@AGf% z1d#LMX1IWJI3IF|kR%;~hxe^uZTPDR>YaeZk&@sa(F6nANutvSX91J+$}?ncT z0VIyog30FWI$r2;Xb}axc?0}ebe2cn>#-t9YFdfe8Qt~HG9sD6>}Iuht0#-eOEl_Che{idmn(ovAm$K$NCF zmedvGIPqzGXCooV!km9$s*C9h;p*hx5_lhvN31ouiW8oSw^Q6phGK}xjp(YO<O6y9Na zA1@+zZq<9`%3NSfxRO$3@d!v{6|o*|h8;UF5s4t#?b~gophjY0piGK*zlF6@Ml@Ja zF4xFoBFC-s2uJ!$1Bxf?C!yjmjZ!U@aq?8R`^@G3}!gJ(?@Q962cz z=sV^aHjR-|U*Fu2P~JbJtQD#~+Y~@8`h4IK9<5 z%y_y}pwb(sj%yHP0{Nw+G)ztBO_6x9uKhtj?Dc$*^<%ZuPEe|_>Bp~0R6c!e zEp|ouv=wFBTz!V`SLw8=mbdrT>1TaaRa?m+VVuGf1Sl((iN;RfRqyHm90s3ns`L7I>8hO!=RVB>o zzS0^qvINuy&iO?}IV7cbCwF)DaP!zboU>{`?s|NXkfw)5VtW@5?lKqc0wc28y!wn3 z7M;}|iY%`;<_@q5EvK?;mTS_3Ywr}+D@y36j@OAu@y&R0q`dBBLLN-*TUg*;pP2aY z`bFj*RQe)U_@@E7Hknbac&`GzN#CJJ)`Dlnw^>;9MQEQoB!rnQ*~w{M-rPL>^pq4y ze-*86igDyu9P$g{%8GU9F-qQDH&FU_lPe)+ZoiJ{)CqwF=0&Mp@FQW zZ?eT_dg`)f&f|k>Qg&5gdr_r!7Hx@k+#%(AuGYc(*u86{jn`>hNN&qNNHvrN)Un?+ zfrCs`7_dUt#Yu6LXb@c-6ubNTMf(e4akNr$hBIO%Ha7hfXPC%z6B{S{%8lDc5_9bV z)D_Qr^!hwUva>dq<}MrQal@yZ1$Uz?ja>Y7)IwT(GIF_h7P zgzp>Mwu%TCHgojq8zK^RdFRtzElL-Zpazx!Oz+cDb(*p>b8(j2Xsf3shIe|=at{^i zaqEmw>>eH$orBo4vZb`NEM>|jX>jHwdB|iGE#6<@+%P?}@X4uN+@A9oo^o1%zKr@5 zSC(;qe${+4Cgo`F`m?jMmk(;r_?&;%+buoPKBYt#Y;XY^cQ865z8x|Soel|({*|G!YxSZ?y z=#BOF7covI6a_)EC6&uyb3e49n(K=^y3L2H^mN}0E1wWW$!{CqX=3%Ir#-*AUEZU= z)=ZrGQgI!tbuZ3Fke9zdHUV{NNwm{v&UE1kJE6yT`edhqfyU&!Q0y6w)mbpz-FzkF z;9B*S@+%cEKPk4-;3jdmXF|d$thF&NZ1d+%a|CdYJvsvI$@f{=-lRtil;Am1=B3*# zw;$Kqmq$`pwq)dn5NYPn6$R+0?}|k#ro3CHBt7G)q~UZs)J%CO2pp_e=P@j7=hQTB zjXNC>)66?ukJiXinPh4Fwb;PBAk+PjX4!2XL|d)+20c6m306U7h8*lXKkJ2$cv_Dc zM^w+`Zad9jm9Uno*luy8a1P}ZP}@bn*9NiZE9eM?6H-RVb<*c+e;1I+E6|2=kUL41 z_tF18Jx(0hZsKj|B&(3Hb2(nQ$-569ujcczXph~>q-9A4TNNM?1n{b}YY)(WFG+^x z94jT#m@xw9g_%i61ZV22+|8*g>BahHzf=Cw|D`^xHBnuSig1UW)`fk_j8thQH`WP~ zMh)Lj0FZW#xWkscVV4>7{Aub|bHWS-_Rr6(;Bz(HEUNM|c%=G_E9WG*?-B%KFZ?4w zoN8*;WDSc=$va!D4@cCMr+cRpf|IQ2qZ{nD6MD)$cG2BU=M?Ewv;{u;Y=`@BV9%EG z2eqCL7Y@)x7P{!Qa|co!us>bw&1af6{&!gARzN-TOxS*6Z`Ed2e);a&;qeRQbX#*ODo9(!j57oS?TiM9 zNow0Bzs=i!e*HE|FwHWMO6y?<{YMlzuGY#nzpPiZ@iz?du91^InMV{<)PQU$zc@QV z13ow37XUj-j7_Ty915NUz}6=`{qxRC=L0*3kIqw^7aG(zwTQfpwkzpxIrIy|nI|r{ z50`|+VcQ8gOqyP)OXE5w(vPlY-fiEVN77WBA4r4RHaRvBbPT_K44E~$h15B=+@unpHpYhWxd@|r*}w+=aPny z*dm@)2aXMx8!q=A#Xs@~o%hgJv(l_3=UwBCNL~=N|30BdqN{f{9R@6q%e6fse_D*z zUl^sJ_xtcHep%(9&GO?5iQ$s4pplCUQuvHoyEf=CW|U9(hw^9{wW`=Y?6#N@`yAi! zXi1%qO*GIYo7(&9n9*U;TO5qY!B+nh8hLg_`B2M8H~fwnkdwoQ=B+xIe}NiGK9XF% zQ1dyew=4eEM}M2A2-bHSYYIEQTaI^gvhdwi8p#$@m}d8wn4#Yyi4V*qSO@@|N%7o; z-ubLiNA|1Biymy6S_Zrix;`s{p&~oDG$ohqqSv#~JX|!0jOkixe00W3bDoQ{-=4ji zrRbNs6I|=`m`uaIUz74aAJ+ONtxK-)-Oh3 zC%u~k<;s;+0(eoow1Q)851ebyc#4!Y1Cp+`ZPeDB8Imi4*|&EJ3yZPm%c6*+EwQ*h zOYYnuMm19v>Nh2BG7CWkw5gPtZIzh1Y+@(zrM}hqFmAjv!G6`GN$6oxx>5L|Rbgm30SV@h7sL#u<0`Hf& z%4s-KMpmxaK@%Lees`ZI``y?`g*rV)R|M$ zJRiW~qU(uB(76_6#Ip)BtNezv+$9Tgh}i2s;tZ#_3EL6Ko+4Wuj!<1}V^S#MWZcK) zgV|C^aT&h7y8(ik6-*K6uPCS1_PVhddH8}U0cO8JjGKTbbE=5C35mjy%7Nif-9F9K zu!P6hpPl&mZ$zU=ShA!Ni4+QgcH(8EvZ^QA{lo0rW5$DNE>_^{xdiCGv!JelPhQOW??yMETQVFqoR!yfZmF+ z>>AuBW~x1x1L?C-#xW0Y)_mrj^~;o1Aw0pzkQ5FVKTH_fU=d~LY*q}kGvpy8>$F&w6vM3dn@0oEzlBWw=U01G7KaEB! zBKc{=_y;CIcTkp z=7=CYHijn6r%``XDjJ8*u2K{3=B%gmB|L|?@n|hDoMrXr$Xc7?#GdEEucLWh zl&RLUJ+AEA?!4N-9`U3yn%V)}W*4h@a)hSWDPTD;^jXkNTH{r2OOyXTWhq8Ur!WAy zlL<4zCLb|8=#@|;lE;Is}3!+^AGga}sQlc8!R5BV>hB^H1 zFX_~bXvSR1+fg_y<%Rvts{C^btSO2UlS)W5gbZA-U(Br;SW$*_dU7&+%KUaYE&-1D`TA*-aG8Yc+VJ6a_crbY3&4va8r7y|U*-{A`oBzGjo|dZ4(p zb|BLOGuD2vBbHxTORA~KK9)eNmcelQ`$MRWQ8=bW&2^81Pl5<%lfE z&w~wX{XDZJrdj!H9Pixc(c5DW7~n49`bU#$!+N;C*wc& z_&%yJCXoreAD}36cCf4_Hshzkz|t4M47b|Ip^27>FKYZ0t!|8>l*Bj0zwLM1bWrm} z@_I#CTMr$G!!q*w0&@?>d@zEo@tSE-7c*aUNdmS3-rD zlc$zaXH{TP`vvu++sdGq?v@Q&=C6pOlajZz1Q;GK^$dFlQo4SkQW6-4((W>SS-{1`*Q@t$K`Je}y>vAJghc;_^6JJK!SJ+z$8t}-s8sDrk^`{xe-J168 zpH_L?c?mDM)88z5^K(Dz&+~m(fq$Ry+5N?6ghYa&>130F*)e_L;2FPYTjnILknwDN&)LeXwumqk-q6N`>kc+Pw!XlThXqjkMU{aZ!j z1pD~f*0t`bc%Z0Ir*d6w_UXrdQ=Vg<7w*aD{5{*Pt!37V|SCD(mONTP8HhK3Xf zf063J3p50r3x6DDco%MTv+Ya$3_n3GjaG7ZBxSH9P0a|%0M~~Vow~_oqO>a5 zsZRO68r=H%71;GmMJ?hwQl06H{oEhMrC8$}3w&@{Kzhb~DKVnmB?kt??5B2Qre5YF zsdtr#S$#x@1K>xpxU6zZ_tt?$-1pB4`akY}USLXqL}dgAOLGIGX9!vqc^Z;b zlUNv4Q^*uBt8x4LqL15e9i-2jmYH?+do1ranQ<=(tVCvb_8;PeWo7#?`uXdf@-d_~ z$X}Bt;e0rM@mZHBZ;jZ(RKeUD=OH0a*FMClxwCtg6lZ`Nrx-=dCuGRmY-H}}+^p$0 zr+B^VYNSwQ^_PUV`|^qV9~^g%c2+ATEw_)^>fQR(Mb2*oQNtAOcZcqLZZ;`6$d|q{ z(#1zA7V5h4N=T^jq?s06CppbGr)b?*J`OKsxfYl~L{IjR2m6?+?Sx$HSAXEb91SQL z^__ypbbe#hV}Ed7@W;~ODWb~XWo>~ksq)gXBy%#Er9n8A-3t^4Mv~9T8!vCE?OaWJ zxGL#7x3Nwv0tA*#&qaGGBFZ2Rvx3#{0HpMCWEQzHx8ipeuv`*E9Cyh&XQBP`2q0lR zf=`1)HR)4X+3M4_gy={X8MpIc#mzNBW`NdvF*a=QW+_lyi*Eg-AnZCIuyx#kon37` zV7IL+2CsmdOQj~-8Kzy{_E$A-bV;EYz5`Kaw}nf~>TB%aQdae4fAR*WuqqBa^4bTK zhYd*yczb4SmdNSo9cf;9&_V(QPfCKB+tKU~eRCE}T5n}V6nPHV3-MzEy`crl3T_$EP z{<6XddA&F~3X(0>9|XnJU8497%W2+x|AZtBcXs7awwQB6sWO%ZrPY_voc=t142tFhY1GxxLrwxxWwV}wHv-zUZichAdx`>~9IJQ^CX2|mm4 zF+(txZSGoU8gWPKbMixh!HR_u<`Ukg-a(H-4{M2lvt5~c4I5kArIHO+4(#2W*YxYSjh^GUyx$U{)teGtC-|1IJcpedOyA}jA&?jJ{Ar5Ukx*>L zlc;x&+dT1J8Ja#&Z6CnZT;jeqs{=9yUJ1>dlv?_Sr%oG4pJyz0)#v1u-S>TaNrQhr z){($rwpy+ZA7oGUp+V?&Vl#=8~U;@8y>S3KiH{HAU+u9fD0O zdCW0q81sf2GmjG8&EZD+@-M+0BRngqP9IgXriUwbe5^y?Gmnv?Q@PQ~*|0`An|?5h z(E*28*k-TdxjTU9H+4gn3P=sjbKm;j=PC?KrJ|Br@hSO-BM1YB~oWF_|QdHDC=GKB>9|cuGz;Tj( z(Gc5WUA=;}>)E)NL-CIvC3_&z(pvZpZDE{GbKMKZ0sdn7xQX9IpI!bU0i?ptB$gSo zOy3^ki9n`u_ivU60()&`&h0JyPy5J%$@w&COwDyY_K3Qr&a#r`^`T?2QA`F73Zy8e9X}>Yiv5k{L)y z=n8+%0u;u^;yL#cYlJgR!CK`6d(7Z3yl5z9ymoR1jrs;oIr5QWxFo80mv4#`m}deu zybzwUq3SFl+ioI*@2L23UeM^2u#0j3MNAd_J%+|ZH!-6ziaKWfG%|{c4tF9FLD5Tr z`7|m{ZWZhzBJDhxL)^%if4k=Iht@d?; ztIC>8BjXu;zGy4vb2Tr=7~CAqhkBxeO#Q|!-6p@;v3d=8(NXjcbhJ1cu`3~ zPWeyr?rM|P2j1pgbIG2nANfBGGOVPB9F;AG>0kQ|wOKaZyy@KU93w{6?dG&dUwSl@ z*=^kvajm44bTyn2EDy+phowzVSiUGfd1m=Lhhs^bDe|5rM`$t$glYmgDGp+{inyG0OMJRp1*E1#N9&+{}P>~lW*^Ku(KS^nRRpWeUM)G?$jsV*R|9965<9uVJe zmh&u($o$DV2uWblaWHKd`%#_qbIY@rI7P_Zk~6lgmxFb+`NI%8tMapjJbark)g+_Y z8GgS_<53qo1+`7~ic$FT6;5AWPCj%W%g`8mD)sPKn@vs%mZvcDY;G2-8gu82LrL@n zQs?sR#LLTzK0PllXB>E4Yz5+TFeOG*b5MAEv_WLh>;nC(aHdp=F0gU+QH;B5%xci( z_)85wSu{l3>7zbq<4&wsl3Mn=0^+>PpS75E*ALAaM71wz-W99sWgh+v0}rl5j{ z`tlQSkQ}#9rLZ+~+tI-3S1C=iOrOmPgsw9EqqG~!4zf)+;R{t0cS6FbXf;c`ugKKz zjrK=&M(!?Qre2fjE^=st97KA~U4@}ZW>F-mWGNec(90k_PJ7oDvtG_kmWuQq9*P$s zvO1mxS<-?N@#R_a24BhMN@BiR5(yU5#(pMG@rdJoc|k{+A#ojl_vND3Js*b>$tI+b zP`;H6>C;B71_O#9QU$qbSOd@_(sgR;OS#OEvOa|+*OHzA_v3jU#VV7TAu$}U+jtOx zrK*z%QmV4*1xQyn!4zE*GvMYmg9EEK3uDz?YcN9qnYA~tI`$2p{|m}~SnmrE9OX!nQ|?N97q01qD?Ndg`#6t#gN8cM6)dbd_L9W?v& W%RAIcmrqBpkW`g472)!4L;nv|LELQs literal 0 HcmV?d00001 diff --git a/Cydia.app/Sources/modmyifone.com.png b/Cydia.app/Sources/modmyifone.com.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ca47071b27c39be199d6517f0063f640b81281 GIT binary patch literal 3285 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 TAhxgo00000NkvXXu0mjfU+Z5O literal 0 HcmV?d00001 diff --git a/Cydia.app/Sources/repo.smxy.org.png b/Cydia.app/Sources/repo.smxy.org.png new file mode 100644 index 0000000000000000000000000000000000000000..26c965508925dbbf1d3bf67548c53cae63470bbb GIT binary patch literal 737 zcmV<70v`Q|P)Px%n@L1LR9M69mOF10F%*Tr)h0V_6P|WPEXLg(g8k)UZ*gLkb?>W9c*RZv%{b!SHH@!~=v_7#L@o>Ok ztyU=V;?$;Hn*n(Pym#uo)f#f-`KF1NZg~Q&yY7V6o%1yiCR7UO7NsbAW0rm7gBKm ziY9qvk)w3*7}p@95%k)SC%J%vih`20q+RT#hK!mWDlRaik&uPusBITa*kgx+JJBA=W4-fM%b)q16QL0L+#i=-zuH z|1-t*YG*}R(QPWPhaU{h@_iwo0SS2}_84+7yE~$GSX~(p6D6aN+21WV+}mkuedkm? z0SoL;azYk3KHR4Y`QR368Sv4;6lwHLm`+9yD#oyiC@N`2J+<^mf(Ev>wXMN#TrME0 Teg=Oy00000NkvXXu0mjfv2$7B literal 0 HcmV?d00001 diff --git a/Cydia.app/Sources/urbanfanatics.com.png b/Cydia.app/Sources/urbanfanatics.com.png new file mode 100644 index 0000000000000000000000000000000000000000..9cf47c41476a0f9c4b339a614f31b497c94e4ce0 GIT binary patch literal 7057 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 literal 0 HcmV?d00001 diff --git a/Cydia.app/Sources/www.zodttd.com.png b/Cydia.app/Sources/www.zodttd.com.png new file mode 100644 index 0000000000000000000000000000000000000000..83a3b33bfb0d8c4a737af47de31255f8d6596bd5 GIT binary patch literal 2482 zcmV;j2~GBiP)Px;Y)M2xR9M5EmrINsM;*q0)!j4Q-kI5%+4a6X_S#@4ahwFl!3rQdAdCnSLOjGR z0wl165-GBjoH>PKE{>EO0y*V|B9UBUkckr{OqO_Yu-EV1^{!_hv)%LRp6Tv-aG2S# zLmXr%sif*hRekmSzyG5I57=IK;f0xUxqM=5Z0uM*pMRn_T%66i*)l+yBtf&)T5L6& z^NnWnT(w#~^ZM(ruRh4S;=g@7b?TI(lsYmtHg>X9Ed5}1?`$cb&u3iMC7a10EDHdw zHA#|?Bne>{rYpB^*Bi~|duwZJZ)&aQPMV=(9|UjL>-AS(d+oLA0|7XB z@}$V+a!-1m_xjk_*pbP}N!xK8*4NfpSzILYebROt$FdMYV2nXZNum@Yo5d{_nXFWp z*|iJTb=ln9RKD-ewcG9Io6Y7w-g@gT^MwFje)(k~rF=>V@y_`8cx7s8ioo}|dG#ud z)m4VGS-yPmAhQP!FgiYtlgR*(#xZLvD_psFksDX8(A64uWQ3W0``A^f5QZVuYW231 z@+ZK@r%#_AfN<^w(CKuZ6hgdHEEX%n!^2!zSYYYWB}&;W-#&4Ir@r}3^10l7O;*{z zpCiYPvA(jx`|rNX<@tFQHaEGmy2_!)A7^A_q;luZop*pA0dt>Y;MA#8Q}ufNkC{y7 z=>GltSzTG7y0F0X=qS%T`z)j5<5-S^0EGCg<%}_Ct8|J~@A$xxfCEC`rgp zPV(f@qpYv5vbAIaJTzD4d18k`!s@pdJtec4q>ZBb8CyJ(ZG))re|iTR;!aj z2+?Kxx2AAr9(0AU!OY&04Z6B85MynY=k3^Ca( zVXH;b=^%u_wk&MVBUdhy$!0$f!We{Qk)|oN_2#rD2gW9 z?ev=#=fPeq+!+{W0-}b5xdi(!0iin~Jr4;My>rXhfT5VQqO}E=c zB?;OXgfSQ)(A&q;8X*Kr*RON>x4*>_f{f?!N1S)<`MI3ej^brJ$efwp*O0gkgwd+Z_DrSJ}C9C&m~Y z$Kl-BvxH%Y?wd&5;~nN6Mr1!|2_a~=+hr$?kDLR0)y|Ge*l)LT!0?3Vw@U`Q| z@jMT$H5+SdEd2AIgH7&c8iDD*(^~fg*?%_1kR%C~);ds1^(NXjN^8`%g0)5~)mxsUYio-umoD**Z+(l04jtmkr=Rk{`|p1)Mr@C5$LX0w zDTEMO z00?0*Ha-rR!F#hEd;qmAJYz_dqEIRk$1zgM6gcNdDbGkL>roVqsdAZosYK}e40#@& z=Y7T#zWngROixV>+{IF!$W5QD_j?RH6}L^uxlLV@MwWzsaQXS3Ne zqDN!?clmt&m($bJjE;`7Fh5Uj#}0N)O)=zoccY!-462~})pG_&(-hT@1;!W}VMuj- zov71cX5T)95Zu0fn?|GY`!EcDCr7}BU{Bnh=z4d3_Y(lmV)kb{z}-`d%1_7mH-zbAw!8e`Z!JB#DG+*n-X z;-{Yyw%g=~hnbj~qBJ_naH&MTP{7-<11TlfZ{FnW2On_e>{&KyH43AnJbdsVNs_R! zu|d6Fza7W%&y-SE@2jIjhYktXb)O2u@EsvUrBo_0Jw46P&=5L3VI7=|CauKTkcJ9f;?&(E6&x|%)o&_h#6lDs5@c+Pd*i9(@3xm;#=cz953ZpVD< z9$iFHM7>_8*=!Pq;X3fP5aQLFH*Z$|=gaAV0|y)_pxb2o0>kpI{1_};dA_wE_3^$8)wF{RWKLWo(* wvdTgTwAO*vdeO41dEgvyW@TmNfv)HO1{LekGJB6bCIA2c07*qoM6N<$f^rD(rvLx| literal 0 HcmV?d00001 diff --git a/Cydia.app/home.html b/Cydia.app/error.html similarity index 100% rename from Cydia.app/home.html rename to Cydia.app/error.html diff --git a/Cydia.app/manage.html b/Cydia.app/manage.html new file mode 100644 index 00000000..ebda79af --- /dev/null +++ b/Cydia.app/manage.html @@ -0,0 +1,114 @@ + + + Manage + + + + + diff --git a/Cydia.app/packages.png b/Cydia.app/packages.png new file mode 100644 index 0000000000000000000000000000000000000000..404fe0cd2e9e9ec05ec309a9b2799b5733d68320 GIT binary patch literal 8884 zcmV;lB1_$gP)S&Svgb)LV7%)I+jRb6{`PxnmEzL6YqM4Cg+a0rnS#v{mv zV9SsI!?qyHuwQHlHf%k}6yP@-dN6E=Fd#n|reISNOba9hh>`%(q$w^U&27lpm)^T; zue;?I;fKieF4c9H>K@MAAGlSSk&%&+aZa2#an6ZIm}8DP=9puSIp&ySjydL-V~#oA zEf6PJ_K*MMxBr1{$=?-HE+7N~0Rn^&fIvv|A0eVN^5+83J?e>*PQW_N`^XnwP*3q$uljCa|KM4QheV_a{zX_wP#_?a@vClco2 z7(bEJKYm7B4^usne_m1_7-Y~vrcAEusQBoD){2AcS3mf(XI1A9zj5W;q`9VsoJAqS z$}QLGpDNYr9PaGV+S^BKh1YW-+d$J2f1u~*2|t?XaZ(?JIpUXPSea#*__{O+QY6F^ zaavMNh7m+2A2PY$cU^>(2@~|%EpEJd5#LvoW$@2{3gBQm@6;0fBp5&d7O1Be&zxg% zeGS{T+27h`@5WZ9cN~-W5%C13r^f^xB)l9>_)$bhWCZCTkq3SZxhIieu@K0VGm;Tf zCJ<8Q@_|4pg$hG@oeouYEK^)KG@A)pM{Nr6+qp0bdq*=!;NQb@{;I-ydiP_w_aMYY+)E*7Kgw;=wAUY{bmKa(d;PY*MqH7dVfB}j`K z(xzJHuIqtoBB6VH9w!r}2`$j^`}I90(f|-zphCr^mtJOZb%mwPO{A1byEHfNrcu6l zKk$9P2Lg;vFfmSq0p5Fl^V!O&HFFk;Nx$c^d}ad`D!T19z8|o9-=kP|s)oc38@G+t zqlUSDWh{HBhh!O@W*(6(K##nxBjwFhQlpjmPqvKcSnK?Gk{%yNM2++LZjZyQ8#sj` z^~FW%%gYcej*((mUR>eKO7+9Q7l01nrX@{=6JdZxt?&!Q`ck40sZb@oR@yeTg$11Y z1_w6}>D>4Ug<>JOc_hst)7V)IBW{||Pv4PkHNaD&m@J>Jhov9Exc!#`KfvvFIseq( z!*+_Oz$NfK5~-5BgQie#a(Z+5Y0MB%z~}+N=$E=RX3YQskoBdd=j>uR>B_x!n{uN@ zcHDPLb=>_+D7Q<`>lsNf(Q6!i)5xoXoN-$b`T@T0V>=FxR7f;dp@s@QLO(zt5*8Nm zu%k7nHcqeo+9&RP{P(}~%2zP-^QNiCtQkQ5kAL~}v(=^52BaFY*K=81U(1cpmQ%&= z?67d|0#2!V%YujYv}rJPF|(`3?prV6_YSd3HGA9;A~ zcbLIuCGM{{#?pb$OeELEDuP<)RZ zPL5edf4&o7oI<6ByMKe?=?e%UC|0YnMhQ9|2MiOG7gjj4zVI~gA29TrY8aR$0|>yX zHJi`drAk8VUb{`HR?B6x3Kg^l=~xKM8tC0q&u#j($%$?rfpN+lstXJj;8g1L_O7sa z&wES`Aqf2d%eK;?Af90e!SdSrgl zA1E)a^3nHge&~9Q7D&lHiB3mC^b)U@8;4oz<(zl2Es{d zGb;uVfNWHYzf!0+h_{_B@+PBje7i~)Y{H$Q%%x_Ii* zRMCUL3#c@jX{OlzZ50WE=bI7zSp=0P^0Am1hdoI_X?LvWEky-5jJ3Hq9kt=T)|#bSNlP>O6S&%Co@#B4vQFF$)F| zfK{)Tp0|tTB*pD^sbsYOn3IK7By>9z8;b}zt~Yv^C2&&o6*M9549;LiIT?;dq1xc! z%0=vwk(hR&fR3hqSyx6p6j-G)XV#ZL0+h&m2ghomnJ~b=`^O($sx}(WN!v*X9R>lV zYL#s7M}u9g<9GIGAGBzSEbx(OCnKRjAV2zQV>s z@5e6H1`3ho5ioVs*{pjeKF1A$#C5%hY|*k+@=1FV8ThwT|W9!5KaCMso?1&sx# z+Q9GZVHYZd?g5r#8-*}q34~}WjlikY*j#Bo4HQX-fw8QD(=vbntV*@|oMk(iq*RF! zLf};D1ifBl11RB?D+sJ9di#j?8?(HbTOcQ_hq*^ntThRHEs8Z`9(Rf*;`qVr@b0@k z$~B{KH%~3C{oPMIe$QvW^!Zve8@;NuP>*0IgIa{*@X#=S=JM-e20Qa~ooBD-AW7e4mL z&wlnx-_KeFZyy7!Ej6CcDt}pzA3(9bh~H@;gh1Lwg6<)u=JMznz)=d;Bz_=02H})z1ijY~R>@dU(dZ;{Bz~|)+IFNHXskk!ht9A4P2kg{3~=n(z%&dX0IOUo zKQH^lf0986tYQVXwHGl!8LxYQRjjdn@nTZP*>zN zmRTvFRb=mpbgJe;^TLylomu(T4=#;u6`Y0v|w-$Ce;62|GABiVVpw_V+;e6GJpVNvtIj^{>2VS1|bkufzaQ{g6pM2^w|C2Fd1t(R0hf(4o z6d5Oyh%D+t#sw#N;s@sP3XOwIoBGm<>R~8aoa8ILNN-RPlo}!;1GIV+BRAvrNyK7-}Nl;InrU^ zmeavW7(f74qh5I)9gZCT?dl>oU-~X8RMbx`A#Dd0czB_27CQjMD|wrLvTFu(9O9kE?hi0QOkf?cgwnbE@v&Cf zyehh+C{=5?-7ek31Ds-!Lb+_Fezt?#YMX$OcrhuG_;G_m^Xe=s1xO zS;=xV@sm0vYyHyuv%hrlXq-m!yaCxUjDy6$L39|&b*;_oWW{_m<+B`zLb*&B__TI* z(MlmL3*U1ol%knbJPZ_^TA^Tl?Q7qD=@MoLxMh^kBm=R0`pJi%MTMCc67S#fFZpxI+ywUsp!v_l?tOF#Frvs7?~eF62&<_mP67a zMu^MEFtO-kwp{(qZl0pIdu3o)7}`5xL|(5nM?Z6jM4}HZ zQ}o@F8JcoEzh7@iZXPuRh`yPc>7qhJ^Ycuv74fOoQT!ezpB5z6z&?#GIZYN0=KsfM zamG@uN~u!eU}u}don1gvuGNe*5R$dkrS~(&Y+zgl5P(&5oac6~U8b|Qk6m!6EiO`R zHj+%ey(>{;4(av%Izu+kh--;>9AKnO?~0FN@gDWY0kNMWewH!%>XNH73DNTFL{lb+ z32o@4Grc!UOcAMvS&qqEmqhCg#lX}r$1Ff?VF4ka+iKC-->0>=OR-#`vATW%6C@HZ z9ZPs<7{+A)30SS&J>gXAoV)iys?9j&FBWl8!zMis;>{uQT{vFRo9)4=)-U?XNXBfy zD39a`mL0#7=ZdtfY@V!W?w3+WBBQa#=Q{o$o3&#FF|Yk+^Tg?T#Pw9E%-*BYD#Z7q zs7GaV4-YuFah;v3S0FC|j|Q z=i-lF#E}Y2??2Wi5)(1NxyRqb8{hjb-@En(E1T!PQ) zds-=Ur={40&v&~nZ+-QfT=>8TIQz)svGuio8Z#2(P6Gvi=lPel3aJ!AmR1+I`05qh z-Z1Bm7~|J>XJ&eJoZpZF#{110Q$GJV@9gzFuDpJQ&GQ>Ls*P63wEvcbk1>%cSSgKr zxJT&rXe>4;mW$lHvPFHNPIIX-^1i8h=}&17O>dvJ{`vd&clO!7y3OeeXDF76s4%3v zw@s5$xD^WB{t7*a{bbE!XV_-+S14ZUc9u+>sR-A_Pu8*7EWS= zlHijENmSpq%CVN|ZT)T9G^|Nb3Z+`LOE*Ebc^61?woLLzX7CtG) z>|w&P(P3!Jz{sJu3u~O_nXZR#?RRzc;MV<1~}L`pxf$l_P(>oTwJ9f=yli& z_TMC(_s`rNY-XX!#zliKy|BDMx83E^tC!h4ztLAoc;db_?pkdekN8uF&Etq%VITGS z(<+tYWk0=A=c&ie(5%G!B@GsE?agaAMThls!`D<6>I>+Og2b?JYfL7C)zKoeTrIPC zeuJA=w^&$iQY=M20UgWOd@TMjoYIXs!*|YZHwlq=3pBhaT~{!0uwPnuj^iJ zID_;4VK243eu~yXo8YiRtx?TpMo38-Q4F_R?9Q@)ldy&=rMPkV2CJu62Zqw2Fy`Z9 z_kNgA2~;SgQ#i&;o9ng4gv#C>Bq*E=QI881Dt2$~9-sIa>3QYq&YPqX08U^C&{7L+ zJ4N~%_^{*gM_+!4`_C-!)MIA=s4TBjIknCg{@}AnOCqE|N}2J2&jLTazKDJ(rO--I zsWo`!xlgix={5Y$Aqc@&zki9BE^hO8o_&aVr7&=Bp;D*kUWp@aPeciff|XRX|4;tn zVb`PM`dr`ZfG{s(7fO^Gi*!3(q?AZYB5j$844NZ`)*2Nm!XTu+utc%GfV5KGWUuAY zaYGI}9*ydtKA^RVmB5qL0jv>goi>+i{H>4N7jdVc*X||PDh10B-;zkn9KVA)?rfkT z3_?N)rN~HTEXAgwKJ>sUPu#!8>6Kx#C}9e)(3~&>Xr)4wQVgSDT)8j^Q7X0-2ucMD z%eIhGVmVf{3-+DifMThL)fbkYY~tJpr4+6^)o!fEht`C)AoK+VCmW7t+NtbFR+^)y z&`PN|4)|oJfvy`Ip!AUU2qCa6D>V=iHNKRDVThOOap`-g zP~rK*NH-h!zRyt3fD@GhQpPqA5UM})JxY!O>6A(Km)tcvJR5$FY;=COUxDXiE}?C+iVB76hOq z2xW$VC^6m=21eT^1d$b0AAkIZ38#U{Va%aJ5QZw{SRIMA{@<7npB7;l5{_6bbxVf4 z4bYmjZK8Hdujyz-)lv1-2qF4s0Vg2=q)zPgLl_{d01Ai}?wIcfiHtrlM?VA-jh4ne zZPujc`YvPIM1Aj0e1IW2ReyOA0(ph2RMDs zqGVxbB;Jy*Va<_3o1sWcky|b%gg{zHhu<6C(Y*ZT^)@Fx1pLPDeC9{5|M{a>PJy5| z7=fgVhU3Lj6r;uG$s&?4lu%+7x+P% z9`*dI`!0KJ&k){{chnO2wngL%5L$EkzEoNYVRV2&WRyg796yoO0d9%OVgf;%K+3^q z7;!bot?&8JN2x5Xo8XSfBREGMTAM%^6)J-57ot>w*Yhb9jDKYm%x)n=qk(2R1SAX9 z;vFr9iKT4hO{~RsFaH4V`j4?}%lHB;Yc2r#ptUCSLjpgbzPe6Ka219~`{C^E_LKdD){21z3lK4YOr1fAvty0~S{r9jf7{sht+#T@L_{Ck3JB9k0A+@N zfu7z!1BeE)xaUiebq38jAcx3`tA#O}#}ZaL83q_7HHC2pahsGtEkvXTn5SpzF`Tf* zCm;}(z;YZ)4YP>RvTdwVl_(kl_i!%?sL)tW5osHPlGci3=Z)w+1Gkr~@gs@o>EE3L zRCt>rdZt9;46+1ihtBMHHWVVc`Ra}RHyI-$7^WBk3_(VCrv{QD@sH61gi`peU1Q(? z*xwrZkg(etSpi`=NZW~a9F2${#QyibGERnx%-($pje1+iB8^5%ZQ3Xk z4rciH=o)IR=y~2)5y3D810)TYsaNO+IDIDIm~-Q)pNywDVoG0t3Q*oK>sVC5;MTo9 znxMR`W+SnuG}&K?TbqG_h`E8=paU2|t5oE#7P$-Qwx$Nzs8*BE_nRY+)PkOferZ_) z*ZUEL>5t_KhAEUlg-*Wu5feD@0?J7oV2p^9Ga*jd{ekDmLkNg0W=Wb;ER60f8ibT) zSQ~R;C``csdk39w)Jo3J6=m1KkmcY2M3h@!5l^=Q$pj&uMOpPlS9&^$m3O>Ut=T2ad` z&^y>mUqFC+;}tB&Hv8o`R-`P>kwxqc4E=!e(kk(?fMK%~-M>i0?2&L=3_$=|2pz=) z3|7uAml22i=0s%v^=tog36MkVInA}p5Pu6KT7P^Jg@miIB7$KW9U!US5bn&xUJEiY z?W7z%p8*Ua8)cd6`NP^OV;zhwpF)lo5e!rL0*nqIh8c9SY4O{{Q=2SD&v~E^*)}@L zS=QHp+H7_Ar(b(u!P`xByHrP5Hg>s&Wjh3Jm(WWWqRQx6 z>OoBY0N}Ux8QPXQd#DMz2PaT_F|^47->2HBWt70gCX>|xj)ln?Kqwt=vD!aP@!E$u z#ShXU%~*qPpAs1Mj7KqO?~Tmk9SrwI3d_bWRmo8x<`V%{p@_6is8*r6(6_=kJ=S4J z=$g%(L-**NT$9b9kLV~`rDk}D3`i411j7_VfRw_l4TwKm7S-1&*HD4qr>A7*g1ITq z1W&(>&?><1?2o)2bSEhExbHl4-fS>ziJ0pKV@CwTl+!@16>P|A5e(CK164Re2N3wZcJ?&+m%h)@BJSOeVL?@i z!lx9rW9K?g7z8o7$Ljqs1p|EX%dh_E0}pHrM5|PmH|g$N&sH4}?CrMjT;FUIWy!fI zcnA`2U=VQk(i$-ML5$D~u$_F+jaK0(9pILj*cb4*Z@j$!+rR!)?t&14?)LRT(Jo-e zTBKX4M9ZA5H12(l3^dACs37E?5zP|>KBY>z@3uHjay%;_Os50r_SZ&)30gm}U7XW!^tqHx5(Dx}V^=%y=F+r$?xZt(s+Rovdj2RIO)3}2%k-?$o zW0x{xlzU>bX} z@-BgqtBHRRh=Yl+R z>f29;fcRo$TJK+0pZ8tdK0^?oUDv--s_4^kLKwJocdiW29FPB`y1*QRh?J{L`;3|{ zXNLhzyW@==5e!pG0EAAhfs8Qi##6y~7t@I*EAJvGowQB5CUCT}9C}@}R{Z4h&e##b zFr^&;Km}fo@HcnceC>O$^Yb5mkWw-AS!*;(YlPCE6++G90R|8a0jf_yj@z*3`TXTK zU*@rUH#ob#n7=VSIPqy<@-VFxVc_MI!2k2z*Lma04zFC?=FxlC6R%d!3$e7o(jYaM z4`IwXAPcQEfoBXsg}?;dX4~k-c8eEYy+)_!B@B>!`82l5-Bt+@YEb$4{L@cdpk66* z-(Aa5w2<*?bzL6^kP0jXQqAoE{VGgb~3owJ#vlS}Xj{Ax_17%}NNt z-i6U7mdSuH!vv%tr0pd~2-y z0MaQ?s4WrMU$F{B%8RSX^~5`uX~ikiH}AcNH(&S(0L_)m2fI@9asM>%;w0Wyyx>@`4K^&c=C~R(>!`&3>`-UA9wHiklaTjANqEzhXdfYTDkKq z{`9Lq#<3*-;_rVvmu}fM=N@^8H-GqJKqO4yw)XIXaH5D{n05$IB+i{Huf9&N-QnCL z4<6ZTpLpo(fTe31+;L;lRL>v0_sK`jVOhhcRF-9P{?Uhd!S!-sGUMO{U1y=?VFav%CcK0W`o5uZW9lcZAVDt1MZ@hM+`+Hx%`bR*3`Eu}B zGl5Bi^Ce(^@3rghYg_FoF(Gd3_g?vfZ(aK@Uwd)q72p8a2RfJ! z;2!Hsn3KvU2^4`QumY?DOF$inzil%2^qeddrq{QDUEq53+XuSQwOeAEAwU5hhT{$} z(j>$%#@y3$^3a&}Z)1qw0$dE?kNq9oX&4}k9@xSVJistR%m8xYAzxjiI_M<<_ zzxc_Y+DneCN#F%hS zQ5AZR1}|=~V@1o_!uL z9(>J%965TJ7!&h+o>J)@{zdcqGf#gW__M&&Wb-BBjGtKhxEI|pXnE6rcp1K$B$0R97T3LshDM{h+S|1{BOQ~*SF)v_SV0{=-=A9ku= zagC|RB69&$1t;LuQ8>kEeyM;{LDf(-oC+~CU=y|{fp2}ofUkL#gV-Xe!C8x=#W_PY z3(kJO5BzyEdmQ+=(1wE{1Y(S&l$h-^e~QWY4A}tF74KCjoKQOXJAZg?{J*~S!NWkp zTTNpQ(E_uytIp>cuS!!lT%EKWUhPrW0SEZ901@iC<;plQD1=EgK61WA1zs3K6wiNr zxM8_+I1Do=6<&MPb6}u=keurj!s047Gg3<5@DG0Q`@i8gf8#g4XSB2PgH2tNV)|1r z12Nfc762ow*pzT2N@u5j>I0j<^6>f51Ap`L2SCfkOJn}8k8koTQFPL*Z$b3 z8wzrB=`^$3xCL~3tAz#&6I^P)7^T3gnlHWgTeCW}O{J`&S^6||c%fk|| zUCVx|{yU@Y>ehs3cZ72j<6Y;BRveca$9pfr@0~X`>byNfGZ3S6uv7@86M7z&D`Bm# z99)7!1L4?EaVk8wBY1UyBC3c8Md7KOQF=j~a(;cA)a+m>0i62DpZe*CLp}bk6k0+E z%x?`@7;f9Fc2jE$ul&3Dx05AOijWeRA>@62-aj~1W`{D5|9v}@QNk);F)diTNMr;8uEYsLCst5ZTQ^#1!BQJ z`n7X>$rt>kACAq=mrq7JZ~wDj@#Xy1Z~YfsQIJw1gwWXuFLCO+!B3gnO-lE-%z&K` z0&Uygm6AP>lD#T~@QOk?{p$PgJN3d=e9ih8?!eyW)P8GUp;WyM0$}8o9~-RRK6d}# z{iTn+>r6UY#mn>y#Y71aP{*KzgWhxRs>@%LtaMdCoj{6gZbu&7Oo&%jJALH@R0I^7 z1RfzGqyQlq2&81Yo&wCgge(x&*(CWVpV>0*JkX%(Kng-^_{h1$htC>c`>GvYc?f?0 zEZlb@acIT()cL@}=g#ocfBk{C{my&dbK$GM{7XOgZ+!c=o%u)q2BAa$#(@^HC^cb$nma4>Pl8jQ^Gh4=MY@{u3^z=W03_=~SCIkcoe z$@jkVIN$VBPxGrEdY(gv4j%dGU;KZb{=UEaw;uZG|NSRE{I;+9I=pjy;*+14F?j09 z%riIv>Kq}&d(8Bdh@AG`-ppt$FMM$0!a4^A1tBSQYuvLUeB~=)DQ)n?nX5dr8Tr=N zuW@*7h{Z&j?Eu14+rq^W9Mi;>LSxyOa{{Uc)}eg{$+D{VDu~aRP773~)G?8w5fsc6 zpM=8G%|@1{gyq#JMihAW^Tx4_hSwiazW6Tql2glo<3Il47JvV@*ZJD}Cw$vmgdck6 z0X}uMV7W+mCOmicIllJmzwsk4Tv-3P6w~Qb_r2oP{eFMYt19}v9#ya8I_vNy(S<8D zpFX!m>6QCWEVH&$Fab6vF}u=aZ5M2RlT-k;mtzaC{Eru7P;mEO__2?FY-?xC+OQy6 zB1S4F^7_*8s ziFxlf!MlVLB~bAD&rbN-mCF!4TJ*s=o_pa6zxfzdq)fi#zm6&ui{J!0J-LWXkv{PYjYt_J9m*ZtL8SvynY_ zqrSMc(M^5t2hB`qp%o3z*)VNc`tgR#vcjQKQ4N?FO@LrVk%Yz>RUr(#Q6PAXgw71SXn?>yOTzs_qb1_a zsFQGdC2+i-*a^zn+Oyf_eZ<7mv^A&WbG-FUr=eVV>706*>DkL8o;bI~O3(9}dsZ3t zJUaGoq49NA3ELTOn&C8N+t6C6MDc!>#o&hc&j-Lrk3tXKJ*)pZV4P#1?t7MX;+ zPbZ8Zf-^9LlpQ*(n}mdNVgUCIz=;u)ATiqzG3N98F0tYht7YUP8zq-x9&fMS;Pv+& z{u9Ier_OJ4_R54|&+|E_4m0RGwp&=QcegrNWcW-IbnnS_jo|&r_5wl9-CeQI>qH^-d|+38Y4yrSY!rut_JmHG_$NCv736;^tl#)Mxu$IaDcb=y>fOkl&Hh=Wya?uwOD7=L z`?0-7;4Pz9DPb{Sak9K|_t*Wx_|hfBA|^_5K7%-F&>3x}8B%qH;tRovpz4sSqVOdy zv~cOYymDCa(BKTKgNl(`qwx$yD44RC`kAng@^$#{HA0~HI<*1YZ;{^5W8#CnaiHR2rR z93~l8hbg41sDdw)(kZ@Fio#J;6;@Q7e)?xPb!f!ea>adv2)!d%F$DFzj*s$$zM6Bz zA07L?UrIt-S$j0`VryqNov%^=?4~fy!Pq5AkgLZ?vR#&K2 z4wF(Oq(Ea}5;*2-iorH9T{}&)z|cN|@Nx^vhacPEb$1`6?0GJZGo}JrRf}EA@A2iPHuVXiXRgxa^PdsN8`D#ZmICEYnhubl!z7?r%2OA z_FpH{$yyYIy@??=5|rujn+eJ0PQyd5Iy^J*W(=P)v9spWbw)Zh`ljDA>4e}qA-}ZO z2;AAce8T}s=Q@=d*}n6e{_SXEox&Mn9#labh-Npdi{TfAXKCPA8x*VzJiVSHNx^p6 z=V0>;cbvErw{j=mFQLA|Yl-?2?<<1qv7{|W^eUIi6$S=P7*Y5oj+Gw(9H_HgxPY~vV zJA031iiD=6X-U3+uE}bT%!uQ_ySo6Pi=zhdI7cv2RQYP@4Vs7f#EfA zc{}{=r+@pIwLz&k=P?|~In*g=4%Dbuiqf&tcN`oR99k||St_V1N05T!=ibHrYtL}k z$$Ke!OPK4UTHvN(S#=nmzSZ299%tlUhr<)A6`ma*<2CX;cex!t%4rTV;#JiJuC~fa zzd@mi9TS=e@4b4Iv$3MINR)!74}JkF7k`su$6Ex&QpiF(KcO!J-AGWT+90JwjDgU$ zgtmp0vL8>!xTz}Vdd%h;&L(!%e%j*}?xh&_2tZkuHyCsRi#QAX^1Gk>5j7C4KpY|- zr>={pWrMFQgykjA+H%3sm5SA6Wu>PSRgXB@;Kb&;Ij~$3;u2e<0dYKGxTLJCdFUoV zR0vYhv%nkThiNI;EDj)18PR7+19!FOSt}Z%6r8R5+`qI%nA#8YXN`=0tZCr-Vd5F;rjMD^O)ybZJ)6pA!WLueWj31XV5`4BSmlwHP)UAy8J{@1FK9aI-(R^1UAR@9q2A-X;=CYE=vB&6r7TsB zL8S~TVc=m6X+R$PaFe`BCxEd?Ya)?*DOZ1$_ ziLfavw8a{i+5tto!E1*bw2dOEWg`vw*yuQ1zQpTRE^u_v(sPlw9X`X8^&8oG^*8X5 zM}CgsaLDny?`M3q?o8a&6)%R-9He_Y!Xk#K;i}*n4D+bPYAz+BA z3}wWF@-$L91jA{KRo$(sXKATq%b(!!QRI%LD?GL7*lHT?br*P|e<${;ui|5m|2mV& z7;%G~FmjtHr9|5_)J;Q-@w#5YbPu1>Y@44Kh&e4VuL@Gi*gwp91UIk&U{6|j2dwV% z${7CO-nV{ty>pea0ADzq%R=D2$9thHJ%fQ`dC4IGQ)YH^hV_z zrC0i8K~?1VdlDrA0VuF88AHg1WVT*38O2JUt>dq!dg5JdZU>GJh9pUtIE=(7L8xJ= zOx=wdQ}11{PQVgpM?H>~I~?$WjxV>=2xm4t1p&1YVR(Sa@J-0Z^Es30 zHqm?%=Z)|HvE6X)bmdPM`Sfe^_`tlon3B!xhy0s2-U5>B$p~7x|E>FsJfRklIQk3Q zt)Q_Xh(}_?w>ej@K#&x%=&%sMd^Tnz8*nit>ZrJoF!7Wg3dtEdm|$uIgsQ1o?$<2c zdyKMlpgEJsl3}T3(i&H#VBjO>QfKWZ#ByqwTFX@%a^4+boF+sqSSun|`l~#(HDRqO z`1Ir$rFVJqlHpQ|H-l6|8r}jcZyzlfZMMtw8N<^q#x@g*>AA)%&24tQbR#2BFxjI4 z9$Y!U&xr|VEe{Xg@t4L|H>rw9G(pWn89@V$Du!YN#3_E#Qk77)73w|I(8fsJD!n3P z!>~}i7o37iMhlc%FK{BBq3uYL6mv^2MR z_ZWy%VaOjDDeaC~EaP(VdKy54v^N^Ke+{02Mb>xp%TkySx4oVv2Qn`XVmhs3}PVCmun&yBC~9 zYN^;P4tFXv11hc_(JMy?75DZ=Y{iC($o=IG>Ly$aL;kRSCAA19L zVE~pE!Ko?mBXfq}%m9qG01O!!2axLp10-isEeOD;E?0{uSvCMQr8mi)D_FfjY!p;T zPKXJjlq5+cB8Fw=Pa04mn$Q4~o}(-r+6wA~euAZF41+N&pehs!qt~_s8{@6Oxe_N1 zaT%p^$z$g74R(MNFiZCy$uRrV34$rfj5-RRx?FJ2$^_>fg%_HXvz5ep9MB1e{TAoa z>KxPOX7MvjGyO9!1k=^qDW#d}-^0|@6}V1q02Q0rN&E3%1)Sd_0Ojz`#j`AB!zk{& zZD(@_O%1Vivur}6Kno*=NbrhAM~mSCNC^1k&^C*)S;h%GFm7`aXpD(AMwan-=SlSr zZLHB=MAQ&Rw=&5-`Yg9wcPp_J1W#WY1SlmENNiX^sFqpZ>Ekya=bnR+U_wl>Q?Y{L zxlfx!y&GVYgtN6y=2ks>o;x7 zYQG@is6{wzFObx57CEKQ;4l=5rq3S`5S$m|It>%~#DaKq=c!PcaX5rqK zgQl}TbKT~DYIkwZ48N=qa~g8g8Dq&vk}-frD$1?P9DDA+u(lE~ z8M3_-@UDkP&#g?3^EUHgCIOym=c!rI_y+vTSVO4fo{0gnX5MKu+in^TL(g23=26qG^Ip}V3In^Gm(;~EAXC? zT35~;^Iq;9G|3T@W8Ab1E9;b>|c%42)fhWX- zS7kCuh#JfNl3>EYvf<#t$RrirSh^a15l*fqHq)4`v`rCfVEIKcZDB5NkO_1vG-V(N z(GqUDil^@19vIjx3vu=wy3fQq!I0Uxxo^Pre|JFuwsxAuLFKUGQS00;Qg#8wGSfpF z(GbzLCAN;(D9MBPl#RA7t;MFBgMlR@CTOs(cqEa^3R!=G1CwVM9zW6rDk9G1_Aki- zAx6Xsf)U1 z(AXXHrZ@f)k)Z1_{e}&uB-<^~42!XYaBWd5?6KsN#jc-1-X;>A<{)d1e9kT|aJ{=( z5P%0xESdye!Dsm3qcy!!(G(%NT!_~hi76VXjkHa`x4uhw@TjF6L<-&cX0s?%>>$hR zB0Ad9Hm`W(7dgCEQuZrC6bfIWzK<_*S#*ePM)+cbSjs421bjgu9+8p|69@Z|$G4aH zwE>k6=?U7upfhfsUqzjKzZ9NBfoW#Ua6eUI3rznRMq6KZBdym1?37@iVp7|-oSu)99k74dAGy%p<%=da730UBGjEkAE zmLQ6hS)Cgyu@kSn&(6mlO%+Rt7>pPaDGI4gB-b@W@IL#j2GT)XrV3rZzF;{Cv{&>| z*Q4kSDXL|>%Nju235d{!afV4nyDTJ6;rcl5fZQr((s*>R$~%uf#_w(2#fr5&wI1ku zqmV3!g|?gzOZ+ZxV7>L+-#kt65{$r?ix#{*OIbFVw;&<3f5ul789|}Id7q?@FC%R zb_XRn6h)m-IPhMmoue&>;41q4B?iMGq62)jMBxWGpX=(qFHq;G8%GQY^@{IGvI|$D zKDU7t0!`EM`QZbc_6;AaEB?#&og6Q>;R-r<001BWNkl8UZ?&eyTPGdMt2RZJBG?EKWx|46YB&SV#iXaY2*`1Oml6*sI3e0&@^m&g>p4bFhm#uZ@6B@`XR-j)hOI|5UrSug= zVGQ~`R@M&C>n(#+_@cu33g=2xl;BI8^AttZ#l01Ex%;Q$a1NX%Vyclz{(XEK$RsYtX7_~bW94*vQAhXE^}b{ApQOdZ4}h!lrwb>5l3Ou zETp2FA;q-Fp<~f5NSJcl^kIQIA%upziZS<8kJI8&DX4tpH#hF*lXe#ee2ro>Ow+-p z#_5e+rx)w{zZiFLZd1*vZ{4mOEX}rP5nIR(wS|8LC&pHtn_d)-8`5GvK-x1<0a1BA zhZ@7ICl3e&Fm+gPSWqk&DMVsZ;ItrVL28XC5sC^|3O$5@k1VS)aEYD@Js)US4pJ-~ zX8m%_frBMgrI=+wODW9y`IzORQqv3`DT?|mAZk++slfY4G9#I%O^y_63}a9jm)aqJ zuzj2Z+Ttanf{Qah?|j{aSvL`c`Qx|RXLx#E1k|isct%W-d2K$0es`^dOxkII^>NDH zf!_Ex7X;wY>SAGt2ozqPxq2laVu%_k)+m`d)=2gY3J=j^L9o^^4|qePhh(TIrSlZx z@G0RnmuL5U&Nga}o}|{dvVGwroIShA$-BFU9Hf9r${>_?=ejn18YPPe`~H`#T;9SmX&IhSzm zWb3dBneNroe-+wjT0w1mJJHeK99a6{

_|BgkGaipA%K{LrO*vkz4l|FX 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]*)>$"); - @interface Address : NSObject { NSString *name_; NSString *email_; @@ -307,6 +306,8 @@ Pcre email_r("^\"?(.*)\"? <([^>]*)>$"); const char *data = [string UTF8String]; size_t size = [string length]; + static Pcre email_r("^\"?(.*)\"? <([^>]*)>$"); + if (email_r(data, size)) { name_ = [email_r[1] retain]; email_ = [email_r[2] retain]; @@ -429,6 +430,7 @@ static CGColor Black_; static CGColor Clear_; static CGColor Red_; static CGColor White_; +static CGColor Gray_; static NSString *Home_; static BOOL Sounds_Keyboard_; @@ -456,9 +458,13 @@ CGColorSpaceRef space_; bool bootstrap_; bool reload_; +static NSMutableDictionary *SectionMap_; static NSMutableDictionary *Metadata_; -static NSMutableDictionary *Packages_; -static NSMutableDictionary *Sections_; +static _transient NSMutableDictionary *Settings_; +static _transient NSString *Role_; +static _transient NSMutableDictionary *Packages_; +static _transient NSMutableDictionary *Sections_; +static _transient NSMutableDictionary *Sources_; static bool Changed_; static NSDate *now_; @@ -527,11 +533,19 @@ NSString *Simplify(NSString *title) { const char *data = [title UTF8String]; size_t size = [title length]; - Pcre title_r("^(.*?)( \\(.*\\))?$"); + static Pcre square_r("^\\[(.*)\\]$"); + if (square_r(data, size)) + return Simplify(square_r[1]); + + static Pcre paren_r("^\\((.*)\\)$"); + if (paren_r(data, size)) + return Simplify(paren_r[1]); + + static Pcre title_r("^(.*?) \\(.*\\)$"); if (title_r(data, size)) - return title_r[1]; - else - return title; + return Simplify(title_r[1]); + + return title; } /* }}} */ @@ -577,6 +591,9 @@ bool isSectionVisible(NSString *section) { - (void) slideUp:(UIAlertSheet *)alert; - (void) distUpgrade; - (void) updateData; +- (void) syncData; +- (void) askForSettings; +- (UIProgressHUD *) addProgressHUD; @end /* }}} */ @@ -710,6 +727,7 @@ class Progress : - (pkgProblemResolver *) resolver; - (pkgAcquire &) fetcher; - (NSArray *) packages; +- (NSArray *) sources; - (void) reloadData; - (void) configure; @@ -738,23 +756,31 @@ class Progress : NSString *defaultIcon_; + NSDictionary *record_; BOOL trusted_; } - (Source *) initWithMetaIndex:(metaIndex *)index; +- (NSComparisonResult) compareByNameAndType:(Source *)source; + +- (NSDictionary *) record; - (BOOL) trusted; - (NSString *) uri; - (NSString *) distribution; - (NSString *) type; +- (NSString *) key; +- (NSString *) host; +- (NSString *) name; - (NSString *) description; - (NSString *) label; - (NSString *) origin; - (NSString *) version; - (NSString *) defaultIcon; + @end @implementation Source @@ -774,6 +800,8 @@ class Progress : [version_ release]; if (defaultIcon_ != nil) [defaultIcon_ release]; + if (record_ != nil) + [record_ release]; [super dealloc]; } @@ -818,9 +846,40 @@ class Progress : version_ = [[NSString stringWithUTF8String:value.c_str()] retain]; } } + + record_ = [Sources_ objectForKey:[self key]]; + if (record_ != nil) + record_ = [record_ retain]; } return self; } +- (NSComparisonResult) compareByNameAndType:(Source *)source { + NSDictionary *lhr = [self record]; + NSDictionary *rhr = [source record]; + + if (lhr != rhr) + return lhr == nil ? NSOrderedDescending : NSOrderedAscending; + + NSString *lhs = [self name]; + NSString *rhs = [source name]; + + if ([lhs length] != 0 && [rhs length] != 0) { + unichar lhc = [lhs characterAtIndex:0]; + unichar rhc = [rhs characterAtIndex:0]; + + if (isalpha(lhc) && !isalpha(rhc)) + return NSOrderedAscending; + else if (!isalpha(lhc) && isalpha(rhc)) + return NSOrderedDescending; + } + + return [lhs caseInsensitiveCompare:rhs]; +} + +- (NSDictionary *) record { + return record_; +} + - (BOOL) trusted { return trusted_; } @@ -837,12 +896,24 @@ class Progress : return type_; } +- (NSString *) key { + return [NSString stringWithFormat:@"%@:%@:%@", type_, uri_, distribution_]; +} + +- (NSString *) host { + return [[[NSURL URLWithString:[self uri]] host] lowercaseString]; +} + +- (NSString *) name { + return origin_ == nil ? [self host] : origin_; +} + - (NSString *) description { return description_; } - (NSString *) label { - return label_; + return label_ == nil ? [self host] : label_; } - (NSString *) origin { @@ -944,6 +1015,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { Address *sponsor_; Address *author_; NSArray *tags_; + NSString *role_; NSArray *relationships_; } @@ -986,10 +1058,11 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (NSArray *) relationships; - (Source *) source; +- (NSString *) role; - (BOOL) matches:(NSString *)text; -- (bool) hasUsefulPurpose; +- (bool) hasSupportingRole; - (BOOL) hasTag:(NSString *)tag; - (NSComparisonResult) compareByName:(Package *)package; @@ -1000,9 +1073,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (void) install; - (void) remove; -- (NSNumber *) isSearchedForBy:(NSString *)search; +- (NSNumber *) isVisiblySearchedForBy:(NSString *)search; - (NSNumber *) isInstalledInSection:(NSString *)section; -- (NSNumber *) isUninstalledInSection:(NSString *)section; +- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section; +- (NSNumber *) isVisibleInSource:(Source *)source; @end @@ -1030,6 +1104,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) { [author_ release]; if (tags_ != nil) [tags_ release]; + if (role_ != nil) + [role_ release]; if (relationships_ != nil) [relationships_ release]; @@ -1086,6 +1162,15 @@ NSString *Scour(const char *field, const char *begin, const char *end) { tags_ = [[tags componentsSeparatedByString:@", "] retain]; } + if (tags_ != nil) + for (int i(0), e([tags_ count]); i != e; ++i) { + NSString *tag = [tags_ objectAtIndex:i]; + if ([tag hasPrefix:@"role::"]) { + role_ = [[tag substringFromIndex:6] retain]; + break; + } + } + NSMutableDictionary *metadata = [Packages_ objectForKey:id_]; if (metadata == nil || [metadata count] == 0) { metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys: @@ -1111,7 +1196,13 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (NSString *) section { const char *section = iterator_.Section(); - return section == NULL ? nil : [[NSString stringWithUTF8String:section] stringByReplacingCharacter:'_' withCharacter:' ']; + if (section == NULL) + return nil; + NSString *key = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_']; + NSString *value = [SectionMap_ objectForKey:key]; + if (value == nil) + value = key; + return [value stringByReplacingCharacter:'_' withCharacter:' ']; } - (Address *) maintainer { @@ -1187,7 +1278,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (BOOL) visible { NSString *section = [self section]; - return [self hasUsefulPurpose] && (section == nil || isSectionVisible(section)); + return [self hasSupportingRole] && (section == nil || isSectionVisible(section)); } - (BOOL) half { @@ -1285,6 +1376,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return source_; } +- (NSString *) role { + return role_; +} + - (BOOL) matches:(NSString *)text { if (text == nil) return NO; @@ -1306,27 +1401,22 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return NO; } -- (bool) hasUsefulPurpose { - if (tags_ == nil) +- (bool) hasSupportingRole { + if (role_ == nil) return true; - bool purpose(false); - - for (int i(0), e([tags_ count]); i != e; ++i) { - NSString *tag = [tags_ objectAtIndex:i]; - if ([tag hasPrefix:@"purpose::"]) { - bool purpose(false); - if ([tag isEqualToString:@"purpose::console"]) { - return true; - } else if ([tag isEqualToString:@"purpose::library"]) { - return true; - } else if ([tag isEqualToString:@"purpose::x"]) { - return true; - } else - purpose = true; - } - } - - return !purpose; + if ([role_ isEqualToString:@"enduser"]) + return true; + if ([Role_ isEqualToString:@"User"]) + return false; + if ([role_ isEqualToString:@"hacker"]) + return true; + if ([Role_ isEqualToString:@"Hacker"]) + return false; + if ([role_ isEqualToString:@"developer"]) + return true; + if ([Role_ isEqualToString:@"Developer"]) + return false; + _assert(false); } - (BOOL) hasTag:(NSString *)tag { @@ -1425,22 +1515,29 @@ NSString *Scour(const char *field, const char *begin, const char *end) { [database_ cache]->MarkDelete(iterator_, true); } -- (NSNumber *) isSearchedForBy:(NSString *)search { - return [NSNumber numberWithBool:([self valid] && [self matches:search])]; +- (NSNumber *) isVisiblySearchedForBy:(NSString *)search { + return [NSNumber numberWithBool:([self valid] && [self visible] && [self matches:search])]; } - (NSNumber *) isInstalledInSection:(NSString *)section { return [NSNumber numberWithBool:([self installed] != nil && (section == nil || [section isEqualToString:[self section]]))]; } -- (NSNumber *) isUninstalledInSection:(NSString *)name { +- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)name { NSString *section = [self section]; - return [NSNumber numberWithBool:([self valid] && [self installed] == nil && ( - (name == nil && [self visible] || - section == nil && [name length] == 0 || - [name isEqualToString:section]) - ))]; + return [NSNumber numberWithBool:( + [self valid] && [self visible] && + [self installed] == nil && ( + name == nil || + section == nil && [name length] == 0 || + [name isEqualToString:section] + ) + )]; +} + +- (NSNumber *) isVisibleInSource:(Source *)source { + return [NSNumber numberWithBool:([self source] == source && [self visible])]; } @end @@ -1548,8 +1645,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) { std::istream is(&ib); std::string line; - Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$"); - Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$"); + static Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$"); + static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$"); while (std::getline(is, line)) { const char *data(line.c_str()); @@ -1690,6 +1787,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return packages_; } +- (NSArray *) sources { + return [sources_ allValues]; +} + - (void) reloadData { _error->Discard(); @@ -2256,8 +2357,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString @end /* }}} */ /* Progress View {{{ */ -Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - @interface ProgressView : UIView < ConfigurationDelegate, ProgressDelegate @@ -2403,7 +2502,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [close_ setAutosizesToFit:NO]; [close_ setDrawsShadow:YES]; [close_ setStretchBackground:YES]; - [close_ setTitle:@"Close Window"]; + [close_ setTitle:@"Return to Cydia"]; [close_ setEnabled:YES]; GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22); @@ -2564,6 +2663,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); } - (void) _setConfigurationData:(NSString *)data { + static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); + _assert(conffile_r(data)); NSString *ofile = conffile_r[1]; @@ -2627,11 +2728,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - (PackageCell *) init; - (void) setPackage:(Package *)package; -- (void) _setSelected:(float)fraction; -- (void) setSelected:(BOOL)selected; -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade; -- (void) _setSelectionFadeFraction:(float)fraction; - + (int) heightForPackage:(Package *)package; @end @@ -2653,7 +2749,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - (PackageCell *) init { if ((self = [super init]) != nil) { - GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 20); + GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 18); GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12); GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14); @@ -2663,7 +2759,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [name_ setBackgroundColor:Clear_]; [name_ setFont:bold]; - source_ = [[UITextLabel alloc] initWithFrame:CGRectMake(58, 28, 225, 20)]; + source_ = [[UITextLabel alloc] initWithFrame:CGRectMake(58, 27, 225, 20)]; [source_ setBackgroundColor:Clear_]; [source_ setFont:large]; @@ -2682,10 +2778,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [status_ setFont:small]; #endif - /*[icon_ setImage:[UIImage applicationImageNamed:@"unknown.png"]]; - [icon_ zoomToScale:0.5]; - [icon_ setFrame:CGRectMake(10, 10, 30, 30)];*/ - [self addSubview:icon_]; [self addSubview:name_]; [self addSubview:description_]; @@ -2709,7 +2801,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); if (NSString *icon = [package icon]) image = [UIImage imageAtPath:[icon substringFromIndex:6]]; if (image == nil) if (NSString *section = [package section]) - image = [UIImage applicationImageNamed:[Simplify(section) stringByAppendingString:@".png"]]; + image = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sections/%@.png", Simplify(section)]]; /*if (image == nil) if (NSString *icon = [source defaultIcon]) image = [UIImage imageAtPath:[icon substringFromIndex:6]];*/ if (image == nil) @@ -2735,8 +2827,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); trusted = [source trusted]; } else if ([[package id] isEqualToString:@"firmware"]) label = @"Apple"; - - if (label == nil) + else label = @"Unknown/Local"; NSString *from = [NSString stringWithFormat:@"from %@", label]; @@ -2833,11 +2924,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); - (id) init; - (void) setSection:(Section *)section editing:(BOOL)editing; -- (void) _setSelected:(float)fraction; -- (void) setSelected:(BOOL)selected; -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade; -- (void) _setSelectionFadeFraction:(float)fraction; - @end @implementation SectionCell @@ -2851,6 +2937,32 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [super dealloc]; } +- (void) _setSelected:(float)fraction { + CGColor black(space_, + Interpolate(0.0, 1.0, fraction), + Interpolate(0.0, 1.0, fraction), + Interpolate(0.0, 1.0, fraction), + 1.0); + + [name_ setColor:black]; +} + +- (void) setSelected:(BOOL)selected { + [self _setSelected:(selected ? 1.0 : 0.0)]; + [super setSelected:selected]; +} + +- (void) setSelected:(BOOL)selected withFade:(BOOL)fade { + if (!fade) + [self _setSelected:(selected ? 1.0 : 0.0)]; + [super setSelected:selected withFade:fade]; +} + +- (void) _setSelectionFadeFraction:(float)fraction { + [self _setSelected:fraction]; + [super _setSelectionFadeFraction:fraction]; +} + - (id) init { if ((self = [super init]) != nil) { GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22); @@ -2925,32 +3037,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [name_ setFrame:CGRectMake(48, 9, editing_ ? 165 : 250, 25)]; } -- (void) _setSelected:(float)fraction { - CGColor black(space_, - Interpolate(0.0, 1.0, fraction), - Interpolate(0.0, 1.0, fraction), - Interpolate(0.0, 1.0, fraction), - 1.0); - - [name_ setColor:black]; -} - -- (void) setSelected:(BOOL)selected { - [self _setSelected:(selected ? 1.0 : 0.0)]; - [super setSelected:selected]; -} - -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade { - if (!fade) - [self _setSelected:(selected ? 1.0 : 0.0)]; - [super setSelected:selected withFade:fade]; -} - -- (void) _setSelectionFadeFraction:(float)fraction { - [self _setSelected:fraction]; - [super _setSelectionFadeFraction:fraction]; -} - @end /* }}} */ @@ -3649,148 +3735,813 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @end /* }}} */ -/* Browser Implementation {{{ */ -@implementation BrowserView - -- (void) dealloc { - WebView *webview = [webview_ webView]; - [webview setFrameLoadDelegate:nil]; - [webview setResourceLoadDelegate:nil]; - [webview setUIDelegate:nil]; - - [scroller_ setDelegate:nil]; - [webview_ setDelegate:nil]; - - [scroller_ release]; - [webview_ release]; - [urls_ release]; - [indicator_ release]; - if (title_ != nil) - [title_ release]; - [super dealloc]; +/* Add Source View {{{ */ +@interface AddSourceView : RVPage { + _transient Database *database_; } -- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy { - NSMutableURLRequest *request = [NSMutableURLRequest - requestWithURL:url - cachePolicy:policy - timeoutInterval:30.0 - ]; - - [request addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"]; - [request addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; - [request addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"]; +- (id) initWithBook:(RVBook *)book database:(Database *)database; - [self loadRequest:request]; -} +@end +@implementation AddSourceView -- (void) loadURL:(NSURL *)url { - [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy]; +- (id) initWithBook:(RVBook *)book database:(Database *)database { + if ((self = [super initWithBook:book]) != nil) { + database_ = database; + } return self; } -// XXX: this needs to add the headers -- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request { - return request; +@end +/* }}} */ +/* Source Cell {{{ */ +@interface SourceCell : UITableCell { + UIImageView *icon_; + UITextLabel *origin_; + UITextLabel *description_; + UITextLabel *label_; } -- (void) loadRequest:(NSURLRequest *)request { - pushed_ = true; - [webview_ loadRequest:request]; -} +- (void) dealloc; -- (void) reloadURL { - NSURL *url = [[[urls_ lastObject] retain] autorelease]; - [urls_ removeLastObject]; - [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData]; -} +- (SourceCell *) initWithSource:(Source *)source; -- (WebView *) webView { - return [webview_ webView]; -} +@end -- (void) view:(UIView *)sender didSetFrame:(CGRect)frame { - [scroller_ setContentSize:frame.size]; -} +@implementation SourceCell -- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old { - [self view:sender didSetFrame:frame]; +- (void) dealloc { + [origin_ release]; + [description_ release]; + [label_ release]; + [super dealloc]; } -- (void) getAppTapp:(NSString *)href { - if ([href hasPrefix:@"apptapp://package/"]) { - NSString *name = [href substringFromIndex:18]; - Package *package = [database_ packageWithName:name]; - if (package == nil) { - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:@"Cannot Locate Package" - buttons:[NSArray arrayWithObjects:@"Close", nil] - defaultButtonIndex:0 - delegate:self - context:@"missing" - ] autorelease]; - - [sheet setBodyText:[NSString stringWithFormat: - @"The package %@ cannot be found in your current sources. I might recommend installing more sources." - , name]]; +- (SourceCell *) initWithSource:(Source *)source { + if ((self = [super init]) != nil) { + GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 18); + GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12); + GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14); - [sheet popupAlertAnimated:YES]; - } else { - [self setBackButtonTitle:title_]; - PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; - [view setDelegate:delegate_]; - [view setPackage:package]; - [book_ pushPage:view]; - } - } -} + icon_ = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 30, 30)]; -- (void) webView:(WebView *)sender willClickElement:(id)element { - if (![element respondsToSelector:@selector(href)]) - return; - NSString *href = [element href]; - if (href == nil) - return; - if ([href hasPrefix:@"apptapp://package/"]) - [self getAppTapp:href]; -} + UIImage *image = nil; + if (image == nil) + image = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sources/%@.png", [source host]]]; + if (image == nil) + image = [UIImage applicationImageNamed:@"unknown.png"]; -- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource { - if ([[[request URL] scheme] isEqualToString:@"apptapp"]) { - [self getAppTapp:[[request URL] absoluteString]]; - return nil; - } + [icon_ setImage:image]; + [icon_ zoomToScale:0.5]; + [icon_ setFrame:CGRectMake(10, 10, 30, 30)]; - if (!pushed_) { - pushed_ = true; - [book_ pushPage:self]; - } + origin_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 8, 240, 25)]; + [origin_ setBackgroundColor:Clear_]; + [origin_ setFont:bold]; - return [self _addHeadersToRequest:request]; -} + label_ = [[UITextLabel alloc] initWithFrame:CGRectMake(58, 27, 225, 20)]; + [label_ setBackgroundColor:Clear_]; + [label_ setFont:large]; -- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request { - if (request != nil && [[[request URL] scheme] isEqualToString:@"apptapp"]) - return nil; - else { - [self setBackButtonTitle:title_]; + description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 46, 280, 20)]; + [description_ setBackgroundColor:Clear_]; + [description_ setFont:small]; - BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease]; - [browser setDelegate:delegate_]; + [origin_ setText:[source name]]; + [label_ setText:[source uri]]; + [description_ setText:[source description]]; - if (request != nil) { - [browser loadRequest:[self _addHeadersToRequest:request]]; - [book_ pushPage:browser]; - } + [self addSubview:icon_]; + [self addSubview:origin_]; + [self addSubview:description_]; + [self addSubview:label_]; - return [browser webView]; - } + CFRelease(small); + CFRelease(bold); + } return self; } -- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame { - title_ = [title retain]; - [self setTitle:title]; -} +- (void) _setSelected:(float)fraction { + CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB(); + + float black[] = { + Interpolate(0.0, 1.0, fraction), + Interpolate(0.0, 1.0, fraction), + Interpolate(0.0, 1.0, fraction), + 1.0}; + + float blue[] = { + Interpolate(0.2, 1.0, fraction), + Interpolate(0.2, 1.0, fraction), + Interpolate(1.0, 1.0, fraction), + 1.0}; + + float gray[] = { + Interpolate(0.4, 1.0, fraction), + Interpolate(0.4, 1.0, fraction), + Interpolate(0.4, 1.0, fraction), + 1.0}; + + [origin_ setColor:CGColorCreate(space, black)]; + [label_ setColor:CGColorCreate(space, blue)]; + [description_ setColor:CGColorCreate(space, gray)]; +} + +- (void) setSelected:(BOOL)selected { + [self _setSelected:(selected ? 1.0 : 0.0)]; + [super setSelected:selected]; +} + +- (void) setSelected:(BOOL)selected withFade:(BOOL)fade { + if (!fade) + [self _setSelected:(selected ? 1.0 : 0.0)]; + [super setSelected:selected withFade:fade]; +} + +- (void) _setSelectionFadeFraction:(float)fraction { + [self _setSelected:fraction]; + [super _setSelectionFadeFraction:fraction]; +} + +@end +/* }}} */ +/* Source Table {{{ */ +@interface SourceTable : RVPage { + _transient Database *database_; + UISectionList *list_; + NSMutableArray *sources_; + UIAlertSheet *alert_; + int offset_; + + NSString *href_; + UIProgressHUD *hud_; + NSError *error_; + + //NSURLConnection *installer_; + NSURLConnection *trivial_bz2_; + NSURLConnection *trivial_gz_; + //NSURLConnection *automatic_; + + BOOL trivial_; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database; + +@end + +@implementation SourceTable + +- (void) _deallocConnection:(NSURLConnection *)connection { + if (connection != nil) { + [connection cancel]; + //[connection setDelegate:nil]; + [connection release]; + } +} + +- (void) dealloc { + [[list_ table] setDelegate:nil]; + [list_ setDataSource:nil]; + + if (href_ != nil) + [href_ release]; + if (hud_ != nil) + [hud_ release]; + if (error_ != nil) + [error_ release]; + + //[self _deallocConnection:installer_]; + [self _deallocConnection:trivial_gz_]; + [self _deallocConnection:trivial_bz2_]; + //[self _deallocConnection:automatic_]; + + [sources_ release]; + [list_ release]; + [super dealloc]; +} + +- (int) numberOfSectionsInSectionList:(UISectionList *)list { + return offset_ == 0 ? 1 : 2; +} + +- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section { + switch (section + (offset_ == 0 ? 1 : 0)) { + case 0: return @"Entered by User"; + case 1: return @"Installed by Packages"; + + default: + _assert(false); + return nil; + } +} + +- (int) sectionList:(UISectionList *)list rowForSection:(int)section { + switch (section + (offset_ == 0 ? 1 : 0)) { + case 0: return 0; + case 1: return offset_; + + default: + _assert(false); + return -1; + } +} + +- (int) numberOfRowsInTable:(UITable *)table { + return [sources_ count]; +} + +- (float) table:(UITable *)table heightForRow:(int)row { + Source *source = [sources_ objectAtIndex:row]; + return [source description] == nil ? 58 : 73; +} + +- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col { + Source *source = [sources_ objectAtIndex:row]; + // XXX: weird warning, stupid selectors ;P + return [[[SourceCell alloc] initWithSource:(id)source] autorelease]; +} + +- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row { + return YES; +} + +- (BOOL) table:(UITable *)table canSelectRow:(int)row { + return YES; +} + +- (void) tableRowSelected:(NSNotification*)notification { + UITable *table([list_ table]); + int row([table selectedRow]); + if (row == INT_MAX) + return; + + Source *source = [sources_ objectAtIndex:row]; + + PackageTable *packages = [[[PackageTable alloc] + initWithBook:book_ + database:database_ + title:[source label] + filter:@selector(isVisibleInSource:) + with:source + ] autorelease]; + + [packages setDelegate:delegate_]; + + [book_ pushPage:packages]; +} + +- (BOOL) table:(UITable *)table canDeleteRow:(int)row { + Source *source = [sources_ objectAtIndex:row]; + return [source record] != nil; +} + +- (void) table:(UITable *)table willSwipeToDeleteRow:(int)row { + [[list_ table] setDeleteConfirmationRow:row]; +} + +- (void) table:(UITable *)table deleteRow:(int)row { + Source *source = [sources_ objectAtIndex:row]; + [Sources_ removeObjectForKey:[source key]]; + [delegate_ syncData]; +} + +- (void) _endConnection:(NSURLConnection *)connection { + NSURLConnection **field = NULL; + if (connection == trivial_bz2_) + field = &trivial_bz2_; + else if (connection == trivial_gz_) + field = &trivial_gz_; + _assert(field != NULL); + [connection release]; + *field = nil; + + if ( + trivial_bz2_ == nil && + trivial_gz_ == nil + ) { + [delegate_ setStatusBarShowsProgress:NO]; + + [hud_ show:NO]; + [hud_ removeFromSuperview]; + [hud_ autorelease]; + hud_ = nil; + + if (trivial_) { + [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys: + @"deb", @"Type", + href_, @"URI", + @"./", @"Distribution", + nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]]; + + [delegate_ syncData]; + } else if (error_ != nil) { + UIAlertSheet *sheet = [[[UIAlertSheet alloc] + initWithTitle:@"Verification Error" + buttons:[NSArray arrayWithObjects:@"OK", nil] + defaultButtonIndex:0 + delegate:self + context:@"urlerror" + ] autorelease]; + + [sheet setBodyText:[error_ localizedDescription]]; + [sheet popupAlertAnimated:YES]; + } else { + UIAlertSheet *sheet = [[[UIAlertSheet alloc] + initWithTitle:@"Did not Find Repository" + buttons:[NSArray arrayWithObjects:@"OK", nil] + defaultButtonIndex:0 + delegate:self + context:@"trivial" + ] autorelease]; + + [sheet setBodyText:@"The indicated repository could not be found. This could be because you are trying to add a legacy Installer repository (these are not supported). Also, this interface is only capable of working with exact repository URLs. If you host a repository and are having issues please contact the author of Cydia with any questions you have."]; + [sheet popupAlertAnimated:YES]; + } + + [href_ release]; + href_ = nil; + + if (error_ != nil) { + [error_ release]; + error_ = nil; + } + } +} + +- (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLResponse *)response { + switch ([response statusCode]) { + case 200: + trivial_ = YES; + } +} + +- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { + fprintf(stderr, "connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]); + if (error_ != nil) + error_ = [error retain]; + [self _endConnection:connection]; +} + +- (void) connectionDidFinishLoading:(NSURLConnection *)connection { + [self _endConnection:connection]; +} + +- (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method { + NSMutableURLRequest *request = [NSMutableURLRequest + requestWithURL:[NSURL URLWithString:href] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:20.0 + ]; + + [request setHTTPMethod:method]; + + return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease]; +} + +- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { + NSString *context = [sheet context]; + if ([context isEqualToString:@"source"]) + switch (button) { + case 1: { + NSString *href = [[sheet textField] text]; + + //installer_ = [[self _requestHRef:href method:@"GET"] retain]; + + if (![href hasSuffix:@"/"]) + href_ = [href stringByAppendingString:@"/"]; + else + href_ = href; + href_ = [href_ retain]; + + trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain]; + trivial_gz_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.gz"] method:@"HEAD"] retain]; + //trivial_bz2_ = [[self _requestHRef:[href stringByAppendingString:@"dists/Release"] method:@"HEAD"] retain]; + + trivial_ = false; + + hud_ = [delegate_ addProgressHUD]; + [hud_ setText:@"Verifying URL"]; + } break; + + case 2: + break; + + default: + _assert(false); + } + + [sheet dismiss]; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database { + if ((self = [super initWithBook:book]) != nil) { + database_ = database; + sources_ = [[NSMutableArray arrayWithCapacity:16] retain]; + + //list_ = [[UITable alloc] initWithFrame:[self bounds]]; + list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO]; + [list_ setShouldHideHeaderInShortLists:NO]; + + [self addSubview:list_]; + [list_ setDataSource:self]; + + UITableColumn *column = [[UITableColumn alloc] + initWithTitle:@"Name" + identifier:@"name" + width:[self frame].size.width + ]; + + UITable *table = [list_ table]; + [table setSeparatorStyle:1]; + [table addTableColumn:column]; + [table setDelegate:self]; + + [self reloadData]; + } return self; +} + +- (void) reloadData { + pkgSourceList list; + _assert(list.ReadMainList()); + + [sources_ removeAllObjects]; + [sources_ addObjectsFromArray:[database_ sources]]; + [sources_ sortUsingSelector:@selector(compareByNameAndType:)]; + + int count = [sources_ count]; + for (offset_ = 0; offset_ != count; ++offset_) { + Source *source = [sources_ objectAtIndex:offset_]; + if ([source record] == nil) + break; + } + + [list_ reloadData]; +} + +- (void) resetViewAnimated:(BOOL)animated { + [list_ resetViewAnimated:animated]; +} + +- (void) _leftButtonClicked { + /*[book_ pushPage:[[[AddSourceView alloc] + initWithBook:book_ + database:database_ + ] autorelease]];*/ + + UIAlertSheet *sheet = [[[UIAlertSheet alloc] + initWithTitle:@"Enter Cydia/APT URL" + buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil] + defaultButtonIndex:0 + delegate:self + context:@"source" + ] autorelease]; + + [sheet addTextFieldWithValue:@"http://" label:@""]; + + UITextTraits *traits = [[sheet textField] textTraits]; + [traits setAutoCapsType:0]; + [traits setPreferredKeyboardType:3]; + [traits setAutoCorrectionType:1]; + + [sheet popupAlertAnimated:YES]; +} + +- (void) _rightButtonClicked { + UITable *table = [list_ table]; + BOOL editing = [table isRowDeletionEnabled]; + [table enableRowDeletion:!editing animated:YES]; + [book_ reloadButtonsForPage:self]; +} + +- (NSString *) title { + return @"Sources"; +} + +- (NSString *) backButtonTitle { + return @"Sources"; +} + +- (NSString *) leftButtonTitle { + return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil; +} + +- (NSString *) rightButtonTitle { + return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit"; +} + +- (RVUINavBarButtonStyle) rightButtonStyle { + return [[list_ table] isRowDeletionEnabled] ? RVUINavBarButtonStyleHighlighted : RVUINavBarButtonStyleNormal; +} + +@end +/* }}} */ + +/* Installed View {{{ */ +@interface InstalledView : RVPage { + _transient Database *database_; + PackageTable *packages_; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database; + +@end + +@implementation InstalledView + +- (void) dealloc { + [packages_ release]; + [super dealloc]; +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database { + if ((self = [super initWithBook:book]) != nil) { + database_ = database; + + packages_ = [[PackageTable alloc] + initWithBook:book + database:database + title:nil + filter:@selector(isInstalledInSection:) + with:nil + ]; + + [self addSubview:packages_]; + } return self; +} + +- (void) resetViewAnimated:(BOOL)animated { + [packages_ resetViewAnimated:animated]; +} + +- (void) reloadData { + [packages_ reloadData]; +} + +- (NSString *) title { + return @"Installed Packages"; +} + +- (NSString *) backButtonTitle { + return @"Packages"; +} + +- (void) setDelegate:(id)delegate { + [super setDelegate:delegate]; + [packages_ setDelegate:delegate]; +} + +@end +/* }}} */ + +@interface HomeView : BrowserView { +} + +@end + +@implementation HomeView + +- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { + [sheet dismiss]; +} + +- (void) _leftButtonClicked { + UIAlertSheet *sheet = [[[UIAlertSheet alloc] + initWithTitle:@"About Cydia Installer" + buttons:[NSArray arrayWithObjects:@"Close", nil] + defaultButtonIndex:0 + delegate:self + context:@"about" + ] autorelease]; + + [sheet setBodyText: + @"Copyright (C) 2008\n" + "Jay Freeman (saurik)\n" + "saurik@saurik.com\n" + "http://www.saurik.com/\n" + "\n" + "The Okori Group\n" + "http://www.theokorigroup.com/\n" + "\n" + "College of Creative Studies,\n" + "University of California,\n" + "Santa Barbara\n" + "http://www.ccs.ucsb.edu/" + ]; + + [sheet popupAlertAnimated:YES]; +} + +- (NSString *) leftButtonTitle { + return @"About"; +} + +@end + +@interface ManageView : BrowserView { +} + +@end + +@implementation ManageView + +- (NSString *) title { + return @"Manage"; +} + +- (void) _leftButtonClicked { + [delegate_ askForSettings]; +} + +- (NSString *) leftButtonTitle { + return @"Settings"; +} + +- (NSString *) rightButtonTitle { + return nil; +} + +@end + +/* Browser Implementation {{{ */ +@implementation BrowserView + +- (void) dealloc { + WebView *webview = [webview_ webView]; + [webview setFrameLoadDelegate:nil]; + [webview setResourceLoadDelegate:nil]; + [webview setUIDelegate:nil]; + + [scroller_ setDelegate:nil]; + [webview_ setDelegate:nil]; + + [scroller_ release]; + [webview_ release]; + [urls_ release]; + [indicator_ release]; + if (title_ != nil) + [title_ release]; + [super dealloc]; +} + +- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy { + [self loadRequest:[NSURLRequest + requestWithURL:url + cachePolicy:policy + timeoutInterval:30.0 + ]]; +} + +- (void) loadURL:(NSURL *)url { + [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy]; +} + +- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request { + NSMutableURLRequest *copy = [request mutableCopy]; + + [copy addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"]; + [copy addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"]; + [copy addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"]; + + if (Role_ != nil) + [copy addValue:Role_ forHTTPHeaderField:@"X-Role"]; + + return copy; +} + +- (void) loadRequest:(NSURLRequest *)request { + pushed_ = true; + [webview_ loadRequest:request]; +} + +- (void) reloadURL { + NSURL *url = [[[urls_ lastObject] retain] autorelease]; + [urls_ removeLastObject]; + [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData]; +} + +- (WebView *) webView { + return [webview_ webView]; +} + +- (void) view:(UIView *)sender didSetFrame:(CGRect)frame { + [scroller_ setContentSize:frame.size]; +} + +- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old { + [self view:sender didSetFrame:frame]; +} + +- (void) pushPage:(RVPage *)page { + [self setBackButtonTitle:title_]; + [page setDelegate:delegate_]; + [book_ pushPage:page]; +} + +- (void) getCydia:(NSString *)href { + RVPage *page = nil; + + if ([href isEqualToString:@"cydia://add-source"]) + page = [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease]; + else if ([href isEqualToString:@"cydia://sources"]) + page = [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease]; + else if ([href isEqualToString:@"cydia://packages"]) + page = [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease]; + + if (page != nil) + [self pushPage:page]; +} + +- (void) getAppTapp:(NSString *)href { + if ([href hasPrefix:@"apptapp://package/"]) { + NSString *name = [href substringFromIndex:18]; + Package *package = [database_ packageWithName:name]; + if (package == nil) { + UIAlertSheet *sheet = [[[UIAlertSheet alloc] + initWithTitle:@"Cannot Locate Package" + buttons:[NSArray arrayWithObjects:@"Close", nil] + defaultButtonIndex:0 + delegate:self + context:@"missing" + ] autorelease]; + + [sheet setBodyText:[NSString stringWithFormat: + @"The package %@ cannot be found in your current sources. I might recommend installing more sources." + , name]]; + + [sheet popupAlertAnimated:YES]; + } else { + PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease]; + [view setPackage:package]; + [self pushPage:view]; + } + } +} + +- (void) webView:(WebView *)sender willClickElement:(id)element { + if ([[element localName] isEqualToString:@"img"]) + do if ((element = [element parentNode]) == nil) + return; + while (![[element localName] isEqualToString:@"a"]); + if (![element respondsToSelector:@selector(href)]) + return; + NSString *href = [element href]; + if (href == nil) + return; + if ([href hasPrefix:@"cydia://"]) + [self getCydia:href]; + if ([href hasPrefix:@"apptapp://"]) + [self getAppTapp:href]; +} + +- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource { + NSString *scheme = [[request URL] scheme]; + + if ([scheme isEqualToString:@"apptapp"]) { + [self getAppTapp:[[request URL] absoluteString]]; + return nil; + } + + if ([scheme isEqualToString:@"cydia"]) { + [self getCydia:[[request URL] absoluteString]]; + return nil; + } + + if (!pushed_) { + pushed_ = true; + [book_ pushPage:self]; + } + + return [self _addHeadersToRequest:request]; +} + +- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request { + if (request != nil) { + NSString *scheme = [[request URL] scheme]; + + if ( + [scheme isEqualToString:@"apptapp"] || + [scheme isEqualToString:@"cydia"] + ) + return nil; + } + + [self setBackButtonTitle:title_]; + + BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease]; + [browser setDelegate:delegate_]; + + if (request != nil) { + [browser loadRequest:[self _addHeadersToRequest:request]]; + [book_ pushPage:browser]; + } + + return [browser webView]; +} + +- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame { + title_ = [title retain]; + [self setTitle:title]; +} - (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame { if ([frame parentFrame] != nil) @@ -3835,8 +4586,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); if ([frame parentFrame] != nil) return; [self _finishLoading]; + [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@", - [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"home" ofType:@"html"]] absoluteString], + [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString], [[error localizedDescription] stringByAddingPercentEscapes] ]]]; } @@ -3894,46 +4646,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); } return self; } -- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { - [sheet dismiss]; -} - -- (void) _leftButtonClicked { - UIAlertSheet *sheet = [[[UIAlertSheet alloc] - initWithTitle:@"About Cydia Installer" - buttons:[NSArray arrayWithObjects:@"Close", nil] - defaultButtonIndex:0 - delegate:self - context:@"about" - ] autorelease]; - - [sheet setBodyText: - @"Copyright (C) 2008\n" - "Jay Freeman (saurik)\n" - "saurik@saurik.com\n" - "http://www.saurik.com/\n" - "\n" - "The Okori Group\n" - "http://www.theokorigroup.com/\n" - "\n" - "College of Creative Studies,\n" - "University of California,\n" - "Santa Barbara\n" - "http://www.ccs.ucsb.edu/" - ]; - - [sheet popupAlertAnimated:YES]; -} - - (void) _rightButtonClicked { reloading_ = true; [self reloadURL]; } -- (NSString *) leftButtonTitle { - return @"About"; -} - - (NSString *) rightButtonTitle { return loading_ ? @"" : @"Reload"; } @@ -3960,254 +4677,25 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); pushed_ = pushed; } -@end -/* }}} */ - -@interface CYBook : RVBook < - ProgressDelegate -> { - _transient Database *database_; - UIView *overlay_; - UIProgressIndicator *indicator_; - UITextLabel *prompt_; - UIProgressBar *progress_; - bool updating_; -} - -- (id) initWithFrame:(CGRect)frame database:(Database *)database; -- (void) update; -- (BOOL) updating; - -@end - -/* Source Cell {{{ */ -@interface SourceCell : UITableCell { - UITextLabel *description_; - UIRightTextLabel *label_; - UITextLabel *origin_; -} - -- (void) dealloc; - -- (SourceCell *) initWithSource:(Source *)source; - -- (void) _setSelected:(float)fraction; -- (void) setSelected:(BOOL)selected; -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade; -- (void) _setSelectionFadeFraction:(float)fraction; - -@end - -@implementation SourceCell - -- (void) dealloc { - [description_ release]; - [label_ release]; - [origin_ release]; - [super dealloc]; -} - -- (SourceCell *) initWithSource:(Source *)source { - if ((self = [super init]) != nil) { - GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 20); - GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14); - - CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB(); - float clear[] = {0, 0, 0, 0}; - - NSString *description = [source description]; - if (description == nil) - description = [source uri]; - - description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 7, 270, 25)]; - [description_ setBackgroundColor:CGColorCreate(space, clear)]; - [description_ setFont:bold]; - [description_ setText:description]; - - NSString *label = [source label]; - if (label == nil) - label = [source type]; - - label_ = [[UIRightTextLabel alloc] initWithFrame:CGRectMake(290, 32, 90, 25)]; - [label_ setBackgroundColor:CGColorCreate(space, clear)]; - [label_ setFont:small]; - [label_ setText:label]; - - NSString *origin = [source origin]; - if (origin == nil) - origin = [source distribution]; - - origin_ = [[UITextLabel alloc] initWithFrame:CGRectMake(13, 35, 315, 20)]; - [origin_ setBackgroundColor:CGColorCreate(space, clear)]; - [origin_ setFont:small]; - [origin_ setText:origin]; - - [self addSubview:description_]; - [self addSubview:label_]; - [self addSubview:origin_]; - - CFRelease(small); - CFRelease(bold); - } return self; -} - -- (void) _setSelected:(float)fraction { - CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB(); - - float black[] = { - Interpolate(0.0, 1.0, fraction), - Interpolate(0.0, 1.0, fraction), - Interpolate(0.0, 1.0, fraction), - 1.0}; - - float blue[] = { - Interpolate(0.2, 1.0, fraction), - Interpolate(0.2, 1.0, fraction), - Interpolate(1.0, 1.0, fraction), - 1.0}; - - float gray[] = { - Interpolate(0.4, 1.0, fraction), - Interpolate(0.4, 1.0, fraction), - Interpolate(0.4, 1.0, fraction), - 1.0}; - - [description_ setColor:CGColorCreate(space, black)]; - [label_ setColor:CGColorCreate(space, blue)]; - [origin_ setColor:CGColorCreate(space, gray)]; -} - -- (void) setSelected:(BOOL)selected { - [self _setSelected:(selected ? 1.0 : 0.0)]; - [super setSelected:selected]; -} - -- (void) setSelected:(BOOL)selected withFade:(BOOL)fade { - if (!fade) - [self _setSelected:(selected ? 1.0 : 0.0)]; - [super setSelected:selected withFade:fade]; -} - -- (void) _setSelectionFadeFraction:(float)fraction { - [self _setSelected:fraction]; - [super _setSelectionFadeFraction:fraction]; -} - -@end -/* }}} */ -/* Source Table {{{ */ -@interface SourceTable : RVPage { - _transient Database *database_; - UISectionList *list_; - NSMutableArray *sources_; - UIAlertSheet *alert_; -} - -- (id) initWithBook:(RVBook *)book database:(Database *)database; - -@end - -@implementation SourceTable - -- (void) dealloc { - [list_ setDataSource:nil]; - - if (sources_ != nil) - [sources_ release]; - [list_ release]; - [super dealloc]; -} - -- (int) numberOfSectionsInSectionList:(UISectionList *)list { - return 1; -} - -- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section { - return @"Sources"; -} - -- (int) sectionList:(UISectionList *)list rowForSection:(int)section { - return 0; -} - -- (int) numberOfRowsInTable:(UITable *)table { - return [sources_ count]; -} - -- (float) table:(UITable *)table heightForRow:(int)row { - return 64; -} - -- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col { - return [[[SourceCell alloc] initWithSource:[sources_ objectAtIndex:row]] autorelease]; -} - -- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row { - return NO; -} - -- (void) tableRowSelected:(NSNotification*)notification { - UITable *table([list_ table]); - int row([table selectedRow]); - if (row == INT_MAX) - return; - - [table selectRow:-1 byExtendingSelection:NO withFade:YES]; -} - -- (id) initWithBook:(RVBook *)book database:(Database *)database { - if ((self = [super initWithBook:book]) != nil) { - database_ = database; - sources_ = nil; - - list_ = [[UISectionList alloc] initWithFrame:[self bounds]]; - - [self addSubview:list_]; - - [list_ setDataSource:self]; - [list_ setShouldHideHeaderInShortLists:NO]; - - UITableColumn *column = [[UITableColumn alloc] - initWithTitle:@"Name" - identifier:@"name" - width:[self frame].size.width - ]; - - UITable *table = [list_ table]; - [table setSeparatorStyle:1]; - [table addTableColumn:column]; - [table setDelegate:self]; - } return self; -} - -- (void) reloadData { - pkgSourceList list; - _assert(list.ReadMainList()); - - if (sources_ != nil) - [sources_ release]; - - sources_ = [[NSMutableArray arrayWithCapacity:16] retain]; - for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source) - [sources_ addObject:[[[Source alloc] initWithMetaIndex:*source] autorelease]]; - - [list_ reloadData]; -} - -- (void) resetViewAnimated:(BOOL)animated { - [list_ resetViewAnimated:animated]; -} +@end +/* }}} */ -- (NSString *) leftTitle { - return @"Refresh All"; +@interface CYBook : RVBook < + ProgressDelegate +> { + _transient Database *database_; + UIView *overlay_; + UIProgressIndicator *indicator_; + UITextLabel *prompt_; + UIProgressBar *progress_; + bool updating_; } -- (NSString *) rightTitle { - return @"Edit"; -} +- (id) initWithFrame:(CGRect)frame database:(Database *)database; +- (void) update; +- (BOOL) updating; @end -/* }}} */ /* Install View {{{ */ @interface InstallView : RVPage { @@ -4295,7 +4783,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); initWithBook:book_ database:database_ title:title - filter:@selector(isUninstalledInSection:) + filter:@selector(isVisiblyUninstalledInSection:) with:name ] autorelease]; @@ -4612,72 +5100,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); return @"Changes"; } -@end -/* }}} */ -/* Manage View {{{ */ -@interface ManageView : RVPage { - _transient Database *database_; - PackageTable *packages_; - SourceTable *sources_; -} - -- (id) initWithBook:(RVBook *)book database:(Database *)database; - -@end - -@implementation ManageView - -- (void) dealloc { - [packages_ release]; - [sources_ release]; - [super dealloc]; -} - -- (id) initWithBook:(RVBook *)book database:(Database *)database { - if ((self = [super initWithBook:book]) != nil) { - database_ = database; - - packages_ = [[PackageTable alloc] - initWithBook:book - database:database - title:nil - filter:@selector(isInstalledInSection:) - with:nil - ]; - - sources_ = [[SourceTable alloc] - initWithBook:book - database:database - ]; - - [self addSubview:packages_]; - } return self; -} - -- (void) resetViewAnimated:(BOOL)animated { - [packages_ resetViewAnimated:animated]; - [sources_ resetViewAnimated:animated]; -} - -- (void) reloadData { - [packages_ reloadData]; - [sources_ reloadData]; -} - -- (NSString *) title { - return @"Installed Packages"; -} - -- (NSString *) backButtonTitle { - return @"Packages"; -} - -- (void) setDelegate:(id)delegate { - [super setDelegate:delegate]; - [packages_ setDelegate:delegate]; - [sources_ setDelegate:delegate]; -} - @end /* }}} */ /* Search View {{{ */ @@ -4833,7 +5255,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); initWithBook:book database:database title:nil - filter:@selector(isSearchedForBy:) + filter:@selector(isVisiblySearchedForBy:) with:nil ]; @@ -5183,16 +5605,6 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [database_ reloadData]; - if (Packages_ == nil) { - Packages_ = [[NSMutableDictionary alloc] initWithCapacity:128]; - [Metadata_ setObject:Packages_ forKey:@"Packages"]; - } - - if (Sections_ == nil) { - Sections_ = [[NSMutableDictionary alloc] initWithCapacity:32]; - [Metadata_ setObject:Sections_ forKey:@"Sections"]; - } - size_t changes(0); [essential_ removeAllObjects]; @@ -5237,25 +5649,60 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [hud removeFromSuperview];*/ } -- (void) updateData { +- (void) _saveConfig { if (Changed_) { _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES); Changed_ = false; } +} + +- (void) updateData { + [self _saveConfig]; /* XXX: this is just stupid */ if (tag_ != 2) [install_ reloadData]; if (tag_ != 3) [changes_ reloadData]; - if (tag_ != 4) - [manage_ reloadData]; if (tag_ != 5) [search_ reloadData]; [book_ reloadData]; } +- (void) update_ { + [database_ update]; +} + +- (void) syncData { + FILE *file = fopen("/etc/apt/sources.list.d/cydia.list", "w"); + _assert(file != NULL); + + NSArray *keys = [Sources_ allKeys]; + + for (int i(0), e([keys count]); i != e; ++i) { + NSString *key = [keys objectAtIndex:i]; + NSDictionary *source = [Sources_ objectForKey:key]; + + fprintf(file, "%s %s %s\n", + [[source objectForKey:@"Type"] UTF8String], + [[source objectForKey:@"URI"] UTF8String], + [[source objectForKey:@"Distribution"] UTF8String] + ); + } + + fclose(file); + + [self _saveConfig]; + + [progress_ + detachNewThreadSelector:@selector(update_) + toTarget:self + withObject:nil + title:@"Updating Sources..." + ]; +} + - (void) reloadData { @synchronized (self) { if (confirm_ == nil) @@ -5373,74 +5820,22 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); } } -- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { - NSString *context = [sheet context]; - if ([context isEqualToString:@"fixhalf"]) - switch (button) { - case 1: - @synchronized (self) { - for (int i = 0, e = [broken_ count]; i != e; ++i) { - Package *broken = [broken_ objectAtIndex:i]; - [broken remove]; - - NSString *id = [broken id]; - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]); - } - - [self resolve]; - [self perform]; - } - break; - - case 2: - [broken_ removeAllObjects]; - [self _loaded]; - break; - - default: - _assert(false); - } - else if ([context isEqualToString:@"upgrade"]) - switch (button) { - case 1: - @synchronized (self) { - for (int i = 0, e = [essential_ count]; i != e; ++i) { - Package *essential = [essential_ objectAtIndex:i]; - [essential install]; - } - - [self resolve]; - [self perform]; - } - break; - - case 2: - Ignored_ = YES; - break; - - default: - _assert(false); - } - - [sheet dismiss]; -} - - (void) setPage:(RVPage *)page { [page resetViewAnimated:NO]; [page setDelegate:self]; [book_ setPage:page]; } -- (RVPage *) _setHomePage { - BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease]; - [self setPage:browser]; - [browser loadURL:[NSURL URLWithString:@"http://cydia.saurik.com/"]]; +- (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class { + BrowserView *browser = [[[_class alloc] initWithBook:book_ database:database_] autorelease]; + [browser loadURL:url]; return browser; } +- (void) _setHomePage { + [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]]; +} + - (void) buttonBarItemTapped:(id)sender { unsigned tag = [sender tag]; if (tag == tag_) { @@ -5494,6 +5889,23 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [super applicationWillSuspend]; } +- (void) askForSettings { + UIAlertSheet *role = [[[UIAlertSheet alloc] + initWithTitle:@"Who Are You?" + buttons:[NSArray arrayWithObjects: + @"User (Graphical Only)", + @"Hacker (Command Line)", + @"Developer (No Filters)", + nil] + defaultButtonIndex:-1 + delegate:self + context:@"role" + ] autorelease]; + + [role setBodyText:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."]; + [role popupAlertAnimated:YES]; +} + - (void) finish { if (hud_ != nil) { [self setStatusBarShowsProgress:NO]; @@ -5512,6 +5924,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); return; } + if (Role_ == nil) { + [self askForSettings]; + return; + } + overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]]; CGRect screenrect = [UIHardware fullScreenApplicationContentRect]; @@ -5609,9 +6026,13 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); install_ = [[InstallView alloc] initWithBook:book_ database:database_]; changes_ = [[ChangesView alloc] initWithBook:book_ database:database_]; - manage_ = [[ManageView alloc] initWithBook:book_ database:database_]; search_ = [[SearchView alloc] initWithBook:book_ database:database_]; + manage_ = (ManageView *) [[self + _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]] + withClass:[ManageView class] + ] retain]; + if (!bootstrap_) [underlay_ addSubview:overlay_]; @@ -5623,6 +6044,86 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [self _setHomePage]; } +- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button { + NSString *context = [sheet context]; + if ([context isEqualToString:@"fixhalf"]) + switch (button) { + case 1: + @synchronized (self) { + for (int i = 0, e = [broken_ count]; i != e; ++i) { + Package *broken = [broken_ objectAtIndex:i]; + [broken remove]; + + NSString *id = [broken id]; + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]); + } + + [self resolve]; + [self perform]; + } + break; + + case 2: + [broken_ removeAllObjects]; + [self _loaded]; + break; + + default: + _assert(false); + } + else if ([context isEqualToString:@"role"]) { + switch (button) { + case 1: Role_ = @"User"; break; + case 2: Role_ = @"Hacker"; break; + case 3: Role_ = @"Developer"; break; + + default: + Role_ = nil; + _assert(false); + } + + bool reset = Settings_ != nil; + + Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys: + Role_, @"Role", + nil]; + + [Metadata_ setObject:Settings_ forKey:@"Settings"]; + + Changed_ = true; + + if (reset) + [self updateData]; + else + [self finish]; + } else if ([context isEqualToString:@"upgrade"]) + switch (button) { + case 1: + @synchronized (self) { + for (int i = 0, e = [essential_ count]; i != e; ++i) { + Package *essential = [essential_ objectAtIndex:i]; + [essential install]; + } + + [self resolve]; + [self perform]; + } + break; + + case 2: + Ignored_ = YES; + break; + + default: + _assert(false); + } + + [sheet dismiss]; +} + - (void) reorganize { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; system("/usr/libexec/cydia/free.sh"); @@ -5645,6 +6146,13 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); [super _setSuspended:value]; } +- (UIProgressHUD *) addProgressHUD { + UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_]; + [hud show:YES]; + [underlay_ addSubview:hud]; + return hud; +} + - (void) applicationDidFinishLaunching:(id)unused { _assert(pkgInitConfig(*_config)); _assert(pkgInitSystem(*_config, _system)); @@ -5682,10 +6190,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); ) { [self setIdleTimerDisabled:YES]; - hud_ = [[UIProgressHUD alloc] initWithWindow:window_]; + hud_ = [self addProgressHUD]; [hud_ setText:@"Reorganizing\n\nWill Automatically\nRestart When Done"]; - [hud_ show:YES]; - [underlay_ addSubview:hud_]; [self setStatusBarShowsProgress:YES]; @@ -5851,8 +6357,29 @@ int main(int argc, char *argv[]) { if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL) Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2]; else { + Settings_ = [Metadata_ objectForKey:@"Settings"]; + Packages_ = [Metadata_ objectForKey:@"Packages"]; Sections_ = [Metadata_ objectForKey:@"Sections"]; + Sources_ = [Metadata_ objectForKey:@"Sources"]; + } + + if (Settings_ != nil) + Role_ = [Settings_ objectForKey:@"Role"]; + + if (Packages_ == nil) { + Packages_ = [[[NSMutableDictionary alloc] initWithCapacity:128] autorelease]; + [Metadata_ setObject:Packages_ forKey:@"Packages"]; + } + + if (Sections_ == nil) { + Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease]; + [Metadata_ setObject:Sections_ forKey:@"Sections"]; + } + + if (Sources_ == nil) { + Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease]; + [Metadata_ setObject:Sources_ forKey:@"Sources"]; } if (access("/User", F_OK) != 0) @@ -5866,6 +6393,22 @@ int main(int argc, char *argv[]) { Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0); Red_.Set(space_, 1.0, 0.0, 0.0, 1.0); White_.Set(space_, 1.0, 1.0, 1.0, 1.0); + Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0); + + SectionMap_ = [NSMutableDictionary dictionaryWithCapacity:16]; { + std::ifstream fin([[[NSBundle mainBundle] pathForResource:@"sections" ofType:@"txt"] UTF8String]); + std::string line; + while (std::getline(fin, line)) { + size_t space = line.find_first_of(' '); + if (space == std::string::npos) + continue; + [SectionMap_ + setObject:[NSString stringWithUTF8String:line.substr(space + 1).c_str()] + forKey:[NSString stringWithUTF8String:line.substr(0, space).c_str()] + ]; + } + } + int value = UIApplicationMain(argc, argv, [Cydia class]); diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm index ccd3e426..d83d7608 100644 --- a/UICaboodle/RVBook.mm +++ b/UICaboodle/RVBook.mm @@ -172,8 +172,17 @@ - (void) reloadButtonsForPage:(RVPage *)page { if ([pages_ count] == 0 || page != [pages_ lastObject]) return; - NSString *leftButtonTitle([pages_ count] == 1 ? [page leftButtonTitle] : nil); - [navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle]]; + NSString *leftButtonTitle([page leftButtonTitle]); + RVUINavBarButtonStyle leftButtonStyle = [page leftButtonStyle]; + RVUINavBarButtonStyle rightButtonStyle = [page rightButtonStyle]; + //[navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle] leftBack:(leftButtonTitle == nil)]; + + [navbar_ + showLeftButton:leftButtonTitle + withStyle:leftButtonStyle + rightButton:[page rightButtonTitle] + withStyle:rightButtonStyle + ]; } - (NSString *) getTitleForPage:(RVPage *)page { diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h index 5065dd2d..8b0a2e41 100644 --- a/UICaboodle/RVPage.h +++ b/UICaboodle/RVPage.h @@ -2,6 +2,13 @@ #import +enum RVUINavBarButtonStyle { + RVUINavBarButtonStyleNormal, + RVUINavBarButtonStyleBack, + RVUINavBarButtonStyleHighlighted, + RVUINavBarButtonStyleDestructive +}; + @class NSString; @class RVBook; @@ -16,6 +23,9 @@ - (NSString *) leftButtonTitle; - (UIView *) accessoryView; +- (RVUINavBarButtonStyle) leftButtonStyle; +- (RVUINavBarButtonStyle) rightButtonStyle; + - (void) _rightButtonClicked; - (void) _leftButtonClicked; diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm index a92058ec..ee85a7ed 100644 --- a/UICaboodle/RVPage.mm +++ b/UICaboodle/RVPage.mm @@ -24,6 +24,14 @@ return nil; } +- (RVUINavBarButtonStyle) leftButtonStyle { + return [self leftButtonTitle] == nil ? RVUINavBarButtonStyleBack : RVUINavBarButtonStyleNormal; +} + +- (RVUINavBarButtonStyle) rightButtonStyle { + return RVUINavBarButtonStyleNormal; +} + - (void) _rightButtonClicked { [self doesNotRecognizeSelector:_cmd]; } diff --git a/makefile b/makefile index ee8fa99f..3a58e583 100644 --- a/makefile +++ b/makefile @@ -19,7 +19,7 @@ exec: exec.mm makefile $(target)g++ -Wall -Werror -o $@ $< -framework Foundation -framework CoreFoundation -lobjc Cydia: Cydia.mm ../uicaboodle.m/*.mm *.h makefile - $(target)g++ -I../uicaboodle.m -fobjc-call-cxx-cdtors -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework IOKit -framework CoreFoundation -framework Foundation -framework CoreGraphics -framework GraphicsServices $(frameworks) -lobjc -lapt-pkg -lpcre -fobjc-exceptions -I/apl/i20 -F"$${PKG_ROOT}"/System/Library/PrivateFrameworks + $(target)g++ -march=armv6 -mcpu=arm1176jzf-s -I../uicaboodle.m -fobjc-call-cxx-cdtors -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework IOKit -framework CoreFoundation -framework Foundation -framework CoreGraphics -framework GraphicsServices $(frameworks) -lobjc -lapt-pkg -lpcre -fobjc-exceptions -I/apl/i20 -F"$${PKG_ROOT}"/System/Library/PrivateFrameworks sign: Cydia CODESIGN_ALLOCATE=$$(which "$(target)codesign_allocate") /apl/tel/util/ldid -S Cydia -- 2.45.2

+
+
+ + +
+ + +
View or remove packages you previously installed.
+
+ +
+ + + +
+ + +
List current sources and add custom ones you may know.
+
+ +
+ + + +
+ + +
See how much room you have left for new packages.
+
+ +
+ + +
Coming Soon!
+ +
+
+