diff options
| -rw-r--r-- | Cydia.app/id.png | bin | 0 -> 505 bytes | |||
| -rw-r--r-- | Cydia.app/package.html | 8 | ||||
| -rw-r--r-- | Cydia.app/package.js | 2 | ||||
| -rw-r--r-- | Cydia.app/version.png | bin | 0 -> 891 bytes | |||
| -rw-r--r-- | Cydia.mm | 5 | ||||
| -rw-r--r-- | UICaboodle/BrowserView.m | 4 | ||||
| -rw-r--r-- | UICaboodle/RVBook.mm | 21 | ||||
| -rw-r--r-- | control | 2 |
8 files changed, 27 insertions, 15 deletions
diff --git a/Cydia.app/id.png b/Cydia.app/id.png Binary files differnew file mode 100644 index 0000000..0ec6a5a --- /dev/null +++ b/Cydia.app/id.png diff --git a/Cydia.app/package.html b/Cydia.app/package.html index 952256c..f9ec648 100644 --- a/Cydia.app/package.html +++ b/Cydia.app/package.html @@ -242,8 +242,9 @@ <label class="installed">Installed Package</label> <fieldset class="installed"> - <div><div> - <label>Version</label> + <div> + <img class="icon" src="version.png"/><div> + <label> </label> <label id="installed"></label> </div></div> @@ -255,7 +256,8 @@ <label>Package Details</label> <fieldset> - <div><div> + <div> + <img class="icon" src="id.png"/><div> <label>ID</label> <label id="id"></label> </div></div> diff --git a/Cydia.app/package.js b/Cydia.app/package.js index 0954380..3e7c9ca 100644 --- a/Cydia.app/package.js +++ b/Cydia.app/package.js @@ -152,7 +152,7 @@ $(function () { $("#files-href").href("cydia://files/" + idc); } - space("#id", id, 238); + space("#id", id, 220); var section = package.section; if (section == null) diff --git a/Cydia.app/version.png b/Cydia.app/version.png Binary files differnew file mode 100644 index 0000000..fd1eec1 --- /dev/null +++ b/Cydia.app/version.png @@ -229,7 +229,7 @@ extern NSString * const kCAFilterNearest; @implementation PopTransitionView -- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to { +- (void) transitionViewDidComplete:(UITransitionView *)view fromView:(UIView *)from toView:(UIView *)to { if (from != nil && to == nil) [self removeFromSuperview]; } @@ -1528,7 +1528,8 @@ class Progress : if (file_.end()) return nil; pkgRecords::Parser *parser = &[database_ records]->Lookup(file_); - return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]]; + const std::string &maintainer(parser->Maintainer()); + return maintainer.empty() ? nil : [Address addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]]; } - (size_t) size { diff --git a/UICaboodle/BrowserView.m b/UICaboodle/BrowserView.m index 61a21c9..6fe74f4 100644 --- a/UICaboodle/BrowserView.m +++ b/UICaboodle/BrowserView.m @@ -376,7 +376,6 @@ [delegate_ openURL:url]; else if ([name isEqualToString:@"_popup"]) { RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]); - [book setDelegate:self]; RVPage *page([delegate_ pageForURL:url hasTag:NULL]); if (page == nil) { @@ -385,6 +384,9 @@ page = browser; } + [book setDelegate:delegate_]; + [page setDelegate:delegate_]; + [book setPage:page]; [book_ pushBook:book]; } else goto unknown; diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm index b1bbce6..b639958 100644 --- a/UICaboodle/RVBook.mm +++ b/UICaboodle/RVBook.mm @@ -220,15 +220,19 @@ [navitem setTitle:title]; } -- (NSString *) _leftButtonTitleForPage:(RVPage *)page { - return [page leftButtonTitle]; +- (void) _leftButtonTitle:(NSString *&)leftButtonTitle style:(UINavigationButtonStyle &)leftButtonStyle forPage:(RVPage *)page { + leftButtonTitle = [page leftButtonTitle]; + leftButtonStyle = [page leftButtonStyle]; } - (void) reloadButtonsForPage:(RVPage *)page { if ([pages_ count] == 0 || page != [pages_ lastObject]) return; - NSString *leftButtonTitle([self _leftButtonTitleForPage:page]); - UINavigationButtonStyle leftButtonStyle = [page leftButtonStyle]; + + NSString *leftButtonTitle; + UINavigationButtonStyle leftButtonStyle; + [self _leftButtonTitle:leftButtonTitle style:leftButtonStyle forPage:page]; + UINavigationButtonStyle rightButtonStyle = [page rightButtonStyle]; //[navbar_ showButtonsWithLeftTitle:leftButtonTitle rightTitle:[page rightButtonTitle] leftBack:(leftButtonTitle == nil)]; @@ -262,9 +266,12 @@ @implementation RVPopUpBook -- (NSString *) _leftButtonTitleForPage:(RVPage *)page { - NSString *title([super _leftButtonTitleForPage:page]); - return (cancel_ = title == nil && [pages_ count] == 1) ? @"Cancel" : title; +- (void) _leftButtonTitle:(NSString *&)leftButtonTitle style:(UINavigationButtonStyle &)leftButtonStyle forPage:(RVPage *)page { + [super _leftButtonTitle:leftButtonTitle style:leftButtonStyle forPage:page]; + if ((cancel_ = leftButtonTitle == nil && [pages_ count] == 1)) { + leftButtonTitle = @"Cancel"; + leftButtonStyle = UINavigationButtonStyleNormal; + } } - (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button { @@ -4,7 +4,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) <saurik@saurik.com> Architecture: iphoneos-arm -Version: 1.0.2675-38 +Version: 1.0.2676-38 Replaces: com.sosiphone.addcydia Depends: apt, darwintools, pcre, shell-cmds Conflicts: com.sosiphone.addcydia |
