From fc6987bbef7ce2f5a8240a36f50864cff874dc3c Mon Sep 17 00:00:00 2001 From: Oleksii Vynogradov Date: Mon, 5 Mar 2012 09:16:24 +0200 Subject: [PATCH] xxx --- ClassesForAllPlatforms/ClientController.m | 133 ++++---- .../ViewControllers/AuthorizationView.m | 2 +- .../DestinationsListViewController.h | 2 + .../DestinationsListViewController.m | 129 ++++++-- .../DestinationsListViewController.xib | 303 ++++++++++++++++-- 5 files changed, 459 insertions(+), 110 deletions(-) diff --git a/ClassesForAllPlatforms/ClientController.m b/ClassesForAllPlatforms/ClientController.m index 855fdcb..0349f6d 100644 --- a/ClassesForAllPlatforms/ClientController.m +++ b/ClassesForAllPlatforms/ClientController.m @@ -64,8 +64,8 @@ - (id)initWithPersistentStoreCoordinator:(NSPersistentStoreCoordinator *)coordin mainServer = [[NSURL alloc] initWithString:@"https://mac.ixcglobal.com:8081"]; #else - mainServer = [[NSURL alloc] initWithString:@"http://127.0.0.1:8081"]; -// mainServer = [[NSURL alloc] initWithString:@"http://192.168.0.58:8081"]; +// mainServer = [[NSURL alloc] initWithString:@"http://127.0.0.1:8081"]; + mainServer = [[NSURL alloc] initWithString:@"http://192.168.0.58:8081"]; #endif // @@ -420,42 +420,45 @@ -(void) createCountrySpecificCodesInCoreDataForMainSystem:(MainSystem *)mainSyst NSMutableArray *codesFromFile = [parser parseFile]; [parser release], parser = nil; path = nil; - NSMutableArray *countrySpecificCodesList = [NSMutableArray array]; + NSMutableArray *countrySpecificCodesList = [[NSMutableArray alloc] init]; NSUInteger countForCodes = codesFromFile.count; [codesFromFile enumerateObjectsWithOptions:NSSortStable usingBlock:^(id code, NSUInteger idx, BOOL *stop) { - NSNumber *percentDone = [NSNumber numberWithDouble:[[NSNumber numberWithUnsignedInteger:idx] doubleValue] / [[NSNumber numberWithUnsignedInteger:countForCodes] doubleValue]]; - [self updateUIwithMessage:@"Parse codes list.." andProgressPercent:percentDone withObjectID:nil]; - - NSMutableDictionary *codesFromFileListNew = [NSMutableDictionary dictionary]; - [codesFromFileListNew setValue:[code objectAtIndex:0] forKey:@"country"]; - [codesFromFileListNew setValue:[code objectAtIndex:1] forKey:@"specific"]; - NSMutableArray *filteredResult = [NSMutableArray arrayWithArray:countrySpecificCodesList]; - [filteredResult filterUsingPredicate:[NSPredicate predicateWithFormat:@"(country == %@) and (specific == %@)",[code objectAtIndex:0],[code objectAtIndex:1]]]; - if ([filteredResult count] != 0) - { - // NSLog (@"We find a simular country: %@ specific %@ and code %@ Total destinations:%ld",[code objectAtIndex:0],[code objectAtIndex:1], [code objectAtIndex:2], [[ProjectArrays sharedProjectArrays].myCountrySpecificCodeList count]); - NSMutableDictionary *lastObject = [[NSArray arrayWithArray:countrySpecificCodesList] lastObject]; - NSMutableArray *codes = [lastObject valueForKey:@"code"]; - [codes addObject:[code objectAtIndex:2]]; - [lastObject setValue:codes forKey:@"code"]; - [countrySpecificCodesList removeLastObject]; - [countrySpecificCodesList addObject:lastObject]; - lastObject = nil; - codes = nil; - } else { - NSMutableDictionary *codesFromFileList = [NSMutableDictionary dictionary]; - NSString *countryBefore = [code objectAtIndex:0]; - NSString *specificBefore = [code objectAtIndex:1]; - NSString *country = [countryBefore stringByReplacingOccurrencesOfString:@"'" withString:@"~"]; - NSString *specific = [specificBefore stringByReplacingOccurrencesOfString:@"'" withString:@"~"]; + @autoreleasepool { - [codesFromFileList setValue:country forKey:@"country"]; - [codesFromFileList setValue:specific forKey:@"specific"]; - [codesFromFileList setValue:[NSMutableArray arrayWithObject:[code objectAtIndex:2]] forKey:@"code"]; - [countrySpecificCodesList addObject:codesFromFileList]; + NSNumber *percentDone = [NSNumber numberWithDouble:[[NSNumber numberWithUnsignedInteger:idx] doubleValue] / [[NSNumber numberWithUnsignedInteger:countForCodes] doubleValue]]; + [self updateUIwithMessage:@"Parse codes list.." andProgressPercent:percentDone withObjectID:nil]; + + NSMutableDictionary *codesFromFileListNew = [NSMutableDictionary dictionary]; + [codesFromFileListNew setValue:[code objectAtIndex:0] forKey:@"country"]; + [codesFromFileListNew setValue:[code objectAtIndex:1] forKey:@"specific"]; + NSMutableArray *filteredResult = [NSMutableArray arrayWithArray:countrySpecificCodesList]; + [filteredResult filterUsingPredicate:[NSPredicate predicateWithFormat:@"(country == %@) and (specific == %@)",[code objectAtIndex:0],[code objectAtIndex:1]]]; + if ([filteredResult count] != 0) + { + // NSLog (@"We find a simular country: %@ specific %@ and code %@ Total destinations:%ld",[code objectAtIndex:0],[code objectAtIndex:1], [code objectAtIndex:2], [[ProjectArrays sharedProjectArrays].myCountrySpecificCodeList count]); + NSMutableDictionary *lastObject = [[NSArray arrayWithArray:countrySpecificCodesList] lastObject]; + NSMutableArray *codes = [lastObject valueForKey:@"code"]; + [codes addObject:[code objectAtIndex:2]]; + [lastObject setValue:codes forKey:@"code"]; + [countrySpecificCodesList removeLastObject]; + [countrySpecificCodesList addObject:lastObject]; + lastObject = nil; + codes = nil; + } else { + NSMutableDictionary *codesFromFileList = [NSMutableDictionary dictionary]; + NSString *countryBefore = [code objectAtIndex:0]; + NSString *specificBefore = [code objectAtIndex:1]; + NSString *country = [countryBefore stringByReplacingOccurrencesOfString:@"'" withString:@"~"]; + NSString *specific = [specificBefore stringByReplacingOccurrencesOfString:@"'" withString:@"~"]; + + [codesFromFileList setValue:country forKey:@"country"]; + [codesFromFileList setValue:specific forKey:@"specific"]; + [codesFromFileList setValue:[NSMutableArray arrayWithObject:[code objectAtIndex:2]] forKey:@"code"]; + [countrySpecificCodesList addObject:codesFromFileList]; + } } }]; @@ -475,38 +478,41 @@ -(void) createCountrySpecificCodesInCoreDataForMainSystem:(MainSystem *)mainSyst //NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSUInteger idx = 0; for (NSDictionary *countrySpecific in countrySpecificCodesList) { - NSNumber *percentDone = [NSNumber numberWithDouble:([[NSNumber numberWithUnsignedInteger:idx] doubleValue] / [[NSNumber numberWithUnsignedInteger:[countrySpecificCodesList count]] doubleValue])]; -// if (sender && [sender respondsToSelector:@selector(updateProgessInfoWithPercent:)]) [sender performSelector:@selector(updateProgessInfoWithPercent:) withObject:percentDone]; - [self updateUIwithMessage:@"Update codes database..." andProgressPercent:percentDone withObjectID:nil]; - - CountrySpecificCodeList *newTest = (CountrySpecificCodeList *)[NSEntityDescription insertNewObjectForEntityForName:@"CountrySpecificCodeList" inManagedObjectContext:self.moc]; - newTest.country = [countrySpecific valueForKey:@"country"]; - newTest.specific = [countrySpecific valueForKey:@"specific"]; - //NSLog(@"CLIENT CONTROLLER: createCountrySpecificCodesInCoreDataForMainSystem start for %@ specific:%@",newTest.country,newTest.specific); - - newTest.mainSystem = (MainSystem *)[self.moc objectWithID:mainSystemID]; - NSMutableString *codes = [NSMutableString string]; - NSArray *codesListLocal = [countrySpecific valueForKey:@"code"]; - NSUInteger idxCodes = 0; - NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; - - for (NSString *codeString in codesListLocal) { - CodesList *newList = (CodesList *)[NSEntityDescription insertNewObjectForEntityForName:@"CodesList" inManagedObjectContext:self.moc]; - NSNumber *codeNumber = [formatter numberFromString:codeString]; - newList.code = codeNumber; - newList.countrySpecificCodesList = newTest; + @autoreleasepool { + + NSNumber *percentDone = [NSNumber numberWithDouble:([[NSNumber numberWithUnsignedInteger:idx] doubleValue] / [[NSNumber numberWithUnsignedInteger:[countrySpecificCodesList count]] doubleValue])]; + // if (sender && [sender respondsToSelector:@selector(updateProgessInfoWithPercent:)]) [sender performSelector:@selector(updateProgessInfoWithPercent:) withObject:percentDone]; + [self updateUIwithMessage:@"Update codes database..." andProgressPercent:percentDone withObjectID:nil]; + + CountrySpecificCodeList *newTest = (CountrySpecificCodeList *)[NSEntityDescription insertNewObjectForEntityForName:@"CountrySpecificCodeList" inManagedObjectContext:self.moc]; + newTest.country = [countrySpecific valueForKey:@"country"]; + newTest.specific = [countrySpecific valueForKey:@"specific"]; + //NSLog(@"CLIENT CONTROLLER: createCountrySpecificCodesInCoreDataForMainSystem start for %@ specific:%@",newTest.country,newTest.specific); + + newTest.mainSystem = (MainSystem *)[self.moc objectWithID:mainSystemID]; + NSMutableString *codes = [NSMutableString string]; + NSArray *codesListLocal = [countrySpecific valueForKey:@"code"]; + NSUInteger idxCodes = 0; + NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; - if (idxCodes != [codesListLocal count] - 1) [codes appendFormat:@"%@, ",codeString]; - else [codes appendFormat:@"%@",codeString]; - idxCodes++; + for (NSString *codeString in codesListLocal) { + CodesList *newList = (CodesList *)[NSEntityDescription insertNewObjectForEntityForName:@"CodesList" inManagedObjectContext:self.moc]; + NSNumber *codeNumber = [formatter numberFromString:codeString]; + newList.code = codeNumber; + newList.countrySpecificCodesList = newTest; + + if (idxCodes != [codesListLocal count] - 1) [codes appendFormat:@"%@, ",codeString]; + else [codes appendFormat:@"%@",codeString]; + idxCodes++; + } + [formatter release],formatter = nil; + + newTest.codes = [NSString stringWithString:codes]; + //NSLog(@"New Object = %@/%@",newTest.country,newTest.specific); + //[pool drain],pool = nil; + //pool = [[NSAutoreleasePool alloc] init]; + idx++; } - [formatter release],formatter = nil; - - newTest.codes = [NSString stringWithString:codes]; - //NSLog(@"New Object = %@/%@",newTest.country,newTest.specific); - //[pool drain],pool = nil; - //pool = [[NSAutoreleasePool alloc] init]; - idx++; } //[pool drain],pool = nil; [countrySpecificCodesList release]; @@ -2124,6 +2130,7 @@ -(NSDictionary *) getJSONAnswerForFunctionVersionTwo:(NSString *)function if (error) { NSLog(@"CLIENT CONTROLLER: getJSON answer error download:%@",[error localizedDescription]); [self updateUIwithMessage:[error localizedDescription] withObjectID:nil withLatestMessage:YES error:NO]; + [finalResultAlloc release]; return nil; } NSString *answer = [[NSString alloc] initWithData:receivedResult encoding:NSUTF8StringEncoding]; @@ -2208,7 +2215,7 @@ -(NSArray *)getAllObjectsListWithGUIDs:(NSArray *)guids NSPropertyListFormat format; NSArray *decodedObjects = [NSPropertyListSerialization propertyListFromData:allObjectsData mutabilityOption:0 format:&format errorDescription:&error]; [finalListObjectsMutable addObjectsFromArray:decodedObjects]; - if (error) NSLog(@"SERVER CONTRORLER: allObjectsSerializationFailed:%@ format:%luu",error,format); + if (error) NSLog(@"SERVER CONTRORLER: allObjectsSerializationFailed:%@ format:%uu",error,format); //NSLog(@"CLIENT CONTROLLER: guids:%@",guids); //NSLog(@"CLIENT CONTROLLER: decodedObjects:%@",decodedObjects); diff --git a/snowMobile/ViewControllers/AuthorizationView.m b/snowMobile/ViewControllers/AuthorizationView.m index 09c5bd5..fa1f862 100644 --- a/snowMobile/ViewControllers/AuthorizationView.m +++ b/snowMobile/ViewControllers/AuthorizationView.m @@ -466,7 +466,7 @@ -(void)finalizeRegisterIssuesForLogin:(BOOL)isLogin; admin.isRegistrationDone = [NSNumber numberWithBool:YES]; // [clientController getAllObjectsForEntity:@"CurrentCompany" immediatelyStart:YES isUserAuthorized:YES]; [clientController putObjectWithTimeoutWithIDs:[NSArray arrayWithObject:[admin objectID]] mustBeApproved:NO]; - [clientController updateLocalGraphFromSnowEnterpriseServerWithDateFrom:nil withDateTo:nil]; + [clientController updateLocalGraphFromSnowEnterpriseServerWithDateFrom:nil withDateTo:nil withIncludeCarrierSubentities:NO]; } else { [self showErrorMessage:@"login failed"]; loginActivity.hidden = YES; diff --git a/snowMobile/ViewControllers/DestinationsListViewController.h b/snowMobile/ViewControllers/DestinationsListViewController.h index 5ad077e..a84ddc1 100644 --- a/snowMobile/ViewControllers/DestinationsListViewController.h +++ b/snowMobile/ViewControllers/DestinationsListViewController.h @@ -74,5 +74,7 @@ @property (readwrite) BOOL isRoutesForSaleListUpdated; @property (readwrite) BOOL isRoutesPushlistListUpdated; @property (retain, nonatomic) IBOutlet UIButton *cancelAllUpdatesButton; +@property (retain, nonatomic) IBOutlet UIView *toolBarView; +@property (retain, nonatomic) IBOutlet UISegmentedControl *routesChangeFilterWithOrWithoutTraffic; @end diff --git a/snowMobile/ViewControllers/DestinationsListViewController.m b/snowMobile/ViewControllers/DestinationsListViewController.m index 338202d..5197615 100644 --- a/snowMobile/ViewControllers/DestinationsListViewController.m +++ b/snowMobile/ViewControllers/DestinationsListViewController.m @@ -80,6 +80,8 @@ -(void) safeSave; @implementation DestinationsListViewController @synthesize cancelAllUpdates; @synthesize cancelAllUpdatesButton; +@synthesize toolBarView; +@synthesize routesChangeFilterWithOrWithoutTraffic; @synthesize managedObjectContext; @synthesize progressView; @@ -153,6 +155,8 @@ - (void)dealloc [progressView release]; [tableView release]; [cancelAllUpdatesButton release]; + [toolBarView release]; + [routesChangeFilterWithOrWithoutTraffic release]; [super dealloc]; } @@ -289,10 +293,53 @@ -(void) updateDestinations; if (selectedSegmentIndex == 2) addRoutes.hidden = NO; else addRoutes.hidden = YES; - if (selectedSegmentIndex == 0 && isRoutesForSaleListUpdated == YES) progressView.hidden = NO; - else if (selectedSegmentIndex == 1 && isRoutesWeBuyListUpdated == YES) progressView.hidden = NO; - else if (selectedSegmentIndex == 2 && isRoutesPushlistListUpdated == YES) progressView.hidden = NO; - else progressView.hidden = YES; + if (selectedSegmentIndex == 0 && isRoutesForSaleListUpdated == YES) { + carriersProgress.hidden = NO; + carriersProgressTitle.hidden = NO; + operationTitle.hidden = NO; + operationProgress.hidden = NO; + cancelAllUpdatesButton.hidden = NO; + + routesChangeFilterWithOrWithoutTraffic.hidden = YES; + + + //[self.navigationController setToolbarHidden:NO animated:YES];//progressView.hidden = NO; + } + else if (selectedSegmentIndex == 1 && isRoutesWeBuyListUpdated == YES) { + carriersProgress.hidden = NO; + carriersProgressTitle.hidden = NO; + operationTitle.hidden = NO; + operationProgress.hidden = NO; + cancelAllUpdatesButton.hidden = NO; + + routesChangeFilterWithOrWithoutTraffic.hidden = YES; + + //[self.navigationController setToolbarHidden:NO animated:YES];//progressView.hidden = NO; + } + else if (selectedSegmentIndex == 2 && isRoutesPushlistListUpdated == YES) { + carriersProgress.hidden = NO; + carriersProgressTitle.hidden = NO; + operationTitle.hidden = NO; + operationProgress.hidden = NO; + cancelAllUpdatesButton.hidden = NO; + + routesChangeFilterWithOrWithoutTraffic.hidden = YES; + + //[self.navigationController setToolbarHidden:NO animated:YES];//progressView.hidden = NO; + } + else { + carriersProgress.hidden = YES; + carriersProgressTitle.hidden = YES; + operationTitle.hidden = YES; + operationProgress.hidden = YES; + cancelAllUpdatesButton.hidden = YES; + + routesChangeFilterWithOrWithoutTraffic.hidden = NO; + NSLog(@"routesChangeFilterWithOrWithoutTraffic.hidden = NO;"); + + +// [self.navigationController setToolbarHidden:YES animated:YES];progressView.hidden = YES; + } //}); if (isRoutesWeBuyListUpdated || isRoutesPushlistListUpdated || isRoutesForSaleListUpdated) return; //else isRoutesListUpdated = YES; @@ -323,8 +370,17 @@ -(void) updateDestinations; if (lastUpdate == nil || -[lastUpdate timeIntervalSinceNow] > 1 ) { [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:lastUpdateTimeKey]; dispatch_async(dispatch_get_main_queue(), ^(void) { - progressView.hidden = NO; - progressView.alpha = 1.0; + //[self.navigationController setToolbarHidden:NO animated:YES]; + carriersProgress.hidden = NO; + carriersProgressTitle.hidden = NO; + operationTitle.hidden = NO; + operationProgress.hidden = NO; + cancelAllUpdatesButton.hidden = NO; + routesChangeFilterWithOrWithoutTraffic.hidden = YES; + NSLog(@"routesChangeFilterWithOrWithoutTraffic.hidden = NO;"); + +// progressView.hidden = NO; +// progressView.alpha = 1.0; // operationProgress.progressTintColor = [UIColor colorWithRed:0.34 green:0.34 blue:0.57 alpha:1.0]; // carriersProgress.progressTintColor = [UIColor colorWithRed:0.34 green:0.34 blue:0.57 alpha:1.0]; // [alert removeAllSegments]; @@ -397,7 +453,16 @@ -(void) updateDestinations; dispatch_async(dispatch_get_main_queue(), ^(void) { // [self.navigationController setToolbarHidden:YES animated:YES]; operationProgress.hidden = YES; - progressView.hidden = YES; + //progressView.hidden = YES; + //[self.navigationController setToolbarHidden:YES animated:YES]; + carriersProgress.hidden = YES; + carriersProgressTitle.hidden = YES; + operationTitle.hidden = YES; + operationProgress.hidden = YES; + cancelAllUpdatesButton.hidden = YES; + + routesChangeFilterWithOrWithoutTraffic.hidden = NO; + cancelAllUpdates = NO; cancelAllUpdatesButton.enabled = YES; }); @@ -431,13 +496,13 @@ - (void)viewDidLoad { [super viewDidLoad]; - [self.progressView.layer setCornerRadius:5]; - [self.progressView.layer setBorderColor:[UIColor blackColor].CGColor]; - [self.progressView.layer setBorderWidth:1.5f]; - [self.progressView.layer setShadowColor:[UIColor whiteColor].CGColor]; - [self.progressView.layer setShadowOpacity:0.8]; - [self.progressView.layer setShadowRadius:5]; - [self.progressView.layer setShadowOffset:CGSizeMake(1.0, 1.0)]; +// [self.progressView.layer setCornerRadius:5]; +// [self.progressView.layer setBorderColor:[UIColor blackColor].CGColor]; +// [self.progressView.layer setBorderWidth:1.5f]; +// [self.progressView.layer setShadowColor:[UIColor whiteColor].CGColor]; +// [self.progressView.layer setShadowOpacity:0.8]; +// [self.progressView.layer setShadowRadius:5]; +// [self.progressView.layer setShadowOffset:CGSizeMake(1.0, 1.0)]; // Do any additional setup after loading the view from its nib. shouldBeginEditing = YES; @@ -462,9 +527,18 @@ - (void)viewDidLoad self.navigationController.toolbar.backgroundColor = [UIColor clearColor]; self.navigationController.toolbar.barStyle = UIBarStyleBlack; + self.navigationController.toolbar.translucent = YES; self.navigationController.toolbar.tintColor = [UIColor colorWithRed:0.65 green:0.65 blue:0.78 alpha:0.2]; - +// UIBarButtonItem *withTraffic = [[[UIBarButtonItem alloc] initWithTitle:@"with trattic..." style:UIBarButtonItemStyleDone target:self action:@selector(sortRoutesWithTraffic)] autorelease]; +// UIBarButtonItem *withOutTraffic = [[[UIBarButtonItem alloc] initWithTitle:@"without trattic..." style:UIBarButtonItemStyleBordered target:self action:@selector(sortRoutesWithTraffic)] autorelease]; + + UIBarButtonItem *itemFor = [[[UIBarButtonItem alloc] initWithCustomView:self.toolBarView] autorelease]; + + [self setToolbarItems:[NSArray arrayWithObject:itemFor]]; + [routesChangeFilterWithOrWithoutTraffic setHidden:YES]; + [self.navigationController setToolbarHidden:NO animated:NO]; + // Set up default values. self.tableView.backgroundColor = [UIColor colorWithRed:0.34 green:0.34 blue:0.57 alpha:1.0]; @@ -502,6 +576,8 @@ - (void)viewDidUnload { [self setTableView:nil]; [self setCancelAllUpdatesButton:nil]; + [self setToolBarView:nil]; + [self setRoutesChangeFilterWithOrWithoutTraffic:nil]; [super viewDidUnload]; // Release any retained subviews of the main view. // e.g. self.myOutlet = nil; @@ -1630,6 +1706,8 @@ - (IBAction)cancelUpdateStart:(id)sender { cancelAllUpdatesButton.enabled = NO; self.cancelAllUpdates = YES; } +- (IBAction)changeRoutesWithOrWithoutTraffic:(id)sender { +} #pragma mark - external reload methods @@ -1752,15 +1830,22 @@ -(void)updateUIWithData:(NSArray *)data; } else { [UIApplication sharedApplication].networkActivityIndicatorVisible = NO; // isRoutesListUpdated = NO; - [self.navigationController setToolbarHidden:YES animated:YES]; + //[self.navigationController setToolbarHidden:YES animated:YES]; + carriersProgress.hidden = YES; + carriersProgressTitle.hidden = YES; + operationTitle.hidden = YES; + operationProgress.hidden = YES; + routesChangeFilterWithOrWithoutTraffic.hidden = NO; + NSLog(@"routesChangeFilterWithOrWithoutTraffic.hidden = NO;"); + [cell.activity stopAnimating]; cell.activity.hidden = YES; - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^(void) { - sleep(10); - dispatch_async(dispatch_get_main_queue(), ^(void) { - [self.navigationController setToolbarHidden:YES animated:YES]; - }); - }); +// dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^(void) { +// sleep(10); +// dispatch_async(dispatch_get_main_queue(), ^(void) { +// [self.navigationController setToolbarHidden:YES animated:YES]; +// }); +// }); if ([status isEqualToString:@"remove object finish"] || [status isEqualToString:@"destination for removing not found"]) { //dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^(void) { diff --git a/snowMobile/ViewControllers/DestinationsListViewController.xib b/snowMobile/ViewControllers/DestinationsListViewController.xib index 3282e09..3b220f6 100644 --- a/snowMobile/ViewControllers/DestinationsListViewController.xib +++ b/snowMobile/ViewControllers/DestinationsListViewController.xib @@ -12,11 +12,12 @@ IBUIProgressView - IBUITableView - IBUIButton IBUIView IBUILabel IBProxyObject + IBUISegmentedControl + IBUITableView + IBUIButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -44,7 +45,7 @@ {320, 460} - + _NS:418 3 @@ -64,7 +65,7 @@ - 292 + -2147483356 @@ -178,19 +179,19 @@ 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + 3 MC41AA - + NSImage delete-icon-md.png - + 2 15 - + Helvetica-Bold 15 16 @@ -211,6 +212,163 @@ 0.60000002384185791 IBCocoaTouchFramework + + + 292 + + + + 292 + {{5, 3}, {155, 22}} + + + + _NS:328 + NO + YES + NO + IBCocoaTouchFramework + Update for carrier + + 2 + MC4zODAzOTIxOTM4IDAuMzkyMTU2ODk5IDAuNTgwMzkyMTgxOQA + + + + 1 + 10 + + + + + + 292 + {{168, 3}, {95, 22}} + + + + _NS:328 + NO + YES + NO + IBCocoaTouchFramework + Operation + + 2 + MC4zODAzOTIxOTM4IDAuMzkyMTU2ODk5IDAuNTgwMzkyMTgxOQA + + + + 1 + 10 + + + + + + 292 + {{270, 4}, {30, 30}} + + + + _NS:225 + NO + 2 + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + + 292 + {{168, 26}, {95, 11}} + + + + _NS:677 + NO + IBCocoaTouchFramework + 1 + + 2 + MC40Mjc0NTEwMTQ1IDAuNDA3ODQzMTcyNiAwLjYzOTIxNTcwNzgAA + + + + + 292 + {{5, 26}, {155, 11}} + + + + _NS:677 + NO + IBCocoaTouchFramework + 1 + + 2 + MC40MTk2MDc4Nzc3IDAuNDMxMzcyNTgyOSAwLjYzOTIxNTcwNzgAA + + + + + -2147483356 + {{5, 6}, {290, 30}} + + + + _NS:273 + NO + 0.69999998807907104 + IBCocoaTouchFramework + 2 + 2 + 0 + + Routes with traffic + RoutesWithoutTraffic + + + + + + + + + + + {0, 0} + {0, 0} + + + + + + + 2 + MC4zODAzOTIxOTM4IDAuMzkyMTU2ODk5IDAuNTgwMzkyMTgxOQA + + + + {{0, 198}, {320, 41}} + + + + _NS:196 + NO + NO + 0.60000002384185791 + IBCocoaTouchFramework + {{0, 20}, {320, 460}} @@ -245,53 +403,69 @@ 15 + + + progressView + + + + 19 + + + + toolBarView + + + + 44 + carriersProgress - + - 21 + 49 - operationProgress + carriersProgressTitle - + - 24 + 50 operationTitle - + - 23 + 51 - carriersProgressTitle + operationProgress - + - 22 + 52 - progressView + routesChangeFilterWithOrWithoutTraffic - + - 19 + 56 cancelAllUpdatesButton - + - 31 + 57 @@ -318,6 +492,24 @@ 33 + + + cancelUpdateStart: + + + 7 + + 48 + + + + changeRoutesWithOrWithoutTraffic: + + + 13 + + 55 + @@ -333,6 +525,7 @@ + @@ -391,6 +584,50 @@ + + 37 + + + + + + + + + + + ToolBarView + + + 39 + + + + + 40 + + + + + 47 + + + + + 46 + + + + + 45 + + + + + 54 + + + @@ -405,13 +642,21 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 36 + 57 @@ -438,7 +683,9 @@ UIProgressView UILabel UIView + UISegmentedControl UITableView + UIView @@ -485,10 +732,18 @@ progressView UIView + + routesChangeFilterWithOrWithoutTraffic + UISegmentedControl + tableView UITableView + + toolBarView + UIView + IBProjectSource