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

equal deleted inserted replaced

-:88cfcd9161d3
+:42b256eca362
 * File created on 22/04/2010.
 */
 #import "MapConfigViewController.h"
-#import "PascalImports.h"
+#import <QuartzCore/QuartzCore.h>
-#import "CommodityFunctions.h"
-#import "UIImageExtra.h"
 #import "SchemeWeaponConfigViewController.h"
 #import "GameConfigViewController.h"
 #define scIndex         self.segmentedControl.selectedSegmentIndex
 #define isRandomness()  (segmentedControl.selectedSegmentIndex == 0 || segmentedControl.selectedSegmentIndex == 2)
 @implementation MapConfigViewController
 @synthesize previewButton, maxHogs, seedCommand, templateFilterCommand, mapGenCommand, mazeSizeCommand, themeCommand, staticMapCommand,
 missionCommand, tableView, maxLabel, sizeLabel, segmentedControl, slider, lastIndexPath, dataSourceArray, busy,
-externalController, parentController;
+oldPage, oldValue;
 -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
 return rotationManager(interfaceOrientation);
 }
--(IBAction) mapButtonPressed {
+-(IBAction) mapButtonPressed:(id) sender {
 [AudioManagerController playClickSound];
 [self updatePreview];
 }
 -(void) updatePreview {
 // don't generate a new preview while it's already generating one
-if (busy)
+if (self.busy)
 return;
 // generate a seed
 CFUUIDRef uuid = CFUUIDCreate(kCFAllocatorDefault);
 NSString *seed = (NSString *)CFUUIDCreateString(kCFAllocatorDefault, uuid);
 CFRelease(uuid);
 NSString *seedCmd = [[NSString alloc] initWithFormat:@"eseed {%@}", seed];
 self.seedCommand = seedCmd;
 [seedCmd release];
-if (self.dataSourceArray == nil)
-[self loadDataSourceArray];
 NSArray *source = [self.dataSourceArray objectAtIndex:scIndex];
-NSIndexPath *theIndex;
 if (isRandomness()) {
 // prevent other events and add an activity while the preview is beign generated
 [self turnOffWidgets];
 [self.previewButton updatePreviewWithSeed:seed];
-theIndex = [NSIndexPath indexPathForRow:(random()%[source count]) inSection:0];
-} else {
-theIndex = [NSIndexPath indexPathForRow:(random()%[source count]) inSection:0];
 // the preview for static maps is loaded in didSelectRowAtIndexPath
 }
 [seed release];
 // perform as if user clicked on an entry
+NSIndexPath *theIndex = [NSIndexPath indexPathForRow:(random()%[source count]) inSection:0];
 [self tableView:self.tableView didSelectRowAtIndexPath:theIndex];
-if (IS_NOT_POWERFUL(getModelType()) == NO)
+if (IS_NOT_POWERFUL([HWUtils modelType]) == NO)
 [self.tableView scrollToRowAtIndexPath:theIndex atScrollPosition:UITableViewScrollPositionMiddle animated:YES];
 }
 -(void) turnOffWidgets {
 busy = YES;
 self.previewButton.alpha = 0.5f;
 self.previewButton.enabled = NO;
-self.maxLabel.text = @"...";
+self.maxLabel.text = NSLocalizedString(@"Loading...",@"");;
 self.segmentedControl.enabled = NO;
 self.slider.enabled = NO;
 }
+#pragma mark -
+#pragma mark MapPreviewButtonView delegate methods
 -(void) turnOnWidgets {
 self.previewButton.alpha = 1.0f;
 self.previewButton.enabled = YES;
 self.segmentedControl.enabled = YES;
 self.slider.enabled = YES;
-busy = NO;
+self.busy = NO;
 }
--(void) setLabelText:(NSString *)str {
+-(void) setMaxLabelText:(NSString *)str {
 self.maxHogs = [str intValue];
-self.maxLabel.text = str;
+self.maxLabel.text = [NSString stringWithFormat:@"%@ %@",NSLocalizedString(@"Max Hogs:",@""),str];
 }
 -(NSDictionary *)getDataForEngine {
 NSDictionary *dictForEngine = [NSDictionary dictionaryWithObjectsAndKeys:
 self.seedCommand,@"seedCommand",
 -(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
 return 1;
 }
 -(NSInteger) tableView:(UITableView *)aTableView numberOfRowsInSection:(NSInteger) section {
-if (self.dataSourceArray == nil)
-[self loadDataSourceArray];
 return [[self.dataSourceArray objectAtIndex:scIndex] count];
 }
 -(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
 static NSString *CellIdentifier = @"Cell";
 UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier];
 if (cell == nil)
 cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
-if (self.dataSourceArray == nil)
-[self loadDataSourceArray];
 NSArray *source = [self.dataSourceArray objectAtIndex:scIndex];
 NSString *labelString = [source objectAtIndex:row];
 cell.textLabel.text = labelString;
 cell.textLabel.adjustsFontSizeToFitWidth = YES;
 cell.textLabel.minimumFontSize = 7;
-cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
+cell.textLabel.textColor = [UIColor lightYellowColor];
 cell.textLabel.backgroundColor = [UIColor clearColor];
 if (isRandomness()) {
 UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@/icon.png",THEMES_DIRECTORY(),labelString]];
 cell.imageView.image = image;
 cell.accessoryView = checkbox;
 [checkbox release];
 } else
 cell.accessoryView = nil;
-cell.backgroundColor = UICOLOR_HW_ALMOSTBLACK;
+cell.backgroundColor = [UIColor blackColorTransparent];
 return cell;
 }
 // this set details for a static map (called by didSelectRowAtIndexPath)
 -(void) setDetailsForStaticMap:(NSInteger) index {
-if (self.dataSourceArray == nil)
-[self loadDataSourceArray];
 NSArray *source = [self.dataSourceArray objectAtIndex:scIndex];
 NSString *fileCfg = [[NSString alloc] initWithFormat:@"%@/%@/map.cfg",
 (scIndex == 1) ? MAPS_DIRECTORY() : MISSIONS_DIRECTORY(),[source objectAtIndex:index]];
 NSString *contents = [[NSString alloc] initWithContentsOfFile:fileCfg encoding:NSUTF8StringEncoding error:NULL];
 NSArray *split = [contents componentsSeparatedByString:@"\n"];
 [contents release];
 // if the number is not set we keep 18 standard;
 // sometimes it's not set but there are trailing characters, we get around them with the second equation
+NSString *max;
 if ([split count] > 1 && [[split objectAtIndex:1] intValue] > 0)
-maxHogs = [[split objectAtIndex:1] intValue];
+max = [split objectAtIndex:1];
 else
-maxHogs = 18;
+max = @"18";
-NSString *max = [[NSString alloc] initWithFormat:@"%d",maxHogs];
+[self setMaxLabelText:max];
-self.maxLabel.text = max;
-[max release];
 self.themeCommand = [NSString stringWithFormat:@"etheme %@", [split objectAtIndex:0]];
 self.staticMapCommand = [NSString stringWithFormat:@"emap %@", [source objectAtIndex:index]];
 if (scIndex != 3)
 -(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
 int newRow = [indexPath row];
 int oldRow = (lastIndexPath != nil) ? [lastIndexPath row] : -1;
 if (newRow != oldRow) {
-if (self.dataSourceArray == nil)
-[self loadDataSourceArray];
 NSArray *source = [self.dataSourceArray objectAtIndex:scIndex];
 if (isRandomness()) {
 // just change the theme, don't update preview
 self.themeCommand = [NSString stringWithFormat:@"etheme %@", [source objectAtIndex:newRow]];
 } else {
 mapgen = @"e$mapgen 0";
 staticmap = @"";
 mission = @"";
 [self sliderChanged:nil];
 self.slider.enabled = YES;
-[externalController fillSections];
+[SchemeWeaponConfigViewController fillInstanceSections];
 break;
 case 1: // Map
 mapgen = @"e$mapgen 0";
 // dummy values, these are set by -updatePreview -> -didSelectRowAtIndexPath -> -setDetailsForStaticMap
 staticmap = @"map Bamboo";
 mission = @"";
 self.slider.enabled = NO;
 self.sizeLabel.text = NSLocalizedString(@"No filter",@"");
-[externalController fillSections];
+[SchemeWeaponConfigViewController fillInstanceSections];
 break;
 case 2: // Maze
 mapgen = @"e$mapgen 1";
 staticmap = @"";
 mission = @"";
 [self sliderChanged:nil];
 self.slider.enabled = YES;
-[externalController fillSections];
+[SchemeWeaponConfigViewController fillInstanceSections];
 break;
 case 3: // Mission
 mapgen = @"e$mapgen 0";
 // dummy values, these are set by -updatePreview -> -didSelectRowAtIndexPath -> -setDetailsForStaticMap
 staticmap = @"map Bamboo";
 mission = @"";
 self.slider.enabled = NO;
 self.sizeLabel.text = NSLocalizedString(@"No filter",@"");
-[externalController emptySections];
+[SchemeWeaponConfigViewController emptyInstanceSections];
 break;
 default:
 mapgen = nil;
 staticmap = nil;
 [self.tableView reloadData];
 [self updatePreview];
 oldPage = newPage;
 }
--(IBAction) buttonPressed:(id) sender {
-[self.parentController buttonPressed:sender];
-}
 #pragma mark -
 #pragma mark view management
--(void) loadDataSourceArray {
+-(NSArray *) dataSourceArray {
-NSString *model = getModelType();
+if (dataSourceArray == nil) {
+NSString *model = [HWUtils modelType];
-// only folders containing icon.png are a valid theme
-NSArray *themeArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:THEMES_DIRECTORY() error:NULL];
+// only folders containing icon.png are a valid theme
-NSMutableArray *themeArray = [[NSMutableArray alloc] init];
+NSArray *themeArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:THEMES_DIRECTORY() error:NULL];
-for (NSString *themeName in themeArrayFull) {
+NSMutableArray *themeArray = [[NSMutableArray alloc] init];
-NSString *checkPath = [[NSString alloc] initWithFormat:@"%@/%@/icon.png",THEMES_DIRECTORY(),themeName];
+for (NSString *themeName in themeArrayFull) {
-if ([[NSFileManager defaultManager] fileExistsAtPath:checkPath])
+NSString *checkPath = [[NSString alloc] initWithFormat:@"%@/%@/icon.png",THEMES_DIRECTORY(),themeName];
-[themeArray addObject:themeName];
+if ([[NSFileManager defaultManager] fileExistsAtPath:checkPath])
-[checkPath release];
+[themeArray addObject:themeName];
-}
+[checkPath release];
+}
-// remove images that are too big for certain devices without loading the whole image
-NSArray *mapArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:MAPS_DIRECTORY() error:NULL];
+// remove images that are too big for certain devices without loading the whole image
-NSMutableArray *mapArray = [[NSMutableArray alloc] init];
+NSArray *mapArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:MAPS_DIRECTORY() error:NULL];
-for (NSString *str in mapArrayFull) {
+NSMutableArray *mapArray = [[NSMutableArray alloc] init];
-CGSize imgSize = PSPNGSizeFromMetaData([MAPS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]);
+for (NSString *str in mapArrayFull) {
-if (IS_NOT_POWERFUL(model) && imgSize.height > 1024.0f)
+CGSize imgSize = [UIImage imageSizeFromMetadataOf:[MAPS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]];
-continue;
+if (IS_NOT_POWERFUL(model) && imgSize.height > 1024.0f)
-if (IS_NOT_VERY_POWERFUL(model) && imgSize.height > 1280.0f)
+continue;
-continue;
+if (IS_NOT_VERY_POWERFUL(model) && imgSize.height > 1280.0f)
-[mapArray addObject:str];
+continue;
-}
+[mapArray addObject:str];
+}
-NSArray *missionArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:MISSIONS_DIRECTORY() error:NULL];
-NSMutableArray *missionArray = [[NSMutableArray alloc] init];
+NSArray *missionArrayFull = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:MISSIONS_DIRECTORY() error:NULL];
-for (NSString *str in missionArrayFull) {
+NSMutableArray *missionArray = [[NSMutableArray alloc] init];
-CGSize imgSize = PSPNGSizeFromMetaData([MISSIONS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]);
+for (NSString *str in missionArrayFull) {
-if (IS_NOT_POWERFUL(model) && imgSize.height > 1024.0f)
+CGSize imgSize = [UIImage imageSizeFromMetadataOf:[MISSIONS_DIRECTORY() stringByAppendingFormat:@"%@/map.png",str]];
-continue;
+if (IS_NOT_POWERFUL(model) && imgSize.height > 1024.0f)
-if (IS_NOT_VERY_POWERFUL(model) && imgSize.height > 1280.0f)
+continue;
-continue;
+if (IS_NOT_VERY_POWERFUL(model) && imgSize.height > 1280.0f)
-[missionArray addObject:str];
+continue;
-}
+[missionArray addObject:str];
-NSArray *array = [[NSArray alloc] initWithObjects:themeArray,mapArray,themeArray,missionArray,nil];
+}
-[missionArray release];
+NSArray *array = [[NSArray alloc] initWithObjects:themeArray,mapArray,themeArray,missionArray,nil];
-[themeArray release];
+[missionArray release];
-[mapArray release];
+[themeArray release];
+[mapArray release];
-self.dataSourceArray = array;
-[array release];
+self.dataSourceArray = array;
+[array release];
+}
+return dataSourceArray;
+}
+-(MapPreviewButtonView *)previewButton {
+if (previewButton == nil) {
+MapPreviewButtonView *preview = [[MapPreviewButtonView alloc] initWithFrame:CGRectMake(32, 26, 256, 128)];
+preview.delegate = self;
+[preview addTarget:self action:@selector(mapButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
+[self.view addSubview:preview];
+self.previewButton = preview;
+[preview release];
+}
+return previewButton;
 }
 -(void) viewDidLoad {
 [super viewDidLoad];
 srandom(time(NULL));
+/*
 CGSize screenSize = [[UIScreen mainScreen] bounds].size;
 self.view.frame = CGRectMake(0, 0, screenSize.height, screenSize.width - 44);
+*/
 // initialize some "default" values
-self.sizeLabel.text = NSLocalizedString(@"All",@"");
 self.slider.value = 0.05f;
-oldValue = 5;
+self.slider.enabled = NO;
+self.sizeLabel.text = NSLocalizedString(@"No filter",@"");
-busy = NO;
+self.oldValue = 5;
-[self loadDataSourceArray];
+self.busy = NO;
-self.lastIndexPath = [NSIndexPath indexPathForRow:-1 inSection:0];
+self.oldPage = self.segmentedControl.selectedSegmentIndex;
-// select a map at first because it's faster - done in IB
-oldPage = 1;
-if (self.segmentedControl.selectedSegmentIndex == 1) {
-self.slider.enabled = NO;
-self.sizeLabel.text = NSLocalizedString(@"No filter",@"");
-}
 self.templateFilterCommand = @"e$template_filter 0";
 self.mazeSizeCommand = @"e$maze_size 0";
 self.mapGenCommand = @"e$mapgen 0";
 self.staticMapCommand = @"";
 self.missionCommand = @"";
-if ([self.tableView respondsToSelector:@selector(setBackgroundView:)])
+if (IS_IPAD()) {
-[self.tableView setBackgroundView:nil];
+[self.tableView setBackgroundColorForAnyTable:[UIColor darkBlueColorTransparent]];
-self.tableView.backgroundColor = [UIColor clearColor];
+self.tableView.layer.borderColor = [[UIColor darkYellowColor] CGColor];
-self.tableView.separatorColor = UICOLOR_HW_YELLOW_BODER;
+self.tableView.layer.borderWidth = 2.7f;
+self.tableView.layer.cornerRadius = 8;
+self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 10, 0);
+UILabel *backLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 14, 300, 190) andTitle:nil withBorderWidth:2.3f];
+[self.view insertSubview:backLabel belowSubview:self.segmentedControl];
+[backLabel release];
+}
+self.tableView.separatorColor = [UIColor whiteColor];
 self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
 }
 -(void) viewWillAppear:(BOOL)animated {
-if (self.dataSourceArray == nil)
-[self loadDataSourceArray];
 [super viewWillAppear:animated];
 }
 -(void) viewDidAppear:(BOOL) animated {
 [self updatePreview];
 [super viewDidUnload];
 }
 -(void) didReceiveMemoryWarning {
 self.dataSourceArray = nil;
+self.previewButton = nil;
 [super didReceiveMemoryWarning];
 if (self.view.superview == nil) {
 self.tableView = nil;
 self.maxLabel = nil;

branch	hedgeroid
changeset 6224	42b256eca362
parent 6115	485cfecadc9a
child 6634	e00762923086