# HG changeset patch
# User koda
# Date 1265166104 0
# Node ID 03df0573a9fd6b9d423db1d38167e2e1c613507b
# Parent f860f27028cc014f9f3cb0106c479b1f14f2b440
programmatically load main controller
adapt settings to landscape
transition between main controller and other views
diff -r f860f27028cc -r 03df0573a9fd cocoaTouch/MainMenuViewController.h
--- a/cocoaTouch/MainMenuViewController.h Mon Feb 01 22:01:35 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.h Wed Feb 03 03:01:44 2010 +0000
@@ -7,20 +7,17 @@
//
#import <UIKit/UIKit.h>
-
+#import "SettingsViewController.h"
@interface MainMenuViewController : UIViewController {
- UIButton *passandplayButton;
- UIButton *netplayButton;
- UIButton *storeButton;
UILabel *versionLabel;
+ SettingsViewController *settingsViewController;
}
-@property (nonatomic, retain) IBOutlet UIButton *passandplayButton;
-@property (nonatomic, retain) IBOutlet UIButton *netplayButton;
-@property (nonatomic, retain) IBOutlet UIButton *storeButton;
@property (nonatomic, retain) IBOutlet UILabel *versionLabel;
+@property (nonatomic, retain) SettingsViewController *settingsViewController;
-(IBAction) startPlaying;
-(IBAction) notYetImplemented;
+-(IBAction) switchViews:(id)sender;
@end
diff -r f860f27028cc -r 03df0573a9fd cocoaTouch/MainMenuViewController.m
--- a/cocoaTouch/MainMenuViewController.m Mon Feb 01 22:01:35 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m Wed Feb 03 03:01:44 2010 +0000
@@ -11,7 +11,7 @@
@implementation MainMenuViewController
-@synthesize passandplayButton, netplayButton, storeButton, versionLabel;
+@synthesize versionLabel, settingsViewController;
/*
// The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
@@ -23,70 +23,89 @@
}
*/
+-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
+ return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
+}
+
+
+- (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.
+ if (nil == self.settingsViewController.view.superview) {
+ self.settingsViewController = nil;
+ }
+}
+
// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-(void) viewDidLoad {
- self.versionLabel.text = @"Hedgewars version 0.9.13-dev";
- [super viewDidLoad];
-}
-
--(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
- if (interfaceOrientation == UIInterfaceOrientationLandscapeRight) return YES;
- else return NO;
+ self.versionLabel.text = @"0.9.13-dev";
+ [super viewDidLoad];
}
-/*
-- (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.
- self.passandplayButton = nil;
- self.netplayButton = nil;
- self.storeButton = nil;
self.versionLabel = nil;
}
- (void)dealloc {
- [passandplayButton release];
- [netplayButton release];
- [storeButton release];
[versionLabel release];
- [super dealloc];
+ [settingsViewController release];
+ [super dealloc];
}
// disable the buttons when to prevent launching twice the game
-(void) viewWillDisappear:(BOOL)animated {
- passandplayButton.enabled = NO;
- netplayButton.enabled = NO;
- storeButton.enabled = NO;
+ self.view.userInteractionEnabled = NO;
[super viewWillDisappear:animated];
}
-(void) viewWillAppear:(BOOL)animated {
- passandplayButton.enabled = YES;
- netplayButton.enabled = YES;
- storeButton.enabled = YES;
+ self.view.userInteractionEnabled = YES;
[super viewWillAppear:animated];
}
+#pragma mark -
+#pragma mark Action buttons
-(IBAction) startPlaying {
[[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];
+ message:@"Sorry, this feature is not yet implemented"
+ delegate:nil
+ cancelButtonTitle:@"Well, don't worry"
+ otherButtonTitles:nil];
[alert show];
[alert release];
}
+-(IBAction) switchViews:(id)sender {
+
+ // view not displayed or not created
+ if (nil == self.settingsViewController.view.superview) {
+ // view not created
+ if (nil == self.settingsViewController) {
+ SettingsViewController *controller = [[SettingsViewController alloc] initWithNibName:@"SettingsViewController"
+ bundle:nil];
+ self.settingsViewController = controller;
+ [controller release];
+ }
+ self.settingsViewController.view.frame = CGRectMake(0, -480, 480, 320);
+
+ [UIView beginAnimations:@"View Switch" context:NULL];
+ [UIView setAnimationDuration:3];
+ [UIView setAnimationDuration:UIViewAnimationCurveEaseOut];
+ self.settingsViewController.view.frame = CGRectMake(0, 0, 480, 320);
+
+ // we have the new controller, let's switch
+ [self.view addSubview:settingsViewController.view];
+ [UIView commitAnimations];
+ }
+
+}
+
@end
diff -r f860f27028cc -r 03df0573a9fd cocoaTouch/MainMenuViewController.xib
--- a/cocoaTouch/MainMenuViewController.xib Mon Feb 01 22:01:35 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.xib Wed Feb 03 03:01:44 2010 +0000
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="4"/>
+ <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -49,18 +49,30 @@
<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="IBUIImageView" id="91331182">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 20}, {240, 94}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <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">title.png</string>
+ </object>
+ </object>
<object class="IBUIButton" id="685977989">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{223, 46}, {232, 61}}</string>
+ <string key="NSFrame">{{240, 145}, {220, 52}}</string>
<reference key="NSSuperview" ref="191373211"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@@ -95,7 +107,7 @@
<object class="IBUIButton" id="1049354127">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{199, 130}, {232, 61}}</string>
+ <string key="NSFrame">{{240, 241}, {220, 52}}</string>
<reference key="NSSuperview" ref="191373211"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@@ -120,7 +132,7 @@
<object class="IBUIButton" id="995155642">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{223, 213}, {232, 61}}</string>
+ <string key="NSFrame">{{28, 194}, {220, 52}}</string>
<reference key="NSSuperview" ref="191373211"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@@ -145,7 +157,7 @@
<object class="IBUILabel" id="168836711">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{44, 384}, {232, 21}}</string>
+ <string key="NSFrame">{{268, 26}, {199, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -165,6 +177,27 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">2</int>
</object>
+ <object class="IBUIButton" id="295111341">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{352, 55}, {59, 52}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <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">settingsButton.png</string>
+ </object>
+ </object>
</object>
<string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview"/>
@@ -183,30 +216,6 @@
<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"/>
@@ -241,6 +250,15 @@
</object>
<int key="connectionID">17</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">switchViews:</string>
+ <reference key="source" ref="295111341"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">20</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -257,10 +275,12 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="478425539"/>
- <reference ref="168836711"/>
- <reference ref="685977989"/>
<reference ref="1049354127"/>
<reference ref="995155642"/>
+ <reference ref="91331182"/>
+ <reference ref="685977989"/>
+ <reference ref="168836711"/>
+ <reference ref="295111341"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -300,6 +320,16 @@
<reference key="object" ref="168836711"/>
<reference key="parent" ref="191373211"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">18</int>
+ <reference key="object" ref="91331182"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">19</int>
+ <reference key="object" ref="295111341"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -311,6 +341,8 @@
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
<string>13.IBPluginDependency</string>
+ <string>18.IBPluginDependency</string>
+ <string>19.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
@@ -320,7 +352,9 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MainMenuViewController</string>
<string>UIResponder</string>
- <string>{{493, 614}, {480, 320}}</string>
+ <string>{{577, 514}, {480, 320}}</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>
@@ -345,7 +379,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">17</int>
+ <int key="maxID">20</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -359,27 +393,25 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>notYetImplemented</string>
<string>startPlaying</string>
+ <string>switchViews:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</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>settingsViewController</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>SettingsViewController</string>
<string>UILabel</string>
</object>
</object>
@@ -388,6 +420,54 @@
<string key="minorKey">../../../hedge.build/trunk/cocoaTouch/MainMenuViewController.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SettingsViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>backgroundTap:</string>
+ <string>deleteData:</string>
+ <string>sliderChanged:</string>
+ <string>textFieldDoneEditing:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>buttonContainer</string>
+ <string>password</string>
+ <string>table</string>
+ <string>username</string>
+ <string>volumeCell</string>
+ <string>volumeLabel</string>
+ <string>volumeSlider</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UIView</string>
+ <string>UITextField</string>
+ <string>UITableView</string>
+ <string>UITextField</string>
+ <string>UITableViewCell</string>
+ <string>UILabel</string>
+ <string>UISlider</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SettingsViewController.h</string>
+ </object>
+ </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -562,6 +642,14 @@
<reference key="sourceIdentifier" ref="238583711"/>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UISearchBar</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -578,14 +666,43 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIView</string>
+ <string key="className">UISlider</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableViewCell</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableViewCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITextField</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="533623865">
+ <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIView</string>
+ <reference key="sourceIdentifier" ref="533623865"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
<string key="superclassName">UIResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
diff -r f860f27028cc -r 03df0573a9fd cocoaTouch/MainWindow.xib
--- a/cocoaTouch/MainWindow.xib Mon Feb 01 22:01:35 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,489 +0,0 @@
-<?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>
- </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="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- </object>
- <object class="IBProxyObject" id="427554174">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- </object>
- <object class="IBUICustomObject" id="664661524"/>
- <object class="IBUIWindow" id="380026005">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">1316</int>
- <object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrameSize">{480, 320}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- </object>
- <object class="IBUIViewController" id="402149676">
- <string key="IBUINibName">MainMenuViewController</string>
- <bool key="IBUIHorizontal">YES</bool>
- </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">delegate</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="664661524"/>
- </object>
- <int key="connectionID">4</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">uiwindow</string>
- <reference key="source" ref="664661524"/>
- <reference key="destination" ref="380026005"/>
- </object>
- <int key="connectionID">25</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">viewController</string>
- <reference key="source" ref="664661524"/>
- <reference key="destination" ref="402149676"/>
- </object>
- <int key="connectionID">28</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">2</int>
- <reference key="object" ref="380026005"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object" ref="664661524"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="427554174"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">26</int>
- <reference key="object" ref="402149676"/>
- <reference key="parent" ref="0"/>
- </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>2.IBAttributePlaceholdersKey</string>
- <string>2.IBEditorWindowLastContentRect</string>
- <string>2.IBPluginDependency</string>
- <string>26.CustomClassName</string>
- <string>26.IBEditorWindowLastContentRect</string>
- <string>26.IBPluginDependency</string>
- <string>3.CustomClassName</string>
- <string>3.IBPluginDependency</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UIApplication</string>
- <string>UIResponder</string>
- <object class="NSMutableDictionary">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <string>{{530, 261}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>MainMenuViewController</string>
- <string>{{349, 679}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>SDLUIKitDelegate</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">28</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">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>notYetImplemented</string>
- <string>startPlaying</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- </object>
- </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 class="IBPartialClassDescription">
- <string key="className">SDLUIKitDelegate</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>uiwindow</string>
- <string>viewController</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UIWindow</string>
- <string>UIViewController</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.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="186590129">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIApplication</string>
- <string key="superclassName">UIResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIApplication.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">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="186590129"/>
- </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 class="IBPartialClassDescription">
- <string key="className">UIWindow</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIWindow.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="3100" 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 f860f27028cc -r 03df0573a9fd cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Mon Feb 01 22:01:35 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Wed Feb 03 03:01:44 2010 +0000
@@ -22,17 +22,18 @@
#import <UIKit/UIKit.h>
#import "SDL_video.h"
+#import "MainMenuViewController.h"
@interface SDLUIKitDelegate:NSObject <UIApplicationDelegate> {
SDL_Window *window;
UIWindow *uiwindow;
- UIViewController *viewController;
+ MainMenuViewController *viewController;
}
// the outlets are set in MainWindow.xib
@property (readwrite, assign) SDL_Window *window;
-@property (readwrite, retain) IBOutlet UIWindow *uiwindow;
-@property (nonatomic, retain) IBOutlet UIViewController *viewController;
+@property (readwrite, retain) UIWindow *uiwindow;
+@property (nonatomic, retain) MainMenuViewController *viewController;
+(SDLUIKitDelegate *)sharedAppDelegate;
-(NSString *)dataFilePath:(NSString *)fileName;
diff -r f860f27028cc -r 03df0573a9fd cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Mon Feb 01 22:01:35 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Feb 03 03:01:44 2010 +0000
@@ -80,9 +80,8 @@
// remove the current view to free resources
[UIView beginAnimations:@"removing main controller" context:NULL];
[UIView setAnimationDuration:1];
- viewController.view.alpha = 0;
+ self.viewController.view.alpha = 0;
[UIView commitAnimations];
- [viewController.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1];
NSLog(@"Game is launching...");
const char **gameArgs = [setup getSettings];
@@ -96,14 +95,14 @@
[setup release];
+ [uiwindow addSubview: viewController.view];
+ [uiwindow makeKeyAndVisible];
+
[UIView beginAnimations:@"inserting main controller" context:NULL];
[UIView setAnimationDuration:1];
- viewController.view.alpha = 1;
+ self.viewController.view.alpha = 1;
[UIView commitAnimations];
- [uiwindow addSubview: viewController.view];
- [uiwindow makeKeyAndVisible];
-
[internal_pool release];
}
@@ -151,20 +150,23 @@
#pragma mark -
#pragma mark SDLUIKitDelegate methods
-
-
// override the direct execution of SDL_main to allow us to implement the frontend (even using a nib)
-(void) applicationDidFinishLaunching:(UIApplication *)application {
[application setStatusBarHidden:YES animated:NO];
[application setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO];
+
+ self.uiwindow = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+ self.uiwindow.backgroundColor = [UIColor blackColor];
- [self checkFirstRun];
+ self.viewController = [[MainMenuViewController alloc] initWithNibName:@"MainMenuViewController" bundle:nil];
/* Set working directory to resource path */
[[NSFileManager defaultManager] changeCurrentDirectoryPath: [[NSBundle mainBundle] resourcePath]];
[uiwindow addSubview:viewController.view];
[uiwindow makeKeyAndVisible];
+ [uiwindow layoutSubviews];
+ [self checkFirstRun];
}
-(void) applicationWillTerminate:(UIApplication *)application {
diff -r f860f27028cc -r 03df0573a9fd cocoaTouch/SDLOverrides/SDL_uikitview.m
--- a/cocoaTouch/SDLOverrides/SDL_uikitview.m Mon Feb 01 22:01:35 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitview.m Wed Feb 03 03:01:44 2010 +0000
@@ -93,13 +93,11 @@
void IPH_showControls (void) {
NSLog(@"Showing controls");
- /*
[UIView beginAnimations:nil context:NULL];
[UIView setAnimationDuration:0.5];
attackButton.frame = CGRectMake(30, 430, 260, 50);
menuButton.frame = CGRectMake(0, 430, 30, 50);
[UIView commitAnimations];
- */
}
#pragma mark -
@@ -114,7 +112,7 @@
#pragma mark -
#pragma mark Custom SDL_UIView input handling
-#define kMinimumPinchDelta 30
+#define kMinimumPinchDelta 40
#define kMinimumGestureLength 10
#define kMaximumVariance 3
diff -r f860f27028cc -r 03df0573a9fd cocoaTouch/SettingsViewController.m
--- a/cocoaTouch/SettingsViewController.m Mon Feb 01 22:01:35 2010 +0000
+++ b/cocoaTouch/SettingsViewController.m Wed Feb 03 03:01:44 2010 +0000
@@ -118,13 +118,13 @@
[buttonContainer release];
[super dealloc];
}
-/*
+
// Override to allow orientations other than the default portrait orientation.
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
// Return YES for supported orientations
- return (interfaceOrientation == UIInterfaceOrientationPortrait);
+ return (interfaceOrientation == UIInterfaceOrientationLandscapeLeft);
}
-*/
+
// makes the keyboard go away when background is tapped
-(IBAction) backgroundTap: (id)sender {
@@ -163,6 +163,7 @@
#pragma mark -
#pragma mark UIActionSheet Methods
-(IBAction) deleteData: (id)sender {
+ /* temporary commented out
UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"")
delegate:self
cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"")
@@ -170,6 +171,15 @@
otherButtonTitles:nil];
[actionSheet showInView:self.view];
[actionSheet release];
+ */
+ [UIView beginAnimations:@"Get Back" context:NULL];
+ [UIView setAnimationDuration:3];
+ [UIView setAnimationDuration:UIViewAnimationCurveEaseOut];
+
+ self.view.frame = CGRectMake(0, -480, 480, 320);
+ [UIView commitAnimations];
+
+ [self.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:2];
}
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex {
diff -r f860f27028cc -r 03df0573a9fd cocoaTouch/SettingsViewController.xib
--- a/cocoaTouch/SettingsViewController.xib Mon Feb 01 22:01:35 2010 +0000
+++ b/cocoaTouch/SettingsViewController.xib Wed Feb 03 03:01:44 2010 +0000
@@ -12,6 +12,8 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ <integer value="44"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -88,27 +90,27 @@
</object>
</object>
<object class="IBUIView" id="191373211">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIImageView" id="411150667">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
- <string key="NSFrameSize">{320, 431}</string>
+ <string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview" ref="191373211"/>
<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>
+ <string key="NSResourceName">background.png</string>
</object>
</object>
<object class="IBUITableView" id="179734732">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
- <string key="NSFrame">{{0, 18}, {320, 393}}</string>
+ <string key="NSFrame">{{0, 20}, {480, 280}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -124,12 +126,12 @@
<float key="IBUISectionFooterHeight">10</float>
</object>
</object>
- <string key="NSFrameSize">{320, 431}</string>
- <object class="NSColor" key="IBUIBackgroundColor" id="458252179">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor" id="771941710">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
- <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
</object>
<object class="IBUITableViewCell" id="45589474">
<nil key="NSNextResponder"/>
@@ -187,10 +189,7 @@
<double key="NSSize">17</double>
<int key="NSfFlags">16</int>
</object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
+ <reference key="IBUITextColor" ref="771941710"/>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
@@ -225,9 +224,8 @@
<object class="IBUIButton" id="227113826">
<reference key="NSNextResponder" ref="399248671"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 38}, {280, 50}}</string>
+ <string key="NSFrame">{{100, 39}, {280, 50}}</string>
<reference key="NSSuperview" ref="399248671"/>
- <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -239,7 +237,10 @@
</object>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">Erase All Data</string>
- <reference key="IBUIHighlightedTitleColor" ref="458252179"/>
+ <object class="NSColor" key="IBUIHighlightedTitleColor">
+ <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>
@@ -250,9 +251,8 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{320, 100}</string>
+ <string key="NSFrameSize">{480, 100}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@@ -522,7 +522,7 @@
<string>SettingsViewController</string>
<string>UIResponder</string>
<string>UIControl</string>
- <string>{{556, 412}, {320, 480}}</string>
+ <string>{{476, 492}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -532,7 +532,7 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>{{1352, 334}, {220, 50}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>{{734, 817}, {320, 100}}</string>
+ <string>{{476, 500}, {480, 100}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>