# HG changeset patch # User koda # Date 1262913171 0 # Node ID 0ba746be5d598e9e279c8fe72f8c4abb9385766c # Parent 04c086d8d9d46e04a0cee40b2c7a8fbb42b05d8e frontend images by Tiy, first setup of frontend diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/MainMenuViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/MainMenuViewController.h Fri Jan 08 01:12:51 2010 +0000 @@ -0,0 +1,25 @@ +// +// MainMenuViewController.h +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import <UIKit/UIKit.h> + + +@interface MainMenuViewController : UIViewController { + UIButton *passandplayButton; + UIButton *netplayButton; + UIButton *storeButton; + UILabel *versionLabel; +} + +@property (nonatomic, retain) IBOutlet UIButton *passandplayButton; +@property (nonatomic, retain) IBOutlet UIButton *netplayButton; +@property (nonatomic, retain) IBOutlet UIButton *storeButton; +@property (nonatomic, retain) IBOutlet UILabel *versionLabel; + +-(IBAction) startPlaying; +@end diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/MainMenuViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/MainMenuViewController.m Fri Jan 08 01:12:51 2010 +0000 @@ -0,0 +1,69 @@ +// +// MainMenuViewController.m +// hwengine +// +// Created by Vittorio on 08/01/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "MainMenuViewController.h" +#import "SDL_uikitappdelegate.h" + +@implementation MainMenuViewController + +@synthesize passandplayButton, netplayButton, storeButton, versionLabel; + +/* + // 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 { + self.versionLabel = @"Hedgewar version 0.9.13-dev"; + [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; + self.passandplayButton = nil; + self.netplayButton = nil; + self.storeButton = nil; + self.versionLabel = nil; +} + +- (void)dealloc { + [passandplayButton release]; + [netplayButton release]; + [storeButton release]; + [versionLabel release]; + [super dealloc]; +} + +-(IBAction) startPlaying { + [[SDLUIKitDelegate sharedAppDelegate] startSDLgame]; +} +@end diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/MainMenuViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/MainMenuViewController.xib Fri Jan 08 01:12:51 2010 +0000 @@ -0,0 +1,594 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> + <data> + <int key="IBDocument.SystemTarget">784</int> + <string key="IBDocument.SystemVersion">10C540</string> + <string key="IBDocument.InterfaceBuilderVersion">740</string> + <string key="IBDocument.AppKitVersion">1038.25</string> + <string key="IBDocument.HIToolboxVersion">458.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="NS.object.0">62</string> + </object> + <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="1"/> + </object> + <object class="NSArray" key="IBDocument.PluginDependencies"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys" id="0"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBProxyObject" id="372490531"> + <string key="IBProxiedObjectIdentifier">IBFilesOwner</string> + </object> + <object class="IBProxyObject" id="975951072"> + <string key="IBProxiedObjectIdentifier">IBFirstResponder</string> + </object> + <object class="IBUIView" id="191373211"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">292</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBUIImageView" id="478425539"> + <reference key="NSNextResponder" ref="191373211"/> + <int key="NSvFlags">274</int> + <string key="NSFrameSize">{320, 431}</string> + <reference key="NSSuperview" ref="191373211"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + </object> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <int key="IBUIContentMode">4</int> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <object class="NSCustomResource" key="IBUIImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Background.png</string> + </object> + </object> + <object class="IBUIButton" id="685977989"> + <reference key="NSNextResponder" ref="191373211"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{44, 131}, {232, 61}}</string> + <reference key="NSSuperview" ref="191373211"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDAgMAA</bytes> + </object> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <int key="IBUIContentHorizontalAlignment">0</int> + <int key="IBUIContentVerticalAlignment">0</int> + <object class="NSFont" key="IBUIFont" id="917635782"> + <string key="NSName">Helvetica-Bold</string> + <double key="NSSize">15</double> + <int key="NSfFlags">16</int> + </object> + <object class="NSColor" key="IBUIHighlightedTitleColor" id="918890028"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + <object class="NSColor" key="IBUINormalTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes> + </object> + <object class="NSColor" key="IBUINormalTitleShadowColor" id="112471976"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + </object> + <object class="NSCustomResource" key="IBUINormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Button_play.png</string> + </object> + </object> + <object class="IBUIButton" id="1049354127"> + <reference key="NSNextResponder" ref="191373211"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{20, 215}, {232, 61}}</string> + <reference key="NSSuperview" ref="191373211"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDAgMAA</bytes> + </object> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <int key="IBUIContentHorizontalAlignment">0</int> + <int key="IBUIContentVerticalAlignment">0</int> + <reference key="IBUIFont" ref="917635782"/> + <reference key="IBUIHighlightedTitleColor" ref="918890028"/> + <object class="NSColor" key="IBUINormalTitleColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes> + </object> + <reference key="IBUINormalTitleShadowColor" ref="112471976"/> + <object class="NSCustomResource" key="IBUINormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Button_network.png</string> + </object> + </object> + <object class="IBUIButton" id="995155642"> + <reference key="NSNextResponder" ref="191373211"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{44, 298}, {232, 61}}</string> + <reference key="NSSuperview" ref="191373211"/> + <object class="NSColor" key="IBUIBackgroundColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDAgMAA</bytes> + </object> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <int key="IBUIContentHorizontalAlignment">0</int> + <int key="IBUIContentVerticalAlignment">0</int> + <reference key="IBUIFont" ref="917635782"/> + <reference key="IBUIHighlightedTitleColor" ref="918890028"/> + <object class="NSCustomResource" key="IBUINormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">Button_store.png</string> + </object> + </object> + <object class="IBUILabel" id="168836711"> + <reference key="NSNextResponder" ref="191373211"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{44, 384}, {232, 21}}</string> + <reference key="NSSuperview" ref="191373211"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClipsSubviews">YES</bool> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <string key="IBUIText"/> + <object class="NSFont" key="IBUIFont"> + <string key="NSName">Helvetica-Oblique</string> + <double key="NSSize">17</double> + <int key="NSfFlags">16</int> + </object> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> + </object> + <nil key="IBUIHighlightedColor"/> + <int key="IBUIBaselineAdjustment">1</int> + <float key="IBUIMinimumFontSize">10</float> + <int key="IBUITextAlignment">2</int> + </object> + </object> + <string key="NSFrameSize">{320, 431}</string> + <reference key="NSSuperview"/> + <reference key="IBUIBackgroundColor" ref="918890028"/> + <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/> + </object> + </object> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <object class="NSMutableArray" key="connectionRecords"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="191373211"/> + </object> + <int key="connectionID">3</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">passandplayButton</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="685977989"/> + </object> + <int key="connectionID">9</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">netplayButton</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="1049354127"/> + </object> + <int key="connectionID">10</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">storeButton</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="995155642"/> + </object> + <int key="connectionID">11</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">startPlaying</string> + <reference key="source" ref="685977989"/> + <reference key="destination" ref="372490531"/> + <int key="IBEventType">7</int> + </object> + <int key="connectionID">12</int> + </object> + </object> + <object class="IBMutableOrderedSet" key="objectRecords"> + <object class="NSArray" key="orderedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBObjectRecord"> + <int key="objectID">0</int> + <reference key="object" ref="0"/> + <reference key="children" ref="1000"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1</int> + <reference key="object" ref="191373211"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="478425539"/> + <reference ref="685977989"/> + <reference ref="1049354127"/> + <reference ref="995155642"/> + <reference ref="168836711"/> + </object> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-1</int> + <reference key="object" ref="372490531"/> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-2</int> + <reference key="object" ref="975951072"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">4</int> + <reference key="object" ref="478425539"/> + <reference key="parent" ref="191373211"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5</int> + <reference key="object" ref="685977989"/> + <reference key="parent" ref="191373211"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7</int> + <reference key="object" ref="1049354127"/> + <reference key="parent" ref="191373211"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8</int> + <reference key="object" ref="995155642"/> + <reference key="parent" ref="191373211"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">13</int> + <reference key="object" ref="168836711"/> + <reference key="parent" ref="191373211"/> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="flattenedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>-1.CustomClassName</string> + <string>-2.CustomClassName</string> + <string>1.IBEditorWindowLastContentRect</string> + <string>1.IBPluginDependency</string> + <string>13.IBPluginDependency</string> + <string>4.IBPluginDependency</string> + <string>5.IBPluginDependency</string> + <string>7.IBPluginDependency</string> + <string>8.IBPluginDependency</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>MainMenuViewController</string> + <string>UIResponder</string> + <string>{{493, 454}, {320, 480}}</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + </object> + </object> + <object class="NSMutableDictionary" key="unlocalizedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="activeLocalization"/> + <object class="NSMutableDictionary" key="localizations"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="sourceID"/> + <int key="maxID">13</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <object class="NSMutableArray" key="referencedPartialClassDescriptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">MainMenuViewController</string> + <string key="superclassName">UIViewController</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">startPlaying</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>netplayButton</string> + <string>passandplayButton</string> + <string>storeButton</string> + <string>versionLabel</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>UIButton</string> + <string>UIButton</string> + <string>UIButton</string> + <string>UILabel</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/MainMenuViewController.h</string> + </object> + </object> + </object> + <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSError.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSPort.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSStream.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="238583711"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIButton</string> + <string key="superclassName">UIControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIButton.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIControl</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIControl.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIImageView</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIImageView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UILabel</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UILabel.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIResponder</string> + <string key="superclassName">NSObject</string> + <reference key="sourceIdentifier" ref="238583711"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UISearchBar</string> + <string key="superclassName">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UISearchDisplayController</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UITextField.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIView</string> + <string key="superclassName">UIResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIViewController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIViewController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">UIViewController</string> + <string key="superclassName">UIResponder</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string> + </object> + </object> + </object> + </object> + <int key="IBDocument.localizationMode">0</int> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> + <integer value="784" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string> + <integer value="3000" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> + <string key="IBDocument.LastKnownRelativeProjectPath">../../../Documents/xcode/hwengine/hwengine.xcodeproj</string> + <int key="IBDocument.defaultPropertyAccessControl">3</int> + <string key="IBCocoaTouchPluginVersion">3.1</string> + </data> +</archive> diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/MainWindow.xib --- a/cocoaTouch/MainWindow.xib Thu Jan 07 22:59:14 2010 +0000 +++ b/cocoaTouch/MainWindow.xib Fri Jan 08 01:12:51 2010 +0000 @@ -12,7 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="10"/> + <integer value="12"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -54,36 +54,22 @@ <object class="IBUITabBarController" id="949193037"> <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/> <bool key="IBUIWantsFullScreenLayout">YES</bool> - <object class="IBUIViewController" key="IBUISelectedViewController" id="78432802"> - <string key="IBUITitle">Item 4</string> - <object class="IBUITabBarItem" key="IBUITabBarItem" id="457331497"> - <int key="IBUITag">3</int> - <string key="IBUITitle">Settings</string> + <object class="IBUIViewController" key="IBUISelectedViewController" id="316666609"> + <string key="IBUITitle">Item 1</string> + <object class="IBUITabBarItem" key="IBUITabBarItem" id="649951061"> + <string key="IBUITitle">Main</string> <object class="NSCustomResource" key="IBUIImage"> <string key="NSClassName">NSImage</string> - <string key="NSResourceName">dependenticon.png</string> + <string key="NSResourceName">tabButton1.png</string> </object> <reference key="IBUITabBar"/> </object> - <reference key="IBUIToolbarItems" ref="0"/> <reference key="IBUIParentViewController" ref="949193037"/> - <string key="IBUINibName">DependentComponentPickerViewController</string> + <string key="IBUINibName">MainMenuViewController</string> </object> <object class="NSMutableArray" key="IBUIViewControllers"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUIViewController" id="316666609"> - <string key="IBUITitle">Item 1</string> - <object class="IBUITabBarItem" key="IBUITabBarItem" id="649951061"> - <string key="IBUITitle">Main</string> - <object class="NSCustomResource" key="IBUIImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">clockicon.png</string> - </object> - <reference key="IBUITabBar"/> - </object> - <reference key="IBUIParentViewController" ref="949193037"/> - <string key="IBUINibName">DatePickerViewController</string> - </object> + <reference ref="316666609"/> <object class="IBUIViewController" id="56776854"> <string key="IBUITitle">Item 2</string> <object class="IBUITabBarItem" key="IBUITabBarItem" id="121845716"> @@ -91,7 +77,7 @@ <string key="IBUITitle">Teams</string> <object class="NSCustomResource" key="IBUIImage"> <string key="NSClassName">NSImage</string> - <string key="NSResourceName">singleicon.png</string> + <string key="NSResourceName">tabButton2.png</string> </object> <reference key="IBUITabBar"/> </object> @@ -105,7 +91,7 @@ <string key="IBUITitle">Schemes</string> <object class="NSCustomResource" key="IBUIImage"> <string key="NSClassName">NSImage</string> - <string key="NSResourceName">doubleicon.png</string> + <string key="NSResourceName">tabButton3.png</string> </object> <reference key="IBUITabBar"/> </object> @@ -113,7 +99,21 @@ <reference key="IBUIParentViewController" ref="949193037"/> <string key="IBUINibName">DoubleComponentPickerViewController</string> </object> - <reference ref="78432802"/> + <object class="IBUIViewController" id="78432802"> + <string key="IBUITitle">Item 4</string> + <object class="IBUITabBarItem" key="IBUITabBarItem" id="457331497"> + <int key="IBUITag">3</int> + <string key="IBUITitle">Settings</string> + <object class="NSCustomResource" key="IBUIImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">tabButton4.png</string> + </object> + <reference key="IBUITabBar"/> + </object> + <reference key="IBUIToolbarItems" ref="0"/> + <reference key="IBUIParentViewController" ref="949193037"/> + <string key="IBUINibName">DependentComponentPickerViewController</string> + </object> </object> <object class="IBUITabBar" key="IBUITabBar" id="906583108"> <nil key="NSNextResponder"/> @@ -294,7 +294,7 @@ <string>{{144, 608}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>DatePickerViewController</string> + <string>MainMenuViewController</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>SingleComponentPickerViewController</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> @@ -337,28 +337,30 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">DatePickerViewController</string> + <string key="className">MainMenuViewController</string> <string key="superclassName">UIViewController</string> <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">startPlaying</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>buttonPressed</string> - <string>startGame</string> + <string>netplayButton</string> + <string>passandplayButton</string> + <string>storeButton</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> + <string>UIButton</string> + <string>UIButton</string> + <string>UIButton</string> </object> </object> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">date_picker</string> - <string key="NS.object.0">UIDatePicker</string> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">../begchap7/Classes/DatePickerViewController.h</string> + <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/MainMenuViewController.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -535,6 +537,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">UIButton</string> + <string key="superclassName">UIControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">UIKit.framework/Headers/UIButton.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">UIControl</string> <string key="superclassName">UIView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -543,14 +553,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">UIDatePicker</string> - <string key="superclassName">UIControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">UIKit.framework/Headers/UIDatePicker.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">UIResponder</string> <string key="superclassName">NSObject</string> <reference key="sourceIdentifier" ref="186590129"/> diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/SDL_uikitappdelegate.m --- a/cocoaTouch/SDL_uikitappdelegate.m Thu Jan 07 22:59:14 2010 +0000 +++ b/cocoaTouch/SDL_uikitappdelegate.m Fri Jan 08 01:12:51 2010 +0000 @@ -34,14 +34,14 @@ static int forward_argc; static char **forward_argv; -int main(int argc, char **argv) { +int main (int argc, char **argv) { int i; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; /* store arguments */ forward_argc = argc; forward_argv = (char **)malloc(argc * sizeof(char *)); - for (i=0; i<argc; i++) { + for (i = 0; i < argc; i++) { forward_argv[i] = malloc( (strlen(argv[i])+1) * sizeof(char)); strcpy(forward_argv[i], argv[i]); } @@ -78,8 +78,9 @@ /* run the user's application, passing argc and argv */ NSLog(@"Game is launching"); SDL_main(forward_argc, forward_argv); + // can't reach here yet NSLog(@"Game exited"); - + //[self performSelector:@selector(makeNewView) withObject:nil afterDelay:0.0]; /* exit, passing the return status from the user's application */ //exit(exit_status); @@ -99,13 +100,16 @@ -(void) applicationWillTerminate:(UIApplication *)application { /* free the memory we used to hold copies of argc and argv */ int i; - for (i=0; i<forward_argc; i++) { + for (i=0; i < forward_argc; i++) { free(forward_argv[i]); } free(forward_argv); SDL_SendQuit(); /* hack to prevent automatic termination. See SDL_uikitevents.m for details */ - longjmp(*(jump_env()), 1); + // have to remove this otherwise game goes on when pushing the home button + //longjmp(*(jump_env()), 1); + + NSLog(@"Closing App..."); } -(void) applicationWillResignActive:(UIApplication*)application diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/SDL_uikitview.m --- a/cocoaTouch/SDL_uikitview.m Thu Jan 07 22:59:14 2010 +0000 +++ b/cocoaTouch/SDL_uikitview.m Fri Jan 08 01:12:51 2010 +0000 @@ -164,7 +164,7 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { initialDistance = 0; - NSLog(@"touches ended, sigh"); +// NSLog(@"touches ended, sigh"); HW_allKeysUp(); /*NSEnumerator *enumerator = [touches objectEnumerator]; @@ -216,6 +216,7 @@ else HW_aimDown(); } + // end pinch detection if (2 == [touches count]) { NSArray *twoTouches = [touches allObjects]; UITouch *first = [twoTouches objectAtIndex:0]; diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/resources/Background.png Binary file cocoaTouch/resources/Background.png has changed diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/resources/Button_network.png Binary file cocoaTouch/resources/Button_network.png has changed diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/resources/Button_play.png Binary file cocoaTouch/resources/Button_play.png has changed diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/resources/Button_store.png Binary file cocoaTouch/resources/Button_store.png has changed diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/resources/tabButton1.png Binary file cocoaTouch/resources/tabButton1.png has changed diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/resources/tabButton2.png Binary file cocoaTouch/resources/tabButton2.png has changed diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/resources/tabButton3.png Binary file cocoaTouch/resources/tabButton3.png has changed diff -r 04c086d8d9d4 -r 0ba746be5d59 cocoaTouch/resources/tabButton4.png Binary file cocoaTouch/resources/tabButton4.png has changed