diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m index 3b1b14d1d..c4bb59b23 100644 --- a/Classes/AboutViewController.m +++ b/Classes/AboutViewController.m @@ -68,7 +68,9 @@ [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"Linphone Core %s", linphone_core_get_version()]]; - [LinphoneUtils adjustFontSize:self.view mult:2.22f]; + if([LinphoneManager runningOnIpad]) { + [LinphoneUtils adjustFontSize:self.view mult:2.22f]; + } } diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib index f19ee71bd..920daf8ea 100644 --- a/Classes/AboutViewController.xib +++ b/Classes/AboutViewController.xib @@ -63,6 +63,7 @@ _NS:9 + 1 NO IBCocoaTouchFramework @@ -105,7 +106,7 @@ 319 - {{20, 187}, {280, 44}} + {{20, 200}, {280, 44}} @@ -134,7 +135,7 @@ 319 - {{20, 138}, {280, 21}} + {{20, 150}, {280, 21}} @@ -163,7 +164,7 @@ 319 - {{20, 158}, {280, 21}} + {{20, 172}, {280, 21}} @@ -185,7 +186,7 @@ 319 - {{20, 269}, {280, 21}} + {{20, 300}, {280, 21}} @@ -210,7 +211,7 @@ 319 - {{20, 225}, {280, 36}} + {{20, 244}, {280, 36}} @@ -231,7 +232,7 @@ 280 - {320, 310} + {320, 341} @@ -508,10 +509,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/ChatRoomViewController.h b/Classes/ChatRoomViewController.h index ceec945ee..4f45e8982 100644 --- a/Classes/ChatRoomViewController.h +++ b/Classes/ChatRoomViewController.h @@ -55,7 +55,7 @@ @property (nonatomic, retain) IBOutlet UIButton* cancelTransferButton; @property (nonatomic, retain) IBOutlet UIProgressView* imageTransferProgressBar; @property (nonatomic, retain) IBOutlet UIView* transferView; - +@property (nonatomic, retain) IBOutlet UIView* waitView; - (IBAction)onBackClick:(id)event; - (IBAction)onEditClick:(id)event; diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index 713c8fc07..ba859ffda 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -45,7 +45,7 @@ @synthesize imageTransferProgressBar; @synthesize cancelTransferButton; @synthesize transferView; - +@synthesize waitView; #pragma mark - Lifecycle Functions @@ -86,6 +86,7 @@ [cancelTransferButton release]; [imageQualities release]; + [waitView release]; [super dealloc]; } @@ -170,6 +171,7 @@ static UICompositeViewDescription *compositeDescription = nil; BOOL fileSharingEnabled = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"] != NULL && [[[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"] length]>0; [pictureButton setEnabled:fileSharingEnabled]; + [waitView setHidden:TRUE]; } - (void)viewWillDisappear:(BOOL)animated { @@ -329,21 +331,34 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta - (void)chooseImageQuality:(UIImage*)image url:(NSURL*)url { DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Choose the compression", nil)]; - for(NSString *key in [imageQualities allKeys]) { - NSAutoreleasePool *p = [[NSAutoreleasePool alloc] init]; - NSNumber *number = [imageQualities objectForKey:key]; - NSData *data = UIImageJPEGRepresentation(image, [number floatValue]); - NSNumber *size = [NSNumber numberWithInteger:[data length]]; - - NSString *text = [NSString stringWithFormat:@"%@ (%@)", key, [size toHumanReadableSize]]; - [sheet addButtonWithTitle:text block:^(){ + [waitView setHidden:FALSE]; + + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + for(NSString *key in [imageQualities allKeys]) { + NSAutoreleasePool *p = [[NSAutoreleasePool alloc] init]; + NSNumber *number = [imageQualities objectForKey:key]; NSData *data = UIImageJPEGRepresentation(image, [number floatValue]); - [self chatRoomStartImageUpload:[UIImage imageWithData:data] url:url]; - }]; - - [p drain]; - } - [sheet showInView:[PhoneMainView instance].view]; + NSNumber *size = [NSNumber numberWithInteger:[data length]]; + + NSString *text = [NSString stringWithFormat:@"%@ (%@)", key, [size toHumanReadableSize]]; + [sheet addButtonWithTitle:text block:^(){ + [waitView setHidden:FALSE]; + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + NSData *data = UIImageJPEGRepresentation(image, [number floatValue]); + dispatch_async(dispatch_get_main_queue(), ^{ + [waitView setHidden:TRUE]; + [self chatRoomStartImageUpload:[UIImage imageWithData:data] url:url]; + }); + }); + }]; + + [p drain]; + } + dispatch_async(dispatch_get_main_queue(), ^{ + [waitView setHidden:TRUE]; + [sheet showInView:[PhoneMainView instance].view]; + }); + }); } @@ -455,10 +470,13 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [messageField resignFirstResponder]; [ImagePickerViewController promptSelectSource:^(UIImagePickerControllerSourceType type) { - UICompositeViewDescription *description = [[[ImagePickerViewController compositeViewDescription] copy] autorelease]; - description.tabBar = nil; // Disable default tarbar - description.tabBarEnabled = false; - ImagePickerViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:description push:TRUE], ImagePickerViewController); + UICompositeViewDescription *description = [ImagePickerViewController compositeViewDescription]; + ImagePickerViewController *controller; + if([LinphoneManager runningOnIpad]) { + controller = DYNAMIC_CAST([[PhoneMainView instance].mainViewController getCachedController:description.content], ImagePickerViewController); + } else { + controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:description push:TRUE], ImagePickerViewController); + } if(controller != nil) { controller.sourceType = type; @@ -470,6 +488,11 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta // trimming movies. To instead show the controls, use YES. controller.allowsEditing = NO; controller.imagePickerDelegate = self; + + if([LinphoneManager runningOnIpad]) { + CGRect rect = [self.messageView convertRect:[pictureButton frame] toView:self.view]; + [controller.popoverController presentPopoverFromRect:rect inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:FALSE]; + } } }]; } @@ -588,6 +611,15 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta #pragma mark ImagePickerDelegate - (void)imagePickerDelegateImage:(UIImage*)image info:(NSDictionary *)info { + // Dismiss popover on iPad + if([LinphoneManager runningOnIpad]) { + UICompositeViewDescription *description = [ImagePickerViewController compositeViewDescription]; + ImagePickerViewController *controller = DYNAMIC_CAST([[PhoneMainView instance].mainViewController getCachedController:description.content], ImagePickerViewController); + if(controller != nil) { + [controller.popoverController dismissPopoverAnimated:TRUE]; + } + } + image = [image normalizedImage]; NSURL *url = [info valueForKey:UIImagePickerControllerReferenceURL]; if(url != nil) { diff --git a/Classes/ImagePickerViewController.h b/Classes/ImagePickerViewController.h index fd15af4bc..1138b8b2e 100644 --- a/Classes/ImagePickerViewController.h +++ b/Classes/ImagePickerViewController.h @@ -28,14 +28,13 @@ @interface ImagePickerViewController : UIViewController { @private UIImagePickerController *pickerController; - UIPopoverController *popoverController; } @property(nonatomic, retain) id imagePickerDelegate; @property(nonatomic) UIImagePickerControllerSourceType sourceType; @property(nonatomic,copy) NSArray *mediaTypes; @property(nonatomic) BOOL allowsEditing; - +@property(nonatomic, readonly) UIPopoverController *popoverController; + (void)promptSelectSource:(void (^)(UIImagePickerControllerSourceType))block; @end diff --git a/Classes/ImagePickerViewController.m b/Classes/ImagePickerViewController.m index 1e364c3e0..29530f27c 100644 --- a/Classes/ImagePickerViewController.m +++ b/Classes/ImagePickerViewController.m @@ -21,12 +21,14 @@ #import "PhoneMainView.h" #import "DTActionSheet.h" + @implementation ImagePickerViewController @synthesize imagePickerDelegate; @synthesize sourceType; @synthesize mediaTypes; @synthesize allowsEditing; +@synthesize popoverController; #pragma mark - Lifecycle Functions @@ -99,6 +101,8 @@ static UICompositeViewDescription *compositeDescription = nil; } else if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) { [pickerController viewDidAppear:animated]; } + [[UIApplication sharedApplication] setStatusBarHidden:NO]; //Fix UIImagePickerController status bar hide + [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque]; //Fix UIImagePickerController status bar style change } - (void)viewDidDisappear:(BOOL)animated { @@ -197,8 +201,10 @@ static UICompositeViewDescription *compositeDescription = nil; animated:(BOOL)animated { if ([navigationController isKindOfClass:[UIImagePickerController class]]) { - [[UIApplication sharedApplication] setStatusBarHidden:NO]; + [[UIApplication sharedApplication] setStatusBarHidden:NO]; //Fix UIImagePickerController status bar hide + [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque]; //Fix UIImagePickerController status bar style change } } + @end diff --git a/Classes/ImageSharing.m b/Classes/ImageSharing.m index 403addd20..e853e54f8 100644 --- a/Classes/ImageSharing.m +++ b/Classes/ImageSharing.m @@ -73,7 +73,7 @@ - (void)cancel { [connection cancel]; - [LinphoneLogger log:LinphoneLoggerLog format:@"File transfer [%@] interrupted by user", [connection.currentRequest.URL absoluteString]]; + [LinphoneLogger log:LinphoneLoggerLog format:@"File transfer interrupted by user"]; if(delegate) { [delegate imageSharingAborted:self]; } @@ -152,7 +152,7 @@ - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { NSHTTPURLResponse * httpResponse = (NSHTTPURLResponse *) response; statusCode = httpResponse.statusCode; - [LinphoneLogger log:LinphoneLoggerLog format:@"File transfer status code [%i]",statusCode]; + [LinphoneLogger log:LinphoneLoggerLog format:@"File transfer status code [%i]", statusCode]; if (statusCode == 200 && !upload) { totalBytesExpectedToRead = [response expectedContentLength]; diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 092798f78..2537e7949 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -237,6 +237,7 @@ } else if([notification.userInfo objectForKey:@"chat"] != nil) { NSString *remoteContact = (NSString*)[notification.userInfo objectForKey:@"chat"]; // Go to ChatRoom view + [[PhoneMainView instance] changeCurrentView:[ChatViewController compositeViewDescription]]; ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController); if(controller != nil) { [controller setRemoteAddress:remoteContact]; diff --git a/Classes/LinphoneUI/UICompositeViewController.h b/Classes/LinphoneUI/UICompositeViewController.h index a401e68ad..ec1a1cbfb 100644 --- a/Classes/LinphoneUI/UICompositeViewController.h +++ b/Classes/LinphoneUI/UICompositeViewController.h @@ -71,6 +71,7 @@ - (void)setFullScreen:(BOOL) enabled; - (void)setStateBarHidden:(BOOL) hidden; - (void)setToolBarHidden:(BOOL) hidden; +- (UIViewController *)getCachedController:(NSString*)name; - (UIViewController *)getCurrentViewController; - (UIInterfaceOrientation)currentOrientation; #ifdef DEBUG diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.m b/Classes/LinphoneUI/UIContactDetailsHeader.m index 5d5c027b5..3815842ce 100644 --- a/Classes/LinphoneUI/UIContactDetailsHeader.m +++ b/Classes/LinphoneUI/UIContactDetailsHeader.m @@ -247,7 +247,13 @@ - (IBAction)onAvatarClick:(id)event { if(self.isEditing) { [ImagePickerViewController promptSelectSource:^(UIImagePickerControllerSourceType type) { - ImagePickerViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ImagePickerViewController compositeViewDescription] push:TRUE], ImagePickerViewController); + UICompositeViewDescription *description = [ImagePickerViewController compositeViewDescription]; + ImagePickerViewController *controller; + if([LinphoneManager runningOnIpad]) { + controller = DYNAMIC_CAST([[PhoneMainView instance].mainViewController getCachedController:description.content], ImagePickerViewController); + } else { + controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:description push:TRUE], ImagePickerViewController); + } if(controller != nil) { controller.sourceType = type; @@ -259,6 +265,10 @@ // trimming movies. To instead show the controls, use YES. controller.allowsEditing = NO; controller.imagePickerDelegate = self; + + if([LinphoneManager runningOnIpad]) { + [controller.popoverController presentPopoverFromRect:[avatarImage frame] inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:FALSE]; + } } }]; } @@ -268,6 +278,14 @@ #pragma mark - ContactDetailsImagePickerDelegate Functions - (void)imagePickerDelegateImage:(UIImage*)image info:(NSDictionary *)info{ + // Dismiss popover on iPad + if([LinphoneManager runningOnIpad]) { + UICompositeViewDescription *description = [ImagePickerViewController compositeViewDescription]; + ImagePickerViewController *controller = DYNAMIC_CAST([[PhoneMainView instance].mainViewController getCachedController:description.content], ImagePickerViewController); + if(controller != nil) { + [controller.popoverController dismissPopoverAnimated:TRUE]; + } + } NSError* error = NULL; if(!ABPersonRemoveImageData(contact, (CFErrorRef*)error)) { [LinphoneLogger log:LinphoneLoggerLog format:@"Can't remove entry: %@", [error localizedDescription]]; diff --git a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib index c5069b9d0..cf2310c07 100644 --- a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib @@ -370,63 +370,7 @@ 23 - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - + 0 IBCocoaTouchFramework diff --git a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib index 6d0e3738d..cf2e3c1c2 100644 --- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib @@ -420,63 +420,7 @@ AAgACAAIAAEAAQABAAE 23 - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - + 0 IBCocoaTouchFramework diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 5b70fbe01..9d0fe62e6 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -148,7 +148,6 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)viewDidLoad { [super viewDidLoad]; if([LinphoneManager runningOnIpad]) { - [LinphoneUtils adjustFontSize:welcomeView mult:2.22f]; [LinphoneUtils adjustFontSize:choiceView mult:2.22f]; [LinphoneUtils adjustFontSize:createAccountView mult:2.22f]; diff --git a/Classes/en.lproj/ChatRoomViewController.xib b/Classes/en.lproj/ChatRoomViewController.xib index 7aa878b4c..04d79fd23 100644 --- a/Classes/en.lproj/ChatRoomViewController.xib +++ b/Classes/en.lproj/ChatRoomViewController.xib @@ -12,6 +12,7 @@ IBProxyObject + IBUIActivityIndicatorView IBUIButton IBUIImageView IBUILabel @@ -497,6 +498,39 @@ IBCocoaTouchFramework + + + -2147483374 + + + + 301 + {{142, 211}, {37, 37}} + + + NO + NO + NO + IBCocoaTouchFramework + NO + YES + 0 + + + {320, 460} + + + + + 3 + MSAwLjY2AA + + 2 + + + NO + IBCocoaTouchFramework + {320, 460} @@ -648,6 +682,14 @@ 90 + + + waitView + + + + 93 + dataSource @@ -743,6 +785,7 @@ + @@ -894,6 +937,21 @@ messageField + + 91 + + + + + + waitView + + + 92 + + + activityIndicator + @@ -933,12 +991,14 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 90 + 93 @@ -1009,6 +1069,7 @@ ChatRoomTableViewController UIImageView UIView + UIView @@ -1075,6 +1136,10 @@ transferView UIView + + waitView + UIView + IBProjectSource diff --git a/Classes/en.lproj/FirstLoginViewController.xib b/Classes/en.lproj/FirstLoginViewController.xib index 992646430..63e616932 100644 --- a/Classes/en.lproj/FirstLoginViewController.xib +++ b/Classes/en.lproj/FirstLoginViewController.xib @@ -43,9 +43,10 @@ YES - 292 + 301 {{33, 312}, {255, 50}} + _NS:9 NO @@ -89,9 +90,10 @@ - -2147483356 + -2147483379 {{60, 420}, {200, 37}} + NO NO IBCocoaTouchFramework @@ -120,9 +122,10 @@ - 292 + 301 {{60, 170}, {200, 31}} + NO NO @@ -162,9 +165,10 @@ - 292 + 301 {{60, 220}, {200, 31}} + NO NO @@ -195,14 +199,15 @@ - -2147483356 + -2147483374 YES - 292 + 301 {{142, 211}, {37, 37}} + NO NO @@ -215,6 +220,7 @@ {320, 460} + 3 @@ -227,6 +233,7 @@ {320, 460} + _NS:9 @@ -446,7 +453,104 @@ 66 - + + + YES + + FirstLoginViewController + UIViewController + + YES + + YES + onLoginClick: + onSiteClick: + + + YES + id + id + + + + YES + + YES + onLoginClick: + onSiteClick: + + + YES + + onLoginClick: + id + + + onSiteClick: + id + + + + + YES + + YES + loginButton + passwordField + siteButton + usernameField + waitView + + + YES + UIButton + UITextField + UIButton + UITextField + UIView + + + + YES + + YES + loginButton + passwordField + siteButton + usernameField + waitView + + + YES + + loginButton + UIButton + + + passwordField + UITextField + + + siteButton + UIButton + + + usernameField + UITextField + + + waitView + UIView + + + + + IBProjectSource + ./Classes/FirstLoginViewController.h + + + + 0 IBCocoaTouchFramework diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib index 736ff8d10..e2e39de44 100644 --- a/Classes/fr.lproj/ChatRoomViewController.xib +++ b/Classes/fr.lproj/ChatRoomViewController.xib @@ -16,6 +16,7 @@ IBUILabel IBProxyObject IBUIProgressView + IBUIActivityIndicatorView IBUITableViewController IBUITableView IBUIButton @@ -478,6 +479,37 @@ IBCocoaTouchFramework + + + -2147483374 + + + + 301 + {{142, 211}, {37, 37}} + + NO + NO + NO + IBCocoaTouchFramework + NO + YES + 0 + + + {320, 460} + + + + 3 + MSAwLjY2AA + + 2 + + + NO + IBCocoaTouchFramework + {320, 460} @@ -627,6 +659,14 @@ 90 + + + waitView + + + + 93 + dataSource @@ -722,6 +762,7 @@ + @@ -873,6 +914,21 @@ messageField + + 91 + + + + + + waitView + + + 92 + + + activityIndicator + @@ -912,12 +968,14 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 90 + 93 @@ -988,6 +1046,7 @@ ChatRoomTableViewController UIImageView UIView + UIView @@ -1054,6 +1113,10 @@ transferView UIView + + waitView + UIView + IBProjectSource diff --git a/Classes/fr.lproj/FirstLoginViewController.xib b/Classes/fr.lproj/FirstLoginViewController.xib index 31720be7e..05e168819 100644 --- a/Classes/fr.lproj/FirstLoginViewController.xib +++ b/Classes/fr.lproj/FirstLoginViewController.xib @@ -43,7 +43,7 @@ YES - 292 + 301 {{33, 312}, {255, 50}} @@ -89,7 +89,7 @@ - -2147483356 + -2147483379 {{60, 420}, {200, 37}} NO @@ -120,7 +120,7 @@ - 292 + 301 {{60, 170}, {200, 31}} @@ -162,7 +162,7 @@ - 292 + 301 {{60, 220}, {200, 31}} @@ -195,12 +195,12 @@ - -2147483356 + -2147483374 YES - 292 + 301 {{142, 211}, {37, 37}} @@ -445,7 +445,104 @@ 66 - + + + YES + + FirstLoginViewController + UIViewController + + YES + + YES + onLoginClick: + onSiteClick: + + + YES + id + id + + + + YES + + YES + onLoginClick: + onSiteClick: + + + YES + + onLoginClick: + id + + + onSiteClick: + id + + + + + YES + + YES + loginButton + passwordField + siteButton + usernameField + waitView + + + YES + UIButton + UITextField + UIButton + UITextField + UIView + + + + YES + + YES + loginButton + passwordField + siteButton + usernameField + waitView + + + YES + + loginButton + UIButton + + + passwordField + UITextField + + + siteButton + UIButton + + + usernameField + UITextField + + + waitView + UIView + + + + + IBProjectSource + ./Classes/FirstLoginViewController.h + + + + 0 IBCocoaTouchFramework diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index f41aa5b96..2f190d764 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -337,17 +337,17 @@ backup - 34 + 36 class BLWrapperHandle name - Classes/ChatRoomViewController/34/ChatRoomViewController.xib + Classes/ChatRoomViewController/36/ChatRoomViewController.xib change date - 2012-09-24T12:35:35Z + 2012-09-24T14:48:31Z changed values class @@ -357,7 +357,7 @@ flags 0 hash - 721bad8bcdaf6bd6dabf3d41eaf915d4 + c57c7e4815f8a5c1d2b7c5200f742dd5 name ChatRoomViewController.xib @@ -793,9 +793,9 @@ versions en - 34 + 36 fr - 34 + 36 @@ -803,17 +803,17 @@ backup - 14 + 15 class BLWrapperHandle name - Classes/ChatViewController/14/ChatViewController.xib + Classes/ChatViewController/15/ChatViewController.xib change date - 2012-09-21T14:10:39Z + 2012-09-24T14:43:23Z changed values class @@ -1038,9 +1038,9 @@ versions en - 14 + 15 fr - 14 + 15 @@ -2481,17 +2481,17 @@ backup - 3 + 4 class BLWrapperHandle name - Classes/FirstLoginViewController/3/FirstLoginViewController.xib + Classes/FirstLoginViewController/4/FirstLoginViewController.xib change date - 2012-09-20T15:21:48Z + 2012-09-24T14:43:15Z changed values class @@ -2501,7 +2501,7 @@ flags 0 hash - 683cfa0503d04d09dd67daf0e7a58035 + 40d122862f8d0146f59a09192ffbcffe name FirstLoginViewController.xib @@ -2665,9 +2665,9 @@ versions en - 3 + 4 fr - 3 + 4 @@ -10451,17 +10451,17 @@ backup - 2 + 3 class BLWrapperHandle name - LinphoneUI/UIContactDetailsHeader/2/UIContactDetailsHeader.xib + LinphoneUI/UIContactDetailsHeader/3/UIContactDetailsHeader.xib change date - 2012-09-20T15:24:01Z + 2012-09-24T14:05:12Z changed values class @@ -10471,7 +10471,7 @@ flags 0 hash - 5c771336b97589e59711a5c00dc7d3bc + e226222023500a3518ea1b00959f6716 name UIContactDetailsHeader.xib @@ -10558,9 +10558,9 @@ versions en - 2 + 3 fr - 2 + 3 diff --git a/linphone.ldb/Resources/Classes/ChatRoomViewController/34/ChatRoomViewController.xib b/linphone.ldb/Resources/Classes/ChatRoomViewController/36/ChatRoomViewController.xib similarity index 94% rename from linphone.ldb/Resources/Classes/ChatRoomViewController/34/ChatRoomViewController.xib rename to linphone.ldb/Resources/Classes/ChatRoomViewController/36/ChatRoomViewController.xib index 7aa878b4c..04d79fd23 100644 --- a/linphone.ldb/Resources/Classes/ChatRoomViewController/34/ChatRoomViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/36/ChatRoomViewController.xib @@ -12,6 +12,7 @@ IBProxyObject + IBUIActivityIndicatorView IBUIButton IBUIImageView IBUILabel @@ -497,6 +498,39 @@ IBCocoaTouchFramework + + + -2147483374 + + + + 301 + {{142, 211}, {37, 37}} + + + NO + NO + NO + IBCocoaTouchFramework + NO + YES + 0 + + + {320, 460} + + + + + 3 + MSAwLjY2AA + + 2 + + + NO + IBCocoaTouchFramework + {320, 460} @@ -648,6 +682,14 @@ 90 + + + waitView + + + + 93 + dataSource @@ -743,6 +785,7 @@ + @@ -894,6 +937,21 @@ messageField + + 91 + + + + + + waitView + + + 92 + + + activityIndicator + @@ -933,12 +991,14 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 90 + 93 @@ -1009,6 +1069,7 @@ ChatRoomTableViewController UIImageView UIView + UIView @@ -1075,6 +1136,10 @@ transferView UIView + + waitView + UIView + IBProjectSource diff --git a/linphone.ldb/Resources/Classes/ChatViewController/14/ChatViewController.xib b/linphone.ldb/Resources/Classes/ChatViewController/15/ChatViewController.xib similarity index 100% rename from linphone.ldb/Resources/Classes/ChatViewController/14/ChatViewController.xib rename to linphone.ldb/Resources/Classes/ChatViewController/15/ChatViewController.xib diff --git a/linphone.ldb/Resources/Classes/FirstLoginViewController/3/FirstLoginViewController.xib b/linphone.ldb/Resources/Classes/FirstLoginViewController/4/FirstLoginViewController.xib similarity index 82% rename from linphone.ldb/Resources/Classes/FirstLoginViewController/3/FirstLoginViewController.xib rename to linphone.ldb/Resources/Classes/FirstLoginViewController/4/FirstLoginViewController.xib index 992646430..63e616932 100644 --- a/linphone.ldb/Resources/Classes/FirstLoginViewController/3/FirstLoginViewController.xib +++ b/linphone.ldb/Resources/Classes/FirstLoginViewController/4/FirstLoginViewController.xib @@ -43,9 +43,10 @@ YES - 292 + 301 {{33, 312}, {255, 50}} + _NS:9 NO @@ -89,9 +90,10 @@ - -2147483356 + -2147483379 {{60, 420}, {200, 37}} + NO NO IBCocoaTouchFramework @@ -120,9 +122,10 @@ - 292 + 301 {{60, 170}, {200, 31}} + NO NO @@ -162,9 +165,10 @@ - 292 + 301 {{60, 220}, {200, 31}} + NO NO @@ -195,14 +199,15 @@ - -2147483356 + -2147483374 YES - 292 + 301 {{142, 211}, {37, 37}} + NO NO @@ -215,6 +220,7 @@ {320, 460} + 3 @@ -227,6 +233,7 @@ {320, 460} + _NS:9 @@ -446,7 +453,104 @@ 66 - + + + YES + + FirstLoginViewController + UIViewController + + YES + + YES + onLoginClick: + onSiteClick: + + + YES + id + id + + + + YES + + YES + onLoginClick: + onSiteClick: + + + YES + + onLoginClick: + id + + + onSiteClick: + id + + + + + YES + + YES + loginButton + passwordField + siteButton + usernameField + waitView + + + YES + UIButton + UITextField + UIButton + UITextField + UIView + + + + YES + + YES + loginButton + passwordField + siteButton + usernameField + waitView + + + YES + + loginButton + UIButton + + + passwordField + UITextField + + + siteButton + UIButton + + + usernameField + UITextField + + + waitView + UIView + + + + + IBProjectSource + ./Classes/FirstLoginViewController.h + + + + 0 IBCocoaTouchFramework diff --git a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/2/UIContactDetailsHeader.xib b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/3/UIContactDetailsHeader.xib similarity index 87% rename from linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/2/UIContactDetailsHeader.xib rename to linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/3/UIContactDetailsHeader.xib index c5069b9d0..cf2310c07 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/2/UIContactDetailsHeader.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/3/UIContactDetailsHeader.xib @@ -370,63 +370,7 @@ 23 - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - + 0 IBCocoaTouchFramework