From b23a4ecf0a5544894a6ce5effe248fa273e7f574 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Thu, 11 Jul 2013 20:44:30 -0700 Subject: Fixed Xcode 4.6 compatibility --- .../gtm-oauth2/Source/Mac/GTMOAuth2Window.xib | 669 +++++++++++++++++---- .../gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib | 264 +++----- 2 files changed, 631 insertions(+), 302 deletions(-) (limited to 'example/common') diff --git a/example/common/gtm-oauth2/Source/Mac/GTMOAuth2Window.xib b/example/common/gtm-oauth2/Source/Mac/GTMOAuth2Window.xib index befc2123..2d707a2c 100644 --- a/example/common/gtm-oauth2/Source/Mac/GTMOAuth2Window.xib +++ b/example/common/gtm-oauth2/Source/Mac/GTMOAuth2Window.xib @@ -1,109 +1,560 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + 1050 + 12E55 + 4457.6 + 1187.39 + 626.00 + + 4457.6 + 3330 + + + NSButton + NSButtonCell + NSCustomObject + NSUserDefaultsController + NSView + NSWindowTemplate + WebView + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.WebKitIBPlugin + + + PluginDependencyRecalculationVersion + + + + + GTMOAuth2WindowController + + + FirstResponder + + + NSApplication + + + 11 + 2 + {{74, 707}, {515, 419}} + 536870912 + Sign In + NSWindow + + + {475, 290} + + + 1792 + + + + 1810 + + + Apple HTML pasteboard type + Apple PDF pasteboard type + Apple URL pasteboard type + Apple Web Archive pasteboard type + NSColor pasteboard type + NSFilenamesPboardType + NSStringPboardType + NeXT RTFD pasteboard type + NeXT Rich Text Format v1.0 pasteboard type + NeXT TIFF v4.0 pasteboard type + WebURLsWithTitlesPboardType + public.png + public.url + public.url-name + + {{0, 20}, {515, 399}} + + + + + + + + + YES + YES + + + + 1825 + + {{479, 0}, {16, 19}} + + YES + + 67108864 + 134217728 + + + LucidaGrande + 13 + 1044 + + + -2041823232 + 134 + + NSImage + NSStopProgressTemplate + + + Gw + 400 + 75 + + NO + + + + 1825 + + {{437, 0}, {16, 19}} + + YES + + 67108864 + 134217728 + + + + -2041823232 + 134 + + NSImage + NSGoLeftTemplate + + + + 400 + 75 + + NO + + + + 1825 + + {{456, 0}, {16, 19}} + + YES + + 67108864 + 134217728 + + + + -2042347520 + 134 + + NSImage + NSGoRightTemplate + + + + 400 + 75 + + NO + + + + 1828 + + {{2, 1}, {429, 18}} + + YES + + -2080374784 + 131072 + Stay signed in to this account + + LucidaGrande + 11 + 3100 + + + 1211912448 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 400 + 75 + + NO + + + + {515, 419} + + {{0, 0}, {1920, 1178}} + {475, 312} + {10000000000000, 10000000000000} + YES + + + YES + + + + NO + + + + closeWindow: + + + + 42 + + + + keychainCheckbox + + + + 46 + + + + webBackButton + + + + 47 + + + + webCloseButton + + + + 48 + + + + webView + + + + 49 + + + + window + + + + 8 + + + + delegate + + + + 7 + + + + goBack: + + + + 28 + + + + goForward: + + + + 29 + + + + webView.canGoBack + + + + + + enabled: webView.canGoBack + enabled + webView.canGoBack + 2 + + + 31 + + + + webView.canGoForward + + + + + + enabled: webView.canGoForward + enabled + webView.canGoForward + 2 + + + 35 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 3 + + + + + + + + 4 + + + + + + + + + + + + 5 + + + + + 17 + + + + + + + + 18 + + + + + 19 + + + + + + + + 20 + + + + + 26 + + + + + + + + 27 + + + + + 43 + + + + + + + + 44 + + + + + 32 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.WebKitIBPlugin + + + + + + + + + + + + GTMOAuth2WindowController + NSWindowController + + closeWindow: + id + + + closeWindow: + + closeWindow: + id + + + + id + id + NSButton + id + NSButton + NSButton + WebView + + + + completionPlaceholder_ + id + + + delegate_ + id + + + keychainCheckbox + NSButton + + + userData_ + id + + + webBackButton + NSButton + + + webCloseButton + NSButton + + + webView + WebView + + + + IBProjectSource + ./Classes/GTMOAuth2WindowController.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {9, 9} + {9, 9} + {11, 11} + {15, 15} + + + diff --git a/example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib b/example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib index 4f91fa4a..d8cb21c8 100644 --- a/example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib +++ b/example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib @@ -1,17 +1,16 @@ - + 1024 - 12C60 - 2840 - 1187.34 - 625.00 + 12E55 + 4457.6 + 1187.39 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 3682.6 - - YES + IBProxyObject IBUIActivityIndicatorView IBUIBarButtonItem @@ -19,17 +18,15 @@ IBUINavigationItem IBUIView IBUIWebView - - - YES + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + PluginDependencyRecalculationVersion - - YES + IBFilesOwner IBCocoaTouchFramework @@ -47,16 +44,14 @@ 1 - + 292 - - YES + 292 {30, 30} - NO NO @@ -95,8 +90,6 @@ 292 {{30, 0}, {30, 30}} - - NO NO IBCocoaTouchFramework @@ -114,10 +107,8 @@ - + {60, 30} - - 3 @@ -132,16 +123,14 @@ IBCocoaTouchFramework - + 274 - - YES + 274 {320, 460} - 1 @@ -158,8 +147,6 @@ 301 {{150, 115}, {20, 20}} - - _NS:9 NO IBCocoaTouchFramework @@ -167,10 +154,8 @@ YES 2 - + {320, 460} - - 3 @@ -181,17 +166,17 @@ IBCocoaTouchFramework - + - - YES + NO + rightBarButtonItem - 20 + 20 @@ -199,7 +184,7 @@ - 22 + 22 @@ -207,7 +192,7 @@ - 25 + 25 @@ -215,7 +200,7 @@ - 26 + 26 @@ -223,7 +208,7 @@ - 28 + 28 @@ -231,7 +216,7 @@ - 29 + 29 @@ -239,7 +224,7 @@ - 33 + 33 @@ -247,7 +232,7 @@ - 9 + 9 @@ -255,7 +240,7 @@ - 14 + 14 @@ -264,7 +249,7 @@ 7 - 18 + 18 @@ -273,206 +258,99 @@ 7 - 19 + 19 - + - - YES + - 0 - - YES - + 0 + - -1 + -1 File's Owner - -2 + -2 - 6 + 6 - - YES - + - 10 + 10 - 15 + 15 - - YES + - + - 16 + 16 - 17 + 17 - 27 + 27 - - YES + - + - 4 + 4 - 31 + 31 - - - - YES - - YES - -1.CustomClassName - -1.IBPluginDependency - -2.CustomClassName - -2.IBPluginDependency - 10.IBPluginDependency - 15.IBPluginDependency - 16.IBPluginDependency - 17.IBPluginDependency - 27.IBPluginDependency - 31.IBPluginDependency - 4.IBPluginDependency - 6.IBPluginDependency - - - YES - GTMOAuth2ViewControllerTouch - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - + + + GTMOAuth2ViewControllerTouch + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + - - YES - - - + - 33 - - - - YES - - GTMOAuth2ViewControllerTouch - UIViewController - - YES - - YES - backButton - forwardButton - initialActivityIndicator - navButtonsView - rightBarButtonItem - webView - - - YES - UIButton - UIButton - UIActivityIndicatorView - UIView - UIBarButtonItem - UIWebView - - - - YES - - YES - backButton - forwardButton - initialActivityIndicator - navButtonsView - rightBarButtonItem - webView - - - YES - - backButton - UIButton - - - forwardButton - UIButton - - - initialActivityIndicator - UIActivityIndicatorView - - - navButtonsView - UIView - - - rightBarButtonItem - UIBarButtonItem - - - webView - UIWebView - - - - - IBProjectSource - ./Classes/GTMOAuth2ViewControllerTouch.h - - - + 0 IBCocoaTouchFramework @@ -481,14 +359,14 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - + YES 3 - 1926 + 3682.6 -- cgit v1.2.3