From 0a7e54786d6b4ee83a954e854825ef1892058b12 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sun, 28 Dec 2008 10:03:16 +0000 Subject: [PATCH] Fixed some last minute isues. --- Cydia.app/id.png | Bin 0 -> 505 bytes Cydia.app/package.html | 8 +++++--- Cydia.app/package.js | 2 +- Cydia.app/version.png | Bin 0 -> 891 bytes Cydia.mm | 5 +++-- UICaboodle/BrowserView.m | 4 +++- UICaboodle/RVBook.mm | 21 ++++++++++++++------- control | 2 +- 8 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 Cydia.app/id.png create mode 100644 Cydia.app/version.png diff --git a/Cydia.app/id.png b/Cydia.app/id.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec6a5a3d85afb9566ef41791681c50db6e2803c GIT binary patch literal 505 zcmV?9 zc4jE<&N)XwXBmkbX*9dq)6BQKI?cZl5p2?Qqt$zW9sm$kE$-ca@NhDj+z`mB%DD?7 ziimU^KsqUch`=KVciaPa$J}sp%pEhs&G3lg`1t7P)#2fboO1>!?o4+d?e9N%wpjdR zG#ViSDhW+WY5;1G+M$JL$_GR=5N?=zQ`oRv&n;)N898U%VLqED;5k4s9*?)HYQfI- z?X@5GY<9-G_aC@&_1cbzq=+!JoRf$U5gZ)6q^hd56c-T&gCT-oW{Kt=i}pGryovR3 zuEoytE(aU`3wnSapa zrza<;5s_Qi>(lA()2*$Ww}6~h6j4_d(GevV0b&Wz`ce^fKnRNRQ~B}jo7ayc;xm9m v1R^p7F4Jj~YqTE`v1ljKzl?f-{~q8MV7mM$)x!-u00000NkvXXu0mjf-G1Q~ literal 0 HcmV?d00001 diff --git a/Cydia.app/package.html b/Cydia.app/package.html index 952256cd..f9ec6481 100644 --- a/Cydia.app/package.html +++ b/Cydia.app/package.html @@ -242,8 +242,9 @@
-
- +
+
+
@@ -255,7 +256,8 @@
-
+
+
diff --git a/Cydia.app/package.js b/Cydia.app/package.js index 09543807..3e7c9ca3 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 new file mode 100644 index 0000000000000000000000000000000000000000..fd1eec19ee9f7486d5e94a45c0aa9524cf49593c GIT binary patch literal 891 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP>?0v z(btiIVPjv-@4(3*9myU+z6=aistgPb%?u1b{{!il3=E|P3=FRl7#OT(FffScPl`Y4 z#=yYz(bL5-q~cc6pa1{u4?8e5FeD{OBrpg#Fu!8}vKa+!IJy66cYL^f^$~l%ol#BX zgaaG`4myW4z5ji0sR+2+6kq?((5CWpcjNTQl4tCTe{;{!RXxJ??DVZo#tm=SI26R> z%=p^a_3Hz!ezLFsZ#-xB=T^l-j#D0pPt1u&x^FM5^#Z-9X^re2;%9aoXV@gI z&=6r)`}=gkpI_;#e*e3kf9B57(?@x>$*}zUo1F0D+h=)Z2L{7W$MpWMKeygR^>&(pkZ0VJm*(|Jef{{xUNko?FesWl-v>dKp>&9g~5TL@iK!OhfQ*Vfv)9&5C5()wpj;DKRA@; z$u1FL!RKJ1Q2cMf!}~uzKK;p?p?Kf`FiIZ8G??=4u{rSJT>*2KfCfv1g_MHbFU}(i zKE1Y<`q$RB-|3@yPG-YIMumnAZ44SK^tLaIs{46_(O_AgR6+s+FfQEG&X_QCt2-r$ zJY@=yVz|W%jOTgW3``jZPBVgHUdn+T9BBo538{&PblCqnoNnA*ajNlu#3ws5vuQ;P zDe5QkfC>*vF)b)sAQHvrb1<0ikL#)bC!R7G{TBaL#307Rz{tYMSahl}KH^kken#rS za1$wA!6r~rSfj|G#~zg#&3C|wL80M5DPtAKg~c)ntWWrbSTtuOPZBITh)q;~WGs9CAF?G(wnLNOZ!rLookup(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 61a21c91..6fe74f41 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 b1bbce67..b639958b 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 { diff --git a/control b/control index 5be10905..79997931 100644 --- a/control +++ b/control @@ -4,7 +4,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) 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 -- 2.45.2