# HG changeset patch # User koda # Date 1280703324 -7200 # Node ID 12d17c6e88555300eba430ff4be1ce0d2dca8ede # Parent 8c449776ebe6aa643cc0a42e441c07c33098555a halfway-through finishing the frontend with new graphics by Tiy + initial 'About' page set up diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/AboutViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/AboutViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -0,0 +1,16 @@ +// +// AboutViewController.h +// Hedgewars +// +// Created by Vittorio on 01/08/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface AboutViewController : UIViewController { + +} + +@end diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/AboutViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Mon Aug 02 00:55:24 2010 +0200 @@ -0,0 +1,42 @@ + // +// AboutViewController.m +// Hedgewars +// +// Created by Vittorio on 01/08/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "AboutViewController.h" +#import "CommodityFunctions.h" + +@implementation AboutViewController + + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); +} + +-(void) viewDidLoad { + self.view.frame = CGRectMake(0, 0, 320, 480); + [super viewDidLoad]; +} + +-(void) didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +-(void) viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + +-(void) dealloc { + [super dealloc]; +} + + +@end diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/AboutViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/AboutViewController.xib Mon Aug 02 00:55:24 2010 +0200 @@ -0,0 +1,382 @@ + + + + 1024 + 10F569 + 788 + 1038.29 + 461.00 +

+ 0 + IBIPadFramework +

