RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] Remove invalid referencies in xibs.

Browse source
This commit is contained in:
vng 2012-10-12 13:47:39 +03:00 • committed by Alex Zolotarev
parent c0609621ac
commit a3ffc32707
4 changed files with 102 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Classes/MapViewController.h
View file

@ -39,8 +39,8 @@
-(BOOL) OnProcessURL:(NSString*)url;
@property (nonatomic, retain) IBOutlet UIButton * m_myPositionButton;
@property (nonatomic, retain) IBOutlet UIButton * m_searchButton;
@property (nonatomic, retain) IBOutlet UIButton * m_downloadButton;
@property (nonatomic, retain) IBOutlet UIButton * m_bookmarksButton;
//@property (nonatomic, retain) IBOutlet UIButton * m_searchButton;
//@property (nonatomic, retain) IBOutlet UIButton * m_downloadButton;
//@property (nonatomic, retain) IBOutlet UIButton * m_bookmarksButton;
@end

7
iphone/Maps/Classes/MapViewController.mm
View file

@ -13,12 +13,13 @@
#include "Framework.h"
#include "RenderContext.hpp"
@implementation MapViewController
@synthesize m_myPositionButton;
@synthesize m_searchButton;
@synthesize m_downloadButton;
@synthesize m_bookmarksButton;
//@synthesize m_searchButton;
//@synthesize m_downloadButton;
//@synthesize m_bookmarksButton;
//********************************************************************************************
//*********************** Callbacks from LocationManager *************************************

41
iphone/Maps/MainWindow.xib
View file

@ -2,20 +2,20 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1024</int>
<string key="IBDocument.SystemVersion">12C54</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</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>
<string key="NS.object.0">1926</string>
<string key="NS.object.0">933</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUICustomObject</string>
<string>IBUIView</string>
<string>IBUIViewController</string>
<string>IBUIButton</string>
<string>IBUIView</string>
<string>IBProxyObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -49,7 +49,6 @@
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="773974234"/>
<string key="NSReuseIdentifierKey">_NS:222</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -97,8 +96,6 @@
<string key="NSFrame">{{160, 435}, {40, 40}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:222</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -128,7 +125,6 @@
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="803813744"/>
<string key="NSReuseIdentifierKey">_NS:222</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -158,7 +154,6 @@
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="23888313"/>
<string key="NSReuseIdentifierKey">_NS:222</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -230,22 +225,6 @@
</object>
<int key="connectionID">209</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_downloadButton</string>
<reference key="source" ref="963277495"/>
<reference key="destination" ref="773974234"/>
</object>
<int key="connectionID">220</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_searchButton</string>
<reference key="source" ref="963277495"/>
<reference key="destination" ref="23888313"/>
</object>
<int key="connectionID">221</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnMyPositionClicked:</string>
@ -500,7 +479,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1536" key="NS.object.0"/>
<real value="1280" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@ -519,6 +498,6 @@
<string key="search-highlighted.png">{48, 48}</string>
<string key="search.png">{48, 48}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1926</string>
<string key="IBCocoaTouchPluginVersion">933</string>
</data>
</archive>

116
iphone/Maps/Resources-iPad/MainWindow-iPad.xib
View file

@ -2,20 +2,20 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1024</int>
<string key="IBDocument.SystemVersion">12C54</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</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>
<string key="NS.object.0">1926</string>
<string key="NS.object.0">933</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUICustomObject</string>
<string>IBUIView</string>
<string>IBUIViewController</string>
<string>IBUIButton</string>
<string>IBUIView</string>
<string>IBProxyObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -46,8 +46,8 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{22, 899}, {44, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="832785650"/>
<string key="NSReuseIdentifierKey">_NS:237</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@ -93,8 +93,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{214, 899}, {44, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:237</string>
<reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@ -121,8 +120,8 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{86, 899}, {44, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="68084817"/>
<string key="NSReuseIdentifierKey">_NS:237</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@ -149,8 +148,8 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{150, 899}, {44, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="312081333"/>
<string key="NSReuseIdentifierKey">_NS:237</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@ -175,6 +174,7 @@
</array>
<string key="NSFrameSize">{768, 960}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="82412579"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@ -219,22 +219,6 @@
</object>
<int key="connectionID">196</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_searchButton</string>
<reference key="source" ref="963277495"/>
<reference key="destination" ref="312081333"/>
</object>
<int key="connectionID">198</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_downloadButton</string>
<reference key="source" ref="963277495"/>
<reference key="destination" ref="832785650"/>
</object>
<int key="connectionID">199</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnMyPositionClicked:</string>
@ -366,6 +350,14 @@
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">EAGLView</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/EAGLView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
<dictionary class="NSMutableDictionary" key="actions">
@ -392,6 +384,68 @@
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MapViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="OnBookmarksClicked:">id</string>
<string key="OnMyPositionClicked:">id</string>
<string key="OnSearchClicked:">id</string>
<string key="OnSettingsClicked:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="OnBookmarksClicked:">
<string key="name">OnBookmarksClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="OnMyPositionClicked:">
<string key="name">OnMyPositionClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="OnSearchClicked:">
<string key="name">OnSearchClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="OnSettingsClicked:">
<string key="name">OnSettingsClicked:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">m_myPositionButton</string>
<string key="NS.object.0">UIButton</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">m_myPositionButton</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">m_myPositionButton</string>
<string key="candidateClassName">UIButton</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MapViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MapsAppDelegate</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">m_mapViewController</string>
<string key="NS.object.0">MapViewController</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">m_mapViewController</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">m_mapViewController</string>
<string key="candidateClassName">MapViewController</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MapsAppDelegate.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
@ -402,7 +456,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1536" key="NS.object.0"/>
<real value="1280" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@ -421,6 +475,6 @@
<string key="search-highlighted.png">{48, 48}</string>
<string key="search.png">{48, 48}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1926</string>
<string key="IBCocoaTouchPluginVersion">933</string>
</data>
</archive>