# HG changeset patch # User koda # Date 1262921881 0 # Node ID 28b8330b8af1a35d751279cd49829c27ed2f1e1f # Parent ad3304e906bbb89c1df8fb629b52cd3a5287bdc0 add stub files for other views and prevent useless crashes also changed the tabBar icons diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/MainMenuViewController.h --- a/cocoaTouch/MainMenuViewController.h Fri Jan 08 01:29:28 2010 +0000 +++ b/cocoaTouch/MainMenuViewController.h Fri Jan 08 03:38:01 2010 +0000 @@ -22,4 +22,5 @@ @property (nonatomic, retain) IBOutlet UILabel *versionLabel; -(IBAction) startPlaying; +-(IBAction) notYetImplemented; @end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/MainMenuViewController.m --- a/cocoaTouch/MainMenuViewController.m Fri Jan 08 01:29:28 2010 +0000 +++ b/cocoaTouch/MainMenuViewController.m Fri Jan 08 03:38:01 2010 +0000 @@ -25,12 +25,11 @@ // Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - self.versionLabel = @"Hedgewar version 0.9.13-dev"; +-(void) viewDidLoad { + self.versionLabel = @"Hedgewars version 0.9.13-dev"; [super viewDidLoad]; } - /* // Override to allow orientations other than the default portrait orientation. - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { @@ -48,7 +47,6 @@ - (void)viewDidUnload { // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; self.passandplayButton = nil; self.netplayButton = nil; self.storeButton = nil; @@ -64,6 +62,19 @@ } -(IBAction) startPlaying { + // TODO: support IPC and start a thread + [[SDLUIKitDelegate sharedAppDelegate] startSDLgame]; } + +-(IBAction) notYetImplemented { + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Not Yet Implemented" + message:@"Sorry, this feature is not yet implemented" + delegate:nil + cancelButtonTitle:@"Well, don't worry" + otherButtonTitles:nil]; + [alert show]; + [alert release]; +} + @end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/MainMenuViewController.xib --- a/cocoaTouch/MainMenuViewController.xib Fri Jan 08 01:29:28 2010 +0000 +++ b/cocoaTouch/MainMenuViewController.xib Fri Jan 08 03:38:01 2010 +0000 @@ -132,6 +132,11 @@ 0 + + 3 + MAA + + NSImage Button_store.png @@ -211,6 +216,32 @@ 12 + + + versionLabel + + + + 14 + + + + notYetImplemented + + + 7 + + 15 + + + + notYetImplemented + + + 7 + + 16 + @@ -315,7 +346,7 @@ - 13 + 16 @@ -324,8 +355,17 @@ MainMenuViewController UIViewController - startPlaying - id + YES + + YES + notYetImplemented + startPlaying + + + YES + id + id + YES diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/MainWindow.xib --- a/cocoaTouch/MainWindow.xib Fri Jan 08 01:29:28 2010 +0000 +++ b/cocoaTouch/MainWindow.xib Fri Jan 08 03:38:01 2010 +0000 @@ -12,7 +12,7 @@ YES - + YES @@ -54,36 +54,36 @@ YES - - Item 1 - - Main + + Item 2 + + 1 + Teams NSImage - tabButton1.png + tabButton2.png - MainMenuViewController + TeamEditViewController YES - - - Item 2 - - 1 - Teams + + Item 1 + + Main NSImage - tabButton2.png + tabButton1.png - SingleComponentPickerViewController + MainMenuViewController + Item 3 @@ -97,7 +97,7 @@ - DoubleComponentPickerViewController + SchemeEditViewController Item 4 @@ -112,7 +112,7 @@ - DependentComponentPickerViewController + SettingsViewController @@ -296,12 +296,12 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin MainMenuViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin - SingleComponentPickerViewController + TeamEditViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - DoubleComponentPickerViewController - DependentComponentPickerViewController + SchemeEditViewController + SettingsViewController YES @@ -340,8 +340,17 @@ MainMenuViewController UIViewController - startPlaying - id + YES + + YES + notYetImplemented + startPlaying + + + YES + id + id + YES @@ -350,12 +359,14 @@ netplayButton passandplayButton storeButton + versionLabel YES UIButton UIButton UIButton + UILabel @@ -384,6 +395,30 @@ ../../../hedge.build/trunk/cocoaTouch/SDL_uikitappdelegate.h + + SchemeEditViewController + UIViewController + + IBProjectSource + ../../../hedge.build/trunk/cocoaTouch/SchemeEditViewController.h + + + + SettingsViewController + UIViewController + + IBProjectSource + ../../../hedge.build/trunk/cocoaTouch/SettingsViewController.h + + + + TeamEditViewController + UIViewController + + IBProjectSource + ../../../hedge.build/trunk/cocoaTouch/TeamEditViewController.h + + YES @@ -553,6 +588,14 @@ + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.h + + + UIResponder NSObject diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/SchemeEditViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SchemeEditViewController.h Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,16 @@ +// +// SchemeEditViewController.h +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface SchemeEditViewController : UIViewController { + +} + +@end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/SchemeEditViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SchemeEditViewController.m Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,57 @@ +// +// SchemeEditViewController.m +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "SchemeEditViewController.h" + + +@implementation SchemeEditViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} +*/ + +/* +// Override to allow orientations other than the default portrait orientation. +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Return YES for supported orientations + return (interfaceOrientation == UIInterfaceOrientationPortrait); +} +*/ + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/SchemeEditViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SchemeEditViewController.xib Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,150 @@ + + + + 784 + 10A394 + 732 + 1027.1 + 430.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 60 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + + + IBFirstResponder + + + + 292 + {320, 460} + + + 3 + MQA + + 2 + + + + + + + + YES + + + view + + + + 3 + + + + + YES + + 0 + + + + + + 1 + + + + + -1 + + + File's Owner + + + -2 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + + + YES + SchemeEditViewController + UIResponder + {{556, 412}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 3 + + + + YES + + SchemeEditViewController + UIViewController + + IBProjectSource + SchemeEditViewController.h + + + + + 0 + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + + 3 + 3.1 + + diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/SettingsViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SettingsViewController.h Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,16 @@ +// +// SettingsViewController.h +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface SettingsViewController : UIViewController { + +} + +@end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/SettingsViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SettingsViewController.m Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,57 @@ +// +// SettingsViewController.m +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "SettingsViewController.h" + + +@implementation SettingsViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} +*/ + +/* +// Override to allow orientations other than the default portrait orientation. +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Return YES for supported orientations + return (interfaceOrientation == UIInterfaceOrientationPortrait); +} +*/ + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/SettingsViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/SettingsViewController.xib Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,150 @@ + + + + 784 + 10A394 + 732 + 1027.1 + 430.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 60 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + + + IBFirstResponder + + + + 292 + {320, 460} + + + 3 + MQA + + 2 + + + + + + + + YES + + + view + + + + 3 + + + + + YES + + 0 + + + + + + 1 + + + + + -1 + + + File's Owner + + + -2 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + + + YES + SettingsViewController + UIResponder + {{556, 412}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 3 + + + + YES + + SettingsViewController + UIViewController + + IBProjectSource + SettingsViewController.h + + + + + 0 + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + + 3 + 3.1 + + diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/TeamEditViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/TeamEditViewController.h Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,16 @@ +// +// TeamEditViewController.h +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface TeamEditViewController : UIViewController { + +} + +@end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/TeamEditViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/TeamEditViewController.m Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,57 @@ +// +// TeamEditViewController.m +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "TeamEditViewController.h" + + +@implementation TeamEditViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} +*/ + +/* +// Override to allow orientations other than the default portrait orientation. +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Return YES for supported orientations + return (interfaceOrientation == UIInterfaceOrientationPortrait); +} +*/ + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/TeamEditViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/TeamEditViewController.xib Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,150 @@ + + + + 784 + 10A394 + 732 + 1027.1 + 430.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 60 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + + + IBFirstResponder + + + + 292 + {320, 460} + + + 3 + MQA + + 2 + + + + + + + + YES + + + view + + + + 3 + + + + + YES + + 0 + + + + + + 1 + + + + + -1 + + + File's Owner + + + -2 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + + + YES + TeamEditViewController + UIResponder + {{556, 412}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 3 + + + + YES + + TeamEditViewController + UIViewController + + IBProjectSource + TeamEditViewController.h + + + + + 0 + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + + 3 + 3.1 + + diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/TeamMenuViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/TeamMenuViewController.h Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,16 @@ +// +// TeamMenuViewController.h +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface TeamMenuViewController : UIViewController { + +} + +@end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/TeamMenuViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/TeamMenuViewController.m Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,57 @@ +// +// TeamMenuViewController.m +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "TeamMenuViewController.h" + + +@implementation TeamMenuViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} +*/ + +/* +// Override to allow orientations other than the default portrait orientation. +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Return YES for supported orientations + return (interfaceOrientation == UIInterfaceOrientationPortrait); +} +*/ + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/TeamMenuViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/TeamMenuViewController.xib Fri Jan 08 03:38:01 2010 +0000 @@ -0,0 +1,150 @@ + + + + 784 + 10A394 + 732 + 1027.1 + 430.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 60 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + + + IBFirstResponder + + + + 292 + {320, 460} + + + 3 + MQA + + 2 + + + + + + + + YES + + + view + + + + 3 + + + + + YES + + 0 + + + + + + 1 + + + + + -1 + + + File's Owner + + + -2 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + + + YES + TeamMenuViewController + UIResponder + {{556, 412}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 3 + + + + YES + + TeamMenuViewController + UIViewController + + IBProjectSource + TeamMenuViewController.h + + + + + 0 + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + + 3 + 3.1 + + diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/resources/tabButton1.png Binary file cocoaTouch/resources/tabButton1.png has changed diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/resources/tabButton2.png Binary file cocoaTouch/resources/tabButton2.png has changed diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/resources/tabButton3.png Binary file cocoaTouch/resources/tabButton3.png has changed diff -r ad3304e906bb -r 28b8330b8af1 cocoaTouch/resources/tabButton4.png Binary file cocoaTouch/resources/tabButton4.png has changed