From 3bc235e264cceed549619ed8f023c39bf77380d1 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 25 Apr 2012 14:19:49 +0200 Subject: [PATCH] Yann's update of firstloginview --- Classes/FirstLoginViewController.m | 16 +- Classes/FirstLoginViewController.xib | 582 ++++++--------------------- 2 files changed, 141 insertions(+), 457 deletions(-) diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m index b91450b65..69ae3149d 100644 --- a/Classes/FirstLoginViewController.m +++ b/Classes/FirstLoginViewController.m @@ -89,8 +89,8 @@ } -(void) displayRegisteredFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain { [[NSUserDefaults standardUserDefaults] setBool:false forKey:@"enable_first_login_view_preference"]; - [self.parentViewController dismissModalViewControllerAnimated:true]; [self.activityIndicator setHidden:true]; + [self dismissModalViewControllerAnimated:YES]; } -(void) displayRegisteringFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain { [self.activityIndicator setHidden:false]; @@ -99,13 +99,13 @@ [self.activityIndicator setHidden:true]; //default behavior if no registration delegates - UIAlertView* error = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:@"Registration failure for user %@",user] - message:reason - delegate:nil - cancelButtonTitle:@"Continue" - otherButtonTitles:nil ,nil]; - [error show]; - [error release]; + //UIAlertView* error = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:@"Registration failure for user %@",user] + // message:reason + // delegate:nil + // cancelButtonTitle:@"Continue" + // otherButtonTitles:nil ,nil]; + //[error show]; + //[error release]; //erase uername passwd [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"username_preference"]; [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"password_preference"]; diff --git a/Classes/FirstLoginViewController.xib b/Classes/FirstLoginViewController.xib index ef6a7d25e..5ab733adc 100644 --- a/Classes/FirstLoginViewController.xib +++ b/Classes/FirstLoginViewController.xib @@ -2,30 +2,31 @@ 784 - 10J567 - 823 - 1038.35 - 462.00 + 10K549 + 1938 + 1038.36 + 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 132 + 933 - + YES - + IBUIView + IBUIImageView + IBUIViewController + IBProxyObject + IBUIActivityIndicatorView + IBUITextField + IBUIButton YES com.apple.InterfaceBuilder.IBCocoaTouchPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -48,27 +49,28 @@ 292 {{0, -20}, {360, 480}} + NO NO 9 NO IBCocoaTouchFramework + + NSImage + wallpaper_iphone_320x480.png + - 292 - {{25, 319}, {184, 37}} + -2147483356 + {{60, 400}, {200, 37}} + NO NO IBCocoaTouchFramework 0 0 - - Helvetica-Bold - 15 - 16 - 3 MQA @@ -81,18 +83,32 @@ 3 MC41AA + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 - {{105, 75}, {197, 31}} + {{60, 200}, {200, 31}} + NO NO IBCocoaTouchFramework + 0 0 3 + Password 3 MAA @@ -108,37 +124,29 @@ YES IBCocoaTouchFramework - - - - 292 - {{9, 80}, {100, 21}} - - NO - YES - NO - IBCocoaTouchFramework - Password* - - 1 - MCAwIDAAA + + 1 + 12 + + + Helvetica + 12 + 16 - - 1 - NO - 10 292 - {{105, 34}, {197, 31}} + {{60, 150}, {200, 31}} + NO NO IBCocoaTouchFramework 0 3 + Username 3 MAA @@ -150,46 +158,41 @@ 1 IBCocoaTouchFramework - - - - 292 - {{9, 40}, {100, 21}} - - - 3 - MCAwAA - - NO - YES - NO - IBCocoaTouchFramework - Username* - - - 1 - NO - 10 + + 292 - {{105, 154}, {195, 37}} + {{60, 300}, {200, 37}} + NO NO IBCocoaTouchFramework 0 0 - 1 - login + Login - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + 5 + MSAwLjY2MDAwMDAyNjIgMCAwAA + + 3 + + 1 0.66 0 0 1 + + 2 + 2 + + + Helvetica-Bold + 18 + 16 + @@ -201,6 +204,7 @@ 292 {{142, 211}, {37, 37}} + NO NO NO @@ -212,17 +216,19 @@ {320, 460} + 3 - MQA + MSAwLjY2AA NO IBCocoaTouchFramework - {320, 460} + {{0, 20}, {320, 460}} + 3 MQA @@ -233,6 +239,7 @@ + 1 1 IBCocoaTouchFramework @@ -258,6 +265,38 @@ 15 + + + activityIndicator + + + + 33 + + + + username + + + + 38 + + + + site + + + + 36 + + + + delegate + + + + 39 + delegate @@ -275,22 +314,6 @@ 20 - - - activityIndicator - - - - 33 - - - - site - - - - 36 - doOk: @@ -300,29 +323,15 @@ 37 - - - username - - - - 38 - - - - delegate - - - - 39 - YES 0 - + + YES + @@ -355,8 +364,6 @@ - - @@ -373,28 +380,12 @@ username - - 35 - - - site - 8 passwd - - 9 - - - - - 7 - - - 5 @@ -415,6 +406,12 @@ + + 35 + + + site + @@ -422,58 +419,40 @@ YES -1.CustomClassName + -1.IBPluginDependency -2.CustomClassName - 1.IBEditorWindowLastContentRect + -2.IBPluginDependency 1.IBPluginDependency 1.IBUserGuides - 1.IBViewBoundsToFrameTransform 12.IBPluginDependency - 12.IBViewBoundsToFrameTransform - 31.IBEditorWindowLastContentRect + 12.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 31.IBPluginDependency - 31.IBViewBoundsToFrameTransform 32.IBPluginDependency 35.IBPluginDependency - 4.IBEditorWindowLastContentRect 4.IBPluginDependency - 4.IBViewEditorWindowController.showingBoundsRectangles 5.IBPluginDependency 6.IBPluginDependency - 7.IBPluginDependency 8.IBPluginDependency - 9.IBPluginDependency YES FirstLoginViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder - {{444, 412}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin YES - 105 + 104 0 - - P4AAAL+AAAAAAAAAw+UAAA - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDUgAAw7EAAA - - {{193, 650}, {320, 460}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw+UAAA - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{85, 91}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -484,316 +463,18 @@ YES - - YES - + YES - - YES - + - 53 - - - - YES - - FirstLoginViewController - UIViewController - - doOk: - id - - - doOk: - - doOk: - id - - - - YES - - YES - activityIndicator - ok - passwd - site - username - - - YES - UIView - UIButton - UITextField - UIButton - UITextField - - - - YES - - YES - activityIndicator - ok - passwd - site - username - - - YES - - activityIndicator - UIView - - - ok - UIButton - - - passwd - UITextField - - - site - UIButton - - - username - UITextField - - - - - IBProjectSource - Classes/FirstLoginViewController.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIActivityIndicatorView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIActivityIndicatorView.h - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIImageView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIImageView.h - - - - UILabel - UIView - - IBFrameworkSource - UIKit.framework/Headers/UILabel.h - - - - UIResponder - NSObject - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UITextField - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIPrintFormatter.h - - - - UIView - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - + 54 + 0 IBCocoaTouchFramework @@ -802,15 +483,18 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 YES - ../linphone.xcodeproj 3 - 132 + + wallpaper_iphone_320x480.png + {320, 480} + + 933