diff --git a/contrib/mobile/iOS/Onelab/ModelListController.mm b/contrib/mobile/iOS/Onelab/ModelListController.mm index 186217b1240caf687b688abe7eb25b25919be79a..aa274aa3646a681749d0a394f3cadf581beb8b8f 100644 --- a/contrib/mobile/iOS/Onelab/ModelListController.mm +++ b/contrib/mobile/iOS/Onelab/ModelListController.mm @@ -103,7 +103,8 @@ { AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate; selectedModel = [[models objectAtIndex:indexPath.row] getFile]; - if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ + if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || + [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ appDelegate.splitViewController.initialModel = selectedModel; [UIView transitionWithView:appDelegate.window duration:0.5 diff --git a/contrib/mobile/iOS/Onelab/ModelViewController.mm b/contrib/mobile/iOS/Onelab/ModelViewController.mm index ed9558aeff834681f3b1969622934cb1ace9594c..3c761e99ea8917974488611989eab909169257ab 100644 --- a/contrib/mobile/iOS/Onelab/ModelViewController.mm +++ b/contrib/mobile/iOS/Onelab/ModelViewController.mm @@ -8,7 +8,6 @@ #import "AppDelegate.h" - @implementation UIErrorAlertView -(void)dismissWithClickedButtonIndex:(NSInteger)buttonIndex animated:(BOOL)animated @@ -45,8 +44,13 @@ -(void)viewWillAppear:(BOOL)animated { - if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]) { - _loadingAlert = [[UIAlertView alloc] initWithTitle:@"Please wait..." message: @"The model is loading" delegate: self cancelButtonTitle: nil otherButtonTitles: nil]; + if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || + [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]) { + _loadingAlert = [[UIAlertView alloc] initWithTitle:@"Please wait..." + message: @"The model is loading" + delegate: self + cancelButtonTitle: nil + otherButtonTitles: nil]; [_loadingAlert show]; } } @@ -87,7 +91,8 @@ _runStopButton = [[UIBarButtonItem alloc] initWithTitle:@"Run" style:UIBarButtonItemStyleBordered target:self action:@selector(compute)]; //UIBarButtonItem *share = [[UIBarButtonItem alloc] initWithTitle:@"Share" style:UIBarButtonItemStyleBordered target:self action:@selector(share)]; - if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ + if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || + [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ UIBarButtonItem *model = [[UIBarButtonItem alloc] initWithTitle:@"Model list" style:UIBarButtonItemStyleBordered target:self action:@selector(showModelsList)]; [self.navigationItem setRightBarButtonItems:[NSArray arrayWithObjects:_runStopButton, model, /*share,*/ nil]]; } @@ -268,7 +273,8 @@ [alert show]; return; } - if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ + if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || + [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate; [UIView transitionWithView:appDelegate.window duration:0.5 diff --git a/contrib/mobile/iOS/Onelab/OptionsViewController.mm b/contrib/mobile/iOS/Onelab/OptionsViewController.mm index 012d8a822b72c0e3031dbfa102aa0e10052e3ac9..a269bd0000aa5e4fc7dbf1a64e693438cbc88506 100644 --- a/contrib/mobile/iOS/Onelab/OptionsViewController.mm +++ b/contrib/mobile/iOS/Onelab/OptionsViewController.mm @@ -39,7 +39,8 @@ UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]; self.toolbarItems = [[NSArray alloc] initWithObjects:flexibleSpace, controlBtn, flexibleSpace, nil]; [control addTarget:self action:@selector(indexDidChangeForSegmentedControl:) forControlEvents:UIControlEventValueChanged]; - if(![[UIDevice currentDevice].model isEqualToString:@"iPad"] && ![[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]) + if(![[UIDevice currentDevice].model isEqualToString:@"iPad"] + && ![[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]) self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:self action:@selector(backButtonPressed:)]; else self.navigationItem.hidesBackButton = true; @@ -201,7 +202,8 @@ { if(indexPath.section != 1) return; UIStoryboard *storyboard; - if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]) + if([[UIDevice currentDevice].model isEqualToString:@"iPad"] || + [[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]) storyboard = [UIStoryboard storyboardWithName:@"iPadStoryboard" bundle:nil]; else storyboard = [UIStoryboard storyboardWithName:@"iPhoneiPodStoryboard" bundle:nil]; diff --git a/contrib/mobile/iOS/Onelab/ParametersViewController.mm b/contrib/mobile/iOS/Onelab/ParametersViewController.mm index 5024a776b2978e8beb53c7b438229e08aacdc677..9a4399f48d883cf6ae76ad69107971a4f30ea669 100644 --- a/contrib/mobile/iOS/Onelab/ParametersViewController.mm +++ b/contrib/mobile/iOS/Onelab/ParametersViewController.mm @@ -41,7 +41,8 @@ UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]; self.toolbarItems = [[NSArray alloc] initWithObjects:flexibleSpace, controlBtn, flexibleSpace, nil]; [control addTarget:self action:@selector(indexDidChangeForSegmentedControl:) forControlEvents:UIControlEventValueChanged]; - if(![[UIDevice currentDevice].model isEqualToString:@"iPad"] && ![[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ + if(![[UIDevice currentDevice].model isEqualToString:@"iPad"] && + ![[UIDevice currentDevice].model isEqualToString:@"iPad Simulator"]){ self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:self action:@selector(backButtonPressed:)]; } self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Reset" style:UIBarButtonItemStyleBordered target:self action:@selector(resetParameters:)];