# HG changeset patch # User koda # Date 1270211916 0 # Node ID d5cd1a6171230ae854e493cc164bc57597834108 # Parent 74a506c9d71bbaadb4e010fa87a3760ee85be8be intial support for team configuration on the ifrontend diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Fri Apr 02 12:38:36 2010 +0000 @@ -124,7 +124,7 @@ SDL_SendQuit(); if (isInGame) { HW_terminate(YES); - // hack to prevent automatic termination. See SDL_uikitevents.m for details + // hack to prevent automatic termination. See SDL_uikitevents.m for details longjmp(*(jump_env()), 1); } } diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/DetailViewController.h --- a/cocoaTouch/iPad/DetailViewController.h Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/DetailViewController.h Fri Apr 02 12:38:36 2010 +0000 @@ -9,24 +9,15 @@ #import -@interface DetailViewController : UIViewController { +@interface DetailViewController : UITableViewController { UIPopoverController *popoverController; - UINavigationBar *navigationBar; - NSArray *optionList; - UITableView * table; + NSArray *controllers; id detailItem; - UILabel *test; } @property (nonatomic, retain) UIPopoverController *popoverController; -@property (nonatomic, retain) IBOutlet UINavigationBar *navigationBar; -@property (nonatomic, retain) IBOutlet UILabel *test; @property (nonatomic, retain) id detailItem; -@property (nonatomic, retain) NSArray *optionList; -@property (nonatomic, retain) IBOutlet UITableView *table; - --(IBAction) dismissSplitView; +@property (nonatomic, retain) NSArray * controllers; @end diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/DetailViewController.m --- a/cocoaTouch/iPad/DetailViewController.m Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/DetailViewController.m Fri Apr 02 12:38:36 2010 +0000 @@ -7,51 +7,44 @@ // #import "DetailViewController.h" - +#import "TeamSettingsViewController.h" @implementation DetailViewController -@synthesize navigationBar, popoverController, detailItem, test, optionList,table; - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ +@synthesize popoverController, detailItem, controllers; // Implement viewDidLoad to do additional setup after loading the view, typically from a nib. - (void)viewDidLoad { + self.title =@"First"; + NSMutableArray *array= [[NSMutableArray alloc] init]; + + TeamSettingsViewController *teamSettingsViewController = [[TeamSettingsViewController alloc] initWithStyle:UITableViewStylePlain]; + teamSettingsViewController.title =NSLocalizedString(@"Teams",@""); + [array addObject:teamSettingsViewController]; + [teamSettingsViewController release]; + + self.controllers = array; + [array release]; + [super viewDidLoad]; - optionList = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""), - NSLocalizedString(@"Teams",@""), - NSLocalizedString(@"Weapons",@""), - NSLocalizedString(@"Schemes",@""), - nil]; } - - (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 { + self.controllers = nil; + self.popoverController = nil; + self.detailItem = nil; [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; } - - (void)dealloc { - [optionList release]; - [navigationBar release]; + [controllers release]; [popoverController release]; [detailItem release]; [super dealloc]; @@ -59,14 +52,12 @@ #pragma mark - #pragma mark Table view data source - -(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { return 1; } - -(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [optionList count]; + return [controllers count]; } -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { @@ -74,28 +65,38 @@ UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; - cell.textLabel.text = [optionList objectAtIndex:[indexPath row]]; + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault + reuseIdentifier:CellIdentifier] autorelease]; } + NSInteger row = [indexPath row]; + UITableViewController *controller = [controllers objectAtIndex:row]; + + cell.textLabel.text = controller.title; + cell.imageView.image = [UIImage imageNamed:@"Icon.png"]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + return cell; } +-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + NSInteger row = [indexPath row]; + UITableViewController *nextController = [self.controllers objectAtIndex:row]; + [self.navigationController pushViewController:nextController animated:YES]; +} + #pragma mark - #pragma mark Managing the popover controller - -/* - When setting the detail item, update the view and dismiss the popover controller if it's showing. - */ +// When setting the detail item, update the view and dismiss the popover controller if it's showing. -(void) setDetailItem:(id) newDetailItem { if (detailItem != newDetailItem) { [detailItem release]; detailItem = [newDetailItem retain]; // Update the view. - navigationBar.topItem.title = (NSString*) detailItem; + // navigationBar.topItem.title = (NSString*) detailItem; - test.text=(NSString*) detailItem; + //test.text=(NSString*) detailItem; } if (popoverController != nil) { @@ -103,33 +104,25 @@ } } - #pragma mark - #pragma mark Split view support - -(void) splitViewController:(UISplitViewController*)svc willHideViewController:(UIViewController *)aViewController withBarButtonItem:(UIBarButtonItem*)barButtonItem forPopoverController: (UIPopoverController*)pc { barButtonItem.title = @"Master List"; - [navigationBar.topItem setLeftBarButtonItem:barButtonItem animated:YES]; + // [navigationBar.topItem setLeftBarButtonItem:barButtonItem animated:YES]; self.popoverController = pc; } - // Called when the view is shown again in the split view, invalidating the button and popover controller. -(void) splitViewController: (UISplitViewController*)svc willShowViewController:(UIViewController *)aViewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem { - [navigationBar.topItem setLeftBarButtonItem:nil animated:YES]; + // [navigationBar.topItem setLeftBarButtonItem:nil animated:YES]; self.popoverController = nil; } #pragma mark - #pragma mark Rotation support - // Ensure that the view controller supports rotation and that the split view can therefore show in both portrait and landscape. -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); } --(IBAction) dismissSplitView { - [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissModalView" object:nil]; -} - @end diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/MainMenuViewController.m --- a/cocoaTouch/iPad/MainMenuViewController.m Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/MainMenuViewController.m Fri Apr 02 12:38:36 2010 +0000 @@ -30,13 +30,19 @@ } - (void)dealloc { + [cover release]; [super dealloc]; } +-(void) viewDidUnload { + self.cover = nil; + [super viewDidUnload]; +} + -(void) viewDidLoad { // initialize some files the first time we load the game [NSThread detachNewThreadSelector:@selector(checkFirstRun) toTarget:self withObject:nil]; - // listet to request to remove the modalviewcontroller + // listen to request to remove the modalviewcontroller [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(dismissModalViewController) name: @"dismissModalView" object:nil]; [super viewDidLoad]; diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/MasterViewController.h --- a/cocoaTouch/iPad/MasterViewController.h Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/MasterViewController.h Fri Apr 02 12:38:36 2010 +0000 @@ -19,4 +19,6 @@ @property (nonatomic, retain) IBOutlet DetailViewController *detailViewController; @property (nonatomic, retain) NSArray *optionList; +-(IBAction) dismissSplitView; + @end diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/MasterViewController.m --- a/cocoaTouch/iPad/MasterViewController.m Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/MasterViewController.m Fri Apr 02 12:38:36 2010 +0000 @@ -23,7 +23,8 @@ NSLocalizedString(@"Weapons",@""), NSLocalizedString(@"Schemes",@""), nil]; - + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0 target:self action:@selector(dismissSplitView)]; + // Uncomment the following line to preserve selection between presentations. //self.clearsSelectionOnViewWillAppear = NO; // Uncomment the following line to display an Edit button in the navigation bar for this view controller. @@ -118,6 +119,9 @@ [super dealloc]; } +-(IBAction) dismissSplitView { + [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissModalView" object:nil]; +} @end diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/OverlayViewController.h --- a/cocoaTouch/iPad/OverlayViewController.h Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/OverlayViewController.h Fri Apr 02 12:38:36 2010 +0000 @@ -9,7 +9,7 @@ #import -@interface OverlayViewController : UIViewController { +@interface OverlayViewController : UIViewController { NSTimer *dimTimer; UIPopoverController* menuPopover; diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/OverlayViewController.m --- a/cocoaTouch/iPad/OverlayViewController.m Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/OverlayViewController.m Fri Apr 02 12:38:36 2010 +0000 @@ -52,6 +52,9 @@ -(void) viewDidUnload { [dimTimer invalidate]; + self.dimTimer = nil; + menuPopover = nil; + [super viewDidUnload]; } -(void) dealloc { @@ -93,7 +96,6 @@ // issue certain action based on the tag of the button -(IBAction) buttonPressed:(id) sender { [self activateOverlay]; - UIActionSheet *actionSheet; UIButton *theButton = (UIButton *)sender; switch (theButton.tag) { @@ -119,23 +121,6 @@ HW_backjump(); break; case 7: - HW_pause(); - break; - case 8: - HW_chat(); - break; - case 9: - actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"") - delegate:self - cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"") - destructiveButtonTitle:NSLocalizedString(@"As sure as I can be!", @"") - otherButtonTitles:nil]; - [actionSheet showInView:self.view]; - [actionSheet release]; - - HW_pause(); - break; - case 10: HW_tab(); break; default: @@ -154,19 +139,12 @@ // show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize -(IBAction) showPopover{ - PopupMenuViewController *popupMenu = [[PopupMenuViewController alloc] initWithNibName:@"PopupMenuViewController" bundle:nil]; + PopupMenuViewController *popupMenu = [[PopupMenuViewController alloc] init]; menuPopover = [[UIPopoverController alloc] initWithContentViewController:popupMenu]; [menuPopover setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; - /*UIButton *button = [UIButton buttonWithType:UIButtonTypeRoundedRect]; - button.frame= CGRectMake(960, 0, 64, 64); - button.titleLabel.text=@"UUUUUUUF"; - [self.view addSubview:button];*/ - [menuPopover presentPopoverFromRect:CGRectMake(960, 0, 220, 32) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionUp animated:YES]; - //UIBarButtonItem *sender = [[useless items] objectAtIndex:1]; - //[self.popoverController presentPopoverFromBarButtonItem:sender permittedArrowDirections:UIPopoverArrowDirectionDown animated:YES]; } // because of the actionSheet, the popOver might not get dismissed, so we do it manually (through a NSNotification system, see above) @@ -176,6 +154,8 @@ } #pragma mark - +#pragma mark Custom touch event handling + #define kMinimumPinchDelta 50 #define kMinimumGestureLength 10 #define kMaximumVariance 3 diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/PopupMenuViewController.h --- a/cocoaTouch/iPad/PopupMenuViewController.h Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/PopupMenuViewController.h Fri Apr 02 12:38:36 2010 +0000 @@ -9,12 +9,10 @@ #import -@interface PopupMenuViewController : UIViewController { - UITableView *menuTable; +@interface PopupMenuViewController : UITableViewController { NSArray *menuList; BOOL isPaused; } -@property (nonatomic,retain) IBOutlet UITableView * menuTable; @property (nonatomic,retain) NSArray *menuList; @end diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/PopupMenuViewController.m --- a/cocoaTouch/iPad/PopupMenuViewController.m Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/PopupMenuViewController.m Fri Apr 02 12:38:36 2010 +0000 @@ -11,24 +11,7 @@ #import "PascalImports.h" @implementation PopupMenuViewController -@synthesize menuTable, menuList; - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} -*/ +@synthesize menuList; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { @@ -36,7 +19,6 @@ return YES; } - -(void) didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; @@ -44,10 +26,11 @@ // Release any cached data, images, etc that aren't in use. } - -(void) viewDidLoad { isPaused = NO; - menuTable.allowsSelection = YES; + self.tableView.allowsSelection = YES; + self.tableView.alwaysBounceVertical = YES; + self.tableView.delaysContentTouches = NO; menuList = [[NSArray alloc] initWithObjects: NSLocalizedString(@"Pause Game", @""), NSLocalizedString(@"Chat", @""), @@ -59,12 +42,11 @@ -(void) dealloc { [menuList release]; - [menuTable release]; [super dealloc]; } #pragma mark - -#pragma mark TableView Methods +#pragma mark tableView methods -(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { return 1; } @@ -80,8 +62,8 @@ if (nil == cell) { cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier] autorelease]; - cell.textLabel.text = [menuList objectAtIndex:[indexPath row]]; } + cell.textLabel.text = [menuList objectAtIndex:[indexPath row]]; return cell; } @@ -102,7 +84,7 @@ actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"") delegate:self cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"") - destructiveButtonTitle:NSLocalizedString(@"As sure as I can be!", @"") + destructiveButtonTitle:NSLocalizedString(@"Of course!", @"") otherButtonTitles:nil]; [actionSheet showInView:self.view]; [actionSheet release]; @@ -120,6 +102,8 @@ [aTableView deselectRowAtIndexPath: indexPath animated:YES]; } +#pragma mark - +#pragma mark actionSheet methods -(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex { if ([actionSheet cancelButtonIndex] != buttonIndex) { [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissPopover" object:nil]; diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/SingleTeamViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/SingleTeamViewController.h Fri Apr 02 12:38:36 2010 +0000 @@ -0,0 +1,16 @@ +// +// SingleTeamViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface SingleTeamViewController : UITableViewController { + +} + +@end diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/SingleTeamViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/SingleTeamViewController.m Fri Apr 02 12:38:36 2010 +0000 @@ -0,0 +1,193 @@ +// +// SingleTeamViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "SingleTeamViewController.h" + + +@implementation SingleTeamViewController + + +#pragma mark - +#pragma mark Initialization + +/* +- (id)initWithStyle:(UITableViewStyle)style { + // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. + if ((self = [super initWithStyle:style])) { + } + return self; +} +*/ + + +#pragma mark - +#pragma mark View lifecycle + +/* +- (void)viewDidLoad { + [super viewDidLoad]; + + // Uncomment the following line to preserve selection between presentations. + self.clearsSelectionOnViewWillAppear = NO; + + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. + // self.navigationItem.rightBarButtonItem = self.editButtonItem; +} +*/ + +/* +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; +} +*/ +/* +- (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; +} +*/ +/* +- (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; +} +*/ +/* +- (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; +} +*/ + + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Override to allow orientations other than the default portrait orientation. + return YES; +} + + +#pragma mark - +#pragma mark Table view data source + +-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView { + // Return the number of sections. + return 3; +} + + +-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + // Return the number of rows in the section. + NSInteger rows; + switch (section) { + case 0: + rows = 1; + break; + case 1: + rows = 8; + break; + case 2: + rows = 5; + break; + default: + break; + } + return rows; +} + + +// Customize the appearance of table view cells. +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + static NSString *CellIdentifier = @"Cell"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; + } + + // Configure the cell... + + return cell; +} + + +/* +// Override to support conditional editing of the table view. +- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the specified item to be editable. + return YES; +} +*/ + + +/* +// Override to support editing the table view. +- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { + + if (editingStyle == UITableViewCellEditingStyleDelete) { + // Delete the row from the data source + [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; + } + else if (editingStyle == UITableViewCellEditingStyleInsert) { + // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view + } +} +*/ + + +/* +// Override to support rearranging the table view. +- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { +} +*/ + + +/* +// Override to support conditional rearranging of the table view. +- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the item to be re-orderable. + return YES; +} +*/ + + +#pragma mark - +#pragma mark Table view delegate + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + // Navigation logic may go here. Create and push another view controller. + /* + <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; + // ... + // Pass the selected object to the new view controller. + [self.navigationController pushViewController:detailViewController animated:YES]; + [detailViewController release]; + */ +} + + +#pragma mark - +#pragma mark Memory management + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Relinquish ownership any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand. + // For example: self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end + diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/SplitViewRootController.m --- a/cocoaTouch/iPad/SplitViewRootController.m Fri Apr 02 10:50:10 2010 +0000 +++ b/cocoaTouch/iPad/SplitViewRootController.m Fri Apr 02 12:38:36 2010 +0000 @@ -29,18 +29,25 @@ -(void) viewDidLoad { // init every possible controller splitViewController = [[UISplitViewController alloc] init]; - detailViewController = [[DetailViewController alloc] initWithNibName:@"DetailViewController" bundle:nil]; masterViewController = [[MasterViewController alloc] initWithStyle:UITableViewStylePlain]; - UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:masterViewController]; - + detailViewController = [[DetailViewController alloc] initWithStyle:UITableViewStyleGrouped]; + + UINavigationController *mainNavController = [[UINavigationController alloc] initWithRootViewController:masterViewController]; + UINavigationController *detailedNavController = [[UINavigationController alloc] initWithRootViewController:detailViewController]; + // set attributes masterViewController.detailViewController = detailViewController; - splitViewController.viewControllers = [NSArray arrayWithObjects:navigationController, detailViewController, nil]; - splitViewController.delegate = detailViewController; + splitViewController.viewControllers = [NSArray arrayWithObjects: mainNavController, detailedNavController, nil]; + [mainNavController release]; + [detailedNavController release]; + + splitViewController.delegate = detailViewController; // add view to main controller [self.view addSubview:splitViewController.view]; - + [detailViewController release]; + [masterViewController release]; + [super viewDidLoad]; } @@ -51,5 +58,28 @@ [super dealloc]; } +#pragma mark - +#pragma mark additional methods as we're using a UINavigationController programmatically +// see http://davidebenini.it/2009/01/03/viewwillappear-not-being-called-inside-a-uinavigationcontroller/ +-(void) viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + [detailViewController.navigationController viewWillAppear:animated]; +} + +-(void) viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; + [detailViewController.navigationController viewWillDisappear:animated]; +} + +-(void) viewDidAppear:(BOOL)animated { + [super viewDidLoad]; + [detailViewController.navigationController viewDidAppear:animated]; +} + +-(void) viewDidDisappear:(BOOL)animated { + [super viewDidUnload]; + [detailViewController.navigationController viewDidDisappear:animated]; +} + @end diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/TeamSettingsViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/TeamSettingsViewController.h Fri Apr 02 12:38:36 2010 +0000 @@ -0,0 +1,18 @@ +// +// TeamSettingsViewController.h +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import +@class SingleTeamViewController; + +@interface TeamSettingsViewController : UITableViewController { + NSArray *list; + SingleTeamViewController *childController; +} +@property (nonatomic, retain) NSArray *list; + +@end diff -r 74a506c9d71b -r d5cd1a617123 cocoaTouch/iPad/TeamSettingsViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cocoaTouch/iPad/TeamSettingsViewController.m Fri Apr 02 12:38:36 2010 +0000 @@ -0,0 +1,170 @@ +// +// TeamSettingsViewController.m +// HedgewarsMobile +// +// Created by Vittorio on 02/04/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "TeamSettingsViewController.h" +#import "SingleTeamViewController.h" + +@implementation TeamSettingsViewController +@synthesize list; + +#pragma mark - +#pragma mark View lifecycle +- (void)viewDidLoad { + [super viewDidLoad]; + NSArray *array = [[NSArray alloc] initWithObjects:@"Toy Story", @"A Bug's Life", @"Toy Story 2", + @"Monsters, Inc.",@"Finding Nemo", @"The Incredibles", @"Cars", @"Ratatouille", + @"WALL-E", @"Up", @"Toy Story 3", @"Cars 2", @"The Bear and the Bow", @"Newt", nil]; + self.list = array; + [array release]; + // Uncomment the following line to preserve selection between presentations. + self.clearsSelectionOnViewWillAppear = NO; + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. + // self.navigationItem.rightBarButtonItem = self.editButtonItem; +} + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Override to allow orientations other than the default portrait orientation. + return (interfaceOrientation == UIInterfaceOrientationLandscapeRight); +} + + +#pragma mark - +#pragma mark Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + // Return the number of sections. + return 1; +} + + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + // Return the number of rows in the section. + return [list count]; +} + + +// Customize the appearance of table view cells. +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + static NSString *CellIdentifier = @"Cell"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; + } + + NSUInteger row = [indexPath row]; + NSString *rowString = [list objectAtIndex:row]; + cell.textLabel.text = rowString; + cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton; + //cell.imageView.image = [UIImage imageNamed:@"Default.png"]; + [rowString release]; + + return cell; +} + + +/* +// Override to support conditional editing of the table view. +- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the specified item to be editable. + return YES; +} +*/ + + +/* +// Override to support editing the table view. +- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { + + if (editingStyle == UITableViewCellEditingStyleDelete) { + // Delete the row from the data source + [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; + } + else if (editingStyle == UITableViewCellEditingStyleInsert) { + // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view + } +} +*/ + + +/* +// Override to support rearranging the table view. +- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { +} +*/ + + +/* +// Override to support conditional rearranging of the table view. +- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { + // Return NO if you do not want the item to be re-orderable. + return YES; +} +*/ + + +#pragma mark - +#pragma mark Table view delegate + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + + UIAlertView *alert = [[UIAlertView alloc] initWithTitle: @"Hey, do you see the disclosure button?" + message:@"If you're trying to drill down, touch that instead" + delegate:nil + cancelButtonTitle:@"Won't happen again" + otherButtonTitles:nil]; + [alert show]; + [alert release]; +} + +-(void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { + if (childController == nil) { + childController = [[SingleTeamViewController alloc] initWithStyle:UITableViewStyleGrouped]; + //childController = [[DisclosureDetailController alloc] initWithNibName:@"DisclosureDatailController" bundle:nil]; + } + + NSInteger row = [indexPath row]; + NSString *selectedMovie = [list objectAtIndex:row]; + NSString *detailMessage = [[NSString alloc] initWithFormat:@"you pressed the button for %@", selectedMovie]; + //self.childController.message = detailMessage; + childController.title = selectedMovie; + [detailMessage release]; + [self.navigationController pushViewController:childController animated:YES]; + + //[childController viewWillAppear:YES]; +} + + +#pragma mark - +#pragma mark Memory management + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Relinquish ownership any cached data, images, etc that aren't in use. +} + +/* +- (void)viewDidUnload { + // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand. + // For example: self.myOutlet = nil; +} +*/ + +- (void)dealloc { + [list release]; + if (nil != childController) + [childController release]; + [super dealloc]; +} + + +@end + diff -r 74a506c9d71b -r d5cd1a617123 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Fri Apr 02 10:50:10 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj Fri Apr 02 12:38:36 2010 +0000 @@ -111,6 +111,8 @@ 611FD9D01155A40700C2203D /* NetworkPlay.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */; }; 611FD9D21155A41000C2203D /* Multiplayer.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9D11155A41000C2203D /* Multiplayer.png */; }; 611FDB641155BFFF00C2203D /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FDB631155BFFF00C2203D /* Default.png */; }; + 615F159E1166216A002444F2 /* TeamSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */; }; + 615F15AE116628CC002444F2 /* SingleTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */; }; 61798816114AA34C00BA94A9 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; }; 61798818114AA34C00BA94A9 /* hwLibrary.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; }; 6179881B114AA34C00BA94A9 /* PascalExports.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; }; @@ -196,7 +198,6 @@ 61CE24EE115E71C20098C467 /* OverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61CE24EB115E71C20098C467 /* OverlayViewController.m */; }; 61CE24EF115E71C20098C467 /* PopupMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */; }; 61CE2503115E73210098C467 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61CE2501115E73210098C467 /* OverlayViewController.xib */; }; - 61CE2504115E73210098C467 /* PopupMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61CE2502115E73210098C467 /* PopupMenuViewController.xib */; }; 61CE250D115E749A0098C467 /* OverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; }; 61CE2511115E74C90098C467 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61CE2510115E74C90098C467 /* OverlayViewController.xib */; }; 61CE25C3115E7D1D0098C467 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; }; @@ -204,7 +205,6 @@ 61FA761F115DA0DB00DA6ED0 /* MainMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */; }; 61FA7647115DA6A300DA6ED0 /* SplitViewRootController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; }; 61FA765D115DAACC00DA6ED0 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */; }; - 61FA7669115DAB1B00DA6ED0 /* DetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61FA7667115DAB1B00DA6ED0 /* DetailViewController.xib */; }; 922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; }; /* End PBXBuildFile section */ @@ -291,6 +291,10 @@ 611FD9CF1155A40700C2203D /* NetworkPlay.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = NetworkPlay.png; path = ../../QTfrontend/res/NetworkPlay.png; sourceTree = SOURCE_ROOT; }; 611FD9D11155A41000C2203D /* Multiplayer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Multiplayer.png; path = ../../QTfrontend/res/Multiplayer.png; sourceTree = SOURCE_ROOT; }; 611FDB631155BFFF00C2203D /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../../cocoaTouch/iPad/Default.png; sourceTree = SOURCE_ROOT; }; + 615F159C1166216A002444F2 /* TeamSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TeamSettingsViewController.h; path = ../../cocoaTouch/iPad/TeamSettingsViewController.h; sourceTree = SOURCE_ROOT; }; + 615F159D1166216A002444F2 /* TeamSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TeamSettingsViewController.m; path = ../../cocoaTouch/iPad/TeamSettingsViewController.m; sourceTree = SOURCE_ROOT; }; + 615F15AC116628CC002444F2 /* SingleTeamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SingleTeamViewController.h; path = ../../cocoaTouch/iPad/SingleTeamViewController.h; sourceTree = SOURCE_ROOT; }; + 615F15AD116628CC002444F2 /* SingleTeamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SingleTeamViewController.m; path = ../../cocoaTouch/iPad/SingleTeamViewController.m; sourceTree = SOURCE_ROOT; }; 617987E1114AA34C00BA94A9 /* CCHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = CCHandlers.inc; path = ../../hedgewars/CCHandlers.inc; sourceTree = SOURCE_ROOT; }; 617987E4114AA34C00BA94A9 /* GSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GSHandlers.inc; path = ../../hedgewars/GSHandlers.inc; sourceTree = SOURCE_ROOT; }; 617987E5114AA34C00BA94A9 /* HHHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = HHHandlers.inc; path = ../../hedgewars/HHHandlers.inc; sourceTree = SOURCE_ROOT; }; @@ -395,7 +399,6 @@ 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PopupMenuViewController.h; path = ../../cocoaTouch/iPad/PopupMenuViewController.h; sourceTree = SOURCE_ROOT; }; 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PopupMenuViewController.m; path = ../../cocoaTouch/iPad/PopupMenuViewController.m; sourceTree = SOURCE_ROOT; }; 61CE2501115E73210098C467 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = ../../cocoaTouch/iPad/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; - 61CE2502115E73210098C467 /* PopupMenuViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = PopupMenuViewController.xib; path = ../../cocoaTouch/iPad/PopupMenuViewController.xib; sourceTree = SOURCE_ROOT; }; 61CE250B115E749A0098C467 /* OverlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OverlayViewController.h; path = ../../cocoaTouch/OverlayViewController.h; sourceTree = SOURCE_ROOT; }; 61CE250C115E749A0098C467 /* OverlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OverlayViewController.m; path = ../../cocoaTouch/OverlayViewController.m; sourceTree = SOURCE_ROOT; }; 61CE2510115E74C90098C467 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = ../../cocoaTouch/OverlayViewController.xib; sourceTree = SOURCE_ROOT; }; @@ -408,7 +411,6 @@ 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MasterViewController.m; path = ../../cocoaTouch/iPad/MasterViewController.m; sourceTree = SOURCE_ROOT; }; 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailViewController.h; path = ../../cocoaTouch/iPad/DetailViewController.h; sourceTree = SOURCE_ROOT; }; 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailViewController.m; path = ../../cocoaTouch/iPad/DetailViewController.m; sourceTree = SOURCE_ROOT; }; - 61FA7667115DAB1B00DA6ED0 /* DetailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DetailViewController.xib; path = ../../cocoaTouch/iPad/DetailViewController.xib; sourceTree = SOURCE_ROOT; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 928301170F10CAFC00CC5A3C /* libfpc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfpc.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -580,6 +582,21 @@ path = Classes; sourceTree = ""; }; + 615F159B11662108002444F2 /* Settings */ = { + isa = PBXGroup; + children = ( + 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */, + 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */, + 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */, + 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */, + 615F15AC116628CC002444F2 /* SingleTeamViewController.h */, + 615F15AD116628CC002444F2 /* SingleTeamViewController.m */, + 615F159C1166216A002444F2 /* TeamSettingsViewController.h */, + 615F159D1166216A002444F2 /* TeamSettingsViewController.m */, + ); + name = Settings; + sourceTree = ""; + }; 61798860114AA49D00BA94A9 /* SDLOverrides */ = { isa = PBXGroup; children = ( @@ -695,11 +712,9 @@ 61CE2509115E74260098C467 /* XIB */ = { isa = PBXGroup; children = ( - 61FA7667115DAB1B00DA6ED0 /* DetailViewController.xib */, 611FD990115590E700C2203D /* MainMenuViewController.xib */, 611FD992115590E700C2203D /* SettingsViewController.xib */, 61CE2501115E73210098C467 /* OverlayViewController.xib */, - 61CE2502115E73210098C467 /* PopupMenuViewController.xib */, ); name = XIB; sourceTree = ""; @@ -707,15 +722,12 @@ 61FA7620115DA0EA00DA6ED0 /* iPad Frontend */ = { isa = PBXGroup; children = ( + 615F159B11662108002444F2 /* Settings */, 61FA766A115DAB2A00DA6ED0 /* Overlay */, 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */, 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */, 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */, 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */, - 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */, - 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */, - 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */, - 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */, ); name = "iPad Frontend"; sourceTree = ""; @@ -967,9 +979,7 @@ 611FD9D01155A40700C2203D /* NetworkPlay.png in Resources */, 611FD9D21155A41000C2203D /* Multiplayer.png in Resources */, 611FDB641155BFFF00C2203D /* Default.png in Resources */, - 61FA7669115DAB1B00DA6ED0 /* DetailViewController.xib in Resources */, 61CE2503115E73210098C467 /* OverlayViewController.xib in Resources */, - 61CE2504115E73210098C467 /* PopupMenuViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1156,6 +1166,8 @@ 61CE24EE115E71C20098C467 /* OverlayViewController.m in Sources */, 61CE24EF115E71C20098C467 /* PopupMenuViewController.m in Sources */, 61CE25C3115E7D1D0098C467 /* DetailViewController.m in Sources */, + 615F159E1166216A002444F2 /* TeamSettingsViewController.m in Sources */, + 615F15AE116628CC002444F2 /* SingleTeamViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff -r 74a506c9d71b -r d5cd1a617123 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Fri Apr 02 10:50:10 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Fri Apr 02 12:38:36 2010 +0000 @@ -197,7 +197,210 @@ Notifications OpenEditors - + + + Content + + PBXProjectModuleGUID + 615F157511661DA5002444F2 + PBXProjectModuleLabel + DetailViewController.m + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 615F157611661DA5002444F2 + PBXProjectModuleLabel + DetailViewController.m + _historyCapacity + 0 + bookmark + 615F15BF116629A0002444F2 + history + + 615F157011661D95002444F2 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {927, 748}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 542 215 927 789 0 0 1920 1178 + + + + Content + + PBXProjectModuleGUID + 615F15C0116629A0002444F2 + PBXProjectModuleLabel + SingleTeamViewController.m + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 615F15C1116629A0002444F2 + PBXProjectModuleLabel + SingleTeamViewController.m + _historyCapacity + 0 + bookmark + 615F15C2116629A0002444F2 + history + + 615F15B0116628F2002444F2 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {895, 596}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 153 410 895 637 0 0 1920 1178 + + + + Content + + PBXProjectModuleGUID + 615F15C3116629A0002444F2 + PBXProjectModuleLabel + GameSetup.m + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 615F15C4116629A0002444F2 + PBXProjectModuleLabel + GameSetup.m + _historyCapacity + 0 + bookmark + 615F15C5116629A0002444F2 + history + + 615F15AB1166270F002444F2 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {1079, 773}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 760 312 1079 814 0 0 1920 1178 + + + + Content + + PBXProjectModuleGUID + 615F15C6116629A0002444F2 + PBXProjectModuleLabel + TeamSettingsViewController.m + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 615F15C7116629A0002444F2 + PBXProjectModuleLabel + TeamSettingsViewController.m + _historyCapacity + 0 + bookmark + 615F15CA116629A0002444F2 + history + + 615F15C8116629A0002444F2 + 615F15C9116629A0002444F2 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {895, 596}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 343 291 895 637 0 0 1920 1178 + + + + Content + + PBXProjectModuleGUID + 615F158811662071002444F2 + PBXProjectModuleLabel + DisclosureButtonController.m + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 615F158911662071002444F2 + PBXProjectModuleLabel + DisclosureButtonController.m + _historyCapacity + 0 + bookmark + 615F15CD116629A0002444F2 + history + + 615F15CB116629A0002444F2 + 615F15CC116629A0002444F2 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {895, 596}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 970 266 895 637 0 0 1920 1178 + + + PerspectiveWidths -1 @@ -229,6 +432,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -265,6 +470,8 @@ 29B97314FDCFA39411CA2CEA 080E96DDFE201D6D7F000001 + 61FA7620115DA0EA00DA6ED0 + 615F159B11662108002444F2 6100DAD4115446B000F455E0 1C37FBAC04509CD000000102 1C37FABC05509CD000000102 @@ -272,13 +479,15 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 7 - 2 + 15 + 9 + 8 + 5 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 558}} + {{0, 1}, {186, 558}} PBXTopSmartGroupGIDs @@ -297,7 +506,7 @@ 186 RubberWindowFrame - 313 455 801 617 0 0 1920 1178 + 300 277 801 617 0 0 1920 1178 Module PBXSmartGroupTreeModule @@ -308,14 +517,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - SDL_uikitappdelegate.m + SingleTeamViewController.h PBXSplitModuleInNavigatorKey Split0 @@ -323,11 +530,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - SDL_uikitappdelegate.m + SingleTeamViewController.h _historyCapacity 0 bookmark - 615F12C311655708002444F2 + 615F15BE116629A0002444F2 history 6179889D114AA5BD00BA94A9 @@ -346,7 +553,6 @@ 611FD8211155111700C2203D 611FD8281155111700C2203D 611FD8291155111700C2203D - 611FD82A1155111700C2203D 611FD82B1155111700C2203D 611FD82C1155111700C2203D 611FD82D1155111700C2203D @@ -365,25 +571,16 @@ 61CE23E7115E49560098C467 61CE23FF115E4B290098C467 61CE2410115E4F620098C467 - 61CE24D4115E5E630098C467 - 61CE24DC115E641F0098C467 61CE2514115E74CC0098C467 61CE2515115E74CC0098C467 61CE251F115E75A70098C467 61CE2577115E78900098C467 61CE2578115E78900098C467 61CE25B4115E7C940098C467 - 61CE25B5115E7C940098C467 - 615E2350115ED80500B0ACA1 615E2397115F023B00B0ACA1 - 615E2398115F023B00B0ACA1 - 615E2399115F023B00B0ACA1 - 615E239A115F023B00B0ACA1 615E239B115F023B00B0ACA1 - 61CCBDA11160666200833FE8 61CCBE60116135FF00833FE8 61CCBF1E116162CA00833FE8 - 61CCBF1F116162CA00833FE8 61CCBF451161637F00833FE8 61CCBF461161637F00833FE8 61CCBF471161637F00833FE8 @@ -403,18 +600,36 @@ 61CCBFDA1161833800833FE8 61CCBFDB1161833800833FE8 61CCBFDC1161833800833FE8 - 61CCBFDD1161833800833FE8 - 61AB99EB1162CC3100B1CF7E 61697B9E1163478A00CCDF37 - 61697BB611634A2400CCDF37 612D5C451165535400C6D842 612D616B1165536300C6D842 612D618F1165545F00C6D842 61430D3B1165551600E2C62D - 61430D3C1165551600E2C62D 61430D3D1165551600E2C62D - 61430D3E1165551600E2C62D - 61430D501165557800E2C62D + 615F12CE11655B21002444F2 + 615F12CF11655B21002444F2 + 615F12FB116560D9002444F2 + 615F1316116561BE002444F2 + 615F134D11656569002444F2 + 615F147F11659AC5002444F2 + 615F148B11659BC2002444F2 + 615F14A911659E9A002444F2 + 615F14AA11659E9A002444F2 + 615F14AE11659E9A002444F2 + 615F154E1165A976002444F2 + 615F157111661DA5002444F2 + 615F158311662071002444F2 + 615F158411662071002444F2 + 615F158511662071002444F2 + 615F15B5116629A0002444F2 + 615F15B6116629A0002444F2 + 615F15B7116629A0002444F2 + 615F15B8116629A0002444F2 + 615F15B9116629A0002444F2 + 615F15BA116629A0002444F2 + 615F15BB116629A0002444F2 + 615F15BC116629A0002444F2 + 615F15BD116629A0002444F2 SplitCount @@ -426,14 +641,14 @@ GeometryConfiguration Frame - {{0, 0}, {593, 213}} + {{0, 0}, {593, 95}} RubberWindowFrame - 313 455 801 617 0 0 1920 1178 + 300 277 801 617 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 213pt + 95pt ContentConfiguration @@ -446,14 +661,14 @@ GeometryConfiguration Frame - {{0, 218}, {593, 358}} + {{0, 100}, {593, 476}} RubberWindowFrame - 313 455 801 617 0 0 1920 1178 + 300 277 801 617 0 0 1920 1178 Module XCDetailModule Proportion - 358pt + 476pt Proportion @@ -472,9 +687,9 @@ TableOfContents - 615F12B911655601002444F2 + 615F157311661DA5002444F2 1CE0B1FE06471DED0097A5F4 - 615F12BA11655601002444F2 + 615F157411661DA5002444F2 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -612,12 +827,21 @@ 5 WindowOrderList + 615F15CE116629A0002444F2 + 615F15CF116629A0002444F2 + 615F159811662090002444F2 + 1C78EAAD065D492600B07095 + 1CD10A99069EF8BA00B06720 + 615F158811662071002444F2 + 615F15C6116629A0002444F2 61798848114AA42600BA94A9 - 612D61911165545F00C6D842 + 615F15C3116629A0002444F2 /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj + 615F15C0116629A0002444F2 + 615F157511661DA5002444F2 WindowString - 313 455 801 617 0 0 1920 1178 + 300 277 801 617 0 0 1920 1178 WindowToolsV3 @@ -633,12 +857,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + TeamSettingsViewController.m StatusBarVisibility @@ -694,7 +920,7 @@ TableOfContents 61798848114AA42600BA94A9 - 615F12BC11655601002444F2 + 615F157811661DA5002444F2 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -707,7 +933,7 @@ WindowToolGUID 61798848114AA42600BA94A9 WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -781,13 +1007,11 @@ DebugVariablesTableConfiguration Name - 120 + 149 Value - 85 + 114 Summary - 95 - Type - 84 + 124 Frame {{0, 239}, {412, 239}} @@ -818,13 +1042,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 61430D451165551600E2C62D + 615F159011662090002444F2 1C162984064C10D400B95A72 - 61430D461165551600E2C62D - 61430D471165551600E2C62D - 61430D481165551600E2C62D - 61430D491165551600E2C62D - 61430D4A1165551600E2C62D + 615F159111662090002444F2 + 615F159211662090002444F2 + 615F159311662090002444F2 + 615F159411662090002444F2 + 615F159511662090002444F2 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -951,8 +1175,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -988,7 +1210,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 61430D4B1165551600E2C62D + 615F159611662090002444F2 1C78EAAC065D492600B07095 ToolbarConfiguration diff -r 74a506c9d71b -r d5cd1a617123 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Fri Apr 02 10:50:10 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Fri Apr 02 12:38:36 2010 +0000 @@ -8,11 +8,11 @@ }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */; + activeExecutable = 6100DAD3115446B000F455E0 /* iHedgewars */; activeSDKPreference = iphonesimulator3.2; - activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */; + activeTarget = 6100DA6E115446B000F455E0 /* iHedgewars */; addToTargets = ( - 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */, + 6100DA6E115446B000F455E0 /* iHedgewars */, ); breakpoints = ( ); @@ -94,8 +94,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 291853811; - PBXWorkspaceStateSaveDate = 291853811; + PBXPerProjectTemplateStateSaveDate = 291904903; + PBXWorkspaceStateSaveDate = 291904903; }; perUserProjectItems = { 611FD81D1155111700C2203D = 611FD81D1155111700C2203D /* PBXTextBookmark */; @@ -105,7 +105,6 @@ 611FD8211155111700C2203D = 611FD8211155111700C2203D /* PBXTextBookmark */; 611FD8281155111700C2203D = 611FD8281155111700C2203D /* PBXTextBookmark */; 611FD8291155111700C2203D = 611FD8291155111700C2203D /* PBXTextBookmark */; - 611FD82A1155111700C2203D = 611FD82A1155111700C2203D /* PBXTextBookmark */; 611FD82B1155111700C2203D = 611FD82B1155111700C2203D /* PBXTextBookmark */; 611FD82C1155111700C2203D = 611FD82C1155111700C2203D /* PBXTextBookmark */; 611FD82D1155111700C2203D = 611FD82D1155111700C2203D /* PBXTextBookmark */; @@ -122,27 +121,67 @@ 612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */; 612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */; 612D618F1165545F00C6D842 = 612D618F1165545F00C6D842 /* PBXTextBookmark */; - 612D61931165545F00C6D842 = 612D61931165545F00C6D842 /* PBXTextBookmark */; - 61430D341165548700E2C62D = 61430D341165548700E2C62D /* PBXBookmark */; 61430D3B1165551600E2C62D = 61430D3B1165551600E2C62D /* PBXTextBookmark */; - 61430D3C1165551600E2C62D = 61430D3C1165551600E2C62D /* PBXTextBookmark */; 61430D3D1165551600E2C62D = 61430D3D1165551600E2C62D /* PBXTextBookmark */; - 61430D3E1165551600E2C62D = 61430D3E1165551600E2C62D /* PBXTextBookmark */; - 61430D3F1165551600E2C62D = 61430D3F1165551600E2C62D /* PBXTextBookmark */; - 61430D501165557800E2C62D = 61430D501165557800E2C62D /* PBXTextBookmark */; - 61430D511165557800E2C62D = 61430D511165557800E2C62D /* PBXTextBookmark */; - 61430D521165557800E2C62D = 61430D521165557800E2C62D /* PBXTextBookmark */; - 615E2350115ED80500B0ACA1 = 615E2350115ED80500B0ACA1 /* PBXTextBookmark */; 615E2397115F023B00B0ACA1 = 615E2397115F023B00B0ACA1 /* PBXTextBookmark */; - 615E2398115F023B00B0ACA1 = 615E2398115F023B00B0ACA1 /* PBXTextBookmark */; - 615E2399115F023B00B0ACA1 = 615E2399115F023B00B0ACA1 /* PBXTextBookmark */; 615E239A115F023B00B0ACA1 = 615E239A115F023B00B0ACA1 /* PBXTextBookmark */; 615E239B115F023B00B0ACA1 = 615E239B115F023B00B0ACA1 /* PBXTextBookmark */; - 615F12B811655601002444F2 /* PBXTextBookmark */ = 615F12B811655601002444F2 /* PBXTextBookmark */; - 615F12BB11655601002444F2 /* PBXTextBookmark */ = 615F12BB11655601002444F2 /* PBXTextBookmark */; - 615F12C311655708002444F2 /* PBXTextBookmark */ = 615F12C311655708002444F2 /* PBXTextBookmark */; + 615F12CE11655B21002444F2 = 615F12CE11655B21002444F2 /* PBXTextBookmark */; + 615F12CF11655B21002444F2 = 615F12CF11655B21002444F2 /* PBXTextBookmark */; + 615F12FB116560D9002444F2 = 615F12FB116560D9002444F2 /* PBXTextBookmark */; + 615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */; + 615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */; + 615F13E811657001002444F2 = 615F13E811657001002444F2 /* PBXTextBookmark */; + 615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */; + 615F148B11659BC2002444F2 = 615F148B11659BC2002444F2 /* PBXTextBookmark */; + 615F148C11659BC2002444F2 = 615F148C11659BC2002444F2 /* PBXTextBookmark */; + 615F14A911659E9A002444F2 = 615F14A911659E9A002444F2 /* PBXTextBookmark */; + 615F14AA11659E9A002444F2 = 615F14AA11659E9A002444F2 /* PBXTextBookmark */; + 615F14AC11659E9A002444F2 = 615F14AC11659E9A002444F2 /* PBXTextBookmark */; + 615F14AD11659E9A002444F2 = 615F14AD11659E9A002444F2 /* PBXTextBookmark */; + 615F14AE11659E9A002444F2 = 615F14AE11659E9A002444F2 /* PBXTextBookmark */; + 615F14B911659F40002444F2 = 615F14B911659F40002444F2 /* PBXTextBookmark */; + 615F15291165A792002444F2 = 615F15291165A792002444F2 /* PBXTextBookmark */; + 615F154C1165A976002444F2 = 615F154C1165A976002444F2 /* PBXTextBookmark */; + 615F154D1165A976002444F2 = 615F154D1165A976002444F2 /* PBXTextBookmark */; + 615F154E1165A976002444F2 = 615F154E1165A976002444F2 /* PBXTextBookmark */; + 615F15591165AA5C002444F2 = 615F15591165AA5C002444F2 /* PBXTextBookmark */; + 615F157011661D95002444F2 /* PBXBookmark */ = 615F157011661D95002444F2 /* PBXBookmark */; + 615F157111661DA5002444F2 /* PBXTextBookmark */ = 615F157111661DA5002444F2 /* PBXTextBookmark */; + 615F157211661DA5002444F2 /* PBXTextBookmark */ = 615F157211661DA5002444F2 /* PBXTextBookmark */; + 615F157711661DA5002444F2 /* PBXTextBookmark */ = 615F157711661DA5002444F2 /* PBXTextBookmark */; + 615F158011661FA4002444F2 /* PBXBookmark */ = 615F158011661FA4002444F2 /* PBXBookmark */; + 615F158311662071002444F2 /* PBXTextBookmark */ = 615F158311662071002444F2 /* PBXTextBookmark */; + 615F158411662071002444F2 /* PBXTextBookmark */ = 615F158411662071002444F2 /* PBXTextBookmark */; + 615F158511662071002444F2 /* PBXTextBookmark */ = 615F158511662071002444F2 /* PBXTextBookmark */; + 615F158611662071002444F2 /* PBXTextBookmark */ = 615F158611662071002444F2 /* PBXTextBookmark */; + 615F158711662071002444F2 /* PBXTextBookmark */ = 615F158711662071002444F2 /* PBXTextBookmark */; + 615F158A11662071002444F2 /* PBXTextBookmark */ = 615F158A11662071002444F2 /* PBXTextBookmark */; + 615F158D11662090002444F2 /* PBXTextBookmark */ = 615F158D11662090002444F2 /* PBXTextBookmark */; + 615F158E11662090002444F2 /* PBXTextBookmark */ = 615F158E11662090002444F2 /* PBXTextBookmark */; + 615F158F11662090002444F2 /* PBXTextBookmark */ = 615F158F11662090002444F2 /* PBXTextBookmark */; + 615F15AB1166270F002444F2 /* PBXBookmark */ = 615F15AB1166270F002444F2 /* PBXBookmark */; + 615F15B0116628F2002444F2 /* PBXBookmark */ = 615F15B0116628F2002444F2 /* PBXBookmark */; + 615F15B5116629A0002444F2 /* PBXTextBookmark */ = 615F15B5116629A0002444F2 /* PBXTextBookmark */; + 615F15B6116629A0002444F2 /* PBXTextBookmark */ = 615F15B6116629A0002444F2 /* PBXTextBookmark */; + 615F15B7116629A0002444F2 /* PBXTextBookmark */ = 615F15B7116629A0002444F2 /* PBXTextBookmark */; + 615F15B8116629A0002444F2 /* PBXTextBookmark */ = 615F15B8116629A0002444F2 /* PBXTextBookmark */; + 615F15B9116629A0002444F2 /* PBXTextBookmark */ = 615F15B9116629A0002444F2 /* PBXTextBookmark */; + 615F15BA116629A0002444F2 /* PBXTextBookmark */ = 615F15BA116629A0002444F2 /* PBXTextBookmark */; + 615F15BB116629A0002444F2 /* PBXTextBookmark */ = 615F15BB116629A0002444F2 /* PBXTextBookmark */; + 615F15BC116629A0002444F2 /* PBXTextBookmark */ = 615F15BC116629A0002444F2 /* PBXTextBookmark */; + 615F15BD116629A0002444F2 /* PBXTextBookmark */ = 615F15BD116629A0002444F2 /* PBXTextBookmark */; + 615F15BE116629A0002444F2 /* PBXTextBookmark */ = 615F15BE116629A0002444F2 /* PBXTextBookmark */; + 615F15BF116629A0002444F2 /* PBXTextBookmark */ = 615F15BF116629A0002444F2 /* PBXTextBookmark */; + 615F15C2116629A0002444F2 /* PBXTextBookmark */ = 615F15C2116629A0002444F2 /* PBXTextBookmark */; + 615F15C5116629A0002444F2 /* PBXTextBookmark */ = 615F15C5116629A0002444F2 /* PBXTextBookmark */; + 615F15C8116629A0002444F2 /* PBXTextBookmark */ = 615F15C8116629A0002444F2 /* PBXTextBookmark */; + 615F15C9116629A0002444F2 /* PBXTextBookmark */ = 615F15C9116629A0002444F2 /* PBXTextBookmark */; + 615F15CA116629A0002444F2 /* PBXTextBookmark */ = 615F15CA116629A0002444F2 /* PBXTextBookmark */; + 615F15CB116629A0002444F2 /* PBXTextBookmark */ = 615F15CB116629A0002444F2 /* PBXTextBookmark */; + 615F15CC116629A0002444F2 /* PBXTextBookmark */ = 615F15CC116629A0002444F2 /* PBXTextBookmark */; + 615F15CD116629A0002444F2 /* PBXTextBookmark */ = 615F15CD116629A0002444F2 /* PBXTextBookmark */; 61697B9E1163478A00CCDF37 = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */; - 61697BB611634A2400CCDF37 = 61697BB611634A2400CCDF37 /* PBXTextBookmark */; 6179889D114AA5BD00BA94A9 = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */; 61799342114B297000BA94A9 = 61799342114B297000BA94A9 /* PBXBookmark */; 61799343114B297000BA94A9 = 61799343114B297000BA94A9 /* PBXBookmark */; @@ -153,11 +192,8 @@ 6179943111502CEA00BA94A9 = 6179943111502CEA00BA94A9 /* PBXBookmark */; 618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */; 6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */; - 61AB99EB1162CC3100B1CF7E = 61AB99EB1162CC3100B1CF7E /* PBXTextBookmark */; - 61CCBDA11160666200833FE8 = 61CCBDA11160666200833FE8 /* PBXTextBookmark */; 61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */; 61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */; - 61CCBF1F116162CA00833FE8 = 61CCBF1F116162CA00833FE8 /* PBXTextBookmark */; 61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */; 61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */; 61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* PBXTextBookmark */; @@ -177,11 +213,9 @@ 61CCBFDA1161833800833FE8 = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */; 61CCBFDB1161833800833FE8 = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */; 61CCBFDC1161833800833FE8 = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */; - 61CCBFDD1161833800833FE8 = 61CCBFDD1161833800833FE8 /* PBXTextBookmark */; 61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */; 61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */; 61CE2410115E4F620098C467 = 61CE2410115E4F620098C467 /* PBXBookmark */; - 61CE24D4115E5E630098C467 = 61CE24D4115E5E630098C467 /* PBXTextBookmark */; 61CE24DC115E641F0098C467 = 61CE24DC115E641F0098C467 /* PBXTextBookmark */; 61CE2514115E74CC0098C467 = 61CE2514115E74CC0098C467 /* PBXBookmark */; 61CE2515115E74CC0098C467 = 61CE2515115E74CC0098C467 /* PBXTextBookmark */; @@ -189,7 +223,6 @@ 61CE2577115E78900098C467 = 61CE2577115E78900098C467 /* PBXTextBookmark */; 61CE2578115E78900098C467 = 61CE2578115E78900098C467 /* PBXTextBookmark */; 61CE25B4115E7C940098C467 = 61CE25B4115E7C940098C467 /* PBXTextBookmark */; - 61CE25B5115E7C940098C467 = 61CE25B5115E7C940098C467 /* PBXTextBookmark */; 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */; }; sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */; @@ -216,7 +249,7 @@ argumentStrings = ( ); autoAttachOnCrash = 1; - breakpointsEnabled = 0; + breakpointsEnabled = 1; configStateDict = { }; customDataFormattersEnabled = 1; @@ -311,16 +344,6 @@ vrLen = 189; vrLoc = 0; }; - 611FD82A1155111700C2203D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798874114AA4D000BA94A9 /* SettingsViewController.h */; - name = "SettingsViewController.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 174; - vrLoc = 0; - }; 611FD82B1155111700C2203D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798877114AA4D000BA94A9 /* TeamEditViewController.h */; @@ -445,20 +468,6 @@ vrLen = 14; vrLoc = 0; }; - 612D61931165545F00C6D842 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; - name = "PascalExports.pas: 10"; - rLen = 0; - rLoc = 145; - rType = 0; - vrLen = 743; - vrLoc = 0; - }; - 61430D341165548700E2C62D /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; - }; 61430D3B1165551600E2C62D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; @@ -469,16 +478,6 @@ vrLen = 22; vrLoc = 3; }; - 61430D3C1165551600E2C62D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; - name = "MainMenuViewController.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 3; - vrLoc = 0; - }; 61430D3D1165551600E2C62D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798867114AA4AA00BA94A9 /* SDL_uikitwindow.h */; @@ -489,66 +488,6 @@ vrLen = 3; vrLoc = 0; }; - 61430D3E1165551600E2C62D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; - name = "SDL_uikitappdelegate.h: 22"; - rLen = 0; - rLoc = 936; - rType = 0; - vrLen = 324; - vrLoc = 936; - }; - 61430D3F1165551600E2C62D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; - name = "SDL_uikitappdelegate.m: 82"; - rLen = 0; - rLoc = 2541; - rType = 0; - vrLen = 860; - vrLoc = 2929; - }; - 61430D501165557800E2C62D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; - name = "SDL_uikitappdelegate.m: 32"; - rLen = 0; - rLoc = 1141; - rType = 0; - vrLen = 394; - vrLoc = 1006; - }; - 61430D511165557800E2C62D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; - name = "MainMenuViewController.m: 47"; - rLen = 0; - rLoc = 1464; - rType = 0; - vrLen = 1025; - vrLoc = 1158; - }; - 61430D521165557800E2C62D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; - name = "PascalExports.pas: 10"; - rLen = 0; - rLoc = 145; - rType = 0; - vrLen = 743; - vrLoc = 0; - }; - 615E2350115ED80500B0ACA1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */; - name = "PopupMenuViewController.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 149; - vrLoc = 7; - }; 615E2397115F023B00B0ACA1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */; @@ -559,26 +498,6 @@ vrLen = 122; vrLoc = 85; }; - 615E2398115F023B00B0ACA1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */; - name = "MainMenuViewController.m: 1"; - rLen = 0; - rLoc = 2; - rType = 0; - vrLen = 131; - vrLoc = 147; - }; - 615E2399115F023B00B0ACA1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; - name = "SplitViewRootController.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 120; - vrLoc = 262; - }; 615E239A115F023B00B0ACA1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */; @@ -594,40 +513,622 @@ fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */; name = "MasterViewController.m: 42"; rLen = 0; - rLoc = 1399; + rLoc = 1543; rType = 0; vrLen = 269; vrLoc = 1592; }; - 615F12B811655601002444F2 /* PBXTextBookmark */ = { + 615F12CE11655B21002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 147; + vrLoc = 0; + }; + 615F12CF11655B21002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798874114AA4D000BA94A9 /* SettingsViewController.h */; + name = "SettingsViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 128; + vrLoc = 45; + }; + 615F12FB116560D9002444F2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 32"; rLen = 0; rLoc = 1141; rType = 0; - vrLen = 361; - vrLoc = 1006; + vrLen = 185; + vrLoc = 981; + }; + 615F1316116561BE002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; + name = "SDL_uikitappdelegate.h: 40"; + rLen = 0; + rLoc = 1430; + rType = 0; + vrLen = 331; + vrLoc = 1260; + }; + 615F1342116564A7002444F2 /* DisclosureDatailController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = DisclosureDatailController.h; + path = /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/DisclosureDatailController.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {532, 234}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 94}"; + sepNavWindowFrame = "{{94, 427}, {897, 692}}"; + }; + }; + 615F1343116564A7002444F2 /* DisclosureDatailController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = DisclosureDatailController.m; + path = /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/DisclosureDatailController.m; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {532, 377}}"; + sepNavSelRange = "{218, 26}"; + sepNavVisRange = "{201, 111}"; + sepNavWindowFrame = "{{733, 303}, {897, 692}}"; + }; + }; + 615F134D11656569002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798887114AA4E600BA94A9 /* GameSetup.h */; + name = "GameSetup.h: 13"; + rLen = 0; + rLoc = 254; + rType = 0; + vrLen = 135; + vrLoc = 169; + }; + 615F136A11656646002444F2 /* DisclosureButtonController.h */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.h; + name = DisclosureButtonController.h; + path = /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/DisclosureButtonController.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {537, 247}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{36, 122}"; + }; }; - 615F12BB11655601002444F2 /* PBXTextBookmark */ = { + 615F136B11656646002444F2 /* DisclosureButtonController.m */ = { + isa = PBXFileReference; + fileEncoding = 4; + lastKnownFileType = sourcecode.c.objc; + name = DisclosureButtonController.m; + path = /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/DisclosureButtonController.m; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1069, 2600}}"; + sepNavSelRange = "{5792, 0}"; + sepNavVisRange = "{0, 1429}"; + sepNavWindowFrame = "{{970, 210}, {895, 693}}"; + }; + }; + 615F13E811657001002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 153; + vrLoc = 229; + }; + 615F147F11659AC5002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 617987ED114AA34C00BA94A9 /* SDLh.pas */; + name = "SDLh.pas: 488"; + rLen = 0; + rLoc = 12867; + rType = 0; + vrLen = 150; + vrLoc = 12762; + }; + 615F148B11659BC2002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */; + name = "PopupMenuViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 159; + vrLoc = 0; + }; + 615F148C11659BC2002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */; + name = "PopupMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 155; + vrLoc = 0; + }; + 615F14A911659E9A002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EB115E71C20098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 153; + vrLoc = 0; + }; + 615F14AA11659E9A002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */; + name = "MainMenuViewController.m: 1"; + rLen = 0; + rLoc = 2; + rType = 0; + vrLen = 135; + vrLoc = 144; + }; + 615F14AC11659E9A002444F2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; - name = "PascalExports.pas: 10"; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + name = "DetailViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 147; + vrLoc = 30; + }; + 615F14AD11659E9A002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F1342116564A7002444F2 /* DisclosureDatailController.h */; + name = "DisclosureDatailController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 156; + vrLoc = 0; + }; + 615F14AE11659E9A002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136A11656646002444F2 /* DisclosureButtonController.h */; + name = "DisclosureButtonController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 158; + vrLoc = 0; + }; + 615F14B911659F40002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; + name = "GameSetup.m: 84"; + rLen = 0; + rLoc = 3164; + rType = 0; + vrLen = 222; + vrLoc = 1100; + }; + 615F15291165A792002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + name = "DisclosureButtonController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 162; + vrLoc = 36; + }; + 615F154C1165A976002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 13"; rLen = 0; - rLoc = 145; + rLoc = 267; + rType = 0; + vrLen = 167; + vrLoc = 157; + }; + 615F154D1165A976002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F1343116564A7002444F2 /* DisclosureDatailController.m */; + name = "DisclosureDatailController.m: 12"; + rLen = 26; + rLoc = 218; + rType = 0; + vrLen = 111; + vrLoc = 201; + }; + 615F154E1165A976002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */; + name = "OverlayViewController.h: 14"; + rLen = 0; + rLoc = 257; + rType = 0; + vrLen = 91; + vrLoc = 0; + }; + 615F15591165AA5C002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */; + name = "PopupMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 155; + vrLoc = 0; + }; + 615F157011661D95002444F2 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + }; + 615F157111661DA5002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */; + name = "PopupMenuViewController.h: 1"; + rLen = 0; + rLoc = 0; rType = 0; - vrLen = 743; + vrLen = 93; + vrLoc = 0; + }; + 615F157211661DA5002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 13"; + rLen = 0; + rLoc = 267; + rType = 0; + vrLen = 166; + vrLoc = 157; + }; + 615F157711661DA5002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 13"; + rLen = 0; + rLoc = 267; + rType = 0; + vrLen = 1427; + vrLoc = 0; + }; + 615F158011661FA4002444F2 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + }; + 615F158311662071002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 13"; + rLen = 0; + rLoc = 267; + rType = 0; + vrLen = 166; + vrLoc = 157; + }; + 615F158411662071002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F1342116564A7002444F2 /* DisclosureDatailController.h */; + name = "DisclosureDatailController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 94; vrLoc = 0; }; - 615F12C311655708002444F2 /* PBXTextBookmark */ = { + 615F158511662071002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F1343116564A7002444F2 /* DisclosureDatailController.m */; + name = "DisclosureDatailController.m: 12"; + rLen = 26; + rLoc = 218; + rType = 0; + vrLen = 111; + vrLoc = 201; + }; + 615F158611662071002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + name = "DisclosureButtonController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 139; + vrLoc = 59; + }; + 615F158711662071002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 76"; + rLen = 0; + rLoc = 2278; + rType = 0; + vrLen = 1890; + vrLoc = 1075; + }; + 615F158A11662071002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + name = "DisclosureButtonController.m: 102"; + rLen = 0; + rLoc = 3050; + rType = 0; + vrLen = 1320; + vrLoc = 1777; + }; + 615F158D11662090002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + name = "DisclosureButtonController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 100; + vrLoc = 59; + }; + 615F158E11662090002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + name = "DisclosureButtonController.m: 102"; + rLen = 0; + rLoc = 3014; + rType = 0; + vrLen = 1324; + vrLoc = 1777; + }; + 615F158F11662090002444F2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; - name = "SDL_uikitappdelegate.m: 32"; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 74"; + rLen = 0; + rLoc = 2209; + rType = 0; + vrLen = 1859; + vrLoc = 1075; + }; + 615F159C1166216A002444F2 /* TeamSettingsViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {836, 565}}"; + sepNavSelRange = "{328, 0}"; + sepNavVisRange = "{0, 400}"; + }; + }; + 615F159D1166216A002444F2 /* TeamSettingsViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {836, 2249}}"; + sepNavSelRange = "{234, 0}"; + sepNavVisRange = "{0, 1486}"; + sepNavWindowFrame = "{{610, 162}, {895, 693}}"; + }; + }; + 615F15AB1166270F002444F2 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; + }; + 615F15AC116628CC002444F2 /* SingleTeamViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {532, 221}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 94}"; + }; + }; + 615F15AD116628CC002444F2 /* SingleTeamViewController.m */ = { + uiCtxt = { + sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{4176, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{4227, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{4277, 12}\";\n s = 1;\n }\n );\n r = \"{0, 4973}\";\n s = 0;\n}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 2444}}"; + sepNavSelRange = "{2575, 0}"; + sepNavVisRange = "{2112, 1583}"; + sepNavWindowFrame = "{{153, 354}, {895, 693}}"; + }; + }; + 615F15B0116628F2002444F2 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */; + }; + 615F15B5116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + name = "DisclosureButtonController.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 139; + vrLoc = 59; + }; + 615F15B6116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; + name = "SplitViewRootController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 124; + vrLoc = 56; + }; + 615F15B7116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */; + name = "MasterViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 124; + vrLoc = 53; + }; + 615F15B8116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */; + name = "SplitViewRootController.m: 1"; rLen = 0; - rLoc = 1141; + rLoc = 0; + rType = 0; + vrLen = 152; + vrLoc = 229; + }; + 615F15B9116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; + name = "GameSetup.m: 84"; + rLen = 0; + rLoc = 3164; + rType = 0; + vrLen = 206; + vrLoc = 1116; + }; + 615F15BA116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; + name = "DetailViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 124; + vrLoc = 53; + }; + 615F15BB116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F159C1166216A002444F2 /* TeamSettingsViewController.h */; + name = "TeamSettingsViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 96; + vrLoc = 0; + }; + 615F15BC116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */; + name = "TeamSettingsViewController.m: 26"; + rLen = 0; + rLoc = 872; + rType = 0; + vrLen = 309; + vrLoc = 744; + }; + 615F15BD116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F15AC116628CC002444F2 /* SingleTeamViewController.h */; + name = "SingleTeamViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 94; + vrLoc = 0; + }; + 615F15BE116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F15AC116628CC002444F2 /* SingleTeamViewController.h */; + name = "SingleTeamViewController.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 57; + vrLoc = 0; + }; + 615F15BF116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; + name = "DetailViewController.m: 21"; + rLen = 0; + rLoc = 615; rType = 0; - vrLen = 361; - vrLoc = 1006; + vrLen = 2232; + vrLoc = 2115; + }; + 615F15C2116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */; + name = "SingleTeamViewController.m: 80"; + rLen = 0; + rLoc = 1696; + rType = 0; + vrLen = 1581; + vrLoc = 2112; + }; + 615F15C5116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; + name = "GameSetup.m: 84"; + rLen = 0; + rLoc = 3164; + rType = 0; + vrLen = 3225; + vrLoc = 1444; + }; + 615F15C8116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F159C1166216A002444F2 /* TeamSettingsViewController.h */; + name = "TeamSettingsViewController.h: 10"; + rLen = 0; + rLoc = 214; + rType = 0; + vrLen = 400; + vrLoc = 0; + }; + 615F15C9116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */; + name = "TeamSettingsViewController.m: 6"; + rLen = 0; + rLoc = 154; + rType = 0; + vrLen = 1481; + vrLoc = 0; + }; + 615F15CA116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */; + name = "TeamSettingsViewController.m: 10"; + rLen = 0; + rLoc = 234; + rType = 0; + vrLen = 1484; + vrLoc = 0; + }; + 615F15CB116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136A11656646002444F2 /* DisclosureButtonController.h */; + name = "DisclosureButtonController.h: 16"; + rLen = 45; + rLoc = 353; + rType = 0; + vrLen = 479; + vrLoc = 0; + }; + 615F15CC116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + name = "DisclosureButtonController.m: 75"; + rLen = 0; + rLoc = 2027; + rType = 0; + vrLen = 1330; + vrLoc = 1774; + }; + 615F15CD116629A0002444F2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 615F136B11656646002444F2 /* DisclosureButtonController.m */; + name = "DisclosureButtonController.m: 179"; + rLen = 0; + rLoc = 5792; + rType = 0; + vrLen = 1427; + vrLoc = 0; }; 61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -639,16 +1140,6 @@ vrLen = 250; vrLoc = 3; }; - 61697BB611634A2400CCDF37 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */; - name = "GameSetup.m: 83"; - rLen = 0; - rLoc = 3164; - rType = 0; - vrLen = 160; - vrLoc = 1161; - }; 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */ = { isa = PBXExecutable; activeArgIndices = ( @@ -761,9 +1252,9 @@ }; 617987ED114AA34C00BA94A9 /* SDLh.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 10582}}"; + sepNavIntBoundsRect = "{{0, 0}, {532, 10569}}"; sepNavSelRange = "{12867, 0}"; - sepNavVisRange = "{12812, 28}"; + sepNavVisRange = "{12762, 150}"; sepNavWindowFrame = "{{15, 455}, {927, 718}}"; }; }; @@ -984,9 +1475,9 @@ }; 6179880B114AA34C00BA94A9 /* uStore.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {824, 19786}}"; - sepNavSelRange = "{36904, 0}"; - sepNavVisRange = "{0, 1275}"; + sepNavIntBoundsRect = "{{0, 0}, {824, 19799}}"; + sepNavSelRange = "{36649, 0}"; + sepNavVisRange = "{36112, 1360}"; sepNavWindowFrame = "{{38, 478}, {803, 674}}"; }; }; @@ -1067,17 +1558,17 @@ }; 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {558, 585}}"; - sepNavSelRange = "{936, 0}"; - sepNavVisRange = "{936, 324}"; - sepNavWindowFrame = "{{841, 168}, {803, 674}}"; + sepNavIntBoundsRect = "{{0, 0}, {1004, 611}}"; + sepNavSelRange = "{1430, 0}"; + sepNavVisRange = "{1109, 510}"; + sepNavWindowFrame = "{{156, 236}, {803, 674}}"; }; }; 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {537, 1898}}"; - sepNavSelRange = "{1141, 0}"; - sepNavVisRange = "{1006, 361}"; + sepNavIntBoundsRect = "{{0, 0}, {796, 1885}}"; + sepNavSelRange = "{2651, 0}"; + sepNavVisRange = "{2048, 1631}"; sepNavWindowFrame = "{{156, 236}, {803, 674}}"; }; }; @@ -1106,9 +1597,9 @@ }; 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {901, 2405}}"; - sepNavSelRange = "{1464, 0}"; - sepNavVisRange = "{1158, 1025}"; + sepNavIntBoundsRect = "{{0, 0}, {901, 2431}}"; + sepNavSelRange = "{1601, 0}"; + sepNavVisRange = "{1080, 935}"; sepNavWindowFrame = "{{525, 308}, {775, 623}}"; }; }; @@ -1129,9 +1620,9 @@ }; 61798874114AA4D000BA94A9 /* SettingsViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {868, 717}}"; - sepNavSelRange = "{822, 67}"; - sepNavVisRange = "{0, 1130}"; + sepNavIntBoundsRect = "{{0, 0}, {551, 494}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{45, 128}"; sepNavWindowFrame = "{{38, 307}, {927, 845}}"; }; }; @@ -1175,17 +1666,17 @@ }; 61798887114AA4E600BA94A9 /* GameSetup.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1020, 742}}"; - sepNavSelRange = "{700, 0}"; - sepNavVisRange = "{0, 746}"; - sepNavWindowFrame = "{{61, 439}, {897, 692}}"; + sepNavIntBoundsRect = "{{0, 0}, {572, 416}}"; + sepNavSelRange = "{254, 0}"; + sepNavVisRange = "{169, 135}"; + sepNavWindowFrame = "{{761, 205}, {897, 692}}"; }; }; 61798888114AA4E600BA94A9 /* GameSetup.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1062, 4667}}"; - sepNavSelRange = "{840, 0}"; - sepNavVisRange = "{131, 1623}"; + sepNavIntBoundsRect = "{{0, 0}, {1412, 4446}}"; + sepNavSelRange = "{3164, 0}"; + sepNavVisRange = "{1444, 3377}"; sepNavWindowFrame = "{{760, 256}, {1079, 870}}"; }; }; @@ -1246,26 +1737,6 @@ rLen = 0; rLoc = 9223372036854775808; }; - 61AB99EB1162CC3100B1CF7E /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61CE24EA115E71C20098C467 /* OverlayViewController.h */; - name = "OverlayViewController.h: 14"; - rLen = 0; - rLoc = 281; - rType = 0; - vrLen = 31; - vrLoc = 0; - }; - 61CCBDA11160666200833FE8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */; - name = "DetailViewController.m: 13"; - rLen = 0; - rLoc = 229; - rType = 0; - vrLen = 83; - vrLoc = 229; - }; 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798800114AA34C00BA94A9 /* uLandGraphics.pas */; @@ -1286,16 +1757,6 @@ vrLen = 125; vrLoc = 3102; }; - 61CCBF1F116162CA00833FE8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 617987ED114AA34C00BA94A9 /* SDLh.pas */; - name = "SDLh.pas: 488"; - rLen = 0; - rLoc = 12867; - rType = 0; - vrLen = 28; - vrLoc = 12812; - }; 61CCBF451161637F00833FE8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 617987F0114AA34C00BA94A9 /* SinTable.inc */; @@ -1486,16 +1947,6 @@ vrLen = 148; vrLoc = 22940; }; - 61CCBFDD1161833800833FE8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61CE24EB115E71C20098C467 /* OverlayViewController.m */; - name = "OverlayViewController.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 153; - vrLoc = 0; - }; 61CE23E7115E49560098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 6179880F114AA34C00BA94A9 /* uWorld.pas */; @@ -1514,16 +1965,6 @@ isa = PBXBookmark; fRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */; }; - 61CE24D4115E5E630098C467 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */; - name = "DetailViewController.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 174; - vrLoc = 3; - }; 61CE24DC115E641F0098C467 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */; @@ -1536,33 +1977,34 @@ }; 61CE24EA115E71C20098C467 /* OverlayViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1004, 494}}"; - sepNavSelRange = "{281, 0}"; - sepNavVisRange = "{0, 395}"; + sepNavIntBoundsRect = "{{0, 0}, {532, 455}}"; + sepNavSelRange = "{257, 0}"; + sepNavVisRange = "{0, 91}"; sepNavWindowFrame = "{{15, 206}, {938, 967}}"; }; }; 61CE24EB115E71C20098C467 /* OverlayViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 3848}}"; + sepNavIntBoundsRect = "{{0, 0}, {532, 3406}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 153}"; - sepNavWindowFrame = "{{38, 185}, {938, 967}}"; + sepNavWindowFrame = "{{586, 162}, {938, 967}}"; }; }; 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {873, 273}}"; + sepNavIntBoundsRect = "{{0, 0}, {532, 260}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{3, 152}"; + sepNavVisRange = "{0, 93}"; + sepNavWindowFrame = "{{530, 457}, {897, 692}}"; }; }; 61CE24ED115E71C20098C467 /* PopupMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 1807}}"; + sepNavIntBoundsRect = "{{0, 0}, {532, 1612}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{7, 149}"; - sepNavWindowFrame = "{{15, 206}, {938, 967}}"; + sepNavVisRange = "{0, 159}"; + sepNavWindowFrame = "{{530, 457}, {897, 692}}"; }; }; 61CE250B115E749A0098C467 /* OverlayViewController.h */ = { @@ -1629,16 +2071,6 @@ vrLen = 488; vrLoc = 3790; }; - 61CE25B5115E7C940098C467 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 61CE24EC115E71C20098C467 /* PopupMenuViewController.h */; - name = "PopupMenuViewController.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 152; - vrLoc = 3; - }; 61E2F0811156B170002D33C1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 617987F6114AA34C00BA94A9 /* uChat.pas */; @@ -1651,17 +2083,17 @@ }; 61FA761D115DA0DB00DA6ED0 /* MainMenuViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {532, 312}}"; + sepNavIntBoundsRect = "{{0, 0}, {868, 717}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{85, 122}"; + sepNavVisRange = "{0, 427}"; sepNavWindowFrame = "{{275, 284}, {927, 845}}"; }; }; 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {824, 2288}}"; + sepNavIntBoundsRect = "{{0, 0}, {901, 2145}}"; sepNavSelRange = "{2, 0}"; - sepNavVisRange = "{147, 131}"; + sepNavVisRange = "{144, 135}"; sepNavWindowFrame = "{{815, 219}, {927, 845}}"; }; }; @@ -1669,48 +2101,48 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {579, 299}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{3, 177}"; - sepNavWindowFrame = "{{750, 197}, {927, 845}}"; + sepNavVisRange = "{56, 124}"; + sepNavWindowFrame = "{{213, 231}, {927, 845}}"; }; }; 61FA7645115DA6A300DA6ED0 /* SplitViewRootController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {663, 793}}"; + sepNavIntBoundsRect = "{{0, 0}, {943, 1144}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{262, 120}"; + sepNavVisRange = "{229, 152}"; sepNavWindowFrame = "{{60, 197}, {927, 845}}"; }; }; 61FA765A115DAACC00DA6ED0 /* MasterViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {868, 717}}"; - sepNavSelRange = "{426, 51}"; - sepNavVisRange = "{0, 483}"; + sepNavIntBoundsRect = "{{0, 0}, {586, 325}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{53, 124}"; sepNavWindowFrame = "{{199, 160}, {927, 845}}"; }; }; 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 1612}}"; - sepNavSelRange = "{3308, 10}"; - sepNavVisRange = "{2508, 1654}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 1664}}"; + sepNavSelRange = "{3057, 0}"; + sepNavVisRange = "{2239, 2059}"; sepNavWindowFrame = "{{92, 210}, {927, 845}}"; }; }; 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {868, 692}}"; - sepNavSelRange = "{678, 13}"; - sepNavVisRange = "{0, 939}"; - sepNavWindowFrame = "{{862, 170}, {927, 845}}"; + sepNavIntBoundsRect = "{{0, 0}, {868, 717}}"; + sepNavSelRange = "{365, 1}"; + sepNavVisRange = "{0, 565}"; + sepNavWindowFrame = "{{364, 237}, {927, 845}}"; }; }; 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1146, 1781}}"; - sepNavSelRange = "{229, 0}"; - sepNavVisRange = "{229, 83}"; - sepNavWindowFrame = "{{862, 170}, {927, 845}}"; + sepNavIntBoundsRect = "{{0, 0}, {1503, 1677}}"; + sepNavSelRange = "{753, 0}"; + sepNavVisRange = "{0, 1517}"; + sepNavWindowFrame = "{{543, 159}, {927, 845}}"; }; }; 928301160F10CAFC00CC5A3C /* fpc */ = {