summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cydia.app/confirm.html12
-rw-r--r--Cydia.app/confirm.js8
-rw-r--r--Cydia.app/menes/style.css77
-rw-r--r--Cydia.app/package.html70
-rw-r--r--Cydia.mm40
-rw-r--r--control2
6 files changed, 125 insertions, 84 deletions
diff --git a/Cydia.app/confirm.html b/Cydia.app/confirm.html
index b1fc0dc..4dcd005 100644
--- a/Cydia.app/confirm.html
+++ b/Cydia.app/confirm.html
@@ -15,20 +15,20 @@
<label class="_issues">Statistics</label>
<fieldset class="_issues">
- <div class="downloading">
+ <div class="downloading"><div>
<label>Downloading</label>
<div id="downloading"></div>
- </div>
+ </div></div>
- <div class="resuming">
+ <div class="resuming"><div>
<label>Resuming At</label>
<div id="resuming"></div>
- </div>
+ </div></div>
- <div>
+ <div><div>
<label id="disk-key"></label>
<div id="disk-value"></div>
- </div>
+ </div></div>
</fieldset>
<label>Modifications</label>
diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js
index 33b0014..75fe70b 100644
--- a/Cydia.app/confirm.js
+++ b/Cydia.app/confirm.js
@@ -43,10 +43,10 @@ $(function () {
var type = entry[0];
if (type == "PreDepends")
type = "Depends";
- $("#i" + i).append("<div>" +
+ $("#i" + i).append("<div><div>" +
"<label>" + type + "</label>" +
"<div>" + entry[1] + " " + entry[3] + "</div>" +
- "</div>");
+ "</div></div>");
}
}
@@ -63,10 +63,10 @@ $(function () {
var length = list.length;
if (length != 0) {
- $("#modifications").append("<div class=\"clearfix\">" +
+ $("#modifications").append("<div class=\"clearfix\"><div>" +
"<label>" + keys[i] + "</label>" +
"<div id=\"c" + i + "\"></div>" +
- "</div>");
+ "</div></div>");
var value = "";
for (var j = 0; j != length; ++j) {
diff --git a/Cydia.app/menes/style.css b/Cydia.app/menes/style.css
index fc6fc0f..66bc265 100644
--- a/Cydia.app/menes/style.css
+++ b/Cydia.app/menes/style.css
@@ -194,7 +194,7 @@ dialog > panel > block > hr {
dialog > panel > fieldset {
background-color: #ffffff;
border: 1px solid #999999;
- -webkit-border-radius: 10px;
+ -webkit-border-radius: 9px;
font-size: 16px;
margin: 9px;
}
@@ -217,7 +217,7 @@ dialog > panel > input[type="submit"] {
dialog > panel > label {
display: block;
- margin: 13px 0 -4px 27px;
+ margin: 13px 0 -4px 24px;
line-height: 24px;
font-size: inherit;
font-weight: bold;
@@ -229,8 +229,9 @@ fieldset > a,
fieldset > div,
fieldset > textarea {
border-top: 1px solid #999999;
- min-height: 40px;
- padding: 12px 17px 11px 17px;
+ min-height: 42px;
+ /* XXX: small differences due to font bugs */
+ padding: 13px 14px 11px 14px;
}
fieldset > a:first-child,
@@ -241,7 +242,8 @@ fieldset > div:first-child {
fieldset > a img.icon,
fieldset > div img.icon {
height: auto;
- margin: -13px 5px -10px -10px;
+ /* XXX: small differences due to font bugs */
+ margin: -7px 6px -9px -8px;
max-height: 30px;
min-width: 30px;
width: 30px;
@@ -288,9 +290,16 @@ fieldset > div > select {
fieldset > a,
fieldset > div > select {
background: no-repeat url(chevron.png);
+}
+
+fieldset > a {
background-position-y: 13px;
}
+fieldset > div > select {
+ background-position-y: 11px;
+}
+
dialog > fieldset > a {
background-position-x: 295px;
}
@@ -304,14 +313,14 @@ dialog > fieldset > div > select {
}
dialog > panel > fieldset > div > select {
- background-position-x: 172px;
+ background-position-x: 163px;
}
fieldset > textarea,
fieldset > div > input,
fieldset > div > select,
-fieldset > a > label + div,
-fieldset > div > label + div {
+fieldset > a > div > label + div,
+fieldset > div > div > label + div {
color: #193250;
}
@@ -321,11 +330,17 @@ fieldset > div > select {
font-size: 16px;
}
+fieldset > div > input {
+ padding-left: 7px;
+ padding-right: 14px;
+}
+
fieldset > div > select,
fieldset > div > input {
border: none;
- height: 44px;
- margin: -13px -17px -13px 86px;
+ float: right;
+ height: 40px;
+ margin: -11px -13px -11px -14px;
}
dialog > panel > fieldset > div > select,
@@ -338,32 +353,46 @@ dialog > fieldset > div > input {
width: 207px;
}
-fieldset > div > input {
- padding: 13px 7px;
-}
-
fieldset > textarea {
padding: 10px;
width: 320px;
}
-fieldset > a > label,
-fieldset > div > label {
- font-weight: bold;
- position: absolute;
+fieldset > div > div,
+fieldset > a > div {
+ display: inline-block;
+}
+
+fieldset > div > div {
+ width: 273px;
+}
+
+fieldset > a > div {
+ width: 250px;
}
-fieldset > a > label + div {
- margin-right: 16px;
+fieldset > div > img.icon + div {
+ width: 244px;
+}
+
+fieldset > a > img.icon + div {
+ width: 221px;
+}
+
+fieldset > a > label,
+fieldset > a > div > label,
+fieldset > div > label,
+fieldset > div > div > label {
+ font-weight: bold;
}
-dialog > fieldset > a > label + div,
-dialog > fieldset > div > label + div {
+dialog > fieldset > a > div > label + div,
+dialog > fieldset > div > div > label + div {
margin-left: 94px;
}
-dialog > panel > fieldset > a > label + div,
-dialog > panel > fieldset > div > label + div {
+dialog > panel > fieldset > a > div > label + div,
+dialog > panel > fieldset > div > div > label + div {
float: right;
text-align: right;
}
diff --git a/Cydia.app/package.html b/Cydia.app/package.html
index 09efc40..6c227f9 100644
--- a/Cydia.app/package.html
+++ b/Cydia.app/package.html
@@ -173,37 +173,37 @@
<fieldset id="actions">
<a id="settings">
- <img class="icon" src="settings.png"/>
+ <img class="icon" src="settings.png"/><div>
<label>Change Package Settings</label>
- </a>
+ </div></a>
<a id="author-href" class="author">
- <img id="author-icon" class="icon" src="email.png"/>
+ <img id="author-icon" class="icon" src="email.png"/><div>
<label>Author</label>
<div id="author"></div>
- </a>
+ </div></a>
<div class="commercial">
- <img class="icon" src="commercial.png"/>
+ <img class="icon" src="commercial.png"/><div>
<label>This is a commercial package!</label>
- </div>
+ </div></div>
<a class="console" href="http://cydia.saurik.com/purpose/console/">
- <img class="icon" src="console.png"/>
+ <img class="icon" src="console.png"/><div>
<label>This is a console package!</label>
- </a>
+ </div></a>
<a id="application">
- <img class="icon"/>
+ <img class="icon"/><div>
<label class="application"></label>
- </a>
+ </div></a>
</fieldset>
<fieldset class="warnings" id="warnings">
<div id="warning">
- <img class="icon" src="warning.png"/>
+ <img class="icon" src="warning.png"/><div>
<label class="warning"></label>
- </div>
+ </div></div>
</fieldset>
<div id="notice" class="notice"><iframe
@@ -235,73 +235,73 @@
<fieldset class="description homepage">
<a class="homepage" id="homepage-href">
- <img class="icon" src="web.png"/>
+ <img class="icon" src="web.png"/><div>
<label>More Information</label>
- </a>
+ </div></a>
</fieldset>
<label class="installed">Installed Package</label>
<fieldset class="installed">
- <div>
+ <div><div>
<label>Version</label>
<div id="installed"></div>
- </div>
+ </div></div>
<a id="files-href">
- <img class="icon" src="filesystem.png"/>
+ <img class="icon" src="filesystem.png"/><div>
<label>Filesystem Content</label>
- </a>
+ </div></a>
</fieldset>
<label>Package Details</label>
<fieldset>
- <div>
+ <div><div>
<label>ID</label>
<div id="id"></div>
- </div>
+ </div></div>
<div class="section">
- <img id="section-src" class="icon"/>
+ <img id="section-src" class="icon"/><div>
<label>Section</label>
<div id="section"></div>
- </div>
+ </div></div>
<div class="size">
- <img class="icon" src="expanded.png"/>
+ <img class="icon" src="expanded.png"/><div>
<label>Expanded Size</label>
<div id="size"></div>
- </div>
+ </div></div>
<a id="maintainer-href" class="maintainer">
- <img id="maintainer-icon" class="icon" src="email.png"/>
+ <img id="maintainer-icon" class="icon" src="email.png"/><div>
<label>Contact</label>
<div id="maintainer"></div>
- </a>
+ </div></a>
<a id="sponsor-href" class="sponsor">
- <img class="icon" src="web.png"/>
+ <img class="icon" src="web.png"/><div>
<label>Sponsor</label>
<div id="sponsor"></div>
- </a>
+ </div></a>
<!--a class="trusted" id="trusted">
- <img class="icon" src="trusted.png">
+ <img class="icon" src="trusted.png"><div>
<label>View Repository Signature</label>
- </a-->
+ </div></a-->
<div class="trusted">
- <img class="icon" src="trusted.png">
- <label></label>
+ <img class="icon" src="trusted.png"><div>
+ <label>&nbsp;</label>
<div>This package has been signed.</div>
- </div>
+ </div></div>
</fieldset>
<label class="source">Source Information</label>
<fieldset class="source">
<div>
- <img class="icon" id="source-src"/>
+ <img class="icon" id="source-src"/><div>
<label id="source-name"></label>
- </div>
+ </div></div>
<div class="source-description" id="source-description"></div>
</fieldset>
diff --git a/Cydia.mm b/Cydia.mm
index 8206426..1c1fd26 100644
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -268,6 +268,11 @@ extern NSString * const kCAFilterNearest;
#define RecycleWebViews 0
#define AlwaysReload (1 && !ForRelease)
+#if ForRelease
+#undef _trace
+#define _trace(args...)
+#endif
+
/* Radix Sort {{{ */
@interface NSMutableArray (Radix)
- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object;
@@ -1609,7 +1614,7 @@ class Progress :
if (current.end())
value = essential && [self essential];
else
- value = !version_.end() && version_ != current && (!essential || ![database_ cache][iterator_].Keep());
+ value = !version_.end() && version_ != current;// && (!essential || ![database_ cache][iterator_].Keep());
return value;
}
@@ -1698,12 +1703,14 @@ class Progress :
NSString *section = [self simpleSection];
UIImage *icon(nil);
- if (NSString *icon = icon_)
- icon = [UIImage imageAtPath:[icon_ substringFromIndex:6]];
+ if (icon_ != nil)
+ if ([icon_ hasPrefix:@"file:///"])
+ icon = [UIImage imageAtPath:[icon_ substringFromIndex:7]];
if (icon == nil) if (section != nil)
icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
- if (icon == nil) if (source_ != nil) if (NSString *icon = [source_ defaultIcon])
- icon = [UIImage imageAtPath:[icon substringFromIndex:6]];
+ if (icon == nil) if (source_ != nil) if (NSString *dicon = [source_ defaultIcon])
+ if ([dicon hasPrefix:@"file:///"])
+ icon = [UIImage imageAtPath:[dicon substringFromIndex:7]];
if (icon == nil)
icon = [UIImage applicationImageNamed:@"unknown.png"];
return icon;
@@ -4124,7 +4131,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
[table setReusesTableCells:YES];
[self addSubview:list_];
- [self reloadData];
[self setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
[list_ setAutoresizingMask:UIViewAutoresizingFlexibleHeight];
@@ -4227,6 +4233,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
if ((self = [super initWithBook:book database:database title:title]) != nil) {
filter_ = filter;
object_ = object == nil ? nil : [object retain];
+
+ [self reloadData];
} return self;
}
@@ -5171,12 +5179,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
- (void) _returnPNGWithImage:(UIImage *)icon forRequest:(NSURLRequest *)request {
id<NSURLProtocolClient> client([self client]);
- NSData *data(UIImagePNGRepresentation(icon));
+ if (icon == nil)
+ [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil]];
+ else {
+ NSData *data(UIImagePNGRepresentation(icon));
- NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]);
- [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
- [client URLProtocol:self didLoadData:data];
- [client URLProtocolDidFinishLoading:self];
+ NSURLResponse *response([[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:@"image/png" expectedContentLength:-1 textEncodingName:nil] autorelease]);
+ [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+ [client URLProtocol:self didLoadData:data];
+ [client URLProtocolDidFinishLoading:self];
+ }
}
- (void) startLoading {
@@ -5587,7 +5599,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
if (
[package installed] == nil && [package valid] && [package visible] ||
- [package upgradableAndEssential:NO]
+ [package upgradableAndEssential:YES]
)
[packages_ addObject:package];
}
@@ -7081,8 +7093,8 @@ int main(int argc, char *argv[]) { _pooled
Indices_ = [[NSMutableDictionary alloc] init];*/
Indices_ = [NSMutableDictionary dictionaryWithObjectsAndKeys:
- @"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/server/rating/@", @"Rating",
- @"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/repotag/@", @"RepoTag",
+ //@"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/server/rating/@", @"Rating",
+ //@"http://"/*"cache.saurik.com/"*/"cydia.saurik.com/repotag/@", @"RepoTag",
nil];
if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL)
diff --git a/control b/control
index 75e157e..f598bf7 100644
--- a/control
+++ b/control
@@ -4,7 +4,7 @@ Priority: required
Section: Packaging
Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
Architecture: iphoneos-arm
-Version: 1.0.2636-38
+Version: 1.0.2673-38
Replaces: com.sosiphone.addcydia
Depends: apt, darwintools, pcre, shell-cmds
Conflicts: com.sosiphone.addcydia
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:45:35 +0000