cocoaTouch/MainMenuViewController.m
changeset 2799 558b29bf00c5
parent 2743 39d097ac2276
child 2803 1f446fc5c8ec
--- a/cocoaTouch/MainMenuViewController.m	Wed Feb 10 21:23:03 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m	Wed Feb 10 22:00:49 2010 +0000
@@ -8,6 +8,7 @@
 
 #import "MainMenuViewController.h"
 #import "SDL_uikitappdelegate.h"
+#import "PascalImports.h"
 
 @implementation MainMenuViewController
 
@@ -35,13 +36,16 @@
 	// Release any cached data, images, etc that aren't in use.
 	if (nil == self.settingsViewController.view.superview) {
 		self.settingsViewController = nil;
+		[settingsViewController release];
 	}
 }
 
 
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 -(void) viewDidLoad {
-	self.versionLabel.text = @"0.9.13-dev";
+	char *ver;
+	HW_versionInfo(NULL, &ver);
+	self.versionLabel.text = [[NSString stringWithUTF8String:ver] autorelease];
 	[super viewDidLoad];
 }
 
@@ -92,14 +96,14 @@
 			SettingsViewController *controller = [[SettingsViewController alloc] initWithNibName:@"SettingsViewController"
 												      bundle:nil];
 			self.settingsViewController = controller;
-			self.settingsViewController.parentView = self.mainView;
 			[controller release];
 		}
 		self.settingsViewController.view.frame = CGRectMake(0, -320, 480, 320);
+		self.settingsViewController.parentView = self.mainView;
 
 		[UIView beginAnimations:@"View Switch" context:NULL];
-		[UIView setAnimationDuration:3];
-		[UIView setAnimationDuration:UIViewAnimationCurveEaseOut];
+		[UIView setAnimationDuration:1];
+		//[UIView setAnimationDuration:UIViewAnimationCurveEaseOut];
 		self.settingsViewController.view.frame = CGRectMake(0, 0, 480, 320);
 		self.mainView.frame = CGRectMake(0, 320, 480, 320);