# HG changeset patch
# User koda
# Date 1329066514 -3600
# Node ID beab48f963d512e1cb2fe1f819a9905d2da14d80
# Parent 6b7560b37eef01ace0eac4a09ca6d5cbd084c1ab
restored interface on iphone
diff -r 6b7560b37eef -r beab48f963d5 project_files/HedgewarsMobile/Classes/GameConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Feb 12 19:38:32 2012 +0400
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Feb 12 18:08:34 2012 +0100
@@ -312,7 +312,7 @@
self.mapConfigViewController.maxLabel = maxLabel;
[maxLabel release];
} else {
- self.mapConfigViewController.view.frame = CGRectMake(0, 0, screenRect.size.height, screenRect.size.width-44);
+ self.mapConfigViewController.view.frame = CGRectMake(0, 0, screenRect.size.width, screenRect.size.height-44);
}
[self.view addSubview:self.mapConfigViewController.view];
[self.view bringSubviewToFront:self.mapConfigViewController.slider];
diff -r 6b7560b37eef -r beab48f963d5 project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sun Feb 12 19:38:32 2012 +0400
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sun Feb 12 18:08:34 2012 +0100
@@ -104,17 +104,30 @@
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
- <object class="IBUISlider" id="938256702">
+ <object class="IBUILabel" id="634417433">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{119, 207}, {149, 23}}</string>
+ <string key="NSFrame">{{71, 196}, {145, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <float key="IBUIValue">0.05000000074505806</float>
- <float key="IBUIMaxValue">0.05000000074505806</float>
+ <string key="IBUIText">Loading...</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">17</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
</object>
<object class="IBUIButton" id="326163764">
<reference key="NSNextResponder" ref="191373211"/>
@@ -143,56 +156,6 @@
<bytes key="NSWhite">MC41AA</bytes>
</object>
</object>
- <object class="IBUILabel" id="634417433">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{9, 221}, {97, 35}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Loading...</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">17</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- <object class="IBUILabel" id="743202682">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{109, 237}, {169, 29}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Label</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Oblique</string>
- <double key="NSSize">22</double>
- <int key="NSfFlags">16</int>
- </object>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">2</int>
- <bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
<object class="IBUITableView" id="565214171">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
@@ -215,6 +178,18 @@
<float key="IBUISectionHeaderHeight">10</float>
<float key="IBUISectionFooterHeight">10</float>
</object>
+ <object class="IBUISlider" id="938256702">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{52, 239}, {184, 23}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <float key="IBUIValue">0.05000000074505806</float>
+ <float key="IBUIMaxValue">0.05000000074505806</float>
+ </object>
</object>
<string key="NSFrameSize">{480, 276}</string>
<reference key="NSSuperview"/>
@@ -254,14 +229,6 @@
<int key="connectionID">16</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">sizeLabel</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="743202682"/>
- </object>
- <int key="connectionID">18</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">sliderChanged:</string>
<reference key="source" ref="938256702"/>
@@ -362,11 +329,10 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="326163764"/>
<reference ref="565214171"/>
- <reference ref="938256702"/>
- <reference ref="743202682"/>
<reference ref="574494641"/>
<reference ref="88728219"/>
<reference ref="634417433"/>
+ <reference ref="938256702"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -387,23 +353,16 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="938256702"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="326163764"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">17</int>
- <reference key="object" ref="743202682"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">25</int>
<reference key="object" ref="565214171"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="parent" ref="191373211"/>
<string key="objectName">Table View (Themes)</string>
</object>
@@ -417,6 +376,11 @@
<reference key="object" ref="634417433"/>
<reference key="parent" ref="191373211"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="938256702"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -429,15 +393,15 @@
<string>1.IBPluginDependency</string>
<string>11.IBPluginDependency</string>
<string>11.IBViewBoundsToFrameTransform</string>
- <string>17.IBPluginDependency</string>
- <string>17.IBViewBoundsToFrameTransform</string>
<string>25.IBPluginDependency</string>
<string>25.IBViewBoundsToFrameTransform</string>
<string>35.IBPluginDependency</string>
<string>35.IBViewBoundsToFrameTransform</string>
<string>7.IBPluginDependency</string>
<string>7.IBViewBoundsToFrameTransform</string>
+ <string>8.CustomClassName</string>
<string>8.IBPluginDependency</string>
+ <string>8.IBViewBoundsToFrameTransform</string>
<string>9.CustomClassName</string>
<string>9.IBPluginDependency</string>
<string>9.IBViewBoundsToFrameTransform</string>
@@ -450,11 +414,7 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABB+AAAw4QAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABCyAAAw2YAAA</bytes>
+ <bytes key="NSTransformStruct">AUKOAABDRAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
@@ -468,7 +428,11 @@
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwigAAA</bytes>
</object>
+ <string>ValueTrackingSliderView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABCWAAAw4IAAA</bytes>
+ </object>
<string>MapPreviewButtonView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
@@ -553,7 +517,6 @@
<string>maxLabel</string>
<string>previewButton</string>
<string>segmentedControl</string>
- <string>sizeLabel</string>
<string>slider</string>
<string>tableView</string>
</object>
@@ -562,8 +525,7 @@
<string>UILabel</string>
<string>MapPreviewButtonView</string>
<string>UISegmentedControl</string>
- <string>UILabel</string>
- <string>UISlider</string>
+ <string>ValueTrackingSliderView</string>
<string>UITableView</string>
</object>
</object>
@@ -574,7 +536,6 @@
<string>maxLabel</string>
<string>previewButton</string>
<string>segmentedControl</string>
- <string>sizeLabel</string>
<string>slider</string>
<string>tableView</string>
</object>
@@ -593,12 +554,8 @@
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo">
- <string key="name">sizeLabel</string>
- <string key="candidateClassName">UILabel</string>
- </object>
- <object class="IBToOneOutletInfo">
<string key="name">slider</string>
- <string key="candidateClassName">UISlider</string>
+ <string key="candidateClassName">ValueTrackingSliderView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">tableView</string>
@@ -632,14 +589,22 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">UILabel</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="290282013">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="67684033">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">ExtraCategories.h</string>
+ <string key="minorKey">Classes/ExtraCategories.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UITableView</string>
- <reference key="sourceIdentifier" ref="290282013"/>
+ <reference key="sourceIdentifier" ref="67684033"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">ValueTrackingSliderView</string>
+ <string key="superclassName">UISlider</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/ValueTrackingSliderView.h</string>
+ </object>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
diff -r 6b7560b37eef -r beab48f963d5 project_files/HedgewarsMobile/Classes/SettingsContainerViewController.m
--- a/project_files/HedgewarsMobile/Classes/SettingsContainerViewController.m Sun Feb 12 19:38:32 2012 +0400
+++ b/project_files/HedgewarsMobile/Classes/SettingsContainerViewController.m Sun Feb 12 18:08:34 2012 +0100
@@ -66,7 +66,7 @@
[sbvc release];
}
self.baseController.targetController = nil;
- self.baseController.view.frame = CGRectMake(0, 0, screenRect.size.height, screenRect.size.width);
+ self.baseController.view.frame = screenRect;
[self.view addSubview:self.baseController.view];
}