From e993e7ba4e1107a875afeec33292b9d01c52035b Mon Sep 17 00:00:00 2001 From: matt handler Date: Sat, 30 Apr 2011 09:25:32 -0400 Subject: added loading animation, piccast color title, navigation controllers for browse and search, uicolor orange and yellow, custom headers for search view, redid loading screen, fixed backgroundGradient, background white for topic table, etc etc etc gay --- Classes/BrowseViewController.m | 8 + Classes/BrowseViewController.xib | 74 +--- Classes/PhotoViewController.m | 48 +++ Classes/PicCastAppDelegate.m | 42 ++ Classes/SearchViewController.m | 47 ++- Classes/SourcesEditViewController.xib | 37 +- Classes/TopicTableViewCell.m | 19 + Classes/TopicsViewController.m | 18 + Default.png | Bin 54865 -> 60291 bytes Default@2x.png | Bin 100561 -> 118609 bytes Images/backgroundGradient.png | Bin 50920 -> 43995 bytes Images/backgroundGradient@2x.png | Bin 92060 -> 79998 bytes Images/loading.1.png | Bin 0 -> 771 bytes Images/loading.1@2x.png | Bin 0 -> 1420 bytes Images/loading.2.png | Bin 0 -> 801 bytes Images/loading.2@2x.png | Bin 0 -> 1522 bytes Images/loading.3.png | Bin 0 -> 693 bytes Images/loading.3@2x.png | Bin 0 -> 1281 bytes Images/loading.4.png | Bin 0 -> 800 bytes Images/loading.4@2x.png | Bin 0 -> 1491 bytes Images/titleLogo.png | Bin 0 -> 5415 bytes Images/titleLogo@2x.png | Bin 0 -> 10762 bytes MainWindow.xib | 195 ++++++--- PicCast.xcodeproj/handler.mode1v3 | 85 ++-- PicCast.xcodeproj/handler.pbxuser | 748 ++++++++++++++++++++++++---------- PicCast.xcodeproj/project.pbxproj | 48 +++ SearchView.xib | 114 ++---- 27 files changed, 1022 insertions(+), 461 deletions(-) create mode 100644 Images/loading.1.png create mode 100644 Images/loading.1@2x.png create mode 100644 Images/loading.2.png create mode 100644 Images/loading.2@2x.png create mode 100644 Images/loading.3.png create mode 100644 Images/loading.3@2x.png create mode 100644 Images/loading.4.png create mode 100644 Images/loading.4@2x.png create mode 100644 Images/titleLogo.png create mode 100644 Images/titleLogo@2x.png diff --git a/Classes/BrowseViewController.m b/Classes/BrowseViewController.m index 22742c7..ca39545 100644 --- a/Classes/BrowseViewController.m +++ b/Classes/BrowseViewController.m @@ -21,6 +21,14 @@ - (void)viewDidLoad { [super viewDidLoad]; + [self.navigationController.navigationBar drawLogo]; + + UIView *backgroundView = [[UIView alloc] initWithFrame:self.view.frame]; + backgroundView.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"backgroundGradient.png"]]; + + self.tableView.backgroundView = backgroundView; + self.tableView.backgroundColor = [UIColor clearColor]; + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. // self.navigationItem.rightBarButtonItem = self.editButtonItem; diff --git a/Classes/BrowseViewController.xib b/Classes/BrowseViewController.xib index 7baf5fb..022a284 100644 --- a/Classes/BrowseViewController.xib +++ b/Classes/BrowseViewController.xib @@ -45,7 +45,7 @@ 274 - {{0, 44}, {320, 387}} + {320, 387} 10 @@ -93,27 +93,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 10 10 - - - 290 - {320, 44} - - IBCocoaTouchFramework - - 1 - MC4wOTMzOTc2Mzk2OSAwLjE3NTQ0MzM4MTEgMC4yNTAzODczMTEAA - - - YES - - - PicCast - IBCocoaTouchFramework - - - - {320, 431} + {320, 387} 3 @@ -122,6 +103,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 2 + + NO + IBCocoaTouchFramework @@ -187,25 +171,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA YES - - - 9 - - - YES - - - - - - 10 - - - 4 @@ -219,20 +188,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA YES -1.CustomClassName -2.CustomClassName - 10.IBPluginDependency 4.IBEditorWindowLastContentRect 4.IBPluginDependency 4.IBViewBoundsToFrameTransform 8.IBEditorWindowLastContentRect 8.IBPluginDependency 8.IBViewBoundsToFrameTransform - 9.IBPluginDependency YES BrowseViewController UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin {{329, 376}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -243,7 +209,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA P4AAAL+AAAAAAAAAw9aAAA - com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -394,35 +359,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA UIKit.framework/Headers/UIResponder.h - - UIBarButtonItem - UIBarItem - - IBFrameworkSource - UIKit.framework/Headers/UIBarButtonItem.h - - - - UIBarItem - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIBarItem.h - - - - UINavigationBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UINavigationBar.h - - - - UINavigationItem - NSObject - - UIResponder NSObject diff --git a/Classes/PhotoViewController.m b/Classes/PhotoViewController.m index 35e58ca..6874df4 100644 --- a/Classes/PhotoViewController.m +++ b/Classes/PhotoViewController.m @@ -47,6 +47,54 @@ [customItem release]; [flex release]; [flex2 release]; + +// UIBarButtonItem *infoDarkButtonType = [[UIButton buttonWithType:UIButtonTypeInfoLight] retain]; +//// infoDarkButtonType = CGRectMake(0.0, 0.0, 25.0, 25.0); +//// infoDarkButtonType.backgroundColor = [UIColor clearColor]; +// [infoDarkButtonType addTarget:self action:@selector(infoButtonPressed:) forControlEvents:UIControlEventTouchUpInside]; +// UIBarButtonItem *infoButton = [[UIBarButtonItem alloc] initWithCustomView:infoDarkButtonType]; +// +// [self.navigationItem.leftBarButtonItem setTitle:@"back"]; + +// self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"back" +// style:UIBarButtonItemStyleBordered +// target:nil +// action:nil]; + +// self.navigationItem.rightBarButtonItem = [UIButton buttonWithType:UIButtonTypeInfoLight]; +// [infoDarkButtonType release]; +// [infoButton release]; +} + +//- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { +// [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; +// self.navigationItem.backBarButtonItem.title = @"back"; +//} + +- (void)updateChrome { + //[self updateTitle]; +// if (![self.previousViewController isKindOfClass: [TTThumbsViewController class]]) { +// if (_photoSource.numberOfPhotos > 1) { +// self.navigationItem.rightBarButtonItem = [[UIBarButtonItem +// alloc] +// initWithTitle:TTLocalizedString(@"See All", @"See all photo +// thumbnails") +// style:UIBarButtonItemStyleBordered target:self action:@selector +// (showThumbnails)]; +// } else { +// self.navigationItem.rightBarButtonItem = [UIButton buttonWithType:UIButtonTypeInfoLight]; +// } +// } else { +// self.navigationItem.rightBarButtonItem = [UIButton buttonWithType:UIButtonTypeInfoLight]; +// } + [super updateChrome]; + self.navigationItem.backBarButtonItem.title = @"back"; + //self.navigationItem.rightBarButtonItem = [UIButton buttonWithType:UIButtonTypeInfoLight]; +// UIBarButtonItem* playButton = [_toolbar itemWithTag:1]; +// playButton.enabled = _photoSource.numberOfPhotos > 1; +// _previousButton.enabled = _centerPhotoIndex > 0; +// _nextButton.enabled = _centerPhotoIndex < +// _photoSource.numberOfPhotos-1; } -(void)action:(id)sender{ diff --git a/Classes/PicCastAppDelegate.m b/Classes/PicCastAppDelegate.m index 3da5a07..854e3c7 100644 --- a/Classes/PicCastAppDelegate.m +++ b/Classes/PicCastAppDelegate.m @@ -9,6 +9,17 @@ #import "PicCastAppDelegate.h" #import +// monkey patches! what a racist term :'(, smh lol + +@implementation UIColor (PicCastColors) +-(void) orangeColor { + return [UIColor colorWithRed:1.0 green:143/255.0 blue:0.0 alpha:1.0]; +} + +-(void) yellowColor { + return [UIColor colorWithRed:209/255.0 green:231/255.0 blue:0.0 alpha:1.0]; +} +@end @implementation UINavigationBar (CustomImage) - (void)drawRect:(CGRect)rect { @@ -23,6 +34,37 @@ } //[super drawRect:rect]; } +- (void)drawLogo { + NSLog(@"logo"); + UIImageView *iv = [[[UIImageView alloc] initWithImage:[UIImage imageNamed: @"titleLogo.png"]] retain]; + [iv setFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; + [self addSubview:iv]; + [iv release]; +} +- (void)animateLoading { + UIImageView* animatedImageView = [[UIImageView alloc] initWithFrame:CGRectMake(6, 6, 32, 32)]; + + animatedImageView.animationImages = [NSArray arrayWithObjects: + [UIImage imageNamed:@"loading.1.png"], + [UIImage imageNamed:@"loading.2.png"], + [UIImage imageNamed:@"loading.3.png"], + [UIImage imageNamed:@"loading.4.png"], + nil]; + + animatedImageView.animationDuration = 0.25; + animatedImageView.animationRepeatCount = 0; + //add quartz core? + //animatedImageView.layer.opacity = 0.5; + + [self addSubview:animatedImageView]; + [animatedImageView startAnimating]; +} +- (void)stopLoadingAnimation { + for (id obj in [self subviews]) { + if ([obj isKindOfClass:[UIImageView class]] && [(UIImageView *)obj animationDuration] == 0.25) + [obj removeFromSuperview]; + } +} @end @implementation PicCastAppDelegate diff --git a/Classes/SearchViewController.m b/Classes/SearchViewController.m index 8272dd9..e4718be 100644 --- a/Classes/SearchViewController.m +++ b/Classes/SearchViewController.m @@ -17,6 +17,14 @@ - (void)viewDidLoad { [super viewDidLoad]; + [self.navigationController.navigationBar drawLogo]; + + UIView *backgroundView = [[UIView alloc] initWithFrame:self.view.frame]; + backgroundView.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"backgroundGradient.png"]]; + + self.tableView.backgroundView = backgroundView; + self.tableView.backgroundColor = [UIColor clearColor]; + [self.tableView setSeparatorStyle:UITableViewCellSeparatorStyleSingleLine]; [self.tableView setSeparatorColor:[UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0]]; @@ -132,16 +140,49 @@ #pragma mark - #pragma mark uitableviewcontroller protocol +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section +{ + // create the parent view that will hold header Label + UIView* customView = [[UIView alloc] initWithFrame:CGRectMake(10.0, 0.0, 300.0, 44.0)]; + + // create the button object + UILabel * headerLabel = [[UILabel alloc] initWithFrame:CGRectZero]; + headerLabel.backgroundColor = [UIColor clearColor]; + headerLabel.opaque = NO; + headerLabel.textColor = [UIColor orangeColor]; + headerLabel.highlightedTextColor = [UIColor whiteColor]; + headerLabel.font = [UIFont boldSystemFontOfSize:20]; + headerLabel.frame = CGRectMake(10.0, 0.0, 300.0, 44.0); + + // If you want to align the header text as centered + // headerLabel.frame = CGRectMake(150.0, 0.0, 300.0, 44.0); + + headerLabel.text = @"tamper proof cap"; // i.e. array element + [customView addSubview:headerLabel]; + + return customView; +} + +- (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 44.0; +} + - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 10; + return 3; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return 5; + return 3; } - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { - return @"tamper proof cap"; + if (section == 0) + return @"Feeds"; + else if (section == 1) + return @"Sets"; + else + return @"Photos"; } //- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath diff --git a/Classes/SourcesEditViewController.xib b/Classes/SourcesEditViewController.xib index 774a35b..ed531bd 100644 --- a/Classes/SourcesEditViewController.xib +++ b/Classes/SourcesEditViewController.xib @@ -12,7 +12,7 @@ YES - + YES @@ -107,7 +107,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA YES - Edit PicCast Sources + Edit Subscriptions Done IBCocoaTouchFramework @@ -288,14 +288,35 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA SourcesEditViewController UIViewController - done: - id + YES + + YES + done: + switchedOnOff: + + + YES + id + id + - done: - - done: - id + YES + + YES + done: + switchedOnOff: + + + YES + + done: + id + + + switchedOnOff: + id + diff --git a/Classes/TopicTableViewCell.m b/Classes/TopicTableViewCell.m index c2753b6..03d202d 100644 --- a/Classes/TopicTableViewCell.m +++ b/Classes/TopicTableViewCell.m @@ -21,9 +21,28 @@ } // titleLabel.lineBreakMode = UILineBreakModeWordWrap; // titleLabel.numberOfLines = 0; +// UIView *backgroundView = [[UIView alloc] initWithFrame:self.frame]; +// backgroundView.backgroundColor = [UIColor whiteColor]; +// self.backgroundView = backgroundView; +// [backgroundView release]; + + //self.contentView.backgroundColor = [UIColor whiteColor]; + //NSLog(@"where"); return self; } +//- (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier { +// [super initWithFrame:frame reuseIdentifier:reuseIdentifier]; +// NSLog(@"here"); +//} +//- (void)init { +// [super init]; +// NSLog(@"there"); +// UIView *myBackView = [[UIView alloc] initWithFrame:self.frame]; +// myBackView.backgroundColor = [UIColor whiteColor]; +// self.backgroundView = myBackView; +//} + - (void)setSelected:(BOOL)selected animated:(BOOL)animated { [gradient removeFromSuperview]; [super setSelected:selected animated:animated]; diff --git a/Classes/TopicsViewController.m b/Classes/TopicsViewController.m index d7ca089..9505272 100644 --- a/Classes/TopicsViewController.m +++ b/Classes/TopicsViewController.m @@ -30,10 +30,21 @@ - (void)viewDidLoad { [super viewDidLoad]; NSLog(@"viewDidLoad"); + + [self.navigationController.navigationBar drawLogo]; + self.tableView.rowHeight = 100; [self.tableView setSeparatorStyle:UITableViewCellSeparatorStyleSingleLine]; [self.tableView setSeparatorColor:[UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1.0]]; + UIView *backgroundView = [[UIView alloc] initWithFrame:self.view.frame]; + backgroundView.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"backgroundGradient.png"]]; + + self.tableView.backgroundView = backgroundView; + self.tableView.backgroundColor = [UIColor clearColor]; + + [backgroundView release]; + objMan = [[HJObjManager alloc] initWithLoadingBufferSize:6 memCacheSize:20]; _today = [[Topic dateToString:[NSDate new]] retain]; @@ -203,6 +214,8 @@ } [result close]; [db close]; + + [self.navigationController.navigationBar animateLoading]; } #pragma mark - @@ -218,6 +231,7 @@ } - (void) connection:(NSURLConnection *)connection finishedWithData:(NSData *)data andPayload:(id)payload { + [self.navigationController.navigationBar stopLoadingAnimation]; [self addTopicsFromJson:data forSource:(Source *)payload]; } @@ -369,6 +383,10 @@ [micon clear]; [mi clear]; } + + UIView *myBackView = [[UIView alloc] initWithFrame:cell.frame]; + myBackView.backgroundColor = [UIColor whiteColor]; + cell.backgroundView = myBackView; Topic *topic = [[tableDictionary objectForIndex:[indexPath section]] objectAtIndex:[indexPath row]]; //cell.useDarkBackground = (indexPath.row % 2 == 0); diff --git a/Default.png b/Default.png index 493b637..e8f3fb9 100644 Binary files a/Default.png and b/Default.png differ diff --git a/Default@2x.png b/Default@2x.png index 8dc55f6..ee648b7 100644 Binary files a/Default@2x.png and b/Default@2x.png differ diff --git a/Images/backgroundGradient.png b/Images/backgroundGradient.png index 70c81a0..ee13638 100644 Binary files a/Images/backgroundGradient.png and b/Images/backgroundGradient.png differ diff --git a/Images/backgroundGradient@2x.png b/Images/backgroundGradient@2x.png index d98cb6e..8dedea6 100644 Binary files a/Images/backgroundGradient@2x.png and b/Images/backgroundGradient@2x.png differ diff --git a/Images/loading.1.png b/Images/loading.1.png new file mode 100644 index 0000000..ce7cdc2 Binary files /dev/null and b/Images/loading.1.png differ diff --git a/Images/loading.1@2x.png b/Images/loading.1@2x.png new file mode 100644 index 0000000..8882f11 Binary files /dev/null and b/Images/loading.1@2x.png differ diff --git a/Images/loading.2.png b/Images/loading.2.png new file mode 100644 index 0000000..9a7a0b0 Binary files /dev/null and b/Images/loading.2.png differ diff --git a/Images/loading.2@2x.png b/Images/loading.2@2x.png new file mode 100644 index 0000000..aadf352 Binary files /dev/null and b/Images/loading.2@2x.png differ diff --git a/Images/loading.3.png b/Images/loading.3.png new file mode 100644 index 0000000..368e6ef Binary files /dev/null and b/Images/loading.3.png differ diff --git a/Images/loading.3@2x.png b/Images/loading.3@2x.png new file mode 100644 index 0000000..8230d20 Binary files /dev/null and b/Images/loading.3@2x.png differ diff --git a/Images/loading.4.png b/Images/loading.4.png new file mode 100644 index 0000000..e239bc3 Binary files /dev/null and b/Images/loading.4.png differ diff --git a/Images/loading.4@2x.png b/Images/loading.4@2x.png new file mode 100644 index 0000000..87ad894 Binary files /dev/null and b/Images/loading.4@2x.png differ diff --git a/Images/titleLogo.png b/Images/titleLogo.png new file mode 100644 index 0000000..47b205c Binary files /dev/null and b/Images/titleLogo.png differ diff --git a/Images/titleLogo@2x.png b/Images/titleLogo@2x.png new file mode 100644 index 0000000..2347b94 Binary files /dev/null and b/Images/titleLogo@2x.png differ diff --git a/MainWindow.xib b/MainWindow.xib index 8ba842d..320c349 100644 --- a/MainWindow.xib +++ b/MainWindow.xib @@ -12,7 +12,7 @@ YES - + YES @@ -9901,8 +9901,8 @@ AAEAAQABA IBCocoaTouchFramework NO - - + + Browse NSImage @@ -9913,11 +9913,37 @@ AAEAAQABA BrowseViewController + 1 IBCocoaTouchFramework NO + + + 256 + {0, 0} + NO + YES + YES + IBCocoaTouchFramework + + + YES + + + + + IBCocoaTouchFramework + + + + 1 + + IBCocoaTouchFramework + NO + + YES @@ -9960,7 +9986,7 @@ AAEAAQABA 10 - PicCast + IBCocoaTouchFramework 1 @@ -9978,7 +10004,7 @@ AAEAAQABA - + Faves @@ -9997,20 +10023,45 @@ AAEAAQABA IBCocoaTouchFramework NO - - + + Search + IBCocoaTouchFramework 8 - SearchView + 1 IBCocoaTouchFramework NO + + + 256 + {0, 0} + NO + YES + YES + IBCocoaTouchFramework + + + YES + + + + IBCocoaTouchFramework + + + + 1 + + IBCocoaTouchFramework + NO + + @@ -10101,10 +10152,10 @@ AAEAAQABA YES - - + + @@ -10113,39 +10164,11 @@ AAEAAQABA - - 109 - - - YES - - - - - - 110 - - - -2 - - 126 - - - YES - - - - - - 125 - - - 128 @@ -10210,6 +10233,76 @@ AAEAAQABA + + 143 + + + YES + + + + + + + + 144 + + + YES + + + + + + 145 + + + + + 146 + + + + + 147 + + + + + 148 + + + YES + + + + + + + + 149 + + + YES + + + + + + 150 + + + + + 151 + + + + + 152 + + + @@ -10224,17 +10317,22 @@ AAEAAQABA 107.IBViewBoundsToFrameTransform 108.CustomClassName 108.IBPluginDependency - 109.CustomClassName - 109.IBPluginDependency - 110.IBPluginDependency 111.IBPluginDependency - 125.IBPluginDependency - 126.CustomClassName 127.IBPluginDependency 129.IBEditorWindowLastContentRect 129.IBPluginDependency 131.IBPluginDependency 136.IBPluginDependency + 143.IBPluginDependency + 144.CustomClassName + 144.IBPluginDependency + 145.IBPluginDependency + 146.IBPluginDependency + 148.IBPluginDependency + 149.CustomClassName + 149.IBPluginDependency + 150.IBPluginDependency + 151.IBPluginDependency 2.IBAttributePlaceholdersKey 2.IBEditorWindowLastContentRect 2.IBPluginDependency @@ -10253,14 +10351,19 @@ AAEAAQABA TopicsViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin - BrowseViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{0, 354}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin SearchViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{0, 354}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + BrowseViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -10293,7 +10396,7 @@ AAEAAQABA - 142 + 152 diff --git a/PicCast.xcodeproj/handler.mode1v3 b/PicCast.xcodeproj/handler.mode1v3 index 14e4a4a..9d86acb 100644 --- a/PicCast.xcodeproj/handler.mode1v3 +++ b/PicCast.xcodeproj/handler.mode1v3 @@ -265,11 +265,8 @@ 29B97314FDCFA39411CA2CEA 080E96DDFE201D6D7F000001 - 4EB5425A13653A50009A5AC5 - 4EB5426B13653A50009A5AC5 4EB53E6513634D4E009A5AC5 4ECFB853135FD22C007FAB8D - 4E68283013594C50001EB808 29B97315FDCFA39411CA2CEA 29B97317FDCFA39411CA2CEA 29B97323FDCFA39411CA2CEA @@ -280,13 +277,13 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 56 + 26 4 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 695}, {282, 667}} + {{0, 284}, {282, 667}} PBXTopSmartGroupGIDs @@ -323,7 +320,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - BrowseViewController.m + PicCastAppDelegate.m PBXSplitModuleInNavigatorKey Split0 @@ -331,11 +328,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - BrowseViewController.m + PicCastAppDelegate.m _historyCapacity 0 bookmark - 4EC4F96C136B36D5006A5F00 + 4ECDBA30136C44BF003284DB history 4E68286F1359595F001EB808 @@ -374,14 +371,12 @@ 4E75CE64136769E400ED9C9D 4E75CEAC1367738400ED9C9D 4E75CEE71367772300ED9C9D - 4E75CF171367AB2100ED9C9D 4E75CF2B1367B75300ED9C9D 4E75CF4D1367BB6A00ED9C9D 4E75CF4E1367BB6A00ED9C9D 4E75CF661367C36100ED9C9D 4E75CF671367C36100ED9C9D 4E75CFE11367DECB00ED9C9D - 4E75CFE21367DECB00ED9C9D 4E75CFFB1368A43800ED9C9D 4E75D0151368A5B000ED9C9D 4E75D0501368C2D100ED9C9D @@ -389,13 +384,18 @@ 4E75D158136928CB00ED9C9D 4E0B6BC3136A6EC600ED46E4 4E0B6BC4136A6EC600ED46E4 - 4E0B6BD9136A78BB00ED46E4 - 4EC4F955136B3569006A5F00 - 4EC4F957136B3569006A5F00 - 4EC4F968136B36D5006A5F00 - 4EC4F969136B36D5006A5F00 - 4EC4F96A136B36D5006A5F00 - 4EC4F96B136B36D5006A5F00 + 4EC4F98D136B5FE2006A5F00 + 4EC4F9D7136B6BE2006A5F00 + 4ECDB988136C25C3003284DB + 4ECDB989136C25C3003284DB + 4ECDB9AD136C2849003284DB + 4ECDB9AF136C2849003284DB + 4ECDB9EA136C4055003284DB + 4ECDB9EB136C4055003284DB + 4ECDB9EC136C4055003284DB + 4ECDB9ED136C4055003284DB + 4ECDBA2E136C44BF003284DB + 4ECDBA2F136C44BF003284DB SplitCount @@ -453,9 +453,9 @@ TableOfContents - 4EC4F93C136B30A5006A5F00 + 4ECDB98D136C25C3003284DB 1CE0B1FE06471DED0097A5F4 - 4EC4F93D136B30A5006A5F00 + 4ECDB98E136C25C3003284DB 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -593,12 +593,13 @@ 5 WindowOrderList - 4EC4F96D136B36D5006A5F00 - 4EC4F96E136B36D5006A5F00 - 4EC4F964136B3569006A5F00 - 1C78EAAD065D492600B07095 + 4ECDBA31136C44BF003284DB + 4ECDB99E136C264E003284DB + 4ECDB997136C25C3003284DB 1CD10A99069EF8BA00B06720 4E6827C813593DE3001EB808 + 1C530D57069F1CE1000CFCEE + 1C78EAAD065D492600B07095 /Users/handler/Documents/code/xCode/PicCast/PicCast.xcodeproj WindowString @@ -618,12 +619,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + SearchViewController.m StatusBarVisibility @@ -679,7 +682,7 @@ TableOfContents 4E6827C813593DE3001EB808 - 4EC4F93E136B30A5006A5F00 + 4ECDB96D136C2234003284DB 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -766,13 +769,13 @@ DebugVariablesTableConfiguration Name - 214 + 224 Value - 85 + 142 Summary - 232 + 172 Type - 91 + 84 Frame {{571, 0}, {650, 343}} @@ -803,13 +806,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 4EC4F95C136B3569006A5F00 + 4ECDB98F136C25C3003284DB 1C162984064C10D400B95A72 - 4EC4F95D136B3569006A5F00 - 4EC4F95E136B3569006A5F00 - 4EC4F95F136B3569006A5F00 - 4EC4F960136B3569006A5F00 - 4EC4F961136B3569006A5F00 + 4ECDB990136C25C3003284DB + 4ECDB991136C25C3003284DB + 4ECDB992136C25C3003284DB + 4ECDB993136C25C3003284DB + 4ECDB994136C25C3003284DB ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -841,7 +844,7 @@ PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - + TopicsViewController.m StatusBarVisibility @@ -899,8 +902,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 4E0B6BD2136A70E900ED46E4 - 4E0B6BD3136A70E900ED46E4 + 4ECDB96F136C2234003284DB + 4ECDB970136C2234003284DB 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -928,6 +931,8 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -963,7 +968,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 4EC4F962136B3569006A5F00 + 4ECDB995136C25C3003284DB 1C78EAAC065D492600B07095 ToolbarConfiguration @@ -973,7 +978,7 @@ WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/PicCast.xcodeproj/handler.pbxuser b/PicCast.xcodeproj/handler.pbxuser index cd2ea66..ea71e8e 100644 --- a/PicCast.xcodeproj/handler.pbxuser +++ b/PicCast.xcodeproj/handler.pbxuser @@ -9,9 +9,9 @@ }; 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 2613}}"; - sepNavSelRange = "{1716, 0}"; - sepNavVisRange = "{953, 1927}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 3263}}"; + sepNavSelRange = "{2117, 0}"; + sepNavVisRange = "{756, 1526}"; }; }; 1D6058900D05DD3D006BFB54 /* PicCast */ = { @@ -43,12 +43,14 @@ 1D6058900D05DD3D006BFB54 /* PicCast */, ); breakpoints = ( - 4E75D07C1368CAD500ED9C9D /* TopicsViewController.m:310 */, - 4E75D0E91368F33700ED9C9D /* TopicsViewController.m:265 */, - 4E75D0EB1368F33900ED9C9D /* TopicsViewController.m:266 */, - 4E75D0ED1368F33B00ED9C9D /* TopicsViewController.m:270 */, - 4E75D0F41368F3A600ED9C9D /* TopicsViewController.m:262 */, - 4E75D0FE1368F46F00ED9C9D /* TopicsViewController.m:272 */, + 4E75D07C1368CAD500ED9C9D /* TopicsViewController.m:324 */, + 4E75D0E91368F33700ED9C9D /* TopicsViewController.m:279 */, + 4E75D0EB1368F33900ED9C9D /* TopicsViewController.m:280 */, + 4E75D0ED1368F33B00ED9C9D /* TopicsViewController.m:284 */, + 4E75D0F41368F3A600ED9C9D /* TopicsViewController.m:276 */, + 4E75D0FE1368F46F00ED9C9D /* TopicsViewController.m:286 */, + 4EC4F986136B5FD6006A5F00 /* PhotoViewController.m:22 */, + 4EC4F994136B6009006A5F00 /* PhotoViewController.m:63 */, ); codeSenseManager = 4E6827BA13593BCD001EB808 /* Code sense */; executables = ( @@ -126,19 +128,14 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 325791907; - PBXWorkspaceStateSaveDate = 325791907; + PBXPerProjectTemplateStateSaveDate = 325853728; + PBXWorkspaceStateSaveDate = 325853728; }; perUserProjectItems = { 4E067D3A1361413100D43FE0 = 4E067D3A1361413100D43FE0 /* PBXTextBookmark */; 4E0B6BC3136A6EC600ED46E4 = 4E0B6BC3136A6EC600ED46E4 /* PBXTextBookmark */; 4E0B6BC4136A6EC600ED46E4 = 4E0B6BC4136A6EC600ED46E4 /* PBXTextBookmark */; - 4E0B6BC5136A6EC600ED46E4 = 4E0B6BC5136A6EC600ED46E4 /* PBXTextBookmark */; - 4E0B6BC6136A6EC600ED46E4 = 4E0B6BC6136A6EC600ED46E4 /* PBXTextBookmark */; - 4E0B6BC7136A6EC600ED46E4 = 4E0B6BC7136A6EC600ED46E4 /* PBXTextBookmark */; - 4E0B6BC8136A6EC600ED46E4 = 4E0B6BC8136A6EC600ED46E4 /* PBXTextBookmark */; 4E0B6BD9136A78BB00ED46E4 = 4E0B6BD9136A78BB00ED46E4 /* PBXTextBookmark */; - 4E0B6BDA136A78BB00ED46E4 = 4E0B6BDA136A78BB00ED46E4 /* PBXTextBookmark */; 4E68286F1359595F001EB808 = 4E68286F1359595F001EB808 /* PBXTextBookmark */; 4E759BF4135D31C500171031 = 4E759BF4135D31C500171031 /* PBXTextBookmark */; 4E75CDF51367576200ED9C9D = 4E75CDF51367576200ED9C9D /* PBXTextBookmark */; @@ -149,14 +146,12 @@ 4E75CE64136769E400ED9C9D = 4E75CE64136769E400ED9C9D /* PBXTextBookmark */; 4E75CEAC1367738400ED9C9D = 4E75CEAC1367738400ED9C9D /* PBXBookmark */; 4E75CEE71367772300ED9C9D = 4E75CEE71367772300ED9C9D /* PBXTextBookmark */; - 4E75CF171367AB2100ED9C9D = 4E75CF171367AB2100ED9C9D /* PBXTextBookmark */; 4E75CF2B1367B75300ED9C9D = 4E75CF2B1367B75300ED9C9D /* PBXTextBookmark */; 4E75CF4D1367BB6A00ED9C9D = 4E75CF4D1367BB6A00ED9C9D /* PBXTextBookmark */; 4E75CF4E1367BB6A00ED9C9D = 4E75CF4E1367BB6A00ED9C9D /* PBXTextBookmark */; 4E75CF661367C36100ED9C9D = 4E75CF661367C36100ED9C9D /* PBXTextBookmark */; 4E75CF671367C36100ED9C9D = 4E75CF671367C36100ED9C9D /* PBXTextBookmark */; 4E75CFE11367DECB00ED9C9D = 4E75CFE11367DECB00ED9C9D /* PBXTextBookmark */; - 4E75CFE21367DECB00ED9C9D = 4E75CFE21367DECB00ED9C9D /* PBXTextBookmark */; 4E75CFFB1368A43800ED9C9D = 4E75CFFB1368A43800ED9C9D /* PBXTextBookmark */; 4E75D0151368A5B000ED9C9D = 4E75D0151368A5B000ED9C9D /* PBXTextBookmark */; 4E75D0501368C2D100ED9C9D = 4E75D0501368C2D100ED9C9D /* PBXTextBookmark */; @@ -182,19 +177,55 @@ 4EB542AB136541D2009A5AC5 = 4EB542AB136541D2009A5AC5 /* PBXTextBookmark */; 4EB542AC136541D2009A5AC5 = 4EB542AC136541D2009A5AC5 /* PBXTextBookmark */; 4EBFCB481360E786005AC5CC = 4EBFCB481360E786005AC5CC /* PBXTextBookmark */; - 4EC4F93B136B30A5006A5F00 /* PBXTextBookmark */ = 4EC4F93B136B30A5006A5F00 /* PBXTextBookmark */; - 4EC4F955136B3569006A5F00 /* PBXTextBookmark */ = 4EC4F955136B3569006A5F00 /* PBXTextBookmark */; - 4EC4F956136B3569006A5F00 /* PBXTextBookmark */ = 4EC4F956136B3569006A5F00 /* PBXTextBookmark */; - 4EC4F957136B3569006A5F00 /* PBXTextBookmark */ = 4EC4F957136B3569006A5F00 /* PBXTextBookmark */; - 4EC4F958136B3569006A5F00 /* PBXTextBookmark */ = 4EC4F958136B3569006A5F00 /* PBXTextBookmark */; - 4EC4F959136B3569006A5F00 /* PBXTextBookmark */ = 4EC4F959136B3569006A5F00 /* PBXTextBookmark */; - 4EC4F95A136B3569006A5F00 /* PBXTextBookmark */ = 4EC4F95A136B3569006A5F00 /* PBXTextBookmark */; - 4EC4F95B136B3569006A5F00 /* PBXTextBookmark */ = 4EC4F95B136B3569006A5F00 /* PBXTextBookmark */; - 4EC4F968136B36D5006A5F00 /* PBXTextBookmark */ = 4EC4F968136B36D5006A5F00 /* PBXTextBookmark */; - 4EC4F969136B36D5006A5F00 /* PBXTextBookmark */ = 4EC4F969136B36D5006A5F00 /* PBXTextBookmark */; - 4EC4F96A136B36D5006A5F00 /* PBXTextBookmark */ = 4EC4F96A136B36D5006A5F00 /* PBXTextBookmark */; - 4EC4F96B136B36D5006A5F00 /* PBXTextBookmark */ = 4EC4F96B136B36D5006A5F00 /* PBXTextBookmark */; - 4EC4F96C136B36D5006A5F00 /* PBXTextBookmark */ = 4EC4F96C136B36D5006A5F00 /* PBXTextBookmark */; + 4EC4F955136B3569006A5F00 = 4EC4F955136B3569006A5F00 /* PBXTextBookmark */; + 4EC4F98A136B5FE2006A5F00 = 4EC4F98A136B5FE2006A5F00 /* PBXTextBookmark */; + 4EC4F98B136B5FE2006A5F00 = 4EC4F98B136B5FE2006A5F00 /* PBXTextBookmark */; + 4EC4F98C136B5FE2006A5F00 = 4EC4F98C136B5FE2006A5F00 /* PBXTextBookmark */; + 4EC4F98D136B5FE2006A5F00 = 4EC4F98D136B5FE2006A5F00 /* PBXTextBookmark */; + 4EC4F9D7136B6BE2006A5F00 = 4EC4F9D7136B6BE2006A5F00 /* PBXTextBookmark */; + 4EC4F9DD136B7243006A5F00 = 4EC4F9DD136B7243006A5F00 /* PBXTextBookmark */; + 4EC4F9DE136B7243006A5F00 = 4EC4F9DE136B7243006A5F00 /* PBXTextBookmark */; + 4EC4FA08136BB681006A5F00 = 4EC4FA08136BB681006A5F00 /* PBXTextBookmark */; + 4ECDB988136C25C3003284DB /* PBXTextBookmark */ = 4ECDB988136C25C3003284DB /* PBXTextBookmark */; + 4ECDB989136C25C3003284DB /* PBXTextBookmark */ = 4ECDB989136C25C3003284DB /* PBXTextBookmark */; + 4ECDB98A136C25C3003284DB /* PBXTextBookmark */ = 4ECDB98A136C25C3003284DB /* PBXTextBookmark */; + 4ECDB98B136C25C3003284DB /* PBXTextBookmark */ = 4ECDB98B136C25C3003284DB /* PBXTextBookmark */; + 4ECDB98C136C25C3003284DB /* PBXTextBookmark */ = 4ECDB98C136C25C3003284DB /* PBXTextBookmark */; + 4ECDB99B136C264E003284DB /* PBXTextBookmark */ = 4ECDB99B136C264E003284DB /* PBXTextBookmark */; + 4ECDB99C136C264E003284DB /* PBXTextBookmark */ = 4ECDB99C136C264E003284DB /* PBXTextBookmark */; + 4ECDB9A7136C2844003284DB /* XCBuildMessageTextBookmark */ = 4ECDB9A7136C2844003284DB /* XCBuildMessageTextBookmark */; + 4ECDB9A8136C2844003284DB /* PBXTextBookmark */ = 4ECDB9A8136C2844003284DB /* PBXTextBookmark */; + 4ECDB9A9136C2844003284DB /* PBXTextBookmark */ = 4ECDB9A9136C2844003284DB /* PBXTextBookmark */; + 4ECDB9AA136C2844003284DB /* PBXTextBookmark */ = 4ECDB9AA136C2844003284DB /* PBXTextBookmark */; + 4ECDB9AD136C2849003284DB /* PBXTextBookmark */ = 4ECDB9AD136C2849003284DB /* PBXTextBookmark */; + 4ECDB9AE136C2849003284DB /* PBXTextBookmark */ = 4ECDB9AE136C2849003284DB /* PBXTextBookmark */; + 4ECDB9AF136C2849003284DB /* PBXTextBookmark */ = 4ECDB9AF136C2849003284DB /* PBXTextBookmark */; + 4ECDB9B0136C2849003284DB /* PBXTextBookmark */ = 4ECDB9B0136C2849003284DB /* PBXTextBookmark */; + 4ECDB9B1136C2849003284DB /* XCBuildMessageTextBookmark */ = 4ECDB9B1136C2849003284DB /* XCBuildMessageTextBookmark */; + 4ECDB9B2136C2849003284DB /* PBXTextBookmark */ = 4ECDB9B2136C2849003284DB /* PBXTextBookmark */; + 4ECDB9B6136C28F9003284DB /* PBXTextBookmark */ = 4ECDB9B6136C28F9003284DB /* PBXTextBookmark */; + 4ECDB9B7136C28F9003284DB /* PBXTextBookmark */ = 4ECDB9B7136C28F9003284DB /* PBXTextBookmark */; + 4ECDB9B8136C28FA003284DB /* PBXTextBookmark */ = 4ECDB9B8136C28FA003284DB /* PBXTextBookmark */; + 4ECDB9C4136C3815003284DB /* PBXTextBookmark */ = 4ECDB9C4136C3815003284DB /* PBXTextBookmark */; + 4ECDB9C5136C3815003284DB /* PBXTextBookmark */ = 4ECDB9C5136C3815003284DB /* PBXTextBookmark */; + 4ECDB9CA136C3893003284DB /* PBXTextBookmark */ = 4ECDB9CA136C3893003284DB /* PBXTextBookmark */; + 4ECDB9CE136C3A61003284DB /* PBXTextBookmark */ = 4ECDB9CE136C3A61003284DB /* PBXTextBookmark */; + 4ECDB9CF136C3A61003284DB /* PBXTextBookmark */ = 4ECDB9CF136C3A61003284DB /* PBXTextBookmark */; + 4ECDB9D0136C3A61003284DB /* PBXTextBookmark */ = 4ECDB9D0136C3A61003284DB /* PBXTextBookmark */; + 4ECDB9D4136C3B68003284DB /* PBXTextBookmark */ = 4ECDB9D4136C3B68003284DB /* PBXTextBookmark */; + 4ECDB9EA136C4055003284DB /* PBXTextBookmark */ = 4ECDB9EA136C4055003284DB /* PBXTextBookmark */; + 4ECDB9EB136C4055003284DB /* PBXBookmark */ = 4ECDB9EB136C4055003284DB /* PBXBookmark */; + 4ECDB9EC136C4055003284DB /* PBXBookmark */ = 4ECDB9EC136C4055003284DB /* PBXBookmark */; + 4ECDB9ED136C4055003284DB /* PBXBookmark */ = 4ECDB9ED136C4055003284DB /* PBXBookmark */; + 4ECDB9EE136C4055003284DB /* PBXTextBookmark */ = 4ECDB9EE136C4055003284DB /* PBXTextBookmark */; + 4ECDB9EF136C4055003284DB /* PBXTextBookmark */ = 4ECDB9EF136C4055003284DB /* PBXTextBookmark */; + 4ECDB9F3136C4078003284DB /* PBXTextBookmark */ = 4ECDB9F3136C4078003284DB /* PBXTextBookmark */; + 4ECDB9F7136C408B003284DB /* PBXTextBookmark */ = 4ECDB9F7136C408B003284DB /* PBXTextBookmark */; + 4ECDB9FB136C4098003284DB /* PBXTextBookmark */ = 4ECDB9FB136C4098003284DB /* PBXTextBookmark */; + 4ECDBA01136C4105003284DB /* PBXTextBookmark */ = 4ECDBA01136C4105003284DB /* PBXTextBookmark */; + 4ECDBA2E136C44BF003284DB /* PBXTextBookmark */ = 4ECDBA2E136C44BF003284DB /* PBXTextBookmark */; + 4ECDBA2F136C44BF003284DB /* PBXTextBookmark */ = 4ECDBA2F136C44BF003284DB /* PBXTextBookmark */; + 4ECDBA30136C44BF003284DB /* PBXTextBookmark */ = 4ECDBA30136C44BF003284DB /* PBXTextBookmark */; 4ECFB6E1135F58D2007FAB8D = 4ECFB6E1135F58D2007FAB8D /* PBXTextBookmark */; 4ECFB724135F80A7007FAB8D = 4ECFB724135F80A7007FAB8D /* PBXBookmark */; 4ED6DC28135B365F00BEF0B7 = 4ED6DC28135B365F00BEF0B7 /* PBXTextBookmark */; @@ -217,16 +248,16 @@ }; 4E0B6B95136A613F00ED46E4 /* SearchViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 625}}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 600}}"; sepNavSelRange = "{686, 0}"; sepNavVisRange = "{0, 991}"; }; }; 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 2509}}"; - sepNavSelRange = "{1435, 600}"; - sepNavVisRange = "{513, 1539}"; + sepNavIntBoundsRect = "{{0, 0}, {1202, 2795}}"; + sepNavSelRange = "{5872, 0}"; + sepNavVisRange = "{4848, 1490}"; }; }; 4E0B6BC3136A6EC600ED46E4 /* PBXTextBookmark */ = { @@ -249,66 +280,16 @@ vrLen = 1408; vrLoc = 0; }; - 4E0B6BC5136A6EC600ED46E4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4ECFB7D5135FC4B0007FAB8D /* SourcesEditViewController.m */; - name = "SourcesEditViewController.m: 235"; - rLen = 0; - rLoc = 2107; - rType = 0; - vrLen = 1790; - vrLoc = 5939; - }; - 4E0B6BC6136A6EC600ED46E4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; - name = "TopicsViewController.m: 30"; - rLen = 1456; - rLoc = 678; - rType = 0; - vrLen = 1743; - vrLoc = 596; - }; - 4E0B6BC7136A6EC600ED46E4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4E0B6B95136A613F00ED46E4 /* SearchViewController.h */; - name = "SearchViewController.h: 33"; - rLen = 0; - rLoc = 838; - rType = 0; - vrLen = 991; - vrLoc = 0; - }; - 4E0B6BC8136A6EC600ED46E4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; - name = "SearchViewController.m: 10"; - rLen = 0; - rLoc = 212; - rType = 0; - vrLen = 1441; - vrLoc = 148; - }; 4E0B6BD9136A78BB00ED46E4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; name = "PicCastAppDelegate.m: 55"; rLen = 0; - rLoc = 1716; + rLoc = 3111; rType = 0; vrLen = 1927; vrLoc = 953; }; - 4E0B6BDA136A78BB00ED46E4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4ECFB7D5135FC4B0007FAB8D /* SourcesEditViewController.m */; - name = "SourcesEditViewController.m: 78"; - rLen = 0; - rLoc = 2107; - rType = 0; - vrLen = 1656; - vrLoc = 6900; - }; 4E6827B513593BAE001EB808 /* acidcow */ = { isa = PBXExecutable; activeArgIndices = ( @@ -381,10 +362,10 @@ }; 4E6827E813594115001EB808 /* TopicsViewController.m */ = { uiCtxt = { - sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{7747, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{7798, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{7848, 12}\";\n s = 1;\n }\n );\n r = \"{0, 17930}\";\n s = 0;\n}"; - sepNavIntBoundsRect = "{{0, 0}, {903, 6890}}"; - sepNavSelRange = "{678, 1456}"; - sepNavVisRange = "{557, 1808}"; + sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{8257, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{8308, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{8358, 12}\";\n s = 1;\n }\n );\n r = \"{0, 18597}\";\n s = 0;\n}"; + sepNavIntBoundsRect = "{{0, 0}, {915, 7215}}"; + sepNavSelRange = "{7691, 0}"; + sepNavVisRange = "{6708, 1633}"; sepNavWindowFrame = "{{15, 323}, {1196, 550}}"; }; }; @@ -397,9 +378,9 @@ }; 4E68280D13594261001EB808 /* TopicTableViewCell.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 767}}"; - sepNavSelRange = "{292, 0}"; - sepNavVisRange = "{180, 1189}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 949}}"; + sepNavSelRange = "{928, 386}"; + sepNavVisRange = "{180, 1571}"; }; }; 4E6828161359437D001EB808 /* XMLParser.h */ = { @@ -559,16 +540,6 @@ vrLen = 480; vrLoc = 0; }; - 4E75CF171367AB2100ED9C9D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4EA95FD4135CE959009243EE /* PhotoViewController.m */; - name = "PhotoViewController.m: 123"; - rLen = 0; - rLoc = 3524; - rType = 0; - vrLen = 1645; - vrLoc = 3250; - }; 4E75CF2B1367B75300ED9C9D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4E68282D13594C48001EB808 /* Topic.h */; @@ -629,16 +600,6 @@ vrLen = 886; vrLoc = 0; }; - 4E75CFE21367DECB00ED9C9D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4E68280D13594261001EB808 /* TopicTableViewCell.m */; - name = "TopicTableViewCell.m: 14"; - rLen = 0; - rLoc = 292; - rType = 0; - vrLen = 1189; - vrLoc = 180; - }; 4E75CFFB1368A43800ED9C9D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4EB5426D13653A50009A5AC5 /* CJSONDeserializer.m */; @@ -679,7 +640,7 @@ vrLen = 576; vrLoc = 0; }; - 4E75D07C1368CAD500ED9C9D /* TopicsViewController.m:310 */ = { + 4E75D07C1368CAD500ED9C9D /* TopicsViewController.m:324 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -691,13 +652,13 @@ functionName = "-tableView:cellForRowAtIndexPath:"; hitCount = 0; ignoreCount = 0; - lineNumber = 310; + lineNumber = 324; location = PicCast; - modificationTime = 325793140.928618; + modificationTime = 325861529.693894; originalNumberOfMultipleMatches = 1; state = 2; }; - 4E75D0E91368F33700ED9C9D /* TopicsViewController.m:265 */ = { + 4E75D0E91368F33700ED9C9D /* TopicsViewController.m:279 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -709,13 +670,13 @@ functionName = "-tableView:titleForHeaderInSection:"; hitCount = 0; ignoreCount = 0; - lineNumber = 265; + lineNumber = 279; location = PicCast; - modificationTime = 325793140.928793; + modificationTime = 325861529.694048; originalNumberOfMultipleMatches = 1; state = 2; }; - 4E75D0EB1368F33900ED9C9D /* TopicsViewController.m:266 */ = { + 4E75D0EB1368F33900ED9C9D /* TopicsViewController.m:280 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -727,13 +688,13 @@ functionName = "-tableView:titleForHeaderInSection:"; hitCount = 0; ignoreCount = 0; - lineNumber = 266; + lineNumber = 280; location = PicCast; - modificationTime = 325793140.928824; + modificationTime = 325861529.694096; originalNumberOfMultipleMatches = 1; state = 2; }; - 4E75D0ED1368F33B00ED9C9D /* TopicsViewController.m:270 */ = { + 4E75D0ED1368F33B00ED9C9D /* TopicsViewController.m:284 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -745,13 +706,13 @@ functionName = "-tableView:titleForHeaderInSection:"; hitCount = 0; ignoreCount = 0; - lineNumber = 270; + lineNumber = 284; location = PicCast; - modificationTime = 325793140.928844; + modificationTime = 325861529.694151; originalNumberOfMultipleMatches = 1; state = 2; }; - 4E75D0F41368F3A600ED9C9D /* TopicsViewController.m:262 */ = { + 4E75D0F41368F3A600ED9C9D /* TopicsViewController.m:276 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -763,13 +724,13 @@ functionName = "-tableView:titleForHeaderInSection:"; hitCount = 0; ignoreCount = 0; - lineNumber = 262; + lineNumber = 276; location = PicCast; - modificationTime = 325793140.928914; + modificationTime = 325861529.694211; originalNumberOfMultipleMatches = 1; state = 2; }; - 4E75D0FE1368F46F00ED9C9D /* TopicsViewController.m:272 */ = { + 4E75D0FE1368F46F00ED9C9D /* TopicsViewController.m:286 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -781,9 +742,9 @@ functionName = "-tableView:titleForHeaderInSection:"; hitCount = 0; ignoreCount = 0; - lineNumber = 272; + lineNumber = 286; location = PicCast; - modificationTime = 325793140.928935; + modificationTime = 325861529.694273; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -920,9 +881,9 @@ }; 4EA95FD4135CE959009243EE /* PhotoViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {793, 2951}}"; - sepNavSelRange = "{1789, 0}"; - sepNavVisRange = "{1623, 514}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 3263}}"; + sepNavSelRange = "{370, 0}"; + sepNavVisRange = "{324, 2178}"; }; }; 4EB53EC2136359E3009A5AC5 /* FMDatabaseAdditions.h */ = { @@ -1074,29 +1035,19 @@ path = /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.2.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIView.h; sourceTree = ""; }; - 4EC4F93B136B30A5006A5F00 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4ECFB7D5135FC4B0007FAB8D /* SourcesEditViewController.m */; - name = "SourcesEditViewController.m: 78"; - rLen = 0; - rLoc = 2107; - rType = 0; - vrLen = 1664; - vrLoc = 6893; - }; 4EC4F948136B3135006A5F00 /* BrowseViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 625}}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 600}}"; sepNavSelRange = "{579, 0}"; sepNavVisRange = "{0, 895}"; }; }; 4EC4F949136B3135006A5F00 /* BrowseViewController.m */ = { uiCtxt = { - sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{5053, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{5104, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{5154, 12}\";\n s = 1;\n }\n );\n r = \"{0, 5855}\";\n s = 0;\n}"; + sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{5405, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{5456, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{5506, 12}\";\n s = 1;\n }\n );\n r = \"{0, 6207}\";\n s = 0;\n}"; sepNavIntBoundsRect = "{{0, 0}, {903, 2691}}"; - sepNavSelRange = "{1524, 0}"; - sepNavVisRange = "{695, 1387}"; + sepNavSelRange = "{688, 0}"; + sepNavVisRange = "{182, 1638}"; }; }; 4EC4F955136B3569006A5F00 /* PBXTextBookmark */ = { @@ -1109,37 +1060,55 @@ vrLen = 1663; vrLoc = 6893; }; - 4EC4F956136B3569006A5F00 /* PBXTextBookmark */ = { + 4EC4F986136B5FD6006A5F00 /* PhotoViewController.m:22 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 4EA95FD4135CE959009243EE /* PhotoViewController.m */; + functionName = "-viewDidLoad"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 22; + location = PicCast; + modificationTime = 325861529.694315; + originalNumberOfMultipleMatches = 1; + state = 2; + }; + 4EC4F98A136B5FE2006A5F00 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 4E0B6B95136A613F00ED46E4 /* SearchViewController.h */; - name = "SearchViewController.h: 24"; - rLen = 414; - rLoc = 570; + fRef = 4EC4F949136B3135006A5F00 /* BrowseViewController.m */; + name = "BrowseViewController.m: 52"; + rLen = 0; + rLoc = 1876; rType = 0; - vrLen = 991; - vrLoc = 0; + vrLen = 1387; + vrLoc = 695; }; - 4EC4F957136B3569006A5F00 /* PBXTextBookmark */ = { + 4EC4F98B136B5FE2006A5F00 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; - name = "TopicsViewController.m: 30"; - rLen = 1456; - rLoc = 678; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 46"; + rLen = 0; + rLoc = 1786; rType = 0; - vrLen = 1808; - vrLoc = 557; + vrLen = 1473; + vrLoc = 3; }; - 4EC4F958136B3569006A5F00 /* PBXTextBookmark */ = { + 4EC4F98C136B5FE2006A5F00 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; - name = "SearchViewController.m: 20"; - rLen = 961; - rLoc = 341; + fRef = 4E0B6B95136A613F00ED46E4 /* SearchViewController.h */; + name = "SearchViewController.h: 27"; + rLen = 0; + rLoc = 686; rType = 0; - vrLen = 1638; - vrLoc = 3821; + vrLen = 991; + vrLoc = 0; }; - 4EC4F959136B3569006A5F00 /* PBXTextBookmark */ = { + 4EC4F98D136B5FE2006A5F00 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4EC4F948136B3135006A5F00 /* BrowseViewController.h */; name = "BrowseViewController.h: 21"; @@ -1149,27 +1118,171 @@ vrLen = 895; vrLoc = 0; }; - 4EC4F95A136B3569006A5F00 /* PBXTextBookmark */ = { + 4EC4F994136B6009006A5F00 /* PhotoViewController.m:63 */ = { + isa = PBXFileBreakpoint; + actions = ( + ); + breakpointStyle = 0; + continueAfterActions = 0; + countType = 0; + delayBeforeContinue = 0; + fileReference = 4EA95FD4135CE959009243EE /* PhotoViewController.m */; + functionName = "-viewDidLoad"; + hitCount = 0; + ignoreCount = 0; + lineNumber = 63; + location = PicCast; + modificationTime = 325861529.694334; + originalNumberOfMultipleMatches = 1; + state = 2; + }; + 4EC4F9D7136B6BE2006A5F00 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 4EC4F949136B3135006A5F00 /* BrowseViewController.m */; - name = "BrowseViewController.m: 90"; + fRef = 4E68280D13594261001EB808 /* TopicTableViewCell.m */; + name = "TopicTableViewCell.m: 34"; + rLen = 386; + rLoc = 928; + rType = 0; + vrLen = 1571; + vrLoc = 180; + }; + 4EC4F9DD136B7243006A5F00 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 382"; rLen = 0; - rLoc = 2954; + rLoc = 13358; rType = 0; - vrLen = 1457; + vrLen = 1781; + vrLoc = 8215; + }; + 4EC4F9DE136B7243006A5F00 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4EA95FD4135CE959009243EE /* PhotoViewController.m */; + name = "PhotoViewController.m: 66"; + rLen = 0; + rLoc = 2498; + rType = 0; + vrLen = 1583; vrLoc = 0; }; - 4EC4F95B136B3569006A5F00 /* PBXTextBookmark */ = { + 4EC4FA08136BB681006A5F00 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 4EC4F949136B3135006A5F00 /* BrowseViewController.m */; - name = "BrowseViewController.m: 90"; + fRef = 4EA95FD4135CE959009243EE /* PhotoViewController.m */; + name = "PhotoViewController.m: 21"; + rLen = 0; + rLoc = 370; + rType = 0; + vrLen = 2173; + vrLoc = 326; + }; + 4ECDB988136C25C3003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4EA95FD4135CE959009243EE /* PhotoViewController.m */; + name = "PhotoViewController.m: 21"; + rLen = 0; + rLoc = 370; + rType = 0; + vrLen = 2178; + vrLoc = 324; + }; + 4ECDB989136C25C3003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ECFB7D5135FC4B0007FAB8D /* SourcesEditViewController.m */; + name = "SourcesEditViewController.m: 78"; + rLen = 0; + rLoc = 2107; + rType = 0; + vrLen = 1228; + vrLoc = 332; + }; + 4ECDB98A136C25C3003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 30"; + rLen = 0; + rLoc = 1311; + rType = 0; + vrLen = 1446; + vrLoc = 0; + }; + 4ECDB98B136C25C3003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 34"; + rLen = 0; + rLoc = 803; + rType = 0; + vrLen = 1437; + vrLoc = 0; + }; + 4ECDB98C136C25C3003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 34"; + rLen = 0; + rLoc = 803; + rType = 0; + vrLen = 1412; + vrLoc = 3; + }; + 4ECDB99B136C264E003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 34"; + rLen = 0; + rLoc = 803; + rType = 0; + vrLen = 1412; + vrLoc = 3; + }; + 4ECDB99C136C264E003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 29"; rLen = 0; - rLoc = 2954; + rLoc = 1274; + rType = 0; + vrLen = 1443; + vrLoc = 3; + }; + 4ECDB9A7136C2844003284DB /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected expression before '<' token"; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 159; + rType = 1; + }; + 4ECDB9A8136C2844003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 160"; + rLen = 0; + rLoc = 5452; + rType = 0; + vrLen = 590; + vrLoc = 5090; + }; + 4ECDB9A9136C2844003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + rLen = 18; + rLoc = 1171; + rType = 0; + }; + 4ECDB9AA136C2844003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 41"; + rLen = 18; + rLoc = 1171; rType = 0; - vrLen = 1597; - vrLoc = 1720; + vrLen = 888; + vrLoc = 527; }; - 4EC4F968136B36D5006A5F00 /* PBXTextBookmark */ = { + 4ECDB9AD136C2849003284DB /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4E0B6B95136A613F00ED46E4 /* SearchViewController.h */; name = "SearchViewController.h: 27"; @@ -1179,45 +1292,266 @@ vrLen = 991; vrLoc = 0; }; - 4EC4F969136B36D5006A5F00 /* PBXTextBookmark */ = { + 4ECDB9AE136C2849003284DB /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 4EC4F948136B3135006A5F00 /* BrowseViewController.h */; - name = "BrowseViewController.h: 21"; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 40"; + rLen = 294; + rLoc = 1010; + rType = 0; + vrLen = 1594; + vrLoc = 88; + }; + 4ECDB9AF136C2849003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4EC4F949136B3135006A5F00 /* BrowseViewController.m */; + name = "BrowseViewController.m: 30"; rLen = 0; - rLoc = 579; + rLoc = 688; rType = 0; - vrLen = 895; - vrLoc = 0; + vrLen = 1638; + vrLoc = 182; + }; + 4ECDB9B0136C2849003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 27"; + rLen = 0; + rLoc = 1088; + rType = 0; + vrLen = 1460; + vrLoc = 3; + }; + 4ECDB9B1136C2849003284DB /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Expected expression before '<' token"; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 159; + rType = 1; + }; + 4ECDB9B2136C2849003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 160"; + rLen = 0; + rLoc = 5451; + rType = 0; + vrLen = 1556; + vrLoc = 4639; + }; + 4ECDB9B6136C28F9003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 160"; + rLen = 0; + rLoc = 5452; + rType = 0; + vrLen = 698; + vrLoc = 4848; + }; + 4ECDB9B7136C28F9003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 41"; + rLen = 18; + rLoc = 1171; + rType = 0; + vrLen = 808; + vrLoc = 527; + }; + 4ECDB9B8136C28FA003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 160"; + rLen = 0; + rLoc = 5451; + rType = 0; + vrLen = 1639; + vrLoc = 148; + }; + 4ECDB9C4136C3815003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 160"; + rLen = 0; + rLoc = 5451; + rType = 0; + vrLen = 1670; + vrLoc = 252; + }; + 4ECDB9C5136C3815003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 160"; + rLen = 0; + rLoc = 5491; + rType = 0; + vrLen = 1624; + vrLoc = 4526; + }; + 4ECDB9CA136C3893003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 169"; + rLen = 0; + rLoc = 5685; + rType = 0; + vrLen = 1463; + vrLoc = 4637; + }; + 4ECDB9CE136C3A61003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 15"; + rLen = 0; + rLoc = 394; + rType = 0; + vrLen = 1353; + vrLoc = 3; + }; + 4ECDB9CF136C3A61003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 169"; + rLen = 0; + rLoc = 5685; + rType = 0; + vrLen = 1463; + vrLoc = 4637; + }; + 4ECDB9D0136C3A61003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 152"; + rLen = 0; + rLoc = 5161; + rType = 0; + vrLen = 1524; + vrLoc = 4641; + }; + 4ECDB9D4136C3B68003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; + name = "SearchViewController.m: 176"; + rLen = 0; + rLoc = 5872; + rType = 0; + vrLen = 1490; + vrLoc = 4848; }; - 4EC4F96A136B36D5006A5F00 /* PBXTextBookmark */ = { + 4ECDB9EA136C4055003284DB /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4E0B6B96136A613F00ED46E4 /* SearchViewController.m */; - name = "SearchViewController.m: 47"; - rLen = 600; - rLoc = 1435; + name = "SearchViewController.m: 176"; + rLen = 0; + rLoc = 5872; rType = 0; - vrLen = 1539; + vrLen = 1490; + vrLoc = 4848; + }; + 4ECDB9EB136C4055003284DB /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 4ECDB97D136C2360003284DB /* titleLogo.png */; + }; + 4ECDB9EC136C4055003284DB /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 4ECDB97F136C2360003284DB /* logo.32.png */; + }; + 4ECDB9ED136C4055003284DB /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 4ECDB97E136C2360003284DB /* logo.32@2x.png */; + }; + 4ECDB9EE136C4055003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 53"; + rLen = 0; + rLoc = 1987; + rType = 0; + vrLen = 1459; + vrLoc = 338; + }; + 4ECDB9EF136C4055003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 62"; + rLen = 164; + rLoc = 1987; + rType = 0; + vrLen = 1525; vrLoc = 513; }; - 4EC4F96B136B36D5006A5F00 /* PBXTextBookmark */ = { + 4ECDB9F3136C4078003284DB /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 4EC4F949136B3135006A5F00 /* BrowseViewController.m */; - name = "BrowseViewController.m: 90"; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 55"; rLen = 0; - rLoc = 2954; + rLoc = 1768; rType = 0; - vrLen = 1597; - vrLoc = 1720; + vrLen = 1556; + vrLoc = 519; }; - 4EC4F96C136B36D5006A5F00 /* PBXTextBookmark */ = { + 4ECDB9F7136C408B003284DB /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 4EC4F949136B3135006A5F00 /* BrowseViewController.m */; - name = "BrowseViewController.m: 52"; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 55"; rLen = 0; - rLoc = 1524; + rLoc = 1768; rType = 0; - vrLen = 1387; - vrLoc = 695; + vrLen = 1523; + vrLoc = 601; + }; + 4ECDB9FB136C4098003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 55"; + rLen = 0; + rLoc = 1768; + rType = 0; + vrLen = 1516; + vrLoc = 643; + }; + 4ECDBA01136C4105003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 57"; + rLen = 0; + rLoc = 1876; + rType = 0; + vrLen = 1557; + vrLoc = 643; + }; + 4ECDBA2E136C44BF003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 234"; + rLen = 0; + rLoc = 7691; + rType = 0; + vrLen = 1690; + vrLoc = 6708; + }; + 4ECDBA2F136C44BF003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 35"; + rLen = 0; + rLoc = 1023; + rType = 0; + vrLen = 1667; + vrLoc = 513; + }; + 4ECDBA30136C44BF003284DB /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 64"; + rLen = 0; + rLoc = 2117; + rType = 0; + vrLen = 1526; + vrLoc = 756; }; 4ECFB6D0135F5807007FAB8D /* AcidCowFeedburnerParser.m */ = { uiCtxt = { @@ -1257,9 +1591,9 @@ 4ECFB7D5135FC4B0007FAB8D /* SourcesEditViewController.m */ = { uiCtxt = { sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{9883, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{9934, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{9984, 12}\";\n s = 1;\n }\n );\n r = \"{0, 10756}\";\n s = 0;\n}"; - sepNavIntBoundsRect = "{{0, 0}, {1048, 4498}}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 4602}}"; sepNavSelRange = "{2107, 0}"; - sepNavVisRange = "{6893, 1663}"; + sepNavVisRange = "{332, 1228}"; }; }; 4ECFB856135FD34B007FAB8D /* SourcesEditViewCell.h */ = { diff --git a/PicCast.xcodeproj/project.pbxproj b/PicCast.xcodeproj/project.pbxproj index ea0fc0f..9584eae 100644 --- a/PicCast.xcodeproj/project.pbxproj +++ b/PicCast.xcodeproj/project.pbxproj @@ -63,6 +63,18 @@ 4EBFCBBD1360F90A005AC5CC /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCBBC1360F90A005AC5CC /* Default@2x.png */; }; 4EC4F94B136B3135006A5F00 /* BrowseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EC4F949136B3135006A5F00 /* BrowseViewController.m */; }; 4EC4F94C136B3135006A5F00 /* BrowseViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4EC4F94A136B3135006A5F00 /* BrowseViewController.xib */; }; + 4ECDB980136C2360003284DB /* titleLogo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB97C136C2360003284DB /* titleLogo@2x.png */; }; + 4ECDB981136C2360003284DB /* titleLogo.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB97D136C2360003284DB /* titleLogo.png */; }; + 4ECDB982136C2360003284DB /* logo.32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB97E136C2360003284DB /* logo.32@2x.png */; }; + 4ECDB983136C2360003284DB /* logo.32.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB97F136C2360003284DB /* logo.32.png */; }; + 4ECDB9DE136C4010003284DB /* loading.4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB9D6136C4010003284DB /* loading.4@2x.png */; }; + 4ECDB9DF136C4010003284DB /* loading.4.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB9D7136C4010003284DB /* loading.4.png */; }; + 4ECDB9E0136C4010003284DB /* loading.3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB9D8136C4010003284DB /* loading.3@2x.png */; }; + 4ECDB9E1136C4010003284DB /* loading.3.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB9D9136C4010003284DB /* loading.3.png */; }; + 4ECDB9E2136C4010003284DB /* loading.2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB9DA136C4010003284DB /* loading.2@2x.png */; }; + 4ECDB9E3136C4010003284DB /* loading.2.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB9DB136C4010003284DB /* loading.2.png */; }; + 4ECDB9E4136C4010003284DB /* loading.1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB9DC136C4010003284DB /* loading.1@2x.png */; }; + 4ECDB9E5136C4010003284DB /* loading.1.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECDB9DD136C4010003284DB /* loading.1.png */; }; 4ECFB6D2135F5807007FAB8D /* AcidCowFeedburnerParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ECFB6D0135F5807007FAB8D /* AcidCowFeedburnerParser.m */; }; 4ECFB6E9135F6FDB007FAB8D /* PicCast.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECFB6E8135F6FDB007FAB8D /* PicCast.png */; }; 4ECFB758135F8869007FAB8D /* PicCastTabBarIcons.category.30.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECFB752135F8869007FAB8D /* PicCastTabBarIcons.category.30.png */; }; @@ -326,6 +338,18 @@ 4EC4F948136B3135006A5F00 /* BrowseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowseViewController.h; sourceTree = ""; }; 4EC4F949136B3135006A5F00 /* BrowseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowseViewController.m; sourceTree = ""; }; 4EC4F94A136B3135006A5F00 /* BrowseViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BrowseViewController.xib; sourceTree = ""; }; + 4ECDB97C136C2360003284DB /* titleLogo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "titleLogo@2x.png"; sourceTree = ""; }; + 4ECDB97D136C2360003284DB /* titleLogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = titleLogo.png; sourceTree = ""; }; + 4ECDB97E136C2360003284DB /* logo.32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo.32@2x.png"; sourceTree = ""; }; + 4ECDB97F136C2360003284DB /* logo.32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.32.png; sourceTree = ""; }; + 4ECDB9D6136C4010003284DB /* loading.4@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "loading.4@2x.png"; sourceTree = ""; }; + 4ECDB9D7136C4010003284DB /* loading.4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.4.png; sourceTree = ""; }; + 4ECDB9D8136C4010003284DB /* loading.3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "loading.3@2x.png"; sourceTree = ""; }; + 4ECDB9D9136C4010003284DB /* loading.3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.3.png; sourceTree = ""; }; + 4ECDB9DA136C4010003284DB /* loading.2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "loading.2@2x.png"; sourceTree = ""; }; + 4ECDB9DB136C4010003284DB /* loading.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.2.png; sourceTree = ""; }; + 4ECDB9DC136C4010003284DB /* loading.1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "loading.1@2x.png"; sourceTree = ""; }; + 4ECDB9DD136C4010003284DB /* loading.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.1.png; sourceTree = ""; }; 4ECFB6D0135F5807007FAB8D /* AcidCowFeedburnerParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AcidCowFeedburnerParser.m; sourceTree = ""; }; 4ECFB6D1135F5807007FAB8D /* AcidCowFeedburnerParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AcidCowFeedburnerParser.h; sourceTree = ""; }; 4ECFB6E8135F6FDB007FAB8D /* PicCast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PicCast.png; sourceTree = ""; }; @@ -661,6 +685,18 @@ 4ECFB751135F8869007FAB8D /* Images */ = { isa = PBXGroup; children = ( + 4ECDB9D6136C4010003284DB /* loading.4@2x.png */, + 4ECDB9D7136C4010003284DB /* loading.4.png */, + 4ECDB9D8136C4010003284DB /* loading.3@2x.png */, + 4ECDB9D9136C4010003284DB /* loading.3.png */, + 4ECDB9DA136C4010003284DB /* loading.2@2x.png */, + 4ECDB9DB136C4010003284DB /* loading.2.png */, + 4ECDB9DC136C4010003284DB /* loading.1@2x.png */, + 4ECDB9DD136C4010003284DB /* loading.1.png */, + 4ECDB97C136C2360003284DB /* titleLogo@2x.png */, + 4ECDB97D136C2360003284DB /* titleLogo.png */, + 4ECDB97E136C2360003284DB /* logo.32@2x.png */, + 4ECDB97F136C2360003284DB /* logo.32.png */, 4EBFCBA81360F8FE005AC5CC /* titleBarBackgroundBlack@2x.png */, 4EBFCBA91360F8FE005AC5CC /* titleBarBackgroundBlack.png */, 4EBFCBAA1360F8FE005AC5CC /* titleBarBackground@2x.png */, @@ -932,6 +968,18 @@ 4E8CFE9C136234CA00B810C6 /* PicCastSqlTable.db in Resources */, 4E0B6B99136A628F00ED46E4 /* SearchView.xib in Resources */, 4EC4F94C136B3135006A5F00 /* BrowseViewController.xib in Resources */, + 4ECDB980136C2360003284DB /* titleLogo@2x.png in Resources */, + 4ECDB981136C2360003284DB /* titleLogo.png in Resources */, + 4ECDB982136C2360003284DB /* logo.32@2x.png in Resources */, + 4ECDB983136C2360003284DB /* logo.32.png in Resources */, + 4ECDB9DE136C4010003284DB /* loading.4@2x.png in Resources */, + 4ECDB9DF136C4010003284DB /* loading.4.png in Resources */, + 4ECDB9E0136C4010003284DB /* loading.3@2x.png in Resources */, + 4ECDB9E1136C4010003284DB /* loading.3.png in Resources */, + 4ECDB9E2136C4010003284DB /* loading.2@2x.png in Resources */, + 4ECDB9E3136C4010003284DB /* loading.2.png in Resources */, + 4ECDB9E4136C4010003284DB /* loading.1@2x.png in Resources */, + 4ECDB9E5136C4010003284DB /* loading.1.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SearchView.xib b/SearchView.xib index bc72c0d..d70a4fe 100644 --- a/SearchView.xib +++ b/SearchView.xib @@ -37,6 +37,9 @@ IBFirstResponder IBCocoaTouchFramework + + IBCocoaTouchFramework + 274 @@ -45,7 +48,7 @@ 274 - {{0, 44}, {320, 367}} + {{0, 44}, {320, 343}} 10 @@ -93,7 +96,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 290 - {{0, 44}, {320, 44}} + {320, 44} 3 IBCocoaTouchFramework @@ -104,23 +107,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA - - - 290 - {320, 44} - - IBCocoaTouchFramework - - YES - - - PicCast - IBCocoaTouchFramework - - - - {320, 411} + {320, 387} 3 @@ -129,15 +117,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA 2 - - 2 + + NO IBCocoaTouchFramework - - IBCocoaTouchFramework - @@ -208,17 +193,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA - - 1 - - - YES - - - - - - -1 @@ -230,37 +204,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA - - 3 - - - YES - - - - - 4 - - - 5 - 11 - + 1 + YES - + + + + + + 4 + - 12 - - + 3 + + @@ -272,8 +239,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA -2.CustomClassName 1.IBEditorWindowLastContentRect 1.IBPluginDependency - 11.IBPluginDependency - 12.IBPluginDependency + 1.IBViewBoundsToFrameTransform 3.IBPluginDependency 3.IBViewBoundsToFrameTransform 4.IBPluginDependency @@ -285,15 +251,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA UIResponder {{466, 261}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAAAAAAAAw9aAAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin P4AAAL+AAAAAAAAAw88AAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAAAAAAAAws4AAA + P4AAAL+AAAAAAAAAwqwAAA @@ -313,7 +280,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA - 15 + 19 @@ -466,35 +433,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA UIKit.framework/Headers/UIResponder.h - - UIBarButtonItem - UIBarItem - - IBFrameworkSource - UIKit.framework/Headers/UIBarButtonItem.h - - - - UIBarItem - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIBarItem.h - - - - UINavigationBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UINavigationBar.h - - - - UINavigationItem - NSObject - - UIResponder NSObject -- cgit v1.2.3