From 97959670e2d240bab0e7c54b85b108ff5b2ff16c Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Fri, 25 Apr 2008 10:38:42 +0000 Subject: [PATCH] Some mild naming and transition nits from the #iphone gang. --- Cydia.app/advanced.png | Bin 0 -> 3555 bytes Cydia.mm | 51 ++++++++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 Cydia.app/advanced.png diff --git a/Cydia.app/advanced.png b/Cydia.app/advanced.png new file mode 100644 index 0000000000000000000000000000000000000000..419ba521125da9ebfdd06252334dc6b9362a6a92 GIT binary patch literal 3555 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 literal 0 HcmV?d00001 diff --git a/Cydia.mm b/Cydia.mm index 70c5ff66..6baa2792 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -2812,7 +2812,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString - (NSString *) rightButtonTitle { _assert(package_ != nil); - return [package_ installed] == nil ? @"Install" : @"Manage"; + return [package_ installed] == nil ? @"Install" : @"Modify"; } - (NSString *) title { @@ -3669,6 +3669,37 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString return @"Changes"; } +@end +/* }}} */ +/* Manage View {{{ */ +@interface ManageView : PackageTable { +} + +- (id) initWithBook:(RVBook *)book database:(Database *)database; + +@end + +@implementation ManageView + +- (id) initWithBook:(RVBook *)book database:(Database *)database { + if ((self = [super + initWithBook:book + database:database + title:nil + filter:@selector(isInstalledInSection:) + with:nil + ]) != nil) { + } return self; +} + +- (NSString *) title { + return @"Installed Packages"; +} + +- (NSString *) backButtonTitle { + return @"All Packages"; +} + @end /* }}} */ /* Search View {{{ */ @@ -3761,10 +3792,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString [transition_ transition:0 toView:table_]; - CGRect cnfrect = {{3, 36}, {17, 18}}; + CGRect cnfrect = {{2, 37}, {17, 18}}; CGRect area; - area.origin.x = cnfrect.size.width + 12; + area.origin.x = cnfrect.size.width + 17; area.origin.y = 30; area.size.width = [self bounds].size.width - area.origin.x - 18; area.size.height = [UISearchField defaultHeight]; @@ -3789,7 +3820,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease]; [configure setShowPressFeedback:YES]; - [configure setImage:[UIImage applicationImageNamed:@"configure.png"]]; + [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]]; [configure addTarget:self action:@selector(configurePushed) forEvents:1]; accessory_ = [[UIView alloc] initWithFrame:CGRectMake(0, 6, cnfrect.size.width + area.size.width + 6 * 3, area.size.height + 30)]; @@ -4202,6 +4233,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString - (void) buttonBarItemTapped:(id)sender { unsigned tag = [sender tag]; + if (tag == tag_) { + [book_ resetViewAnimated:YES]; + return; + } switch (tag) { case 1: @@ -4217,13 +4252,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString break; case 4: - [self setPage:[[[PackageTable alloc] - initWithBook:book_ - database:database_ - title:@"Manage" - filter:@selector(isInstalledInSection:) - with:nil - ] autorelease]]; + [self setPage:[[[ManageView alloc] initWithBook:book_ database:database_] autorelease]]; break; case 5: -- 2.45.2