--- a/cocoaTouch/SettingsViewController.xib Wed Jan 20 14:31:45 2010 +0000
+++ b/cocoaTouch/SettingsViewController.xib Sat Jan 23 13:15:27 2010 +0000
@@ -12,6 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="37"/>
<integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -56,22 +57,23 @@
<object class="IBUITextField" id="52230916">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{130, 135}, {152, 31}}</string>
+ <string key="NSFrame">{{100, 18}, {200, 31}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUIContentVerticalAlignment">0</int>
<string key="IBUIText"/>
- <int key="IBUIBorderStyle">3</int>
<string key="IBUIPlaceholder">username</string>
<object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace" id="6220105">
- <int key="NSID">2</int>
- </object>
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC40MDAwMDAwMDYgMC40MDAwMDAwMDYgMQA</bytes>
</object>
- <bool key="IBUIClearsOnBeginEditing">YES</bool>
+ <object class="NSFont" key="IBUIFont" id="788314749">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <int key="IBUITextAlignment">2</int>
<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
<float key="IBUIMinimumFontSize">17</float>
<object class="IBUITextInputTraits" key="IBUITextInputTraits">
@@ -82,19 +84,22 @@
<object class="IBUITextField" id="809344278">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{130, 174}, {152, 31}}</string>
+ <string key="NSFrame">{{100, 50}, {200, 31}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="IBUIContentVerticalAlignment">0</int>
<string key="IBUIText"/>
- <int key="IBUIBorderStyle">3</int>
<string key="IBUIPlaceholder">network password (if any)</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
- <reference key="NSCustomColorSpace" ref="6220105"/>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">2</int>
+ </object>
</object>
+ <reference key="IBUIFont" ref="788314749"/>
+ <int key="IBUITextAlignment">2</int>
<bool key="IBUIClearsOnBeginEditing">YES</bool>
<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
<float key="IBUIMinimumFontSize">17</float>
@@ -104,72 +109,23 @@
<bool key="IBUISecureTextEntry">YES</bool>
</object>
</object>
- <object class="IBUISlider" id="1157528">
+ <object class="IBUITableView" id="179734732">
<reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{38, 373}, {243, 23}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <float key="IBUIValue">100</float>
- <float key="IBUIMaxValue">100</float>
- <bool key="IBUIContinuous">NO</bool>
- </object>
- <object class="IBUISwitch" id="846182137">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{188, 224}, {94, 27}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <bool key="IBUIOn">YES</bool>
- </object>
- <object class="IBUISwitch" id="101121478">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{188, 279}, {94, 27}}</string>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{0, 98}, {320, 333}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <bool key="IBUIOn">YES</bool>
- </object>
- <object class="IBUILabel" id="939351608">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{56, 316}, {42, 21}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="IBUIText"/>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDEAA</bytes>
- </object>
- <nil key="IBUIHighlightedColor"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- </object>
- <object class="IBUISwitch" id="140511032">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{188, 330}, {94, 27}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- <bool key="IBUIOn">YES</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
+ <bool key="IBUICanCancelContentTouches">NO</bool>
+ <bool key="IBUIBouncesZoom">NO</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">1</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ <float key="IBUISectionFooterHeight">10</float>
</object>
</object>
<string key="NSFrameSize">{320, 431}</string>
@@ -180,6 +136,93 @@
</object>
<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
</object>
+ <object class="IBUITableViewCell" id="45589474">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIView" id="1008690992">
+ <reference key="NSNextResponder" ref="45589474"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISlider" id="1157528">
+ <reference key="NSNextResponder" ref="1008690992"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{10, 37}, {284, 23}}</string>
+ <reference key="NSSuperview" ref="1008690992"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <float key="IBUIValue">100</float>
+ <float key="IBUIMaxValue">100</float>
+ <bool key="IBUIContinuous">NO</bool>
+ </object>
+ <object class="IBUILabel" id="450734048">
+ <reference key="NSNextResponder" ref="1008690992"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{250, 8}, {42, 21}}</string>
+ <reference key="NSSuperview" ref="1008690992"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="IBUIText"/>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwLjUwMTk2MDgxNCAxAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">2</int>
+ </object>
+ <object class="IBUILabel" id="891605917">
+ <reference key="NSNextResponder" ref="1008690992"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{12, 8}, {62, 21}}</string>
+ <reference key="NSSuperview" ref="1008690992"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="IBUIText">Volume</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">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 69}</string>
+ <reference key="NSSuperview" ref="45589474"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 70}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ </object>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUISeparatorStyle">1</int>
+ <reference key="IBUIContentView" ref="1008690992"/>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -209,22 +252,6 @@
<int key="connectionID">14</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">musicOn</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="846182137"/>
- </object>
- <int key="connectionID">15</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">effectsOn</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="101121478"/>
- </object>
- <int key="connectionID">16</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">backgroundTap:</string>
<reference key="source" ref="191373211"/>
@@ -253,14 +280,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">volumeLabel</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="939351608"/>
- </object>
- <int key="connectionID">21</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">volumeSlider</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="1157528"/>
@@ -287,11 +306,43 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">altDamageOn</string>
+ <string key="label">dataSource</string>
+ <reference key="source" ref="179734732"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">31</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="179734732"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">32</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">table</string>
<reference key="source" ref="372490531"/>
- <reference key="destination" ref="140511032"/>
+ <reference key="destination" ref="179734732"/>
+ </object>
+ <int key="connectionID">34</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">volumeLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="450734048"/>
</object>
- <int key="connectionID">28</int>
+ <int key="connectionID">36</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">volumeCell</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="45589474"/>
+ </object>
+ <int key="connectionID">39</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -309,13 +360,9 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="411150667"/>
- <reference ref="52230916"/>
+ <reference ref="179734732"/>
<reference ref="809344278"/>
- <reference ref="846182137"/>
- <reference ref="101121478"/>
- <reference ref="1157528"/>
- <reference ref="939351608"/>
- <reference ref="140511032"/>
+ <reference ref="52230916"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -336,39 +383,48 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="52230916"/>
- <reference key="parent" ref="191373211"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="809344278"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="1157528"/>
+ <int key="objectID">30</int>
+ <reference key="object" ref="179734732"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="846182137"/>
+ <int key="objectID">5</int>
+ <reference key="object" ref="52230916"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="101121478"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">37</int>
+ <reference key="object" ref="45589474"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1157528"/>
+ <reference ref="891605917"/>
+ <reference ref="450734048"/>
+ </object>
+ <reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">20</int>
- <reference key="object" ref="939351608"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">7</int>
+ <reference key="object" ref="1157528"/>
+ <reference key="parent" ref="45589474"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="140511032"/>
- <reference key="parent" ref="191373211"/>
+ <int key="objectID">35</int>
+ <reference key="object" ref="450734048"/>
+ <reference key="parent" ref="45589474"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">38</int>
+ <reference key="object" ref="891605917"/>
+ <reference key="parent" ref="45589474"/>
</object>
</object>
</object>
@@ -381,14 +437,15 @@
<string>1.CustomClassName</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
- <string>20.IBPluginDependency</string>
- <string>27.IBPluginDependency</string>
+ <string>30.IBPluginDependency</string>
+ <string>35.IBPluginDependency</string>
+ <string>37.IBEditorWindowLastContentRect</string>
+ <string>37.IBPluginDependency</string>
+ <string>38.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
- <string>8.IBPluginDependency</string>
- <string>9.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -399,6 +456,7 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{564, 553}, {320, 70}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -423,7 +481,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">28</int>
+ <int key="maxID">40</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -450,21 +508,19 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>altDamageOn</string>
- <string>effectsOn</string>
- <string>musicOn</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>UISwitch</string>
- <string>UISwitch</string>
- <string>UISwitch</string>
<string>UITextField</string>
+ <string>UITableView</string>
<string>UITextField</string>
+ <string>UITableViewCell</string>
<string>UILabel</string>
<string>UISlider</string>
</object>
@@ -640,6 +696,14 @@
<reference key="sourceIdentifier" ref="311037604"/>
</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">
@@ -664,11 +728,19 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">UISwitch</string>
- <string key="superclassName">UIControl</string>
+ <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/UISwitch.h</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">