# HG changeset patch
# User koda
# Date 1318207801 -7200
# Node ID 485cfecadc9aa72cb2d30c9700781317744577a6
# Parent 443cce9e060f317fd62b4174cc147dd32a25fc4f
HUGE refactoring of the ipad interface, finally understood how to use interface builder with custom uiviewcontrollers, as well as converted some uitableviewcontrollers to uiviewcontrollers for simplicity
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib Mon Oct 10 02:50:01 2011 +0200
@@ -0,0 +1,1105 @@
+
+
+
+ 1056
+ 10K549
+ 823
+ 1038.36
+ 461.00
+
+
+
+
+
+
+
+ 0
+ IBIPadFramework
+
+
+ YES
+ ../Hedgewars.xcodeproj
+ 3
+
+ 132
+
+
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/GameConfigViewController-iPhone.xib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPhone.xib Mon Oct 10 02:50:01 2011 +0200
@@ -0,0 +1,608 @@
+
+
+
+ 1056
+ 10K540
+ 823
+ 1038.36
+ 461.00
+
+
+
+
+
+
+
+ 0
+ IBCocoaTouchFramework
+
+
+ YES
+ ../Hedgewars.xcodeproj
+ 3
+ 132
+
+
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/GameConfigViewController.h
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Sun Oct 09 20:03:04 2011 -0400
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Mon Oct 10 02:50:01 2011 +0200
@@ -21,28 +21,25 @@
#import
-@class HelpPageViewController;
-@class MapConfigViewController;
+@class SchemeWeaponConfigViewController;
@class TeamConfigViewController;
-@class SchemeWeaponConfigViewController;
-@class GameInterfaceBridge;
+@class MapConfigViewController;
+@class HelpPageViewController;
@interface GameConfigViewController : UIViewController {
UIView *imgContainer;
- HelpPageViewController *helpPage;
-
+
+ SchemeWeaponConfigViewController *schemeWeaponConfigViewController;
+ TeamConfigViewController *teamConfigViewController;
MapConfigViewController *mapConfigViewController;
- TeamConfigViewController *teamConfigViewController;
- SchemeWeaponConfigViewController *schemeWeaponConfigViewController;
- GameInterfaceBridge *interfaceBridge;
+ HelpPageViewController *helpPage;
}
@property (retain) UIView *imgContainer;
+@property (nonatomic,retain) IBOutlet SchemeWeaponConfigViewController *schemeWeaponConfigViewController;
+@property (nonatomic,retain) IBOutlet TeamConfigViewController *teamConfigViewController;
+@property (nonatomic,retain) IBOutlet MapConfigViewController *mapConfigViewController;
@property (nonatomic,retain) HelpPageViewController *helpPage;
-@property (nonatomic,retain) MapConfigViewController *mapConfigViewController;
-@property (nonatomic,retain) TeamConfigViewController *teamConfigViewController;
-@property (nonatomic,retain) SchemeWeaponConfigViewController *schemeWeaponConfigViewController;
-@property (nonatomic,retain) GameInterfaceBridge *interfaceBridge;
-(IBAction) buttonPressed:(id) sender;
-(IBAction) segmentPressed:(id) sender;
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/GameConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Oct 09 20:03:04 2011 -0400
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Oct 10 02:50:01 2011 +0200
@@ -28,13 +28,26 @@
@implementation GameConfigViewController
-@synthesize imgContainer, helpPage, mapConfigViewController, teamConfigViewController, schemeWeaponConfigViewController, interfaceBridge;
+@synthesize imgContainer, helpPage, mapConfigViewController, teamConfigViewController, schemeWeaponConfigViewController;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
return rotationManager(interfaceOrientation);
}
+/*
+-(MapConfigViewController *)mapConfigViewController {
+ if (mapConfigViewController == nil) {
+ NSString *xib = IS_IPAD() ? @"MapConfigViewController-iPad" : @"MapConfigViewController-iPhone";
+ MapConfigViewController *mcvc = [[MapConfigViewController alloc] initWithNibName:xib bundle:nil];
+ [self.view addSubview:mcvc.view];
+ self.mapConfigViewController = mcvc;
+ [mcvc release];
+ }
+ return mapConfigViewController;
+}
+*/
+
-(IBAction) buttonPressed:(id) sender {
UIButton *theButton = (UIButton *)sender;
@@ -84,28 +97,20 @@
}
-(IBAction) segmentPressed:(id) sender {
+/*
UISegmentedControl *theSegment = (UISegmentedControl *)sender;
[AudioManagerController playSelectSound];
switch (theSegment.selectedSegmentIndex) {
case 0:
- // this init here is just aestetic as this controller was already set up in viewDidLoad
- if (mapConfigViewController == nil) {
- mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPhone" bundle:nil];
- [self.view addSubview:mapConfigViewController.view];
- }
// this message is compulsory otherwise the table won't be loaded at all
- [mapConfigViewController viewWillAppear:NO];
- [self.view bringSubviewToFront:mapConfigViewController.view];
+ [self.mapConfigViewController viewWillAppear:NO];
+ [self.view bringSubviewToFront:self.mapConfigViewController.view];
break;
case 1:
- if (teamConfigViewController == nil) {
- teamConfigViewController = [[TeamConfigViewController alloc] initWithStyle:UITableViewStyleGrouped];
- [self.view addSubview:teamConfigViewController.view];
- }
// this message is compulsory otherwise the table won't be loaded at all
- [teamConfigViewController viewWillAppear:NO];
- [self.view bringSubviewToFront:teamConfigViewController.view];
+ [self.teamConfigViewController viewWillAppear:NO];
+ [self.view bringSubviewToFront:self.teamConfigViewController.view];
break;
case 2:
if (schemeWeaponConfigViewController == nil) {
@@ -129,6 +134,7 @@
DLog(@"Nope");
break;
}
+*/
}
-(BOOL) isEverythingSet {
@@ -234,12 +240,9 @@
script,@"mission_command",
nil];
- if (self.interfaceBridge == nil) {
- GameInterfaceBridge *bridge = [[GameInterfaceBridge alloc] initWithController:self];
- self.interfaceBridge = bridge;
- [bridge release];
- }
- [self.interfaceBridge startLocalGame:gameDictionary];
+ GameInterfaceBridge *bridge = [[GameInterfaceBridge alloc] initWithController:self];
+ [bridge startLocalGame:gameDictionary];
+ [bridge release];
}
-(void) loadNiceHogs {
@@ -300,48 +303,26 @@
self.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width);
if (IS_IPAD()) {
- // load other controllers and the background
- if (self.mapConfigViewController == nil)
- self.mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPad" bundle:nil];
+ // the label for the filter slider
+ UILabel *filterLabel = [[UILabel alloc] initWithFrame:CGRectMake(116, 714, 310, 40)
+ andTitle:nil
+ withBorderWidth:2.0f];
+ [self.view insertSubview:filterLabel belowSubview:self.mapConfigViewController.slider];
+ [filterLabel release];
- UILabel *theLabel;
- // top right column (map)
- theLabel = [[UILabel alloc] initWithFrame:CGRectMake(714, 14, 300, 190) andTitle:nil withBorderWidth:2.3f];
- [self.mapConfigViewController.view addSubview:theLabel];
- releaseAndNil(theLabel);
- // bottom left
- theLabel = [[UILabel alloc] initWithFrame:CGRectMake(116, 714, 310, 40) andTitle:nil withBorderWidth:2.0f];
- [self.mapConfigViewController.view addSubview:theLabel];
- releaseAndNil(theLabel);
- // bottom right
- theLabel = [[UILabel alloc] initWithFrame:CGRectMake(598, 714, 310, 40)
- andTitle:NSLocalizedString(@" Max Hogs:",@"")
- withBorderWidth:2.0f];
- theLabel.font = [UIFont italicSystemFontOfSize:[UIFont labelFontSize]];
- theLabel.textColor = [UIColor whiteColor];
- theLabel.textAlignment = UITextAlignmentLeft;
- [self.mapConfigViewController.view addSubview:theLabel];
- releaseAndNil(theLabel);
+ // the label for max hogs
+ UILabel *maxLabel = [[UILabel alloc] initWithFrame:CGRectMake(598, 714, 310, 40)
+ andTitle:NSLocalizedString(@"Loading...",@"")
+ withBorderWidth:2.0f];
+ maxLabel.font = [UIFont italicSystemFontOfSize:[UIFont labelFontSize]];
+ maxLabel.textColor = [UIColor whiteColor];
+ maxLabel.textAlignment = UITextAlignmentCenter;
+ [self.view addSubview:maxLabel];
+ self.mapConfigViewController.maxLabel = maxLabel;
+ [maxLabel release];
- [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.maxLabel];
- [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.sizeLabel];
- [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.segmentedControl];
- [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.previewButton];
- [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.slider];
- [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.tableView];
-
- if (self.teamConfigViewController == nil)
- self.teamConfigViewController = [[TeamConfigViewController alloc] initWithStyle:UITableViewStyleGrouped];
- [self.mapConfigViewController.view addSubview:self.teamConfigViewController.view];
- if (self.schemeWeaponConfigViewController == nil)
- self.schemeWeaponConfigViewController = [[SchemeWeaponConfigViewController alloc] initWithStyle:UITableViewStyleGrouped];
- [self.mapConfigViewController.view addSubview:schemeWeaponConfigViewController.view];
-
- self.mapConfigViewController.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width);
- self.schemeWeaponConfigViewController.view.frame = CGRectMake(0, 60, 320, 620);
- self.teamConfigViewController.view.frame = CGRectMake(337, 187, 350, 505);
-
- self.mapConfigViewController.parentController = self;
+ // as this is loaded from a NIB we need to set its size and position
+ self.mapConfigViewController.view.frame = CGRectMake(704, 0, 320, 680);
} else {
// this is the visible controller
if (self.mapConfigViewController == nil)
@@ -351,7 +332,6 @@
[self.view addSubview:self.schemeWeaponConfigViewController.view];
}
[self.view addSubview:self.mapConfigViewController.view];
- self.mapConfigViewController.externalController = schemeWeaponConfigViewController;
[super viewDidLoad];
}
@@ -390,28 +370,25 @@
}
-(void) didReceiveMemoryWarning {
+ self.imgContainer = nil;
+
+ if (self.mapConfigViewController.view.superview == nil)
+ self.mapConfigViewController = nil;
if (self.teamConfigViewController.view.superview == nil)
self.teamConfigViewController = nil;
if (self.schemeWeaponConfigViewController.view.superview == nil)
self.schemeWeaponConfigViewController = nil;
if (self.helpPage.view.superview == nil)
self.helpPage = nil;
- if (self.mapConfigViewController.view.superview == nil)
- self.mapConfigViewController = nil;
-
- self.imgContainer = nil;
- // don't nil this one or it won't be able to send messages
- //self.interfaceBridge = nil;
MSG_MEMCLEAN();
[super didReceiveMemoryWarning];
}
-(void) viewDidUnload {
self.imgContainer = nil;
- self.interfaceBridge = nil;
+ self.schemeWeaponConfigViewController = nil;
+ self.teamConfigViewController = nil;
self.mapConfigViewController = nil;
- self.teamConfigViewController = nil;
- self.schemeWeaponConfigViewController = nil;
self.helpPage = nil;
MSG_DIDUNLOAD();
[super viewDidUnload];
@@ -419,10 +396,9 @@
-(void) dealloc {
releaseAndNil(imgContainer);
- releaseAndNil(interfaceBridge);
+ releaseAndNil(schemeWeaponConfigViewController);
+ releaseAndNil(teamConfigViewController);
releaseAndNil(mapConfigViewController);
- releaseAndNil(teamConfigViewController);
- releaseAndNil(schemeWeaponConfigViewController);
releaseAndNil(helpPage);
[super dealloc];
}
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/GameConfigViewController.xib
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.xib Sun Oct 09 20:03:04 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,608 +0,0 @@
-
-
-
- 1056
- 10K540
- 823
- 1038.36
- 461.00
-
-
-
-
-
-
-
- 0
- IBCocoaTouchFramework
-
-
- YES
- ../Hedgewars.xcodeproj
- 3
- 132
-
-
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/HoldTableViewCell.h
--- a/project_files/HedgewarsMobile/Classes/HoldTableViewCell.h Sun Oct 09 20:03:04 2011 -0400
+++ b/project_files/HedgewarsMobile/Classes/HoldTableViewCell.h Mon Oct 10 02:50:01 2011 +0200
@@ -23,7 +23,7 @@
@protocol HoldTableViewCellDelegate
--(void) holdAction:(NSString *)content;
+-(void) holdAction:(NSString *)content onTable:(UITableView *)aTableView;
@end
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/HoldTableViewCell.m
--- a/project_files/HedgewarsMobile/Classes/HoldTableViewCell.m Sun Oct 09 20:03:04 2011 -0400
+++ b/project_files/HedgewarsMobile/Classes/HoldTableViewCell.m Mon Oct 10 02:50:01 2011 +0200
@@ -58,8 +58,8 @@
}
-(void) holdAction {
- if (self.delegate != nil && [self.delegate respondsToSelector:@selector(holdAction:)])
- [self.delegate holdAction:self.textLabel.text];
+ if (self.delegate != nil && [self.delegate respondsToSelector:@selector(holdAction:onTable:)])
+ [self.delegate holdAction:self.textLabel.text onTable:(UITableView *)self.superview];
}
-(void) dealloc {
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/MainMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sun Oct 09 20:03:04 2011 -0400
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Mon Oct 10 02:50:01 2011 +0200
@@ -151,7 +151,7 @@
switch (button.tag) {
case 0:
if (nil == self.gameConfigViewController) {
- xib = IS_IPAD() ? nil : @"GameConfigViewController";
+ xib = IS_IPAD() ? @"GameConfigViewController-iPad" : @"GameConfigViewController-iPhone";
GameConfigViewController *gcvc = [[GameConfigViewController alloc] initWithNibName:xib bundle:nil];
gcvc.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
diff -r 443cce9e060f -r 485cfecadc9a project_files/HedgewarsMobile/Classes/MapConfigViewController-iPad.xib
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPad.xib Sun Oct 09 20:03:04 2011 -0400
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPad.xib Mon Oct 10 02:50:01 2011 +0200
@@ -42,23 +42,10 @@
274
-
-
-
-
- {1024, 768}
+ {320, 768}
-
+
+ NO
+ YES
@@ -305,40 +138,6 @@
-
-
-
-
- 122
+ 126