Skip to content

Commit

Permalink
Merge branch 'master' of github.com:deepwinter/Wildflowers-of-Detroit…
Browse files Browse the repository at this point in the history 
…-IPhone-App
  • Loading branch information
Deepwinter committed Mar 12, 2012
2 parents 4ea501f + 014a575 commit f4ebfc6
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 18 deletions.
Binary file modified Targets/Squirrels/Loading.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Targets/Squirrels/Loadingx2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 25 additions & 18 deletions Wildflowers of Detroit Iphone/MapViewController.xib
View file
Expand Up @@ -12,13 +12,13 @@
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBUIView</string>
<string>IBUIImageView</string>
<string>IBUILabel</string>
<string>IBProxyObject</string>
<string>IBUITextView</string>
<string>IBUIImageView</string>
<string>IBMKMapView</string>
<string>IBUIScrollView</string>
<string>IBUIButton</string>
<string>IBUILabel</string>
<string>IBUITextView</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
Expand Down Expand Up @@ -64,6 +64,7 @@
<string key="NSFrame">{{439, 0}, {42, 47}}</string>
<reference key="NSSuperview" ref="1042458868"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
Expand Down Expand Up @@ -355,6 +356,7 @@
<string key="NSFrame">{{0, 6}, {480, 48}}</string>
<reference key="NSSuperview" ref="410460167"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
Expand Down Expand Up @@ -431,7 +433,7 @@
<object class="IBUIButton" id="846218631">
<reference key="NSNextResponder" ref="490449960"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{431.5, 20}, {25, 25}}</string>
<string key="NSFrame">{{425, 14}, {30, 39}}</string>
<reference key="NSSuperview" ref="490449960"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="180854801"/>
Expand Down Expand Up @@ -497,6 +499,7 @@
<string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
Expand Down Expand Up @@ -525,6 +528,7 @@
<string key="NSFrameSize">{480, 320}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
Expand Down Expand Up @@ -552,6 +556,7 @@
<string key="NSFrame">{{138, 41}, {68, 22}}</string>
<reference key="NSSuperview" ref="412910088"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="922124063"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
Expand All @@ -571,9 +576,10 @@
<object class="IBUIButton" id="165621378">
<reference key="NSNextResponder" ref="412910088"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{437, 96}, {22, 22}}</string>
<string key="NSFrame">{{425, 110}, {30, 30}}</string>
<reference key="NSSuperview" ref="412910088"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
Expand All @@ -594,7 +600,7 @@
<object class="IBUIButton" id="922124063">
<reference key="NSNextResponder" ref="412910088"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{430.5, 17}, {25, 25}}</string>
<string key="NSFrame">{{421, 10}, {30, 39}}</string>
<reference key="NSSuperview" ref="412910088"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="306372015"/>
Expand All @@ -615,7 +621,7 @@
<object class="IBUIButton" id="306372015">
<reference key="NSNextResponder" ref="412910088"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{436.5, 55}, {23, 23}}</string>
<string key="NSFrame">{{425, 62}, {30, 29}}</string>
<reference key="NSSuperview" ref="412910088"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="165621378"/>
Expand All @@ -642,7 +648,7 @@
<string key="NSFrame">{{136, 9}, {261, 24}}</string>
<reference key="NSSuperview" ref="412910088"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="922124063"/>
<reference key="NSNextKeyView" ref="435343376"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
Expand Down Expand Up @@ -701,12 +707,13 @@
<string key="NSFrame">{{20, 84}, {322, 64}}</string>
<reference key="NSSuperview" ref="113063239"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
</object>
<bool key="IBUIClipsSubviews">YES</bool>
<float key="IBUIAlpha">0.5</float>
<float key="IBUIAlpha">0.75</float>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIEditable">NO</bool>
Expand Down Expand Up @@ -1306,11 +1313,6 @@
<reference key="parent" ref="412910088"/>
<string key="objectName">UpAndOut</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">83</int>
<reference key="object" ref="165621378"/>
<reference key="parent" ref="412910088"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">81</int>
<reference key="object" ref="670918665"/>
Expand Down Expand Up @@ -1353,6 +1355,11 @@
<reference key="object" ref="435343376"/>
<reference key="parent" ref="412910088"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">83</int>
<reference key="object" ref="165621378"/>
<reference key="parent" ref="412910088"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
Expand Down Expand Up @@ -1579,9 +1586,9 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="MenuReturnButton.png">{21, 23}</string>
<string key="galleryButton.png">{22, 22}</string>
<string key="info.png">{22, 22}</string>
<string key="MenuReturnButton.png">{30, 39}</string>
<string key="galleryButton.png">{30, 30}</string>
<string key="info.png">{30, 29}</string>
<string key="infoBack.png">{369, 214}</string>
<string key="timelineBack.png">{480, 47}</string>
<string key="timelinePlaceholder.png">{480, 49}</string>
Expand Down

0 comments on commit f4ebfc6

Please sign in to comment.