--- a/project_files/HedgewarsMobile/Classes/AboutViewController.h Sun Aug 22 22:08:39 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.h Mon Aug 23 00:46:06 2010 +0200
@@ -13,4 +13,6 @@
}
+-(IBAction) buttonPressed:(id) sender;
+
@end
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.m Sun Aug 22 22:08:39 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Mon Aug 23 00:46:06 2010 +0200
@@ -38,5 +38,8 @@
[super dealloc];
}
+-(IBAction) buttonPressed:(id) sender {
+ [[self parentViewController] dismissModalViewControllerAnimated:YES];
+}
@end
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.xib Sun Aug 22 22:08:39 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.xib Mon Aug 23 00:46:06 2010 +0200
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
+ <integer value="7"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -61,16 +61,35 @@
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
</object>
+ <object class="IBUINavigationBar" id="241300702">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrameSize">{320, 44}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <object class="NSArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUINavigationItem" id="824792699">
+ <reference key="IBUINavigationBar" ref="241300702"/>
+ <string key="IBUITitle">About...</string>
+ <object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="322694234">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUINavigationItem" ref="824792699"/>
+ <int key="IBUISystemItemIdentifier">0</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ </object>
+ </object>
</object>
<string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace">
- <int key="NSID">2</int>
- </object>
</object>
+ <bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="interfaceOrientation">3</int>
@@ -89,6 +108,14 @@
</object>
<int key="connectionID">3</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">buttonPressed:</string>
+ <reference key="source" ref="322694234"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">8</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -116,6 +143,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="712969491"/>
+ <reference ref="241300702"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -124,6 +152,29 @@
<reference key="object" ref="712969491"/>
<reference key="parent" ref="766721923"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="241300702"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="824792699"/>
+ </object>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="824792699"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="322694234"/>
+ </object>
+ <reference key="parent" ref="241300702"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="322694234"/>
+ <reference key="parent" ref="824792699"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -135,12 +186,18 @@
<string>2.IBEditorWindowLastContentRect</string>
<string>2.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
+ <string>5.IBPluginDependency</string>
+ <string>6.IBPluginDependency</string>
+ <string>7.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>AboutViewController</string>
<string>UIResponder</string>
- <string>{{275, 444}, {320, 480}}</string>
+ <string>{{932, 318}, {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>
</object>
@@ -161,7 +218,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">4</int>
+ <int key="maxID">8</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -169,6 +226,17 @@
<object class="IBPartialClassDescription">
<string key="className">AboutViewController</string>
<string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">buttonPressed:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">buttonPressed:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">buttonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/AboutViewController.h</string>
@@ -283,6 +351,22 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIBarButtonItem</string>
+ <string key="superclassName">UIBarItem</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarItem</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UILabel</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -291,6 +375,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UINavigationBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="802309264">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UINavigationItem</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="802309264"/>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UIResponder</string>
<string key="superclassName">NSObject</string>
<reference key="sourceIdentifier" ref="786211723"/>
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sun Aug 22 22:08:39 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Mon Aug 23 00:46:06 2010 +0200
@@ -176,6 +176,7 @@
case 2:
if (nil == self.settingsViewController) {
SplitViewRootController *svrc = [[SplitViewRootController alloc] initWithNibName:nil bundle:nil];
+ svrc.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
self.settingsViewController = svrc;
[svrc release];
}
@@ -185,7 +186,8 @@
case 3:
if (nil == self.aboutViewController) {
AboutViewController *about = [[AboutViewController alloc] initWithNibName:@"AboutViewController" bundle:nil];
- about.modalTransitionStyle = UIModalPresentationFormSheet;
+ about.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
+ about.modalPresentationStyle = UIModalPresentationFormSheet;
self.aboutViewController = about;
[about release];
}
@@ -219,7 +221,7 @@
}
}
-// allows child controllers to return to the main controller
+// must be kept for compatibility with the settings page
-(void) dismissModalViewController {
[self dismissModalViewControllerAnimated:YES];
}
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Sun Aug 22 22:08:39 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Mon Aug 23 00:46:06 2010 +0200
@@ -26,6 +26,7 @@
-(void) viewDidLoad {
[super viewDidLoad];
+ // title, description, image name (+btn)
NSArray *mods = [[NSArray alloc] initWithObjects:
[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Fort Mode",@""),@"title",
NSLocalizedString(@"Defend your fort and destroy the opponents (two team colours max)",@""),@"description",
@@ -85,6 +86,7 @@
self.gameModifierArray = mods;
[mods release];
+ // title, image name (+icon), default value, max value, min value
NSArray *basicSettings = [[NSArray alloc] initWithObjects:
[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Damage Modifier",@""),@"title",@"Damage",@"image",
[NSNumber numberWithInt:100],@"default",[NSNumber numberWithInt:10],@"min",[NSNumber numberWithInt:300],@"max",nil],