equal
deleted
inserted
replaced
40 // targetControllers tells whether we're on the right or left side of the splitview -- on iphone we only use the right side |
40 // targetControllers tells whether we're on the right or left side of the splitview -- on iphone we only use the right side |
41 if (targetController == nil && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
41 if (targetController == nil && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
42 if (nil == generalSettingsViewController) |
42 if (nil == generalSettingsViewController) |
43 generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped]; |
43 generalSettingsViewController = [[GeneralSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped]; |
44 generalSettingsViewController.navigationItem.hidesBackButton = YES; |
44 generalSettingsViewController.navigationItem.hidesBackButton = YES; |
|
45 [generalSettingsViewController viewWillAppear:YES]; |
45 [self.navigationController pushViewController:generalSettingsViewController animated:NO]; |
46 [self.navigationController pushViewController:generalSettingsViewController animated:NO]; |
46 } else { |
47 } else { |
47 self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone |
48 self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone |
48 target:self |
49 target:self |
49 action:@selector(dismissSplitView)]; |
50 action:@selector(dismissSplitView)]; |