# HG changeset patch # User koda # Date 1287525507 -7200 # Node ID aa24192417a87aec1339dcc7d354a91a28a0bc14 # Parent 86c3a6e8e265d7e6b0fd97d3fc765960d53761fd use labels instead of images, should save ram and space diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Classes/CommodityFunctions.h --- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Tue Oct 19 21:55:49 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Tue Oct 19 23:58:27 2010 +0200 @@ -50,6 +50,7 @@ #define UICOLOR_HW_YELLOW_BODER [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xC0/255 blue:0 alpha:1] #define UICOLOR_HW_YELLOW_TEXT [UIColor colorWithRed:(CGFloat)0xF0/255 green:(CGFloat)0xD0/255 blue:0 alpha:1] #define UICOLOR_HW_DARKBLUE [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x42/255 alpha:1] +#define UICOLOR_HW_ALPHABLUE [UIColor colorWithRed:(CGFloat)0x0F/255 green:0 blue:(CGFloat)0x42/255 alpha:0.58f] #define IS_DUALHEAD() ([[UIScreen screens] count] > 1) @@ -67,3 +68,5 @@ NSInteger randomPort (void); NSString *modelType (void); NSArray *getAvailableColors (void); +UILabel *createBlueLabel (NSString *title, CGRect frame); +UILabel *createLabelWithParams (NSString *title, CGRect frame, CGFloat borderWidth, UIColor *borderColor, UIColor *backgroundColor); diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Classes/CommodityFunctions.m --- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Tue Oct 19 21:55:49 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Tue Oct 19 23:58:27 2010 +0200 @@ -24,6 +24,7 @@ #import #import #import +#import #import "AudioToolbox/AudioToolbox.h" #import "PascalImports.h" @@ -260,7 +261,7 @@ AudioServicesPlaySystemSound(soundID); } -NSArray inline *getAvailableColors(void) { +NSArray inline *getAvailableColors (void) { return [NSArray arrayWithObjects:[NSNumber numberWithUnsignedInt:0x4376e9], // bluette [NSNumber numberWithUnsignedInt:0x3e9321], // greeeen [NSNumber numberWithUnsignedInt:0xa23dbb], // violett @@ -271,3 +272,26 @@ [NSNumber numberWithUnsignedInt:0x3da2bb], // cyannnn nil]; } + +UILabel *createBlueLabel (NSString *title, CGRect frame) { + return createLabelWithParams(title, frame, 1.5f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_DARKBLUE); +} + +UILabel *createLabelWithParams (NSString *title, CGRect frame, CGFloat borderWidth, UIColor *borderColor, UIColor *backgroundColor) { + UILabel *theLabel = [[UILabel alloc] initWithFrame:frame]; + theLabel.backgroundColor = backgroundColor; + + if (title != nil) { + theLabel.text = title; + theLabel.textColor = UICOLOR_HW_YELLOW_TEXT; + theLabel.textAlignment = UITextAlignmentCenter; + theLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]*80/100]; + } + + [theLabel.layer setBorderWidth:borderWidth]; + [theLabel.layer setBorderColor:borderColor.CGColor]; + [theLabel.layer setCornerRadius:8.0f]; + [theLabel.layer setMasksToBounds:YES]; + + return theLabel; +} diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Tue Oct 19 21:55:49 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Tue Oct 19 23:58:27 2010 +0200 @@ -290,10 +290,37 @@ name:@"buttonPressed" object:nil]; srandom(time(NULL)); - + // load other controllers if (self.mapConfigViewController == nil) self.mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPad" bundle:nil]; + + UILabel *leftBackground = createLabelWithParams(nil, CGRectMake(0, 60, 320, 620), 2.7f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE); + [self.mapConfigViewController.view addSubview:leftBackground]; + [leftBackground release]; + UILabel *middleBackground = createLabelWithParams(nil, CGRectMake(337, 187, 350, 505), 2.7f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE); + [self.mapConfigViewController.view addSubview:middleBackground]; + [middleBackground release]; + UILabel *rightBackground = createLabelWithParams(nil, CGRectMake(704, 214, 320, 464), 2.7f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE); + [self.mapConfigViewController.view addSubview:rightBackground]; + [rightBackground release]; + UILabel *topBackground = createLabelWithParams(nil, CGRectMake(714, 14, 300, 190), 2.3f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE); + [self.mapConfigViewController.view addSubview:topBackground]; + [topBackground release]; + UILabel *bottomLeftBackground = createLabelWithParams(nil, CGRectMake(106, 714, 320, 40), 2.0f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE); + [self.mapConfigViewController.view addSubview:bottomLeftBackground]; + [bottomLeftBackground release]; + UILabel *bottomRightBackground = createLabelWithParams(NSLocalizedString(@"Max Hogs: ",@""), CGRectMake(594, 714, 320, 40), 2.0f, UICOLOR_HW_YELLOW_BODER, UICOLOR_HW_ALPHABLUE); + bottomRightBackground.font = [UIFont italicSystemFontOfSize:[UIFont labelFontSize]]; + [self.mapConfigViewController.view addSubview:bottomRightBackground]; + [bottomRightBackground release]; + [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.maxLabel]; + [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.sizeLabel]; + [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.segmentedControl]; + [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.previewButton]; + [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.slider]; + [self.mapConfigViewController.view bringSubviewToFront:self.mapConfigViewController.tableView]; + if (self.teamConfigViewController == nil) self.teamConfigViewController = [[TeamConfigViewController alloc] initWithStyle:UITableViewStyleGrouped]; [self.mapConfigViewController.view addSubview:self.teamConfigViewController.view]; @@ -303,7 +330,7 @@ self.mapConfigViewController.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width); self.teamConfigViewController.view.frame = CGRectMake(348, 200, 328, 480); self.schemeWeaponConfigViewController.view.frame = CGRectMake(10, 70, 300, 600); - + } else { // this is the visible controller if (self.mapConfigViewController == nil) @@ -351,16 +378,15 @@ } -(void) didReceiveMemoryWarning { - if (self.mapConfigViewController.view.superview == nil) - self.mapConfigViewController = nil; if (self.teamConfigViewController.view.superview == nil) self.teamConfigViewController = nil; if (self.schemeWeaponConfigViewController.view.superview == nil) self.schemeWeaponConfigViewController = nil; if (self.helpPage.view.superview == nil) self.helpPage = nil; + if (self.mapConfigViewController.view.superview == nil) + self.mapConfigViewController = nil; - // Release any cached data, images, etc that aren't in use. self.imgContainer = nil; MSG_MEMCLEAN(); [super didReceiveMemoryWarning]; diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Tue Oct 19 21:55:49 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Tue Oct 19 23:58:27 2010 +0200 @@ -20,7 +20,6 @@ #import "SchemeWeaponConfigViewController.h" -#import #import "CommodityFunctions.h" #import "SDL_uikitappdelegate.h" @@ -127,22 +126,14 @@ } -(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - UILabel *theLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width * 80/100, 30)]; - theLabel.backgroundColor = [UIColor blueColor]; + CGRect frame = CGRectMake(0, 0, self.view.frame.size.width * 80/100, 30); + NSString *text; if (section == 0) - theLabel.text = NSLocalizedString(@"Schemes",@""); + text = NSLocalizedString(@"Schemes",@""); else - theLabel.text = NSLocalizedString(@"Weapons",@""); + text = NSLocalizedString(@"Weapons",@""); + UILabel *theLabel = createBlueLabel(text, frame); theLabel.center = CGPointMake(self.view.frame.size.width/2, 20); - theLabel.textColor = UICOLOR_HW_YELLOW_TEXT; - theLabel.textAlignment = UITextAlignmentCenter; - theLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]*80/100]; - theLabel.backgroundColor = UICOLOR_HW_DARKBLUE; - - [theLabel.layer setBorderWidth:1.5f]; - [theLabel.layer setBorderColor:[UICOLOR_HW_YELLOW_BODER CGColor]]; - [theLabel.layer setCornerRadius:8.0f]; - [theLabel.layer setMasksToBounds:YES]; UIView *theView = [[[UIView alloc] init] autorelease]; [theView addSubview:theLabel]; @@ -150,16 +141,6 @@ return theView; } -/* --(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger) section { - if (section == 0) { - return NSLocalizedString(@"Schemes",@""); - } else { - return NSLocalizedString(@"Weapons",@"");; - } -} -*/ - #pragma mark - #pragma mark Table view delegate -(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Tue Oct 19 21:55:49 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Tue Oct 19 23:58:27 2010 +0200 @@ -20,7 +20,6 @@ #import "TeamConfigViewController.h" -#import #import "CommodityFunctions.h" #import "HogButtonView.h" #import "SquareButtonView.h" @@ -172,22 +171,14 @@ } -(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - UILabel *theLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width * 80/100, 30)]; - theLabel.backgroundColor = [UIColor blueColor]; + CGRect frame = CGRectMake(0, 0, self.view.frame.size.width * 80/100, 30); + NSString *text; if (section == 0) - theLabel.text = NSLocalizedString(@"Playing Teams",@""); + text = NSLocalizedString(@"Playing Teams",@""); else - theLabel.text = NSLocalizedString(@"Available Teams",@""); + text = NSLocalizedString(@"Available Teams",@""); + UILabel *theLabel = createBlueLabel(text, frame); theLabel.center = CGPointMake(self.view.frame.size.width/2, 20); - theLabel.textColor = UICOLOR_HW_YELLOW_TEXT; - theLabel.textAlignment = UITextAlignmentCenter; - theLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]*80/100]; - theLabel.backgroundColor = UICOLOR_HW_DARKBLUE; - - [theLabel.layer setBorderWidth:1.5f]; - [theLabel.layer setBorderColor:[UICOLOR_HW_YELLOW_BODER CGColor]]; - [theLabel.layer setCornerRadius:8.0f]; - [theLabel.layer setMasksToBounds:YES]; UIView *theView = [[[UIView alloc] init] autorelease]; [theView addSubview:theLabel]; diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Oct 19 21:55:49 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Oct 19 23:58:27 2010 +0200 @@ -145,7 +145,6 @@ 61E1F4F811D004240016A5AA /* adler32.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61E1F4F711D004240016A5AA /* adler32.pas */; }; 61EBA62A11DFF2BC0048B68A /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title.png */; }; 61EBA62D11DFF3310048B68A /* backgroundAndTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62C11DFF3310048B68A /* backgroundAndTitle.png */; }; - 61EBB1E41228920300C1784F /* bluebox-squeezed.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBB1E31228920300C1784F /* bluebox-squeezed.png */; }; 61EF920E11DF57AC003441C4 /* arrowDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920511DF57AC003441C4 /* arrowDown.png */; }; 61EF920F11DF57AC003441C4 /* arrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920611DF57AC003441C4 /* arrowLeft.png */; }; 61EF921011DF57AC003441C4 /* arrowRight.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920711DF57AC003441C4 /* arrowRight.png */; }; @@ -164,7 +163,6 @@ 61F9040911DF58B00068B24D /* settingsButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040811DF58B00068B24D /* settingsButton.png */; }; 61F9040B11DF59370068B24D /* background.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040A11DF59370068B24D /* background.png */; }; 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040C11DF59D10068B24D /* localplayButton.png */; }; - 61F9043A11DF64E20068B24D /* bluebox.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9043911DF64E20068B24D /* bluebox.png */; }; 61F904D711DF7DA30068B24D /* WeaponCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F904D611DF7DA30068B24D /* WeaponCellView.m */; }; 922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; }; /* End PBXBuildFile section */ @@ -885,7 +883,6 @@ 61E1F4F711D004240016A5AA /* adler32.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = adler32.pas; path = ../../hedgewars/adler32.pas; sourceTree = SOURCE_ROOT; }; 61EBA62811DFF2BC0048B68A /* title.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title.png; path = "Resources/Frontend-iPad/title.png"; sourceTree = ""; }; 61EBA62C11DFF3310048B68A /* backgroundAndTitle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = backgroundAndTitle.png; path = "Resources/Frontend-iPad/backgroundAndTitle.png"; sourceTree = ""; }; - 61EBB1E31228920300C1784F /* bluebox-squeezed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bluebox-squeezed.png"; path = "Resources/Frontend-iPad/bluebox-squeezed.png"; sourceTree = ""; }; 61EF920511DF57AC003441C4 /* arrowDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowDown.png; path = Resources/Overlay/arrowDown.png; sourceTree = ""; }; 61EF920611DF57AC003441C4 /* arrowLeft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowLeft.png; path = Resources/Overlay/arrowLeft.png; sourceTree = ""; }; 61EF920711DF57AC003441C4 /* arrowRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowRight.png; path = Resources/Overlay/arrowRight.png; sourceTree = ""; }; @@ -918,7 +915,6 @@ 61F9040A11DF59370068B24D /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = "Resources/Frontend-iPad/background.png"; sourceTree = ""; }; 61F9040C11DF59D10068B24D /* localplayButton.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = localplayButton.png; path = "Resources/Frontend-iPad/localplayButton.png"; sourceTree = ""; }; 61F9040D11DF59D10068B24D /* netplayButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = netplayButton.png; path = "Resources/Frontend-iPad/netplayButton.png"; sourceTree = ""; }; - 61F9043911DF64E20068B24D /* bluebox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bluebox.png; path = "Resources/Frontend-iPad/bluebox.png"; sourceTree = ""; }; 61F904D511DF7DA30068B24D /* WeaponCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeaponCellView.h; sourceTree = ""; }; 61F904D611DF7DA30068B24D /* WeaponCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeaponCellView.m; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -1397,11 +1393,9 @@ 61F903FA11DF58680068B24D /* Frontend-iPad */ = { isa = PBXGroup; children = ( - 61EBB1E31228920300C1784F /* bluebox-squeezed.png */, 615AD96112073B4D00F2FF04 /* startGameButton.png */, 615AD9EA1207654E00F2FF04 /* helpButton.png */, 615AD9E8120764CA00F2FF04 /* backButton.png */, - 61F9043911DF64E20068B24D /* bluebox.png */, 61EBA62811DFF2BC0048B68A /* title.png */, 61F9040C11DF59D10068B24D /* localplayButton.png */, 61F9040D11DF59D10068B24D /* netplayButton.png */, @@ -1458,7 +1452,7 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* Hedgewars */ = { + 1D6058900D05DD3D006BFB54 /* Test Lua */ = { isa = PBXNativeTarget; buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Hedgewars" */; buildPhases = ( @@ -1542,7 +1536,7 @@ ); projectRoot = ""; targets = ( - 1D6058900D05DD3D006BFB54 /* Hedgewars */, + 1D6058900D05DD3D006BFB54 /* Test Lua */, 928301160F10CAFC00CC5A3C /* fpc */, 6179928B114AE0C800BA94A9 /* UpdateDataFolder */, ); @@ -2093,7 +2087,6 @@ 61F9040911DF58B00068B24D /* settingsButton.png in Resources */, 61F9040B11DF59370068B24D /* background.png in Resources */, 61F9040E11DF59D10068B24D /* localplayButton.png in Resources */, - 61F9043A11DF64E20068B24D /* bluebox.png in Resources */, 61EBA62A11DFF2BC0048B68A /* title.png in Resources */, 61EBA62D11DFF3310048B68A /* backgroundAndTitle.png in Resources */, 61F7A43811E290650040BA66 /* Icon-72.png in Resources */, @@ -2111,7 +2104,6 @@ 615AD9E9120764CA00F2FF04 /* backButton.png in Resources */, 615AD9EB1207654E00F2FF04 /* helpButton.png in Resources */, 6187AEBD120781B900B31A27 /* Settings in Resources */, - 61EBB1E41228920300C1784F /* bluebox-squeezed.png in Resources */, 611EE974122A9C4100DF6938 /* clickSound.wav in Resources */, 611EE9D9122AA10A00DF6938 /* backSound.wav in Resources */, 611EE9DA122AA10A00DF6938 /* selSound.wav in Resources */, diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Resources/Frontend-iPad/bluebox-squeezed.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/bluebox-squeezed.png has changed diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Resources/Frontend-iPad/bluebox.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/bluebox.png has changed diff -r 86c3a6e8e265 -r aa24192417a8 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Tue Oct 19 21:55:49 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Tue Oct 19 23:58:27 2010 +0200 @@ -47,6 +47,7 @@ 292 {1024, 768} + NO NO IBIPadFramework @@ -54,97 +55,6 @@ background.png - - - 292 - {{0, 60}, {320, 618}} - - NO - NO - IBIPadFramework - - NSImage - bluebox.png - - - - - 292 - {{704, 214}, {320, 464}} - - NO - NO - IBIPadFramework - - - - - 292 - {{337, 187}, {350, 505}} - - NO - NO - IBIPadFramework - - - - - 292 - {{714, 14}, {300, 190}} - - NO - NO - IBIPadFramework - - - - - 292 - {{106, 707}, {320, 40}} - - NO - NO - IBIPadFramework - - NSImage - bluebox-squeezed.png - - - - - 292 - {{594, 707}, {320, 40}} - - NO - NO - IBIPadFramework - - - - - 292 - {{610, 713}, {145, 29}} - - NO - YES - 7 - NO - IBIPadFramework - Max Hogs: - - Helvetica-Oblique - 18 - 16 - - - 2 - MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA - - - 1 - 10 - 2 - 289 @@ -198,7 +108,7 @@ 292 - {{263, 716}, {149, 23}} + {{263, 723}, {149, 23}} NO IBIPadFramework @@ -241,7 +151,7 @@ 292 - {{778, 717}, {42, 21}} + {{778, 725}, {42, 21}} NO YES @@ -266,7 +176,7 @@ 292 - {{112, 713}, {145, 29}} + {{112, 720}, {145, 29}} NO YES @@ -274,7 +184,11 @@ NO IBIPadFramework Label - + + Helvetica-Oblique + 18 + 16 + 2 MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA @@ -284,48 +198,10 @@ 10 1 - - - -2147483356 - {{10, 70}, {300, 600}} - - NO - IBIPadFramework - 0 - 0 - - 1 - teams section - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - - - -2147483356 - {{348, 200}, {328, 480}} - - NO - IBIPadFramework - 0 - 0 - - 1 - details section - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 292 - {{357, 30}, {309, 165}} + {{357, 28}, {309, 165}} NO NO @@ -357,7 +233,7 @@ 292 - {{441, 693}, {142, 64}} + {{441, 702}, {142, 64}} NO 1 @@ -609,19 +485,10 @@ - - - - - - - - - @@ -653,16 +520,6 @@ - 51 - - - - - 39 - - - - 17 @@ -688,41 +545,6 @@ - 78 - - - - - 80 - - - - - 79 - - - - - 61 - - - - - 54 - - - - - 53 - - - - - 55 - - - - 50 @@ -739,23 +561,14 @@ 1.IBPluginDependency 11.IBPluginDependency 17.IBPluginDependency - 39.IBPluginDependency 50.IBPluginDependency - 51.IBPluginDependency - 53.IBPluginDependency - 54.IBPluginDependency - 55.IBPluginDependency 57.IBPluginDependency - 61.IBPluginDependency 66.IBPluginDependency 7.IBPluginDependency 70.IBPluginDependency 72.IBPluginDependency 75.IBPluginDependency - 78.IBPluginDependency - 79.IBPluginDependency 8.IBPluginDependency - 80.IBPluginDependency 9.CustomClassName 9.IBPluginDependency @@ -763,16 +576,7 @@ YES MapConfigViewController UIResponder - {{489, 236}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{288, 236}, {1024, 768}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -869,7 +673,6 @@ YES YES - delegate maxLabel previewButton segmentedControl @@ -879,7 +682,6 @@ YES - id UILabel MapPreviewButtonView UISegmentedControl @@ -892,7 +694,6 @@ YES YES - delegate maxLabel previewButton segmentedControl @@ -903,10 +704,6 @@ YES - delegate - id - - maxLabel UILabel @@ -1221,8 +1018,6 @@ YES backButton.png background.png - bluebox-squeezed.png - bluebox.png helpButton.png startGameButton.png title.png @@ -1231,8 +1026,6 @@ YES {64, 64} {1024, 768} - {320, 40} - {512, 512} {64, 64} {142, 64} {273, 151}