# HG changeset patch # User antonc27 # Date 1455575868 -3600 # Node ID 893722a2a1f9b5f9e771e2de04d9ff8ffe5d82b2 # Parent 45982bda46cc5a9dc81167136594265d79952f92 - Some warnings fixed with text alignment on iOS front-end diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/AboutViewController.m --- a/project_files/HedgewarsMobile/Classes/AboutViewController.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Mon Feb 15 23:37:48 2016 +0100 @@ -128,7 +128,7 @@ UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width*80/100, 90)]; label.center = CGPointMake(self.tableView.frame.size.width/2, 45); - label.textAlignment = UITextAlignmentCenter; + label.textAlignment = NSTextAlignmentCenter; label.font = [UIFont systemFontOfSize:16]; label.textColor = [UIColor lightGrayColor]; label.numberOfLines = 5; diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/EditableCellView.m --- a/project_files/HedgewarsMobile/Classes/EditableCellView.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/EditableCellView.m Mon Feb 15 23:37:48 2016 +0100 @@ -43,7 +43,7 @@ //[textField release]; titleLabel = [[UILabel alloc] init]; - titleLabel.textAlignment = UITextAlignmentLeft; + titleLabel.textAlignment = NSTextAlignmentLeft; titleLabel.backgroundColor = [UIColor clearColor]; titleLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]]; [self.contentView addSubview:titleLabel]; diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/ExtraCategories.m --- a/project_files/HedgewarsMobile/Classes/ExtraCategories.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/ExtraCategories.m Mon Feb 15 23:37:48 2016 +0100 @@ -161,7 +161,7 @@ if (title != nil) { theLabel.text = title; theLabel.textColor = [UIColor lightYellowColor]; - theLabel.textAlignment = UITextAlignmentCenter; + theLabel.textAlignment = NSTextAlignmentCenter; theLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]*80/100]; } diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Feb 15 23:37:48 2016 +0100 @@ -349,7 +349,7 @@ withBorderWidth:2.0f]; maxLabel.font = [UIFont italicSystemFontOfSize:[UIFont labelFontSize]]; maxLabel.textColor = [UIColor whiteColor]; - maxLabel.textAlignment = UITextAlignmentCenter; + maxLabel.textAlignment = NSTextAlignmentCenter; [self.view addSubview:maxLabel]; self.mapConfigViewController.maxLabel = maxLabel; [maxLabel release]; diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/MNEValueTrackingSlider.m --- a/project_files/HedgewarsMobile/Classes/MNEValueTrackingSlider.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/MNEValueTrackingSlider.m Mon Feb 15 23:37:48 2016 +0100 @@ -81,7 +81,7 @@ [_text drawInRect:textRect withFont:self.font lineBreakMode:UILineBreakModeWordWrap - alignment:UITextAlignmentCenter]; + alignment:NSTextAlignmentCenter]; } } diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m --- a/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController.m Mon Feb 15 23:37:48 2016 +0100 @@ -226,7 +226,7 @@ cell.textLabel.textColor = [UIColor lightYellowColor]; //cell.textLabel.font = [UIFont fontWithName:@"Bradley Hand Bold" size:[UIFont labelFontSize]]; - cell.textLabel.textAlignment = (IS_IPAD()) ? UITextAlignmentCenter : UITextAlignmentLeft; + cell.textLabel.textAlignment = (IS_IPAD()) ? NSTextAlignmentCenter : NSTextAlignmentLeft; cell.textLabel.backgroundColor = [UIColor clearColor]; cell.textLabel.adjustsFontSizeToFitWidth = YES; cell.detailTextLabel.text = (IS_IPAD()) ? nil : self.dictOfMissions[missionID][@"desc"]; diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/SavedGamesViewController.m --- a/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/SavedGamesViewController.m Mon Feb 15 23:37:48 2016 +0100 @@ -144,7 +144,7 @@ UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width*60/100, 60)]; label.center = CGPointMake(self.tableView.frame.size.width/2, 30); - label.textAlignment = UITextAlignmentCenter; + label.textAlignment = NSTextAlignmentCenter; label.font = [UIFont italicSystemFontOfSize:16]; label.textColor = [UIColor lightGrayColor]; label.numberOfLines = 5; diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Mon Feb 15 23:37:48 2016 +0100 @@ -270,7 +270,7 @@ UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*90/100, height)]; label.center = CGPointMake(aTableView.frame.size.width/2, height/2); - label.textAlignment = UITextAlignmentCenter; + label.textAlignment = NSTextAlignmentCenter; label.font = [UIFont italicSystemFontOfSize:12]; label.textColor = [UIColor whiteColor]; label.numberOfLines = 2; diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/StatsPageViewController.m --- a/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/StatsPageViewController.m Mon Feb 15 23:37:48 2016 +0100 @@ -124,7 +124,7 @@ cell.accessoryView = imgView; [imgView release]; - cell.textLabel.textAlignment = UITextAlignmentCenter; + cell.textLabel.textAlignment = NSTextAlignmentCenter; cell.textLabel.adjustsFontSizeToFitWidth = YES; cell.backgroundColor = [UIColor blackColor]; cell.selectionStyle = UITableViewCellSelectionStyleNone; diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/SupportViewController.m --- a/project_files/HedgewarsMobile/Classes/SupportViewController.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/SupportViewController.m Mon Feb 15 23:37:48 2016 +0100 @@ -74,10 +74,10 @@ if (section == 0) { imgName = @"star"; - cell.textLabel.textAlignment = UITextAlignmentCenter; + cell.textLabel.textAlignment = NSTextAlignmentCenter; cell.imageView.image = nil; } else { - cell.textLabel.textAlignment = UITextAlignmentLeft; + cell.textLabel.textAlignment = NSTextAlignmentLeft; switch (row) { case 0: imgName = @"fb"; @@ -160,7 +160,7 @@ UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 20)]; label.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin; - label.textAlignment = UITextAlignmentCenter; + label.textAlignment = NSTextAlignmentCenter; label.text = NSLocalizedString(@" ♥ THANK YOU ♥ ", nil); label.backgroundColor = [UIColor clearColor]; label.center = CGPointMake(self.tableView.frame.size.width/2, 250); diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Mon Feb 15 23:37:48 2016 +0100 @@ -205,7 +205,7 @@ UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, aTableView.frame.size.width*90/100, height)]; label.center = CGPointMake(aTableView.frame.size.width/2, height/2); - label.textAlignment = UITextAlignmentCenter; + label.textAlignment = NSTextAlignmentCenter; label.font = [UIFont italicSystemFontOfSize:12]; label.textColor = [UIColor whiteColor]; label.numberOfLines = 2; diff -r 45982bda46cc -r 893722a2a1f9 project_files/HedgewarsMobile/Classes/WeaponCellView.m --- a/project_files/HedgewarsMobile/Classes/WeaponCellView.m Sun Feb 14 21:34:01 2016 +0100 +++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.m Mon Feb 15 23:37:48 2016 +0100 @@ -81,27 +81,27 @@ initialLab = [[UILabel alloc] init]; initialLab.backgroundColor = [UIColor clearColor]; initialLab.textColor = [UIColor grayColor]; - initialLab.textAlignment = UITextAlignmentCenter; + initialLab.textAlignment = NSTextAlignmentCenter; probabilityLab = [[UILabel alloc] init]; probabilityLab.backgroundColor = [UIColor clearColor]; probabilityLab.textColor = [UIColor grayColor]; - probabilityLab.textAlignment = UITextAlignmentCenter; + probabilityLab.textAlignment = NSTextAlignmentCenter; delayLab = [[UILabel alloc] init]; delayLab.backgroundColor = [UIColor clearColor]; delayLab.textColor = [UIColor grayColor]; - delayLab.textAlignment = UITextAlignmentCenter; + delayLab.textAlignment = NSTextAlignmentCenter; crateLab = [[UILabel alloc] init]; crateLab.backgroundColor = [UIColor clearColor]; crateLab.textColor = [UIColor grayColor]; - crateLab.textAlignment = UITextAlignmentCenter; + crateLab.textAlignment = NSTextAlignmentCenter; helpLabel = [[UILabel alloc] init]; helpLabel.backgroundColor = [UIColor clearColor]; helpLabel.textColor = [UIColor darkGrayColor]; - helpLabel.textAlignment = UITextAlignmentRight; + helpLabel.textAlignment = NSTextAlignmentRight; helpLabel.font = [UIFont italicSystemFontOfSize:[UIFont systemFontSize]]; helpLabel.adjustsFontSizeToFitWidth = YES;