--- a/cocoaTouch/MainWindow.xib Mon Feb 01 19:43:57 2010 +0000
+++ b/cocoaTouch/MainWindow.xib Mon Feb 01 21:26:15 2010 +0000
@@ -12,7 +12,6 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="13"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,90 +36,21 @@
</object>
<object class="IBUICustomObject" id="664661524"/>
<object class="IBUIWindow" id="380026005">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">1316</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
- <string key="NSFrameSize">{320, 480}</string>
+ <string key="NSFrameSize">{480, 320}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
</object>
- <object class="IBUITabBarController" id="949193037">
- <object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
- <bool key="IBUIWantsFullScreenLayout">YES</bool>
- <object class="IBUIViewController" key="IBUISelectedViewController" id="56776854">
- <string key="IBUITitle">Item 2</string>
- <object class="IBUITabBarItem" key="IBUITabBarItem" id="121845716">
- <int key="IBUITag">1</int>
- <string key="IBUITitle">Teams</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">tabButton2.png</string>
- </object>
- <reference key="IBUITabBar"/>
- </object>
- <reference key="IBUIParentViewController" ref="949193037"/>
- <string key="IBUINibName">TeamEditViewController</string>
- </object>
- <object class="NSMutableArray" key="IBUIViewControllers">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIViewController" id="316666609">
- <string key="IBUITitle">Item 1</string>
- <object class="IBUITabBarItem" key="IBUITabBarItem" id="649951061">
- <string key="IBUITitle">Main</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">tabButton1.png</string>
- </object>
- <reference key="IBUITabBar"/>
- </object>
- <reference key="IBUIParentViewController" ref="949193037"/>
- <string key="IBUINibName">MainMenuViewController</string>
- </object>
- <reference ref="56776854"/>
- <object class="IBUIViewController" id="18996086">
- <string key="IBUITitle">Item 3</string>
- <object class="IBUITabBarItem" key="IBUITabBarItem" id="588275822">
- <int key="IBUITag">2</int>
- <string key="IBUITitle">Schemes</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">tabButton3.png</string>
- </object>
- <reference key="IBUITabBar"/>
- </object>
- <reference key="IBUIToolbarItems" ref="0"/>
- <reference key="IBUIParentViewController" ref="949193037"/>
- <string key="IBUINibName">SchemeEditViewController</string>
- </object>
- <object class="IBUIViewController" id="78432802">
- <string key="IBUITitle">Item 4</string>
- <object class="IBUITabBarItem" key="IBUITabBarItem" id="457331497">
- <int key="IBUITag">3</int>
- <string key="IBUITitle">Settings</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">tabButton4.png</string>
- </object>
- <reference key="IBUITabBar"/>
- </object>
- <reference key="IBUIToolbarItems" ref="0"/>
- <reference key="IBUIParentViewController" ref="949193037"/>
- <string key="IBUINibName">SettingsViewController</string>
- </object>
- </object>
- <object class="IBUITabBar" key="IBUITabBar" id="906583108">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{129, 330}, {163, 49}}</string>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwAA</bytes>
- </object>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- </object>
+ <object class="IBUIViewController" id="402149676">
+ <string key="IBUINibName">MainMenuViewController</string>
+ <bool key="IBUIHorizontal">YES</bool>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -136,20 +66,20 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">controller</string>
- <reference key="source" ref="664661524"/>
- <reference key="destination" ref="949193037"/>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">uiwindow</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="380026005"/>
</object>
<int key="connectionID">25</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">viewController</string>
+ <reference key="source" ref="664661524"/>
+ <reference key="destination" ref="402149676"/>
+ </object>
+ <int key="connectionID">28</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -185,79 +115,10 @@
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="949193037"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="906583108"/>
- <reference ref="316666609"/>
- <reference ref="56776854"/>
- <reference ref="18996086"/>
- <reference ref="78432802"/>
- </object>
+ <int key="objectID">26</int>
+ <reference key="object" ref="402149676"/>
<reference key="parent" ref="0"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="906583108"/>
- <reference key="parent" ref="949193037"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">12</int>
- <reference key="object" ref="316666609"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="649951061"/>
- </object>
- <reference key="parent" ref="949193037"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">13</int>
- <reference key="object" ref="56776854"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="121845716"/>
- </object>
- <reference key="parent" ref="949193037"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">14</int>
- <reference key="object" ref="121845716"/>
- <reference key="parent" ref="56776854"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">15</int>
- <reference key="object" ref="649951061"/>
- <reference key="parent" ref="316666609"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">16</int>
- <reference key="object" ref="18996086"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="588275822"/>
- </object>
- <reference key="parent" ref="949193037"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">17</int>
- <reference key="object" ref="588275822"/>
- <reference key="parent" ref="18996086"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="78432802"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="457331497"/>
- </object>
- <reference key="parent" ref="949193037"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="457331497"/>
- <reference key="parent" ref="78432802"/>
- </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -266,20 +127,12 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
- <string>10.IBEditorWindowLastContentRect</string>
- <string>10.IBPluginDependency</string>
- <string>11.IBPluginDependency</string>
- <string>12.CustomClassName</string>
- <string>12.IBPluginDependency</string>
- <string>13.CustomClassName</string>
- <string>13.IBPluginDependency</string>
- <string>14.IBPluginDependency</string>
- <string>15.IBPluginDependency</string>
- <string>16.CustomClassName</string>
- <string>18.CustomClassName</string>
<string>2.IBAttributePlaceholdersKey</string>
<string>2.IBEditorWindowLastContentRect</string>
<string>2.IBPluginDependency</string>
+ <string>26.CustomClassName</string>
+ <string>26.IBEditorWindowLastContentRect</string>
+ <string>26.IBPluginDependency</string>
<string>3.CustomClassName</string>
<string>3.IBPluginDependency</string>
</object>
@@ -287,17 +140,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIApplication</string>
<string>UIResponder</string>
- <string>{{144, 608}, {320, 480}}</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>MainMenuViewController</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>TeamEditViewController</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>SchemeEditViewController</string>
- <string>SettingsViewController</string>
<object class="NSMutableDictionary">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
@@ -305,7 +147,10 @@
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
- <string>{{820, 472}, {320, 480}}</string>
+ <string>{{530, 261}, {480, 320}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>MainMenuViewController</string>
+ <string>{{349, 679}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>SDLUIKitDelegate</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -327,7 +172,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">25</int>
+ <int key="maxID">28</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -377,13 +222,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>controller</string>
<string>uiwindow</string>
+ <string>viewController</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>UITabBarController</string>
<string>UIWindow</string>
+ <string>UIViewController</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -391,83 +236,6 @@
<string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.h</string>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">SchemeEditViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>cell0</string>
- <string>table</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UITableViewCell</string>
- <string>UITableView</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SchemeEditViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SettingsViewController</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>backgroundTap:</string>
- <string>deleteData:</string>
- <string>sliderChanged:</string>
- <string>textFieldDoneEditing:</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="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>buttonContainer</string>
- <string>password</string>
- <string>table</string>
- <string>username</string>
- <string>volumeCell</string>
- <string>volumeLabel</string>
- <string>volumeSlider</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UIView</string>
- <string>UITextField</string>
- <string>UITableView</string>
- <string>UITextField</string>
- <string>UITableViewCell</string>
- <string>UILabel</string>
- <string>UISlider</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/SettingsViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">TeamEditViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">../../../hedge.build/trunk/cocoaTouch/TeamEditViewController.h</string>
- </object>
- </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -613,14 +381,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UIBarItem</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">UIButton</string>
<string key="superclassName">UIControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -650,14 +410,6 @@
<reference key="sourceIdentifier" ref="186590129"/>
</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">
@@ -674,67 +426,14 @@
</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">UITabBar</string>
- <string key="superclassName">UIView</string>
+ <string key="className">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBar.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UITabBarController</string>
- <string key="superclassName">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="779948122">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UITabBarItem</string>
- <string key="superclassName">UIBarItem</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITabBarItem.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">UITableViewCell</string>
- <string key="superclassName">UIView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">UIKit.framework/Headers/UITableViewCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UITextField</string>
- <string key="superclassName">UIControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1045548135">
- <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIView</string>
- <reference key="sourceIdentifier" ref="1045548135"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">UIView</string>
<string key="superclassName">UIResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
@@ -750,7 +449,10 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">UIViewController</string>
- <reference key="sourceIdentifier" ref="779948122"/>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIViewController</string>