--- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.h Thu Sep 02 22:37:24 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.h Thu Sep 02 23:44:35 2010 +0200
@@ -23,6 +23,7 @@
UIImage *normalHogSprite;
NSArray *secondaryItems;
+ NSArray *moreSecondaryItems;
BOOL isWriteNeeded;
HogHatViewController *hogHatViewController;
@@ -37,6 +38,7 @@
@property (nonatomic,retain) NSString *teamName;
@property (nonatomic,retain) UIImage *normalHogSprite;
@property (nonatomic,retain) NSArray *secondaryItems;
+@property (nonatomic,retain) NSArray *moreSecondaryItems;
-(void) writeFile;
-(void) setWriteNeeded;
--- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Thu Sep 02 22:37:24 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m Thu Sep 02 23:44:35 2010 +0200
@@ -19,7 +19,7 @@
#define TEAMNAME_TAG 78789
@implementation SingleTeamViewController
-@synthesize teamDictionary, normalHogSprite, secondaryItems, teamName;
+@synthesize teamDictionary, normalHogSprite, secondaryItems, moreSecondaryItems, teamName;
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
return rotationManager(interfaceOrientation);
@@ -58,6 +58,16 @@
NSLocalizedString(@"Level",@""),nil];
self.secondaryItems = array;
[array release];
+
+ // labels for the subtitles
+ NSArray *moreArray = [[NSArray alloc] initWithObjects:
+ NSLocalizedString(@"Mark the death of your fallen warriors",@""),
+ NSLocalizedString(@"Pick a slang your hogs will speak",@""),
+ NSLocalizedString(@"Select the team invincible fortress (only valid for fort games)",@""),
+ NSLocalizedString(@"Choose a charismatic symbol for your team",@""),
+ NSLocalizedString(@"Opt for controlling the team or let the AI lead",@""),nil];
+ self.moreSecondaryItems = moreArray;
+ [moreArray release];
// load the base hog image, drawing will occure in cellForRow...
NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/Hedgehog.png",GRAPHICS_DIRECTORY()];
@@ -208,11 +218,12 @@
case 2:
cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier2];
if (cell == nil) {
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle
reuseIdentifier:CellIdentifier2] autorelease];
}
cell.textLabel.text = [self.secondaryItems objectAtIndex:row];
+ cell.detailTextLabel.text = [self.moreSecondaryItems objectAtIndex:row];
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
switch (row) {
case 0: // grave
@@ -222,17 +233,22 @@
cell.imageView.image = accessoryImage;
[accessoryImage release];
break;
+ case 1: // voice
+ accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/HellishBomb.png",
+ GRAPHICS_DIRECTORY()]];
+ cell.imageView.image = accessoryImage;
+ [accessoryImage release];
+ break;
case 2: // fort
accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@-preview.png",
FORTS_DIRECTORY(),[teamDictionary objectForKey:@"fort"]]];
- cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(42, 42)];
+ cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)];
[accessoryImage release];
break;
-
case 3: // flags
accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.png",
FLAGS_DIRECTORY(),[teamDictionary objectForKey:@"flag"]]];
- cell.imageView.image = accessoryImage;
+ cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)];
[accessoryImage release];
break;
case 4: // level
@@ -240,7 +256,7 @@
BOTLEVELS_DIRECTORY(),[[[[teamDictionary objectForKey:@"hedgehogs"]
objectAtIndex:0] objectForKey:@"level"]
intValue]]];
- cell.imageView.image = accessoryImage;
+ cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)];
[accessoryImage release];
break;
default:
@@ -348,6 +364,7 @@
self.teamName = nil;
self.normalHogSprite = nil;
self.secondaryItems = nil;
+ self.moreSecondaryItems = nil;
hogHatViewController = nil;
gravesViewController = nil;
voicesViewController = nil;
@@ -363,6 +380,7 @@
[teamName release];
[normalHogSprite release];
[secondaryItems release];
+ [moreSecondaryItems release];
[hogHatViewController release];
[gravesViewController release];
[fortsViewController release];
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Thu Sep 02 22:37:24 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Thu Sep 02 23:44:35 2010 +0200
@@ -2027,7 +2027,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n#delete forbidden maps\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,Island}\nrm -rf ${PROJECT_DIR}/Data/Themes/City/Flake.png\n\n#the following ones must be removed when their support is implemented\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Russian,Singer,Surfer}\n\n#delete all names\nrm -rf ${PROJECT_DIR}/Data/Names/\n\n#delete all missions\nrm -rf ${PROJECT_DIR}/Data/Missions/\n\n#delete all reserved hats\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/";
+ shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{City,Island}\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#rm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Pirate,Robot,Russian,Singer,Surfer}\n\n#delete all names, missions, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Missions/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n";
showEnvVarsInLog = 0;
};
9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {