equal
deleted
inserted
replaced
144 #pragma mark - |
144 #pragma mark - |
145 #pragma mark Split view support |
145 #pragma mark Split view support |
146 #ifdef __IPHONE_3_2 |
146 #ifdef __IPHONE_3_2 |
147 -(void) splitViewController:(UISplitViewController *)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)pc { |
147 -(void) splitViewController:(UISplitViewController *)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)pc { |
148 barButtonItem.title = @"Master List"; |
148 barButtonItem.title = @"Master List"; |
149 [self.navigationController.navigationBar.topItem setLeftBarButtonItem:barButtonItem animated:YES]; |
149 [self.navigationItem setLeftBarButtonItem:barButtonItem animated:YES]; |
150 self.popoverController = pc; |
150 self.popoverController = pc; |
151 } |
151 } |
152 |
152 |
153 // Called when the view is shown again in the split view, invalidating the button and popover controller. |
153 // Called when the view is shown again in the split view, invalidating the button and popover controller. |
154 -(void) splitViewController: (UISplitViewController*)svc willShowViewController:(UIViewController *)aViewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem { |
154 -(void) splitViewController: (UISplitViewController*)svc willShowViewController:(UIViewController *)aViewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem { |
155 [self.navigationController.navigationBar.topItem setLeftBarButtonItem:nil animated:YES]; |
155 [self.navigationItem setLeftBarButtonItem:nil animated:YES]; |
156 self.popoverController = nil; |
156 self.popoverController = nil; |
157 } |
157 } |
158 #endif |
158 #endif |
159 |
159 |
160 -(IBAction) dismissSplitView { |
160 -(IBAction) dismissSplitView { |
164 |
164 |
165 -(void) didReceiveMemoryWarning { |
165 -(void) didReceiveMemoryWarning { |
166 // Releases the view if it doesn't have a superview. |
166 // Releases the view if it doesn't have a superview. |
167 [super didReceiveMemoryWarning]; |
167 [super didReceiveMemoryWarning]; |
168 // Release any cached data, images, etc that aren't in use. |
168 // Release any cached data, images, etc that aren't in use. |
|
169 generalSettingsViewController = nil; |
|
170 teamSettingsViewController = nil; |
|
171 weaponSettingsViewController = nil; |
|
172 schemeSettingsViewController = nil; |
|
173 MSG_MEMCLEAN(); |
169 } |
174 } |
170 |
175 |
171 -(void) viewDidUnload { |
176 -(void) viewDidUnload { |
172 self.controllerNames = nil; |
177 self.controllerNames = nil; |
173 self.popoverController = nil; |
178 self.popoverController = nil; |