From 71eea899e02b4f86e365526b11f583a8a8688aeb Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sun, 27 Mar 2016 19:40:15 +0200 Subject: [PATCH] loading from tableview done --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 34 ------------------- FMC Planner 2/TableViewController.h | 4 +++ FMC Planner 2/TableViewController.m | 8 +++++ FMC Planner 2/ViewControllerScreen.h | 1 + FMC Planner 2/ViewControllerScreen.m | 11 +++--- FMC Planner 2/ViewControllerServiceMenu.m | 1 + 6 files changed, 19 insertions(+), 40 deletions(-) diff --git a/FMC Planner 2.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FMC Planner 2.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index d276ccb..fe2b454 100644 --- a/FMC Planner 2.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/FMC Planner 2.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,38 +2,4 @@ - - - - - - - - - - diff --git a/FMC Planner 2/TableViewController.h b/FMC Planner 2/TableViewController.h index 1ae0f0d..c40f4f0 100644 --- a/FMC Planner 2/TableViewController.h +++ b/FMC Planner 2/TableViewController.h @@ -7,10 +7,14 @@ // #import "SharedDeclerations.h" +#import "ViewController.h" #import +@class ViewController; @interface TableViewController : UITableViewController +@property(strong, nonatomic) ViewController *main; + @property(strong, nonatomic) NSMutableArray *dataSource; @end diff --git a/FMC Planner 2/TableViewController.m b/FMC Planner 2/TableViewController.m index 32d3a77..54a6473 100644 --- a/FMC Planner 2/TableViewController.m +++ b/FMC Planner 2/TableViewController.m @@ -85,6 +85,14 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + [self + dismissViewControllerAnimated:YES + completion:^(void) { + [_main + loadSave:[tableView + cellForRowAtIndexPath:indexPath] + .textLabel.text]; + }]; } @end diff --git a/FMC Planner 2/ViewControllerScreen.h b/FMC Planner 2/ViewControllerScreen.h index dbc8e90..bbf3902 100644 --- a/FMC Planner 2/ViewControllerScreen.h +++ b/FMC Planner 2/ViewControllerScreen.h @@ -8,6 +8,7 @@ #import "SharedDeclerations.h" #import "ViewController.h" +#import "ViewControllerServiceMenu.h" #import @class ViewController; diff --git a/FMC Planner 2/ViewControllerScreen.m b/FMC Planner 2/ViewControllerScreen.m index 68abe4a..741b7cf 100644 --- a/FMC Planner 2/ViewControllerScreen.m +++ b/FMC Planner 2/ViewControllerScreen.m @@ -107,12 +107,11 @@ #warning EXPORT TO PMDG GOES HERE } else if ([((UILabel *)tapReg.view) .restorationIdentifier isEqualToString:@"LSKR6"]) { - [self - presentViewController: - [self.storyboard - instantiateViewControllerWithIdentifier:@"ServiceMenu"] - animated:YES - completion:nil]; + UINavigationController *sm = [self.storyboard + instantiateViewControllerWithIdentifier:@"ServiceMenu"]; + ((ViewControllerServiceMenu *)[sm.childViewControllers firstObject]) + .main = _main; + [self presentViewController:sm animated:YES completion:nil]; } else { ((UILabel *)tapReg.view).text = _Scratchpad.text; } diff --git a/FMC Planner 2/ViewControllerServiceMenu.m b/FMC Planner 2/ViewControllerServiceMenu.m index cf15ffe..dcfd79e 100644 --- a/FMC Planner 2/ViewControllerServiceMenu.m +++ b/FMC Planner 2/ViewControllerServiceMenu.m @@ -27,6 +27,7 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { ((TableViewController *)[segue destinationViewController]).title = segue.identifier; + ((TableViewController *)[segue destinationViewController]).main = _main; } @end