From 1ee16b02d54bd8c71ae365bdb56d7389702839ea Mon Sep 17 00:00:00 2001 From: matt handler Date: Tue, 26 Apr 2011 17:21:39 -0400 Subject: sort topics when popping out of the database, customize photoview controller, need to add sharekit --- Classes/PhotoViewController.m | 53 ++++++++ Classes/TopicsViewController.m | 91 ++++++------- PicCast.xcodeproj/handler.mode1v3 | 8 +- PicCast.xcodeproj/handler.pbxuser | 262 ++++++++++++++++++++++---------------- 4 files changed, 251 insertions(+), 163 deletions(-) diff --git a/Classes/PhotoViewController.m b/Classes/PhotoViewController.m index 1b43094..151aabd 100644 --- a/Classes/PhotoViewController.m +++ b/Classes/PhotoViewController.m @@ -8,6 +8,59 @@ #import "PhotoViewController.h" #import "PhotoSource.h" +#import + +@interface MyPhotoViewController : TTPhotoViewController +{ + +} +@end + +@implementation MyPhotoViewController + +-(void)viewDidLoad{ + // New item to be added + UIBarButtonItem *shareItem = [[UIBarButtonItem alloc] + initWithTitle:@"Share" style:UIBarButtonItemStyleBordered target:self + action:@selector(action:)]; + UIBarButtonItem *customItem = [[UIBarButtonItem alloc] + initWithTitle:@"Save" style:UIBarButtonItemStyleBordered target:self + action:@selector(action:)]; + // Flex space to keep the back / forward arrows centered + UIBarButtonItem *flex = [[UIBarButtonItem alloc] + initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace + target:nil action:nil]; + UIBarButtonItem *flex2 = [[UIBarButtonItem alloc] + initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace + target:nil action:nil]; + // Create array with items starting with the left side + NSMutableArray *items = [NSMutableArray arrayWithObject:shareItem]; + [items addObject:flex]; + // Then add the current items (the back / forward arrows) + [items addObjectsFromArray:[_toolbar items]]; + [items addObject:flex2]; + // Add in our new item to the far right + [items addObject:customItem]; + [_toolbar setItems:items]; + [shareItem release]; + [customItem release]; + [flex release]; + [flex2 release]; +} + +-(void)action:(id)sender{ + // Perform your action +} + +@end + + +@implementation TTThumbsViewController (test) +- (TTPhotoViewController*)createPhotoViewController { + NSLog(@"test"); + return (TTPhotoViewController *)[[[MyPhotoViewController alloc] init] autorelease]; +} +@end @implementation PhotoViewController diff --git a/Classes/TopicsViewController.m b/Classes/TopicsViewController.m index 1d93566..78258d7 100644 --- a/Classes/TopicsViewController.m +++ b/Classes/TopicsViewController.m @@ -31,18 +31,9 @@ [super viewDidLoad]; NSLog(@"viewDidLoad"); self.tableView.rowHeight = 100; - //UIBarButtonItem *doneItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(returnToParserChoices)] autorelease]; - //self.navigationItem.rightBarButtonItem = doneItem; - // Create the object manager objMan = [[HJObjManager alloc] initWithLoadingBufferSize:6 memCacheSize:20]; - //if you are using for full screen images, you'll need a smaller memory cache than the defaults, - //otherwise the cached images will get you out of memory quickly - //objMan = [[HJObjManager alloc] initWithLoadingBufferSize:6 memCacheSize:1]; - - // Create a file cache for the object manager to use - // A real app might do this durring startup, allowing the object manager and cache to be shared by several screens NSString* cacheDirectory = [NSHomeDirectory() stringByAppendingString:@"/Library/Caches/imgcache/icons/"] ; HJMOFileCache* fileCache = [[[HJMOFileCache alloc] initWithRootPath:cacheDirectory] autorelease]; objMan.fileCache = fileCache; @@ -67,7 +58,7 @@ - (void) getTopicsFromDb { // grab topics [db open]; - FMResultSet *fResult = [db executeQuery:@"SELECT * FROM picCasts"]; //order by date, limite _max + FMResultSet *fResult = [db executeQuery:@"SELECT * FROM picCasts ORDER BY releaseDate DESC"]; //order by date, limite _max // put into sections while([fResult next]) @@ -115,46 +106,6 @@ return photoViewController; } -#pragma mark - -#pragma mark View lifecycle - -/* -- (void)viewDidLoad { - [super viewDidLoad]; - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem; -} -*/ - -/* -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; -} -*/ -/* -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} -*/ -/* -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; -} -*/ -/* -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; -} -*/ -/* -// Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations. - return (interfaceOrientation == UIInterfaceOrientationPortrait); -} -*/ - #pragma mark - #pragma mark custom sheeyit @@ -352,6 +303,46 @@ } +#pragma mark - +#pragma mark View lifecycle + +/* + - (void)viewDidLoad { + [super viewDidLoad]; + + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. + // self.navigationItem.rightBarButtonItem = self.editButtonItem; + } + */ + +/* + - (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + } + */ +/* + - (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; + } + */ +/* + - (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; + } + */ +/* + - (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; + } + */ +/* + // Override to allow orientations other than the default portrait orientation. + - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Return YES for supported orientations. + return (interfaceOrientation == UIInterfaceOrientationPortrait); + } + */ + #pragma mark Implementation - (void)startParsing { diff --git a/PicCast.xcodeproj/handler.mode1v3 b/PicCast.xcodeproj/handler.mode1v3 index 6f595a9..a5d9129 100644 --- a/PicCast.xcodeproj/handler.mode1v3 +++ b/PicCast.xcodeproj/handler.mode1v3 @@ -332,7 +332,7 @@ _historyCapacity 0 bookmark - 4E75CE9813676C7B00ED9C9D + 4E75CEA413676E8E00ED9C9D history 4E68286F1359595F001EB808 @@ -383,9 +383,9 @@ 4E75CE6B13676A3500ED9C9D 4E75CE6C13676A3500ED9C9D 4E75CE8513676B4800ED9C9D - 4E75CE9013676C3A00ED9C9D 4E75CE9113676C3A00ED9C9D - 4E75CE9213676C3A00ED9C9D + 4E75CE9E13676E7600ED9C9D + 4E75CE9F13676E7600ED9C9D SplitCount @@ -583,7 +583,7 @@ 5 WindowOrderList - 4E75CE9913676C7B00ED9C9D + 4E75CEA513676E8E00ED9C9D 1C530D57069F1CE1000CFCEE 4E75CD90136747B800ED9C9D 4E75CD851367476C00ED9C9D diff --git a/PicCast.xcodeproj/handler.pbxuser b/PicCast.xcodeproj/handler.pbxuser index 189cc6d..2ea5968 100644 --- a/PicCast.xcodeproj/handler.pbxuser +++ b/PicCast.xcodeproj/handler.pbxuser @@ -75,12 +75,12 @@ 4EB541B313651953009A5AC5 /* FMDatabase.m:546 */, 4EB541B513651963009A5AC5 /* FMDatabase.m:561 */, 4EB541B713651964009A5AC5 /* FMDatabase.m:572 */, - 4EB541C713651DC8009A5AC5 /* TopicsViewController.m:93 */, + 4EB541C713651DC8009A5AC5 /* TopicsViewController.m:84 */, 4EB541CF13651E18009A5AC5 /* FMDatabase.m:465 */, 4EB541D313651E3A009A5AC5 /* FMDatabase.m:476 */, 4EB541D513651E59009A5AC5 /* FMDatabase.m:477 */, 4EB541D7136521F2009A5AC5 /* FMDatabase.m:558 */, - 4EB5421E1365280F009A5AC5 /* TopicsViewController.m:56 */, + 4EB5421E1365280F009A5AC5 /* TopicsViewController.m:47 */, 4EB5424413652BFA009A5AC5 /* FMDatabase.m:577 */, 4EB5424E13652E24009A5AC5 /* FMDatabase.m:497 */, 4EE05555136601D5000FE2EF /* SourcesEditViewController.m:264 */, @@ -98,10 +98,10 @@ 4E75CDCF13674A7900ED9C9D /* Source.m:41 */, 4E75CDD113674A8E00ED9C9D /* Source.m:42 */, 4E75CDDF1367566A00ED9C9D /* Topic.m:45 */, - 4E75CE7113676A4200ED9C9D /* TopicsViewController.m:233 */, - 4E75CE7313676A9400ED9C9D /* TopicsViewController.m:232 */, - 4E75CE7C13676AEC00ED9C9D /* TopicsViewController.m:163 */, - 4E75CE7E13676AFB00ED9C9D /* TopicsViewController.m:176 */, + 4E75CE7113676A4200ED9C9D /* TopicsViewController.m:184 */, + 4E75CE7313676A9400ED9C9D /* TopicsViewController.m:183 */, + 4E75CE7C13676AEC00ED9C9D /* TopicsViewController.m:114 */, + 4E75CE7E13676AFB00ED9C9D /* TopicsViewController.m:127 */, 4E75CE8A13676B6000ED9C9D /* Topic.m:46 */, ); codeSenseManager = 4E6827BA13593BCD001EB808 /* Code sense */; @@ -281,6 +281,10 @@ 4E75CE9213676C3A00ED9C9D /* PBXTextBookmark */ = 4E75CE9213676C3A00ED9C9D /* PBXTextBookmark */; 4E75CE9313676C3A00ED9C9D /* PBXTextBookmark */ = 4E75CE9313676C3A00ED9C9D /* PBXTextBookmark */; 4E75CE9813676C7B00ED9C9D /* PBXTextBookmark */ = 4E75CE9813676C7B00ED9C9D /* PBXTextBookmark */; + 4E75CE9E13676E7600ED9C9D /* PBXTextBookmark */ = 4E75CE9E13676E7600ED9C9D /* PBXTextBookmark */; + 4E75CE9F13676E7600ED9C9D /* PBXTextBookmark */ = 4E75CE9F13676E7600ED9C9D /* PBXTextBookmark */; + 4E75CEA013676E7600ED9C9D /* PBXTextBookmark */ = 4E75CEA013676E7600ED9C9D /* PBXTextBookmark */; + 4E75CEA413676E8E00ED9C9D /* PBXTextBookmark */ = 4E75CEA413676E8E00ED9C9D /* PBXTextBookmark */; 4E8CFDB41361F7C900B810C6 = 4E8CFDB41361F7C900B810C6 /* PBXTextBookmark */; 4E8CFDB61361F7C900B810C6 = 4E8CFDB61361F7C900B810C6 /* PBXTextBookmark */; 4E8CFDB71361F7C900B810C6 = 4E8CFDB71361F7C900B810C6 /* PBXTextBookmark */; @@ -424,10 +428,10 @@ }; 4E6827E813594115001EB808 /* TopicsViewController.m */ = { uiCtxt = { - sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{7706, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{7757, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{7807, 12}\";\n s = 1;\n }\n );\n r = \"{0, 14235}\";\n s = 0;\n}"; - sepNavIntBoundsRect = "{{0, 0}, {1272, 5590}}"; - sepNavSelRange = "{2224, 0}"; - sepNavVisRange = "{700, 1897}"; + sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{6124, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{6175, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{6225, 12}\";\n s = 1;\n }\n );\n r = \"{0, 13571}\";\n s = 0;\n}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 5577}}"; + sepNavSelRange = "{1777, 0}"; + sepNavVisRange = "{863, 1608}"; sepNavWindowFrame = "{{15, 323}, {1196, 550}}"; }; }; @@ -468,9 +472,9 @@ }; 4E68282E13594C48001EB808 /* Topic.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1160, 1378}}"; - sepNavSelRange = "{1519, 0}"; - sepNavVisRange = "{816, 802}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 1365}}"; + sepNavSelRange = "{1633, 0}"; + sepNavVisRange = "{0, 1683}"; }; }; 4E68286F1359595F001EB808 /* PBXTextBookmark */ = { @@ -519,7 +523,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 63"; rLen = 0; - rLoc = 2311; + rLoc = 1628; rType = 0; vrLen = 1740; vrLoc = 1327; @@ -529,7 +533,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 63"; rLen = 0; - rLoc = 2311; + rLoc = 1628; rType = 0; vrLen = 1742; vrLoc = 1327; @@ -588,7 +592,7 @@ ignoreCount = 0; lineNumber = 54; location = PicCast; - modificationTime = 325545019.98324; + modificationTime = 325545591.93145; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -626,7 +630,7 @@ ignoreCount = 0; lineNumber = 55; location = PicCast; - modificationTime = 325545019.983296; + modificationTime = 325545591.931485; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -644,7 +648,7 @@ ignoreCount = 0; lineNumber = 56; location = PicCast; - modificationTime = 325545019.983313; + modificationTime = 325545591.931529; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -662,7 +666,7 @@ ignoreCount = 0; lineNumber = 58; location = PicCast; - modificationTime = 325545019.983338; + modificationTime = 325545591.931554; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -680,7 +684,7 @@ ignoreCount = 0; lineNumber = 138; location = PicCast; - modificationTime = 325545019.983354; + modificationTime = 325545591.931587; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -698,7 +702,7 @@ ignoreCount = 0; lineNumber = 142; location = PicCast; - modificationTime = 325545019.983367; + modificationTime = 325545591.931605; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -716,7 +720,7 @@ ignoreCount = 0; lineNumber = 69; location = PicCast; - modificationTime = 325545019.983387; + modificationTime = 325545591.931619; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -859,7 +863,7 @@ ignoreCount = 0; lineNumber = 80; location = PicCast; - modificationTime = 325545019.9834; + modificationTime = 325545591.931635; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -877,7 +881,7 @@ ignoreCount = 0; lineNumber = 81; location = PicCast; - modificationTime = 325545019.98342; + modificationTime = 325545591.93165; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -915,7 +919,7 @@ ignoreCount = 0; lineNumber = 41; location = PicCast; - modificationTime = 325545019.983439; + modificationTime = 325545591.931685; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -933,7 +937,7 @@ ignoreCount = 0; lineNumber = 42; location = PicCast; - modificationTime = 325545019.983452; + modificationTime = 325545591.931706; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1011,7 +1015,7 @@ ignoreCount = 0; lineNumber = 45; location = PicCast; - modificationTime = 325545019.983467; + modificationTime = 325545591.931723; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1031,7 +1035,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; fallbackIsa = XCBuildMessageTextBookmark; rLen = 1; - rLoc = 163; + rLoc = 114; rType = 1; }; 4E75CDED1367574700ED9C9D /* PBXTextBookmark */ = { @@ -1138,7 +1142,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 225"; rLen = 0; - rLoc = 5562; + rLoc = 3980; rType = 0; vrLen = 1398; vrLoc = 6514; @@ -1148,7 +1152,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 76"; rLen = 0; - rLoc = 2312; + rLoc = 1629; rType = 0; vrLen = 1902; vrLoc = 1527; @@ -1262,7 +1266,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 228"; rLen = 0; - rLoc = 6993; + rLoc = 5411; rType = 0; vrLen = 1220; vrLoc = 5798; @@ -1272,7 +1276,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 228"; rLen = 0; - rLoc = 6993; + rLoc = 5411; rType = 0; vrLen = 1331; vrLoc = 6016; @@ -1282,7 +1286,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7202; + rLoc = 5620; rType = 0; vrLen = 1559; vrLoc = 6121; @@ -1302,7 +1306,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 413"; rLen = 0; - rLoc = 14067; + rLoc = 13403; rType = 0; vrLen = 458; vrLoc = 13613; @@ -1331,7 +1335,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7202; + rLoc = 5620; rType = 0; vrLen = 1552; vrLoc = 6128; @@ -1341,7 +1345,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7202; + rLoc = 5620; rType = 0; vrLen = 1552; vrLoc = 6128; @@ -1468,7 +1472,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7202; + rLoc = 5620; rType = 0; vrLen = 1436; vrLoc = 4555; @@ -1538,7 +1542,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7202; + rLoc = 5620; rType = 0; vrLen = 1416; vrLoc = 6121; @@ -1548,12 +1552,12 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7202; + rLoc = 5620; rType = 0; vrLen = 1275; vrLoc = 4846; }; - 4E75CE7113676A4200ED9C9D /* TopicsViewController.m:233 */ = { + 4E75CE7113676A4200ED9C9D /* TopicsViewController.m:184 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1565,13 +1569,13 @@ functionName = "-connection:finishedWithData:"; hitCount = 0; ignoreCount = 0; - lineNumber = 233; + lineNumber = 184; location = PicCast; - modificationTime = 325545019.983527; + modificationTime = 325545591.931794; originalNumberOfMultipleMatches = 1; state = 2; }; - 4E75CE7313676A9400ED9C9D /* TopicsViewController.m:232 */ = { + 4E75CE7313676A9400ED9C9D /* TopicsViewController.m:183 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1583,9 +1587,9 @@ functionName = "-connection:finishedWithData:"; hitCount = 0; ignoreCount = 0; - lineNumber = 232; + lineNumber = 183; location = PicCast; - modificationTime = 325545019.983597; + modificationTime = 325545591.931897; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1594,7 +1598,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7170; + rLoc = 5588; rType = 0; vrLen = 1414; vrLoc = 5991; @@ -1604,12 +1608,12 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7167; + rLoc = 5585; rType = 0; vrLen = 1413; vrLoc = 5948; }; - 4E75CE7C13676AEC00ED9C9D /* TopicsViewController.m:163 */ = { + 4E75CE7C13676AEC00ED9C9D /* TopicsViewController.m:114 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1621,13 +1625,13 @@ functionName = "-addTopicsFromJson:"; hitCount = 0; ignoreCount = 0; - lineNumber = 163; + lineNumber = 114; location = PicCast; - modificationTime = 325545019.983663; + modificationTime = 325545591.931962; originalNumberOfMultipleMatches = 1; state = 2; }; - 4E75CE7E13676AFB00ED9C9D /* TopicsViewController.m:176 */ = { + 4E75CE7E13676AFB00ED9C9D /* TopicsViewController.m:127 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -1639,9 +1643,9 @@ functionName = "-addTopicsFromJson:"; hitCount = 0; ignoreCount = 0; - lineNumber = 176; + lineNumber = 127; location = PicCast; - modificationTime = 325545019.983728; + modificationTime = 325545591.932026; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1690,7 +1694,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7167; + rLoc = 5585; rType = 0; vrLen = 1413; vrLoc = 5948; @@ -1700,7 +1704,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7167; + rLoc = 5585; rType = 0; vrLen = 1282; vrLoc = 4940; @@ -1719,7 +1723,7 @@ ignoreCount = 0; lineNumber = 46; location = PicCast; - modificationTime = 325545019.983821; + modificationTime = 325545591.932084; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -1728,7 +1732,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 230"; rLen = 0; - rLoc = 7167; + rLoc = 5585; rType = 0; vrLen = 1727; vrLoc = 6255; @@ -1758,7 +1762,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 184"; rLen = 0; - rLoc = 5677; + rLoc = 4095; rType = 0; vrLen = 1483; vrLoc = 2513; @@ -1768,7 +1772,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 97"; rLen = 0; - rLoc = 3294; + rLoc = 2637; rType = 0; vrLen = 1513; vrLoc = 2487; @@ -1778,11 +1782,51 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 60"; rLen = 0; - rLoc = 2224; + rLoc = 1541; rType = 0; vrLen = 1897; vrLoc = 700; }; + 4E75CE9E13676E7600ED9C9D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E68282E13594C48001EB808 /* Topic.m */; + name = "Topic.m: 46"; + rLen = 0; + rLoc = 1633; + rType = 0; + vrLen = 1764; + vrLoc = 0; + }; + 4E75CE9F13676E7600ED9C9D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 61"; + rLen = 0; + rLoc = 1772; + rType = 0; + vrLen = 1589; + vrLoc = 782; + }; + 4E75CEA013676E7600ED9C9D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 61"; + rLen = 0; + rLoc = 1777; + rType = 0; + vrLen = 1599; + vrLoc = 783; + }; + 4E75CEA413676E8E00ED9C9D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 61"; + rLen = 0; + rLoc = 1777; + rType = 0; + vrLen = 1608; + vrLoc = 863; + }; 4E8CFDB41361F7C900B810C6 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4ED6DB25135A194A00BEF0B7 /* HJCircularBuffer.h */; @@ -2070,7 +2114,7 @@ ignoreCount = 0; lineNumber = 83; location = PicCast; - modificationTime = 325545019.982135; + modificationTime = 325545591.930091; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2088,7 +2132,7 @@ ignoreCount = 0; lineNumber = 79; location = PicCast; - modificationTime = 325545019.982295; + modificationTime = 325545591.930286; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2106,7 +2150,7 @@ ignoreCount = 0; lineNumber = 80; location = PicCast; - modificationTime = 325545019.982361; + modificationTime = 325545591.930357; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2124,7 +2168,7 @@ ignoreCount = 0; lineNumber = 659; location = PicCast; - modificationTime = 325545019.982411; + modificationTime = 325545591.930406; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2142,7 +2186,7 @@ ignoreCount = 0; lineNumber = 658; location = PicCast; - modificationTime = 325545019.982433; + modificationTime = 325545591.930428; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2160,7 +2204,7 @@ ignoreCount = 0; lineNumber = 660; location = PicCast; - modificationTime = 325545019.982453; + modificationTime = 325545591.93045; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2178,7 +2222,7 @@ ignoreCount = 0; lineNumber = 661; location = PicCast; - modificationTime = 325545019.982473; + modificationTime = 325545591.930472; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2196,7 +2240,7 @@ ignoreCount = 0; lineNumber = 662; location = PicCast; - modificationTime = 325545019.982492; + modificationTime = 325545591.930513; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2214,7 +2258,7 @@ ignoreCount = 0; lineNumber = 608; location = PicCast; - modificationTime = 325545019.982507; + modificationTime = 325545591.930535; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2232,7 +2276,7 @@ ignoreCount = 0; lineNumber = 609; location = PicCast; - modificationTime = 325545019.982524; + modificationTime = 325545591.930552; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2250,7 +2294,7 @@ ignoreCount = 0; lineNumber = 611; location = PicCast; - modificationTime = 325545019.982539; + modificationTime = 325545591.930575; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2268,7 +2312,7 @@ ignoreCount = 0; lineNumber = 613; location = PicCast; - modificationTime = 325545019.982556; + modificationTime = 325545591.930607; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2286,7 +2330,7 @@ ignoreCount = 0; lineNumber = 614; location = PicCast; - modificationTime = 325545019.982573; + modificationTime = 325545591.930626; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2304,7 +2348,7 @@ ignoreCount = 0; lineNumber = 462; location = PicCast; - modificationTime = 325545019.982585; + modificationTime = 325545591.930639; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2322,7 +2366,7 @@ ignoreCount = 0; lineNumber = 472; location = PicCast; - modificationTime = 325545019.982599; + modificationTime = 325545591.930653; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2340,7 +2384,7 @@ ignoreCount = 0; lineNumber = 484; location = PicCast; - modificationTime = 325545019.982616; + modificationTime = 325545591.930672; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2358,7 +2402,7 @@ ignoreCount = 0; lineNumber = 496; location = PicCast; - modificationTime = 325545019.982633; + modificationTime = 325545591.930688; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2376,7 +2420,7 @@ ignoreCount = 0; lineNumber = 504; location = PicCast; - modificationTime = 325545019.982647; + modificationTime = 325545591.930705; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2394,7 +2438,7 @@ ignoreCount = 0; lineNumber = 509; location = PicCast; - modificationTime = 325545019.982662; + modificationTime = 325545591.930724; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2412,7 +2456,7 @@ ignoreCount = 0; lineNumber = 518; location = PicCast; - modificationTime = 325545019.982679; + modificationTime = 325545591.93074; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2430,7 +2474,7 @@ ignoreCount = 0; lineNumber = 527; location = PicCast; - modificationTime = 325545019.982694; + modificationTime = 325545591.930767; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2448,7 +2492,7 @@ ignoreCount = 0; lineNumber = 542; location = PicCast; - modificationTime = 325545019.982714; + modificationTime = 325545591.930788; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2466,7 +2510,7 @@ ignoreCount = 0; lineNumber = 553; location = PicCast; - modificationTime = 325545019.982734; + modificationTime = 325545591.93085; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2484,7 +2528,7 @@ ignoreCount = 0; lineNumber = 565; location = PicCast; - modificationTime = 325545019.982752; + modificationTime = 325545591.930871; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2502,7 +2546,7 @@ ignoreCount = 0; lineNumber = 574; location = PicCast; - modificationTime = 325545019.982769; + modificationTime = 325545591.930888; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2520,7 +2564,7 @@ ignoreCount = 0; lineNumber = 586; location = PicCast; - modificationTime = 325545019.982783; + modificationTime = 325545591.930903; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2538,7 +2582,7 @@ ignoreCount = 0; lineNumber = 599; location = PicCast; - modificationTime = 325545019.9828; + modificationTime = 325545591.93094; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2556,7 +2600,7 @@ ignoreCount = 0; lineNumber = 488; location = PicCast; - modificationTime = 325545019.982817; + modificationTime = 325545591.930959; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2574,7 +2618,7 @@ ignoreCount = 0; lineNumber = 544; location = PicCast; - modificationTime = 325545019.98283; + modificationTime = 325545591.930974; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2592,7 +2636,7 @@ ignoreCount = 0; lineNumber = 546; location = PicCast; - modificationTime = 325545019.982846; + modificationTime = 325545591.930992; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2610,7 +2654,7 @@ ignoreCount = 0; lineNumber = 561; location = PicCast; - modificationTime = 325545019.982865; + modificationTime = 325545591.931014; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2628,7 +2672,7 @@ ignoreCount = 0; lineNumber = 572; location = PicCast; - modificationTime = 325545019.982885; + modificationTime = 325545591.931034; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2642,7 +2686,7 @@ vrLen = 1181; vrLoc = 1484; }; - 4EB541C713651DC8009A5AC5 /* TopicsViewController.m:93 */ = { + 4EB541C713651DC8009A5AC5 /* TopicsViewController.m:84 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2654,9 +2698,9 @@ functionName = "-updateTopicsFromWeb:"; hitCount = 0; ignoreCount = 0; - lineNumber = 93; + lineNumber = 84; location = PicCast; - modificationTime = 325545019.982901; + modificationTime = 325545591.931058; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2674,7 +2718,7 @@ ignoreCount = 0; lineNumber = 465; location = PicCast; - modificationTime = 325545019.983019; + modificationTime = 325545591.931184; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2692,7 +2736,7 @@ ignoreCount = 0; lineNumber = 476; location = PicCast; - modificationTime = 325545019.983041; + modificationTime = 325545591.931206; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2710,7 +2754,7 @@ ignoreCount = 0; lineNumber = 477; location = PicCast; - modificationTime = 325545019.983061; + modificationTime = 325545591.931228; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2728,11 +2772,11 @@ ignoreCount = 0; lineNumber = 558; location = PicCast; - modificationTime = 325545019.983079; + modificationTime = 325545591.931245; originalNumberOfMultipleMatches = 1; state = 2; }; - 4EB5421E1365280F009A5AC5 /* TopicsViewController.m:56 */ = { + 4EB5421E1365280F009A5AC5 /* TopicsViewController.m:47 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2744,9 +2788,9 @@ functionName = "-viewDidLoad"; hitCount = 0; ignoreCount = 0; - lineNumber = 56; + lineNumber = 47; location = PicCast; - modificationTime = 325545019.983091; + modificationTime = 325545591.931262; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2764,7 +2808,7 @@ ignoreCount = 0; lineNumber = 577; location = PicCast; - modificationTime = 325545019.983153; + modificationTime = 325545591.931343; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -2782,7 +2826,7 @@ ignoreCount = 0; lineNumber = 497; location = PicCast; - modificationTime = 325545019.98317; + modificationTime = 325545591.93136; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -3053,7 +3097,7 @@ ignoreCount = 0; lineNumber = 264; location = PicCast; - modificationTime = 325545019.983183; + modificationTime = 325545591.931381; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -3071,7 +3115,7 @@ ignoreCount = 0; lineNumber = 267; location = PicCast; - modificationTime = 325545019.983201; + modificationTime = 325545591.931404; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -3089,7 +3133,7 @@ ignoreCount = 0; lineNumber = 268; location = PicCast; - modificationTime = 325545019.98322; + modificationTime = 325545591.931426; originalNumberOfMultipleMatches = 1; state = 2; }; @@ -3215,7 +3259,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 87"; rLen = 0; - rLoc = 2958; + rLoc = 2301; rType = 0; vrLen = 1354; vrLoc = 2407; @@ -3225,7 +3269,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 63"; rLen = 0; - rLoc = 2311; + rLoc = 1628; rType = 0; vrLen = 1686; vrLoc = 1381; -- cgit v1.2.3