equal
deleted
inserted
replaced
174 [self presentModalViewController:self.gameConfigViewController animated:YES]; |
174 [self presentModalViewController:self.gameConfigViewController animated:YES]; |
175 break; |
175 break; |
176 case 2: |
176 case 2: |
177 if (nil == self.settingsViewController) { |
177 if (nil == self.settingsViewController) { |
178 SplitViewRootController *svrc = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil]; |
178 SplitViewRootController *svrc = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil]; |
|
179 svrc.modalTransitionStyle = UIModalTransitionStyleCoverVertical; |
179 self.settingsViewController = svrc; |
180 self.settingsViewController = svrc; |
180 [svrc release]; |
181 [svrc release]; |
181 } |
182 } |
182 |
183 |
183 [self presentModalViewController:self.settingsViewController animated:YES]; |
184 [self presentModalViewController:self.settingsViewController animated:YES]; |
184 break; |
185 break; |
185 case 3: |
186 case 3: |
186 if (nil == self.aboutViewController) { |
187 if (nil == self.aboutViewController) { |
187 AboutViewController *about = [[AboutViewController alloc] initWithNibName:@"AboutViewController" bundle:nil]; |
188 AboutViewController *about = [[AboutViewController alloc] initWithNibName:@"AboutViewController" bundle:nil]; |
188 about.modalTransitionStyle = UIModalPresentationFormSheet; |
189 about.modalTransitionStyle = UIModalTransitionStyleCoverVertical; |
|
190 about.modalPresentationStyle = UIModalPresentationFormSheet; |
189 self.aboutViewController = about; |
191 self.aboutViewController = about; |
190 [about release]; |
192 [about release]; |
191 } |
193 } |
192 |
194 |
193 [self presentModalViewController:self.aboutViewController animated:YES]; |
195 [self presentModalViewController:self.aboutViewController animated:YES]; |
217 [alert release]; |
219 [alert release]; |
218 break; |
220 break; |
219 } |
221 } |
220 } |
222 } |
221 |
223 |
222 // allows child controllers to return to the main controller |
224 // must be kept for compatibility with the settings page |
223 -(void) dismissModalViewController { |
225 -(void) dismissModalViewController { |
224 [self dismissModalViewControllerAnimated:YES]; |
226 [self dismissModalViewControllerAnimated:YES]; |
225 } |
227 } |
226 |
228 |
227 -(void) viewDidUnload { |
229 -(void) viewDidUnload { |