Updated iOSSampleApp to display FPS and display in OpenGL
git-svn-id: http://skia.googlecode.com/svn/trunk@1879 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/iOSSampleApp/iPad/MainWindow_iPad.xib b/experimental/iOSSampleApp/iPad/MainWindow_iPad.xib
index 898dd18..d134be1 100644
--- a/experimental/iOSSampleApp/iPad/MainWindow_iPad.xib
+++ b/experimental/iOSSampleApp/iPad/MainWindow_iPad.xib
@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1056</int>
- <string key="IBDocument.SystemVersion">10J4138</string>
+ <string key="IBDocument.SystemVersion">10K540</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="52"/>
+ <integer value="143"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -125,122 +125,155 @@
</object>
</object>
</object>
- <object class="IBUIViewController" key="IBUIDetailViewController" id="324576857">
- <object class="IBUIView" key="IBUIView" id="662500735">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUINavigationBar" id="532491637">
- <reference key="NSNextResponder" ref="662500735"/>
- <int key="NSvFlags">290</int>
- <string key="NSFrameSize">{768, 44}</string>
- <reference key="NSSuperview" ref="662500735"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIBarStyle">1</int>
- <object class="NSArray" key="IBUIItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUINavigationItem" id="719745349">
- <reference key="IBUINavigationBar" ref="532491637"/>
- <string key="IBUITitle">Title</string>
- <object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="271380391">
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIStyle">1</int>
- <reference key="IBUINavigationItem" ref="719745349"/>
- <int key="IBUISystemItemIdentifier">9</int>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- </object>
- </object>
- <object class="IBUIToolbar" id="872721022">
- <reference key="NSNextResponder" ref="662500735"/>
- <int key="NSvFlags">266</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUISwitch" id="241745124">
- <reference key="NSNextResponder" ref="872721022"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{584, 9}, {94, 27}}</string>
- <reference key="NSSuperview" ref="872721022"/>
- <bool key="IBUIOpaque">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIContentHorizontalAlignment">0</int>
- <int key="IBUIContentVerticalAlignment">0</int>
- </object>
- </object>
- <string key="NSFrame">{{0, 960}, {768, 44}}</string>
- <reference key="NSSuperview" ref="662500735"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIBarStyle">1</int>
- <object class="NSMutableArray" key="IBUIItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBUIBarButtonItem" id="732530149">
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <reference key="IBUIToolbar" ref="872721022"/>
- <int key="IBUISystemItemIdentifier">5</int>
- </object>
- <object class="IBUIBarButtonItem" id="829573230">
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <float key="IBUIWidth">55</float>
- <reference key="IBUIToolbar" ref="872721022"/>
- <int key="IBUISystemItemIdentifier">6</int>
- </object>
- <object class="IBUIBarButtonItem" id="780237299">
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIStyle">1</int>
- <reference key="IBUICustomView" ref="241745124"/>
- <reference key="IBUIToolbar" ref="872721022"/>
- </object>
- <object class="IBUIBarButtonItem" id="247862273">
- <string key="IBUITitle">Server iP</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <int key="IBUIStyle">1</int>
- <reference key="IBUIToolbar" ref="872721022"/>
- </object>
- </object>
- </object>
- <object class="IBUILabel" id="65333785">
- <reference key="NSNextResponder" ref="662500735"/>
- <int key="NSvFlags">265</int>
- <string key="NSFrame">{{526, 967}, {49, 29}}</string>
- <reference key="NSSuperview" ref="662500735"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <int key="IBUIContentMode">7</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <string key="IBUIText">Pipe</string>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica</string>
- <double key="NSSize">24</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="IBUITextColor" ref="933040628"/>
- <reference key="IBUIHighlightedColor" ref="933040628"/>
- <int key="IBUIBaselineAdjustment">1</int>
- <float key="IBUIMinimumFontSize">10</float>
- <int key="IBUITextAlignment">1</int>
- </object>
- </object>
- <string key="NSFrameSize">{768, 1004}</string>
- <reference key="NSSuperview"/>
- <reference key="IBUIBackgroundColor" ref="933040628"/>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <reference key="IBUIToolbarItems" ref="0"/>
+ <object class="IBUINavigationController" key="IBUIDetailViewController" id="1006871283">
<reference key="IBUIParentViewController" ref="143532475"/>
+ <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
+ <int key="IBUIStatusBarStyle">2</int>
+ </object>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBUIHorizontal">NO</bool>
+ <object class="IBUINavigationBar" key="IBUINavigationBar" id="210980145">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{0, 0}</string>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIBarStyle">1</int>
+ </object>
+ <object class="NSMutableArray" key="IBUIViewControllers">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIViewController" id="659859393">
+ <object class="IBUIView" key="IBUIView" id="879616490">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIToolbar" id="1016878395">
+ <reference key="NSNextResponder" ref="879616490"/>
+ <int key="NSvFlags">-2147483382</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISwitch" id="822261752">
+ <reference key="NSNextResponder" ref="1016878395"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{584, 9}, {94, 27}}</string>
+ <reference key="NSSuperview" ref="1016878395"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ </object>
+ </object>
+ <string key="NSFrame">{{0, 916}, {768, 44}}</string>
+ <reference key="NSSuperview" ref="879616490"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIBarStyle">1</int>
+ <object class="NSMutableArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIBarButtonItem" id="565718">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <reference key="IBUIToolbar" ref="1016878395"/>
+ <int key="IBUISystemItemIdentifier">5</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="328568987">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <float key="IBUIWidth">306</float>
+ <reference key="IBUIToolbar" ref="1016878395"/>
+ <int key="IBUISystemItemIdentifier">6</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="267525560">
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUICustomView" ref="822261752"/>
+ <reference key="IBUIToolbar" ref="1016878395"/>
+ </object>
+ <object class="IBUIBarButtonItem" id="377478105">
+ <string key="IBUITitle">Server iP</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUIToolbar" ref="1016878395"/>
+ </object>
+ </object>
+ </object>
+ <object class="IBUILabel" id="706652129">
+ <reference key="NSNextResponder" ref="879616490"/>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{525, 923}, {49, 29}}</string>
+ <reference key="NSSuperview" ref="879616490"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <string key="IBUIText">Pipe</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">24</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="IBUITextColor" ref="933040628"/>
+ <reference key="IBUIHighlightedColor" ref="933040628"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUITextAlignment">1</int>
+ </object>
+ </object>
+ <string key="NSFrameSize">{768, 960}</string>
+ <reference key="NSSuperview"/>
+ <reference key="IBUIBackgroundColor" ref="933040628"/>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <reference key="IBUIToolbarItems" ref="0"/>
+ <object class="IBUINavigationItem" key="IBUINavigationItem" id="245890386">
+ <reference key="IBUINavigationBar"/>
+ <string key="IBUITitle">Title</string>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ </object>
+ <reference key="IBUIParentViewController" ref="1006871283"/>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">1</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIHorizontal">NO</bool>
+ </object>
+ </object>
</object>
</object>
+ <object class="IBUITableViewController" id="714935080">
+ <object class="IBUITableView" key="IBUIView" id="999117554">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{184, 202}, {400, 600}}</string>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAgMAA</bytes>
+ </object>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIAlwaysBounceVertical">YES</bool>
+ <int key="IBUIStyle">1</int>
+ <int key="IBUISeparatorStyle">2</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">10</float>
+ </object>
+ <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
+ <int key="IBUIStatusBarStyle">2</int>
+ </object>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="interfaceOrientation">1</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIHorizontal">NO</bool>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -271,14 +304,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">fNavigationBar</string>
- <reference key="source" ref="324576857"/>
- <reference key="destination" ref="532491637"/>
- </object>
- <int key="connectionID">83</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">fRoot</string>
<reference key="source" ref="143532475"/>
<reference key="destination" ref="714382558"/>
@@ -287,14 +312,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">fDetail</string>
- <reference key="source" ref="143532475"/>
- <reference key="destination" ref="324576857"/>
- </object>
- <int key="connectionID">86</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">rootViewController</string>
<reference key="source" ref="62075450"/>
<reference key="destination" ref="143532475"/>
@@ -318,37 +335,53 @@
<int key="connectionID">93</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">fPrintButton</string>
- <reference key="source" ref="324576857"/>
- <reference key="destination" ref="271380391"/>
- </object>
- <int key="connectionID">95</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">printContent:</string>
- <reference key="source" ref="271380391"/>
- <reference key="destination" ref="324576857"/>
- </object>
- <int key="connectionID">96</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">usePipe:</string>
- <reference key="source" ref="241745124"/>
- <reference key="destination" ref="324576857"/>
+ <reference key="source" ref="822261752"/>
+ <reference key="destination" ref="659859393"/>
<int key="IBEventType">13</int>
</object>
- <int key="connectionID">110</int>
+ <int key="connectionID">159</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">enterServerIP:</string>
- <reference key="source" ref="247862273"/>
- <reference key="destination" ref="324576857"/>
+ <reference key="source" ref="377478105"/>
+ <reference key="destination" ref="659859393"/>
</object>
- <int key="connectionID">129</int>
+ <int key="connectionID">161</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">fNavigationBar</string>
+ <reference key="source" ref="659859393"/>
+ <reference key="destination" ref="210980145"/>
+ </object>
+ <int key="connectionID">171</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">fDetail</string>
+ <reference key="source" ref="143532475"/>
+ <reference key="destination" ref="659859393"/>
+ </object>
+ <int key="connectionID">172</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="999117554"/>
+ <reference key="destination" ref="714935080"/>
+ </object>
+ <int key="connectionID">191</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="999117554"/>
+ <reference key="destination" ref="714935080"/>
+ </object>
+ <int key="connectionID">192</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -390,7 +423,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="524408385"/>
- <reference ref="324576857"/>
+ <reference ref="1006871283"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -405,15 +438,6 @@
<reference key="parent" ref="143532475"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">54</int>
- <reference key="object" ref="324576857"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="662500735"/>
- </object>
- <reference key="parent" ref="143532475"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">55</int>
<reference key="object" ref="714382558"/>
<object class="NSMutableArray" key="children">
@@ -434,89 +458,112 @@
<reference key="parent" ref="714382558"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">63</int>
- <reference key="object" ref="662500735"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="532491637"/>
- <reference ref="872721022"/>
- <reference ref="65333785"/>
- </object>
- <reference key="parent" ref="324576857"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">89</int>
<reference key="object" ref="805122470"/>
<reference key="parent" ref="714382558"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">64</int>
- <reference key="object" ref="532491637"/>
+ <int key="objectID">138</int>
+ <reference key="object" ref="1006871283"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="719745349"/>
+ <reference ref="659859393"/>
+ <reference ref="210980145"/>
</object>
- <reference key="parent" ref="662500735"/>
+ <reference key="parent" ref="143532475"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">71</int>
- <reference key="object" ref="719745349"/>
+ <int key="objectID">142</int>
+ <reference key="object" ref="659859393"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="271380391"/>
+ <reference ref="245890386"/>
+ <reference ref="879616490"/>
</object>
- <reference key="parent" ref="532491637"/>
+ <reference key="parent" ref="1006871283"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">94</int>
- <reference key="object" ref="271380391"/>
- <reference key="parent" ref="719745349"/>
+ <int key="objectID">140</int>
+ <reference key="object" ref="210980145"/>
+ <reference key="parent" ref="1006871283"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">106</int>
- <reference key="object" ref="872721022"/>
+ <int key="objectID">162</int>
+ <reference key="object" ref="245890386"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="732530149"/>
- <reference ref="829573230"/>
- <reference ref="780237299"/>
- <reference ref="247862273"/>
</object>
- <reference key="parent" ref="662500735"/>
+ <reference key="parent" ref="659859393"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">113</int>
- <reference key="object" ref="732530149"/>
- <reference key="parent" ref="872721022"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">123</int>
- <reference key="object" ref="65333785"/>
- <reference key="parent" ref="662500735"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">126</int>
- <reference key="object" ref="829573230"/>
- <reference key="parent" ref="872721022"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">109</int>
- <reference key="object" ref="780237299"/>
+ <int key="objectID">143</int>
+ <reference key="object" ref="879616490"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="241745124"/>
+ <reference ref="1016878395"/>
+ <reference ref="706652129"/>
</object>
- <reference key="parent" ref="872721022"/>
+ <reference key="parent" ref="659859393"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">108</int>
- <reference key="object" ref="241745124"/>
- <reference key="parent" ref="780237299"/>
+ <int key="objectID">147</int>
+ <reference key="object" ref="706652129"/>
+ <reference key="parent" ref="879616490"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">127</int>
- <reference key="object" ref="247862273"/>
- <reference key="parent" ref="872721022"/>
+ <int key="objectID">146</int>
+ <reference key="object" ref="1016878395"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="565718"/>
+ <reference ref="328568987"/>
+ <reference ref="267525560"/>
+ <reference ref="377478105"/>
+ </object>
+ <reference key="parent" ref="879616490"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">151</int>
+ <reference key="object" ref="565718"/>
+ <reference key="parent" ref="1016878395"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">150</int>
+ <reference key="object" ref="328568987"/>
+ <reference key="parent" ref="1016878395"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">149</int>
+ <reference key="object" ref="267525560"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="822261752"/>
+ </object>
+ <reference key="parent" ref="1016878395"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">148</int>
+ <reference key="object" ref="377478105"/>
+ <reference key="parent" ref="1016878395"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">152</int>
+ <reference key="object" ref="822261752"/>
+ <reference key="parent" ref="267525560"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">185</int>
+ <reference key="object" ref="714935080"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="999117554"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">190</int>
+ <reference key="object" ref="999117554"/>
+ <reference key="parent" ref="714935080"/>
</object>
</object>
</object>
@@ -526,78 +573,80 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
- <string>106.IBPluginDependency</string>
- <string>106.IBViewBoundsToFrameTransform</string>
- <string>108.IBPluginDependency</string>
- <string>113.IBPluginDependency</string>
- <string>123.IBPluginDependency</string>
- <string>123.IBViewBoundsToFrameTransform</string>
- <string>126.IBPluginDependency</string>
- <string>127.IBPluginDependency</string>
+ <string>138.IBEditorWindowLastContentRect</string>
+ <string>138.IBPluginDependency</string>
+ <string>140.IBPluginDependency</string>
+ <string>142.CustomClassName</string>
+ <string>142.IBPluginDependency</string>
+ <string>143.CustomClassName</string>
+ <string>143.IBPluginDependency</string>
+ <string>143.IBViewBoundsToFrameTransform</string>
+ <string>146.IBPluginDependency</string>
+ <string>146.IBViewBoundsToFrameTransform</string>
+ <string>147.IBPluginDependency</string>
+ <string>147.IBViewBoundsToFrameTransform</string>
+ <string>148.IBPluginDependency</string>
+ <string>150.IBPluginDependency</string>
+ <string>151.IBPluginDependency</string>
+ <string>152.IBPluginDependency</string>
+ <string>185.IBEditorWindowLastContentRect</string>
+ <string>185.IBPluginDependency</string>
+ <string>190.IBPluginDependency</string>
<string>2.IBEditorWindowLastContentRect</string>
<string>2.IBPluginDependency</string>
<string>52.CustomClassName</string>
<string>52.IBEditorWindowLastContentRect</string>
<string>52.IBPluginDependency</string>
<string>53.IBPluginDependency</string>
- <string>54.CustomClassName</string>
- <string>54.IBPluginDependency</string>
<string>55.CustomClassName</string>
<string>55.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
<string>57.IBPluginDependency</string>
<string>6.CustomClassName</string>
<string>6.IBPluginDependency</string>
- <string>63.CustomClassName</string>
- <string>63.IBPluginDependency</string>
- <string>63.IBViewBoundsToFrameTransform</string>
- <string>64.IBPluginDependency</string>
- <string>64.IBViewBoundsToFrameTransform</string>
- <string>71.IBPluginDependency</string>
<string>89.IBPluginDependency</string>
- <string>94.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIApplication</string>
<string>UIResponder</string>
+ <string>{{335, 4}, {768, 1024}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>SkUIDetailViewController</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>SkUIView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAxDqAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAxGsAAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABD8AAAxHiAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABD74AAxGlgAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>{{269, 480}, {768, 1024}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>{{125, 4}, {768, 1024}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>SkUISplitViewController</string>
- <string>{{-34, 57}, {768, 1024}}</string>
+ <string>{{35, 4}, {783, 1002}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>SkUIDetailViewController</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>SkUIRootViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>AppDelegate_iPad</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>SkUIView_shell</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAxDqAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAwigAAA</bytes>
- </object>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
@@ -617,7 +666,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">129</int>
+ <int key="maxID">193</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -670,14 +719,12 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>enterServerIP:</string>
- <string>printContent:</string>
<string>usePipe:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
- <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -685,7 +732,6 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>enterServerIP:</string>
- <string>printContent:</string>
<string>usePipe:</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -695,50 +741,25 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
- <string key="name">printContent:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
<string key="name">usePipe:</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>fNavigationBar</string>
- <string>fPrintButton</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UINavigationBar</string>
- <string>UIBarButtonItem</string>
- </object>
+ <string key="NS.key.0">fNavigationBar</string>
+ <string key="NS.object.0">UINavigationBar</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>fNavigationBar</string>
- <string>fPrintButton</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">fNavigationBar</string>
- <string key="candidateClassName">UINavigationBar</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">fPrintButton</string>
- <string key="candidateClassName">UIBarButtonItem</string>
- </object>
+ <string key="NS.key.0">fNavigationBar</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">fNavigationBar</string>
+ <string key="candidateClassName">UINavigationBar</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">SkUIDetailViewController.h</string>
+ <string key="minorKey">Shared/SkUIDetailViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -746,7 +767,7 @@
<string key="superclassName">UITableViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">SkUIRootViewController.h</string>
+ <string key="minorKey">Shared/SkUIRootViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -790,11 +811,11 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">SkUIView_shell</string>
+ <string key="className">SkUIView</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">SkUIView_shell.h</string>
+ <string key="minorKey">Shared/SkUIView.h</string>
</object>
</object>
</object>
@@ -874,6 +895,20 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
</object>
</object>