team selection completely refactored, now has animation and more performance
use a semi transparent black background color (on powerful devices)
other smaller improvements and bugfixes
--- a/project_files/HedgewarsMobile/Classes/CGPointUtils.c Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CGPointUtils.c Wed Dec 08 14:47:52 2010 +0100
@@ -32,3 +32,29 @@
CGFloat rads = acos(((a*c) + (b*d)) / ((sqrt(a*a + b*b)) * (sqrt(c*c + d*d))));
return radiansToDegrees(rads);
}
+
+CGFloat CGPointDot(CGPoint a,CGPoint b) {
+ return a.x*b.x+a.y*b.y;
+}
+
+CGFloat CGPointLen(CGPoint a) {
+ return sqrtf(a.x*a.x+a.y*a.y);
+}
+
+CGPoint CGPointSub(CGPoint a,CGPoint b) {
+ CGPoint c = {a.x-b.x,a.y-b.y};
+ return c;
+}
+
+CGFloat CGPointDist(CGPoint a,CGPoint b) {
+ CGPoint c = CGPointSub(a,b);
+ return CGPointLen(c);
+}
+
+CGPoint CGPointNorm(CGPoint a) {
+ CGFloat m = sqrtf(a.x*a.x+a.y*a.y);
+ CGPoint c;
+ c.x = a.x/m;
+ c.y = a.y/m;
+ return c;
+}
--- a/project_files/HedgewarsMobile/Classes/CGPointUtils.h Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CGPointUtils.h Wed Dec 08 14:47:52 2010 +0100
@@ -21,3 +21,9 @@
CGFloat distanceBetweenPoints (CGPoint first, CGPoint second);
CGFloat angleBetweenPoints(CGPoint first, CGPoint second);
CGFloat angleBetweenLines(CGPoint line1Start, CGPoint line1End, CGPoint line2Start, CGPoint line2End);
+
+CGFloat CGPointDot(CGPoint a, CGPoint b);
+CGFloat CGPointLen(CGPoint a);
+CGPoint CGPointSub(CGPoint a, CGPoint b);
+CGFloat CGPointDist(CGPoint a, CGPoint b);
+CGPoint CGPointNorm(CGPoint a);
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Wed Dec 08 14:47:52 2010 +0100
@@ -25,6 +25,7 @@
#define SETTINGS_FILE() [DOCUMENTS_FOLDER() stringByAppendingString:@"/settings.plist"]
#define DEBUG_FILE() [DOCUMENTS_FOLDER() stringByAppendingString:@"/hw-game.log"]
+#define HEDGEHOG_FILE() [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/Images/hedgehog.png"]
#define TEAMS_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Teams/"]
#define WEAPONS_DIRECTORY() [DOCUMENTS_FOLDER() stringByAppendingString:@"/Weapons/"]
@@ -52,6 +53,7 @@
#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 UICOLOR_HW_ALMOSTBLACK (IS_NOT_POWERFUL()) ? [UIColor blackColor] : [UIColor colorWithRed:0 green:0 blue:0 alpha:0.6]
#define IS_DUALHEAD() ([[UIScreen class] respondsToSelector:@selector(screens)] && [[UIScreen screens] count] > 1)
#define IS_IPAD() (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
--- a/project_files/HedgewarsMobile/Classes/FortsViewController.m Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/FortsViewController.m Wed Dec 08 14:47:52 2010 +0100
@@ -23,6 +23,8 @@
#import "CommodityFunctions.h"
#import "UIImageExtra.h"
+#define IMGNUM_PER_FORT 4
+
@implementation FortsViewController
@synthesize teamDictionary, fortArray, lastIndexPath;
@@ -41,7 +43,7 @@
NSMutableArray *filteredContents = [[NSMutableArray alloc] initWithCapacity:([directoryContents count] / 3)];
// we need to remove the double entries and the L.png suffix
for (int i = 0; i < [directoryContents count]; i++) {
- if (i % 3 == 1) {
+ if (i % IMGNUM_PER_FORT == 3) {
NSString *currentName = [directoryContents objectAtIndex:i];
NSString *correctName = [currentName substringToIndex:([currentName length] - 5)];
[filteredContents addObject:correctName];
@@ -51,13 +53,13 @@
[filteredContents release];
// statically set row height instead of using delegate method for performance reasons
- self.tableView.rowHeight = 200;
+ self.tableView.rowHeight = 128;
self.title = NSLocalizedString(@"Choose team fort",@"");
}
-- (void)viewWillAppear:(BOOL)animated {
+-(void) viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self.tableView reloadData];
[self.tableView setContentOffset:CGPointMake(0,0) animated:NO];
@@ -79,10 +81,9 @@
static NSString *CellIdentifier = @"Cell";
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
- if (cell == nil) {
+ if (cell == nil)
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle
reuseIdentifier:CellIdentifier] autorelease];
- }
NSString *fortName = [fortArray objectAtIndex:[indexPath row]];
cell.textLabel.text = fortName;
@@ -151,7 +152,6 @@
[teamDictionary release];
[lastIndexPath release];
[fortArray release];
-// [fortSprites release];
[super dealloc];
}
--- a/project_files/HedgewarsMobile/Classes/HogButtonView.h Tue Dec 07 01:18:43 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- * Hedgewars-iOS, a Hedgewars port for iOS devices
- * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * File created on 20/04/2010.
- */
-
-
-#import <UIKit/UIKit.h>
-
-
-@interface HogButtonView : UIButton {
- NSInteger numberOfHogs;
- UIImage *singleHog;
- NSMutableDictionary *ownerDictionary;
-}
-
-@property (nonatomic,retain) UIImage *singleHog;
-@property (nonatomic) NSInteger numberOfHogs;
-@property (nonatomic,retain) NSMutableDictionary *ownerDictionary;
-
--(void) drawManyHogs:(NSInteger) hogs;
--(void) addOne;
-
-@end
--- a/project_files/HedgewarsMobile/Classes/HogButtonView.m Tue Dec 07 01:18:43 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
- * Hedgewars-iOS, a Hedgewars port for iOS devices
- * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * File created on 20/04/2010.
- */
-
-
-#import "HogButtonView.h"
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
-#import "PascalImports.h"
-
-@implementation HogButtonView
-@synthesize singleHog, numberOfHogs, ownerDictionary;
-
--(id) initWithFrame:(CGRect)frame {
- if ((self = [super initWithFrame:frame])) {
- self.backgroundColor = [UIColor clearColor];
-
- NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/Hedgehog.png",GRAPHICS_DIRECTORY()];
- UIImage *normalHogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile andCutAt:CGRectMake(96, 0, 32, 32)];
- [normalHogFile release];
-
- self.singleHog = normalHogSprite;
- [normalHogSprite release];
- [self addTarget:self action:@selector(addOne) forControlEvents:UIControlEventTouchUpInside];
- }
- return self;
-}
-
--(void) addOne {
- playSound(@"clickSound");
- self.highlighted = NO;
- NSInteger number = self.numberOfHogs;
- number++;
- [self drawManyHogs:number];
-}
-
--(void) drawManyHogs:(NSInteger) hogs {
- if (numberOfHogs != hogs) {
- if (hogs <= HW_getMaxNumberOfHogs() && hogs >= 1)
- numberOfHogs = hogs;
- else {
- if (hogs > HW_getMaxNumberOfHogs())
- numberOfHogs = 1;
- else
- numberOfHogs = HW_getMaxNumberOfHogs();
- }
- [ownerDictionary setObject:[NSNumber numberWithInt:numberOfHogs] forKey:@"number"];
-
- UIImage *teamHogs = [[[UIImage alloc] init] autorelease];
- for (int i = 0; i < numberOfHogs; i++) {
- teamHogs = [singleHog mergeWith:teamHogs
- atPoint:CGPointMake(8, 0)
- ofSize:CGSizeMake(88, 32)];
- }
- [self setImage:teamHogs forState:UIControlStateNormal];
- }
-}
-
--(void) dealloc {
- [ownerDictionary release];
- [singleHog release];
- [super dealloc];
-}
-
-
-@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/HoldTableViewCell.h Wed Dec 08 14:47:52 2010 +0100
@@ -0,0 +1,38 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 03/07/2010.
+ */
+
+
+#import <UIKit/UIKit.h>
+
+@protocol HoldTableViewCellDelegate <NSObject>
+
+-(void) holdAction:(NSString *)content;
+
+@end
+
+@interface HoldTableViewCell : UITableViewCell {
+ id<HoldTableViewCellDelegate> delegate;
+}
+
+@property (nonatomic,assign) id<HoldTableViewCellDelegate> delegate;
+
+-(void) holdAction;
+
+@end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Classes/HoldTableViewCell.m Wed Dec 08 14:47:52 2010 +0100
@@ -0,0 +1,64 @@
+/*
+ * Hedgewars-iOS, a Hedgewars port for iOS devices
+ * Copyright (c) 2009-2010 Vittorio Giovara <vittorio.giovara@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * File created on 03/07/2010.
+ */
+
+//http://devblog.wm-innovations.com/2010/03/30/custom-swipe-uitableviewcell/
+
+
+#import "HoldTableViewCell.h"
+#import "CGPointUtils.h"
+
+@implementation HoldTableViewCell
+@synthesize delegate;
+
+#define SWIPE_DRAG_HORIZ_MIN 10
+#define SWIPE_DRAG_VERT_MAX 40
+
+-(id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+ if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
+ delegate = nil;
+ }
+ return self;
+}
+
+-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+ [self performSelector:@selector(holdAction) withObject:nil afterDelay:0.4];
+
+ [super touchesBegan:touches withEvent:event];
+}
+
+-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+ [NSObject cancelPreviousPerformRequestsWithTarget:self
+ selector:@selector(holdAction)
+ object:nil];
+
+ [super touchesEnded:touches withEvent:event];
+}
+
+-(void) holdAction {
+ if (self.delegate != nil && [self.delegate respondsToSelector:@selector(holdAction:)])
+ [self.delegate holdAction:self.textLabel.text];
+}
+
+-(void) dealloc {
+ self.delegate = nil;
+ [super dealloc];
+}
+
+@end
--- a/project_files/HedgewarsMobile/Classes/LevelViewController.m Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/LevelViewController.m Wed Dec 08 14:47:52 2010 +0100
@@ -177,7 +177,6 @@
self.lastIndexPath = indexPath;
[self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
}
- [self.navigationController popViewControllerAnimated:YES];
}
[self.tableView deselectRowAtIndexPath:indexPath animated:YES];
}
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Wed Dec 08 14:47:52 2010 +0100
@@ -139,6 +139,7 @@
cell.textLabel.adjustsFontSizeToFitWidth = YES;
cell.textLabel.minimumFontSize = 7;
cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
+ cell.textLabel.backgroundColor = [UIColor clearColor];
if (isRandomness()) {
UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@/icon.png",THEMES_DIRECTORY(),labelString]];
@@ -154,7 +155,7 @@
} else
cell.accessoryView = nil;
- cell.backgroundColor = [UIColor blackColor];
+ cell.backgroundColor = UICOLOR_HW_ALMOSTBLACK;
return cell;
}
--- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Wed Dec 08 14:47:52 2010 +0100
@@ -174,7 +174,7 @@
label.font = [UIFont systemFontOfSize:16];
label.textColor = [UIColor lightGrayColor];
label.numberOfLines = 5;
- label.text = NSLocalizedString(@"Games are automatically saved and can be resumed by selecting an entry above.\nYou can modify this list by pressing the 'Edit' button.\nNotice that completed games are deleted, so make backups.",@"");
+ label.text = NSLocalizedString(@"Games are automatically saved and can be resumed by selecting an entry above.\nYou can modify this list by pressing the 'Edit' button.\nCompleted games are removed at the end of the match.",@"");
label.backgroundColor = [UIColor clearColor];
[footer addSubview:label];
--- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Wed Dec 08 14:47:52 2010 +0100
@@ -146,7 +146,7 @@
cell.accessoryView = self.syncSwitch;
}
- cell.backgroundColor = [UIColor blackColor];
+ cell.backgroundColor = UICOLOR_HW_ALMOSTBLACK;
cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
cell.detailTextLabel.textColor = [UIColor whiteColor];
return cell;
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.h Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.h Wed Dec 08 14:47:52 2010 +0100
@@ -20,11 +20,14 @@
#import <UIKit/UIKit.h>
-
+#import "HoldTableViewCell.h"
-@interface TeamConfigViewController : UITableViewController {
+@interface TeamConfigViewController : UITableViewController <HoldTableViewCellDelegate> {
+ NSInteger selectedTeamsCount;
+ NSInteger allTeamsCount;
+
+ NSMutableArray *listOfSelectedTeams;
NSMutableArray *listOfTeams;
- NSMutableArray *listOfSelectedTeams;
NSArray *cachedContentsOfDir;
}
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Wed Dec 08 14:47:52 2010 +0100
@@ -21,16 +21,11 @@
#import "TeamConfigViewController.h"
#import "CommodityFunctions.h"
-#import "HogButtonView.h"
#import "SquareButtonView.h"
@implementation TeamConfigViewController
@synthesize listOfTeams, listOfSelectedTeams, cachedContentsOfDir;
-#define NUMBERBUTTON_TAG 123456
-#define SQUAREBUTTON_TAG 654321
-#define LABEL_TAG 456123
-
#pragma mark -
#pragma mark View lifecycle
-(void) viewDidLoad {
@@ -49,9 +44,8 @@
[self.tableView setBackgroundView:background];
[background release];
}
- } else {
+ } else
self.view.backgroundColor = [UIColor blackColor];
- }
self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
@@ -79,8 +73,11 @@
NSMutableArray *emptyArray = [[NSMutableArray alloc] initWithObjects:nil];
self.listOfSelectedTeams = emptyArray;
[emptyArray release];
-
- cachedContentsOfDir = [[NSArray alloc] initWithArray:contentsOfDir copyItems:YES];
+
+ selectedTeamsCount = [self.listOfSelectedTeams count];
+ allTeamsCount = [self.listOfTeams count];
+
+ self.cachedContentsOfDir = [[NSArray alloc] initWithArray:contentsOfDir copyItems:YES];
}
[self.tableView reloadData];
}
@@ -89,6 +86,49 @@
return rotationManager(interfaceOrientation);
}
+-(NSInteger) filterNumberOfHogs:(NSInteger) hogs {
+ NSInteger numberOfHogs;
+ if (hogs <= HW_getMaxNumberOfHogs() && hogs >= 1)
+ numberOfHogs = hogs;
+ else {
+ if (hogs > HW_getMaxNumberOfHogs())
+ numberOfHogs = 1;
+ else
+ numberOfHogs = HW_getMaxNumberOfHogs();
+ }
+ return numberOfHogs;
+}
+
+-(UIImage *)drawHogsRepeated:(NSInteger) manyTimes {
+ UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:HEDGEHOG_FILE()];
+ CGFloat screenScale = getScreenScale();
+ int w = hogSprite.size.width * screenScale;
+ int h = hogSprite.size.height * screenScale;
+ CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+ CGContextRef context = CGBitmapContextCreate(NULL, w * 3, h, 8, 4 * w * 3, colorSpace, kCGImageAlphaPremultipliedFirst);
+
+ // draw the two images in the current context
+ for (int i = 0; i < manyTimes; i++)
+ CGContextDrawImage(context, CGRectMake(i*8*screenScale, 0, w, h), [hogSprite CGImage]);
+ [hogSprite release];
+
+ // Create bitmap image info from pixel data in current context
+ CGImageRef imageRef = CGBitmapContextCreateImage(context);
+
+ // Create a new UIImage object
+ UIImage *resultImage;
+ if ([self respondsToSelector:@selector(imageWithCGImage:scale:orientation:)])
+ resultImage = [UIImage imageWithCGImage:imageRef scale:screenScale orientation:UIImageOrientationUp];
+ else
+ resultImage = [UIImage imageWithCGImage:imageRef];
+
+ // Release colorspace, context and bitmap information
+ CGColorSpaceRelease(colorSpace);
+ CGContextRelease(context);
+ CFRelease(imageRef);
+
+ return resultImage;
+}
#pragma mark -
#pragma mark Table view data source
@@ -98,9 +138,9 @@
-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if (section == 0)
- return [listOfSelectedTeams count] ;
+ return selectedTeamsCount;
else
- return [listOfTeams count];
+ return allTeamsCount;
}
// Customize the appearance of table view cells.
@@ -113,52 +153,36 @@
if (section == 0) {
cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier0];
if (cell == nil) {
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier0] autorelease];
-
- UIButton *numberButton = [[HogButtonView alloc] initWithFrame:CGRectMake(12, 5, 88, 32)];
- numberButton.tag = NUMBERBUTTON_TAG;
- [cell addSubview:numberButton];
- [numberButton release];
-
- SquareButtonView *squareButton = [[SquareButtonView alloc] initWithFrame:CGRectMake(12+88+6, 5, 36, 36)];
- squareButton.tag = SQUAREBUTTON_TAG;
- [cell addSubview:squareButton];
- [squareButton release];
+ cell = [[[HoldTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier0] autorelease];
- NSInteger length;
- if (IS_IPAD())
- length = 103;
- else
- length = 285;
- UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(12+88+6+36, 10, length, 25)];
- label.textAlignment = UITextAlignmentLeft;
- label.minimumFontSize = 11;
- label.adjustsFontSizeToFitWidth = YES;
- label.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
- label.backgroundColor = [UIColor clearColor];
- label.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
- label.textColor = UICOLOR_HW_YELLOW_TEXT;
- label.tag = LABEL_TAG;
- [cell.contentView addSubview:label];
- [label release];
+ SquareButtonView *squareButton = [[SquareButtonView alloc] initWithFrame:CGRectMake(0, 0, 36, 36)];
+ cell.accessoryView = squareButton;
+ [squareButton release];
}
NSMutableDictionary *selectedRow = [listOfSelectedTeams objectAtIndex:[indexPath row]];
-
- UILabel *cellLabel = (UILabel *)[cell viewWithTag:LABEL_TAG];
- cellLabel.text = [[selectedRow objectForKey:@"team"] stringByDeletingPathExtension];
+ cell.textLabel.text = [[selectedRow objectForKey:@"team"] stringByDeletingPathExtension];
+ cell.textLabel.backgroundColor = [UIColor clearColor];
- HogButtonView *numberButton = (HogButtonView *)[cell viewWithTag:NUMBERBUTTON_TAG];
- [numberButton drawManyHogs:[[selectedRow objectForKey:@"number"] intValue]];
- numberButton.ownerDictionary = selectedRow;
+ SquareButtonView *squareButton = (SquareButtonView *)cell.accessoryView;
+ [squareButton selectColor:[[selectedRow objectForKey:@"color"] intValue]];
+ NSNumber *hogNumber = [selectedRow objectForKey:@"number"];
+ [squareButton setTitle:[hogNumber stringValue] forState:UIControlStateNormal];
+ squareButton.ownerDictionary = selectedRow;
- SquareButtonView *squareButton = (SquareButtonView *)[cell viewWithTag:SQUAREBUTTON_TAG];
- [squareButton selectColor:[[selectedRow objectForKey:@"color"] intValue]];
- squareButton.ownerDictionary = selectedRow;
+ cell.imageView.image = [self drawHogsRepeated:[hogNumber intValue]];
+ ((HoldTableViewCell *)cell).delegate = self;
+ } else {
+ cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier1];
+ if (cell == nil)
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier1] autorelease];
+
+ cell.textLabel.text = [[[listOfTeams objectAtIndex:[indexPath row]] objectForKey:@"team"] stringByDeletingPathExtension];
+ cell.textLabel.backgroundColor = [UIColor clearColor];
- NSString *teamPath = [NSString stringWithFormat:@"%@/%@",TEAMS_DIRECTORY(),[selectedRow objectForKey:@"team"]];
+ NSString *teamPath = [NSString stringWithFormat:@"%@/%@.plist",TEAMS_DIRECTORY(),cell.textLabel.text];
NSDictionary *firstHog = [[[NSDictionary dictionaryWithContentsOfFile:teamPath] objectForKey:@"hedgehogs"] objectAtIndex:0];
- if ([[firstHog objectForKey:@"level"] intValue]> 0) {
+ if ([[firstHog objectForKey:@"level"] intValue] != 0) {
NSString *filePath = [NSString stringWithFormat:@"%@/cyborg.png",HATS_DIRECTORY()];
UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:filePath andCutAt:CGRectMake(0, 2, 32, 32)];
UIImageView *spriteView = [[UIImageView alloc] initWithImage:sprite];
@@ -168,18 +192,12 @@
[spriteView release];
} else
cell.accessoryView = nil;
- } else {
- cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier1];
- if (cell == nil)
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier1] autorelease];
+ }
- cell.textLabel.text = [[[listOfTeams objectAtIndex:[indexPath row]] objectForKey:@"team"] stringByDeletingPathExtension];
- cell.accessoryView = nil;
- }
-
cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
- cell.backgroundColor = [UIColor blackColor];
-
+ cell.backgroundColor = UICOLOR_HW_ALMOSTBLACK;
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+
return cell;
}
@@ -190,7 +208,7 @@
-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
CGRect frame = CGRectMake(0, 0, self.view.frame.size.width * 80/100, 30);
NSString *text;
- if (section == 0)
+ if (section == 0)
text = NSLocalizedString(@"Playing Teams",@"");
else
text = NSLocalizedString(@"Available Teams",@"");
@@ -203,6 +221,32 @@
return theView;
}
+-(CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ return 20;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger) section {
+ UIView *footer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 20)];
+ footer.backgroundColor = [UIColor clearColor];
+
+ UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width*80/100, 20)];
+ label.center = CGPointMake(self.tableView.frame.size.width/2, 20/2);
+ label.textAlignment = UITextAlignmentCenter;
+ label.font = [UIFont italicSystemFontOfSize:12];
+ label.textColor = [UIColor whiteColor];
+ label.numberOfLines = 1;
+ if (section == 0)
+ label.text = NSLocalizedString(@"Tap to add hogs or change color, hold tap to remove team.",@"");
+ else
+ label.text = NSLocalizedString(@"The robot badge indicates an AI-controlled team.",@"");
+
+ label.backgroundColor = [UIColor clearColor];
+ [footer addSubview:label];
+ [label release];
+ return [footer autorelease];
+}
+
+
#pragma mark -
#pragma mark Table view delegate
-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -210,15 +254,49 @@
NSInteger section = [indexPath section];
if (section == 0) {
- [self.listOfTeams addObject:[self.listOfSelectedTeams objectAtIndex:row]];
- [self.listOfSelectedTeams removeObjectAtIndex:row];
+ NSMutableDictionary *selectedRow = [self.listOfSelectedTeams objectAtIndex:[indexPath row]];
+ UITableViewCell *cell = [aTableView cellForRowAtIndexPath:indexPath];
+ SquareButtonView *squareButton = (SquareButtonView *)cell.accessoryView;
+
+ NSInteger increaseNumber = [[selectedRow objectForKey:@"number"] intValue] + 1;
+ NSNumber *newNumber = [NSNumber numberWithInt:[self filterNumberOfHogs:increaseNumber]];
+ [squareButton setTitle:[newNumber stringValue] forState:UIControlStateNormal];
+ [selectedRow setObject:newNumber forKey:@"number"];
+
+ cell.imageView.image = [self drawHogsRepeated:[newNumber intValue]];
+ [cell setNeedsLayout];
} else {
[self.listOfSelectedTeams addObject:[self.listOfTeams objectAtIndex:row]];
[self.listOfTeams removeObjectAtIndex:row];
+
+ NSIndexPath *newIndexPath = [NSIndexPath indexPathForRow:selectedTeamsCount inSection:0];
+ allTeamsCount--;
+ selectedTeamsCount++;
+ [aTableView beginUpdates];
+ [aTableView insertRowsAtIndexPaths:[NSArray arrayWithObject:newIndexPath] withRowAnimation:UITableViewRowAnimationRight];
+ [aTableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationRight];
+ [aTableView endUpdates];
}
- [aTableView reloadData];
}
+-(void) holdAction:(NSString *)content {
+ NSInteger row;
+ for (row = 0; row < [self.listOfSelectedTeams count]; row++) {
+ NSDictionary *dict = [self.listOfSelectedTeams objectAtIndex:row];
+ if ([content isEqualToString:[[dict objectForKey:@"team"] stringByDeletingPathExtension]])
+ break;
+ }
+
+ [self.listOfTeams addObject:[self.listOfSelectedTeams objectAtIndex:row]];
+ [self.listOfSelectedTeams removeObjectAtIndex:row];
+
+ [self.tableView beginUpdates];
+ [self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:[NSIndexPath indexPathForRow:row inSection:0]] withRowAnimation:UITableViewRowAnimationLeft];
+ [self.tableView insertRowsAtIndexPaths:[NSArray arrayWithObject:[NSIndexPath indexPathForRow:allTeamsCount inSection:1]] withRowAnimation:UITableViewRowAnimationLeft];
+ allTeamsCount++;
+ selectedTeamsCount--;
+ [self.tableView endUpdates];
+}
#pragma mark -
#pragma mark Memory management
--- a/project_files/HedgewarsMobile/Classes/UIImageExtra.m Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/UIImageExtra.m Wed Dec 08 14:47:52 2010 +0100
@@ -35,7 +35,10 @@
DLog(@"warning - this is a very expensive operation, you should avoid using it");
// Create a bitmap graphics context; this will also set it as the current context
- UIGraphicsBeginImageContext(size);
+ if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)])
+ UIGraphicsBeginImageContextWithOptions(size, NO, getScreenScale());
+ else
+ UIGraphicsBeginImageContext(size);
// Draw the scaled image in the current context
[self drawInRect:CGRectMake(0, 0, size.width, size.height)];
@@ -60,8 +63,9 @@
DLog(@"Warning, secondImage == nil");
return self;
}
- int w = resultingSize.width;
- int h = resultingSize.height;
+ CGFloat screenScale = getScreenScale();
+ int w = resultingSize.width * screenScale;
+ int h = resultingSize.height * screenScale;
if (w == 0 || h == 0) {
DLog(@"Can have 0 dimesions");
@@ -73,14 +77,18 @@
CGContextRef context = CGBitmapContextCreate(NULL, w, h, 8, 4 * w, colorSpace, kCGImageAlphaPremultipliedFirst);
// draw the two images in the current context
- CGContextDrawImage(context, CGRectMake(0, 0, self.size.width, self.size.height), [self CGImage]);
- CGContextDrawImage(context, CGRectMake(secondImagePoint.x, secondImagePoint.y, secondImage.size.width, secondImage.size.height), [secondImage CGImage]);
+ CGContextDrawImage(context, CGRectMake(0, 0, self.size.width*screenScale, self.size.height*screenScale), [self CGImage]);
+ CGContextDrawImage(context, CGRectMake(secondImagePoint.x*screenScale, secondImagePoint.y*screenScale, secondImage.size.width*screenScale, secondImage.size.height*screenScale), [secondImage CGImage]);
// Create bitmap image info from pixel data in current context
CGImageRef imageRef = CGBitmapContextCreateImage(context);
// Create a new UIImage object
- UIImage *resultImage = [UIImage imageWithCGImage:imageRef];
+ UIImage *resultImage;
+ if ([self respondsToSelector:@selector(imageWithCGImage:scale:orientation:)])
+ resultImage = [UIImage imageWithCGImage:imageRef scale:screenScale orientation:UIImageOrientationUp];
+ else
+ resultImage = [UIImage imageWithCGImage:imageRef];
// Release colorspace, context and bitmap information
CGColorSpaceRelease(colorSpace);
@@ -200,9 +208,9 @@
-(UIImage *)makeRoundCornersOfSize:(CGSize) sizewh {
CGFloat cornerWidth = sizewh.width;
CGFloat cornerHeight = sizewh.height;
- CGFloat theScale = getScreenScale();
- CGFloat w = self.size.width * theScale;
- CGFloat h = self.size.height * theScale;
+ CGFloat screenScale = getScreenScale();
+ CGFloat w = self.size.width * screenScale;
+ CGFloat h = self.size.height * screenScale;
CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
CGContextRef context = CGBitmapContextCreate(NULL, w, h, 8, 4 * w, colorSpace, kCGImageAlphaPremultipliedFirst);
@@ -221,7 +229,7 @@
UIImage *newImage;
if ([self respondsToSelector:@selector(imageWithCGImage:scale:orientation:)])
- newImage = [UIImage imageWithCGImage:imageMasked scale:theScale orientation:UIImageOrientationUp];
+ newImage = [UIImage imageWithCGImage:imageMasked scale:screenScale orientation:UIImageOrientationUp];
else
newImage = [UIImage imageWithCGImage:imageMasked];
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Wed Dec 08 14:47:52 2010 +0100
@@ -107,7 +107,6 @@
6165922211CA9BA200D6E256 /* WeaponSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165920B11CA9BA200D6E256 /* WeaponSettingsViewController.m */; };
6165922E11CA9BD500D6E256 /* CGPointUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = 6165922311CA9BD500D6E256 /* CGPointUtils.c */; };
6165922F11CA9BD500D6E256 /* CommodityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165922611CA9BD500D6E256 /* CommodityFunctions.m */; };
- 6165923011CA9BD500D6E256 /* HogButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165922811CA9BD500D6E256 /* HogButtonView.m */; };
6165923111CA9BD500D6E256 /* SquareButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165922B11CA9BD500D6E256 /* SquareButtonView.m */; };
6165923211CA9BD500D6E256 /* UIImageExtra.m in Sources */ = {isa = PBXBuildFile; fileRef = 6165922D11CA9BD500D6E256 /* UIImageExtra.m */; };
6165925311CA9CB400D6E256 /* MainMenuViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6165924B11CA9CB400D6E256 /* MainMenuViewController-iPad.xib */; };
@@ -205,6 +204,7 @@
61F2E7CE1205EDE0005734F7 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */; };
61F2E7CF1205EDE0005734F7 /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */; };
61F2E7EC12060E31005734F7 /* checkbox.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7EB12060E31005734F7 /* checkbox.png */; };
+ 61F544C712AF1748007FD913 /* HoldTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F544C612AF1748007FD913 /* HoldTableViewCell.m */; };
61F7A43811E290650040BA66 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43111E290650040BA66 /* Icon-72.png */; };
61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43211E290650040BA66 /* Icon-Small-50.png */; };
61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43311E290650040BA66 /* Icon-Small.png */; };
@@ -863,8 +863,6 @@
6165922411CA9BD500D6E256 /* CGPointUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CGPointUtils.h; path = Classes/CGPointUtils.h; sourceTree = "<group>"; };
6165922511CA9BD500D6E256 /* CommodityFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommodityFunctions.h; path = Classes/CommodityFunctions.h; sourceTree = "<group>"; };
6165922611CA9BD500D6E256 /* CommodityFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommodityFunctions.m; path = Classes/CommodityFunctions.m; sourceTree = "<group>"; };
- 6165922711CA9BD500D6E256 /* HogButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HogButtonView.h; path = Classes/HogButtonView.h; sourceTree = "<group>"; };
- 6165922811CA9BD500D6E256 /* HogButtonView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HogButtonView.m; path = Classes/HogButtonView.m; sourceTree = "<group>"; };
6165922911CA9BD500D6E256 /* PascalImports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PascalImports.h; path = Classes/PascalImports.h; sourceTree = "<group>"; };
6165922A11CA9BD500D6E256 /* SquareButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SquareButtonView.h; path = Classes/SquareButtonView.h; sourceTree = "<group>"; };
6165922B11CA9BD500D6E256 /* SquareButtonView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SquareButtonView.m; path = Classes/SquareButtonView.m; sourceTree = "<group>"; };
@@ -960,8 +958,8 @@
61A4A39212A5CCC2004D81E6 /* uUtils.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uUtils.pas; path = ../../hedgewars/uUtils.pas; sourceTree = SOURCE_ROOT; };
61A4A39312A5CCC2004D81E6 /* uVariables.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uVariables.pas; path = ../../hedgewars/uVariables.pas; sourceTree = SOURCE_ROOT; };
61A4A3A112A5CD56004D81E6 /* uCaptions.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uCaptions.pas; path = ../../hedgewars/uCaptions.pas; sourceTree = SOURCE_ROOT; };
- 61C079E211F35A300072BF46 /* EditableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditableCellView.h; sourceTree = "<group>"; };
- 61C079E311F35A300072BF46 /* EditableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditableCellView.m; sourceTree = "<group>"; };
+ 61C079E211F35A300072BF46 /* EditableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditableCellView.h; path = Classes/EditableCellView.h; sourceTree = "<group>"; };
+ 61C079E311F35A300072BF46 /* EditableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EditableCellView.m; path = Classes/EditableCellView.m; sourceTree = "<group>"; };
61D2059F127CDD1100ABD83E /* ObjcExports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjcExports.h; path = Classes/ObjcExports.h; sourceTree = "<group>"; };
61D205A0127CDD1100ABD83E /* ObjcExports.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ObjcExports.m; path = Classes/ObjcExports.m; sourceTree = "<group>"; };
61D3D2A41290E03A003CE7C3 /* irc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = irc.png; path = Resources/Icons/irc.png; sourceTree = "<group>"; };
@@ -985,6 +983,8 @@
61F2E7CC1205EDE0005734F7 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = "<group>"; };
61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = AboutViewController.xib; path = ../Resources/AboutViewController.xib; sourceTree = "<group>"; };
61F2E7EB12060E31005734F7 /* checkbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = checkbox.png; path = Resources/Icons/checkbox.png; sourceTree = "<group>"; };
+ 61F544C512AF1748007FD913 /* HoldTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HoldTableViewCell.h; path = Classes/HoldTableViewCell.h; sourceTree = "<group>"; };
+ 61F544C612AF1748007FD913 /* HoldTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HoldTableViewCell.m; path = Classes/HoldTableViewCell.m; sourceTree = "<group>"; };
61F7A43111E290650040BA66 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "Resources/Icons/Icon-72.png"; sourceTree = "<group>"; };
61F7A43211E290650040BA66 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-50.png"; path = "Resources/Icons/Icon-Small-50.png"; sourceTree = "<group>"; };
61F7A43311E290650040BA66 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small.png"; path = "Resources/Icons/Icon-Small.png"; sourceTree = "<group>"; };
@@ -995,8 +995,8 @@
61F9040811DF58B00068B24D /* settingsButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settingsButton.png; path = Resources/Frontend/settingsButton.png; sourceTree = "<group>"; };
61F9040A11DF59370068B24D /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = Resources/Frontend/background.png; sourceTree = "<group>"; };
61F9040D11DF59D10068B24D /* netplayButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = netplayButton.png; path = Resources/Frontend/netplayButton.png; sourceTree = "<group>"; };
- 61F904D511DF7DA30068B24D /* WeaponCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeaponCellView.h; sourceTree = "<group>"; };
- 61F904D611DF7DA30068B24D /* WeaponCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WeaponCellView.m; sourceTree = "<group>"; };
+ 61F904D511DF7DA30068B24D /* WeaponCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WeaponCellView.h; path = Classes/WeaponCellView.h; sourceTree = "<group>"; };
+ 61F904D611DF7DA30068B24D /* WeaponCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WeaponCellView.m; path = Classes/WeaponCellView.m; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
928301170F10CAFC00CC5A3C /* libfpc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfpc.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -1076,7 +1076,7 @@
children = (
6165929C11CA9E2F00D6E256 /* SDL_uikitappdelegate.h */,
6165929D11CA9E2F00D6E256 /* SDL_uikitappdelegate.m */,
- 61DE91561258B76800B80214 /* Custom Buttons */,
+ 61DE91561258B76800B80214 /* Custom UIs */,
32CA4F630368D1EE00C91783 /* Hedgewars_Prefix.pch */,
6165922911CA9BD500D6E256 /* PascalImports.h */,
61D2059F127CDD1100ABD83E /* ObjcExports.h */,
@@ -1299,10 +1299,6 @@
6163EE7D11CC2600001C0453 /* SingleWeaponViewController.m */,
616591FE11CA9BA200D6E256 /* SingleSchemeViewController.h */,
616591FF11CA9BA200D6E256 /* SingleSchemeViewController.m */,
- 61C079E211F35A300072BF46 /* EditableCellView.h */,
- 61C079E311F35A300072BF46 /* EditableCellView.m */,
- 61F904D511DF7DA30068B24D /* WeaponCellView.h */,
- 61F904D611DF7DA30068B24D /* WeaponCellView.m */,
);
name = "Second Level";
sourceTree = "<group>";
@@ -1426,17 +1422,21 @@
name = Products;
sourceTree = "<group>";
};
- 61DE91561258B76800B80214 /* Custom Buttons */ = {
+ 61DE91561258B76800B80214 /* Custom UIs */ = {
isa = PBXGroup;
children = (
- 6165922711CA9BD500D6E256 /* HogButtonView.h */,
- 6165922811CA9BD500D6E256 /* HogButtonView.m */,
+ 619C5BA0124FA59000D041AE /* MapPreviewButtonView.h */,
+ 619C5BA1124FA59000D041AE /* MapPreviewButtonView.m */,
+ 61F544C512AF1748007FD913 /* HoldTableViewCell.h */,
+ 61F544C612AF1748007FD913 /* HoldTableViewCell.m */,
6165922A11CA9BD500D6E256 /* SquareButtonView.h */,
6165922B11CA9BD500D6E256 /* SquareButtonView.m */,
- 619C5BA0124FA59000D041AE /* MapPreviewButtonView.h */,
- 619C5BA1124FA59000D041AE /* MapPreviewButtonView.m */,
+ 61C079E211F35A300072BF46 /* EditableCellView.h */,
+ 61C079E311F35A300072BF46 /* EditableCellView.m */,
+ 61F904D511DF7DA30068B24D /* WeaponCellView.h */,
+ 61F904D611DF7DA30068B24D /* WeaponCellView.m */,
);
- name = "Custom Buttons";
+ name = "Custom UIs";
sourceTree = "<group>";
};
61F7A42811E2905C0040BA66 /* Icons */ = {
@@ -2380,7 +2380,6 @@
6165922211CA9BA200D6E256 /* WeaponSettingsViewController.m in Sources */,
6165922E11CA9BD500D6E256 /* CGPointUtils.c in Sources */,
6165922F11CA9BD500D6E256 /* CommodityFunctions.m in Sources */,
- 6165923011CA9BD500D6E256 /* HogButtonView.m in Sources */,
6165923111CA9BD500D6E256 /* SquareButtonView.m in Sources */,
6165923211CA9BD500D6E256 /* UIImageExtra.m in Sources */,
6165929E11CA9E2F00D6E256 /* SDL_uikitappdelegate.m in Sources */,
@@ -2412,6 +2411,7 @@
61A4A39E12A5CCC2004D81E6 /* uVariables.pas in Sources */,
61A4A3A212A5CD56004D81E6 /* uCaptions.pas in Sources */,
61E5D68D12AB006F00566F29 /* uLandPainted.pas in Sources */,
+ 61F544C712AF1748007FD913 /* HoldTableViewCell.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
--- a/project_files/HedgewarsMobile/Resources/GameConfigViewController.xib Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/GameConfigViewController.xib Wed Dec 08 14:47:52 2010 +0100
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1024</int>
+ <int key="IBDocument.SystemTarget">1056</int>
<string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">123</string>
+ <string key="NS.object.0">132</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -50,7 +50,7 @@
<object class="IBUISegmentedControl" id="563596142">
<reference key="NSNextResponder" ref="836721772"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{87, 8}, {265, 30}}</string>
+ <string key="NSFrame">{{96, 8}, {269, 30}}</string>
<reference key="NSSuperview" ref="836721772"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">12345</int>
@@ -120,7 +120,6 @@
</object>
<object class="IBUIBarButtonItem" id="530186890">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <float key="IBUIWidth">265</float>
<reference key="IBUICustomView" ref="563596142"/>
<reference key="IBUIToolbar" ref="836721772"/>
</object>
@@ -131,9 +130,9 @@
</object>
<object class="IBUIBarButtonItem" id="919181414">
<int key="IBUITag">1</int>
- <string key="IBUITitle">Start Game</string>
+ <string key="IBUITitle">Start</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <float key="IBUIWidth">90</float>
+ <float key="IBUIWidth">68</float>
<int key="IBUIStyle">2</int>
<reference key="IBUIToolbar" ref="836721772"/>
</object>
@@ -535,6 +534,13 @@
<string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPrintFormatter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
</object>
</object>
@@ -588,7 +594,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
+ <integer value="1056" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -597,6 +603,6 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../Hedgewars.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">123</string>
+ <string key="IBCocoaTouchPluginVersion">132</string>
</data>
</archive>
--- a/project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPhone.xib Tue Dec 07 01:18:43 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/HelpPageInGameViewController-iPhone.xib Wed Dec 08 14:47:52 2010 +0100
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="97"/>
+ <integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -42,42 +42,16 @@
<int key="NSvFlags">292</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIScrollView" id="400316535">
+ <object class="IBUIScrollView" id="480371523">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUILabel" id="827961215">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="806535969">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{13, 3}, {440, 30}}</string>
- <reference key="NSSuperview" ref="400316535"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Here you can find help for the various game elements.</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Oblique</string>
- <double key="NSSize">16</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor" id="283637272">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUINumberOfLines">0</int>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="337977618">
- <reference key="NSNextResponder" ref="400316535"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 311}, {150, 22}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{20, 283}, {150, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -89,16 +63,19 @@
<double key="NSSize">18</double>
<int key="NSfFlags">16</int>
</object>
- <reference key="IBUITextColor" ref="283637272"/>
+ <object class="NSColor" key="IBUITextColor" id="283637272">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
</object>
- <object class="IBUILabel" id="451019636">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="837055082">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 320}, {203, 85}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{20, 292}, {203, 85}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -116,11 +93,11 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUINumberOfLines">0</int>
</object>
- <object class="IBUILabel" id="408507086">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="669645325">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 41}, {186, 22}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{20, 13}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -133,11 +110,11 @@
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
</object>
- <object class="IBUILabel" id="904797875">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="392421036">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 62}, {187, 43}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{20, 34}, {187, 43}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -151,11 +128,11 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUINumberOfLines">0</int>
</object>
- <object class="IBUILabel" id="549219303">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="709427542">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{217, 336}, {243, 22}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{217, 308}, {243, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -169,11 +146,11 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">2</int>
</object>
- <object class="IBUILabel" id="430607879">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="748437184">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{231, 356}, {229, 87}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{231, 328}, {229, 87}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -188,11 +165,11 @@
<int key="IBUINumberOfLines">0</int>
<int key="IBUITextAlignment">2</int>
</object>
- <object class="IBUILabel" id="56917735">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="941791832">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 113}, {186, 22}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{20, 85}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -205,11 +182,11 @@
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
</object>
- <object class="IBUILabel" id="147310378">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="26100154">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 129}, {191, 63}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{20, 101}, {191, 63}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -223,11 +200,11 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUINumberOfLines">0</int>
</object>
- <object class="IBUILabel" id="323195165">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="413836006">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 200}, {203, 22}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{20, 172}, {203, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -240,11 +217,11 @@
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
</object>
- <object class="IBUILabel" id="1047547119">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="579557686">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 219}, {203, 85}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{20, 191}, {203, 85}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -258,11 +235,11 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUINumberOfLines">4</int>
</object>
- <object class="IBUILabel" id="160523547">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="740577465">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{274, 41}, {186, 22}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{274, 13}, {186, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -276,11 +253,11 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">2</int>
</object>
- <object class="IBUILabel" id="341620427">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="347724774">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{273, 63}, {187, 43}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{273, 35}, {187, 43}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -295,11 +272,11 @@
<int key="IBUINumberOfLines">0</int>
<int key="IBUITextAlignment">2</int>
</object>
- <object class="IBUILabel" id="869619534">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="318624215">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{351, 110}, {109, 22}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{351, 82}, {109, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -313,11 +290,11 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">2</int>
</object>
- <object class="IBUILabel" id="16268121">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="145842014">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{246, 133}, {214, 84}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{246, 105}, {214, 84}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -332,11 +309,11 @@
<int key="IBUINumberOfLines">0</int>
<int key="IBUITextAlignment">2</int>
</object>
- <object class="IBUILabel" id="577051094">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="415037922">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{325, 225}, {135, 22}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{325, 197}, {135, 22}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -350,11 +327,11 @@
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">2</int>
</object>
- <object class="IBUILabel" id="420793299">
- <reference key="NSNextResponder" ref="400316535"/>
+ <object class="IBUILabel" id="499026341">
+ <reference key="NSNextResponder" ref="480371523"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{249, 245}, {211, 85}}</string>
- <reference key="NSSuperview" ref="400316535"/>
+ <string key="NSFrame">{{249, 217}, {211, 85}}</string>
+ <reference key="NSSuperview" ref="480371523"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -369,43 +346,34 @@
<int key="IBUINumberOfLines">0</int>
<int key="IBUITextAlignment">2</int>
</object>
- <object class="IBUIButton" id="630442385">
- <reference key="NSNextResponder" ref="400316535"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{203, 34}, {60, 37}}</string>
- <reference key="NSSuperview" ref="400316535"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">15</double>
- <int key="NSfFlags">16</int>
- </object>
- <int key="IBUIButtonType">1</int>
- <string key="IBUINormalTitle">Back</string>
- <object class="NSColor" key="IBUIHighlightedTitleColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
- </object>
- <object class="NSColor" key="IBUINormalTitleShadowColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
</object>
- <string key="NSFrameSize">{489, 332}</string>
+ <string key="NSFrame">{{-5, 44}, {489, 332}}</string>
<reference key="NSSuperview" ref="766721923"/>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<int key="IBUITag">1</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
+ <object class="IBUINavigationBar" id="126317414">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrame">{{-1, 0}, {481, 44}}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUINavigationItem" id="477618874">
+ <reference key="IBUINavigationBar" ref="126317414"/>
+ <string key="IBUITitle">Help page</string>
+ <object class="IBUIBarButtonItem" key="IBUILeftBarButtonItem" id="843591489">
+ <string key="IBUITitle">Back</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUINavigationItem" ref="477618874"/>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ </object>
</object>
<string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview"/>
@@ -432,21 +400,20 @@
<int key="connectionID">3</int>
</object>
<object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">dismiss</string>
+ <reference key="source" ref="843591489"/>
+ <reference key="destination" ref="841351856"/>
+ </object>
+ <int key="connectionID">141</int>
+ </object>
+ <object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">scrollView</string>
<reference key="source" ref="841351856"/>
- <reference key="destination" ref="400316535"/>
+ <reference key="destination" ref="480371523"/>
</object>
- <int key="connectionID">115</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">dismiss</string>
- <reference key="source" ref="630442385"/>
- <reference key="destination" ref="841351856"/>
- <int key="IBEventType">7</int>
- </object>
- <int key="connectionID">117</int>
+ <int key="connectionID">142</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -474,125 +441,137 @@
<reference key="object" ref="766721923"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="400316535"/>
+ <reference ref="126317414"/>
+ <reference ref="480371523"/>
</object>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">97</int>
- <reference key="object" ref="400316535"/>
+ <int key="objectID">118</int>
+ <reference key="object" ref="126317414"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="477618874"/>
+ </object>
+ <reference key="parent" ref="766721923"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">121</int>
+ <reference key="object" ref="480371523"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="420793299"/>
- <reference ref="577051094"/>
- <reference ref="16268121"/>
- <reference ref="869619534"/>
- <reference ref="341620427"/>
- <reference ref="160523547"/>
- <reference ref="430607879"/>
- <reference ref="1047547119"/>
- <reference ref="323195165"/>
- <reference ref="451019636"/>
- <reference ref="337977618"/>
- <reference ref="147310378"/>
- <reference ref="56917735"/>
- <reference ref="408507086"/>
- <reference ref="904797875"/>
- <reference ref="827961215"/>
- <reference ref="549219303"/>
- <reference ref="630442385"/>
+ <reference ref="709427542"/>
+ <reference ref="392421036"/>
+ <reference ref="669645325"/>
+ <reference ref="941791832"/>
+ <reference ref="26100154"/>
+ <reference ref="806535969"/>
+ <reference ref="837055082"/>
+ <reference ref="413836006"/>
+ <reference ref="579557686"/>
+ <reference ref="748437184"/>
+ <reference ref="740577465"/>
+ <reference ref="347724774"/>
+ <reference ref="318624215"/>
+ <reference ref="145842014"/>
+ <reference ref="415037922"/>
+ <reference ref="499026341"/>
</object>
<reference key="parent" ref="766721923"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">98</int>
- <reference key="object" ref="420793299"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">122</int>
+ <reference key="object" ref="709427542"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">99</int>
- <reference key="object" ref="577051094"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">124</int>
+ <reference key="object" ref="392421036"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">100</int>
- <reference key="object" ref="16268121"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">125</int>
+ <reference key="object" ref="669645325"/>
+ <reference key="parent" ref="480371523"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">126</int>
+ <reference key="object" ref="941791832"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">101</int>
- <reference key="object" ref="869619534"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">127</int>
+ <reference key="object" ref="26100154"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">102</int>
- <reference key="object" ref="341620427"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">128</int>
+ <reference key="object" ref="806535969"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">103</int>
- <reference key="object" ref="160523547"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">129</int>
+ <reference key="object" ref="837055082"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">104</int>
- <reference key="object" ref="430607879"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">130</int>
+ <reference key="object" ref="413836006"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">105</int>
- <reference key="object" ref="1047547119"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">131</int>
+ <reference key="object" ref="579557686"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">106</int>
- <reference key="object" ref="323195165"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">132</int>
+ <reference key="object" ref="748437184"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">107</int>
- <reference key="object" ref="451019636"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">133</int>
+ <reference key="object" ref="740577465"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">108</int>
- <reference key="object" ref="337977618"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">134</int>
+ <reference key="object" ref="347724774"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">109</int>
- <reference key="object" ref="147310378"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">135</int>
+ <reference key="object" ref="318624215"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">110</int>
- <reference key="object" ref="56917735"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">136</int>
+ <reference key="object" ref="145842014"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">111</int>
- <reference key="object" ref="408507086"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">137</int>
+ <reference key="object" ref="415037922"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">112</int>
- <reference key="object" ref="904797875"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">138</int>
+ <reference key="object" ref="499026341"/>
+ <reference key="parent" ref="480371523"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">113</int>
- <reference key="object" ref="827961215"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">119</int>
+ <reference key="object" ref="477618874"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="843591489"/>
+ </object>
+ <reference key="parent" ref="126317414"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">114</int>
- <reference key="object" ref="549219303"/>
- <reference key="parent" ref="400316535"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">116</int>
- <reference key="object" ref="630442385"/>
- <reference key="parent" ref="400316535"/>
+ <int key="objectID">140</int>
+ <reference key="object" ref="843591489"/>
+ <reference key="parent" ref="477618874"/>
</object>
</object>
</object>
@@ -602,48 +581,48 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
- <string>100.IBPluginDependency</string>
- <string>100.IBViewBoundsToFrameTransform</string>
- <string>101.IBPluginDependency</string>
- <string>101.IBViewBoundsToFrameTransform</string>
- <string>102.IBPluginDependency</string>
- <string>102.IBViewBoundsToFrameTransform</string>
- <string>103.IBPluginDependency</string>
- <string>103.IBViewBoundsToFrameTransform</string>
- <string>104.IBPluginDependency</string>
- <string>104.IBViewBoundsToFrameTransform</string>
- <string>105.IBPluginDependency</string>
- <string>105.IBViewBoundsToFrameTransform</string>
- <string>106.IBPluginDependency</string>
- <string>106.IBViewBoundsToFrameTransform</string>
- <string>107.IBPluginDependency</string>
- <string>107.IBViewBoundsToFrameTransform</string>
- <string>108.IBPluginDependency</string>
- <string>108.IBViewBoundsToFrameTransform</string>
- <string>109.IBPluginDependency</string>
- <string>109.IBViewBoundsToFrameTransform</string>
- <string>110.IBPluginDependency</string>
- <string>110.IBViewBoundsToFrameTransform</string>
- <string>111.IBPluginDependency</string>
- <string>111.IBViewBoundsToFrameTransform</string>
- <string>112.IBPluginDependency</string>
- <string>112.IBViewBoundsToFrameTransform</string>
- <string>113.IBPluginDependency</string>
- <string>113.IBViewBoundsToFrameTransform</string>
- <string>114.IBPluginDependency</string>
- <string>114.IBViewBoundsToFrameTransform</string>
- <string>116.IBPluginDependency</string>
- <string>116.IBViewBoundsToFrameTransform</string>
+ <string>118.IBPluginDependency</string>
+ <string>118.IBViewBoundsToFrameTransform</string>
+ <string>119.IBPluginDependency</string>
+ <string>121.IBEditorWindowLastContentRect</string>
+ <string>121.IBPluginDependency</string>
+ <string>121.IBViewBoundsToFrameTransform</string>
+ <string>122.IBPluginDependency</string>
+ <string>122.IBViewBoundsToFrameTransform</string>
+ <string>124.IBPluginDependency</string>
+ <string>124.IBViewBoundsToFrameTransform</string>
+ <string>125.IBPluginDependency</string>
+ <string>125.IBViewBoundsToFrameTransform</string>
+ <string>126.IBPluginDependency</string>
+ <string>126.IBViewBoundsToFrameTransform</string>
+ <string>127.IBPluginDependency</string>
+ <string>127.IBViewBoundsToFrameTransform</string>
+ <string>128.IBPluginDependency</string>
+ <string>128.IBViewBoundsToFrameTransform</string>
+ <string>129.IBPluginDependency</string>
+ <string>129.IBViewBoundsToFrameTransform</string>
+ <string>130.IBPluginDependency</string>
+ <string>130.IBViewBoundsToFrameTransform</string>
+ <string>131.IBPluginDependency</string>
+ <string>131.IBViewBoundsToFrameTransform</string>
+ <string>132.IBPluginDependency</string>
+ <string>132.IBViewBoundsToFrameTransform</string>
+ <string>133.IBPluginDependency</string>
+ <string>133.IBViewBoundsToFrameTransform</string>
+ <string>134.IBPluginDependency</string>
+ <string>134.IBViewBoundsToFrameTransform</string>
+ <string>135.IBPluginDependency</string>
+ <string>135.IBViewBoundsToFrameTransform</string>
+ <string>136.IBPluginDependency</string>
+ <string>136.IBViewBoundsToFrameTransform</string>
+ <string>137.IBPluginDependency</string>
+ <string>137.IBViewBoundsToFrameTransform</string>
+ <string>138.IBPluginDependency</string>
+ <string>138.IBViewBoundsToFrameTransform</string>
+ <string>140.IBPluginDependency</string>
<string>2.IBEditorWindowLastContentRect</string>
<string>2.IBPluginDependency</string>
<string>2.IBViewBoundsToFrameTransform</string>
- <string>97.IBEditorWindowLastContentRect</string>
- <string>97.IBPluginDependency</string>
- <string>97.IBViewBoundsToFrameTransform</string>
- <string>98.IBPluginDependency</string>
- <string>98.IBViewBoundsToFrameTransform</string>
- <string>99.IBPluginDependency</string>
- <string>99.IBViewBoundsToFrameTransform</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -651,11 +630,57 @@
<string>UIResponder</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDdgAAw1oAAA</bytes>
+ <bytes key="NSTransformStruct">AQAAAADAQAAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{589, 578}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">AcCgAABCMAAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw7aAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCVAAAwx8AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwnQAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCxgAAwtYAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDr4AAwwUAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABCxgAAwyQAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw+SAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAxARAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw6aAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw8+AAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw+EAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDiQAAwmwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
@@ -663,71 +688,25 @@
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDiQAAwmwAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw+EAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw8+AAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw6aAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAxARAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw+SAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCxgAAwyQAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDr4AAwwUAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCxgAAwtYAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwnQAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCVAAAwx8AAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDdgAAw1oAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwnQAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAw7aAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDooAAw3gAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDSwAAwooAAA</bytes>
- </object>
- <string>{{165, 514}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw4kAAA</bytes>
- </object>
- <string>{{589, 578}, {480, 320}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform"/>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDeQAAw6aAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{165, 514}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDooAAw3gAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw4kAAA</bytes>
</object>
</object>
</object>
@@ -747,7 +726,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">117</int>
+ <int key="maxID">142</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -891,19 +870,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIButton</string>
- <string key="superclassName">UIControl</string>
+ <string key="className">UIBarButtonItem</string>
+ <string key="superclassName">UIBarItem</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIControl</string>
- <string key="superclassName">UIView</string>
+ <string key="className">UIBarItem</string>
+ <string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -915,6 +894,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UINavigationBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="847596400">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UINavigationItem</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="847596400"/>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UIResponder</string>
<string key="superclassName">NSObject</string>
<reference key="sourceIdentifier" ref="786211723"/>
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog.png has changed
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog@2x.png has changed
