From 8c86c115d0e68584b0e7369f047a218c22f9bbad Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 8 Sep 2009 06:04:52 +0000 Subject: [PATCH 01/16] Stupid semicolons. --- Cydia.app/German.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cydia.app/German.lproj/Localizable.strings b/Cydia.app/German.lproj/Localizable.strings index 01041df7..78a818ca 100644 --- a/Cydia.app/German.lproj/Localizable.strings +++ b/Cydia.app/German.lproj/Localizable.strings @@ -179,7 +179,7 @@ "SPONSOR" = "Sponsor"; "SPONSORING_PRODUCTS" = "Unterstützende Produkte"; "STATISTICS" = "Statistik"; -"STILL_BROKEN_EX" = "Der Versuch, die kaputten Sektionen zu reparieren hat nichts gebracht." +"STILL_BROKEN_EX" = "Der Versuch, die kaputten Sektionen zu reparieren hat nichts gebracht."; "STORAGE" = "Speicherplatz"; "STORAGE_EX" = "Nachsehen, wieviel Speicherplatz für neue Pakete vorhanden ist."; "SUBMIT" = "Absenden"; -- 2.45.2 From 3d3f46666b0fc612216bb841c3ba31eff641d49b Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 8 Sep 2009 08:25:30 +0000 Subject: [PATCH 02/16] Fixed a stupid bug with trivial repo addition. --- Cydia.mm | 17 +++++++++++------ control | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Cydia.mm b/Cydia.mm index c6d6b522..fd160dfa 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -5626,11 +5626,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { NSError *error_; //NSURLConnection *installer_; + NSURLConnection *trivial_; NSURLConnection *trivial_bz2_; NSURLConnection *trivial_gz_; //NSURLConnection *automatic_; - BOOL trivial_; + BOOL cydia_; } - (id) initWithBook:(RVBook *)book database:(Database *)database; @@ -5659,6 +5660,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [error_ release]; //[self _deallocConnection:installer_]; + [self _deallocConnection:trivial_]; [self _deallocConnection:trivial_gz_]; [self _deallocConnection:trivial_bz2_]; //[self _deallocConnection:automatic_]; @@ -5780,7 +5782,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) _endConnection:(NSURLConnection *)connection { NSURLConnection **field = NULL; - if (connection == trivial_bz2_) + if (connection == trivial_) + field = &trivial_; + else if (connection == trivial_bz2_) field = &trivial_bz2_; else if (connection == trivial_gz_) field = &trivial_gz_; @@ -5789,12 +5793,13 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { *field = nil; if ( + trivial_ == nil && trivial_bz2_ == nil && trivial_gz_ == nil ) { bool defer(false); - if (trivial_) { + if (cydia_) { if (NSString *warning = [self yieldToSelector:@selector(getWarning)]) { defer = true; @@ -5857,7 +5862,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLResponse *)response { switch ([response statusCode]) { case 200: - trivial_ = YES; + cydia_ = YES; } } @@ -5908,12 +5913,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { href_ = href; href_ = [href_ retain]; - trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages"] method:@"HEAD"] retain]; + trivial_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages"] method:@"HEAD"] 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; + cydia_ = false; hud_ = [[delegate_ addProgressHUD] retain]; [hud_ setText:UCLocalize("VERIFYING_URL")]; diff --git a/control b/control index 3d372520..7d13b2f0 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 1.0.3027-1 +Version: 1.0.3030-1 Replaces: com.sosiphone.addcydia Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds, essential Pre-Depends: dpkg (>= 1.14.25-8) -- 2.45.2 From 12b7669a2bb7d4b93c01af5a98a436eb4529d4bd Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 8 Sep 2009 16:47:43 +0000 Subject: [PATCH 03/16] Fixed a really stupid memory corruption bug. --- Cydia.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Cydia.mm b/Cydia.mm index fd160dfa..579d17f4 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -1622,9 +1622,12 @@ typedef std::map< unsigned long, _H > SourceMap; host_ = [[host_ lowercaseString] retain]; if (host_ != nil) - authority_ = [host_ retain]; + authority_ = host_; else authority_ = [url path]; + + if (authority_ != nil) + authority_ = [authority_ retain]; } - (Source *) initWithMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool { -- 2.45.2 From bdc466daf638c629aa60b110ac654c5cbde94130 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 9 Sep 2009 22:03:03 +0000 Subject: [PATCH 04/16] OMG WTH. --- Cydia.mm | 2 +- control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cydia.mm b/Cydia.mm index 579d17f4..51eea376 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -8182,7 +8182,7 @@ static _finline void _setHomePage(Cydia *self) { [hud_ setText:@"Reorganizing\n\nWill Automatically\nClose When Done"]; [self setStatusBarShowsProgress:YES]; - [self yieldToSelector:@selector(system) withObject:@"http://www.hipsterwave.com/tag/cydia/"]; + [self yieldToSelector:@selector(system:) withObject:@"/usr/libexec/cydia/space.sh"]; [self setStatusBarShowsProgress:NO]; [self removeProgressHUD:hud_]; diff --git a/control b/control index 7d13b2f0..30ba83c8 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 1.0.3030-1 +Version: 1.0.3032-1 Replaces: com.sosiphone.addcydia Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds, essential Pre-Depends: dpkg (>= 1.14.25-8) -- 2.45.2 From 22b21e43c03d2fa0cb51c7cad6a2762c07d63715 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 16 Sep 2009 20:46:06 +0000 Subject: [PATCH 05/16] I hate you Apple, and your tiny little iframes, too. --- Cydia.app/package.html | 14 +++++++++ Cydia.app/package.js | 26 ++++++++++++++-- Cydia.mm | 69 +++++++++--------------------------------- control | 2 +- 4 files changed, 53 insertions(+), 58 deletions(-) diff --git a/Cydia.app/package.html b/Cydia.app/package.html index 317f41b2..5bd2f4c6 100644 --- a/Cydia.app/package.html +++ b/Cydia.app/package.html @@ -9,6 +9,20 @@ + + + + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/Cydia.app/icon-72.png b/Cydia.app/icon-72.png new file mode 100644 index 0000000000000000000000000000000000000000..83a19f99892069e712ef0cb42dd5274c38920176 GIT binary patch literal 14538 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òlU<@cYHEv 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 Vblhwect#umkdaUnuMss2{2v`sd$#}p literal 0 HcmV?d00001 diff --git a/Cydia.mm b/Cydia.mm index 120a97b5..77acf567 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -378,7 +378,7 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | #define TraceLogging (1 && !ForRelease) #define HistogramInsertionSort (0 && !ForRelease) #define ProfileTimes (0 && !ForRelease) -#define ForSaurik (1 && !ForRelease) +#define ForSaurik (0 && !ForRelease) #define LogBrowser (0 && !ForRelease) #define TrackResize (0 && !ForRelease) #define ManualRefresh (1 && !ForRelease) @@ -386,7 +386,7 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | #define IgnoreInstall (0 && !ForRelease) #define RecycleWebViews 0 #define RecyclePackageViews (1 && ForRelease) -#define AlwaysReload (1 && !ForRelease) +#define AlwaysReload (0 && !ForRelease) #if !TraceLogging #undef _trace diff --git a/control b/control index 9958a4af..09deb27a 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 1.0.3140-1 +Version: 1.0.3159-1 Replaces: com.sosiphone.addcydia Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds, essential Pre-Depends: dpkg (>= 1.14.25-8) -- 2.45.2 From 575ffd3c53c5d96c9752926f4aadbd8a2ac1f1bb Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 7 Apr 2010 13:13:52 +0000 Subject: [PATCH 14/16] This is working well. --- Cydia.app/Default-Portrait.png | Bin 0 -> 4800 bytes Cydia.app/Info.plist | 2 +- Cydia.app/confirm.html | 4 +- Cydia.app/menes/style.css | 218 +++++++++++++++++++++------------ Cydia.app/package.html | 4 +- Cydia.app/storage.html | 6 +- Cydia.mm | 67 +++------- control | 4 +- 8 files changed, 166 insertions(+), 139 deletions(-) create mode 100644 Cydia.app/Default-Portrait.png diff --git a/Cydia.app/Default-Portrait.png b/Cydia.app/Default-Portrait.png new file mode 100644 index 0000000000000000000000000000000000000000..c24b27e32fcf6938b1f008d06de0f25126c46b11 GIT binary patch literal 4800 zcmd^DZAg<*6h52FbY)F5l)ik!k1Q%O!-}GAGMj^@Vky#(Sf$Cb#1d5cfJ<0WP*JNz z`GNi@Lt;fAe+<)DRMLltRGJg}W0_?+LHuE5=S;JP@2ndv7X7$;@9sVKoacGYxi7ru zSW1#EKs`eZ00H_$Z7P5dPJKT3`QoE*Vp}0T6#1#Tc(6X3^$s9tpI*CeQ_-s)drWTd zI?a)$y6m`H2WGx4iVa_>oU*OqeoJviUjpBiaB`zAQB?}Xr99(CS+4b7Qf*=J@i!&i zA1#>?4V|4?R;zVyL4n0=He-Z`yX!jMIvghvVD_%h2fgvAYr=hF1>h_Kx0120Q z+62A|pDEF>FU(}X85-oN&{ManKGbv){rj;;pDqaUI!Bu~5+uD#fDHLF*>N}X# zKA5+|%KAv-urJ$OTO_)@5(u@YZbjj&LJLK{!2qZjTz>#vixtSN3^Ho6nF1;{z?0@u zQ@H_|FHqH=zt*wTVAdly#iBh*vS#X<+^TN17pJj>D71A(4NfM2KOMzaisS zySHH)A1x;Z$C${!N!+X9en(!7F##FDaQ{|tzat-6pd>~kdl@E9iU?q05Q?nj<#6xD z{f>MIcsLQFq@8!)%P=uYoB$??>;(&!(;0!>F|zj{Ci!9+zZks@)A(q|W=KH((ZixT zc^Z>INpLD5g%Mdx&KdsvCc1x}G$r~ssWOs=L=`O#;Y45z0Zbgt|8-1^ICz;(qL?J& zAn>jiy*lKd;SkYDB6|;F5-8K*tHT2UIDrzlM2zeOibEp%KOvo-d9yvYd2_5ke${Ir zIXRhvR%6q_hF|rJywbvo&07@MD2d;N^9qf#vyj=me_(Pnz$Smt@t;gbQ~dQN^isRw zM=K%@Ph*FJoG=`aGue5xA_ZD#X`~+!uP{=Fh{9%6TC_-t1)BeYgegsH=dbMT96Ztb P97BUXAxUeEHy-*1^$tz0 literal 0 HcmV?d00001 diff --git a/Cydia.app/Info.plist b/Cydia.app/Info.plist index 7af583c2..05d10f1e 100644 --- a/Cydia.app/Info.plist +++ b/Cydia.app/Info.plist @@ -54,7 +54,7 @@ UIDeviceFamily 1 - + 2 UISupportedInterfaceOrientations diff --git a/Cydia.app/confirm.html b/Cydia.app/confirm.html index 3f01c116..335a3267 100644 --- a/Cydia.app/confirm.html +++ b/Cydia.app/confirm.html @@ -9,7 +9,7 @@ - +

:

@@ -37,5 +37,5 @@
-
 + diff --git a/Cydia.app/menes/style.css b/Cydia.app/menes/style.css index d558e839..a9d32409 100644 --- a/Cydia.app/menes/style.css +++ b/Cydia.app/menes/style.css @@ -52,12 +52,13 @@ * { border: 0; + -moz-border-radius: 0; -webkit-border-radius: 0; box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; -webkit-box-sizing: border-box; - font-family: inherit; + /*font-family: inherit;*/ font-size: 100%; font-style: inherit; font-weight: inherit; @@ -83,11 +84,17 @@ select { border: 1px solid #999999; } -body { +panel { + display: block; width: 320px; - font-family: Helvetica; +} + +body { + font-family: Helvetica, Arial; -webkit-text-size-adjust: none; -webkit-user-select: none; + margin: 0 auto; + width: 320px; } body.white { @@ -133,6 +140,10 @@ em { color: #aaaabb; } +.deleted { + display: none; +} + /* #toolbar {{{ */ dialog > toolbar { background: url(toolbar.png) #6d84a2 repeat-x; @@ -190,11 +201,12 @@ panel > block { border-top: 1px solid #999999; border-left: 1px dotted #999999; border-right: 1px dotted #999999; + -moz-border-radius: 9px; -webkit-border-radius: 9px; //border: 1px solid #999999; display: block; font-size: 16px; - margin: 9px 10px; + margin: 9px; padding: 0 10px; } @@ -206,6 +218,7 @@ panel > block > hr { panel > fieldset { background-color: #ffffff; border: 1px solid #999999; + -moz-border-radius: 9px; -webkit-border-radius: 9px; font-size: 16px; margin: 9px; @@ -213,6 +226,7 @@ panel > fieldset { panel > input[type="submit"] { /*-webkit-border-image: url(whiteButton.png) 0 12 0 12; + -moz-border-radius: 0; -webkit-border-radius: 0; border-width: 0px 12px;*/ border: none; @@ -255,11 +269,9 @@ panel > fieldset > textarea { border-top: 1px solid #999999; } -.deleted { - display: none; -} - -panel > fieldset > a.right:nth-child(2), +/* XXX: should be a.left:nth-last-child(2) */ +panel > fieldset > a.left, +panel > fieldset > a.middle, panel > fieldset > a:first-child, panel > fieldset > div:first-child, panel > fieldset > textarea:first-child { @@ -289,37 +301,39 @@ fieldset > a[type="ad"] { padding: 4px 4px 2px 5px; } -panel > fieldset > a[type="ad"]:first-child > div:first-of-type, -panel > fieldset > a[type="comment"]:first-child > div:first-of-type, -panel > fieldset > a[type="profile"]:first-child > div:first-of-type, -panel > fieldset > a[type="thumb"]:first-child > div:first-of-type { +panel > fieldset > a[type="ad"]:first-child > div:first-child, +panel > fieldset > a[type="comment"]:first-child > div:first-child, +panel > fieldset > a[type="profile"]:first-child > div:first-child, +panel > fieldset > a[type="thumb"]:first-child > div:first-child { + -moz-border-radius-topleft: 9px; -webkit-border-top-left-radius: 9px; } -panel > fieldset > a[type="ad"]:last-child > div:first-of-type, -panel > fieldset > a[type="comment"]:last-child > div:first-of-type, -panel > fieldset > a[type="profile"]:last-child > div:first-of-type, -panel > fieldset > a[type="thumb"]:last-child > div:first-of-type { +panel > fieldset > a[type="ad"]:last-child > div:first-child, +panel > fieldset > a[type="comment"]:last-child > div:first-child, +panel > fieldset > a[type="profile"]:last-child > div:first-child, +panel > fieldset > a[type="thumb"]:last-child > div:first-child { + -moz-border-radius-bottomleft: 9px; -webkit-border-bottom-left-radius: 9px; } -fieldset > a[type="ad"] > div:first-of-type { +fieldset > a[type="ad"] > div:first-child { border: 1px solid #999999; } -list > fieldset > a[type="comment"] > div:first-of-type, -list > fieldset > a[type="profile"] > div:first-of-type, -list > fieldset > a[type="thumb"] > div:first-of-type { +list > fieldset > a[type="comment"] > div:first-child, +list > fieldset > a[type="profile"] > div:first-child, +list > fieldset > a[type="thumb"] > div:first-child { border: 1px solid #e0e0e0; } -panel > fieldset > a[type="comment"] > div:first-of-type { +panel > fieldset > a[type="comment"] > div:first-child { border: 1px solid #999999; border-bottom-style: dashed; } -panel > fieldset > a[type="profile"] > div:first-of-type, -panel > fieldset:not(.header) > a[type="thumb"] > div:first-of-type { +panel > fieldset > a[type="profile"] > div:first-child, +panel > fieldset:not(.header) > a[type="thumb"] > div:first-child { border: 1px solid #999999; } @@ -336,7 +350,7 @@ div[tile="media"] { background-image: url(http://cache.saurik.com/cydia/tile/med div[tile="music"] { background-image: url(http://cache.saurik.com/cydia/tile/video.png); } div[tile="site"] { background-image: url(http://cache.saurik.com/cydia/tile/site.png); } -fieldset > a[type="ad"] > div:first-of-type { +fieldset > a[type="ad"] > div:first-child { background-repeat: no-repeat; background-position: center center; border-right: none; @@ -353,32 +367,32 @@ panel > fieldset > a[type="comment"] { border-bottom-style: dashed; } -fieldset > a[type="comment"] > div:first-of-type { +fieldset > a[type="comment"] > div:first-child { -webkit-background-size: 44px; height: 44px; width: 44px; } -fieldset > a[type="header"] > div:first-of-type { +fieldset > a[type="header"] > div:first-child { height: 64px; width: 64px; } -fieldset > a[type="profile"] > div:first-of-type { +fieldset > a[type="profile"] > div:first-child { -webkit-background-size: 50px; height: 50px; width: 50px; } -fieldset > a[type="thumb"] > div:first-of-type { +fieldset > a[type="thumb"] > div:first-child { height: 64px; width: 64px; } -fieldset > a[type="comment"] > div:first-of-type, -fieldset > a[type="header"] > div:first-of-type, -fieldset > a[type="profile"] > div:first-of-type, -fieldset > a[type="thumb"] > div:first-of-type { +fieldset > a[type="comment"] > div:first-child, +fieldset > a[type="header"] > div:first-child, +fieldset > a[type="profile"] > div:first-child, +fieldset > a[type="thumb"] > div:first-child { background-repeat: no-repeat; background-position: center center; display: inline-block; @@ -397,11 +411,16 @@ fieldset > div > img.icon { width: 30px; } +fieldset > a.sixth > img.icon { + position: relative; + left: 7px; +} + panel > block > p, fieldset > div > p, panel > block > ul, fieldset > div > ul { - margin: 11px 0; + margin: 10px 0; } panel > block > ul, @@ -430,8 +449,9 @@ fieldset > a { } fieldset > textarea, -fieldset > div > input, -fieldset > div > select { +fieldset > div > input:not([type="checkbox"]), +fieldset > div > select, +fieldset > div > div > select { background: none; -webkit-box-shadow: none; -webkit-appearance: none; @@ -440,34 +460,44 @@ fieldset > div > select { /* Chevrons {{{ */ fieldset > a[href]:not([type="ad"]), -fieldset > div > select { +fieldset > div > select, +fieldset > div > div > select { background-repeat: no-repeat; background-image: url(chevron.png); - background-position-y: center; } /* Horizontal */ list > fieldset > a[href] { - background-position-x: 295px; + background-position: 295px center; } panel > fieldset > a[href] { - background-position-x: 275px; + background-position: 275px center; } panel > fieldset > a[href].half { - background-position-x: 125px; + background-position: 125px center; +} + +panel > fieldset > a[href].third { + background-position: 75px center; +} + +panel > fieldset > a[href].sixth { + background: none; } list > fieldset > a:not([href]) > select, -list > fieldset > div > select { - background-position-x: 183px; +list > fieldset > div > select, +list > fieldset > div > div > select { + background-position: 183px center; } panel > fieldset > a:not([href]) > select, -panel > fieldset > div > select { - background-position-x: 163px; +panel > fieldset > div > select, +panel > fieldset > div > div > select { + background-position: 163px center; } /* }}} */ @@ -475,14 +505,16 @@ panel > fieldset > div > select { fieldset > textarea, fieldset > div > input, fieldset > div > select, -fieldset > a > div > label:nth-of-type(2), -fieldset > div > div > label:nth-of-type(2) { +fieldset > div > div > select, +fieldset > a > div > label + label, +fieldset > div > div > label + label { color: #193250; } fieldset > textarea, fieldset > div > input, -fieldset > div > select { +fieldset > div > select, +fieldset > div > div > select { font-size: 16px; } @@ -491,8 +523,19 @@ fieldset > div > input { padding-right: 14px; } +fieldset > div > input[type="checkbox"] { + border: 1px solid #999999; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + float: right; + margin: -7px -8px; + height: 30px; + width: 30px; +} + fieldset > div > select, -fieldset > div > input { +fieldset > div > div > select, +fieldset > div > input:not([type="checkbox"]) { border: none; float: right; height: 40px; @@ -500,12 +543,14 @@ fieldset > div > input { } panel > fieldset > div > select, -panel > fieldset > div > input { +panel > fieldset > div > div > select, +panel > fieldset > div > input:not([type="checkbox"]) { width: 187px; } list > fieldset > div > select, -list > fieldset > div > input { +list > fieldset > div > div > select, +list > fieldset > div > input:not([type="checkbox"]) { width: 207px; } @@ -523,7 +568,7 @@ fieldset > div > div { width: 273px; } -fieldset > a[type="ad"] > div:nth-of-type(2) { +fieldset > a[type="ad"] > div:nth-child(2) { width: 218px; } @@ -540,64 +585,64 @@ fieldset > a[href] > img.icon + div { width: 221px; } -fieldset > a[type="profile"] > div:nth-of-type(2) > label:nth-of-type(1).unknown { +fieldset > a[type="profile"] > div:nth-child(2) > label:nth-child(1).unknown { color: #aaaabb; } -fieldset > a[type="profile"] > div:nth-of-type(2) > label:only-of-type { +fieldset > a[type="profile"] > div:nth-child(2) > label:only-child { left: 4px; position: relative; top: 3px; } -fieldset > a[type="thumb"] > div:nth-of-type(2) > label:only-of-type { +fieldset > a[type="thumb"] > div:nth-child(2) > label:only-child { position: relative; top: 10px; } -fieldset > a[type="profile"] > div:nth-of-type(2) > label:nth-of-type(2) { +fieldset > a[type="profile"] > div:nth-child(2) > label + label { display: block; font-size: 13px; margin-top: 2px; } -fieldset > a[type="thumb"] > div:nth-of-type(2) > label:nth-of-type(2) { +fieldset > a[type="thumb"] > div:nth-child(2) > label + label { display: block; margin-top: 2px; } -fieldset > a[type="profile"] > div:nth-of-type(2) { +fieldset > a[type="profile"] > div:nth-child(2) { width: 207px; } -fieldset > a[type="thumb"] > div:nth-of-type(2) { +fieldset > a[type="thumb"] > div:nth-child(2) { width: 193px; } -fieldset > a[type="profile"] > div:nth-of-type(2) { +fieldset > a[type="profile"] > div:nth-child(2) { margin: -5px 0; } -fieldset > a[type="profile"] > div:nth-of-type(2), -fieldset > a[type="thumb"] > div:nth-of-type(2) { +fieldset > a[type="profile"] > div:nth-child(2), +fieldset > a[type="thumb"] > div:nth-child(2) { vertical-align: top; } -fieldset > a > label:first-of-type, -fieldset > a > div > label:first-of-type, -fieldset > div > label:first-of-type, -fieldset > div > div > label:first-of-type { +fieldset > a > label:first-child, +fieldset > a > div > label:first-child, +fieldset > div > label:first-child, +fieldset > div > div > label:first-child { font-weight: bold; } /* XXX: this doesn't handle icon offsets */ -list > fieldset > a:not([type]) > div > label:nth-of-type(2), -list > fieldset > div > div > label:nth-of-type(2) { +list > fieldset > a:not([type]) > div > label + label, +list > fieldset > div > div > label + label { margin-left: 94px; } -panel > fieldset > a:not([type]) > div > label:nth-of-type(2), -panel > fieldset > div > div > label:nth-of-type(2) { +panel > fieldset > a:not([type]) > div > label + label, +panel > fieldset > div > div > label + label { float: right; text-align: right; } @@ -612,19 +657,19 @@ panel > img { fieldset > a[type="ad"] { } -fieldset > a[type="ad"] > div:nth-of-type(2) { +fieldset > a[type="ad"] > div:nth-child(2) { position: relative; vertical-align: top; } -fieldset > a[type="ad"] > div > label:nth-of-type(1) { +fieldset > a[type="ad"] > div > label:first-child { color: #2d2d50; font-size: 13px; font-weight: bold; line-height: 15px; } -fieldset > a[type="ad"] > div > label:nth-of-type(2) { +fieldset > a[type="ad"] > div > label + label { position: absolute; top: 17px; left: 156px; @@ -632,6 +677,7 @@ fieldset > a[type="ad"] > div > label:nth-of-type(2) { font-weight: normal; } +panel > fieldset > a.middle, panel > fieldset > a.right { border-left: 1px solid #999999; } @@ -641,9 +687,19 @@ panel > fieldset > a.half { width: 150px; } +panel > fieldset > a.third { + display: inline-block; + width: 100px; +} + +panel > fieldset > a.sixth { + display: inline-block; + width: 50px; +} + fieldset.half > a { background: none; - background-position-x: 120px; + background-position: 120px center; } fieldset.half > a > img.icon + div { @@ -674,10 +730,12 @@ list > fieldset.dashed > textarea { } fieldset > a[type="thumb"]:first-child > back { + -moz-border-radius-topright: 9px; -webkit-border-top-right-radius: 9px; } fieldset > a[type="thumb"]:last-child > back { + -moz-border-radius-bottomright: 9px; -webkit-border-bottom-right-radius: 9px; } @@ -695,6 +753,7 @@ fieldset > a[type="thumb"] > back { .mm { border: 1px solid #999999; + -moz-border-radius: 9px; -webkit-border-radius: 9px; } @@ -729,6 +788,14 @@ fieldset > a.small.half > img.icon + div { width: 79px; } +fieldset > a.small.third > img.icon + div { + width: 50px; +} + +fieldset > a.small.sixth > img.icon + div { + width: 0px; +} + panel.centered > label { margin-left: 0px; margin-right: 0px; @@ -739,6 +806,7 @@ panel > iframe { margin: -9px 0; } +panel > iframe:first-child, panel > iframe + iframe { margin-top: 0; } @@ -799,7 +867,7 @@ panel > iframe + iframe { panel > fieldset.header { background-color: transparent; border: none; - margin: -5px 0 -11px 0; + margin: -5px 9px -11px 9px; } panel > fieldset.header > a > div > label { diff --git a/Cydia.app/package.html b/Cydia.app/package.html index 7a737019..aacd6b7c 100644 --- a/Cydia.app/package.html +++ b/Cydia.app/package.html @@ -198,7 +198,7 @@ } - + - + diff --git a/Cydia.app/storage.html b/Cydia.app/storage.html index 033ff4fc..55ac5abf 100644 --- a/Cydia.app/storage.html +++ b/Cydia.app/storage.html @@ -195,8 +195,7 @@ } - - + + diff --git a/Cydia.mm b/Cydia.mm index 77acf567..9cebd988 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -1001,6 +1001,7 @@ class CGColor { /* Random Global Variables {{{ */ static const int PulseInterval_ = 50000; +static const int ButtonBarWidth_ = 60; static const int ButtonBarHeight_ = 48; static const float KeyboardTime_ = 0.3f; @@ -4357,55 +4358,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { case 4: [close_ setTitle:UCLocalize("REBOOT_DEVICE")]; break; } -#define ListCache_ "/User/Library/Caches/com.apple.mobile.installation.plist" -#define IconCache_ "/User/Library/Caches/com.apple.springboard-imagecache-icons.plist" - - unlink(IconCache_); - - if (NSMutableDictionary *cache = [[NSMutableDictionary alloc] initWithContentsOfFile:@ListCache_]) { - [cache autorelease]; - - NSFileManager *manager([NSFileManager defaultManager]); - NSError *error(nil); - - id system([cache objectForKey:@"System"]); - if (system == nil) - goto error; - - struct stat info; - if (stat(ListCache_, &info) == -1) - goto error; - - [system removeAllObjects]; - - if (NSArray *apps = [manager contentsOfDirectoryAtPath:@"/Applications" error:&error]) { - for (NSString *app in apps) - if ([app hasSuffix:@".app"]) { - NSString *path = [@"/Applications" stringByAppendingPathComponent:app]; - NSString *plist = [path stringByAppendingPathComponent:@"Info.plist"]; - if (NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithContentsOfFile:plist]) { - [info autorelease]; - if ([info objectForKey:@"CFBundleIdentifier"] != nil) { - [info setObject:path forKey:@"Path"]; - [info setObject:@"System" forKey:@"ApplicationType"]; - [system addInfoDictionary:info]; - } - } - } - } else goto error; - - [cache writeToFile:@ListCache_ atomically:YES]; - - if (chown(ListCache_, info.st_uid, info.st_gid) == -1) - goto error; - if (chmod(ListCache_, info.st_mode) == -1) - goto error; - - if (false) error: - lprintf("%s\n", error == nil ? strerror(errno) : [[error localizedDescription] UTF8String]); - } - - notify_post("com.apple.mobile.application_installed"); + system("su -c /usr/bin/uicache mobile"); [delegate_ setStatusBarShowsProgress:NO]; } @@ -4871,7 +4824,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (id) init { if ((self = [super init]) != nil) { icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain]; - switch_ = [[_UISwitchSlider alloc] initWithFrame:CGRectMake(218, 9, 60, 25)]; [switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventTouchUpInside]; } return self; @@ -4927,7 +4879,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if (!selected) UISetColor(Black_); - [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(editing_ ? 164 : 250) withFont:Font22Bold_ ellipsis:2]; + + float width(rect.size.width + 23); + if (editing_) + width -= 86; + + [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 170) withFont:Font22Bold_ ellipsis:2]; CGSize size = [count_ sizeWithFont:Font14_]; @@ -5237,7 +5194,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { frame.size.height = 0; [webview_ setFrame:frame]; - [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + if ([scroller_ respondsToSelector:@selector(scrollPointVisibleAtTopLeft:)]) + [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + else + [scroller_ scrollRectToVisible:CGRectZero animated:NO]; WebThreadLock(); [[[webview_ webView] windowScriptObject] setValue:package_ forKey:@"package"]; @@ -8261,7 +8221,8 @@ static _finline void _setHomePage(Cydia *self) { for (int i = 0; i != 5; ++i) [[toolbar_ viewWithTag:(i + 1)] setFrame:CGRectMake( - i * 64 + 2, 1, 60, ButtonBarHeight_ + i * (screenrect.size.width / 5) + (screenrect.size.width / 5 - ButtonBarWidth_) / 2, 1, + ButtonBarWidth_, ButtonBarHeight_ )]; [toolbar_ showSelectionForButton:1]; diff --git a/control b/control index 09deb27a..cd974de0 100644 --- a/control +++ b/control @@ -3,9 +3,9 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 1.0.3159-1 +Version: 1.0.3163-1 Replaces: com.sosiphone.addcydia -Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds, essential +Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds, uikittools Pre-Depends: dpkg (>= 1.14.25-8) Conflicts: com.sosiphone.addcydia Description: graphical iPhone front-end for APT -- 2.45.2 From d4f84362aecb14bc7343022545139727d3ad7191 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Fri, 9 Apr 2010 07:16:07 +0000 Subject: [PATCH 15/16] Scrollers and keyboards and things. --- Cydia.mm | 3 +- UICaboodle/BrowserView.mm | 170 +++++++++++++++++++++++++++++++------- UICaboodle/RVBook.h | 2 + UICaboodle/RVPage.h | 2 + UICaboodle/RVPage.mm | 4 + UICaboodle/UCPlatform.h | 6 +- control | 2 +- 7 files changed, 154 insertions(+), 35 deletions(-) diff --git a/Cydia.mm b/Cydia.mm index 9cebd988..26c23c5a 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -8547,7 +8547,8 @@ int main(int argc, char *argv[]) { _pooled if ($GSFontSetUseLegacyFontMetrics != NULL) $GSFontSetUseLegacyFontMetrics(YES); - UIKeyboardDisableAutomaticAppearance(); + // XXX: I have a feeling this was important + //UIKeyboardDisableAutomaticAppearance(); /* }}} */ Colon_ = UCLocalize("COLON_DELIMITED"); diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 61437118..f479dd51 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -10,10 +10,12 @@ extern NSString * const kCAFilterNearest; #include "substrate.h" -#define ForSaurik 0 +#define ForSaurik 1 static CFArrayRef (*$GSSystemCopyCapability)(CFStringRef); static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); +static Class $UIFormAssistant; +static Class $UIWebBrowserView; @interface NSString (UIKit) - (NSString *) stringByAddingPercentEscapes; @@ -144,7 +146,7 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); @end -#define ShowInternals 0 +#define ShowInternals 1 #define LogBrowser 0 #define lprintf(args...) fprintf(stderr, args) @@ -166,6 +168,11 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); $GSSystemCopyCapability = reinterpret_cast(dlsym(RTLD_DEFAULT, "GSSystemCopyCapability")); $GSSystemGetCapability = reinterpret_cast(dlsym(RTLD_DEFAULT, "GSSystemGetCapability")); + $UIFormAssistant = objc_getClass("UIFormAssistant"); + + $UIWebBrowserView = objc_getClass("UIWebBrowserView"); + if ($UIWebBrowserView == nil) + $UIWebBrowserView = objc_getClass("UIWebDocumentView"); } - (void) dealloc { @@ -196,7 +203,10 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); [webview_ setDelegate:nil]; [webview_ setGestureDelegate:nil]; - [webview_ setFormEditingDelegate:nil]; + + if ([webview_ respondsToSelector:@selector(setFormEditingDelegate:)]) + [webview_ setFormEditingDelegate:nil]; + [webview_ setInteractionDelegate:nil]; [indirect_ setDelegate:nil]; @@ -294,10 +304,11 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); /* XXX: WebThreadLock? */ - (void) _fixScroller:(CGRect)bounds { float extra; - if (!editing_) + + if (!editing_ || $UIFormAssistant == nil) extra = 0; else { - UIFormAssistant *assistant([UIFormAssistant sharedFormAssistant]); + UIFormAssistant *assistant([$UIFormAssistant sharedFormAssistant]); CGRect peripheral([assistant peripheralFrame]); #if LogBrowser NSLog(@"per:%f", peripheral.size.height); @@ -307,16 +318,18 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); CGRect subrect([scroller_ frame]); subrect.size.height -= extra; - [scroller_ setScrollerIndicatorSubrect:subrect]; - NSSize visible(NSMakeSize(subrect.size.width, subrect.size.height)); - [webview_ setValue:[NSValue valueWithSize:visible] forGestureAttribute:UIGestureAttributeVisibleSize]; + if ([scroller_ respondsToSelector:@selector(setScrollerIndicatorSubrect:)]) + [scroller_ setScrollerIndicatorSubrect:subrect]; + + [webview_ setValue:[NSValue valueWithSize:NSMakeSize(subrect.size.width, subrect.size.height)] forGestureAttribute:UIGestureAttributeVisibleSize]; CGSize size(size_); size.height += extra; [scroller_ setContentSize:size]; - [scroller_ releaseRubberBandIfNecessary]; + if ([scroller_ respondsToSelector:@selector(releaseRubberBandIfNecessary)]) + [scroller_ releaseRubberBandIfNecessary]; } - (void) fixScroller { @@ -938,7 +951,14 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); [book_ reloadTitleForPage:self]; - [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + CGRect webrect = [scroller_ bounds]; + webrect.size.height = 1; + [webview_ setFrame:webrect]; + + if ([scroller_ respondsToSelector:@selector(scrollPointVisibleAtTopLeft:)]) + [scroller_ scrollPointVisibleAtTopLeft:CGPointZero]; + else + [scroller_ scrollRectToVisible:CGRectZero animated:NO]; if ([scroller_ respondsToSelector:@selector(setZoomScale:duration:)]) [scroller_ setZoomScale:1 duration:0]; @@ -946,10 +966,6 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); [scroller_ _setZoomScale:1 duration:0]; /*else if ([scroller_ respondsToSelector:@selector(setZoomScale:animated:)]) [scroller_ setZoomScale:1 animated:NO];*/ - - CGRect webrect = [scroller_ bounds]; - webrect.size.height = 0; - [webview_ setFrame:webrect]; } [self reloadButtons]; @@ -1071,6 +1087,8 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); - (void) webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { [self _didFailWithError:error forFrame:frame]; + if ([webview_ respondsToSelector:@selector(webView:didFailLoadWithError:forFrame:)]) + [webview_ webView:sender didFailLoadWithError:error forFrame:frame]; } - (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { @@ -1083,11 +1101,93 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); #endif } +- (void) webView:(WebView *)sender didReceiveMessage:(NSDictionary *)dictionary { +#if LogBrowser || ForSaurik + lprintf("Console:%s\n", [[dictionary description] UTF8String]); +#endif + if ([webview_ respondsToSelector:@selector(webView:didReceiveMessage:)]) + [webview_ webView:sender didReceiveMessage:dictionary]; +} + +- (void) webView:(id)sender willCloseFrame:(id)frame { + if ([webview_ respondsToSelector:@selector(webView:willCloseFrame:)]) + [webview_ webView:sender willCloseFrame:frame]; +} + +- (void) webView:(id)sender didFinishDocumentLoadForFrame:(id)frame { + if ([webview_ respondsToSelector:@selector(webView:didFinishDocumentLoadForFrame:)]) + [webview_ webView:sender didFinishDocumentLoadForFrame:frame]; +} + +- (void) webView:(id)sender didFirstLayoutInFrame:(id)frame { + if ([webview_ respondsToSelector:@selector(webView:didFirstLayoutInFrame:)]) + [webview_ webView:sender didFirstLayoutInFrame:frame]; +} + +- (void) webViewFormEditedStatusHasChanged:(id)changed { + if ([webview_ respondsToSelector:@selector(webViewFormEditedStatusHasChanged:)]) + [webview_ webViewFormEditedStatusHasChanged:changed]; +} + +- (void) webView:(id)sender formStateDidFocusNode:(id)formState { + if ([webview_ respondsToSelector:@selector(webView:formStateDidFocusNode:)]) + [webview_ webView:sender formStateDidFocusNode:formState]; +} + +- (void) webView:(id)sender formStateDidBlurNode:(id)formState { + if ([webview_ respondsToSelector:@selector(webView:formStateDidBlurNode:)]) + [webview_ webView:sender formStateDidBlurNode:formState]; +} + /* XXX: fix this stupid include file - (void) webView:(WebView *)sender frame:(WebFrame *)frame exceededDatabaseQuotaForSecurityOrigin:(WebSecurityOrigin *)origin database:(NSString *)database { [origin setQuota:0x500000]; }*/ +- (void) webViewDidLayout:(id)sender { + [webview_ webViewDidLayout:sender]; +} + +- (void) webView:(id)sender didFirstVisuallyNonEmptyLayoutInFrame:(id)frame { + [webview_ webView:sender didFirstVisuallyNonEmptyLayoutInFrame:frame]; +} + +- (void) webView:(id)sender saveStateToHistoryItem:(id)item forFrame:(id)frame { + [webview_ webView:sender saveStateToHistoryItem:item forFrame:frame]; +} + +- (void) webView:(id)sender restoreStateFromHistoryItem:(id)item forFrame:(id)frame force:(BOOL)force { + [webview_ webView:sender restoreStateFromHistoryItem:item forFrame:frame force:force]; +} + +- (void) webView:(id)sender attachRootLayer:(id)layer { + [webview_ webView:sender attachRootLayer:layer]; +} + +- (id) webView:(id)sender plugInViewWithArguments:(id)arguments fromPlugInPackage:(id)package { + return [webview_ webView:sender plugInViewWithArguments:arguments fromPlugInPackage:package]; +} + +- (void) webView:(id)sender willShowFullScreenForPlugInView:(id)view { + [webview_ webView:sender willShowFullScreenForPlugInView:view]; +} + +- (void) webView:(id)sender didHideFullScreenForPlugInView:(id)view { + [webview_ webView:sender didHideFullScreenForPlugInView:view]; +} + +- (void) webView:(id)sender willAddPlugInView:(id)view { + [webview_ webView:sender willAddPlugInView:view]; +} + +- (void) webView:(id)sender didObserveDeferredContentChange:(int)change forFrame:(id)frame { + [webview_ webView:sender didObserveDeferredContentChange:change forFrame:frame]; +} + +- (void) webViewDidPreventDefaultForEvent:(id)sender { + [webview_ webViewDidPreventDefaultForEvent:sender]; +} + - (void) _setTileDrawingEnabled:(BOOL)enabled { //[webview_ setTileDrawingEnabled:enabled]; } @@ -1126,7 +1226,7 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); struct CGRect bounds = [self bounds]; - scroller_ = [[UIScroller alloc] initWithFrame:bounds]; + scroller_ = [[UIScrollView alloc] initWithFrame:bounds]; [self addSubview:scroller_]; [scroller_ setFixedBackgroundPattern:YES]; @@ -1134,18 +1234,26 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); [scroller_ setScrollingEnabled:YES]; [scroller_ setClipsSubviews:YES]; - [scroller_ setAllowsRubberBanding:YES]; + + if (false) + [scroller_ setAllowsRubberBanding:YES]; [scroller_ setDelegate:self]; [scroller_ setBounces:YES]; - [scroller_ setScrollHysteresis:8]; - [scroller_ setThumbDetectionEnabled:NO]; - [scroller_ setDirectionalScrolling:YES]; - [scroller_ setScrollDecelerationFactor:0.99]; /* 0.989324 */ - [scroller_ setEventMode:YES]; + + if (false) { + [scroller_ setScrollHysteresis:8]; + [scroller_ setThumbDetectionEnabled:NO]; + [scroller_ setDirectionalScrolling:YES]; + [scroller_ setScrollDecelerationFactor:0.99]; /* 0.989324 */ + [scroller_ setEventMode:YES]; + } + [scroller_ setShowBackgroundShadow:NO]; /* YES */ - [scroller_ setAllowsRubberBanding:YES]; /* Vertical */ - [scroller_ setAdjustForContentSizeChange:YES]; /* NO */ + //[scroller_ setAllowsRubberBanding:YES]; /* Vertical */ + + if (false) + [scroller_ setAdjustForContentSizeChange:YES]; /* NO */ CGRect webrect = [scroller_ bounds]; webrect.size.height = 0; @@ -1165,7 +1273,7 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); #else if (true) { #endif - webview_ = [[UIWebDocumentView alloc] initWithFrame:webrect]; + webview_ = [[$UIWebBrowserView alloc] initWithFrame:webrect]; webview = [webview_ webView]; // XXX: this is terribly (too?) expensive @@ -1176,9 +1284,8 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); if ([webview_ respondsToSelector:@selector(enableReachability)]) [webview_ enableReachability]; - - [webview_ setAllowsMessaging:YES]; - + if ([webview_ respondsToSelector:@selector(setAllowsMessaging:)]) + [webview_ setAllowsMessaging:YES]; if ([webview_ respondsToSelector:@selector(useSelectionAssistantWithMode:)]) [webview_ useSelectionAssistantWithMode:0]; @@ -1208,7 +1315,7 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); [webview_ _setDocumentType:0x4]; - if ([webview_ respondsToSelector:@selector(UIWebDocumentView:)]) + if ([webview_ respondsToSelector:@selector(setZoomsFocusedFormControl:)]) [webview_ setZoomsFocusedFormControl:YES]; [webview_ setContentsPosition:7]; [webview_ setEnabledGestures:0xa]; @@ -1233,7 +1340,10 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); [webview_ setDelegate:self]; [webview_ setGestureDelegate:self]; - [webview_ setFormEditingDelegate:self]; + + if ([webview_ respondsToSelector:@selector(setFormEditingDelegate:)]) + [webview_ setFormEditingDelegate:self]; + [webview_ setInteractionDelegate:self]; [scroller_ addSubview:webview_]; @@ -1253,7 +1363,7 @@ static CFArrayRef (*$GSSystemGetCapability)(CFStringRef); WebThreadUnlock(); CGSize indsize = [UIProgressIndicator defaultSizeForStyle:UIProgressIndicatorStyleMediumWhite]; - indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 12, indsize.width, indsize.height)]; + indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(bounds.size.width - 39, 12, indsize.width, indsize.height)]; [indicator_ setStyle:UIProgressIndicatorStyleMediumWhite]; [self setAutoresizingMask:UIViewAutoresizingFlexibleHeight]; diff --git a/UICaboodle/RVBook.h b/UICaboodle/RVBook.h index e3b109af..376a1531 100644 --- a/UICaboodle/RVBook.h +++ b/UICaboodle/RVBook.h @@ -49,8 +49,10 @@ - (void) setPage:(RVPage *)page; - (void) swapPage:(RVPage *)page; + - (void) pushPage:(RVPage *)page animated:(BOOL)animated; - (void) pushPage:(RVPage *)page; + - (void) popPages:(unsigned)pages; - (void) pushBook:(RVBook *)book; diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h index 18e3dd4c..284ebcaf 100644 --- a/UICaboodle/RVPage.h +++ b/UICaboodle/RVPage.h @@ -10,6 +10,8 @@ _transient id delegate_; } +- (bool) splitView; + - (NSString *) title; - (NSString *) backButtonTitle; - (id) rightButtonTitle; diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm index 9d77a861..7154bab5 100644 --- a/UICaboodle/RVPage.mm +++ b/UICaboodle/RVPage.mm @@ -7,6 +7,10 @@ @implementation RVPage +- (bool) splitView { + return false; +} + - (NSString *) title { [self doesNotRecognizeSelector:_cmd]; return nil; diff --git a/UICaboodle/UCPlatform.h b/UICaboodle/UCPlatform.h index 2506a5dc..4f2169e4 100644 --- a/UICaboodle/UCPlatform.h +++ b/UICaboodle/UCPlatform.h @@ -43,9 +43,9 @@ while (false) #define _label _label_(__LINE__) #define _packed \ - __attribute__((packed)) - -#define _finline inline __attribute__((always_inline)) + __attribute__((__packed__)) +#define _finline \ + inline __attribute__((__always_inline__)) #define _assume(e) \ _assert(e) diff --git a/control b/control index cd974de0..0266b87c 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 1.0.3163-1 +Version: 1.0.3166-1 Replaces: com.sosiphone.addcydia Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds, uikittools Pre-Depends: dpkg (>= 1.14.25-8) -- 2.45.2 From 195c9edd6493389147153164f7194366eab9e426 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Thu, 29 Apr 2010 10:09:23 +0000 Subject: [PATCH 16/16] I hate repositories. --- Cydia.app/Sections.plist | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Cydia.app/Sections.plist b/Cydia.app/Sections.plist index 9b590bcf..fb590b6e 100644 --- a/Cydia.app/Sections.plist +++ b/Cydia.app/Sections.plist @@ -51,6 +51,30 @@ Messaging + Themes_(Locksceen) + + Rename + Themes_(LockScreen) + + + Themes_(Lockscree) + + Rename + Themes_(LockScreen) + + + Themes_(Losckscreen) + + Rename + Themes_(LockScreen) + + + Themes_(Video) + + Rename + Themes_(Videos) + + Utilites Rename -- 2.45.2