# HG changeset patch
# User koda
# Date 1270603325 0
# Node ID 52f0482b043f266369201e27eca7c8640a624967
# Parent 4e281371335842e0f377d3bf40cf190b2104e333
fix a couple of leaks in hte ifrontend
diff -r 4e2813713358 -r 52f0482b043f cocoaTouch/DetailViewController.m
--- a/cocoaTouch/DetailViewController.m Tue Apr 06 21:54:46 2010 +0000
+++ b/cocoaTouch/DetailViewController.m Wed Apr 07 01:22:05 2010 +0000
@@ -17,10 +17,8 @@
- (void)viewDidLoad {
self.title = NSLocalizedString(@"Settings",@"");
-
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
- self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0 target:self action:@selector(dismissSplitView)];
+ // allocate controllers and store them into the array
NSMutableArray *array= [[NSMutableArray alloc] init];
GeneralSettingsViewController *generalSettingsViewController = [[GeneralSettingsViewController alloc]
@@ -37,14 +35,22 @@
self.controllers = array;
[array release];
-
+
+ // on ipad make the general setting the first view, on iphone add the "Done" button on top left
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+ UITableViewController *nextController = [self.controllers objectAtIndex:0];
+ nextController.navigationItem.hidesBackButton = YES;
+ [self.navigationController pushViewController:nextController animated:NO];
+ } else {
+ self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0 target:self action:@selector(dismissSplitView)];
+ }
+
[super viewDidLoad];
}
- (void)didReceiveMemoryWarning {
// Releases the view if it doesn't have a superview.
[super didReceiveMemoryWarning];
-
// Release any cached data, images, etc that aren't in use.
}
@@ -131,6 +137,7 @@
self.popoverController = nil;
}
#endif
+
#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.
diff -r 4e2813713358 -r 52f0482b043f cocoaTouch/HogHatViewController.m
--- a/cocoaTouch/HogHatViewController.m Tue Apr 06 21:54:46 2010 +0000
+++ b/cocoaTouch/HogHatViewController.m Wed Apr 07 01:22:05 2010 +0000
@@ -25,9 +25,10 @@
// load all the hat images from the previous array but save only the first sprite and store it in hatSprites
NSMutableArray *spriteArray = [[NSMutableArray alloc] initWithCapacity:[hatArray count]];
for (int i=0; i< [hatArray count]; i++) {
- NSString *hatFile = [hatPath stringByAppendingString:[hatArray objectAtIndex:i]];
+ NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/Data/Graphics/Hats/%@",[[NSBundle mainBundle] resourcePath],[hatArray objectAtIndex:i]];
UIImage *image = [[UIImage alloc] initWithContentsOfFile: hatFile];
+ [hatFile release];
CGRect firstSpriteArea = CGRectMake(0, 0, 32, 32);
CGImageRef cgImgage = CGImageCreateWithImageInRect([image CGImage], firstSpriteArea);
[image release];
diff -r 4e2813713358 -r 52f0482b043f cocoaTouch/MasterViewController.h
--- a/cocoaTouch/MasterViewController.h Tue Apr 06 21:54:46 2010 +0000
+++ b/cocoaTouch/MasterViewController.h Wed Apr 07 01:22:05 2010 +0000
@@ -15,11 +15,13 @@
DetailViewController *detailViewController;
NSArray *optionList;
NSArray *controllers;
+ NSIndexPath *lastIndexPath;
}
@property (nonatomic, retain) DetailViewController *detailViewController;
@property (nonatomic, retain) NSArray *optionList;
@property (nonatomic, retain) NSArray *controllers;
+@property (nonatomic, retain) NSIndexPath *lastIndexPath;
-(IBAction) dismissSplitView;
diff -r 4e2813713358 -r 52f0482b043f cocoaTouch/MasterViewController.m
--- a/cocoaTouch/MasterViewController.m Tue Apr 06 21:54:46 2010 +0000
+++ b/cocoaTouch/MasterViewController.m Wed Apr 07 01:22:05 2010 +0000
@@ -12,23 +12,24 @@
#import "TeamSettingsViewController.h"
@implementation MasterViewController
-@synthesize detailViewController, optionList, controllers;
+@synthesize detailViewController, optionList, controllers, lastIndexPath;
#pragma mark -
#pragma mark View lifecycle
-
-
- (void)viewDidLoad {
[super viewDidLoad];
+
+ // the list of selectable controllers
optionList = [[NSArray alloc] initWithObjects:NSLocalizedString(@"General",@""),
NSLocalizedString(@"Teams",@""),
NSLocalizedString(@"Weapons",@""),
NSLocalizedString(@"Schemes",@""),
nil];
+ // the "Done" button on top left
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0
target:self
action:@selector(dismissSplitView)];
-
+ // list of allocated viewcontrollers (same in DetailViewController)
NSMutableArray *array= [[NSMutableArray alloc] init];
GeneralSettingsViewController *generalSettingsViewController = [[GeneralSettingsViewController alloc]
@@ -47,10 +48,6 @@
self.controllers = 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 {
@@ -115,12 +112,18 @@
#pragma mark -
#pragma mark Table view delegate
-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ int newRow = [indexPath row];
+ int oldRow = (lastIndexPath != nil) ? [lastIndexPath row] : 0;
- [detailViewController.navigationController popToRootViewControllerAnimated:NO];
-
- NSInteger row = [indexPath row];
- UITableViewController *nextController = [self.controllers objectAtIndex:row];
- [detailViewController.navigationController pushViewController:nextController animated:YES];
+ if (newRow != oldRow) {
+ [detailViewController.navigationController popToRootViewControllerAnimated:NO];
+
+ UITableViewController *nextController = [self.controllers objectAtIndex:[indexPath row]];
+ [detailViewController.navigationController pushViewController:nextController animated:YES];
+ self.lastIndexPath = indexPath;
+ [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
+ }
+ [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
}
@@ -129,7 +132,6 @@
-(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.
}
diff -r 4e2813713358 -r 52f0482b043f cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Tue Apr 06 21:54:46 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h Wed Apr 07 01:22:05 2010 +0000
@@ -30,14 +30,12 @@
SDL_Window *window;
UIWindow *uiwindow;
MainMenuViewController *viewController;
- OverlayViewController *overlayController;
BOOL isInGame;
}
@property (readwrite, assign) SDL_Window *window;
@property (readwrite, retain) UIWindow *uiwindow;
@property (nonatomic, retain) MainMenuViewController *viewController;
-@property (nonatomic, retain) OverlayViewController *overlayController;
+(SDLUIKitDelegate *)sharedAppDelegate;
-(NSString *)dataFilePath:(NSString *)fileName;
diff -r 4e2813713358 -r 52f0482b043f cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m
--- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Tue Apr 06 21:54:46 2010 +0000
+++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Apr 07 01:22:05 2010 +0000
@@ -35,7 +35,17 @@
#undef main
#endif
+#define VALGRIND "/opt/valgrind/bin/valgrind"
+
int main (int argc, char *argv[]) {
+#ifdef VALGRIND_REXEC
+ // Using the valgrind build config, rexec ourself in valgrind
+ // from http://landonf.bikemonkey.org/code/iphone/iPhone_Simulator_Valgrind.20081224.html
+ if (argc < 2 || (argc >= 2 && strcmp(argv[1], "-valgrind") != 0)) {
+ execl(VALGRIND, VALGRIND, "--leak-check=full", "--show-reachable=yes", argv[0], "-valgrind", NULL);
+ }
+#endif
+
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
int retVal = UIApplicationMain(argc, argv, nil, @"SDLUIKitDelegate");
[pool release];
@@ -43,7 +53,7 @@
}
@implementation SDLUIKitDelegate
-@synthesize uiwindow, window, viewController, overlayController;
+@synthesize uiwindow, window, viewController;
// convenience method
+(SDLUIKitDelegate *)sharedAppDelegate {
@@ -56,7 +66,6 @@
self.uiwindow = nil;
self.window = NULL;
self.viewController = nil;
- self.overlayController = nil;
isInGame = NO;
return self;
} else
@@ -78,6 +87,7 @@
const char **gameArgs = [setup getSettings];
[setup release];
+ OverlayViewController *overlayController;
// overlay with controls, become visible after 2 seconds
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController-iPad" bundle:nil];
diff -r 4e2813713358 -r 52f0482b043f cocoaTouch/SingleTeamViewController.m
--- a/cocoaTouch/SingleTeamViewController.m Tue Apr 06 21:54:46 2010 +0000
+++ b/cocoaTouch/SingleTeamViewController.m Wed Apr 07 01:22:05 2010 +0000
@@ -60,6 +60,7 @@
NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/Data/Graphics/Hats/%@.png",[[NSBundle mainBundle] resourcePath],[hog objectForKey:@"hat"]];
UIImage *image = [[UIImage alloc] initWithContentsOfFile: hatFile];
+ [hatFile release];
CGRect firstSpriteArea = CGRectMake(0, 0, 32, 32);
CGImageRef cgImgage = CGImageCreateWithImageInRect([image CGImage], firstSpriteArea);
[image release];
diff -r 4e2813713358 -r 52f0482b043f project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Tue Apr 06 21:54:46 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Wed Apr 07 01:22:05 2010 +0000
@@ -197,7 +197,88 @@
Notifications
OpenEditors
-
+
+
+ Content
+
+ PBXProjectModuleGUID
+ 6105637F116C0393003C420C
+ PBXProjectModuleLabel
+ HogHatViewController.m
+ PBXSplitModuleInNavigatorKey
+
+ Split0
+
+ PBXProjectModuleGUID
+ 61056380116C0393003C420C
+ PBXProjectModuleLabel
+ HogHatViewController.m
+ _historyCapacity
+ 0
+ bookmark
+ 61056381116C0393003C420C
+ history
+
+ 61056362116C0172003C420C
+
+
+ SplitCount
+ 1
+
+ StatusBarVisibility
+
+
+ Geometry
+
+ Frame
+ {{0, 20}, {1058, 695}}
+ PBXModuleWindowStatusBarHidden2
+
+ RubberWindowFrame
+ 861 306 1058 736 0 0 1920 1178
+
+
+
+ Content
+
+ PBXProjectModuleGUID
+ 61056382116C0393003C420C
+ PBXProjectModuleLabel
+ SingleTeamViewController.m
+ PBXSplitModuleInNavigatorKey
+
+ Split0
+
+ PBXProjectModuleGUID
+ 61056383116C0393003C420C
+ PBXProjectModuleLabel
+ SingleTeamViewController.m
+ _historyCapacity
+ 0
+ bookmark
+ 61056384116C0393003C420C
+ history
+
+ 6105636C116C01D5003C420C
+
+
+ SplitCount
+ 1
+
+ StatusBarVisibility
+
+
+ Geometry
+
+ Frame
+ {{0, 20}, {1058, 695}}
+ PBXModuleWindowStatusBarHidden2
+
+ RubberWindowFrame
+ 530 202 1058 736 0 0 1920 1178
+
+
+
PerspectiveWidths
-1
@@ -229,6 +310,8 @@
Layout
+ BecomeActive
+
ContentConfiguration
PBXBottomSmartGroupGIDs
@@ -276,12 +359,16 @@
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 43
+ 19
+ 15
+ 5
+ 4
+ 2
0
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
- {{0, 394}, {235, 558}}
+ {{0, 81}, {235, 558}}
PBXTopSmartGroupGIDs
@@ -300,7 +387,7 @@
235
RubberWindowFrame
- 162 341 801 617 0 0 1920 1178
+ 48 186 801 617 0 0 1920 1178
Module
PBXSmartGroupTreeModule
@@ -316,7 +403,7 @@
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- Default-Landscape.png
+ MasterViewController.m
PBXSplitModuleInNavigatorKey
Split0
@@ -324,11 +411,11 @@
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
PBXProjectModuleLabel
- Default-Landscape.png
+ MasterViewController.m
_historyCapacity
0
bookmark
- 6122CD09116BED82002648E9
+ 6105637C116C0393003C420C
history
6179889D114AA5BD00BA94A9
@@ -396,15 +483,17 @@
61CEDB60116ACBBB0067BAFC
61CEDC94116ADCB80067BAFC
611B0AC6116B6E8B00112153
- 611B0AC7116B6E8B00112153
611B0AC8116B6E8B00112153
611B0B84116B817C00112153
611B0BE9116BA1CC00112153
611B0C42116BAF3A00112153
61DFFE27116BC80100EA93BB
- 6122CC91116BE651002648E9
6122CD06116BECE0002648E9
- 6122CD07116BECE0002648E9
+ 61056377116C0393003C420C
+ 61056378116C0393003C420C
+ 61056379116C0393003C420C
+ 6105637A116C0393003C420C
+ 6105637B116C0393003C420C
SplitCount
@@ -416,18 +505,16 @@
GeometryConfiguration
Frame
- {{0, 0}, {544, 171}}
+ {{0, 0}, {544, 156}}
RubberWindowFrame
- 162 341 801 617 0 0 1920 1178
+ 48 186 801 617 0 0 1920 1178
Module
PBXNavigatorGroup
Proportion
- 171pt
+ 156pt
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
@@ -438,14 +525,14 @@
GeometryConfiguration
Frame
- {{0, 176}, {544, 400}}
+ {{0, 161}, {544, 415}}
RubberWindowFrame
- 162 341 801 617 0 0 1920 1178
+ 48 186 801 617 0 0 1920 1178
Module
XCDetailModule
Proportion
- 400pt
+ 415pt
Proportion
@@ -464,9 +551,9 @@
TableOfContents
- 6122CB05116BC967002648E9
+ 6105637D116C0393003C420C
1CE0B1FE06471DED0097A5F4
- 6122CB06116BC967002648E9
+ 6105637E116C0393003C420C
1CE0B20306471E060097A5F4
1CE0B20506471E060097A5F4
@@ -604,15 +691,17 @@
5
WindowOrderList
- 6122CB1F116BC991002648E9
- 6122CB12116BC967002648E9
+ 6105638D116C0393003C420C
+ 6105638E116C0393003C420C
1C78EAAD065D492600B07095
1CD10A99069EF8BA00B06720
61798848114AA42600BA94A9
/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj
+ 61056382116C0393003C420C
+ 6105637F116C0393003C420C
WindowString
- 162 341 801 617 0 0 1920 1178
+ 48 186 801 617 0 0 1920 1178
WindowToolsV3
@@ -628,14 +717,12 @@
Dock
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
1CD0528F0623707200166675
PBXProjectModuleLabel
- HogHatViewController.m
+
StatusBarVisibility
@@ -691,7 +778,7 @@
TableOfContents
61798848114AA42600BA94A9
- 6122CB09116BC967002648E9
+ 61056385116C0393003C420C
1CD0528F0623707200166675
XCMainBuildResultsModuleGUID
@@ -815,13 +902,13 @@
TableOfContents
1CD10A99069EF8BA00B06720
- 6122CB0A116BC967002648E9
+ 61056386116C0393003C420C
1C162984064C10D400B95A72
- 6122CB0B116BC967002648E9
- 6122CB0C116BC967002648E9
- 6122CB0D116BC967002648E9
- 6122CB0E116BC967002648E9
- 6122CB0F116BC967002648E9
+ 61056387116C0393003C420C
+ 61056388116C0393003C420C
+ 61056389116C0393003C420C
+ 6105638A116C0393003C420C
+ 6105638B116C0393003C420C
ToolbarConfiguration
xcode.toolbar.config.debugV3
@@ -948,8 +1035,6 @@
Dock
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
@@ -985,7 +1070,7 @@
TableOfContents
1C78EAAD065D492600B07095
- 6122CB10116BC967002648E9
+ 6105638C116C0393003C420C
1C78EAAC065D492600B07095
ToolbarConfiguration
diff -r 4e2813713358 -r 52f0482b043f project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Tue Apr 06 21:54:46 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Wed Apr 07 01:22:05 2010 +0000
@@ -9,7 +9,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
activeBuildConfigurationName = Debug;
activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */;
- activeSDKPreference = iphonesimulator3.2;
+ activeSDKPreference = iphonesimulator3.0;
activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */;
addToTargets = (
1D6058900D05DD3D006BFB54 /* HedgewarsMobile */,
@@ -107,85 +107,95 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 292276574;
- PBXWorkspaceStateSaveDate = 292276574;
+ PBXPerProjectTemplateStateSaveDate = 292289473;
+ PBXWorkspaceStateSaveDate = 292289473;
};
perUserProjectItems = {
- 611B0AC6116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */;
- 611B0AC7116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC7116B6E8B00112153 /* PBXTextBookmark */;
- 611B0AC8116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC8116B6E8B00112153 /* PBXTextBookmark */;
- 611B0B84116B817C00112153 /* PBXTextBookmark */ = 611B0B84116B817C00112153 /* PBXTextBookmark */;
- 611B0BE9116BA1CC00112153 /* PBXTextBookmark */ = 611B0BE9116BA1CC00112153 /* PBXTextBookmark */;
- 611B0C42116BAF3A00112153 /* PBXTextBookmark */ = 611B0C42116BAF3A00112153 /* PBXTextBookmark */;
- 611FD81D1155111700C2203D /* PBXTextBookmark */ = 611FD81D1155111700C2203D /* PBXTextBookmark */;
- 611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */;
- 611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */;
- 611FD8211155111700C2203D /* PBXTextBookmark */ = 611FD8211155111700C2203D /* PBXTextBookmark */;
- 611FD95711551C3700C2203D /* PBXTextBookmark */ = 611FD95711551C3700C2203D /* PBXTextBookmark */;
- 611FD95811551C3700C2203D /* PBXBookmark */ = 611FD95811551C3700C2203D /* PBXBookmark */;
- 611FD95911551C3700C2203D /* PBXBookmark */ = 611FD95911551C3700C2203D /* PBXBookmark */;
- 611FD96611551E8000C2203D /* PBXBookmark */ = 611FD96611551E8000C2203D /* PBXBookmark */;
- 611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
- 611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
- 611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
- 6122CC91116BE651002648E9 /* PBXTextBookmark */ = 6122CC91116BE651002648E9 /* PBXTextBookmark */;
- 6122CD06116BECE0002648E9 /* PBXTextBookmark */ = 6122CD06116BECE0002648E9 /* PBXTextBookmark */;
- 6122CD07116BECE0002648E9 /* PBXBookmark */ = 6122CD07116BECE0002648E9 /* PBXBookmark */;
- 6122CD09116BED82002648E9 /* PBXBookmark */ = 6122CD09116BED82002648E9 /* PBXBookmark */;
- 612D5C451165535400C6D842 /* PBXTextBookmark */ = 612D5C451165535400C6D842 /* PBXTextBookmark */;
- 612D616B1165536300C6D842 /* PBXTextBookmark */ = 612D616B1165536300C6D842 /* PBXTextBookmark */;
- 612D618F1165545F00C6D842 /* PBXTextBookmark */ = 612D618F1165545F00C6D842 /* PBXTextBookmark */;
- 61430D3B1165551600E2C62D /* PBXTextBookmark */ = 61430D3B1165551600E2C62D /* PBXTextBookmark */;
- 61430D3D1165551600E2C62D /* PBXTextBookmark */ = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
- 615F1316116561BE002444F2 /* PBXTextBookmark */ = 615F1316116561BE002444F2 /* PBXTextBookmark */;
- 615F134D11656569002444F2 /* PBXTextBookmark */ = 615F134D11656569002444F2 /* PBXTextBookmark */;
- 615F147F11659AC5002444F2 /* PBXTextBookmark */ = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
- 615F198C1166A71E002444F2 /* PBXBookmark */ = 615F198C1166A71E002444F2 /* PBXBookmark */;
- 615F198E1166A71E002444F2 /* PBXTextBookmark */ = 615F198E1166A71E002444F2 /* PBXTextBookmark */;
- 615F19911166A71E002444F2 /* PBXTextBookmark */ = 615F19911166A71E002444F2 /* PBXTextBookmark */;
- 61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
- 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
- 61799342114B297000BA94A9 /* PBXBookmark */ = 61799342114B297000BA94A9 /* PBXBookmark */;
- 61799343114B297000BA94A9 /* PBXBookmark */ = 61799343114B297000BA94A9 /* PBXBookmark */;
- 6179937111501D7800BA94A9 /* PBXBookmark */ = 6179937111501D7800BA94A9 /* PBXBookmark */;
- 6179937411501D7800BA94A9 /* PBXBookmark */ = 6179937411501D7800BA94A9 /* PBXBookmark */;
- 6179937511501D7800BA94A9 /* PBXBookmark */ = 6179937511501D7800BA94A9 /* PBXBookmark */;
- 6179938511501FFA00BA94A9 /* PBXBookmark */ = 6179938511501FFA00BA94A9 /* PBXBookmark */;
- 6179943111502CEA00BA94A9 /* PBXBookmark */ = 6179943111502CEA00BA94A9 /* PBXBookmark */;
- 618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */;
- 6194CC0711505FCF00A4BA5C /* PlistBookmark */ = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
- 61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
- 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
- 61CCBF451161637F00833FE8 /* PBXTextBookmark */ = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF461161637F00833FE8 /* PBXTextBookmark */ = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF471161637F00833FE8 /* PBXTextBookmark */ = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
- 61CCBF791161657400833FE8 /* PBXTextBookmark */ = 61CCBF791161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7B1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7C1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7E1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
- 61CCBF7F1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
- 61CCBFD11161833800833FE8 /* PBXTextBookmark */ = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD21161833800833FE8 /* PBXTextBookmark */ = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD31161833800833FE8 /* PBXTextBookmark */ = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD41161833800833FE8 /* PBXTextBookmark */ = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD51161833800833FE8 /* PBXTextBookmark */ = 61CCBFD51161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD71161833800833FE8 /* PBXTextBookmark */ = 61CCBFD71161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD81161833800833FE8 /* PBXTextBookmark */ = 61CCBFD81161833800833FE8 /* PBXTextBookmark */;
- 61CCBFD91161833800833FE8 /* PBXTextBookmark */ = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDA1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDB1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
- 61CCBFDC1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
- 61CE23E7115E49560098C467 /* PBXTextBookmark */ = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
- 61CE23FF115E4B290098C467 /* PBXBookmark */ = 61CE23FF115E4B290098C467 /* PBXBookmark */;
- 61CE2514115E74CC0098C467 /* PBXBookmark */ = 61CE2514115E74CC0098C467 /* PBXBookmark */;
- 61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */;
- 61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */ = 61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */;
- 61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */ = 61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */;
- 61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */;
- 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
- 61CEDC94116ADCB80067BAFC /* PBXTextBookmark */ = 61CEDC94116ADCB80067BAFC /* PBXTextBookmark */;
- 61DFFE27116BC80100EA93BB /* PBXTextBookmark */ = 61DFFE27116BC80100EA93BB /* PBXTextBookmark */;
- 61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
+ 61056362116C0172003C420C /* PBXBookmark */ = 61056362116C0172003C420C /* PBXBookmark */;
+ 6105636C116C01D5003C420C /* PBXBookmark */ = 6105636C116C01D5003C420C /* PBXBookmark */;
+ 61056377116C0393003C420C /* PBXBookmark */ = 61056377116C0393003C420C /* PBXBookmark */;
+ 61056378116C0393003C420C /* PBXTextBookmark */ = 61056378116C0393003C420C /* PBXTextBookmark */;
+ 61056379116C0393003C420C /* PBXTextBookmark */ = 61056379116C0393003C420C /* PBXTextBookmark */;
+ 6105637A116C0393003C420C /* PBXTextBookmark */ = 6105637A116C0393003C420C /* PBXTextBookmark */;
+ 6105637B116C0393003C420C /* PBXBookmark */ = 6105637B116C0393003C420C /* PBXBookmark */;
+ 6105637C116C0393003C420C /* PBXTextBookmark */ = 6105637C116C0393003C420C /* PBXTextBookmark */;
+ 61056381116C0393003C420C /* PBXTextBookmark */ = 61056381116C0393003C420C /* PBXTextBookmark */;
+ 61056384116C0393003C420C /* PBXTextBookmark */ = 61056384116C0393003C420C /* PBXTextBookmark */;
+ 611B0AC6116B6E8B00112153 = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */;
+ 611B0AC7116B6E8B00112153 = 611B0AC7116B6E8B00112153 /* PBXTextBookmark */;
+ 611B0AC8116B6E8B00112153 = 611B0AC8116B6E8B00112153 /* PBXTextBookmark */;
+ 611B0B84116B817C00112153 = 611B0B84116B817C00112153 /* PBXTextBookmark */;
+ 611B0BE9116BA1CC00112153 = 611B0BE9116BA1CC00112153 /* PBXTextBookmark */;
+ 611B0C42116BAF3A00112153 = 611B0C42116BAF3A00112153 /* PBXTextBookmark */;
+ 611FD81D1155111700C2203D = 611FD81D1155111700C2203D /* PBXTextBookmark */;
+ 611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */;
+ 611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */;
+ 611FD8211155111700C2203D = 611FD8211155111700C2203D /* PBXTextBookmark */;
+ 611FD95711551C3700C2203D = 611FD95711551C3700C2203D /* PBXTextBookmark */;
+ 611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* PBXBookmark */;
+ 611FD95911551C3700C2203D = 611FD95911551C3700C2203D /* PBXBookmark */;
+ 611FD96611551E8000C2203D = 611FD96611551E8000C2203D /* PBXBookmark */;
+ 611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
+ 611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
+ 611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
+ 6122CC91116BE651002648E9 = 6122CC91116BE651002648E9 /* PBXTextBookmark */;
+ 6122CD06116BECE0002648E9 = 6122CD06116BECE0002648E9 /* PBXTextBookmark */;
+ 6122CD07116BECE0002648E9 = 6122CD07116BECE0002648E9 /* PBXBookmark */;
+ 6122CD09116BED82002648E9 = 6122CD09116BED82002648E9 /* PBXBookmark */;
+ 612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */;
+ 612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */;
+ 612D618F1165545F00C6D842 = 612D618F1165545F00C6D842 /* PBXTextBookmark */;
+ 61430D3B1165551600E2C62D = 61430D3B1165551600E2C62D /* PBXTextBookmark */;
+ 61430D3D1165551600E2C62D = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
+ 615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */;
+ 615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */;
+ 615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
+ 615F198C1166A71E002444F2 = 615F198C1166A71E002444F2 /* PBXBookmark */;
+ 615F198E1166A71E002444F2 = 615F198E1166A71E002444F2 /* PBXTextBookmark */;
+ 615F19911166A71E002444F2 = 615F19911166A71E002444F2 /* PBXTextBookmark */;
+ 61697B9E1163478A00CCDF37 = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
+ 6179889D114AA5BD00BA94A9 = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
+ 61799342114B297000BA94A9 = 61799342114B297000BA94A9 /* PBXBookmark */;
+ 61799343114B297000BA94A9 = 61799343114B297000BA94A9 /* PBXBookmark */;
+ 6179937111501D7800BA94A9 = 6179937111501D7800BA94A9 /* PBXBookmark */;
+ 6179937411501D7800BA94A9 = 6179937411501D7800BA94A9 /* PBXBookmark */;
+ 6179937511501D7800BA94A9 = 6179937511501D7800BA94A9 /* PBXBookmark */;
+ 6179938511501FFA00BA94A9 = 6179938511501FFA00BA94A9 /* PBXBookmark */;
+ 6179943111502CEA00BA94A9 = 6179943111502CEA00BA94A9 /* PBXBookmark */;
+ 618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */;
+ 6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
+ 61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
+ 61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
+ 61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
+ 61CCBF791161657400833FE8 = 61CCBF791161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7B1161657400833FE8 = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7C1161657400833FE8 = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7E1161657400833FE8 = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBF7F1161657400833FE8 = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
+ 61CCBFD11161833800833FE8 = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD21161833800833FE8 = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD31161833800833FE8 = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD41161833800833FE8 = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD51161833800833FE8 = 61CCBFD51161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD71161833800833FE8 = 61CCBFD71161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD81161833800833FE8 = 61CCBFD81161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFD91161833800833FE8 = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDA1161833800833FE8 = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDB1161833800833FE8 = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
+ 61CCBFDC1161833800833FE8 = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
+ 61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
+ 61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */;
+ 61CE2514115E74CC0098C467 = 61CE2514115E74CC0098C467 /* PBXBookmark */;
+ 61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */;
+ 61CEDAA1116ABECE0067BAFC = 61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */;
+ 61CEDAA2116ABECE0067BAFC = 61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */;
+ 61CEDB5F116ACBBB0067BAFC = 61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */;
+ 61CEDB60116ACBBB0067BAFC = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
+ 61CEDC94116ADCB80067BAFC = 61CEDC94116ADCB80067BAFC /* PBXTextBookmark */;
+ 61DFFE27116BC80100EA93BB = 61DFFE27116BC80100EA93BB /* PBXTextBookmark */;
+ 61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
};
sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
userBuildSettings = {
@@ -198,6 +208,82 @@
sepNavVisRange = "{106, 119}";
};
};
+ 61056362116C0172003C420C /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
+ };
+ 6105636C116C01D5003C420C /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
+ };
+ 61056377116C0393003C420C /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */;
+ };
+ 61056378116C0393003C420C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */;
+ name = "SingleTeamViewController.h: 17";
+ rLen = 0;
+ rLoc = 394;
+ rType = 0;
+ vrLen = 347;
+ vrLoc = 211;
+ };
+ 61056379116C0393003C420C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
+ name = "SingleTeamViewController.m: 75";
+ rLen = 0;
+ rLoc = 3036;
+ rType = 0;
+ vrLen = 355;
+ vrLoc = 2649;
+ };
+ 6105637A116C0393003C420C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */;
+ name = "DetailViewController.m: 37";
+ rLen = 5;
+ rLoc = 1379;
+ rType = 0;
+ vrLen = 223;
+ vrLoc = 0;
+ };
+ 6105637B116C0393003C420C /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */;
+ };
+ 6105637C116C0393003C420C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61A11AC81168DA9400359010 /* MasterViewController.m */;
+ name = "MasterViewController.m: 11";
+ rLen = 0;
+ rLoc = 260;
+ rType = 0;
+ vrLen = 207;
+ vrLoc = 3996;
+ };
+ 61056381116C0393003C420C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
+ name = "HogHatViewController.m: 31";
+ rLen = 0;
+ rLoc = 1222;
+ rType = 0;
+ vrLen = 1971;
+ vrLoc = 152;
+ };
+ 61056384116C0393003C420C /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
+ name = "SingleTeamViewController.m: 63";
+ rLen = 0;
+ rLoc = 2616;
+ rType = 0;
+ vrLen = 1670;
+ vrLoc = 1660;
+ };
611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {999, 641}}";
@@ -228,7 +314,7 @@
fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */;
name = "DetailViewController.m: 33";
rLen = 5;
- rLoc = 1542;
+ rLoc = 1379;
rType = 0;
vrLen = 27;
vrLoc = 7;
@@ -358,7 +444,7 @@
fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
name = "SingleTeamViewController.m: 74";
rLen = 0;
- rLoc = 3009;
+ rLoc = 3036;
rType = 0;
vrLen = 146;
vrLoc = 2772;
@@ -1075,17 +1161,17 @@
};
61A11AC71168DA9400359010 /* MasterViewController.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
- sepNavSelRange = "{399, 0}";
- sepNavVisRange = "{0, 583}";
+ sepNavIntBoundsRect = "{{0, 0}, {999, 639}}";
+ sepNavSelRange = "{621, 13}";
+ sepNavVisRange = "{0, 673}";
};
};
61A11AC81168DA9400359010 /* MasterViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1048, 1872}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1048, 2054}}";
sepNavSelRange = "{260, 0}";
- sepNavVisRange = "{3526, 1819}";
- sepNavWindowFrame = "{{322, 221}, {1058, 792}}";
+ sepNavVisRange = "{3996, 207}";
+ sepNavWindowFrame = "{{312, 236}, {1058, 792}}";
};
};
61A11ACD1168DB1B00359010 /* TeamSettingsViewController.h */ = {
@@ -1114,24 +1200,24 @@
};
61A11AD51168DB3700359010 /* DetailViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1503, 1898}}";
- sepNavSelRange = "{2421, 0}";
- sepNavVisRange = "{1791, 1747}";
+ sepNavIntBoundsRect = "{{0, 0}, {1069, 2028}}";
+ sepNavSelRange = "{1708, 0}";
+ sepNavVisRange = "{410, 1995}";
sepNavWindowFrame = "{{690, 271}, {1058, 792}}";
};
};
61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {999, 639}}";
+ sepNavIntBoundsRect = "{{0, 0}, {483, 325}}";
sepNavSelRange = "{394, 0}";
- sepNavVisRange = "{0, 617}";
+ sepNavVisRange = "{211, 347}";
};
};
61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1111, 3289}}";
- sepNavSelRange = "{7429, 0}";
- sepNavVisRange = "{3042, 1256}";
+ sepNavIntBoundsRect = "{{0, 0}, {1111, 3250}}";
+ sepNavSelRange = "{2616, 0}";
+ sepNavVisRange = "{1660, 1670}";
sepNavWindowFrame = "{{530, 146}, {1058, 792}}";
};
};
@@ -1144,9 +1230,9 @@
};
61A11AE31168DC9400359010 /* HogHatViewController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {544, 2873}}";
- sepNavSelRange = "{301, 0}";
- sepNavVisRange = "{0, 726}";
+ sepNavIntBoundsRect = "{{0, 0}, {1090, 2847}}";
+ sepNavSelRange = "{1222, 0}";
+ sepNavVisRange = "{152, 1971}";
sepNavWindowFrame = "{{861, 250}, {1058, 792}}";
};
};
@@ -1453,7 +1539,7 @@
fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
name = "HogHatViewController.m: 110";
rLen = 0;
- rLoc = 3885;
+ rLoc = 3977;
rType = 0;
vrLen = 0;
vrLoc = 0;