# 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 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
@@ -167,7 +167,7 @@
</object>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45MTc2NDcxMjMzIDAuNjc0NTA5ODIzMyAwAA</bytes>
+ <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
@@ -192,7 +192,7 @@
</object>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45MTM3MjU1NTQ5IDAuNzMzMzMzMzQ5MiAwLjAxMTc2NDcwNzA0AA</bytes>
+ <bytes key="NSRGB">MC45MjU0OTAyNjAxIDAuODAwMDAwMDcxNSAwAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
@@ -202,14 +202,14 @@
<object class="IBUIImageView" id="920829014">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{357, 28}, {309, 165}}</string>
+ <string key="NSFrame">{{357, 19}, {309, 165}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">title.png</string>
+ <string key="NSResourceName">title~iphone.png</string>
</object>
</object>
<object class="IBUITableView" id="394383001">
@@ -256,7 +256,7 @@
<object class="IBUIButton" id="403581306">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{10, 693}, {64, 64}}</string>
+ <string key="NSFrame">{{11, 693}, {64, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -277,7 +277,7 @@
<object class="IBUIButton" id="1065439841">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{950, 693}, {64, 64}}</string>
+ <string key="NSFrame">{{955, 693}, {64, 64}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">2</int>
@@ -481,17 +481,17 @@
<reference key="object" ref="191373211"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1065439841"/>
- <reference ref="403581306"/>
<reference ref="550636851"/>
<reference ref="394383001"/>
- <reference ref="920829014"/>
<reference ref="743202682"/>
<reference ref="634417433"/>
<reference ref="326163764"/>
<reference ref="938256702"/>
<reference ref="420136851"/>
<reference ref="88728219"/>
+ <reference ref="920829014"/>
+ <reference ref="403581306"/>
+ <reference ref="1065439841"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -563,13 +563,18 @@
<string>11.IBPluginDependency</string>
<string>17.IBPluginDependency</string>
<string>50.IBPluginDependency</string>
+ <string>50.IBViewBoundsToFrameTransform</string>
<string>57.IBPluginDependency</string>
+ <string>57.IBViewBoundsToFrameTransform</string>
<string>66.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
<string>7.IBViewBoundsToFrameTransform</string>
<string>70.IBPluginDependency</string>
+ <string>70.IBViewBoundsToFrameTransform</string>
<string>72.IBPluginDependency</string>
+ <string>72.IBViewBoundsToFrameTransform</string>
<string>75.IBPluginDependency</string>
+ <string>75.IBViewBoundsToFrameTransform</string>
<string>8.IBPluginDependency</string>
<string>9.CustomClassName</string>
<string>9.IBPluginDependency</string>
@@ -583,15 +588,28 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDsoAAwz8AAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABENUAAw0IAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABD3IAAxD8AAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBIAAAxDzAAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABEbsAAxDzAAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>MapPreviewButtonView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -613,7 +631,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">119</int>
+ <int key="maxID">120</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -758,6 +776,13 @@
<string key="minorKey">Classes/MapPreviewButtonView.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HWUtils.h</string>
+ </object>
+ </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1032,7 +1057,7 @@
<string>background.png</string>
<string>helpButton.png</string>
<string>startGameButton.png</string>
- <string>title.png</string>
+ <string>title~iphone.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
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 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
@@ -12,7 +12,6 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -47,6 +46,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{480, 276}</string>
<reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
@@ -59,6 +59,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{9, 14}, {270, 30}}</string>
<reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBSegmentControlStyle">2</int>
@@ -109,6 +110,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{119, 207}, {149, 23}}</string>
<reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -121,6 +123,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{16, 58}, {256, 128}}</string>
<reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -148,6 +151,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{58, 221}, {48, 35}}</string>
<reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -161,7 +165,7 @@
</object>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45NDkwMTk2NzA1IDAuNzY4NjI3NTI0NCAwAA</bytes>
+ <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">1</int>
@@ -173,6 +177,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{109, 237}, {169, 29}}</string>
<reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -184,7 +189,7 @@
<double key="NSSize">22</double>
<int key="NSfFlags">16</int>
</object>
- <object class="NSColor" key="IBUITextColor">
+ <object class="NSColor" key="IBUITextColor" id="312386610">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
</object>
@@ -198,6 +203,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{284, 0}, {196, 276}}</string>
<reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
@@ -220,6 +226,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{-9, 225}, {92, 27}}</string>
<reference key="NSSuperview" ref="191373211"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -231,10 +238,7 @@
<double key="NSSize">18</double>
<int key="NSfFlags">16</int>
</object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45NDkwMTk2NzA1IDAuNzY4NjI3NTI0NCAwAA</bytes>
- </object>
+ <reference key="IBUITextColor" ref="312386610"/>
<reference key="IBUIHighlightedColor" ref="437070330"/>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">10</float>
@@ -243,6 +247,7 @@
</object>
<string key="NSFrameSize">{480, 276}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="IBUIBackgroundColor" ref="437070330"/>
<object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
@@ -674,6 +679,13 @@
<string key="minorKey">Classes/MapPreviewButtonView.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/HWUtils.h</string>
+ </object>
+ </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>