--- a/hedgewars/hwengine.pas Thu Oct 27 22:52:22 2011 +0200
+++ b/hedgewars/hwengine.pas Fri Oct 28 03:06:31 2011 +0200
@@ -187,9 +187,12 @@
end
else if event.window.event = SDL_WINDOWEVENT_RESIZED then
begin
+ // way too broken right now
+ (*
cNewScreenWidth:= max(2 * (event.window.data1 div 2), cMinScreenWidth);
cNewScreenHeight:= max(2 * (event.window.data2 div 2), cMinScreenHeight);
cScreenResizeDelay:= RealTicks+500;
+ *)
end;
{$ELSE}
SDL_KEYDOWN: if GameState = gsChat then
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib Thu Oct 27 22:52:22 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib Fri Oct 28 03:06:31 2011 +0200
@@ -12,7 +12,6 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -47,6 +46,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<bool key="IBUIAutoresizesSubviews">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -61,6 +61,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{357, 17}, {309, 165}}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -74,6 +75,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{441, 702}, {142, 64}}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">1</int>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -106,6 +108,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 693}, {64, 64}}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -127,6 +130,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{940, 693}, {64, 64}}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">2</int>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -149,6 +153,7 @@
<int key="NSvFlags">278</int>
<string key="NSFrame">{{0, 60}, {320, 620}}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<object class="NSColor" key="IBUIBackgroundColor" id="720784738">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
@@ -162,6 +167,7 @@
<int key="NSvFlags">277</int>
<string key="NSFrame">{{337, 187}, {350, 505}}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<reference key="IBUIBackgroundColor" ref="720784738"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -172,6 +178,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{269, 724}, {150, 23}}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -184,6 +191,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{121, 720}, {148, 30}}</string>
<reference key="NSSuperview" ref="766721923"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@@ -210,6 +218,7 @@
</object>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="IBUIBackgroundColor" ref="473179629"/>
<bool key="IBUIClipsSubviews">YES</bool>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
@@ -506,7 +515,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>GameConfigViewController</string>
<string>UIResponder</string>
- <string>{{444, 287}, {1024, 768}}</string>
+ <string>{{289, 287}, {1024, 768}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
@@ -806,14 +815,14 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">UILabel</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="746733566">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="379894190">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/HWUtils.h</string>
+ <string key="minorKey">ExtraCategories.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UITableView</string>
- <reference key="sourceIdentifier" ref="746733566"/>
+ <reference key="sourceIdentifier" ref="379894190"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPhone.xib Thu Oct 27 22:52:22 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPhone.xib Fri Oct 28 03:06:31 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>
@@ -13,6 +13,7 @@
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2"/>
+ <integer value="30"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -138,6 +139,32 @@
</object>
</object>
</object>
+ <object class="IBUIView" id="914954699">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{480, 276}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace" id="9020506">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="848489667">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{480, 276}</string>
+ <reference key="NSSuperview" ref="766721923"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ <reference key="NSCustomColorSpace" ref="9020506"/>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
</object>
<string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview"/>
@@ -151,6 +178,29 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
+ <object class="IBUIViewController" id="682131721">
+ <string key="IBUINibName">MapConfigViewController-iPhone</string>
+ <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics" id="789431191">
+ <int key="interfaceOrientation">3</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIHorizontal">YES</bool>
+ </object>
+ <object class="IBUIViewController" id="508843780">
+ <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics" id="129104688">
+ <int key="IBUIBarStyle">1</int>
+ </object>
+ <reference key="IBUISimulatedOrientationMetrics" ref="789431191"/>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIHorizontal">YES</bool>
+ </object>
+ <object class="IBUIViewController" id="290947091">
+ <reference key="IBUISimulatedBottomBarMetrics" ref="129104688"/>
+ <reference key="IBUISimulatedOrientationMetrics" ref="789431191"/>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIHorizontal">YES</bool>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -188,6 +238,46 @@
</object>
<int key="connectionID">29</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">mapConfigViewController</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="682131721"/>
+ </object>
+ <int key="connectionID">33</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">teamConfigViewController</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="508843780"/>
+ </object>
+ <int key="connectionID">34</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">schemeWeaponConfigViewController</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="290947091"/>
+ </object>
+ <int key="connectionID">35</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="508843780"/>
+ <reference key="destination" ref="914954699"/>
+ </object>
+ <int key="connectionID">42</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="290947091"/>
+ <reference key="destination" ref="848489667"/>
+ </object>
+ <int key="connectionID">43</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -215,6 +305,8 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="836721772"/>
+ <reference ref="914954699"/>
+ <reference ref="848489667"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -265,6 +357,33 @@
<reference key="object" ref="716161941"/>
<reference key="parent" ref="836721772"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">30</int>
+ <reference key="object" ref="682131721"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">31</int>
+ <reference key="object" ref="508843780"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">32</int>
+ <reference key="object" ref="290947091"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">40</int>
+ <reference key="object" ref="914954699"/>
+ <reference key="parent" ref="766721923"/>
+ <string key="objectName">TeamConfigViewController View</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">41</int>
+ <reference key="object" ref="848489667"/>
+ <reference key="parent" ref="766721923"/>
+ <string key="objectName">SchemeWeaponConfigViewController View</string>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -282,6 +401,19 @@
<string>2.IBPluginDependency</string>
<string>20.IBPluginDependency</string>
<string>22.IBPluginDependency</string>
+ <string>30.CustomClassName</string>
+ <string>30.IBEditorWindowLastContentRect</string>
+ <string>30.IBPluginDependency</string>
+ <string>31.CustomClassName</string>
+ <string>31.IBEditorWindowLastContentRect</string>
+ <string>31.IBPluginDependency</string>
+ <string>32.CustomClassName</string>
+ <string>32.IBEditorWindowLastContentRect</string>
+ <string>32.IBPluginDependency</string>
+ <string>40.IBPluginDependency</string>
+ <string>40.IBViewBoundsToFrameTransform</string>
+ <string>41.IBPluginDependency</string>
+ <string>41.IBViewBoundsToFrameTransform</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -294,10 +426,27 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>{{131, 321}, {480, 320}}</string>
+ <string>{{40, 217}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>MapConfigViewController</string>
+ <string>{{0, 825}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>TeamConfigViewController</string>
+ <string>{{21, 802}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>SchemeWeaponConfigViewController</string>
+ <string>{{42, 779}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw5QAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw5QAAA</bytes>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -316,7 +465,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">29</int>
+ <int key="maxID">45</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -356,11 +505,210 @@
</object>
</object>
</object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>mapConfigViewController</string>
+ <string>schemeWeaponConfigViewController</string>
+ <string>teamConfigViewController</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>MapConfigViewController</string>
+ <string>SchemeWeaponConfigViewController</string>
+ <string>TeamConfigViewController</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>mapConfigViewController</string>
+ <string>schemeWeaponConfigViewController</string>
+ <string>teamConfigViewController</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">mapConfigViewController</string>
+ <string key="candidateClassName">MapConfigViewController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">schemeWeaponConfigViewController</string>
+ <string key="candidateClassName">SchemeWeaponConfigViewController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">teamConfigViewController</string>
+ <string key="candidateClassName">TeamConfigViewController</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Classes/GameConfigViewController.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">MapConfigViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>mapButtonPressed:</string>
+ <string>segmentedControlChanged:</string>
+ <string>sliderChanged:</string>
+ <string>sliderEndedChanging:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>mapButtonPressed:</string>
+ <string>segmentedControlChanged:</string>
+ <string>sliderChanged:</string>
+ <string>sliderEndedChanging:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">mapButtonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">segmentedControlChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">sliderChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">sliderEndedChanging:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>maxLabel</string>
+ <string>previewButton</string>
+ <string>segmentedControl</string>
+ <string>sizeLabel</string>
+ <string>slider</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UILabel</string>
+ <string>MapPreviewButtonView</string>
+ <string>UISegmentedControl</string>
+ <string>UILabel</string>
+ <string>UISlider</string>
+ <string>UITableView</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>maxLabel</string>
+ <string>previewButton</string>
+ <string>segmentedControl</string>
+ <string>sizeLabel</string>
+ <string>slider</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">maxLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">previewButton</string>
+ <string key="candidateClassName">MapPreviewButtonView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">segmentedControl</string>
+ <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>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MapConfigViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">MapPreviewButtonView</string>
+ <string key="superclassName">UIButton</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">delegate</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/MapPreviewButtonView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SchemeWeaponConfigViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/SchemeWeaponConfigViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">TeamConfigViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/TeamConfigViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="270765233">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">ExtraCategories.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <reference key="sourceIdentifier" ref="270765233"/>
+ </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -486,6 +834,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIButton</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UIControl</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -494,11 +850,27 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UIResponder</string>
<string key="superclassName">NSObject</string>
<reference key="sourceIdentifier" ref="786211723"/>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UISearchBar</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -523,6 +895,22 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">UISlider</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISlider.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">UIToolbar</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
--- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Thu Oct 27 22:52:22 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Fri Oct 28 03:06:31 2011 +0200
@@ -35,19 +35,6 @@
return rotationManager(interfaceOrientation);
}
-/*
--(MapConfigViewController *)mapConfigViewController {
- if (mapConfigViewController == nil) {
- NSString *xib = IS_IPAD() ? @"MapConfigViewController-iPad" : @"MapConfigViewController-iPhone";
- MapConfigViewController *mcvc = [[MapConfigViewController alloc] initWithNibName:xib bundle:nil];
- [self.view addSubview:mcvc.view];
- self.mapConfigViewController = mcvc;
- [mcvc release];
- }
- return mapConfigViewController;
-}
-*/
-
-(IBAction) buttonPressed:(id) sender {
UIButton *theButton = (UIButton *)sender;
@@ -97,7 +84,7 @@
}
-(IBAction) segmentPressed:(id) sender {
-/*
+
UISegmentedControl *theSegment = (UISegmentedControl *)sender;
[AudioManagerController playSelectSound];
@@ -113,10 +100,6 @@
[self.view bringSubviewToFront:self.teamConfigViewController.view];
break;
case 2:
- if (schemeWeaponConfigViewController == nil) {
- schemeWeaponConfigViewController = [[SchemeWeaponConfigViewController alloc] initWithStyle:UITableViewStyleGrouped];
- [self.view addSubview:schemeWeaponConfigViewController.view];
- }
// this message is compulsory otherwise the table won't be loaded at all
[schemeWeaponConfigViewController viewWillAppear:NO];
[self.view bringSubviewToFront:schemeWeaponConfigViewController.view];
@@ -134,7 +117,7 @@
DLog(@"Nope");
break;
}
-*/
+
}
-(BOOL) isEverythingSet {
@@ -324,12 +307,7 @@
// as this is loaded from a NIB we need to set its size and position
self.mapConfigViewController.view.frame = CGRectMake(704, 0, 320, 680);
} else {
- // this is the visible controller
- if (self.mapConfigViewController == nil)
- self.mapConfigViewController = [[MapConfigViewController alloc] initWithNibName:@"MapConfigViewController-iPhone" bundle:nil];
- // this must be loaded & added in order to auto set default scheme and ammo
- self.schemeWeaponConfigViewController = [[SchemeWeaponConfigViewController alloc] initWithStyle:UITableViewStyleGrouped];
- [self.view addSubview:self.schemeWeaponConfigViewController.view];
+ self.mapConfigViewController.view.frame = CGRectMake(0, 0, screen.size.height, screen.size.width-44);
}
[self.view addSubview:self.mapConfigViewController.view];
--- a/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Thu Oct 27 22:52:22 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Fri Oct 28 03:06:31 2011 +0200
@@ -146,14 +146,14 @@
<object class="IBUILabel" id="634417433">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{58, 221}, {48, 35}}</string>
+ <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">...</string>
+ <string key="IBUIText">Loading...</string>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">17</double>
@@ -184,7 +184,7 @@
<double key="NSSize">22</double>
<int key="NSfFlags">16</int>
</object>
- <object class="NSColor" key="IBUITextColor" id="312386610">
+ <object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA</bytes>
</object>
@@ -215,28 +215,6 @@
<float key="IBUISectionHeaderHeight">10</float>
<float key="IBUISectionFooterHeight">10</float>
</object>
- <object class="IBUILabel" id="32436512">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{-9, 225}, {92, 27}}</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">Max</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-BoldOblique</string>
- <double key="NSSize">18</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="IBUITextColor" ref="312386610"/>
- <reference key="IBUIHighlightedColor" ref="437070330"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
</object>
<string key="NSFrameSize">{480, 276}</string>
<reference key="NSSuperview"/>
@@ -389,7 +367,6 @@
<reference ref="574494641"/>
<reference ref="88728219"/>
<reference ref="634417433"/>
- <reference ref="32436512"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -420,11 +397,6 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="634417433"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="743202682"/>
<reference key="parent" ref="191373211"/>
@@ -441,8 +413,8 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">36</int>
- <reference key="object" ref="32436512"/>
+ <int key="objectID">11</int>
+ <reference key="object" ref="634417433"/>
<reference key="parent" ref="191373211"/>
</object>
</object>
@@ -463,8 +435,6 @@
<string>25.IBViewBoundsToFrameTransform</string>
<string>35.IBPluginDependency</string>
<string>35.IBViewBoundsToFrameTransform</string>
- <string>36.IBPluginDependency</string>
- <string>36.IBViewBoundsToFrameTransform</string>
<string>7.IBPluginDependency</string>
<string>7.IBViewBoundsToFrameTransform</string>
<string>8.IBPluginDependency</string>
@@ -496,17 +466,13 @@
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBMAAAw2gAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwigAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>MapPreviewButtonView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwxIAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABBgAAAwzgAAA</bytes>
</object>
</object>
</object>
@@ -538,7 +504,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
<string>mapButtonPressed:</string>
<string>segmentedControlChanged:</string>
<string>sliderChanged:</string>
@@ -550,14 +515,12 @@
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonPressed:</string>
<string>mapButtonPressed:</string>
<string>segmentedControlChanged:</string>
<string>sliderChanged:</string>
@@ -566,10 +529,6 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
- <string key="name">buttonPressed:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
<string key="name">mapButtonPressed:</string>
<string key="candidateClassName">id</string>
</object>
@@ -673,14 +632,14 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">UILabel</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="812051196">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="290282013">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/HWUtils.h</string>
+ <string key="minorKey">ExtraCategories.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UITableView</string>
- <reference key="sourceIdentifier" ref="812051196"/>
+ <reference key="sourceIdentifier" ref="290282013"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
--- a/project_files/HedgewarsMobile/Classes/MapPreviewButtonView.m Thu Oct 27 22:52:22 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MapPreviewButtonView.m Fri Oct 28 03:06:31 2011 +0200
@@ -209,6 +209,8 @@
-(void) updatePreviewWithFile:(NSString *)filePath {
UIImage *image = [[UIImage alloc] initWithContentsOfFile:filePath];
[self setImageRounded:image forState:UIControlStateNormal];
+ self.backgroundColor = [UIColor whiteColor];
+ self.layer.cornerRadius = 12;
[image release];
}
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Thu Oct 27 22:52:22 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Fri Oct 28 03:06:31 2011 +0200
@@ -34,10 +34,6 @@
#pragma mark -
#pragma mark View lifecycle
-(void) viewDidLoad {
-/*
- CGSize screenSize = [[UIScreen mainScreen] bounds].size;
- self.view.frame = CGRectMake(0, 0, screenSize.height, screenSize.width - 44);
-*/
UITableView *aTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height)
style:UITableViewStyleGrouped];
aTableView.delegate = self;