From 0235116c285db06d1c825e1c89449439cbfee54e Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 12 Aug 2008 12:57:17 +0000 Subject: [PATCH] Fixed trusted and added iSpazio and Depiction. --- Cydia.app/Sources/ispaziorepo.com.png | Bin 0 -> 10712 bytes Cydia.app/menes/menes.js | 16 ++++++++-- Cydia.app/package.html | 19 +++++++++--- Cydia.app/package.js | 42 +++++++++++++++++--------- Cydia.mm | 22 +++++++++----- 5 files changed, 70 insertions(+), 29 deletions(-) create mode 100644 Cydia.app/Sources/ispaziorepo.com.png diff --git a/Cydia.app/Sources/ispaziorepo.com.png b/Cydia.app/Sources/ispaziorepo.com.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b1a3918e63b6b02acecf5b9057e3e2bc62cd04 GIT binary patch literal 10712 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 - +
+ + +
+
- +
@@ -36,7 +45,7 @@
- + @@ -56,12 +65,12 @@
- +
- diff --git a/Cydia.app/package.js b/Cydia.app/package.js index 45390065..aec81416 100644 --- a/Cydia.app/package.js +++ b/Cydia.app/package.js @@ -5,8 +5,10 @@ "name": "Allen Porter", "address": "allen.porter@gmail.com" }, + "depiction": "http://planet-iphones.com/repository/info/chromium1.3.php", "description": "this is a sample description", - "homepage": "http://cydia.saurik.com/terminal.html", + //"homepage": "http://cydia.saurik.com/terminal.html", + "homepage": "http://planet-iphones.com/repository/info/chromium1.3.php", "installed": "286u-4", "id": "mobileterminal", "section": "Terminal Support", @@ -34,28 +36,36 @@ $(function () { $(".author").remove(); else { $("#author").html(author.name); - $("#author-link").href("mailto:" + author.address + "?subject=" + regarding); + $("#author-href").href("mailto:" + author.address + "?subject=" + regarding); } - var description = package.description; - if (description == null) - description = package.tagline; - else - description = description.replace(/\n/g, "
"); - $("#description").html(description); + var depiction = package.depiction; + if (depiction != null) { + $(".description").remove(); + $("#depiction-src").src(depiction); + } else { + $(".depiction").remove(); + + var description = package.description; + if (description == null) + description = package.tagline; + else + description = description.replace(/\n/g, "
"); + $("#description").html(description); + } var homepage = package.homepage; if (homepage == null) $(".homepage").remove(); else - $("#homepage-link").href(homepage); + $("#homepage-href").href(homepage); var installed = package.installed; if (installed == null) $(".installed").remove(); else { $("#installed").html(installed); - $("#files-link").href("cydia://files/" + id); + $("#files-href").href("cydia://files/" + id); } $("#id").html(id); @@ -77,7 +87,7 @@ $(function () { $(".maintainer").remove(); else { $("#maintainer").html(maintainer.name); - $("#maintainer-link").href("mailto:" + maintainer.address + "?subject=" + regarding); + $("#maintainer-href").href("mailto:" + maintainer.address + "?subject=" + regarding); } var sponsor = package.sponsor; @@ -85,15 +95,19 @@ $(function () { $(".sponsor").remove(); else { $("#sponsor").html(sponsor.name); - $("#sponsor-link").href(sponsor.address); + $("#sponsor-href").href(sponsor.address); } var source = package.source; - if (source == null) + if (source == null) { $(".source").remove(); - else { + $(".trusted").remove(); + } else { $("#source-name").html(source.name); + if (!source.trusted) + $(".trusted").remove(); + var description = source.description; if (description == null) $(".source-description").remove(); diff --git a/Cydia.mm b/Cydia.mm index c8d57c41..4e6d0cae 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -849,12 +849,6 @@ class Progress : distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain]; type_ = [[NSString stringWithUTF8String:index->GetType()] retain]; - description_ = nil; - label_ = nil; - origin_ = nil; - version_ = nil; - defaultIcon_ = nil; - debReleaseIndex *dindex(dynamic_cast(index)); if (dindex != NULL) { std::ifstream release(dindex->MetaIndexFile("Release").c_str()); @@ -1047,6 +1041,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { NSString *tagline_; NSString *icon_; NSString *homepage_; + NSString *depiction_; Address *sponsor_; Address *author_; NSArray *tags_; @@ -1088,6 +1083,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { - (NSString *) tagline; - (NSString *) icon; - (NSString *) homepage; +- (NSString *) depiction; - (Address *) author; - (NSArray *) relationships; @@ -1133,6 +1129,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) { [icon_ release]; if (homepage_ != nil) [homepage_ release]; + if (depiction_ != nil) + [depiction_ release]; if (sponsor_ != nil) [sponsor_ release]; if (author_ != nil) @@ -1149,7 +1147,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) { } + (NSArray *) _attributeKeys { - return [NSArray arrayWithObjects:@"author", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"section", @"size", @"source", @"sponsor", @"tagline", nil]; + return [NSArray arrayWithObjects:@"author", @"depiction", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"section", @"size", @"source", @"sponsor", @"tagline", nil]; } - (NSArray *) attributeKeys { @@ -1198,6 +1196,9 @@ NSString *Scour(const char *field, const char *begin, const char *end) { homepage_ = Scour("Website", begin, end); if (homepage_ != nil) homepage_ = [homepage_ retain]; + depiction_ = Scour("Depiction", begin, end); + if (depiction_ != nil) + depiction_ = [depiction_ retain]; NSString *sponsor = Scour("Sponsor", begin, end); if (sponsor != nil) sponsor_ = [[Address addressWithString:sponsor] retain]; @@ -1408,6 +1409,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) { return homepage_; } +- (NSString *) depiction { + return depiction_; +} + - (Address *) sponsor { return sponsor_; } @@ -4318,6 +4323,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString } - (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame { + if ([frame parentFrame] != nil) + return; + title_ = [title retain]; [self setTitle:title]; } -- 2.45.2