--- a/project_files/HedgewarsMobile/Classes/ExtraCategories.h Sat Feb 18 16:56:04 2012 +0100
+++ b/project_files/HedgewarsMobile/Classes/ExtraCategories.h Sat Feb 18 19:33:48 2012 +0100
@@ -48,12 +48,19 @@
@end
+@interface UIButton (quickStyle)
+
+-(id) initWithFrame:(CGRect) frame andTitle:(NSString *)title;
+
+@end
+
+
@interface UILabel (quickStyle)
--(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title;
--(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth;
--(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth
- withBorderColor:(UIColor *)borderColor withBackgroundColor:(UIColor *)backColor;
+-(id) initWithFrame:(CGRect)frame andTitle:(NSString *)title;
+-(id) initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth;
+-(id) initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth
+ withBorderColor:(UIColor *)borderColor withBackgroundColor:(UIColor *)backColor;
@end
--- a/project_files/HedgewarsMobile/Classes/ExtraCategories.m Sat Feb 18 16:56:04 2012 +0100
+++ b/project_files/HedgewarsMobile/Classes/ExtraCategories.m Sat Feb 18 19:33:48 2012 +0100
@@ -96,9 +96,31 @@
#pragma mark -
+@implementation UIButton (quickStyle)
+
+-(id) initWithFrame:(CGRect) frame andTitle:(NSString *)title {
+ [self initWithFrame:frame];
+ [self setTitle:title forState:UIControlStateNormal];
+ [self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+ [self setTitleColor:[UIColor grayColor] forState:UIControlStateHighlighted];
+ self.titleLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
+ self.backgroundColor = [UIColor blackColorTransparent];
+
+ [self.layer setBorderWidth:1];
+ [self.layer setBorderColor:[[UIColor darkYellowColor] CGColor]];
+ [self.layer setCornerRadius:9.0f];
+ [self.layer setMasksToBounds:YES];
+
+ return self;
+}
+
+@end
+
+
+#pragma mark -
@implementation UILabel (quickStyle)
--(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title {
+-(id) initWithFrame:(CGRect)frame andTitle:(NSString *)title {
return [self initWithFrame:frame
andTitle:title
withBorderWidth:1.5f
@@ -106,7 +128,7 @@
withBackgroundColor:[UIColor darkBlueColor]];
}
--(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth {
+-(id) initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth {
return [self initWithFrame:frame
andTitle:title
withBorderWidth:borderWidth
@@ -114,8 +136,8 @@
withBackgroundColor:[UIColor darkBlueColorTransparent]];
}
--(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth
- withBorderColor:(UIColor *)borderColor withBackgroundColor:(UIColor *)backColor{
+-(id) initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth
+ withBorderColor:(UIColor *)borderColor withBackgroundColor:(UIColor *)backColor {
UILabel *theLabel = [self initWithFrame:frame];
theLabel.backgroundColor = backColor;
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib Sat Feb 18 16:56:04 2012 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib Sat Feb 18 19:33:48 2012 +0100
@@ -12,6 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -46,7 +47,6 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
<bool key="IBUIAutoresizesSubviews">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -61,7 +61,6 @@
<int key="NSvFlags">301</int>
<string key="NSFrame">{{357, 17}, {309, 165}}</string>
<reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -75,7 +74,6 @@
<int key="NSvFlags">301</int>
<string key="NSFrame">{{441, 702}, {142, 64}}</string>
<reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">1</int>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -108,7 +106,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 693}, {64, 64}}</string>
<reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -130,7 +127,6 @@
<int key="NSvFlags">265</int>
<string key="NSFrame">{{940, 693}, {64, 64}}</string>
<reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">2</int>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -153,7 +149,6 @@
<int key="NSvFlags">301</int>
<string key="NSFrame">{{0, 60}, {320, 620}}</string>
<reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
<object class="NSColor" key="IBUIBackgroundColor" id="720784738">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
@@ -167,7 +162,6 @@
<int key="NSvFlags">301</int>
<string key="NSFrame">{{337, 187}, {350, 505}}</string>
<reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
<reference key="IBUIBackgroundColor" ref="720784738"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -178,7 +172,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{269, 724}, {150, 23}}</string>
<reference key="NSSuperview" ref="766721923"/>
- <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -189,7 +182,6 @@
</object>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="IBUIBackgroundColor" ref="473179629"/>
<bool key="IBUIClipsSubviews">YES</bool>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
@@ -298,14 +290,6 @@
<int key="connectionID">57</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">slider</string>
- <reference key="source" ref="670598485"/>
- <reference key="destination" ref="1000322445"/>
- </object>
- <int key="connectionID">61</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">sliderChanged:</string>
<reference key="source" ref="1000322445"/>
@@ -331,6 +315,14 @@
</object>
<int key="connectionID">68</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">slider</string>
+ <reference key="source" ref="670598485"/>
+ <reference key="destination" ref="1000322445"/>
+ </object>
+ <int key="connectionID">69</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -540,7 +532,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">68</int>
+ <int key="maxID">69</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -632,6 +624,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">MNEValueTrackingSlider</string>
+ <string key="superclassName">UISlider</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MNEValueTrackingSlider.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">MapConfigViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
@@ -695,7 +695,7 @@
<string>UILabel</string>
<string>MapPreviewButtonView</string>
<string>UISegmentedControl</string>
- <string>ValueTrackingSliderView</string>
+ <string>MNEValueTrackingSlider</string>
<string>UITableView</string>
</object>
</object>
@@ -725,7 +725,7 @@
</object>
<object class="IBToOneOutletInfo">
<string key="name">slider</string>
- <string key="candidateClassName">ValueTrackingSliderView</string>
+ <string key="candidateClassName">MNEValueTrackingSlider</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">tableView</string>
@@ -774,23 +774,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
+ <string key="className">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="106046383">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/ExtraCategories.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UITableView</string>
+ <string key="className">UILabel</string>
<reference key="sourceIdentifier" ref="106046383"/>
</object>
<object class="IBPartialClassDescription">
- <string key="className">ValueTrackingSliderView</string>
- <string key="superclassName">UISlider</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/MNEValueTrackingSlider.h</string>
- </object>
+ <string key="className">UITableView</string>
+ <reference key="sourceIdentifier" ref="106046383"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
--- a/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m Sat Feb 18 16:56:04 2012 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameInterfaceBridge.m Sat Feb 18 19:33:48 2012 +0100
@@ -91,7 +91,7 @@
// engine thread *should* be done by now
NSArray *stats = [[NSArray alloc] initWithArray:self.proto.statsArray copyItems:YES];
if ([HWUtils gameStatus] == gsEnded && stats != nil) {
- StatsPageViewController *statsPage = [[StatsPageViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ StatsPageViewController *statsPage = [[StatsPageViewController alloc] init];
statsPage.statsArray = stats;
statsPage.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
if ([statsPage respondsToSelector:@selector(setModalPresentationStyle:)])
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sat Feb 18 16:56:04 2012 +0100
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sat Feb 18 19:33:48 2012 +0100
@@ -12,6 +12,7 @@
</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>
@@ -37,7 +38,7 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="191373211">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -191,6 +192,7 @@
</object>
</object>
<string key="NSFrameSize">{480, 276}</string>
+ <reference key="NSSuperview"/>
<reference key="IBUIBackgroundColor" ref="437070330"/>
<object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
@@ -263,14 +265,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">slider</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="938256702"/>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
<reference key="source" ref="565214171"/>
<reference key="destination" ref="372490531"/>
@@ -310,6 +304,14 @@
</object>
<int key="connectionID">37</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">slider</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="938256702"/>
+ </object>
+ <int key="connectionID">38</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -454,12 +456,20 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">37</int>
+ <int key="maxID">38</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
+ <string key="className">MNEValueTrackingSlider</string>
+ <string key="superclassName">UISlider</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MNEValueTrackingSlider.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">MapConfigViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
@@ -523,7 +533,7 @@
<string>UILabel</string>
<string>MapPreviewButtonView</string>
<string>UISegmentedControl</string>
- <string>ValueTrackingSliderView</string>
+ <string>MNEValueTrackingSlider</string>
<string>UITableView</string>
</object>
</object>
@@ -553,7 +563,7 @@
</object>
<object class="IBToOneOutletInfo">
<string key="name">slider</string>
- <string key="candidateClassName">ValueTrackingSliderView</string>
+ <string key="candidateClassName">MNEValueTrackingSlider</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">tableView</string>
@@ -586,23 +596,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UILabel</string>
+ <string key="className">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="67684033">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/ExtraCategories.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UITableView</string>
+ <string key="className">UILabel</string>
<reference key="sourceIdentifier" ref="67684033"/>
</object>
<object class="IBPartialClassDescription">
- <string key="className">ValueTrackingSliderView</string>
- <string key="superclassName">UISlider</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/MNEValueTrackingSlider.h</string>
- </object>
+ <string key="className">UITableView</string>
+ <reference key="sourceIdentifier" ref="67684033"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
--- a/project_files/HedgewarsMobile/Classes/StatsPageViewController.h Sat Feb 18 16:56:04 2012 +0100
+++ b/project_files/HedgewarsMobile/Classes/StatsPageViewController.h Sat Feb 18 19:33:48 2012 +0100
@@ -21,7 +21,7 @@
#import <UIKit/UIKit.h>
-@interface StatsPageViewController : UITableViewController {
+@interface StatsPageViewController : UIViewController <UITableViewDelegate, UITableViewDataSource> {
NSArray *statsArray;
}
--- a/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Sat Feb 18 16:56:04 2012 +0100
+++ b/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Sat Feb 18 19:33:48 2012 +0100
@@ -20,7 +20,6 @@
#import "StatsPageViewController.h"
-#import <QuartzCore/QuartzCore.h>
@implementation StatsPageViewController
@synthesize statsArray;
@@ -30,7 +29,8 @@
}
-(void) viewDidLoad {
- [self.tableView setBackgroundColorForAnyTable:[UIColor clearColor]];
+ UITableView *aTableView = [[UITableView alloc] initWithFrame:self.view.frame style:UITableViewStyleGrouped];
+ [aTableView setBackgroundColorForAnyTable:[UIColor clearColor]];
NSString *imgName = (IS_IPAD()) ? @"mediumBackground~ipad.png" : @"smallerBackground~iphone.png";
UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgName];
@@ -41,8 +41,13 @@
[self.view insertSubview:background atIndex:0];
[background release];
- self.tableView.separatorColor = [UIColor darkYellowColor];
- self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ aTableView.separatorColor = [UIColor darkYellowColor];
+ aTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+ aTableView.delegate = self;
+ aTableView.dataSource = self;
+
+ [self.view addSubview:aTableView];
+ [aTableView release];
[super viewDidLoad];
}
@@ -53,7 +58,7 @@
return 3;
}
--(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+-(NSInteger) tableView:(UITableView *)aTableView numberOfRowsInSection:(NSInteger)section {
if (section == 0)
return 1;
else if (section == 1)
@@ -111,19 +116,19 @@
return cell;
}
--(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+-(CGFloat) tableView:(UITableView *)aTableView heightForHeaderInSection:(NSInteger)section {
return 160;
}
--(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+-(UIView *)tableView:(UITableView *)aTableView viewForHeaderInSection:(NSInteger)section {
if (section == 0) {
- UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 160)];
+ UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width, 160)];
header.autoresizingMask = UIViewAutoresizingFlexibleWidth;
UIImage *img = [[UIImage alloc] initWithContentsOfFile:@"smallerTitle.png"];
UIImageView *imgView = [[UIImageView alloc] initWithImage:img];
[img release];
- imgView.center = CGPointMake(self.tableView.frame.size.width/2, 160/2);
+ imgView.center = CGPointMake(aTableView.frame.size.width/2, 160/2);
imgView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
[header addSubview:imgView];
[imgView release];
@@ -133,27 +138,18 @@
return nil;
}
--(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
- return self.tableView.rowHeight + 30;
+-(CGFloat) tableView:(UITableView *)aTableView heightForFooterInSection:(NSInteger)section {
+ return aTableView.rowHeight + 30;
}
--(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+-(UIView *)tableView:(UITableView *)aTableView viewForFooterInSection:(NSInteger)section {
if (section == 2) {
- UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width * 70 / 100, self.tableView.rowHeight)];
+ UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width * 70 / 100, aTableView.rowHeight)];
footer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
- UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 17, self.view.frame.size.width * 70 / 100, self.tableView.rowHeight)];
+ UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, 17, self.view.frame.size.width * 70 / 100, aTableView.rowHeight)
+ andTitle:NSLocalizedString(@"Done",@"")];
button.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
- [button setTitle:NSLocalizedString(@"Done",@"") forState:UIControlStateNormal];
- [button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- [button setTitleColor:[UIColor grayColor] forState:UIControlStateHighlighted];
-
- button.titleLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
- button.backgroundColor = [UIColor blackColorTransparent];
- [button.layer setBorderWidth:1];
- [button.layer setBorderColor:[[UIColor darkYellowColor] CGColor]];
- [button.layer setCornerRadius:9.0f];
- [button.layer setMasksToBounds:YES];
[button addTarget:self action:@selector(dismissView) forControlEvents:UIControlEventTouchUpInside];
[footer addSubview:button];
[button release];