hedgewars-draft: comparison project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m

equal deleted inserted replaced

-:2bfda544ae48
+:dc3531e49e4c
 #import "WeaponCellView.h"
 #import "CommodityFunctions.h"
 #import "UIImageExtra.h"
 @implementation SingleWeaponViewController
-@synthesize weaponName, ammoStoreImage, ammoNames;
+@synthesize weaponName, description, ammoStoreImage, ammoNames;
 -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
 return rotationManager(interfaceOrientation);
 }
 #pragma mark -
 #pragma mark View lifecycle
 -(void) viewDidLoad {
 [super viewDidLoad];
 // also increment CURRENT_AMMOSIZE in CommodityFunctions.h
 NSArray *array = [[NSArray alloc] initWithObjects:
 NSLocalizedString(@"Grenade",@""),
 NSLocalizedString(@"Cluster Bomb",@""),
 NSLocalizedString(@"Bazooka",@""),
 NSLocalizedString(@"Sticky Mine",@""),
 NSLocalizedString(@"Hammer",@""),
 nil];
 self.ammoNames = array;
 [array release];
 quantity = (char *)malloc(sizeof(char)*(CURRENT_AMMOSIZE+1));
 probability = (char *)malloc(sizeof(char)*(CURRENT_AMMOSIZE+1));
 delay = (char *)malloc(sizeof(char)*(CURRENT_AMMOSIZE+1));
 crateness = (char *)malloc(sizeof(char)*(CURRENT_AMMOSIZE+1));
 NSString *str = [NSString stringWithFormat:@"%@/AmmoMenu/Ammos.png",GRAPHICS_DIRECTORY()];
 UIImage *img = [[UIImage alloc] initWithContentsOfFile:str];
 self.ammoStoreImage = img;
 [img release];
 self.title = NSLocalizedString(@"Edit weapons preferences",@"");
 }
 -(void) viewWillAppear:(BOOL) animated {
 [super viewWillAppear:animated];
 NSString *ammoFile = [[NSString alloc] initWithFormat:@"%@/%@.plist",WEAPONS_DIRECTORY(),self.weaponName];
 NSDictionary *weapon = [[NSDictionary alloc] initWithContentsOfFile:ammoFile];
 [ammoFile release];
+self.description = [weapon objectForKey:@"description"];
 const char *tmp1 = [[weapon objectForKey:@"ammostore_initialqt"] UTF8String];
 const char *tmp2 = [[weapon objectForKey:@"ammostore_probability"] UTF8String];
 const char *tmp3 = [[weapon objectForKey:@"ammostore_delay"] UTF8String];
 const char *tmp4 = [[weapon objectForKey:@"ammostore_crate"] UTF8String];
 [weapon release];
 // if the new weaponset is diffrent from the older we need to update it replacing
 // the missing ammos with 0 quantity
 int oldlen = strlen(tmp1);
 for (int i = 0; i < oldlen; i++) {
 quantity[i] = tmp1[i];
 quantity[i] = '0';
 probability[i] = '0';
 delay[i] = '0';
 crateness[i] = '0';
 }
 [self.tableView reloadData];
 }
 -(void) viewWillDisappear:(BOOL) animated {
 [super viewWillDisappear:animated];
 -(void) saveAmmos {
 quantity[CURRENT_AMMOSIZE] = '\0';
 probability[CURRENT_AMMOSIZE] = '\0';
 delay[CURRENT_AMMOSIZE] = '\0';
 crateness[CURRENT_AMMOSIZE] = '\0';
 NSString *quantityStr = [NSString stringWithUTF8String:quantity];
 NSString *probabilityStr = [NSString stringWithUTF8String:probability];
 NSString *delayStr = [NSString stringWithUTF8String:delay];
 NSString *cratenessStr = [NSString stringWithUTF8String:crateness];
 NSDictionary *weapon = [[NSDictionary alloc] initWithObjectsAndKeys:
 [NSNumber numberWithInt:CURRENT_AMMOSIZE],@"version",
 quantityStr,@"ammostore_initialqt",
 probabilityStr,@"ammostore_probability",
 delayStr,@"ammostore_delay",
-cratenessStr,@"ammostore_crate", nil];
+cratenessStr,@"ammostore_crate",
+self.description,@"description",
+nil];
 NSString *ammoFile = [[NSString alloc] initWithFormat:@"%@/%@.plist",WEAPONS_DIRECTORY(),self.weaponName];
 [weapon writeToFile:ammoFile atomically:YES];
 [ammoFile release];
 [weapon release];
 }
 return 2;
 }
 -(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
 if (section == 0)
-return 1;
+return 2;
 else
 return CURRENT_AMMOSIZE;
 }
 // Customize the appearance of table view cells.
 -(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
 static NSString *CellIdentifier0 = @"Cell0";
 static NSString *CellIdentifier1 = @"Cell1";
 NSInteger row = [indexPath row];
 UITableViewCell *cell = nil;
 if (0 == [indexPath section]) {
-EditableCellView *customCell = (EditableCellView *)[aTableView dequeueReusableCellWithIdentifier:CellIdentifier0];
+EditableCellView *editableCell = (EditableCellView *)[aTableView dequeueReusableCellWithIdentifier:CellIdentifier0];
-if (customCell == nil) {
+if (editableCell == nil) {
-customCell = [[[EditableCellView alloc] initWithStyle:UITableViewCellStyleDefault
+editableCell = [[[EditableCellView alloc] initWithStyle:UITableViewCellStyleDefault
 reuseIdentifier:CellIdentifier0] autorelease];
-customCell.delegate = self;
+editableCell.delegate = self;
 }
+editableCell.tag = row;
-customCell.textField.text = self.weaponName;
+editableCell.selectionStyle = UITableViewCellSelectionStyleNone;
-customCell.detailTextLabel.text = nil;
+editableCell.imageView.image = nil;
-customCell.imageView.image = nil;
+editableCell.detailTextLabel.text = nil;
-customCell.selectionStyle = UITableViewCellSelectionStyleNone;
-cell = customCell;
+if (row == 0) {
+editableCell.textField.text = self.weaponName;
+} else {
+editableCell.textField.font = [UIFont systemFontOfSize:[UIFont labelFontSize]];
+editableCell.textField.text = self.description;
+editableCell.textField.placeholder = NSLocalizedString(@"You can add a description if you wish",@"");
+}
+cell = editableCell;
 } else {
-WeaponCellView *customCell = (WeaponCellView *)[aTableView dequeueReusableCellWithIdentifier:CellIdentifier1];
+WeaponCellView *weaponCell = (WeaponCellView *)[aTableView dequeueReusableCellWithIdentifier:CellIdentifier1];
-if (customCell == nil) {
+if (weaponCell == nil) {
-customCell = [[[WeaponCellView alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier1] autorelease];
+weaponCell = [[[WeaponCellView alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier1] autorelease];
-customCell.delegate = self;
+weaponCell.delegate = self;
 }
 int x = ((row*32)/1024)*32;
 int y = (row*32)%1024;
 UIImage *img = [[self.ammoStoreImage cutAt:CGRectMake(x, y, 32, 32)] makeRoundCornersOfSize:CGSizeMake(7, 7)];
-customCell.weaponIcon.image = img;
+weaponCell.weaponIcon.image = img;
-customCell.weaponName.text = [ammoNames objectAtIndex:row];
+weaponCell.weaponName.text = [ammoNames objectAtIndex:row];
-customCell.tag = row;
+weaponCell.tag = row;
-[customCell.initialSli setValue:[[NSString stringWithFormat:@"%c",quantity[row]] intValue] animated:NO];
+[weaponCell.initialSli setValue:[[NSString stringWithFormat:@"%c",quantity[row]] intValue] animated:NO];
-[customCell.probabilitySli setValue:[[NSString stringWithFormat:@"%c", probability[row]] intValue] animated:NO];
+[weaponCell.probabilitySli setValue:[[NSString stringWithFormat:@"%c", probability[row]] intValue] animated:NO];
-[customCell.delaySli setValue:[[NSString stringWithFormat:@"%c", delay[row]] intValue] animated:NO];
+[weaponCell.delaySli setValue:[[NSString stringWithFormat:@"%c", delay[row]] intValue] animated:NO];
-[customCell.crateSli setValue:[[NSString stringWithFormat:@"%c", crateness[row]] intValue] animated:NO];
+[weaponCell.crateSli setValue:[[NSString stringWithFormat:@"%c", crateness[row]] intValue] animated:NO];
-cell = customCell;
+cell = weaponCell;
 }
 cell.selectionStyle = UITableViewCellSelectionStyleNone;
 return cell;
 }
 #pragma mark -
 #pragma mark editableCellView delegate
 // set the new value
 -(void) saveTextFieldValue:(NSString *)textString withTag:(NSInteger) tagValue {
-// delete old file
+if (tagValue == 0) {
-[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@.plist",WEAPONS_DIRECTORY(),self.weaponName] error:NULL];
+// delete old file
-// update filename
+[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@.plist",WEAPONS_DIRECTORY(),self.weaponName] error:NULL];
-self.weaponName = textString;
+// update filename
-// save new file
+self.weaponName = textString;
-[self saveAmmos];
+// save new file
+[self saveAmmos];
+} else {
+self.description = textString;
+}
 }
 #pragma mark -
 #pragma mark WeaponButtonControllerDelegate
 -(void) updateValues:(NSArray *)withArray atIndex:(NSInteger) index {
 free(quantity); quantity = NULL;
 free(probability); probability = NULL;
 free(delay); delay = NULL;
 free(crateness); crateness = NULL;
 [super viewDidUnload];
+self.description = nil;
 self.weaponName = nil;
 self.ammoStoreImage = nil;
 self.ammoNames = nil;
 MSG_DIDUNLOAD();
 [super viewDidUnload];
 }
 -(void) dealloc {
 [weaponName release];
+[description release];
 [ammoStoreImage release];
 [ammoNames release];
 [super dealloc];
 }

changeset 3782	dc3531e49e4c
parent 3766	36b625111609
child 3825	fd6c20cd90e3