# HG changeset patch # User koda # Date 1317512120 -7200 # Node ID c10767edcd5818a763eb7829199051649271482b # Parent 8c0cc07731e5bec953698097b5b74044f1a44986 little changes and fixes to the previous commit diff -r 8c0cc07731e5 -r c10767edcd58 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Oct 02 00:57:04 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Oct 02 01:35:20 2011 +0200 @@ -299,14 +299,16 @@ [self.mapConfigViewController.view addSubview:theLabel]; releaseAndNil(theLabel); // bottom left - theLabel = [[UILabel alloc] initWithFrame:CGRectMake(106, 714, 320, 40) andTitle:nil withBorderWidth:2.0f]; + theLabel = [[UILabel alloc] initWithFrame:CGRectMake(110, 714, 320, 40) andTitle:nil withBorderWidth:2.0f]; [self.mapConfigViewController.view addSubview:theLabel]; releaseAndNil(theLabel); // bottom right - theLabel = [[UILabel alloc] initWithFrame:CGRectMake(594, 714, 320, 40) - andTitle:NSLocalizedString(@"Max Hogs: ",@"") + theLabel = [[UILabel alloc] initWithFrame:CGRectMake(596, 714, 320, 40) + andTitle:NSLocalizedString(@" Max Hogs:",@"") withBorderWidth:2.0f]; theLabel.font = [UIFont italicSystemFontOfSize:[UIFont labelFontSize]]; + theLabel.textColor = [UIColor lightYellowColor]; + theLabel.textAlignment = UITextAlignmentLeft; [self.mapConfigViewController.view addSubview:theLabel]; releaseAndNil(theLabel); diff -r 8c0cc07731e5 -r c10767edcd58 project_files/HedgewarsMobile/Classes/HWUtils.m --- a/project_files/HedgewarsMobile/Classes/HWUtils.m Sun Oct 02 00:57:04 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/HWUtils.m Sun Oct 02 01:35:20 2011 +0200 @@ -78,10 +78,7 @@ } +(UIColor *)blackColorTransparent { - if (IS_NOT_POWERFUL([HWUtils modelType])) - return [UIColor blackColor]; - else - return [UIColor colorWithRed:0 green:0 blue:0 alpha:0.6]; + return [UIColor colorWithRed:0 green:0 blue:0 alpha:0.5f]; } @end @@ -102,7 +99,7 @@ andTitle:title withBorderWidth:borderWidth withBorderColor:[UIColor darkYellowColor] - withBackgroundColor:[UIColor darkBlueColor]]; + withBackgroundColor:[UIColor darkBlueColorTransparent]]; } -(UILabel *)initWithFrame:(CGRect)frame andTitle:(NSString *)title withBorderWidth:(CGFloat) borderWidth diff -r 8c0cc07731e5 -r c10767edcd58 project_files/HedgewarsMobile/Classes/MapConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sun Oct 02 00:57:04 2011 +0200 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Sun Oct 02 01:35:20 2011 +0200 @@ -441,6 +441,7 @@ if (self.segmentedControl.selectedSegmentIndex == 1) { self.slider.enabled = NO; self.sizeLabel.text = NSLocalizedString(@"No filter",@""); + self.sizeLabel.textColor = [UIColor lightYellowColor]; } self.templateFilterCommand = @"e$template_filter 0"; diff -r 8c0cc07731e5 -r c10767edcd58 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Sun Oct 02 00:57:04 2011 +0200 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPad.xib Sun Oct 02 01:35:20 2011 +0200 @@ -2,7 +2,7 @@ 1056 - 10K540 + 10K549 823 1038.36 461.00 @@ -167,7 +167,7 @@ 2 - MC45MTc2NDcxMjMzIDAuNjc0NTA5ODIzMyAwAA + MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA 1 @@ -192,7 +192,7 @@ 2 - MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA + MC45MjU0OTAyNjAxIDAuODAwMDAwMDcxNSAwAA 1 @@ -202,14 +202,14 @@ 292 - {{357, 28}, {309, 165}} + {{357, 19}, {309, 165}} NO NO IBIPadFramework NSImage - title.png + title~iphone.png @@ -256,7 +256,7 @@ 292 - {{10, 693}, {64, 64}} + {{11, 693}, {64, 64}} NO IBIPadFramework @@ -277,7 +277,7 @@ 292 - {{950, 693}, {64, 64}} + {{955, 693}, {64, 64}} NO 2 @@ -481,17 +481,17 @@ YES - - - + + + @@ -563,13 +563,18 @@ 11.IBPluginDependency 17.IBPluginDependency 50.IBPluginDependency + 50.IBViewBoundsToFrameTransform 57.IBPluginDependency + 57.IBViewBoundsToFrameTransform 66.IBPluginDependency 7.IBPluginDependency 7.IBViewBoundsToFrameTransform 70.IBPluginDependency + 70.IBViewBoundsToFrameTransform 72.IBPluginDependency + 72.IBViewBoundsToFrameTransform 75.IBPluginDependency + 75.IBViewBoundsToFrameTransform 8.IBPluginDependency 9.CustomClassName 9.IBPluginDependency @@ -583,15 +588,28 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABDsoAAwz8AAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin P4AAAL+AAABENUAAw0IAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABD3IAAxD8AAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABBIAAAxDzAAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABEbsAAxDzAAA + com.apple.InterfaceBuilder.IBCocoaTouchPlugin MapPreviewButtonView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -613,7 +631,7 @@ - 119 + 120 @@ -758,6 +776,13 @@ Classes/MapPreviewButtonView.h + + UILabel + + IBProjectSource + Classes/HWUtils.h + + YES @@ -1032,7 +1057,7 @@ background.png helpButton.png startGameButton.png - title.png + title~iphone.png YES diff -r 8c0cc07731e5 -r c10767edcd58 project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Sun Oct 02 00:57:04 2011 +0200 +++ b/project_files/HedgewarsMobile/Resources/MapConfigViewController-iPhone.xib Sun Oct 02 01:35:20 2011 +0200 @@ -2,7 +2,7 @@ 1056 - 10K540 + 10K549 823 1038.36 461.00 @@ -12,7 +12,6 @@ YES - YES @@ -47,6 +46,7 @@ 292 {480, 276} + NO IBCocoaTouchFramework @@ -59,6 +59,7 @@ 292 {{9, 14}, {270, 30}} + NO IBCocoaTouchFramework 2 @@ -109,6 +110,7 @@ 292 {{119, 207}, {149, 23}} + NO IBCocoaTouchFramework 0 @@ -121,6 +123,7 @@ 292 {{16, 58}, {256, 128}} + NO IBCocoaTouchFramework 0 @@ -148,6 +151,7 @@ 292 {{58, 221}, {48, 35}} + NO YES 7 @@ -161,7 +165,7 @@ 2 - MC45NDkwMTk2NzA1IDAuNzY4NjI3NTI0NCAwAA + MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA 1 @@ -173,6 +177,7 @@ 292 {{109, 237}, {169, 29}} + NO YES 7 @@ -184,7 +189,7 @@ 22 16 - + 2 MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA @@ -198,6 +203,7 @@ 274 {{284, 0}, {196, 276}} + 3 MCAwAA @@ -220,6 +226,7 @@ 292 {{-9, 225}, {92, 27}} + NO YES 7 @@ -231,10 +238,7 @@ 18 16 - - 2 - MC45NDkwMTk2NzA1IDAuNzY4NjI3NTI0NCAwAA - + 1 10 @@ -243,6 +247,7 @@ {480, 276} + @@ -674,6 +679,13 @@ Classes/MapPreviewButtonView.h + + UILabel + + IBProjectSource + Classes/HWUtils.h + + YES