+ YES + ../Hedgewars.xcodeproj + 3 + 117 + + diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/CommodityFunctions.h --- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.h Mon Aug 02 00:55:24 2010 +0200 @@ -39,6 +39,9 @@ #define CURRENT_AMMOSIZE 46 +#define UICOLOR_HW_YELLOW_BODER [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xC0/255 blue:0 alpha:1] +#define UICOLOR_HW_YELLOW_TEXT [UIColor colorWithRed:(CGFloat)0xF0/255 green:(CGFloat)0xD0/255 blue:0 alpha:1] + void createTeamNamed (NSString *nameWithoutExt); void createWeaponNamed (NSString *nameWithoutExt); void createSchemeNamed (NSString *nameWithoutExt); diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/EditableCellView.h --- a/project_files/HedgewarsMobile/Classes/EditableCellView.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/EditableCellView.h Mon Aug 02 00:55:24 2010 +0200 @@ -20,7 +20,7 @@ UILabel *titleLabel; NSInteger minimumCharacters; NSInteger maximumCharacters; - + @private NSString *oldValue; } diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/FlagsViewController.h --- a/project_files/HedgewarsMobile/Classes/FlagsViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/FlagsViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -12,7 +12,7 @@ @interface FlagsViewController : UITableViewController { NSDictionary *teamDictionary; - NSArray *flagArray; + NSArray *flagArray; NSIndexPath *lastIndexPath; } diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/GameConfigViewController.h --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -12,7 +12,7 @@ @class MapConfigViewController; @class SchemeWeaponConfigViewController; -@interface GameConfigViewController : UIViewController { +@interface GameConfigViewController : UIViewController { UIViewController *activeController; MapConfigViewController *mapConfigViewController; TeamConfigViewController *teamConfigViewController; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Aug 02 00:55:24 2010 +0200 @@ -198,17 +198,17 @@ if (mapConfigViewController == nil) mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPad" bundle:nil]; if (teamConfigViewController == nil) - teamConfigViewController = [[TeamConfigViewController alloc] initWithStyle:UITableViewStylePlain]; - teamConfigViewController.view.frame = CGRectMake(3, 224, 300, 472); + teamConfigViewController = [[TeamConfigViewController alloc] initWithStyle:UITableViewStyleGrouped]; + teamConfigViewController.view.frame = CGRectMake(10, 225, 300, 470); teamConfigViewController.view.backgroundColor = [UIColor clearColor]; [mapConfigViewController.view addSubview:teamConfigViewController.view]; if (schemeWeaponConfigViewController == nil) schemeWeaponConfigViewController = [[SchemeWeaponConfigViewController alloc] initWithStyle:UITableViewStyleGrouped]; - schemeWeaponConfigViewController.view.frame = CGRectMake(362, 224, 300, 472); + schemeWeaponConfigViewController.view.frame = CGRectMake(362, 230, 300, 470); [mapConfigViewController.view addSubview:schemeWeaponConfigViewController.view]; for (UIView *oneView in self.view.subviews) { if ([oneView isMemberOfClass:[UIToolbar class]]) { - [[oneView viewWithTag:12345] setHidden:YES]; + [oneView setHidden:YES]; break; } } diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/GameSetup.h --- a/project_files/HedgewarsMobile/Classes/GameSetup.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameSetup.h Mon Aug 02 00:55:24 2010 +0200 @@ -12,7 +12,7 @@ @interface GameSetup : NSObject { NSDictionary *systemSettings; NSDictionary *gameConfig; - + NSInteger ipcPort; // Port on which engine will listen TCPsocket csd; // Client socket descriptor } diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m --- a/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Mon Aug 02 00:55:24 2010 +0200 @@ -187,48 +187,6 @@ return cell; } -/* --(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - UIView *containerView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)] autorelease]; - UILabel *headerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(10, 20, 300, 40)] autorelease]; - headerLabel.textColor = [UIColor lightGrayColor]; - headerLabel.shadowColor = [UIColor blackColor]; - headerLabel.shadowOffset = CGSizeMake(0, 1); - headerLabel.font = [UIFont boldSystemFontOfSize:20]; - headerLabel.backgroundColor = [UIColor clearColor]; - - switch (section) { - case kNetworkFields: - headerLabel.text = NSLocalizedString(@"Network Configuration", @""); - break; - case kAudioFields: - headerLabel.text = NSLocalizedString(@"Audio Preferences", @""); - break; - case kOtherFields: - headerLabel.text = NSLocalizedString(@"Other Settings", @""); - break; - default: - NSLog(@"Warning: unset case value in titleForHeaderInSection!"); - headerLabel.text = @"!"; - break; - } - - [containerView addSubview:headerLabel]; - return containerView; -} - --(CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (kAudioFields == [indexPath section] && 2 == [indexPath row]) - return volumeCell.frame.size.height; - else - return table.rowHeight; -} - --(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { - return 57.0; -} -*/ - #pragma mark - #pragma mark Table view delegate -(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/GravesViewController.h --- a/project_files/HedgewarsMobile/Classes/GravesViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GravesViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -11,7 +11,7 @@ @interface GravesViewController : UITableViewController { NSMutableDictionary *teamDictionary; - + NSArray *graveArray; NSIndexPath *lastIndexPath; } diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/HogHatViewController.h --- a/project_files/HedgewarsMobile/Classes/HogHatViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/HogHatViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -12,7 +12,7 @@ @interface HogHatViewController : UITableViewController { NSDictionary *teamDictionary; NSInteger selectedHog; - + NSArray *hatArray; UIImage *normalHogSprite; NSIndexPath *lastIndexPath; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/LevelViewController.h --- a/project_files/HedgewarsMobile/Classes/LevelViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/LevelViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -11,7 +11,7 @@ @interface LevelViewController : UITableViewController { NSDictionary *teamDictionary; - + NSArray *levelArray; NSArray *levelSprites; NSIndexPath *lastIndexPath; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/MainMenuViewController.h --- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -10,16 +10,19 @@ @class SplitViewRootController; @class GameConfigViewController; +@class AboutViewController; @interface MainMenuViewController : UIViewController { UILabel *versionLabel; GameConfigViewController *gameConfigViewController; SplitViewRootController *settingsViewController; + AboutViewController *aboutViewController; } @property (nonatomic,retain) IBOutlet UILabel *versionLabel; @property (nonatomic,retain) GameConfigViewController *gameConfigViewController; @property (nonatomic,retain) SplitViewRootController *settingsViewController; +@property (nonatomic,retain) AboutViewController *aboutViewController; -(IBAction) switchViews:(id)sender; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/MainMenuViewController.m --- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Mon Aug 02 00:55:24 2010 +0200 @@ -7,15 +7,16 @@ // #import "MainMenuViewController.h" +#import "CommodityFunctions.h" #import "SDL_uikitappdelegate.h" +#import "SDL_mixer.h" #import "PascalImports.h" #import "GameConfigViewController.h" #import "SplitViewRootController.h" -#import "CommodityFunctions.h" -#import "SDL_mixer.h" +#import "AboutViewController.h" @implementation MainMenuViewController -@synthesize versionLabel, gameConfigViewController, settingsViewController; +@synthesize versionLabel, gameConfigViewController, settingsViewController, aboutViewController; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { return rotationManager(interfaceOrientation); @@ -137,6 +138,15 @@ [self presentModalViewController:self.settingsViewController animated:YES]; break; case 3: + if (nil == self.aboutViewController) { + AboutViewController *about = [[AboutViewController alloc] initWithNibName:@"AboutViewController" bundle:nil]; + about.modalTransitionStyle = UIModalPresentationFormSheet; + self.aboutViewController = about; + [about release]; + } + + [self presentModalViewController:self.aboutViewController animated:YES]; + /* debugStr = [[NSString alloc] initWithContentsOfFile:DEBUG_FILE()]; UITextView *scroll = [[UITextView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.height, self.view.frame.size.width)]; scroll.text = debugStr; @@ -150,6 +160,7 @@ [scroll addSubview:btn]; [self.view addSubview:scroll]; [scroll release]; + */ break; default: alert = [[UIAlertView alloc] initWithTitle:@"Not Yet Implemented" @@ -172,6 +183,7 @@ self.versionLabel = nil; self.gameConfigViewController = nil; self.settingsViewController = nil; + self.aboutViewController = nil; MSG_DIDUNLOAD(); [super viewDidUnload]; } @@ -180,6 +192,7 @@ [versionLabel release]; [settingsViewController release]; [gameConfigViewController release]; + [aboutViewController release]; [super dealloc]; } diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/MapConfigViewController.h --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -14,7 +14,7 @@ NSInteger oldValue; //slider NSInteger oldPage; //segmented control BOOL busy; - + // objects read (mostly) by parent view NSInteger maxHogs; NSString *seedCommand; @@ -23,7 +23,7 @@ NSString *mazeSizeCommand; NSString *themeCommand; NSString *staticMapCommand; - + // various widgets in the view UIButton *previewButton; UITableView *tableView; @@ -31,7 +31,7 @@ UILabel *sizeLabel; UISegmentedControl *segmentedControl; UISlider *slider; - + // internal objects NSIndexPath *lastIndexPath; NSArray *themeArray; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/MapConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 02 00:55:24 2010 +0200 @@ -297,7 +297,7 @@ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - cell.textLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1 ]; + cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; } if (self.segmentedControl.selectedSegmentIndex != 1) { @@ -312,11 +312,14 @@ cell.imageView.image = nil; } - if (row == [self.lastIndexPath row]) - cell.accessoryType = UITableViewCellAccessoryCheckmark; - else - cell.accessoryType = UITableViewCellAccessoryNone; + if (row == [self.lastIndexPath row]) { + UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]]; + cell.accessoryView = checkbox; + [checkbox release]; + } else + cell.accessoryView = nil; + cell.backgroundColor = [UIColor blackColor]; return cell; } @@ -337,9 +340,11 @@ } UITableViewCell *newCell = [aTableView cellForRowAtIndexPath:indexPath]; - newCell.accessoryType = UITableViewCellAccessoryCheckmark; + UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]]; + newCell.accessoryView = checkbox; + [checkbox release]; UITableViewCell *oldCell = [aTableView cellForRowAtIndexPath:self.lastIndexPath]; - oldCell.accessoryType = UITableViewCellAccessoryNone; + oldCell.accessoryView = nil; self.lastIndexPath = indexPath; [aTableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone]; @@ -515,7 +520,6 @@ [array release]; self.mapArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:MAPS_DIRECTORY() error:NULL]; - self.tableView.rowHeight = 42; busy = NO; // draw a white background @@ -527,7 +531,8 @@ // on slower device we show directly the static map NSString *modelId = modelType(); - if ([modelId hasPrefix:@"iPhone1"] || [modelId hasPrefix:@"iPod1,1"] || [modelId hasPrefix:@"iPod2,1"]) + //if ([modelId hasPrefix:@"iPhone1"] || [modelId hasPrefix:@"iPod1,1"] || [modelId hasPrefix:@"iPod2,1"]) + if (1) self.segmentedControl.selectedSegmentIndex = 1; else self.segmentedControl.selectedSegmentIndex = 0; @@ -541,6 +546,14 @@ oldValue = 5; oldPage = 0; + + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + [self.tableView setBackgroundView:nil]; + self.view.backgroundColor = [UIColor clearColor]; + self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER; + self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; + self.tableView.rowHeight = 45; + } } -(void) viewDidAppear:(BOOL) animated { diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/OverlayViewController.h --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -19,12 +19,12 @@ UIPopoverController *popoverController; // iPad only InGameMenuViewController *popupMenu; BOOL isPopoverVisible; - + // ths touch section CGFloat initialDistanceForPinching; CGPoint startingPoint; BOOL isSegmentVisible; - + // the sdl window underneath SDL_Window *sdlwindow; } diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/PascalImports.h --- a/project_files/HedgewarsMobile/Classes/PascalImports.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/PascalImports.h Mon Aug 02 00:55:24 2010 +0200 @@ -13,7 +13,7 @@ #ifdef __cplusplus extern "C" { #endif - + /* add C declarations below for all exported Pascal functions/procedure * that you want to use */ @@ -25,50 +25,50 @@ void HW_versionInfo(short int *netProto, char **versionStr); void HW_click(void); - + void HW_zoomIn(void); void HW_zoomOut(void); void HW_zoomReset(void); void HW_ammoMenu(void); - + void HW_walkingKeysUp(void); void HW_otherKeysUp(void); void HW_allKeysUp(void); - + void HW_walkLeft(void); void HW_walkRight(void); void HW_aimUp(void); void HW_aimDown(void); void HW_preciseSet(BOOL status); - + void HW_shoot(void); void HW_jump(void); void HW_backjump(void); - + void HW_chat(void); void HW_chatEnd(void); void HW_tab(void); void HW_pause(void); - + void HW_terminate(BOOL andCloseFrontend); - + void HW_setLandscape(BOOL rotate); void HW_setCursor(int x, int y); void HW_getCursor(int *x, int *y); void HW_setPianoSound(int snd); - + float HW_zoomFactor(void); int HW_zoomLevel(void); - + BOOL HW_isAmmoOpen(void); BOOL HW_isPaused(void); BOOL HW_isWeaponRequiringClick(void); BOOL HW_isWeaponTimerable(void); BOOL HW_isWeaponSwitch(void); - + void HW_setGrenadeTime(int time); - + #ifdef __cplusplus } #endif diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.h --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -12,7 +12,7 @@ @interface SchemeWeaponConfigViewController : UITableViewController { NSArray *listOfSchemes; NSArray *listOfWeapons; - + NSIndexPath *lastIndexPath_sc; NSIndexPath *lastIndexPath_we; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Mon Aug 02 00:55:24 2010 +0200 @@ -30,7 +30,7 @@ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { [self.tableView setBackgroundView:nil]; self.view.backgroundColor = [UIColor clearColor]; - self.tableView.separatorColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1]; + self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER; } self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; } @@ -77,23 +77,57 @@ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; } - cell.accessoryType = UITableViewCellAccessoryNone; + cell.accessoryView = nil; if ([indexPath section] == 0) { cell.textLabel.text = [[self.listOfSchemes objectAtIndex:row] stringByDeletingPathExtension]; if ([[self.listOfSchemes objectAtIndex:row] isEqualToString:self.selectedScheme]) { - cell.accessoryType = UITableViewCellAccessoryCheckmark; + UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]]; + cell.accessoryView = checkbox; + [checkbox release]; self.lastIndexPath_sc = indexPath; } } else { cell.textLabel.text = [[self.listOfWeapons objectAtIndex:row] stringByDeletingPathExtension]; if ([[self.listOfWeapons objectAtIndex:row] isEqualToString:self.selectedWeapon]) { - cell.accessoryType = UITableViewCellAccessoryCheckmark; + UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]]; + cell.accessoryView = checkbox; + [checkbox release]; self.lastIndexPath_we = indexPath; } } + + cell.backgroundColor = [UIColor blackColor]; + cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; return cell; } +-(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + return 40.0; +} + +-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + NSString *fileToLoad; + if (section == 0) + fileToLoad = @"SchemesLabel.png"; + else + fileToLoad = @"WeaponsLabel.png"; + + UIImage *img = [[UIImage alloc] initWithContentsOfFile:fileToLoad]; + UIImageView *imgView = [[[UIImageView alloc] initWithImage:img] autorelease]; + [img release]; + + return imgView; +} + +/* +-(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger) section { + if (section == 0) { + return NSLocalizedString(@"Schemes",@""); + } else { + return NSLocalizedString(@"Weapons",@"");; + } +} +*/ #pragma mark - #pragma mark Table view delegate @@ -110,9 +144,11 @@ if (newRow != oldRow) { //TODO: this code works only for a single section table UITableViewCell *newCell = [aTableView cellForRowAtIndexPath:indexPath]; - newCell.accessoryType = UITableViewCellAccessoryCheckmark; + UIImageView *checkbox = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:@"checkbox.png"]]; + newCell.accessoryView = checkbox; + [checkbox release]; UITableViewCell *oldCell = [aTableView cellForRowAtIndexPath:lastIndexPath]; - oldCell.accessoryType = UITableViewCellAccessoryNone; + oldCell.accessoryView = nil; if ([indexPath section] == 0) { self.lastIndexPath_sc = indexPath; @@ -127,14 +163,6 @@ [aTableView deselectRowAtIndexPath:indexPath animated:YES]; } --(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger) section { - if (section == 0) { - return NSLocalizedString(@"Schemes",@""); - } else { - return NSLocalizedString(@"Weapons",@"");; - } -} - #pragma mark - #pragma mark Memory management -(void) didReceiveMemoryWarning { diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/SingleSchemeViewController.h --- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -11,7 +11,7 @@ @interface SingleSchemeViewController : UITableViewController { NSString *schemeName; - NSMutableArray *schemeArray; + NSMutableArray *schemeArray; NSArray *basicSettingList; NSArray *gameModifierArray; } diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/SingleTeamViewController.h --- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -18,13 +18,13 @@ @interface SingleTeamViewController : UITableViewController { NSMutableDictionary *teamDictionary; - + NSString *teamName; UIImage *normalHogSprite; - + NSArray *secondaryItems; BOOL isWriteNeeded; - + HogHatViewController *hogHatViewController; GravesViewController *gravesViewController; VoicesViewController *voicesViewController; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/SingleWeaponViewController.h --- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -12,10 +12,10 @@ @interface SingleWeaponViewController : UITableViewController { NSString *weaponName; - + UIImage *ammoStoreImage; NSArray *ammoNames; - + char *quantity; char *probability; char *delay; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/SquareButtonView.m --- a/project_files/HedgewarsMobile/Classes/SquareButtonView.m Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SquareButtonView.m Mon Aug 02 00:55:24 2010 +0200 @@ -37,6 +37,7 @@ [self.layer setCornerRadius:7.0f]; [self.layer setMasksToBounds:YES]; [self.layer setBorderWidth:2]; + [self.layer setBorderColor:[UICOLOR_HW_YELLOW_BODER CGColor]]; // this changes the color at button press [self addTarget:self action:@selector(nextColor) forControlEvents:UIControlEventTouchUpInside]; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Mon Aug 02 00:55:24 2010 +0200 @@ -26,6 +26,13 @@ CGSize screenSize = [[UIScreen mainScreen] bounds].size; self.view.frame = CGRectMake(0, 0, screenSize.height, screenSize.width - 44); isFirstLoad = YES; + + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + [self.tableView setBackgroundView:nil]; + self.view.backgroundColor = [UIColor clearColor]; + self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER; + } + self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone; } -(void) viewWillAppear:(BOOL)animated { @@ -74,13 +81,6 @@ return [listOfTeams count]; } --(NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section { - if (section == 0) - return NSLocalizedString(@"Playing Teams",@""); - else - return NSLocalizedString(@"Available Teams",@""); -} - // Customize the appearance of table view cells. -(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { static NSString *CellIdentifier0 = @"Cell0"; @@ -106,7 +106,8 @@ UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(12+88+7+36+7, 10, 250, 25)]; label.textAlignment = UITextAlignmentLeft; label.backgroundColor = [UIColor clearColor]; - label.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize] + 2]; + label.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]]; + label.textColor = UICOLOR_HW_YELLOW_TEXT; label.tag = LABEL_TAG; [cell.contentView addSubview:label]; [label release]; @@ -124,23 +125,48 @@ SquareButtonView *squareButton = (SquareButtonView *)[cell viewWithTag:SQUAREBUTTON_TAG]; [squareButton selectColor:[[selectedRow objectForKey:@"color"] intValue]]; squareButton.ownerDictionary = selectedRow; - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - cellLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1]; - } } 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]; - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - cell.textLabel.textColor = [UIColor colorWithRed:(CGFloat)0xFE/255 green:(CGFloat)0xCB/255 blue:0 alpha:1 ]; - } } + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; + cell.backgroundColor = [UIColor blackColor]; + } + return cell; } +-(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + return 40.0; +} + +-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + NSString *fileToLoad; + if (section == 0) + fileToLoad = @"PlayingTeamsLabel.png"; + else + fileToLoad = @"AvailableTeamsLabel.png"; + + UIImage *img = [[UIImage alloc] initWithContentsOfFile:fileToLoad]; + UIImageView *imgView = [[[UIImageView alloc] initWithImage:img] autorelease]; + [img release]; + + return imgView; +} + +/* +-(NSString *)tableView:(UITableView *)aTableView titleForHeaderInSection:(NSInteger)section { + if (section == 0) + return NSLocalizedString(@"Playing Teams",@""); + else + return NSLocalizedString(@"Available Teams",@""); +} +*/ #pragma mark - #pragma mark Table view delegate diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/VoicesViewController.h --- a/project_files/HedgewarsMobile/Classes/VoicesViewController.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/VoicesViewController.h Mon Aug 02 00:55:24 2010 +0200 @@ -11,7 +11,7 @@ @interface VoicesViewController : UITableViewController { NSMutableDictionary *teamDictionary; - + NSArray *voiceArray; NSIndexPath *lastIndexPath; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Classes/WeaponCellView.h --- a/project_files/HedgewarsMobile/Classes/WeaponCellView.h Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.h Mon Aug 02 00:55:24 2010 +0200 @@ -18,18 +18,18 @@ id delegate; UILabel *weaponName; UIImageView *weaponIcon; - + UISlider *initialQt; UISlider *probabilityQt; UISlider *delayQt; UISlider *crateQt; - + @private UIImageView *initialImg; UIImageView *probabImg; UIImageView *delayImg; UIImageView *crateImg; - + UILabel *initialLab; UILabel *probLab; UILabel *delLab; @@ -40,7 +40,7 @@ @property (nonatomic,retain) UILabel *weaponName; @property (nonatomic,retain) UIImageView *weaponIcon; - + @property (nonatomic,retain) UISlider *initialQt; @property (nonatomic,retain) UISlider *probabilityQt; @property (nonatomic,retain) UISlider *delayQt; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 02 00:55:24 2010 +0200 @@ -125,6 +125,13 @@ 61EF921211DF57AC003441C4 /* joyButton_attack.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920911DF57AC003441C4 /* joyButton_attack.png */; }; 61EF921311DF57AC003441C4 /* joyButton_backjump.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920A11DF57AC003441C4 /* joyButton_backjump.png */; }; 61EF921411DF57AC003441C4 /* joyButton_forwardjump.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */; }; + 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 */; }; + 61F2E7FA12060FF6005734F7 /* SchemesLabel.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7F812060FF6005734F7 /* SchemesLabel.png */; }; + 61F2E7FB12060FF6005734F7 /* WeaponsLabel.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E7F912060FF6005734F7 /* WeaponsLabel.png */; }; + 61F2E80D12061713005734F7 /* AvailableTeamsLabel.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E80B12061713005734F7 /* AvailableTeamsLabel.png */; }; + 61F2E80E12061713005734F7 /* PlayingTeamsLabel.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F2E80C12061713005734F7 /* PlayingTeamsLabel.png */; }; 61F7A35511E27D3C0040BA66 /* background-lobby.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A35411E27D3C0040BA66 /* background-lobby.png */; }; 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 */; }; @@ -820,6 +827,14 @@ 61EF920911DF57AC003441C4 /* joyButton_attack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_attack.png; path = Resources/Overlay/joyButton_attack.png; sourceTree = ""; }; 61EF920A11DF57AC003441C4 /* joyButton_backjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_backjump.png; path = Resources/Overlay/joyButton_backjump.png; sourceTree = ""; }; 61EF920B11DF57AC003441C4 /* joyButton_forwardjump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = joyButton_forwardjump.png; path = Resources/Overlay/joyButton_forwardjump.png; sourceTree = ""; }; + 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = ""; }; + 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = ""; }; + 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AboutViewController.xib; sourceTree = ""; }; + 61F2E7EB12060E31005734F7 /* checkbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = checkbox.png; path = Resources/checkbox.png; sourceTree = ""; }; + 61F2E7F812060FF6005734F7 /* SchemesLabel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SchemesLabel.png; path = "Resources/Frontend-iPad/SchemesLabel.png"; sourceTree = ""; }; + 61F2E7F912060FF6005734F7 /* WeaponsLabel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = WeaponsLabel.png; path = "Resources/Frontend-iPad/WeaponsLabel.png"; sourceTree = ""; }; + 61F2E80B12061713005734F7 /* AvailableTeamsLabel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AvailableTeamsLabel.png; path = "Resources/Frontend-iPad/AvailableTeamsLabel.png"; sourceTree = ""; }; + 61F2E80C12061713005734F7 /* PlayingTeamsLabel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PlayingTeamsLabel.png; path = "Resources/Frontend-iPad/PlayingTeamsLabel.png"; sourceTree = ""; }; 61F7A35411E27D3C0040BA66 /* background-lobby.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background-lobby.png"; path = "Resources/Frontend-iPad/background-lobby.png"; sourceTree = ""; }; 61F7A43111E290650040BA66 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "Resources/Icons/Icon-72.png"; sourceTree = ""; }; 61F7A43211E290650040BA66 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-50.png"; path = "Resources/Icons/Icon-Small-50.png"; sourceTree = ""; }; @@ -941,6 +956,7 @@ isa = PBXGroup; children = ( 6129B9F611EFB04D0017E305 /* denied.png */, + 61F2E7EB12060E31005734F7 /* checkbox.png */, 61F7A42811E2905C0040BA66 /* Icons */, 61F903FA11DF58680068B24D /* Frontend-iPad */, 61F903E311DF584D0068B24D /* Frontend-iPhone */, @@ -1153,6 +1169,9 @@ 616591F611CA9BA200D6E256 /* OverlayViewController.h */, 616591F711CA9BA200D6E256 /* OverlayViewController.m */, 6165925011CA9CB400D6E256 /* OverlayViewController.xib */, + 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */, + 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */, + 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */, ); name = Overlay; sourceTree = ""; @@ -1258,6 +1277,10 @@ 61F903FA11DF58680068B24D /* Frontend-iPad */ = { isa = PBXGroup; children = ( + 61F2E7F812060FF6005734F7 /* SchemesLabel.png */, + 61F2E80B12061713005734F7 /* AvailableTeamsLabel.png */, + 61F2E80C12061713005734F7 /* PlayingTeamsLabel.png */, + 61F2E7F912060FF6005734F7 /* WeaponsLabel.png */, 61F9043911DF64E20068B24D /* bluebox.png */, 61EBA62711DFF2BC0048B68A /* bricks.png */, 61EBA62811DFF2BC0048B68A /* title.png */, @@ -1958,6 +1981,12 @@ 6129B9F711EFB04D0017E305 /* denied.png in Resources */, 611E0EE711FB20610077A41E /* ammoButton.png in Resources */, 611E0EE811FB20610077A41E /* cornerButton.png in Resources */, + 61F2E7CF1205EDE0005734F7 /* AboutViewController.xib in Resources */, + 61F2E7EC12060E31005734F7 /* checkbox.png in Resources */, + 61F2E7FA12060FF6005734F7 /* SchemesLabel.png in Resources */, + 61F2E7FB12060FF6005734F7 /* WeaponsLabel.png in Resources */, + 61F2E80D12061713005734F7 /* AvailableTeamsLabel.png in Resources */, + 61F2E80E12061713005734F7 /* PlayingTeamsLabel.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2081,6 +2110,7 @@ 61F904D711DF7DA30068B24D /* WeaponCellView.m in Sources */, 61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */, 61C079E411F35A300072BF46 /* EditableCellView.m in Sources */, + 61F2E7CE1205EDE0005734F7 /* AboutViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Resources/Frontend-iPad/AvailableTeamsLabel.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/AvailableTeamsLabel.png has changed diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Resources/Frontend-iPad/PlayingTeamsLabel.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/PlayingTeamsLabel.png has changed diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Resources/Frontend-iPad/SchemesLabel.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/SchemesLabel.png has changed diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Resources/Frontend-iPad/WeaponsLabel.png Binary file project_files/HedgewarsMobile/Resources/Frontend-iPad/WeaponsLabel.png has changed diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Sun Aug 01 17:58:09 2010 +0200 +++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPad.xib Mon Aug 02 00:55:24 2010 +0200 @@ -1,7 +1,7 @@ - 800 + 1024 10F569 788 1038.29 @@ -57,7 +57,7 @@

@@ -445,13 +446,6 @@ NSObject

- -

@@ -459,13 +453,6 @@ NSObject

- -

@@ -473,13 +460,6 @@ NSObject

- -

@@ -501,13 +481,6 @@ NSObject

- -

@@ -649,7 +622,7 @@ IBIPadFramework

@@ -812,13 +793,6 @@ NSObject

- -

@@ -840,13 +814,6 @@ NSObject

- -

@@ -1020,7 +987,7 @@ IBIPadFramework

diff -r 8c449776ebe6 -r 12d17c6e8855 project_files/HedgewarsMobile/Resources/checkbox.png Binary file project_files/HedgewarsMobile/Resources/checkbox.png has changed