diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib index 920daf8ea..ed5d7e7d4 100644 --- a/Classes/AboutViewController.xib +++ b/Classes/AboutViewController.xib @@ -41,8 +41,6 @@ 268 {320, 460} - - _NS:9 YES YES @@ -60,7 +58,6 @@ 311 {{124, 20}, {72, 72}} - _NS:9 1 @@ -76,7 +73,6 @@ 319 {{20, 100}, {280, 50}} - _NS:9 NO @@ -108,7 +104,6 @@ 319 {{20, 200}, {280, 44}} - NO YES @@ -137,7 +132,6 @@ 319 {{20, 150}, {280, 21}} - _NS:9 NO @@ -166,7 +160,6 @@ 319 {{20, 172}, {280, 21}} - _NS:9 NO @@ -188,8 +181,6 @@ 319 {{20, 300}, {280, 21}} - - NO YES 7 @@ -213,7 +204,6 @@ 319 {{20, 244}, {280, 36}} - _NS:9 NO @@ -234,7 +224,6 @@ {320, 341} - _NS:9 @@ -426,83 +415,7 @@ 68 - - - YES - - AboutViewController - UIViewController - - onLinkTap: - id - - - onLinkTap: - - onLinkTap: - id - - - - YES - - YES - contentView - linkLabel - linkTapGestureRecognizer - linphoneCoreVersionLabel - linphoneIphoneVersionLabel - - - YES - UIView - UILabel - UITapGestureRecognizer - UILabel - UILabel - - - - YES - - YES - contentView - linkLabel - linkTapGestureRecognizer - linphoneCoreVersionLabel - linphoneIphoneVersionLabel - - - YES - - contentView - UIView - - - linkLabel - UILabel - - - linkTapGestureRecognizer - UITapGestureRecognizer - - - linphoneCoreVersionLabel - UILabel - - - linphoneIphoneVersionLabel - UILabel - - - - - IBProjectSource - ./Classes/AboutViewController.h - - - - + 0 IBCocoaTouchFramework diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index 8f934f7e8..5531f3bef 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -332,9 +332,9 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta - (void)saveAndSend:(UIImage*)image url:(NSURL*)url { if(url == nil) { [waitView setHidden:FALSE]; - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{ [[LinphoneManager instance].photoLibrary writeImageToSavedPhotosAlbum:image.CGImage - metadata:nil + orientation:(ALAssetOrientation)[image imageOrientation] completionBlock:^(NSURL *assetURL, NSError *error){ dispatch_async(dispatch_get_main_queue(), ^{ [waitView setHidden:TRUE]; @@ -361,12 +361,12 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta } } -- (void)chooseImageQuality:(UIImage*)original_image url:(NSURL*)url { +- (void)chooseImageQuality:(UIImage*)image url:(NSURL*)url { [waitView setHidden:FALSE]; DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Choose the compression", nil)]; - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - UIImage *image = [original_image normalizedImage]; + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{ + //UIImage *image = [original_image normalizedImage]; for(NSString *key in [imageQualities allKeys]) { NSNumber *number = [imageQualities objectForKey:key]; NSData *data = UIImageJPEGRepresentation(image, [number floatValue]); @@ -492,7 +492,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta - (IBAction)onPictureClick:(id)event { [messageField resignFirstResponder]; - [ImagePickerViewController promptSelectSource:^(UIImagePickerControllerSourceType type) { + void (^block)(UIImagePickerControllerSourceType) = ^(UIImagePickerControllerSourceType type) { UICompositeViewDescription *description = [ImagePickerViewController compositeViewDescription]; ImagePickerViewController *controller; if([LinphoneManager runningOnIpad]) { @@ -517,7 +517,22 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [controller.popoverController presentPopoverFromRect:rect inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:FALSE]; } } - }]; + }; + + DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source",nil)] autorelease]; + if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) { + [sheet addButtonWithTitle:NSLocalizedString(@"Camera",nil) block:^(){ + block(UIImagePickerControllerSourceTypeCamera); + }]; + } + if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) { + [sheet addButtonWithTitle:NSLocalizedString(@"Photo library",nil) block:^(){ + block(UIImagePickerControllerSourceTypePhotoLibrary); + }]; + } + [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel",nil)]; + + [sheet showInView:[PhoneMainView instance].view]; } - (IBAction)onTransferCancelClick:(id)event { @@ -607,7 +622,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta ChatModel *chat = (ChatModel *)[imageSharing userInfo]; [[LinphoneManager instance].photoLibrary writeImageToSavedPhotosAlbum:image.CGImage - metadata:nil + orientation:(ALAssetOrientation)[image imageOrientation] completionBlock:^(NSURL *assetURL, NSError *error){ if (error) { [LinphoneLogger log:LinphoneLoggerError format:@"Cannot save image data downloaded [%@]", [error localizedDescription]]; diff --git a/Classes/ImagePickerViewController.h b/Classes/ImagePickerViewController.h index 1138b8b2e..a5941ec42 100644 --- a/Classes/ImagePickerViewController.h +++ b/Classes/ImagePickerViewController.h @@ -35,6 +35,5 @@ @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 73d533731..38fe255f0 100644 --- a/Classes/ImagePickerViewController.m +++ b/Classes/ImagePickerViewController.m @@ -156,23 +156,6 @@ static UICompositeViewDescription *compositeDescription = nil; } } -+ (void)promptSelectSource:(void (^)(UIImagePickerControllerSourceType))block { - DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source",nil)] autorelease]; - if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) { - [sheet addButtonWithTitle:NSLocalizedString(@"Camera",nil) block:^(){ - block(UIImagePickerControllerSourceTypeCamera); - }]; - } - if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) { - [sheet addButtonWithTitle:NSLocalizedString(@"Photo library",nil) block:^(){ - block(UIImagePickerControllerSourceTypePhotoLibrary); - }]; - } - [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel",nil)]; - - [sheet showInView:[PhoneMainView instance].view]; -} - #pragma mark - UIImagePickerControllerDelegate Functions diff --git a/Classes/InCallTableViewController.m b/Classes/InCallTableViewController.m index f4c939c4a..2e2798824 100644 --- a/Classes/InCallTableViewController.m +++ b/Classes/InCallTableViewController.m @@ -193,6 +193,7 @@ enum TableSection { [[self tableView] reloadData]; } + #pragma mark - UITableViewDataSource Functions - (UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { diff --git a/Classes/LinphoneUI/UICallCell.h b/Classes/LinphoneUI/UICallCell.h index 3cf7e27b6..5fefb7bc5 100644 --- a/Classes/LinphoneUI/UICallCell.h +++ b/Classes/LinphoneUI/UICallCell.h @@ -22,9 +22,17 @@ #include "linphonecore.h" #include "UIPauseButton.h" +typedef enum _UICallCellOtherView { + UICallCellOtherView_Avatar = 0, + UICallCellOtherView_AudioStats, + UICallCellOtherView_VideoStats, + UICallCellOtherView_MAX +} UICallCellOtherView; + @interface UICallCellData : NSObject { @public bool minimize; + UICallCellOtherView view; LinphoneCall *call; } @@ -50,6 +58,33 @@ @property (nonatomic, retain) IBOutlet UIView* headerView; @property (nonatomic, retain) IBOutlet UIView* avatarView; +@property (nonatomic, retain) IBOutlet UIView* audioStatsView; + +@property (nonatomic, retain) IBOutlet UILabel* audioCodecLabel; +@property (nonatomic, retain) IBOutlet UILabel* audioCodecHeaderLabel; +@property (nonatomic, retain) IBOutlet UILabel* audioUploadBandwidthLabel; +@property (nonatomic, retain) IBOutlet UILabel* audioUploadBandwidthHeaderLabel; +@property (nonatomic, retain) IBOutlet UILabel* audioDownloadBandwidthLabel; +@property (nonatomic, retain) IBOutlet UILabel* audioDownloadBandwidthHeaderLabel; +@property (nonatomic, retain) IBOutlet UILabel* audioIceConnectivityLabel; +@property (nonatomic, retain) IBOutlet UILabel* audioIceConnectivityHeaderLabel; + +@property (nonatomic, retain) IBOutlet UIView* videoStatsView; + +@property (nonatomic, retain) IBOutlet UILabel* videoCodecLabel; +@property (nonatomic, retain) IBOutlet UILabel* videoCodecHeaderLabel; +@property (nonatomic, retain) IBOutlet UILabel* videoUploadBandwidthLabel; +@property (nonatomic, retain) IBOutlet UILabel* videoUploadBandwidthHeaderLabel; +@property (nonatomic, retain) IBOutlet UILabel* videoDownloadBandwidthLabel; +@property (nonatomic, retain) IBOutlet UILabel* videoDownloadBandwidthHeaderLabel; +@property (nonatomic, retain) IBOutlet UILabel* videoIceConnectivityLabel; +@property (nonatomic, retain) IBOutlet UILabel* videoIceConnectivityHeaderLabel; + +@property (nonatomic, retain) IBOutlet UIView* otherView; + +@property (nonatomic, retain) IBOutlet UISwipeGestureRecognizer *detailsLeftSwipeGestureRecognizer; +@property (nonatomic, retain) IBOutlet UISwipeGestureRecognizer *detailsRightSwipeGestureRecognizer; + @property (assign) BOOL firstCell; @property (assign) BOOL conferenceCell; @property (nonatomic, assign) BOOL currentCall; @@ -60,7 +95,8 @@ - (IBAction)doHeaderClick:(id)sender; - (IBAction)doRemoveClick:(id)sender; - +- (IBAction)doDetailsSwipe:(UISwipeGestureRecognizer *)sender; + + (int)getMaximizedHeight; + (int)getMinimizedHeight; diff --git a/Classes/LinphoneUI/UICallCell.m b/Classes/LinphoneUI/UICallCell.m index 92b32c186..6d484055e 100644 --- a/Classes/LinphoneUI/UICallCell.m +++ b/Classes/LinphoneUI/UICallCell.m @@ -30,6 +30,7 @@ self = [super init]; if(self != nil) { self->minimize = false; + self->view = UICallCellOtherView_Avatar; self->call = acall; } return self; @@ -53,10 +54,35 @@ @synthesize headerView; @synthesize avatarView; +@synthesize audioStatsView; + +@synthesize audioCodecLabel; +@synthesize audioCodecHeaderLabel; +@synthesize audioUploadBandwidthLabel; +@synthesize audioUploadBandwidthHeaderLabel; +@synthesize audioDownloadBandwidthLabel; +@synthesize audioDownloadBandwidthHeaderLabel; +@synthesize audioIceConnectivityLabel; +@synthesize audioIceConnectivityHeaderLabel; + +@synthesize videoStatsView; + +@synthesize videoCodecLabel; +@synthesize videoCodecHeaderLabel; +@synthesize videoUploadBandwidthLabel; +@synthesize videoUploadBandwidthHeaderLabel; +@synthesize videoDownloadBandwidthLabel; +@synthesize videoDownloadBandwidthHeaderLabel; +@synthesize videoIceConnectivityLabel; +@synthesize videoIceConnectivityHeaderLabel; + +@synthesize otherView; + @synthesize firstCell; @synthesize conferenceCell; @synthesize currentCall; - +@synthesize detailsLeftSwipeGestureRecognizer; +@synthesize detailsRightSwipeGestureRecognizer; #pragma mark - Lifecycle Functions @@ -74,53 +100,106 @@ forState:(UIControlStateHighlighted | UIControlStateSelected)]; self->currentCall = FALSE; + + self->detailsRightSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(doDetailsSwipe:)]; + [detailsRightSwipeGestureRecognizer setDirection:UISwipeGestureRecognizerDirectionLeft]; + [otherView addGestureRecognizer:detailsRightSwipeGestureRecognizer]; + + self->detailsRightSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(doDetailsSwipe:)]; + [detailsRightSwipeGestureRecognizer setDirection:UISwipeGestureRecognizerDirectionRight]; + [otherView addGestureRecognizer:detailsRightSwipeGestureRecognizer]; + + [self->avatarView setHidden:TRUE]; + [self->audioStatsView setHidden:TRUE]; + [self->videoStatsView setHidden:TRUE]; + + [UICallCell adaptSize:audioCodecHeaderLabel field:audioCodecLabel]; + [UICallCell adaptSize:audioDownloadBandwidthHeaderLabel field:audioDownloadBandwidthLabel]; + [UICallCell adaptSize:audioUploadBandwidthHeaderLabel field:audioUploadBandwidthLabel]; + [UICallCell adaptSize:audioIceConnectivityHeaderLabel field:audioIceConnectivityLabel]; + + [UICallCell adaptSize:videoCodecHeaderLabel field:videoCodecLabel]; + [UICallCell adaptSize:videoDownloadBandwidthHeaderLabel field:videoDownloadBandwidthLabel]; + [UICallCell adaptSize:videoUploadBandwidthHeaderLabel field:videoUploadBandwidthLabel]; + [UICallCell adaptSize:videoIceConnectivityHeaderLabel field:videoIceConnectivityLabel]; } return self; } - (void)dealloc { [headerBackgroundImage release]; + [headerBackgroundHighlightImage release]; + [addressLabel release]; [stateLabel release]; [stateImage release]; [avatarImage release]; + [pauseButton release]; + [removeButton release]; + [headerView release]; + [avatarView release]; + + [audioStatsView release]; + + [audioCodecLabel release]; + [audioCodecHeaderLabel release]; + [audioUploadBandwidthLabel release]; + [audioUploadBandwidthHeaderLabel release]; + [audioDownloadBandwidthLabel release]; + [audioDownloadBandwidthHeaderLabel release]; + [audioIceConnectivityLabel release]; + [audioIceConnectivityHeaderLabel release]; + + [videoStatsView release]; + + [videoCodecLabel release]; + [videoCodecHeaderLabel release]; + [videoUploadBandwidthLabel release]; + [videoUploadBandwidthHeaderLabel release]; + [videoDownloadBandwidthLabel release]; + [videoDownloadBandwidthHeaderLabel release]; + [videoIceConnectivityLabel release]; + [videoIceConnectivityHeaderLabel release]; + + [otherView release]; + [data release]; + + [detailsLeftSwipeGestureRecognizer release]; + [detailsRightSwipeGestureRecognizer release]; + [super dealloc]; } - (void)prepareForReuse { - [super prepareForReuse]; - currentCall = FALSE; - [headerBackgroundHighlightImage setAlpha:0.0f]; - [data release]; - data = nil; + } - #pragma mark - Properties Functions - (void)setData:(UICallCellData *)adata { - if(data !=nil) { + if(adata == data) { + return; + } + if(data != nil) { [data release]; data = nil; } - if(adata !=nil) { + if(adata != nil) { data = [adata retain]; + [self updateContact]; } - [self update]; } - (void)setCurrentCall:(BOOL) val { - BOOL oldVal = currentCall; currentCall = val; - if(oldVal != val) { - if (currentCall) { - [self startBlinkAnimation:@"Blink" target:headerBackgroundHighlightImage]; - } else { - [self stopBlinkAnimation:@"Blink" target:headerBackgroundHighlightImage]; - } + if (currentCall && ![self isBlinkAnimationRunning:@"blink" target:headerBackgroundHighlightImage]) { + [self startBlinkAnimation:@"blink" target:headerBackgroundHighlightImage]; + } + if (!currentCall && [self isBlinkAnimationRunning:@"blink" target:headerBackgroundHighlightImage]) { + [self stopBlinkAnimation:@"blink" target:headerBackgroundHighlightImage]; } } @@ -135,19 +214,70 @@ return 54; } -- (void)startBlinkAnimation:(NSString *)animationID target:(UIView *)target { - [UIView animateWithDuration:1.0 - delay: 0.0 - options: UIViewAnimationOptionRepeat | - UIViewAnimationOptionAutoreverse | - UIViewAnimationOptionAllowUserInteraction | - UIViewAnimationOptionCurveEaseIn - animations:^{ - [target setAlpha:1.0f]; - } - completion:^(BOOL finished){ - }]; ++ (void)adaptSize:(UILabel*)label field:(UIView*)field { + // + // Adapt size + // + CGRect labelFrame = [label frame]; + CGRect fieldFrame = [field frame]; + + fieldFrame.origin.x -= labelFrame.size.width; + + // Compute firstName size + CGSize contraints; + contraints.height = [label frame].size.height; + contraints.width = ([field frame].size.width + [field frame].origin.x) - [label frame].origin.x; + CGSize firstNameSize = [[label text] sizeWithFont:[label font] constrainedToSize: contraints]; + labelFrame.size.width = firstNameSize.width; + + // Compute lastName size & position + fieldFrame.origin.x += labelFrame.size.width; + fieldFrame.size.width = (contraints.width + [label frame].origin.x) - fieldFrame.origin.x; + + [label setFrame: labelFrame]; + [field setFrame: fieldFrame]; +} + ++ (NSString*)iceToString:(LinphoneIceState)state { + switch (state) { + case LinphoneIceStateNotActivated: + return NSLocalizedString(@"Not activated", @"ICE has not been activated for this call"); + break; + case LinphoneIceStateFailed: + return NSLocalizedString(@"Failed", @"ICE processing has failed"); + break; + case LinphoneIceStateInProgress: + return NSLocalizedString(@"In progress", @"ICE process is in progress"); + break; + case LinphoneIceStateHostConnection: + return NSLocalizedString(@"Direct connection", @"ICE has established a direct connection to the remote host"); + break; + case LinphoneIceStateReflexiveConnection: + return NSLocalizedString(@"NAT(s) connection", @"ICE has established a connection to the remote host through one or several NATs"); + break; + case LinphoneIceStateRelayConnection: + return NSLocalizedString(@"Relay connection", @"ICE has established a connection through a relay"); + break; + } +} + + +#pragma mark - Animation Functions + +- (void)startBlinkAnimation:(NSString *)animationID target:(UIView *)target { + CABasicAnimation *blink = [CABasicAnimation animationWithKeyPath:@"opacity"]; + blink.duration = 1.0; + blink.fromValue = [NSNumber numberWithDouble:0.0f]; + blink.toValue = [NSNumber numberWithDouble:1.0f]; + blink.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]; + blink.autoreverses = TRUE; + blink.repeatCount = HUGE_VALF; + [target.layer addAnimation:blink forKey:animationID]; +} + +- (BOOL)isBlinkAnimationRunning:(NSString *)animationID target:(UIView *)target { + return [target.layer animationForKey:animationID] != nil; } - (void)stopBlinkAnimation:(NSString *)animationID target:(UIView *)target { @@ -156,9 +286,9 @@ } -#pragma mark - +#pragma mark - -- (void)update { +- (void)updateContact { if(data == nil || data->call == NULL) { [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update call cell: null call or data"]; return; @@ -170,7 +300,7 @@ NSString* address = nil; if(addr != NULL) { BOOL useLinphoneAddress = true; - // contact name + // contact name char* lAddress = linphone_address_as_string_uri_only(addr); if(lAddress) { NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:[NSString stringWithUTF8String:lAddress]]; @@ -185,9 +315,9 @@ if(useLinphoneAddress) { const char* lDisplayName = linphone_address_get_display_name(addr); const char* lUserName = linphone_address_get_username(addr); - if (lDisplayName) + if (lDisplayName) address = [NSString stringWithUTF8String:lDisplayName]; - else if(lUserName) + else if(lUserName) address = [NSString stringWithUTF8String:lUserName]; } } @@ -203,6 +333,14 @@ address = @"Unknown"; } [addressLabel setText:address]; +} + +- (void)update { + if(data == nil || data->call == NULL) { + [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update call cell: null call or data"]; + return; + } + LinphoneCall *call = data->call; LinphoneCallState state = linphone_call_get_state(call); if(!conferenceCell) { @@ -239,16 +377,85 @@ if(!data->minimize) { CGRect frame = [self frame]; - frame.size.height = [avatarView frame].size.height; + frame.size.height = [otherView frame].size.height; [self setFrame:frame]; - [avatarView setHidden:false]; + [otherView setHidden:false]; } else { CGRect frame = [self frame]; frame.size.height = [headerView frame].size.height; [self setFrame:frame]; - [avatarView setHidden:true]; + [otherView setHidden:true]; } [pauseButton setType:UIPauseButtonType_Call call:call]; + + [self updateStats]; + + [self updateDetailsView]; +} + +- (void)updateStats { + if(data == nil || data->call == NULL) { + [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update call cell: null call or data"]; + return; + } + LinphoneCall *call = data->call; + + const LinphoneCallParams *params = linphone_call_get_current_params(call); + { + const PayloadType* payload = linphone_call_params_get_used_audio_codec(params); + if(payload != NULL) { + [audioCodecLabel setText:[NSString stringWithFormat:@"%s/%i/%i", payload->mime_type, payload->clock_rate, payload->channels]]; + } else { + [audioCodecLabel setText:NSLocalizedString(@"No codec", nil)]; + } + const LinphoneCallStats *stats = linphone_call_get_audio_stats(call); + if(stats != NULL) { + [audioUploadBandwidthLabel setText:[NSString stringWithFormat:@"%1.1f kbits/s", stats->upload_bandwidth]]; + [audioDownloadBandwidthLabel setText:[NSString stringWithFormat:@"%1.1f kbits/s", stats->download_bandwidth]]; + [audioIceConnectivityLabel setText:[UICallCell iceToString:stats->ice_state]]; + } else { + [audioUploadBandwidthLabel setText:@""]; + [audioDownloadBandwidthLabel setText:@""]; + [audioIceConnectivityLabel setText:@""]; + } + } + + { + const PayloadType* payload = linphone_call_params_get_used_video_codec(params); + if(payload != NULL) { + [videoCodecLabel setText:[NSString stringWithFormat:@"%s/%i", payload->mime_type, payload->clock_rate]]; + } else { + [videoCodecLabel setText:NSLocalizedString(@"No codec", nil)]; + } + + const LinphoneCallStats *stats = linphone_call_get_video_stats(call); + if(stats != NULL) { + [videoUploadBandwidthLabel setText:[NSString stringWithFormat:@"%1.1f kbits/s", stats->upload_bandwidth]]; + [videoDownloadBandwidthLabel setText:[NSString stringWithFormat:@"%1.1f kbits/s", stats->download_bandwidth]]; + [videoIceConnectivityLabel setText:[UICallCell iceToString:stats->ice_state]]; + } else { + [videoUploadBandwidthLabel setText:@""]; + [videoDownloadBandwidthLabel setText:@""]; + [videoIceConnectivityLabel setText:@""]; + } + } +} + + +- (void)updateDetailsView { + if(data->view == UICallCellOtherView_Avatar && avatarView.isHidden) { + [self->avatarView setHidden:FALSE]; + [self->audioStatsView setHidden:TRUE]; + [self->videoStatsView setHidden:TRUE]; + } else if(data->view == UICallCellOtherView_AudioStats && audioStatsView.isHidden) { + [self->avatarView setHidden:TRUE]; + [self->audioStatsView setHidden:FALSE]; + [self->videoStatsView setHidden:TRUE]; + } else if(data->view == UICallCellOtherView_VideoStats && videoStatsView.isHidden) { + [self->avatarView setHidden:TRUE]; + [self->audioStatsView setHidden:TRUE]; + [self->videoStatsView setHidden:FALSE]; + } } - (void)selfUpdate { @@ -277,4 +484,36 @@ } } +- (IBAction)doDetailsSwipe:(UISwipeGestureRecognizer *)sender { + CATransition* trans = nil; + if (sender.direction == UISwipeGestureRecognizerDirectionLeft) { + if(data->view == UICallCellOtherView_MAX - 1) { + data->view = 0; + } else { + ++data->view; + } + trans = [CATransition animation]; + [trans setType:kCATransitionPush]; + [trans setDuration:0.35]; + [trans setTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]]; + [trans setSubtype:kCATransitionFromRight]; + } else if (sender.direction == UISwipeGestureRecognizerDirectionRight) { + if(data->view == 0) { + data->view = UICallCellOtherView_MAX - 1; + } else { + --data->view; + } + trans = [CATransition animation]; + [trans setType:kCATransitionPush]; + [trans setDuration:0.35]; + [trans setTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]]; + [trans setSubtype:kCATransitionFromLeft]; + } + if(trans) { + [otherView.layer removeAnimationForKey:@"transition"]; + [otherView.layer addAnimation:trans forKey:@"transition"]; + [self updateDetailsView]; + } +} + @end diff --git a/Classes/LinphoneUI/UIChatCell.xib b/Classes/LinphoneUI/UIChatCell.xib index 92d29fb24..78812d464 100644 --- a/Classes/LinphoneUI/UIChatCell.xib +++ b/Classes/LinphoneUI/UIChatCell.xib @@ -42,7 +42,6 @@ 292 {{10, 8}, {27, 27}} - _NS:9 NO @@ -57,7 +56,6 @@ 274 {{45, 0}, {60, 44}} - _NS:328 NO @@ -94,7 +92,6 @@ 274 {{110, 0}, {170, 44}} - _NS:328 NO @@ -127,7 +124,6 @@ 257 {{276, 0}, {44, 44}} - _NS:9 NO @@ -170,7 +166,6 @@ 274 {{10, 12}, {24, 20}} - _NS:9 NO @@ -185,7 +180,6 @@ 292 {{12, 10}, {20, 20}} - _NS:9 NO YES @@ -217,7 +211,6 @@ {{276, 0}, {44, 44}} - _NS:9 @@ -229,7 +222,6 @@ {320, 44} - _NS:9 @@ -397,69 +389,9 @@ 43 - - - - UIChatCell - UITableViewCell - - onDeleteClick: - id - - - onDeleteClick: - - onDeleteClick: - id - - - - UILabel - UIImageView - UILabel - UIButton - UILabel - UIView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - chatContentLabel - UILabel - - - deleteButton - UIButton - - - unreadMessageLabel - UILabel - - - unreadMessageView - UIView - - - - IBProjectSource - ./Classes/UIChatCell.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/UIChatRoomCell.h b/Classes/LinphoneUI/UIChatRoomCell.h index 660149e87..37b4a51e4 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.h +++ b/Classes/LinphoneUI/UIChatRoomCell.h @@ -21,6 +21,7 @@ #import "ChatModel.h" #import "ChatRoomTableViewController.h" +#import "UILoadingImageView.h" @interface UIChatRoomCell : UITableViewCell { @@ -31,7 +32,7 @@ @property (nonatomic, retain) IBOutlet UIView *bubbleView; @property (nonatomic, retain) IBOutlet UIImageView* backgroundImage; @property (nonatomic, retain) IBOutlet UITextView *messageText; -@property (nonatomic, retain) IBOutlet UIImageView *messageImageView; +@property (nonatomic, retain) IBOutlet UILoadingImageView *messageImageView; @property (nonatomic, retain) IBOutlet UIButton *deleteButton; @property (nonatomic, retain) IBOutlet UILabel *dateLabel; @property (nonatomic, retain) IBOutlet UIImageView* statusImage; diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index cf99cd061..341a8f0d0 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -18,6 +18,7 @@ */ #import "UIChatRoomCell.h" +#import "UILinphone.h" #import "Utils.h" #import "LinphoneManager.h" #import "PhoneMainView.h" @@ -85,20 +86,27 @@ static UIFont *CELL_FONT = nil; [super dealloc]; } +- (void)prepareForReuse { + +} + #pragma mark - - (void)setChat:(ChatModel *)achat { + if(chat == achat) { + return; + } + if(chat != nil) { [chat release]; + chat = nil; + } + + if(achat != nil) { + chat = [achat retain]; + [self update]; } - chat = [achat retain]; - [self update]; -} - -- (void)prepareForReuse { - [super prepareForReuse]; - chat = nil; } - (void)update { @@ -116,14 +124,22 @@ static UIFont *CELL_FONT = nil; [downloadButton setHidden:FALSE]; } else if([chat isInternalImage]) { [messageText setHidden:TRUE]; - + [messageImageView setImage:nil]; + [messageImageView startLoading]; + ChatModel *achat = chat; [[LinphoneManager instance].photoLibrary assetForURL:[NSURL URLWithString:[chat message]] resultBlock:^(ALAsset *asset) { - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, (unsigned long)NULL), ^(void) { + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, (unsigned long)NULL), ^(void) { ALAssetRepresentation* representation = [asset defaultRepresentation]; - UIImage *image = [UIImage imageWithCGImage:[representation fullResolutionImage]]; - dispatch_async(dispatch_get_main_queue(), ^{ - [messageImageView setImage:image]; - }); + UIImage *image = [UIImage imageWithCGImage:[representation fullResolutionImage] + scale:representation.scale + orientation:(UIImageOrientation)representation.orientation]; + [image forceDecompression]; + if(achat == self->chat) { //Avoid glitch and scrolling + dispatch_async(dispatch_get_main_queue(), ^{ + [messageImageView setImage:image]; + [messageImageView stopLoading]; + }); + } }); } failureBlock:^(NSError *error) { [LinphoneLogger log:LinphoneLoggerError format:@"Can't read image"]; diff --git a/Classes/LinphoneUI/UIChatRoomCell.xib b/Classes/LinphoneUI/UIChatRoomCell.xib index a8fbc4394..e0eb45415 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.xib +++ b/Classes/LinphoneUI/UIChatRoomCell.xib @@ -194,6 +194,7 @@ {{284, 104}, {10, 10}} + _NS:9 NO IBCocoaTouchFramework @@ -258,6 +259,7 @@ {100, 100} + _NS:9 IBCocoaTouchFramework @@ -268,6 +270,7 @@ {100, 100} + _NS:9 IBCocoaTouchFramework @@ -503,6 +506,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILoadingImageView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -600,14 +604,29 @@ ./Classes/UIChatRoomCell.h + + UILoadingImageView + UIImageView + + waitIndicatorView + UIActivityIndicatorView + + + waitIndicatorView + + waitIndicatorView + UIActivityIndicatorView + + + + IBProjectSource + ./Classes/UILoadingImageView.h + + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.m b/Classes/LinphoneUI/UIContactDetailsHeader.m index 3815842ce..5709a4c0e 100644 --- a/Classes/LinphoneUI/UIContactDetailsHeader.m +++ b/Classes/LinphoneUI/UIContactDetailsHeader.m @@ -23,6 +23,7 @@ #import "FastAddressBook.h" #import "UILinphone.h" #import "PhoneMainView.h" +#import "DTActionSheet.h" #import @@ -246,7 +247,7 @@ - (IBAction)onAvatarClick:(id)event { if(self.isEditing) { - [ImagePickerViewController promptSelectSource:^(UIImagePickerControllerSourceType type) { + void (^block)(UIImagePickerControllerSourceType) = ^(UIImagePickerControllerSourceType type) { UICompositeViewDescription *description = [ImagePickerViewController compositeViewDescription]; ImagePickerViewController *controller; if([LinphoneManager runningOnIpad]) { @@ -270,7 +271,30 @@ [controller.popoverController presentPopoverFromRect:[avatarImage frame] inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:FALSE]; } } - }]; + }; + DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source",nil)] autorelease]; + if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) { + [sheet addButtonWithTitle:NSLocalizedString(@"Camera",nil) block:^(){ + block(UIImagePickerControllerSourceTypeCamera); + }]; + } + if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) { + [sheet addButtonWithTitle:NSLocalizedString(@"Photo library",nil) block:^(){ + block(UIImagePickerControllerSourceTypePhotoLibrary); + }]; + } + if([FastAddressBook getContactImage:contact thumbnail:true] != nil) { + [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Remove", nil) block:^(){ + NSError* error = NULL; + if(!ABPersonRemoveImageData(contact, (CFErrorRef*)error)) { + [LinphoneLogger log:LinphoneLoggerLog format:@"Can't remove entry: %@", [error localizedDescription]]; + } + [self update]; + }]; + } + [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel",nil)]; + + [sheet showInView:[PhoneMainView instance].view]; } } @@ -290,7 +314,7 @@ if(!ABPersonRemoveImageData(contact, (CFErrorRef*)error)) { [LinphoneLogger log:LinphoneLoggerLog format:@"Can't remove entry: %@", [error localizedDescription]]; } - NSData *dataRef = UIImagePNGRepresentation([image normalizedImage]); + NSData *dataRef = UIImageJPEGRepresentation(image, 0.9f); CFDataRef cfdata = CFDataCreate(NULL,[dataRef bytes], [dataRef length]); if(!ABPersonSetImageData(contact, cfdata, (CFErrorRef*)error)) { diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h index 4f0fc380b..02b6d660c 100644 --- a/Classes/LinphoneUI/UILinphone.h +++ b/Classes/LinphoneUI/UILinphone.h @@ -37,6 +37,6 @@ @interface UIImage (NormalizedImage) -- (UIImage *)normalizedImage; +- (void)forceDecompression; @end diff --git a/Classes/LinphoneUI/UILinphone.m b/Classes/LinphoneUI/UILinphone.m index 73571255f..a9fbce149 100644 --- a/Classes/LinphoneUI/UILinphone.m +++ b/Classes/LinphoneUI/UILinphone.m @@ -95,14 +95,14 @@ @implementation UIImage (NormalizedImage) -- (UIImage *)normalizedImage { - if (self.imageOrientation == UIImageOrientationUp) return self; - - UIGraphicsBeginImageContextWithOptions(self.size, NO, self.scale); - [self drawInRect:(CGRect){0, 0, self.size}]; - UIImage *normalizedImage = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - return normalizedImage; +- (void)forceDecompression { + CGImageRef imageRef = [self CGImage]; + CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); + CGContextRef context = CGBitmapContextCreate(NULL, CGImageGetWidth(imageRef), CGImageGetHeight(imageRef), 8, CGImageGetWidth(imageRef) * 4, colorSpace,kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little); + CGColorSpaceRelease(colorSpace); + if (!context) { NSLog(@"Could not create context for image decompression"); return; } + CGContextDrawImage(context, (CGRect){{0.0f, 0.0f}, {CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)}}, imageRef); + CFRelease(context); } @end diff --git a/Classes/LinphoneUI/UILoadingImageView.h b/Classes/LinphoneUI/UILoadingImageView.h new file mode 100644 index 000000000..621be1c63 --- /dev/null +++ b/Classes/LinphoneUI/UILoadingImageView.h @@ -0,0 +1,30 @@ +/* UILoadingImageView.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import + +@interface UILoadingImageView : UIImageView + + +- (void)startLoading; +- (void)stopLoading; + +@property (nonatomic, readonly) IBOutlet UIActivityIndicatorView *waitIndicatorView; + +@end diff --git a/Classes/LinphoneUI/UILoadingImageView.m b/Classes/LinphoneUI/UILoadingImageView.m new file mode 100644 index 000000000..3fd253dd0 --- /dev/null +++ b/Classes/LinphoneUI/UILoadingImageView.m @@ -0,0 +1,97 @@ +/* UILoadingImageView.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "UILoadingImageView.h" + +@implementation UILoadingImageView + + +@synthesize waitIndicatorView; + + +#pragma mark - Lifecycle Functions + +- (void)initUIRemoteImageView { + waitIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; + waitIndicatorView.hidesWhenStopped = TRUE; + waitIndicatorView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | + UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin; + waitIndicatorView.center = self.center; + [self addSubview:waitIndicatorView]; +} + +- (id)init { + self = [super init]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (id)initWithCoder:(NSCoder *)aDecoder { + self = [super initWithCoder:aDecoder]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (id)initWithFrame:(CGRect)frame { + self = [super initWithFrame:frame]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (id)initWithImage:(UIImage *)image { + self = [super initWithImage:image]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (id)initWithImage:(UIImage *)image highlightedImage:(UIImage *)highlightedImage { + self = [super initWithImage:image highlightedImage:highlightedImage]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (void)dealloc { + [waitIndicatorView release]; + + [super dealloc]; +} + + +#pragma mark - + +- (void)startLoading { + [waitIndicatorView startAnimating]; +} + +- (void)stopLoading { + [waitIndicatorView stopAnimating]; +} + + +@end diff --git a/Classes/LinphoneUI/UIStateBar.xib b/Classes/LinphoneUI/UIStateBar.xib index 2b45cc5cc..688a607a1 100644 --- a/Classes/LinphoneUI/UIStateBar.xib +++ b/Classes/LinphoneUI/UIStateBar.xib @@ -413,70 +413,9 @@ 26 - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UIStateBar - TPMultiLayoutViewController - - UIImageView - UIImageView - UIImageView - UILabel - - - - callQualityImage - UIImageView - - - callSecurityImage - UIImageView - - - registrationStateImage - UIImageView - - - registrationStateLabel - UILabel - - - - IBProjectSource - ./Classes/UIStateBar.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/en.lproj/UICallBar.xib b/Classes/LinphoneUI/en.lproj/UICallBar.xib index 7454c922c..6074ef8ad 100644 --- a/Classes/LinphoneUI/en.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/en.lproj/UICallBar.xib @@ -42,6 +42,7 @@ -2147483356 {{0, 335}, {320, 125}} + _NS:9 1 @@ -63,6 +64,7 @@ 274 {281, 260} + _NS:9 2 @@ -78,6 +80,7 @@ 292 {{-20, 10}, {107, 54}} + 1 @@ -121,6 +124,7 @@ 292 {{87, 10}, {106, 54}} + NO NO @@ -148,6 +152,7 @@ 292 {{193, 10}, {107, 54}} + NO NO @@ -175,6 +180,7 @@ 292 {{-20, 72}, {107, 54}} + NO NO @@ -202,6 +208,7 @@ 292 {{87, 72}, {106, 54}} + NO NO @@ -229,6 +236,7 @@ 292 {{193, 72}, {107, 54}} + NO NO @@ -256,6 +264,7 @@ 292 {{-20, 134}, {107, 54}} + NO NO @@ -283,6 +292,7 @@ 292 {{87, 134}, {106, 54}} + NO NO @@ -310,6 +320,7 @@ 292 {{193, 134}, {107, 54}} + NO NO @@ -337,6 +348,7 @@ 292 {{-20, 196}, {107, 54}} + NO NO @@ -364,6 +376,7 @@ 292 {{87, 196}, {106, 54}} + NO NO @@ -391,6 +404,7 @@ 292 {{193, 196}, {107, 54}} + NO NO @@ -416,6 +430,7 @@ {{20, 57}, {281, 260}} + _NS:9 @@ -434,6 +449,7 @@ 292 {{3, 0}, {77, 68}} + _NS:9 NO @@ -489,8 +505,9 @@ 292 - {{3, 61}, {77, 68}} + {{3, 58}, {77, 68}} + _NS:9 NO @@ -528,8 +545,9 @@ - {{240, 205}, {80, 129}} + {{240, 208}, {80, 126}} + _NS:9 @@ -545,6 +563,7 @@ 290 {{0, 135}, {320, 2000}} + _NS:9 @@ -559,6 +578,7 @@ 292 {80, 67} + _NS:9 NO @@ -605,6 +625,7 @@ -2147483356 {{20, 20}, {37, 37}} + _NS:9 NO @@ -617,6 +638,7 @@ 292 {{80, 0}, {80, 67}} + _NS:9 NO @@ -663,6 +685,7 @@ 292 {{160, 0}, {80, 67}} + _NS:9 NO @@ -709,6 +732,7 @@ 292 {{240, 0}, {80, 67}} + _NS:9 NO @@ -755,6 +779,7 @@ 264 {{0, 67}, {105, 68}} + _NS:9 NO @@ -791,6 +816,7 @@ -2147483384 {{0, 67}, {105, 68}} + _NS:9 NO @@ -820,6 +846,7 @@ 264 {{105, 67}, {111, 68}} + _NS:9 NO @@ -849,6 +876,7 @@ 264 {{215, 67}, {105, 68}} + _NS:9 NO @@ -884,6 +912,7 @@ {{0, 325}, {320, 135}} + _NS:9 @@ -893,6 +922,7 @@ {320, 460} + _NS:9 @@ -908,6 +938,7 @@ -2147483356 {{0, 248}, {480, 72}} + _NS:9 @@ -930,6 +961,7 @@ 274 {281, 260} + _NS:9 2 @@ -942,6 +974,7 @@ 292 {{-20, 10}, {107, 54}} + 1 @@ -964,6 +997,7 @@ 292 {{87, 10}, {106, 54}} + NO NO @@ -982,6 +1016,7 @@ 292 {{193, 10}, {107, 54}} + NO NO @@ -1000,6 +1035,7 @@ 292 {{-20, 72}, {107, 54}} + NO NO @@ -1018,6 +1054,7 @@ 292 {{87, 72}, {106, 54}} + NO NO @@ -1036,6 +1073,7 @@ 292 {{193, 72}, {107, 54}} + NO NO @@ -1054,6 +1092,7 @@ 292 {{-20, 134}, {107, 54}} + NO NO @@ -1072,6 +1111,7 @@ 292 {{87, 134}, {106, 54}} + NO NO @@ -1090,6 +1130,7 @@ 292 {{193, 134}, {107, 54}} + NO NO @@ -1108,6 +1149,7 @@ 292 {{-20, 196}, {107, 54}} + NO NO @@ -1126,6 +1168,7 @@ 292 {{87, 196}, {106, 54}} + NO NO @@ -1144,6 +1187,7 @@ 292 {{193, 196}, {107, 54}} + NO NO 14 @@ -1159,6 +1203,7 @@ {{91, 0}, {281, 260}} + _NS:9 @@ -1174,6 +1219,7 @@ 292 {65, 55} + _NS:9 NO @@ -1215,6 +1261,7 @@ 292 {{0, 51}, {65, 55}} + _NS:9 NO @@ -1254,6 +1301,7 @@ {{415, 140}, {65, 105}} + _NS:9 @@ -1269,6 +1317,7 @@ 290 {{0, 82}, {480, 2000}} + _NS:9 @@ -1283,6 +1332,7 @@ 292 {{65, 0}, {65, 82}} + _NS:9 NO @@ -1329,6 +1379,7 @@ -2147483356 {{79, 20}, {37, 37}} + _NS:9 NO @@ -1341,6 +1392,7 @@ 292 {{130, 0}, {65, 82}} + _NS:9 NO @@ -1387,6 +1439,7 @@ 292 {{285, 0}, {65, 82}} + _NS:9 NO @@ -1433,6 +1486,7 @@ 292 {{350, 0}, {65, 82}} + _NS:9 NO @@ -1479,6 +1533,7 @@ 264 {65, 82} + _NS:9 NO @@ -1512,6 +1567,7 @@ -2147483384 {65, 82} + _NS:9 NO @@ -1541,6 +1597,7 @@ 264 {{195, 0}, {90, 82}} + _NS:9 NO @@ -1570,6 +1627,7 @@ 264 {{415, 0}, {65, 82}} + _NS:9 NO @@ -1602,6 +1660,7 @@ {{0, 238}, {480, 82}} + _NS:9 @@ -1611,6 +1670,7 @@ {480, 320} + _NS:9 @@ -2607,13 +2667,289 @@ 142 - + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + UICallBar + TPMultiLayoutViewController + + id + id + id + id + id + + + + onConferenceClick: + id + + + onOptionsAddClick: + id + + + onOptionsClick: + id + + + onOptionsTransferClick: + id + + + onPadClick: + id + + + + UIButton + UIToggleButton + UIDigitButton + UIDigitButton + UIDigitButton + UIHangUpButton + UIMicroButton + UIDigitButton + UIDigitButton + UIButton + UIToggleButton + UIButton + UIView + UIView + UIPauseButton + UIDigitButton + UIDigitButton + UIDigitButton + UISpeakerButton + UIDigitButton + UIDigitButton + UIDigitButton + UIVideoButton + UIDigitButton + + + + conferenceButton + UIButton + + + dialerButton + UIToggleButton + + + eightButton + UIDigitButton + + + fiveButton + UIDigitButton + + + fourButton + UIDigitButton + + + hangupButton + UIHangUpButton + + + microButton + UIMicroButton + + + nineButton + UIDigitButton + + + oneButton + UIDigitButton + + + optionsAddButton + UIButton + + + optionsButton + UIToggleButton + + + optionsTransferButton + UIButton + + + optionsView + UIView + + + padView + UIView + + + pauseButton + UIPauseButton + + + sevenButton + UIDigitButton + + + sharpButton + UIDigitButton + + + sixButton + UIDigitButton + + + speakerButton + UISpeakerButton + + + starButton + UIDigitButton + + + threeButton + UIDigitButton + + + twoButton + UIDigitButton + + + videoButton + UIVideoButton + + + zeroButton + UIDigitButton + + + + IBProjectSource + ./Classes/UICallBar.h + + + + UIDigitButton + UILongTouchButton + + addressField + UITextField + + + addressField + + addressField + UITextField + + + + IBProjectSource + ./Classes/UIDigitButton.h + + + + UIHangUpButton + UIButton + + IBProjectSource + ./Classes/UIHangUpButton.h + + + + UILongTouchButton + UIButton + + IBProjectSource + ./Classes/UILongTouchButton.h + + + + UIMicroButton + UIToggleButton + + IBProjectSource + ./Classes/UIMicroButton.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UISpeakerButton + UIToggleButton + + IBProjectSource + ./Classes/UISpeakerButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + UITransparentView + UIView + + IBProjectSource + ./Classes/UITransparentView.h + + + + UIVideoButton + UIToggleButton + + waitView + UIActivityIndicatorView + + + waitView + + waitView + UIActivityIndicatorView + + + + IBProjectSource + ./Classes/UIVideoButton.h + + + + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib b/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib index a213bd86a..56b82da9b 100644 --- a/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib +++ b/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib @@ -2803,10 +2803,6 @@ 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/en.lproj/UICallCell.xib b/Classes/LinphoneUI/en.lproj/UICallCell.xib index 5d5c2fe24..8bdb77a3e 100644 --- a/Classes/LinphoneUI/en.lproj/UICallCell.xib +++ b/Classes/LinphoneUI/en.lproj/UICallCell.xib @@ -37,96 +37,689 @@ 290 - + 290 - - - 290 - {{0, 63}, {320, 250}} - - - - _NS:9 - - 3 - MCAwAA - - NO - - - - IBCocoaTouchFramework - 0 - 0 - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - + + 293 - {{0, 48}, {320, 262}} - + + + + 290 + {320, 250} + + + + _NS:9 + + 3 + MCAwAA + + NO + + + + IBCocoaTouchFramework + 0 + 0 + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 293 + {{0, -15}, {320, 262}} + + + + _NS:9 + + NO + IBCocoaTouchFramework + + NSImage + avatar_shadow.png + + + + + 293 + {{80, 2}, {160, 170}} + + + + _NS:9 + + NO + + Contact's avatar + + + + IBCocoaTouchFramework + + NSImage + avatar_unknown.png + + + + {{0, 63}, {320, 237}} + - + _NS:9 - NO IBCocoaTouchFramework - - NSImage - avatar_shadow.png - - - + + 293 - {{80, 65}, {160, 170}} - + + + + 293 + {{10, 21}, {300, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio section + + IBCocoaTouchFramework + Audio + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + + + 0 + + 2 + 22 + + + Helvetica-Bold + 22 + 16 + + NO + + + + 295 + + + + 292 + {60, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Codec: + + 0 + 10 + + 2 + 17 + + + Helvetica-Bold + 17 + 16 + + + + + 290 + {{68, 0}, {232, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio codec + + + IBCocoaTouchFramework + SILK + + 0 + 10 + + 1 + 17 + + + Helvetica + 17 + 16 + + + + {{10, 50}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {160, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Upload bandwidth: + + 0 + 10 + + + + + + 290 + {{168, 0}, {132, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio upload bandwidth + + + IBCocoaTouchFramework + 2 KB/s + + 0 + 10 + + + + + {{10, 80}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {182, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Download bandwidth: + + 0 + 10 + + + + + + 290 + {{190, 0}, {110, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video upload bandwidth + + + IBCocoaTouchFramework + 10.0 KB/s + + 0 + 10 + + + + + {{10, 110}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {142, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + ICE connectivity: + + 0 + 10 + + + + + + 290 + {{150, 0}, {150, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio ICE connectivity state + + + IBCocoaTouchFramework + not activated + + 0 + 10 + + + + + {{10, 140}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + {{0, 63}, {320, 237}} + - + + _NS:9 + + IBCocoaTouchFramework + + + + 293 + + + + 293 + {{10, 21}, {300, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video section + + IBCocoaTouchFramework + Video + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + + + 0 + + + NO + + + + 295 + + + + 292 + {60, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Codec: + + 0 + 10 + + + + + + 290 + {{68, 0}, {232, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video codec + + + IBCocoaTouchFramework + SILK + + 0 + 10 + + + + + {{10, 50}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {160, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Upload bandwidth: + + 0 + 10 + + + + + + 290 + {{168, 0}, {132, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video upload bandwidth + + + IBCocoaTouchFramework + 2 KB/s + + 0 + 10 + + + + + {{10, 80}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {182, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Download bandwidth: + + 0 + 10 + + + + + + 290 + {{190, 0}, {110, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio download bandwidth + + + IBCocoaTouchFramework + 10.0 KB/s + + 0 + 10 + + + + + {{10, 110}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {142, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + ICE connectivity: + + 0 + 10 + + + + + + 290 + {{150, 0}, {150, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video ICE connectivity state + + + IBCocoaTouchFramework + not activated + + 0 + 10 + + + + + {{10, 140}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + {{0, 63}, {320, 237}} + + + _NS:9 - NO - - Contact's avatar - - - IBCocoaTouchFramework - - NSImage - avatar_unknown.png - {320, 300} - + _NS:9 - NO IBCocoaTouchFramework @@ -4703,7 +5296,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 290 - {{0, 5}, {200, 40}} + {200, 63} @@ -4734,7 +5327,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 300} - + _NS:9 IBCocoaTouchFramework @@ -4753,14 +5346,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - - - avatarImage - - - - 34 - addressLabel @@ -4785,14 +5370,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 32 - - - avatarView - - - - 41 - headerView @@ -4849,6 +5426,174 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 59 + + + avatarView + + + + 41 + + + + avatarImage + + + + 34 + + + + otherView + + + + 78 + + + + audioCodecHeaderLabel + + + + 113 + + + + audioCodecLabel + + + + 114 + + + + audioDownloadBandwidthHeaderLabel + + + + 115 + + + + audioDownloadBandwidthLabel + + + + 116 + + + + audioIceConnectivityHeaderLabel + + + + 117 + + + + audioIceConnectivityLabel + + + + 118 + + + + audioStatsView + + + + 119 + + + + audioUploadBandwidthHeaderLabel + + + + 120 + + + + audioUploadBandwidthLabel + + + + 121 + + + + videoCodecHeaderLabel + + + + 122 + + + + videoCodecLabel + + + + 123 + + + + videoDownloadBandwidthHeaderLabel + + + + 124 + + + + videoDownloadBandwidthLabel + + + + 125 + + + + videoIceConnectivityHeaderLabel + + + + 126 + + + + videoIceConnectivityLabel + + + + 127 + + + + videoStatsView + + + + 128 + + + + videoUploadBandwidthHeaderLabel + + + + 129 + + + + videoUploadBandwidthLabel + + + + 130 + doHeaderClick: @@ -4891,28 +5636,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 16 - + - - 31 - - - - - - - - avatarView - - - 29 - - - avatarImage - 36 @@ -4947,17 +5675,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE stateLabel - - 30 - - - avatarShadowImage - - - 44 - - - 45 @@ -4994,6 +5711,259 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE headerBackgroundHighlightImage + + 77 + + + + + + + + otherView + + + 76 + + + + + + + + + + audioStatsView + + + 31 + + + + + + + + avatarView + + + 44 + + + + + 29 + + + avatarImage + + + 30 + + + avatarShadowImage + + + 83 + + + + + + + audioCodecView + + + 85 + + + audioCodecHeaderLabel + + + 84 + + + audioCodecLabel + + + 89 + + + + + + + audioUploadBandwidthView + + + 90 + + + audioUploadBandwidthLabel + + + 91 + + + audioUploadBandwidthHeaderLabel + + + 92 + + + + + + + audioDownloadBandwidthView + + + 93 + + + audioDownloadBandwidthHeaderLabel + + + 94 + + + audioDownloadBandwidthLabel + + + 95 + + + audioLabel + + + 96 + + + + + + + audioIceConnectivityView + + + 97 + + + audioIceConnectivityLabel + + + 98 + + + audioIceConnectivityHeaderLabel + + + 99 + + + + + + + + + + videoStatsView + + + 100 + + + + + + + audioIceConnectivityView + + + 101 + + + videoLabel + + + 102 + + + + + + + audioDownloadBandwidthView + + + 103 + + + + + + + videoUploadBandwidthView + + + 104 + + + + + + + videoCodecView + + + 105 + + + videoCodecHeaderLabel + + + 106 + + + videoCodecLabel + + + 107 + + + videoUploadBandwidthHeaderLabel + + + 108 + + + videoUploadBandwidthLabel + + + 109 + + + videoDownloadBandwidthLabel + + + 110 + + + videoDownloadBandwidthHeaderLabel + + + 111 + + + videoIceConnectivityHeaderLabel + + + 112 + + + videoIceConnectivityLabel + @@ -5001,6 +5971,19 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 + 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 @@ -5021,12 +6004,28 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 + 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 - 75 + 130 @@ -5034,10 +6033,15 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UICallCell UITableViewCell + UISwipeGestureRecognizer id id + + doDetailsSwipe: + UISwipeGestureRecognizer + doHeaderClick: id @@ -5049,21 +6053,78 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UIView + UILabel + UILabel UIImageView UIView + UISwipeGestureRecognizer + UISwipeGestureRecognizer UIImageView UIImageView UIView + UIView UIPauseButton UIButton UIImageView UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UIView + UILabel + UILabel addressLabel UILabel + + audioCodecHeaderLabel + UILabel + + + audioCodecLabel + UILabel + + + audioDownloadBandwidthHeaderLabel + UILabel + + + audioDownloadBandwidthLabel + UILabel + + + audioIceConnectivityHeaderLabel + UILabel + + + audioIceConnectivityLabel + UILabel + + + audioStatsView + UIView + + + audioUploadBandwidthHeaderLabel + UILabel + + + audioUploadBandwidthLabel + UILabel + avatarImage UIImageView @@ -5072,6 +6133,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE avatarView UIView + + detailsLeftSwipeGestureRecognizer + UISwipeGestureRecognizer + + + detailsRightSwipeGestureRecognizer + UISwipeGestureRecognizer + headerBackgroundHighlightImage UIImageView @@ -5084,6 +6153,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE headerView UIView + + otherView + UIView + pauseButton UIPauseButton @@ -5100,6 +6173,42 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE stateLabel UILabel + + videoCodecHeaderLabel + UILabel + + + videoCodecLabel + UILabel + + + videoDownloadBandwidthHeaderLabel + UILabel + + + videoDownloadBandwidthLabel + UILabel + + + videoIceConnectivityHeaderLabel + UILabel + + + videoIceConnectivityLabel + UILabel + + + videoStatsView + UIView + + + videoUploadBandwidthHeaderLabel + UILabel + + + videoUploadBandwidthLabel + UILabel + IBProjectSource @@ -5126,10 +6235,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib b/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib index 2e72dd919..a70dc3dc7 100644 --- a/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib +++ b/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -41,7 +41,6 @@ 290 {320, 68} - _NS:9 NO @@ -61,7 +60,6 @@ 289 {{224, 14}, {25, 25}} - _NS:9 NO IBCocoaTouchFramework @@ -71,7 +69,6 @@ 289 {{216, 6}, {41, 41}} - _NS:9 NO @@ -116,7 +113,6 @@ {320, 68} - _NS:9 @@ -224,54 +220,9 @@ 14 - - - - UIConferenceHeader - UIViewController - - UIPauseButton - UIImageView - - - - pauseButton - UIPauseButton - - - stateImage - UIImageView - - - - IBProjectSource - ./Classes/UIConferenceHeader.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 @@ -280,6 +231,6 @@ {43, 46} {640, 135} - 1498 + 1926 diff --git a/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib b/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib index 0d353a385..51314ac12 100644 --- a/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib +++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib @@ -163,49 +163,9 @@ 10 - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib index cf2310c07..3448c3439 100644 --- a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib @@ -373,10 +373,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/en.lproj/UIMainBar.xib b/Classes/LinphoneUI/en.lproj/UIMainBar.xib index da3794cab..6248592a3 100644 --- a/Classes/LinphoneUI/en.lproj/UIMainBar.xib +++ b/Classes/LinphoneUI/en.lproj/UIMainBar.xib @@ -702,10 +702,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib b/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib index d72f12f02..3ab58826c 100644 --- a/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib +++ b/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib @@ -1170,10 +1170,6 @@ 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar.xib b/Classes/LinphoneUI/fr.lproj/UICallBar.xib index 784673776..945d0cf55 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallBar.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -489,7 +489,7 @@ 292 - {{3, 61}, {77, 68}} + {{3, 58}, {77, 68}} _NS:9 @@ -528,7 +528,7 @@ - {{240, 205}, {80, 129}} + {{240, 208}, {80, 126}} _NS:9 @@ -2605,13 +2605,289 @@ 142 - + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + UICallBar + TPMultiLayoutViewController + + id + id + id + id + id + + + + onConferenceClick: + id + + + onOptionsAddClick: + id + + + onOptionsClick: + id + + + onOptionsTransferClick: + id + + + onPadClick: + id + + + + UIButton + UIToggleButton + UIDigitButton + UIDigitButton + UIDigitButton + UIHangUpButton + UIMicroButton + UIDigitButton + UIDigitButton + UIButton + UIToggleButton + UIButton + UIView + UIView + UIPauseButton + UIDigitButton + UIDigitButton + UIDigitButton + UISpeakerButton + UIDigitButton + UIDigitButton + UIDigitButton + UIVideoButton + UIDigitButton + + + + conferenceButton + UIButton + + + dialerButton + UIToggleButton + + + eightButton + UIDigitButton + + + fiveButton + UIDigitButton + + + fourButton + UIDigitButton + + + hangupButton + UIHangUpButton + + + microButton + UIMicroButton + + + nineButton + UIDigitButton + + + oneButton + UIDigitButton + + + optionsAddButton + UIButton + + + optionsButton + UIToggleButton + + + optionsTransferButton + UIButton + + + optionsView + UIView + + + padView + UIView + + + pauseButton + UIPauseButton + + + sevenButton + UIDigitButton + + + sharpButton + UIDigitButton + + + sixButton + UIDigitButton + + + speakerButton + UISpeakerButton + + + starButton + UIDigitButton + + + threeButton + UIDigitButton + + + twoButton + UIDigitButton + + + videoButton + UIVideoButton + + + zeroButton + UIDigitButton + + + + IBProjectSource + ./Classes/UICallBar.h + + + + UIDigitButton + UILongTouchButton + + addressField + UITextField + + + addressField + + addressField + UITextField + + + + IBProjectSource + ./Classes/UIDigitButton.h + + + + UIHangUpButton + UIButton + + IBProjectSource + ./Classes/UIHangUpButton.h + + + + UILongTouchButton + UIButton + + IBProjectSource + ./Classes/UILongTouchButton.h + + + + UIMicroButton + UIToggleButton + + IBProjectSource + ./Classes/UIMicroButton.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UISpeakerButton + UIToggleButton + + IBProjectSource + ./Classes/UISpeakerButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + UITransparentView + UIView + + IBProjectSource + ./Classes/UITransparentView.h + + + + UIVideoButton + UIToggleButton + + waitView + UIActivityIndicatorView + + + waitView + + waitView + UIActivityIndicatorView + + + + IBProjectSource + ./Classes/UIVideoButton.h + + + + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib b/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib index f2b86dd03..001a25e89 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -2801,10 +2801,6 @@ 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/fr.lproj/UICallCell.xib b/Classes/LinphoneUI/fr.lproj/UICallCell.xib index e9bd40047..97a5a6b80 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallCell.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallCell.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -37,92 +37,656 @@ 290 - + 290 - - - 290 - {{0, 63}, {320, 250}} - - - _NS:9 - - 3 - MCAwAA - - NO - - - - IBCocoaTouchFramework - 0 - 0 - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - + + 293 - {{0, 48}, {320, 262}} - - + + + + 290 + {320, 250} + + + _NS:9 + + 3 + MCAwAA + + NO + + + + IBCocoaTouchFramework + 0 + 0 + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 293 + {{0, -15}, {320, 262}} + + + _NS:9 + + NO + IBCocoaTouchFramework + + NSImage + avatar_shadow.png + + + + + 293 + {{80, 2}, {160, 170}} + + + _NS:9 + + NO + + Avatar du contact + + + + IBCocoaTouchFramework + + NSImage + avatar_unknown.png + + + + {{0, 63}, {320, 237}} + + _NS:9 - NO IBCocoaTouchFramework - - NSImage - avatar_shadow.png - - - + + 293 - {{80, 65}, {160, 170}} - - + + + + 293 + {{10, 21}, {300, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Section audio + + IBCocoaTouchFramework + Audio + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + + + 0 + NO + + 2 + 22 + + + Helvetica-Bold + 22 + 16 + + + + + 295 + + + + 292 + {60, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Codec: + + 0 + 10 + + 2 + 17 + + + Helvetica-Bold + 17 + 16 + + + + + 290 + {{68, 0}, {232, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Codec audio + + + IBCocoaTouchFramework + SILK + + 0 + 10 + + 1 + 17 + + + Helvetica + 17 + 16 + + + + {{10, 50}, {300, 21}} + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {160, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Débit montant: + + 0 + 10 + + + + + + 290 + {{168, 0}, {132, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Bande passante montante de l'audio + + + IBCocoaTouchFramework + 2 KB/s + + 0 + 10 + + + + + {{10, 80}, {300, 21}} + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {182, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Débit descendant: + + 0 + 10 + + + + + + 290 + {{190, 0}, {110, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Bande passante montante de la vidéo + + + IBCocoaTouchFramework + 10.0 KB/s + + 0 + 10 + + + + + {{10, 110}, {300, 21}} + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {142, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Connectivité ICE: + + 0 + 10 + + + + + + 290 + {{150, 0}, {150, 21}} + + + _NS:9 + NO + YES + 7 + NO + + État de la connectivité ICE de la audio + + + IBCocoaTouchFramework + not activated + + 0 + 10 + + + + + {{10, 140}, {300, 21}} + + + _NS:9 + + IBCocoaTouchFramework + + + {{0, 63}, {320, 237}} + + + _NS:9 + + IBCocoaTouchFramework + + + + 293 + + + + 293 + {{10, 21}, {300, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Section vidéo + + IBCocoaTouchFramework + Vidéo + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + + + 0 + NO + + + + + + 295 + + + + 292 + {60, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Codec: + + 0 + 10 + + + + + + 290 + {{68, 0}, {232, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Codec vidéo + + + IBCocoaTouchFramework + SILK + + 0 + 10 + + + + + {{10, 50}, {300, 21}} + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {160, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Débit montant: + + 0 + 10 + + + + + + 290 + {{168, 0}, {132, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Bande passante montante de la vidéo + + + IBCocoaTouchFramework + 2 KB/s + + 0 + 10 + + + + + {{10, 80}, {300, 21}} + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {182, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Débit descendant: + + 0 + 10 + + + + + + 290 + {{190, 0}, {110, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Bande passante descendante de l'audio + + + IBCocoaTouchFramework + 10.0 KB/s + + 0 + 10 + + + + + {{10, 110}, {300, 21}} + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {142, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Connectivité ICE: + + 0 + 10 + + + + + + 290 + {{150, 0}, {150, 21}} + + + _NS:9 + NO + YES + 7 + NO + + État de la connectivité ICE de la vidéo + + + IBCocoaTouchFramework + not activated + + 0 + 10 + + + + + {{10, 140}, {300, 21}} + + + _NS:9 + + IBCocoaTouchFramework + + + {{0, 63}, {320, 237}} + + _NS:9 - NO - - Avatar du contact - - - IBCocoaTouchFramework - - NSImage - avatar_unknown.png - {320, 300} - + _NS:9 - NO IBCocoaTouchFramework @@ -4692,7 +5256,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 290 - {{0, 5}, {200, 40}} + {200, 63} _NS:9 @@ -4719,7 +5283,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 300} - + _NS:9 IBCocoaTouchFramework @@ -4736,14 +5300,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - - - avatarImage - - - - 34 - addressLabel @@ -4768,14 +5324,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 32 - - - avatarView - - - - 41 - headerView @@ -4832,6 +5380,174 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 59 + + + avatarView + + + + 41 + + + + avatarImage + + + + 34 + + + + otherView + + + + 78 + + + + audioCodecHeaderLabel + + + + 113 + + + + audioCodecLabel + + + + 114 + + + + audioDownloadBandwidthHeaderLabel + + + + 115 + + + + audioDownloadBandwidthLabel + + + + 116 + + + + audioIceConnectivityHeaderLabel + + + + 117 + + + + audioIceConnectivityLabel + + + + 118 + + + + audioStatsView + + + + 119 + + + + audioUploadBandwidthHeaderLabel + + + + 120 + + + + audioUploadBandwidthLabel + + + + 121 + + + + videoCodecHeaderLabel + + + + 122 + + + + videoCodecLabel + + + + 123 + + + + videoDownloadBandwidthHeaderLabel + + + + 124 + + + + videoDownloadBandwidthLabel + + + + 125 + + + + videoIceConnectivityHeaderLabel + + + + 126 + + + + videoIceConnectivityLabel + + + + 127 + + + + videoStatsView + + + + 128 + + + + videoUploadBandwidthHeaderLabel + + + + 129 + + + + videoUploadBandwidthLabel + + + + 130 + doHeaderClick: @@ -4874,28 +5590,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 16 - + - - 31 - - - - - - - - avatarView - - - 29 - - - avatarImage - 36 @@ -4930,17 +5629,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE stateLabel - - 30 - - - avatarShadowImage - - - 44 - - - 45 @@ -4977,6 +5665,259 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE headerBackgroundHighlightImage + + 77 + + + + + + + + otherView + + + 76 + + + + + + + + + + audioStatsView + + + 31 + + + + + + + + avatarView + + + 44 + + + + + 29 + + + avatarImage + + + 30 + + + avatarShadowImage + + + 83 + + + + + + + audioCodecView + + + 85 + + + audioCodecHeaderLabel + + + 84 + + + audioCodecLabel + + + 89 + + + + + + + audioUploadBandwidthView + + + 90 + + + audioUploadBandwidthLabel + + + 91 + + + audioUploadBandwidthHeaderLabel + + + 92 + + + + + + + audioDownloadBandwidthView + + + 93 + + + audioDownloadBandwidthHeaderLabel + + + 94 + + + audioDownloadBandwidthLabel + + + 95 + + + audioLabel + + + 96 + + + + + + + audioIceConnectivityView + + + 97 + + + audioIceConnectivityLabel + + + 98 + + + audioIceConnectivityHeaderLabel + + + 99 + + + + + + + + + + videoStatsView + + + 100 + + + + + + + audioIceConnectivityView + + + 101 + + + videoLabel + + + 102 + + + + + + + audioDownloadBandwidthView + + + 103 + + + + + + + videoUploadBandwidthView + + + 104 + + + + + + + videoCodecView + + + 105 + + + videoCodecHeaderLabel + + + 106 + + + videoCodecLabel + + + 107 + + + videoUploadBandwidthHeaderLabel + + + 108 + + + videoUploadBandwidthLabel + + + 109 + + + videoDownloadBandwidthLabel + + + 110 + + + videoDownloadBandwidthHeaderLabel + + + 111 + + + videoIceConnectivityHeaderLabel + + + 112 + + + videoIceConnectivityLabel + @@ -4984,6 +5925,19 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 + 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 @@ -5004,12 +5958,28 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 + 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 - 75 + 130 @@ -5017,10 +5987,15 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UICallCell UITableViewCell + UISwipeGestureRecognizer id id + + doDetailsSwipe: + UISwipeGestureRecognizer + doHeaderClick: id @@ -5032,21 +6007,78 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UIView + UILabel + UILabel UIImageView UIView + UISwipeGestureRecognizer + UISwipeGestureRecognizer UIImageView UIImageView UIView + UIView UIPauseButton UIButton UIImageView UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UIView + UILabel + UILabel addressLabel UILabel + + audioCodecHeaderLabel + UILabel + + + audioCodecLabel + UILabel + + + audioDownloadBandwidthHeaderLabel + UILabel + + + audioDownloadBandwidthLabel + UILabel + + + audioIceConnectivityHeaderLabel + UILabel + + + audioIceConnectivityLabel + UILabel + + + audioStatsView + UIView + + + audioUploadBandwidthHeaderLabel + UILabel + + + audioUploadBandwidthLabel + UILabel + avatarImage UIImageView @@ -5055,6 +6087,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE avatarView UIView + + detailsLeftSwipeGestureRecognizer + UISwipeGestureRecognizer + + + detailsRightSwipeGestureRecognizer + UISwipeGestureRecognizer + headerBackgroundHighlightImage UIImageView @@ -5067,6 +6107,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE headerView UIView + + otherView + UIView + pauseButton UIPauseButton @@ -5083,6 +6127,42 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE stateLabel UILabel + + videoCodecHeaderLabel + UILabel + + + videoCodecLabel + UILabel + + + videoDownloadBandwidthHeaderLabel + UILabel + + + videoDownloadBandwidthLabel + UILabel + + + videoIceConnectivityHeaderLabel + UILabel + + + videoIceConnectivityLabel + UILabel + + + videoStatsView + UIView + + + videoUploadBandwidthHeaderLabel + UILabel + + + videoUploadBandwidthLabel + UILabel + IBProjectSource @@ -5109,10 +6189,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib b/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib index db6aa3690..4e2d3e37e 100644 --- a/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib +++ b/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib @@ -1,7 +1,7 @@ - 1296 + 1280 11E53 1938 1138.47 @@ -219,54 +219,9 @@ 14 - - - - UIConferenceHeader - UIViewController - - UIPauseButton - UIImageView - - - - pauseButton - UIPauseButton - - - stateImage - UIImageView - - - - IBProjectSource - ./Classes/UIConferenceHeader.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib b/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib index ea17ccc53..c7b06f6bb 100644 --- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib +++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -162,49 +162,9 @@ 10 - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib index cf2e3c1c2..b1b2452be 100644 --- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -423,10 +423,6 @@ AAgACAAIAAEAAQABAAE 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/fr.lproj/UIMainBar.xib b/Classes/LinphoneUI/fr.lproj/UIMainBar.xib index 35a724808..b06bffac7 100644 --- a/Classes/LinphoneUI/fr.lproj/UIMainBar.xib +++ b/Classes/LinphoneUI/fr.lproj/UIMainBar.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -701,10 +701,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib b/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib index 386e55f3c..b13b366f0 100644 --- a/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib +++ b/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -1168,10 +1168,6 @@ 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index 35ad278b6..e81cbe2de 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -45,7 +45,6 @@ 274 {320, 480} - _NS:9 1 NO @@ -58,7 +57,6 @@ {320, 480} - _NS:9 @@ -182,127 +180,13 @@ 217 - - - YES - - PhoneMainView - UIViewController - - mainViewController - UICompositeViewController - - - mainViewController - - mainViewController - UICompositeViewController - - - - IBProjectSource - ./Classes/PhoneMainView.h - - - - TPMultiLayoutViewController - UIViewController - - YES - - YES - landscapeView - portraitView - - - YES - UIView - UIView - - - - YES - - YES - landscapeView - portraitView - - - YES - - landscapeView - UIView - - - portraitView - UIView - - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICompositeViewController - TPMultiLayoutViewController - - YES - - YES - contentView - stateBarView - tabBarView - - - YES - UIView - UIView - UIView - - - - YES - - YES - contentView - stateBarView - tabBarView - - - YES - - contentView - UIView - - - stateBarView - UIView - - - tabBarView - UIView - - - - - IBProjectSource - ./Classes/UICompositeViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index d8d9f7716..bdb6e1b70 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -41,8 +41,11 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf if (contact && ABPersonHasImageData(contact)) { CFDataRef imgData = ABPersonCopyImageDataWithFormat(contact, thumbnail? kABPersonImageFormatThumbnail: kABPersonImageFormatOriginalSize); + retImage = [UIImage imageWithData:(NSData *)imgData]; - CFRelease(imgData); + if(imgData != NULL) { + CFRelease(imgData); + } } return retImage; } diff --git a/Classes/en.lproj/ChatRoomViewController.xib b/Classes/en.lproj/ChatRoomViewController.xib index 04d79fd23..4c0e4a66b 100644 --- a/Classes/en.lproj/ChatRoomViewController.xib +++ b/Classes/en.lproj/ChatRoomViewController.xib @@ -54,7 +54,6 @@ 292 {{-13, -5}, {131, 107}} - _NS:9 NO @@ -69,7 +68,6 @@ 292 {{20, 6}, {65, 65}} - _NS:9 NO @@ -89,7 +87,6 @@ 290 {{101, 37}, {199, 43}} - _NS:9 NO @@ -122,7 +119,6 @@ {320, 80} - _NS:9 @@ -137,7 +133,6 @@ 274 {{0, 80}, {320, 279}} - _NS:9 @@ -163,7 +158,6 @@ 274 {320, 57} - _NS:9 @@ -179,7 +173,6 @@ 297 {{262, 0}, {58, 57}} - _NS:9 NO @@ -222,7 +215,6 @@ 298 {{20, 24}, {222, 9}} - _NS:9 NO @@ -236,7 +228,6 @@ {{0, 359}, {320, 57}} - _NS:9 @@ -251,7 +242,6 @@ 274 {320, 57} - _NS:9 @@ -267,7 +257,6 @@ 297 {{262, 0}, {58, 57}} - _NS:9 NO @@ -324,7 +313,6 @@ 300 {35, 57} - _NS:9 NO @@ -362,7 +350,6 @@ 274 {{39, 12}, {218, 33}} - _NS:9 @@ -371,7 +358,6 @@ {{0, 359}, {320, 57}} - _NS:9 @@ -380,7 +366,6 @@ {{0, 44}, {320, 416}} - _NS:9 @@ -395,7 +380,6 @@ 290 {320, 44} - _NS:9 NO @@ -410,7 +394,6 @@ 292 {160, 44} - _NS:9 @@ -452,7 +435,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 @@ -492,7 +474,6 @@ {320, 44} - _NS:9 @@ -507,7 +488,6 @@ 301 {{142, 211}, {37, 37}} - NO NO NO @@ -519,7 +499,6 @@ {320, 460} - 3 @@ -534,7 +513,6 @@ {320, 460} - _NS:9 @@ -1000,170 +978,7 @@ 93 - - - - ChatRoomTableViewController - UITableViewController - - IBProjectSource - ./Classes/ChatRoomTableViewController.h - - - - ChatRoomViewController - UIViewController - - id - id - id - id - id - id - id - - - - onBackClick: - id - - - onEditClick: - id - - - onListTap: - id - - - onMessageChange: - id - - - onPictureClick: - id - - - onSendClick: - id - - - onTransferCancelClick: - id - - - - UILabel - UIImageView - UIButton - UIView - UIToggleButton - UIView - UIProgressView - UITapGestureRecognizer - UIImageView - HPGrowingTextView - UIView - UIButton - UIButton - ChatRoomTableViewController - UIImageView - UIView - UIView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - cancelTransferButton - UIButton - - - chatView - UIView - - - editButton - UIToggleButton - - - headerView - UIView - - - imageTransferProgressBar - UIProgressView - - - listTapGestureRecognizer - UITapGestureRecognizer - - - messageBackgroundImage - UIImageView - - - messageField - HPGrowingTextView - - - messageView - UIView - - - pictureButton - UIButton - - - sendButton - UIButton - - - tableController - ChatRoomTableViewController - - - transferBackgroundImage - UIImageView - - - transferView - UIView - - - waitView - UIView - - - - IBProjectSource - ./Classes/ChatRoomViewController.h - - - - HPGrowingTextView - UIView - - IBProjectSource - ./Classes/HPGrowingTextView.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES diff --git a/Classes/en.lproj/ChatViewController.xib b/Classes/en.lproj/ChatViewController.xib index 638433c1b..aae2a8c7b 100644 --- a/Classes/en.lproj/ChatViewController.xib +++ b/Classes/en.lproj/ChatViewController.xib @@ -48,7 +48,6 @@ 290 {320, 44} - _NS:9 NO @@ -63,7 +62,6 @@ 292 {160, 44} - _NS:9 NO @@ -114,7 +112,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -156,7 +153,6 @@ {320, 44} - _NS:9 @@ -173,7 +169,6 @@ 274 {{0, 79}, {320, 381}} - _NS:9 3 @@ -206,7 +201,6 @@ 290 {{2, 44}, {316, 35}} - _NS:9 @@ -250,7 +244,6 @@ {320, 460} - _NS:9 @@ -457,100 +450,9 @@ 28 - - - - ChatTableViewController - UITableViewController - - IBProjectSource - ./Classes/ChatTableViewController.h - - - - ChatViewController - UIViewController - - id - id - - - - onAddClick: - id - - - onEditClick: - id - - - - UITextField - UIToggleButton - ChatTableViewController - - - - addressField - UITextField - - - editButton - UIToggleButton - - - tableController - ChatTableViewController - - - - IBProjectSource - ./Classes/ChatViewController.h - - - - TUNinePatch - NSObject - - IBProjectSource - ./Classes/TUNinePatch.h - - - - UILinphoneTextField - UITextField - - backgroundNinePatch - TUNinePatch - - - backgroundNinePatch - - backgroundNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneTextField.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/ContactDetailsLabelViewController.xib b/Classes/en.lproj/ContactDetailsLabelViewController.xib index 182c718cd..5a1cdfbe1 100644 --- a/Classes/en.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/en.lproj/ContactDetailsLabelViewController.xib @@ -42,7 +42,6 @@ 274 {320, 460} - _NS:9 NO @@ -64,7 +63,6 @@ 290 {320, 44} - _NS:9 NO @@ -79,7 +77,6 @@ 292 {160, 44} - _NS:9 NO @@ -128,7 +125,6 @@ {320, 44} - _NS:9 @@ -145,7 +141,6 @@ 306 {{0, 59}, {320, 401}} - _NS:9 1 @@ -175,7 +170,6 @@ {320, 460} - 3 @@ -313,46 +307,9 @@ 16 - - - - ContactDetailsLabelViewController - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - tableView - UITableView - - - tableView - - tableView - UITableView - - - - IBProjectSource - ./Classes/ContactDetailsLabelViewController.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/ContactDetailsViewController.xib b/Classes/en.lproj/ContactDetailsViewController.xib index 369a774f5..646a59cc9 100644 --- a/Classes/en.lproj/ContactDetailsViewController.xib +++ b/Classes/en.lproj/ContactDetailsViewController.xib @@ -48,7 +48,6 @@ 290 {320, 44} - _NS:9 NO @@ -63,7 +62,6 @@ 292 {160, 44} - _NS:9 NO @@ -110,7 +108,6 @@ -2147483356 {160, 44} - _NS:9 NO @@ -148,7 +145,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -187,7 +183,6 @@ {320, 44} - _NS:9 @@ -204,7 +199,6 @@ 306 {{0, 44}, {320, 416}} - _NS:9 1 @@ -234,7 +228,6 @@ {320, 460} - 3 @@ -529,188 +522,9 @@ 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - 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 - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/ContactsViewController.xib b/Classes/en.lproj/ContactsViewController.xib index 22e4a7aa9..fef3173c9 100644 --- a/Classes/en.lproj/ContactsViewController.xib +++ b/Classes/en.lproj/ContactsViewController.xib @@ -47,7 +47,6 @@ 290 {320, 44} - _NS:9 NO @@ -66,7 +65,6 @@ 292 {107, 44} - _NS:9 NO @@ -119,7 +117,6 @@ 289 {{107, 0}, {107, 44}} - _NS:9 NO @@ -154,7 +151,6 @@ {{106, 0}, {214, 44}} - _NS:9 @@ -171,7 +167,6 @@ 292 {107, 44} - _NS:9 NO @@ -219,7 +214,6 @@ -2147483356 {107, 44} - _NS:9 NO @@ -252,7 +246,6 @@ {320, 44} - _NS:9 @@ -267,7 +260,6 @@ 274 {{0, 44}, {320, 416}} - _NS:10 3 @@ -299,7 +291,6 @@ {320, 460} - _NS:9 @@ -564,90 +555,9 @@ 94 - - - - ContactsTableViewController - UITableViewController - - IBProjectSource - ./Classes/ContactsTableViewController.h - - - - ContactsViewController - UIViewController - - id - id - id - id - - - - onAddContactClick: - id - - - onAllClick: - id - - - onBackClick: - id - - - onLinphoneClick: - id - - - - UIButton - UIButton - UIButton - UIButton - ContactsTableViewController - UITableView - - - - addButton - UIButton - - - allButton - UIButton - - - backButton - UIButton - - - linphoneButton - UIButton - - - tableController - ContactsTableViewController - - - tableView - UITableView - - - - IBProjectSource - ./Classes/ContactsViewController.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/DialerViewController~ipad.xib b/Classes/en.lproj/DialerViewController~ipad.xib index 9f5148f36..26ab328b9 100644 --- a/Classes/en.lproj/DialerViewController~ipad.xib +++ b/Classes/en.lproj/DialerViewController~ipad.xib @@ -42,7 +42,6 @@ 301 {{127, 200}, {510, 460}} - _NS:9 1 @@ -58,7 +57,6 @@ 301 {{-1000, -1000}, {2768, 2900}} - _NS:9 @@ -72,7 +70,6 @@ 274 {{0, 58}, {768, 842}} - 3 @@ -86,7 +83,6 @@ -2147483356 {{20, 90}, {85, 33}} - _NS:9 NO @@ -129,7 +125,6 @@ 290 {{0, -2000}, {768, 2000}} - _NS:9 @@ -144,7 +139,6 @@ 290 {768, 80} - _NS:9 @@ -160,7 +154,6 @@ 290 {700, 60} - NO @@ -199,7 +192,6 @@ 289 {{698, 4}, {70, 51}} - _NS:9 NO @@ -235,7 +227,6 @@ {768, 80} - _NS:9 @@ -250,7 +241,6 @@ 274 {320, 280} - _NS:9 2 @@ -266,7 +256,6 @@ 292 {{0, 11}, {107, 54}} - 1 @@ -302,7 +291,6 @@ 292 {{107, 11}, {106, 54}} - NO NO @@ -329,7 +317,6 @@ 292 {{213, 11}, {107, 54}} - NO NO @@ -356,7 +343,6 @@ 292 {{0, 73}, {107, 54}} - NO NO @@ -383,7 +369,6 @@ 292 {{107, 73}, {106, 54}} - NO NO @@ -410,7 +395,6 @@ 292 {{213, 73}, {107, 54}} - NO NO @@ -437,7 +421,6 @@ 292 {{0, 135}, {107, 54}} - NO NO @@ -464,7 +447,6 @@ 292 {{107, 135}, {106, 54}} - NO NO @@ -491,7 +473,6 @@ 292 {{213, 135}, {107, 54}} - NO NO @@ -518,7 +499,6 @@ 292 {{0, 197}, {107, 54}} - NO NO @@ -545,7 +525,6 @@ 292 {{107, 197}, {106, 54}} - NO NO @@ -572,7 +551,6 @@ 292 {{213, 197}, {107, 54}} - NO NO @@ -597,7 +575,6 @@ {{0, 640}, {320, 260}} - _NS:9 @@ -612,7 +589,6 @@ 292 {126, 85} - _NS:9 NO @@ -646,7 +622,6 @@ -2147483356 {126, 85} - _NS:9 NO @@ -679,7 +654,6 @@ 292 {{126, 0}, {186, 85}} - _NS:9 NO @@ -713,7 +687,6 @@ -2147483356 {{126, 0}, {186, 85}} - _NS:9 NO @@ -747,8 +720,6 @@ -2147483356 {{126, 0}, {186, 85}} - - _NS:9 NO @@ -779,7 +750,6 @@ {{456, 815}, {312, 85}} - _NS:9 @@ -794,7 +764,6 @@ {768, 900} - _NS:9 @@ -1469,268 +1438,9 @@ 79 - - - - DialerViewController - UIViewController - - id - id - id - - - - onAddContactClick: - id - - - onAddressChange: - id - - - onBackClick: - id - - - - UICallButton - UIButton - UITextField - UIButton - UIView - UICallButton - UIDigitButton - UIEraseButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UITransferButton - UIDigitButton - UICamSwitch - UIView - UIDigitButton - - - - addCallButton - UICallButton - - - addContactButton - UIButton - - - addressField - UITextField - - - backButton - UIButton - - - backgroundView - UIView - - - callButton - UICallButton - - - eightButton - UIDigitButton - - - eraseButton - UIEraseButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - transferButton - UITransferButton - - - twoButton - UIDigitButton - - - videoCameraSwitch - UICamSwitch - - - videoPreview - UIView - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/DialerViewController.h - - - - UIAddressTextField - UITextField - - IBProjectSource - ./Classes/UIAddressTextField.h - - - - UICallButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UICallButton.h - - - - UICamSwitch - UIButton - - preview - UIView - - - preview - - preview - UIView - - - - IBProjectSource - ./Classes/UICamSwitch.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIEraseButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIEraseButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UITransferButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UITransferButton.h - - - - + 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/FirstLoginViewController.xib b/Classes/en.lproj/FirstLoginViewController.xib index 63e616932..e4232bdce 100644 --- a/Classes/en.lproj/FirstLoginViewController.xib +++ b/Classes/en.lproj/FirstLoginViewController.xib @@ -46,7 +46,6 @@ 301 {{33, 312}, {255, 50}} - _NS:9 NO @@ -93,7 +92,6 @@ -2147483379 {{60, 420}, {200, 37}} - NO NO IBCocoaTouchFramework @@ -125,7 +123,6 @@ 301 {{60, 170}, {200, 31}} - NO NO @@ -168,7 +165,6 @@ 301 {{60, 220}, {200, 31}} - NO NO @@ -207,7 +203,6 @@ 301 {{142, 211}, {37, 37}} - NO NO @@ -220,7 +215,6 @@ {320, 460} - 3 @@ -233,7 +227,6 @@ {320, 460} - _NS:9 @@ -453,114 +446,13 @@ 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 com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/en.lproj/HistoryDetailsViewController.xib b/Classes/en.lproj/HistoryDetailsViewController.xib index 516273d34..cd83816fa 100644 --- a/Classes/en.lproj/HistoryDetailsViewController.xib +++ b/Classes/en.lproj/HistoryDetailsViewController.xib @@ -838,10 +838,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/HistoryViewController.xib b/Classes/en.lproj/HistoryViewController.xib index f8e45dcac..0bd694880 100644 --- a/Classes/en.lproj/HistoryViewController.xib +++ b/Classes/en.lproj/HistoryViewController.xib @@ -562,10 +562,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/ImageViewController.xib b/Classes/en.lproj/ImageViewController.xib index c3e4877f0..2deb24b23 100644 --- a/Classes/en.lproj/ImageViewController.xib +++ b/Classes/en.lproj/ImageViewController.xib @@ -252,10 +252,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/InCallViewController.xib b/Classes/en.lproj/InCallViewController.xib index 03d8739de..a35dfab43 100644 --- a/Classes/en.lproj/InCallViewController.xib +++ b/Classes/en.lproj/InCallViewController.xib @@ -447,10 +447,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/en.lproj/IncomingCallViewController.xib b/Classes/en.lproj/IncomingCallViewController.xib index 12fa76ae0..f51eba906 100644 --- a/Classes/en.lproj/IncomingCallViewController.xib +++ b/Classes/en.lproj/IncomingCallViewController.xib @@ -4836,10 +4836,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/WizardViewController.xib b/Classes/en.lproj/WizardViewController.xib index 19ddd7f5d..314276a32 100644 --- a/Classes/en.lproj/WizardViewController.xib +++ b/Classes/en.lproj/WizardViewController.xib @@ -425,10 +425,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/WizardViewController~ipad.xib b/Classes/en.lproj/WizardViewController~ipad.xib index 0b2e69b39..3644e0e0f 100644 --- a/Classes/en.lproj/WizardViewController~ipad.xib +++ b/Classes/en.lproj/WizardViewController~ipad.xib @@ -770,10 +770,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/en.lproj/WizardViews.xib b/Classes/en.lproj/WizardViews.xib index 4f88a1172..d1584ea80 100644 --- a/Classes/en.lproj/WizardViews.xib +++ b/Classes/en.lproj/WizardViews.xib @@ -1538,10 +1538,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib index e2e39de44..abcf137a7 100644 --- a/Classes/fr.lproj/ChatRoomViewController.xib +++ b/Classes/fr.lproj/ChatRoomViewController.xib @@ -977,170 +977,7 @@ 93 - - - - ChatRoomTableViewController - UITableViewController - - IBProjectSource - ./Classes/ChatRoomTableViewController.h - - - - ChatRoomViewController - UIViewController - - id - id - id - id - id - id - id - - - - onBackClick: - id - - - onEditClick: - id - - - onListTap: - id - - - onMessageChange: - id - - - onPictureClick: - id - - - onSendClick: - id - - - onTransferCancelClick: - id - - - - UILabel - UIImageView - UIButton - UIView - UIToggleButton - UIView - UIProgressView - UITapGestureRecognizer - UIImageView - HPGrowingTextView - UIView - UIButton - UIButton - ChatRoomTableViewController - UIImageView - UIView - UIView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - cancelTransferButton - UIButton - - - chatView - UIView - - - editButton - UIToggleButton - - - headerView - UIView - - - imageTransferProgressBar - UIProgressView - - - listTapGestureRecognizer - UITapGestureRecognizer - - - messageBackgroundImage - UIImageView - - - messageField - HPGrowingTextView - - - messageView - UIView - - - pictureButton - UIButton - - - sendButton - UIButton - - - tableController - ChatRoomTableViewController - - - transferBackgroundImage - UIImageView - - - transferView - UIView - - - waitView - UIView - - - - IBProjectSource - ./Classes/ChatRoomViewController.h - - - - HPGrowingTextView - UIView - - IBProjectSource - ./Classes/HPGrowingTextView.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES diff --git a/Classes/fr.lproj/ChatViewController.xib b/Classes/fr.lproj/ChatViewController.xib index ebdcaca48..a305f9d93 100644 --- a/Classes/fr.lproj/ChatViewController.xib +++ b/Classes/fr.lproj/ChatViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -449,100 +449,9 @@ 28 - - - - ChatTableViewController - UITableViewController - - IBProjectSource - ./Classes/ChatTableViewController.h - - - - ChatViewController - UIViewController - - id - id - - - - onAddClick: - id - - - onEditClick: - id - - - - UITextField - UIToggleButton - ChatTableViewController - - - - addressField - UITextField - - - editButton - UIToggleButton - - - tableController - ChatTableViewController - - - - IBProjectSource - ./Classes/ChatViewController.h - - - - TUNinePatch - NSObject - - IBProjectSource - ./Classes/TUNinePatch.h - - - - UILinphoneTextField - UITextField - - backgroundNinePatch - TUNinePatch - - - backgroundNinePatch - - backgroundNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneTextField.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/ContactDetailsLabelViewController.xib b/Classes/fr.lproj/ContactDetailsLabelViewController.xib index 45845b9da..bd2befa68 100644 --- a/Classes/fr.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/fr.lproj/ContactDetailsLabelViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -194,7 +194,7 @@ AAgACAAIAAEAAQABAAE - + 3 MCAwAA @@ -224,7 +224,7 @@ AAgACAAIAAEAAQABAAE {320, 460} - + IBCocoaTouchFramework @@ -357,46 +357,9 @@ AAgACAAIAAEAAQABAAE 16 - - - - ContactDetailsLabelViewController - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - tableView - UITableView - - - tableView - - tableView - UITableView - - - - IBProjectSource - ./Classes/ContactDetailsLabelViewController.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/ContactDetailsViewController.xib b/Classes/fr.lproj/ContactDetailsViewController.xib index 4c3934262..667ee6055 100644 --- a/Classes/fr.lproj/ContactDetailsViewController.xib +++ b/Classes/fr.lproj/ContactDetailsViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -252,7 +252,7 @@ AAgACAAIAAEAAQABAAE - + 3 MCAwAA @@ -282,7 +282,7 @@ AAgACAAIAAEAAQABAAE {320, 460} - + IBCocoaTouchFramework @@ -572,188 +572,9 @@ AAgACAAIAAEAAQABAAE 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - 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 - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/ContactsViewController.xib b/Classes/fr.lproj/ContactsViewController.xib index 26f21d348..4629e79bd 100644 --- a/Classes/fr.lproj/ContactsViewController.xib +++ b/Classes/fr.lproj/ContactsViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -554,90 +554,9 @@ 94 - - - - ContactsTableViewController - UITableViewController - - IBProjectSource - ./Classes/ContactsTableViewController.h - - - - ContactsViewController - UIViewController - - id - id - id - id - - - - onAddContactClick: - id - - - onAllClick: - id - - - onBackClick: - id - - - onLinphoneClick: - id - - - - UIButton - UIButton - UIButton - UIButton - ContactsTableViewController - UITableView - - - - addButton - UIButton - - - allButton - UIButton - - - backButton - UIButton - - - linphoneButton - UIButton - - - tableController - ContactsTableViewController - - - tableView - UITableView - - - - IBProjectSource - ./Classes/ContactsViewController.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/DialerViewController~ipad.xib b/Classes/fr.lproj/DialerViewController~ipad.xib index 577478353..2af66f70a 100644 --- a/Classes/fr.lproj/DialerViewController~ipad.xib +++ b/Classes/fr.lproj/DialerViewController~ipad.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -1437,268 +1437,9 @@ 79 - - - - DialerViewController - UIViewController - - id - id - id - - - - onAddContactClick: - id - - - onAddressChange: - id - - - onBackClick: - id - - - - UICallButton - UIButton - UITextField - UIButton - UIView - UICallButton - UIDigitButton - UIEraseButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UITransferButton - UIDigitButton - UICamSwitch - UIView - UIDigitButton - - - - addCallButton - UICallButton - - - addContactButton - UIButton - - - addressField - UITextField - - - backButton - UIButton - - - backgroundView - UIView - - - callButton - UICallButton - - - eightButton - UIDigitButton - - - eraseButton - UIEraseButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - transferButton - UITransferButton - - - twoButton - UIDigitButton - - - videoCameraSwitch - UICamSwitch - - - videoPreview - UIView - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/DialerViewController.h - - - - UIAddressTextField - UITextField - - IBProjectSource - ./Classes/UIAddressTextField.h - - - - UICallButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UICallButton.h - - - - UICamSwitch - UIButton - - preview - UIView - - - preview - - preview - UIView - - - - IBProjectSource - ./Classes/UICamSwitch.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIEraseButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIEraseButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UITransferButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UITransferButton.h - - - - + 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/FirstLoginViewController.xib b/Classes/fr.lproj/FirstLoginViewController.xib index 05e168819..14f23a56e 100644 --- a/Classes/fr.lproj/FirstLoginViewController.xib +++ b/Classes/fr.lproj/FirstLoginViewController.xib @@ -445,114 +445,13 @@ 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 com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/fr.lproj/HistoryDetailsViewController.xib b/Classes/fr.lproj/HistoryDetailsViewController.xib index e518aefd3..d418215d7 100644 --- a/Classes/fr.lproj/HistoryDetailsViewController.xib +++ b/Classes/fr.lproj/HistoryDetailsViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -837,10 +837,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/HistoryViewController.xib b/Classes/fr.lproj/HistoryViewController.xib index 93d618a89..d1ce68a87 100644 --- a/Classes/fr.lproj/HistoryViewController.xib +++ b/Classes/fr.lproj/HistoryViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -561,10 +561,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/ImageViewController.xib b/Classes/fr.lproj/ImageViewController.xib index 708556ae8..33dc45d1c 100644 --- a/Classes/fr.lproj/ImageViewController.xib +++ b/Classes/fr.lproj/ImageViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -251,10 +251,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/InCallViewController.xib b/Classes/fr.lproj/InCallViewController.xib index e62df6703..e5a97fb30 100644 --- a/Classes/fr.lproj/InCallViewController.xib +++ b/Classes/fr.lproj/InCallViewController.xib @@ -446,10 +446,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/fr.lproj/IncomingCallViewController.xib b/Classes/fr.lproj/IncomingCallViewController.xib index ef0b1ed02..2c7cd6cdc 100644 --- a/Classes/fr.lproj/IncomingCallViewController.xib +++ b/Classes/fr.lproj/IncomingCallViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -4835,10 +4835,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/WizardViewController.xib b/Classes/fr.lproj/WizardViewController.xib index f72df4827..c3b7c1f29 100644 --- a/Classes/fr.lproj/WizardViewController.xib +++ b/Classes/fr.lproj/WizardViewController.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -424,10 +424,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/WizardViewController~ipad.xib b/Classes/fr.lproj/WizardViewController~ipad.xib index 97bad9d75..0a1f3c058 100644 --- a/Classes/fr.lproj/WizardViewController~ipad.xib +++ b/Classes/fr.lproj/WizardViewController~ipad.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -768,10 +768,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Classes/fr.lproj/WizardViews.xib b/Classes/fr.lproj/WizardViews.xib index 80063c6d8..073e3646f 100644 --- a/Classes/fr.lproj/WizardViews.xib +++ b/Classes/fr.lproj/WizardViews.xib @@ -1,7 +1,7 @@ - 1536 + 1280 11E53 1938 1138.47 @@ -1526,10 +1526,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index a962fb583..d9ac6f854 100644 Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index e719c7c7b..f3ef71d1b 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 2f190d764..a9a0ea715 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -24,17 +24,17 @@ backup - 3 + 4 class BLWrapperHandle name - Classes/ContactDetailsViewController/3/ContactDetailsViewController.xib + Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib change date - 2012-09-20T15:19:32Z + 2012-09-25T09:16:19Z changed values class @@ -44,7 +44,7 @@ flags 0 hash - 1caa10b45e5b72c0b45d43ff5ee656a6 + 43882923c210d264214497b3ab945eff name ContactDetailsViewController.xib @@ -233,9 +233,9 @@ versions en - 3 + 4 fr - 3 + 4 @@ -243,17 +243,17 @@ backup - 3 + 4 class BLWrapperHandle name - Classes/ContactDetailsLabelViewController/3/ContactDetailsLabelViewController.xib + Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib change date - 2012-09-20T15:19:31Z + 2012-09-25T09:16:19Z changed values class @@ -263,7 +263,7 @@ flags 0 hash - 08525b9077736429caae65f799b0dc2e + 5c405771bb00fa3b9d58151b4f959205 name ContactDetailsLabelViewController.xib @@ -327,9 +327,9 @@ versions en - 3 + 4 fr - 3 + 4 @@ -337,17 +337,17 @@ backup - 36 + 37 class BLWrapperHandle name - Classes/ChatRoomViewController/36/ChatRoomViewController.xib + Classes/ChatRoomViewController/37/ChatRoomViewController.xib change date - 2012-09-24T14:48:31Z + 2012-09-25T09:16:19Z changed values class @@ -357,7 +357,7 @@ flags 0 hash - c57c7e4815f8a5c1d2b7c5200f742dd5 + 2c29ad50834be771f98d7848cce343d2 name ChatRoomViewController.xib @@ -793,9 +793,9 @@ versions en - 36 + 37 fr - 36 + 37 @@ -803,17 +803,17 @@ backup - 15 + 16 class BLWrapperHandle name - Classes/ChatViewController/15/ChatViewController.xib + Classes/ChatViewController/16/ChatViewController.xib change date - 2012-09-24T14:43:23Z + 2012-09-25T09:16:19Z changed values class @@ -823,7 +823,7 @@ flags 0 hash - 8c14eaa11baf171c54e5b5e4111cf584 + 7505ccd2bea1c762e561f35644e6dffe name ChatViewController.xib @@ -1038,9 +1038,9 @@ versions en - 15 + 16 fr - 15 + 16 @@ -1048,17 +1048,17 @@ backup - 12 + 13 class BLWrapperHandle name - Classes/ContactsViewController/12/ContactsViewController.xib + Classes/ContactsViewController/13/ContactsViewController.xib change date - 2012-09-21T08:19:54Z + 2012-09-25T09:16:19Z changed values class @@ -1068,7 +1068,7 @@ flags 0 hash - bda616bf70739869c9bbce01c4de1324 + 8e543e6857c6d386b26dfcbb630432f3 name ContactsViewController.xib @@ -1358,9 +1358,9 @@ versions en - 12 + 13 fr - 12 + 13 @@ -1912,17 +1912,17 @@ backup - 11 + 12 class BLWrapperHandle name - Classes/DialerViewController~ipad/11/DialerViewController~ipad.xib + Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib change date - 2012-09-21T12:43:40Z + 2012-09-25T09:16:19Z changed values class @@ -1932,7 +1932,7 @@ flags 0 hash - 75e89e01d452e053bea070cc7ec8e9bc + 59f1094a1a961adfb2ee06864bc51600 name DialerViewController~ipad.xib @@ -2471,9 +2471,9 @@ versions en - 11 + 12 fr - 11 + 12 @@ -2481,17 +2481,17 @@ backup - 4 + 5 class BLWrapperHandle name - Classes/FirstLoginViewController/4/FirstLoginViewController.xib + Classes/FirstLoginViewController/5/FirstLoginViewController.xib change date - 2012-09-24T14:43:15Z + 2012-09-25T09:16:19Z changed values class @@ -2501,7 +2501,7 @@ flags 0 hash - 40d122862f8d0146f59a09192ffbcffe + 955b765235e9de0f0fc6f830777dae53 name FirstLoginViewController.xib @@ -2665,9 +2665,9 @@ versions en - 4 + 5 fr - 4 + 5 @@ -2675,17 +2675,17 @@ backup - 4 + 5 class BLWrapperHandle name - Classes/HistoryDetailsViewController/4/HistoryDetailsViewController.xib + Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib change date - 2012-09-20T15:21:47Z + 2012-09-25T09:16:19Z changed values class @@ -2695,7 +2695,7 @@ flags 0 hash - 76e9fd5b54782273c07d00a96c0c4859 + e32663fb7bb499508cfde62e883bded0 name HistoryDetailsViewController.xib @@ -3149,9 +3149,9 @@ versions en - 4 + 5 fr - 4 + 5 @@ -3159,17 +3159,17 @@ backup - 11 + 12 class BLWrapperHandle name - Classes/HistoryViewController/11/HistoryViewController.xib + Classes/HistoryViewController/12/HistoryViewController.xib change date - 2012-09-20T15:21:47Z + 2012-09-25T09:16:19Z changed values class @@ -3179,7 +3179,7 @@ flags 0 hash - 74cb66e1edce45c588eb919f833b5612 + 8c91c616433e85834e20d758d6de0e2e name HistoryViewController.xib @@ -3418,9 +3418,9 @@ versions en - 11 + 12 fr - 11 + 12 @@ -3428,17 +3428,17 @@ backup - 4 + 5 class BLWrapperHandle name - Classes/InCallViewController/4/InCallViewController.xib + Classes/InCallViewController/5/InCallViewController.xib change date - 2012-09-20T15:21:46Z + 2012-09-25T09:16:20Z changed values class @@ -3448,7 +3448,7 @@ flags 0 hash - 69a923b81b02ce81e0d4fb038ffd0b4f + 7f214a2ef7edff45568215c89af0ece4 name InCallViewController.xib @@ -3487,9 +3487,9 @@ versions en - 4 + 5 fr - 4 + 5 @@ -3497,17 +3497,17 @@ backup - 3 + 4 class BLWrapperHandle name - Classes/IncomingCallViewController/3/IncomingCallViewController.xib + Classes/IncomingCallViewController/4/IncomingCallViewController.xib change date - 2012-09-20T15:21:46Z + 2012-09-25T09:16:20Z changed values class @@ -3517,7 +3517,7 @@ flags 0 hash - 4d010445881216ef3cfc44aac4e542e1 + b540fdc804ad4e5382cd8c8e57936e4b name IncomingCallViewController.xib @@ -3679,9 +3679,9 @@ versions en - 3 + 4 fr - 3 + 4 @@ -3689,17 +3689,17 @@ backup - 14 + 15 class BLWrapperHandle name - Classes/WizardViewController/14/WizardViewController.xib + Classes/WizardViewController/15/WizardViewController.xib change date - 2012-09-21T13:03:03Z + 2012-09-25T09:16:25Z changed values class @@ -3709,7 +3709,7 @@ flags 0 hash - e1fc10096ab7b22c55089d5dccdf2015 + 1f374617f40cb46101a653d625d13fff name WizardViewController.xib @@ -4999,9 +4999,9 @@ versions en - 14 + 15 fr - 14 + 15 @@ -5009,17 +5009,17 @@ backup - 8 + 9 class BLWrapperHandle name - Classes/ImageViewController/8/ImageViewController.xib + Classes/ImageViewController/9/ImageViewController.xib change date - 2012-09-20T15:21:46Z + 2012-09-25T09:16:20Z changed values class @@ -5029,7 +5029,7 @@ flags 0 hash - cf069e97eab14629cf2aa49715fd2362 + e7fb7fceec086e05fc06199fa2fc727e name ImageViewController.xib @@ -5093,9 +5093,9 @@ versions en - 8 + 9 fr - 8 + 9 @@ -5103,17 +5103,17 @@ backup - 16 + 17 class BLWrapperHandle name - Classes/WizardViews/16/WizardViews.xib + Classes/WizardViews/17/WizardViews.xib change date - 2012-09-24T07:27:30Z + 2012-09-25T09:16:24Z changed values class @@ -5123,7 +5123,7 @@ flags 0 hash - b68ffd1e89d760c822e0a9f66e9caa06 + f4ecee252717a38ef19deba7126a3aa2 name WizardViews.xib @@ -6555,9 +6555,9 @@ versions en - 16 + 17 fr - 16 + 17 @@ -6565,17 +6565,17 @@ backup - 10 + 11 class BLWrapperHandle name - Classes/WizardViewController~ipad/10/WizardViewController~ipad.xib + Classes/WizardViewController~ipad/11/WizardViewController~ipad.xib change date - 2012-09-21T13:03:02Z + 2012-09-25T09:16:23Z changed values class @@ -6585,7 +6585,7 @@ flags 0 hash - 950141adce6aab34f1068654a47edf3c + 001756cc0181877ec9b22a738a582193 name WizardViewController~ipad.xib @@ -6899,9 +6899,9 @@ versions en - 10 + 11 fr - 10 + 11 @@ -6936,17 +6936,17 @@ backup - 7 + 9 class BLWrapperHandle name - LinphoneUI/UICallBar/7/UICallBar.xib + LinphoneUI/UICallBar/9/UICallBar.xib change date - 2012-09-20T15:21:45Z + 2012-09-25T10:19:35Z changed values class @@ -6956,7 +6956,7 @@ flags 0 hash - 3d9fb2748e85ed54a71f223656d2f5a4 + 9749cf40e44f80d8f216e5ea70f90e8c name UICallBar.xib @@ -8058,9 +8058,9 @@ versions en - 7 + 9 fr - 7 + 9 @@ -8068,17 +8068,17 @@ backup - 6 + 7 class BLWrapperHandle name - LinphoneUI/UICallBar~ipad/6/UICallBar~ipad.xib + LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib change date - 2012-09-20T15:24:01Z + 2012-09-25T09:16:23Z changed values class @@ -8088,7 +8088,7 @@ flags 0 hash - 388aee3f3bd637d1a4e4f01b09cdac8b + 3d366e4bfeac691f39183968a6d63579 name UICallBar~ipad.xib @@ -9233,9 +9233,9 @@ versions en - 6 + 7 fr - 6 + 7 @@ -9250,17 +9250,17 @@ name LinphoneUI/UIConferenceHeader/1/UIConferenceHeader.xib - 2 + 3 class BLWrapperHandle name - LinphoneUI/UIConferenceHeader/2/UIConferenceHeader.xib + LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib change date - 2012-09-19T14:21:28Z + 2012-09-25T09:16:22Z changed values class @@ -9270,7 +9270,7 @@ flags 0 hash - 89c4c1d271514b74c615584d0de71eab + 6b2fc885020930eed8cc187bf1383346 name UIConferenceHeader.xib @@ -9334,9 +9334,9 @@ versions en - 2 + 3 fr - 2 + 3 fr_FR 1 @@ -9346,17 +9346,17 @@ backup - 2 + 3 class BLWrapperHandle name - LinphoneUI/UIContactDetailsFooter/2/UIContactDetailsFooter.xib + LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib change date - 2012-09-20T15:24:01Z + 2012-09-25T09:16:22Z changed values class @@ -9366,7 +9366,7 @@ flags 0 hash - 4982cb7d83d9ace9fae48e656fb999d2 + e5ec2a4a72a470502b16f5f04b202480 name UIContactDetailsFooter.xib @@ -9430,9 +9430,9 @@ versions en - 2 + 3 fr - 2 + 3 @@ -9440,17 +9440,17 @@ backup - 8 + 9 class BLWrapperHandle name - LinphoneUI/UIMainBar/8/UIMainBar.xib + LinphoneUI/UIMainBar/9/UIMainBar.xib change date - 2012-09-24T09:24:19Z + 2012-09-25T09:16:21Z changed values class @@ -9460,7 +9460,7 @@ flags 0 hash - 3f33781c8e9039686dc8bbece53c3962 + 001c2f28174fcded7ef3fd932a9875d7 name UIMainBar.xib @@ -9795,9 +9795,9 @@ versions en - 8 + 9 fr - 8 + 9 @@ -9805,17 +9805,17 @@ backup - 7 + 8 class BLWrapperHandle name - LinphoneUI/UIMainBar~ipad/7/UIMainBar~ipad.xib + LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib change date - 2012-09-21T12:33:08Z + 2012-09-25T09:16:21Z changed values class @@ -9825,7 +9825,7 @@ flags 0 hash - 7515bfc55761e951edeabce40676d625 + 50bad1c64debc965bbd5e883be490e61 name UIMainBar~ipad.xib @@ -10441,9 +10441,9 @@ versions en - 7 + 8 fr - 7 + 8 @@ -10451,17 +10451,17 @@ backup - 3 + 4 class BLWrapperHandle name - LinphoneUI/UIContactDetailsHeader/3/UIContactDetailsHeader.xib + LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib change date - 2012-09-24T14:05:12Z + 2012-09-25T09:16:21Z changed values class @@ -10471,7 +10471,7 @@ flags 0 hash - e226222023500a3518ea1b00959f6716 + a3054fa100ec1a034084f20d8b1369d9 name UIContactDetailsHeader.xib @@ -10558,9 +10558,9 @@ versions en - 3 + 4 fr - 3 + 4 @@ -10568,17 +10568,17 @@ backup - 4 + 9 class BLWrapperHandle name - LinphoneUI/UICallCell/4/UICallCell.xib + LinphoneUI/UICallCell/9/UICallCell.xib change date - 2012-09-24T09:24:18Z + 2012-09-25T13:25:00Z changed values class @@ -10588,7 +10588,7 @@ flags 0 hash - e86bebbcdf5309f743354e41c3fdd8c3 + 4ec34c73102f4cc78c2fa16666a0d1e3 name UICallCell.xib @@ -10815,6 +10815,690 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Audio codec"; ObjectID = "84"; + errors + + flags + 0 + key + 84.accessibilityLabel + localizations + + en + Audio codec + fr + Codec audio + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "SILK"; ObjectID = "84"; + errors + + flags + 2 + key + 84.text + localizations + + en + SILK + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Codec:"; ObjectID = "85"; + errors + + flags + 0 + key + 85.text + localizations + + en + Codec: + fr + Codec: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Audio upload bandwidth"; ObjectID = "90"; + errors + + flags + 0 + key + 90.accessibilityLabel + localizations + + en + Audio upload bandwidth + fr + Bande passante montante de l'audio + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "2 KB/s"; ObjectID = "90"; + errors + + flags + 2 + key + 90.text + localizations + + en + 2 KB/s + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Upload bandwidth:"; ObjectID = "91"; + errors + + flags + 0 + key + 91.text + localizations + + en + Upload bandwidth: + fr + Débit montant: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Download bandwidth:"; ObjectID = "93"; + errors + + flags + 0 + key + 93.text + localizations + + en + Download bandwidth: + fr + Débit descendant: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Video upload bandwidth"; ObjectID = "94"; + errors + + flags + 0 + key + 94.accessibilityLabel + localizations + + en + Video upload bandwidth + fr + Bande passante montante de la vidéo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "10.0 KB/s"; ObjectID = "94"; + errors + + flags + 2 + key + 94.text + localizations + + en + 10.0 KB/s + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Audio section"; ObjectID = "95"; + errors + + flags + 0 + key + 95.accessibilityLabel + localizations + + en + Audio section + fr + Section audio + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Audio"; ObjectID = "95"; + errors + + flags + 0 + key + 95.text + localizations + + en + Audio + fr + Audio + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Audio ICE connectivity state"; ObjectID = "97"; + errors + + flags + 0 + key + 97.accessibilityLabel + localizations + + en + Audio ICE connectivity state + fr + État de la connectivité ICE de la audio + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "not activated"; ObjectID = "97"; + errors + + flags + 2 + key + 97.text + localizations + + en + not activated + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "ICE connectivity:"; ObjectID = "98"; + errors + + flags + 0 + key + 98.text + localizations + + en + ICE connectivity: + fr + Connectivité ICE: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Video section"; ObjectID = "101"; + errors + + flags + 0 + key + 101.accessibilityLabel + localizations + + en + Video section + fr + Section vidéo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Video"; ObjectID = "101"; + errors + + flags + 0 + key + 101.text + localizations + + en + Video + fr + Vidéo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Codec:"; ObjectID = "105"; + errors + + flags + 0 + key + 105.text + localizations + + en + Codec: + fr + Codec: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Video codec"; ObjectID = "106"; + errors + + flags + 0 + key + 106.accessibilityLabel + localizations + + en + Video codec + fr + Codec vidéo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "SILK"; ObjectID = "106"; + errors + + flags + 2 + key + 106.text + localizations + + en + SILK + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Upload bandwidth:"; ObjectID = "107"; + errors + + flags + 0 + key + 107.text + localizations + + en + Upload bandwidth: + fr + Débit montant: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Video upload bandwidth"; ObjectID = "108"; + errors + + flags + 0 + key + 108.accessibilityLabel + localizations + + en + Video upload bandwidth + fr + Bande passante montante de la vidéo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "2 KB/s"; ObjectID = "108"; + errors + + flags + 2 + key + 108.text + localizations + + en + 2 KB/s + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Audio download bandwidth"; ObjectID = "109"; + errors + + flags + 0 + key + 109.accessibilityLabel + localizations + + en + Audio download bandwidth + fr + Bande passante descendante de l'audio + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "10.0 KB/s"; ObjectID = "109"; + errors + + flags + 2 + key + 109.text + localizations + + en + 10.0 KB/s + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Download bandwidth:"; ObjectID = "110"; + errors + + flags + 0 + key + 110.text + localizations + + en + Download bandwidth: + fr + Débit descendant: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "ICE connectivity:"; ObjectID = "111"; + errors + + flags + 0 + key + 111.text + localizations + + en + ICE connectivity: + fr + Connectivité ICE: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Video ICE connectivity state"; ObjectID = "112"; + errors + + flags + 0 + key + 112.accessibilityLabel + localizations + + en + Video ICE connectivity state + fr + État de la connectivité ICE de la vidéo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "not activated"; ObjectID = "112"; + errors + + flags + 2 + key + 112.text + localizations + + en + not activated + + snapshots + + old objects @@ -10823,9 +11507,9 @@ versions en - 4 + 9 fr - 4 + 9 @@ -10870,7 +11554,7 @@ change date - 2012-09-24T09:53:58Z + 2012-09-25T10:39:02Z changed values class @@ -10880,7 +11564,7 @@ flags 0 hash - 660159e85a578aec4e5cdc047a29f686 + 1221a18069179e955b6cb15b1bb69337 name Localizable.strings @@ -11689,6 +12373,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + ICE has established a direct connection to the remote host + errors + + flags + 0 + key + Direct connection + localizations + + en + Direct connection + fr + Connexion direct + + snapshots + + change date 2001-01-01T00:00:00Z @@ -11822,19 +12531,19 @@ La cause était: %2$@ class BLStringKeyObject comment - No comment provided by engineer. + ICE processing has failed errors flags 0 key - First name + Failed localizations en - First name + Failed fr - Prénom + Échec snapshots @@ -11853,13 +12562,13 @@ La cause était: %2$@ flags 0 key - Ignore + First name localizations en - Ignore + First name fr - Ignoner + Prénom snapshots @@ -11897,44 +12606,19 @@ La cause était: %2$@ class BLStringKeyObject comment - No comment provided by engineer. + ICE process is in progress errors flags 0 key - IM_MSG + In progress localizations en - Incoming message from %@ + In progress fr - Message entrant de %@ - - snapshots - - - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - No comment provided by engineer. - errors - - flags - 0 - key - Image sent - localizations - - en - Image sent - fr - Image envoyé + En cours snapshots @@ -11964,31 +12648,6 @@ La cause était: %2$@ snapshots - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - No comment provided by engineer. - errors - - flags - 0 - key - Incoming file - localizations - - en - Incoming file - fr - Fichier entrant - - snapshots - - change date 2001-01-01T00:00:00Z @@ -12112,6 +12771,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + ICE has established a connection to the remote host through one or several NATs + errors + + flags + 0 + key + NAT(s) connection + localizations + + en + NAT(s) connection + fr + Connexion par NAT + + snapshots + + change date 2001-01-01T00:00:00Z @@ -12162,6 +12846,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + No codec + localizations + + en + No codec + fr + Aucun codec + + snapshots + + change date 2001-01-01T00:00:00Z @@ -12212,6 +12921,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + ICE has not been activated for this call + errors + + flags + 0 + key + Not activated + localizations + + en + Not activated + fr + Pas activée + + snapshots + + change date 2001-01-01T00:00:00Z @@ -12237,6 +12971,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Ok + localizations + + en + Ok + fr + Ok + + snapshots + + change date 2001-01-01T00:00:00Z @@ -12262,31 +13021,6 @@ La cause était: %2$@ snapshots - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - No comment provided by engineer. - errors - - flags - 0 - key - Ok - localizations - - en - Ok - fr - Ok - - snapshots - - change date 2001-01-01T00:00:00Z @@ -12312,31 +13046,6 @@ La cause était: %2$@ snapshots - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - No comment provided by engineer. - errors - - flags - 0 - key - Photo library - localizations - - en - Photo library - fr - Album photos - - snapshots - - change date 2001-01-01T00:00:00Z @@ -12387,6 +13096,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Photo library + localizations + + en + Photo library + fr + Album photos + + snapshots + + change date 2001-01-01T00:00:00Z @@ -12537,6 +13271,56 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + ICE has established a connection through a relay + errors + + flags + 0 + key + Relay connection + localizations + + en + Relay connection + fr + Connexion relayée + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Remove + localizations + + en + Remove + fr + Supprimer + + snapshots + + change date 2001-01-01T00:00:00Z @@ -12943,31 +13727,6 @@ La cause était: %2$@ snapshots - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - No comment provided by engineer. - errors - - flags - 0 - key - Warning - localizations - - en - Warning - fr - Attention - - snapshots - - change date 2001-01-01T00:00:00Z @@ -13652,6 +14411,131 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Ignore + localizations + + en + Ignore + fr + Ignoner + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + IM_MSG + localizations + + en + Incoming message from %@ + fr + Message entrant de %@ + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Image sent + localizations + + en + Image sent + fr + Image envoyé + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Incoming file + localizations + + en + Incoming file + fr + Fichier entrant + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Warning + localizations + + en + Warning + fr + Attention + + snapshots + + plist file diff --git a/linphone.ldb/Resources/Classes/ChatRoomViewController/36/ChatRoomViewController.xib b/linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib similarity index 85% rename from linphone.ldb/Resources/Classes/ChatRoomViewController/36/ChatRoomViewController.xib rename to linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib index 04d79fd23..4c0e4a66b 100644 --- a/linphone.ldb/Resources/Classes/ChatRoomViewController/36/ChatRoomViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib @@ -54,7 +54,6 @@ 292 {{-13, -5}, {131, 107}} - _NS:9 NO @@ -69,7 +68,6 @@ 292 {{20, 6}, {65, 65}} - _NS:9 NO @@ -89,7 +87,6 @@ 290 {{101, 37}, {199, 43}} - _NS:9 NO @@ -122,7 +119,6 @@ {320, 80} - _NS:9 @@ -137,7 +133,6 @@ 274 {{0, 80}, {320, 279}} - _NS:9 @@ -163,7 +158,6 @@ 274 {320, 57} - _NS:9 @@ -179,7 +173,6 @@ 297 {{262, 0}, {58, 57}} - _NS:9 NO @@ -222,7 +215,6 @@ 298 {{20, 24}, {222, 9}} - _NS:9 NO @@ -236,7 +228,6 @@ {{0, 359}, {320, 57}} - _NS:9 @@ -251,7 +242,6 @@ 274 {320, 57} - _NS:9 @@ -267,7 +257,6 @@ 297 {{262, 0}, {58, 57}} - _NS:9 NO @@ -324,7 +313,6 @@ 300 {35, 57} - _NS:9 NO @@ -362,7 +350,6 @@ 274 {{39, 12}, {218, 33}} - _NS:9 @@ -371,7 +358,6 @@ {{0, 359}, {320, 57}} - _NS:9 @@ -380,7 +366,6 @@ {{0, 44}, {320, 416}} - _NS:9 @@ -395,7 +380,6 @@ 290 {320, 44} - _NS:9 NO @@ -410,7 +394,6 @@ 292 {160, 44} - _NS:9 @@ -452,7 +435,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 @@ -492,7 +474,6 @@ {320, 44} - _NS:9 @@ -507,7 +488,6 @@ 301 {{142, 211}, {37, 37}} - NO NO NO @@ -519,7 +499,6 @@ {320, 460} - 3 @@ -534,7 +513,6 @@ {320, 460} - _NS:9 @@ -1000,170 +978,7 @@ 93 - - - - ChatRoomTableViewController - UITableViewController - - IBProjectSource - ./Classes/ChatRoomTableViewController.h - - - - ChatRoomViewController - UIViewController - - id - id - id - id - id - id - id - - - - onBackClick: - id - - - onEditClick: - id - - - onListTap: - id - - - onMessageChange: - id - - - onPictureClick: - id - - - onSendClick: - id - - - onTransferCancelClick: - id - - - - UILabel - UIImageView - UIButton - UIView - UIToggleButton - UIView - UIProgressView - UITapGestureRecognizer - UIImageView - HPGrowingTextView - UIView - UIButton - UIButton - ChatRoomTableViewController - UIImageView - UIView - UIView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - cancelTransferButton - UIButton - - - chatView - UIView - - - editButton - UIToggleButton - - - headerView - UIView - - - imageTransferProgressBar - UIProgressView - - - listTapGestureRecognizer - UITapGestureRecognizer - - - messageBackgroundImage - UIImageView - - - messageField - HPGrowingTextView - - - messageView - UIView - - - pictureButton - UIButton - - - sendButton - UIButton - - - tableController - ChatRoomTableViewController - - - transferBackgroundImage - UIImageView - - - transferView - UIView - - - waitView - UIView - - - - IBProjectSource - ./Classes/ChatRoomViewController.h - - - - HPGrowingTextView - UIView - - IBProjectSource - ./Classes/HPGrowingTextView.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES diff --git a/linphone.ldb/Resources/Classes/ChatViewController/15/ChatViewController.xib b/linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib similarity index 82% rename from linphone.ldb/Resources/Classes/ChatViewController/15/ChatViewController.xib rename to linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib index 638433c1b..aae2a8c7b 100644 --- a/linphone.ldb/Resources/Classes/ChatViewController/15/ChatViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib @@ -48,7 +48,6 @@ 290 {320, 44} - _NS:9 NO @@ -63,7 +62,6 @@ 292 {160, 44} - _NS:9 NO @@ -114,7 +112,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -156,7 +153,6 @@ {320, 44} - _NS:9 @@ -173,7 +169,6 @@ 274 {{0, 79}, {320, 381}} - _NS:9 3 @@ -206,7 +201,6 @@ 290 {{2, 44}, {316, 35}} - _NS:9 @@ -250,7 +244,6 @@ {320, 460} - _NS:9 @@ -457,100 +450,9 @@ 28 - - - - ChatTableViewController - UITableViewController - - IBProjectSource - ./Classes/ChatTableViewController.h - - - - ChatViewController - UIViewController - - id - id - - - - onAddClick: - id - - - onEditClick: - id - - - - UITextField - UIToggleButton - ChatTableViewController - - - - addressField - UITextField - - - editButton - UIToggleButton - - - tableController - ChatTableViewController - - - - IBProjectSource - ./Classes/ChatViewController.h - - - - TUNinePatch - NSObject - - IBProjectSource - ./Classes/TUNinePatch.h - - - - UILinphoneTextField - UITextField - - backgroundNinePatch - TUNinePatch - - - backgroundNinePatch - - backgroundNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneTextField.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/3/ContactDetailsLabelViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib similarity index 88% rename from linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/3/ContactDetailsLabelViewController.xib rename to linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib index 182c718cd..5a1cdfbe1 100644 --- a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/3/ContactDetailsLabelViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib @@ -42,7 +42,6 @@ 274 {320, 460} - _NS:9 NO @@ -64,7 +63,6 @@ 290 {320, 44} - _NS:9 NO @@ -79,7 +77,6 @@ 292 {160, 44} - _NS:9 NO @@ -128,7 +125,6 @@ {320, 44} - _NS:9 @@ -145,7 +141,6 @@ 306 {{0, 59}, {320, 401}} - _NS:9 1 @@ -175,7 +170,6 @@ {320, 460} - 3 @@ -313,46 +307,9 @@ 16 - - - - ContactDetailsLabelViewController - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - tableView - UITableView - - - tableView - - tableView - UITableView - - - - IBProjectSource - ./Classes/ContactDetailsLabelViewController.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/ContactDetailsViewController/3/ContactDetailsViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib similarity index 74% rename from linphone.ldb/Resources/Classes/ContactDetailsViewController/3/ContactDetailsViewController.xib rename to linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib index 369a774f5..646a59cc9 100644 --- a/linphone.ldb/Resources/Classes/ContactDetailsViewController/3/ContactDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib @@ -48,7 +48,6 @@ 290 {320, 44} - _NS:9 NO @@ -63,7 +62,6 @@ 292 {160, 44} - _NS:9 NO @@ -110,7 +108,6 @@ -2147483356 {160, 44} - _NS:9 NO @@ -148,7 +145,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -187,7 +183,6 @@ {320, 44} - _NS:9 @@ -204,7 +199,6 @@ 306 {{0, 44}, {320, 416}} - _NS:9 1 @@ -234,7 +228,6 @@ {320, 460} - 3 @@ -529,188 +522,9 @@ 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - 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 - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/ContactsViewController/12/ContactsViewController.xib b/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib similarity index 86% rename from linphone.ldb/Resources/Classes/ContactsViewController/12/ContactsViewController.xib rename to linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib index 22e4a7aa9..fef3173c9 100644 --- a/linphone.ldb/Resources/Classes/ContactsViewController/12/ContactsViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib @@ -47,7 +47,6 @@ 290 {320, 44} - _NS:9 NO @@ -66,7 +65,6 @@ 292 {107, 44} - _NS:9 NO @@ -119,7 +117,6 @@ 289 {{107, 0}, {107, 44}} - _NS:9 NO @@ -154,7 +151,6 @@ {{106, 0}, {214, 44}} - _NS:9 @@ -171,7 +167,6 @@ 292 {107, 44} - _NS:9 NO @@ -219,7 +214,6 @@ -2147483356 {107, 44} - _NS:9 NO @@ -252,7 +246,6 @@ {320, 44} - _NS:9 @@ -267,7 +260,6 @@ 274 {{0, 44}, {320, 416}} - _NS:10 3 @@ -299,7 +291,6 @@ {320, 460} - _NS:9 @@ -564,90 +555,9 @@ 94 - - - - ContactsTableViewController - UITableViewController - - IBProjectSource - ./Classes/ContactsTableViewController.h - - - - ContactsViewController - UIViewController - - id - id - id - id - - - - onAddContactClick: - id - - - onAllClick: - id - - - onBackClick: - id - - - onLinphoneClick: - id - - - - UIButton - UIButton - UIButton - UIButton - ContactsTableViewController - UITableView - - - - addButton - UIButton - - - allButton - UIButton - - - backButton - UIButton - - - linphoneButton - UIButton - - - tableController - ContactsTableViewController - - - tableView - UITableView - - - - IBProjectSource - ./Classes/ContactsViewController.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/DialerViewController~ipad/11/DialerViewController~ipad.xib b/linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib similarity index 84% rename from linphone.ldb/Resources/Classes/DialerViewController~ipad/11/DialerViewController~ipad.xib rename to linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib index 9f5148f36..26ab328b9 100644 --- a/linphone.ldb/Resources/Classes/DialerViewController~ipad/11/DialerViewController~ipad.xib +++ b/linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib @@ -42,7 +42,6 @@ 301 {{127, 200}, {510, 460}} - _NS:9 1 @@ -58,7 +57,6 @@ 301 {{-1000, -1000}, {2768, 2900}} - _NS:9 @@ -72,7 +70,6 @@ 274 {{0, 58}, {768, 842}} - 3 @@ -86,7 +83,6 @@ -2147483356 {{20, 90}, {85, 33}} - _NS:9 NO @@ -129,7 +125,6 @@ 290 {{0, -2000}, {768, 2000}} - _NS:9 @@ -144,7 +139,6 @@ 290 {768, 80} - _NS:9 @@ -160,7 +154,6 @@ 290 {700, 60} - NO @@ -199,7 +192,6 @@ 289 {{698, 4}, {70, 51}} - _NS:9 NO @@ -235,7 +227,6 @@ {768, 80} - _NS:9 @@ -250,7 +241,6 @@ 274 {320, 280} - _NS:9 2 @@ -266,7 +256,6 @@ 292 {{0, 11}, {107, 54}} - 1 @@ -302,7 +291,6 @@ 292 {{107, 11}, {106, 54}} - NO NO @@ -329,7 +317,6 @@ 292 {{213, 11}, {107, 54}} - NO NO @@ -356,7 +343,6 @@ 292 {{0, 73}, {107, 54}} - NO NO @@ -383,7 +369,6 @@ 292 {{107, 73}, {106, 54}} - NO NO @@ -410,7 +395,6 @@ 292 {{213, 73}, {107, 54}} - NO NO @@ -437,7 +421,6 @@ 292 {{0, 135}, {107, 54}} - NO NO @@ -464,7 +447,6 @@ 292 {{107, 135}, {106, 54}} - NO NO @@ -491,7 +473,6 @@ 292 {{213, 135}, {107, 54}} - NO NO @@ -518,7 +499,6 @@ 292 {{0, 197}, {107, 54}} - NO NO @@ -545,7 +525,6 @@ 292 {{107, 197}, {106, 54}} - NO NO @@ -572,7 +551,6 @@ 292 {{213, 197}, {107, 54}} - NO NO @@ -597,7 +575,6 @@ {{0, 640}, {320, 260}} - _NS:9 @@ -612,7 +589,6 @@ 292 {126, 85} - _NS:9 NO @@ -646,7 +622,6 @@ -2147483356 {126, 85} - _NS:9 NO @@ -679,7 +654,6 @@ 292 {{126, 0}, {186, 85}} - _NS:9 NO @@ -713,7 +687,6 @@ -2147483356 {{126, 0}, {186, 85}} - _NS:9 NO @@ -747,8 +720,6 @@ -2147483356 {{126, 0}, {186, 85}} - - _NS:9 NO @@ -779,7 +750,6 @@ {{456, 815}, {312, 85}} - _NS:9 @@ -794,7 +764,6 @@ {768, 900} - _NS:9 @@ -1469,268 +1438,9 @@ 79 - - - - DialerViewController - UIViewController - - id - id - id - - - - onAddContactClick: - id - - - onAddressChange: - id - - - onBackClick: - id - - - - UICallButton - UIButton - UITextField - UIButton - UIView - UICallButton - UIDigitButton - UIEraseButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UITransferButton - UIDigitButton - UICamSwitch - UIView - UIDigitButton - - - - addCallButton - UICallButton - - - addContactButton - UIButton - - - addressField - UITextField - - - backButton - UIButton - - - backgroundView - UIView - - - callButton - UICallButton - - - eightButton - UIDigitButton - - - eraseButton - UIEraseButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - transferButton - UITransferButton - - - twoButton - UIDigitButton - - - videoCameraSwitch - UICamSwitch - - - videoPreview - UIView - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/DialerViewController.h - - - - UIAddressTextField - UITextField - - IBProjectSource - ./Classes/UIAddressTextField.h - - - - UICallButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UICallButton.h - - - - UICamSwitch - UIButton - - preview - UIView - - - preview - - preview - UIView - - - - IBProjectSource - ./Classes/UICamSwitch.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIEraseButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIEraseButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UITransferButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UITransferButton.h - - - - + 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/FirstLoginViewController/4/FirstLoginViewController.xib b/linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib similarity index 82% rename from linphone.ldb/Resources/Classes/FirstLoginViewController/4/FirstLoginViewController.xib rename to linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib index 63e616932..e4232bdce 100644 --- a/linphone.ldb/Resources/Classes/FirstLoginViewController/4/FirstLoginViewController.xib +++ b/linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib @@ -46,7 +46,6 @@ 301 {{33, 312}, {255, 50}} - _NS:9 NO @@ -93,7 +92,6 @@ -2147483379 {{60, 420}, {200, 37}} - NO NO IBCocoaTouchFramework @@ -125,7 +123,6 @@ 301 {{60, 170}, {200, 31}} - NO NO @@ -168,7 +165,6 @@ 301 {{60, 220}, {200, 31}} - NO NO @@ -207,7 +203,6 @@ 301 {{142, 211}, {37, 37}} - NO NO @@ -220,7 +215,6 @@ {320, 460} - 3 @@ -233,7 +227,6 @@ {320, 460} - _NS:9 @@ -453,114 +446,13 @@ 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 com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/4/HistoryDetailsViewController.xib b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/HistoryDetailsViewController/4/HistoryDetailsViewController.xib rename to linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib index 516273d34..cd83816fa 100644 --- a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/4/HistoryDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib @@ -838,10 +838,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/HistoryViewController/11/HistoryViewController.xib b/linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/HistoryViewController/11/HistoryViewController.xib rename to linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib index f8e45dcac..0bd694880 100644 --- a/linphone.ldb/Resources/Classes/HistoryViewController/11/HistoryViewController.xib +++ b/linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib @@ -562,10 +562,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/ImageViewController/8/ImageViewController.xib b/linphone.ldb/Resources/Classes/ImageViewController/9/ImageViewController.xib similarity index 98% rename from linphone.ldb/Resources/Classes/ImageViewController/8/ImageViewController.xib rename to linphone.ldb/Resources/Classes/ImageViewController/9/ImageViewController.xib index c3e4877f0..2deb24b23 100644 --- a/linphone.ldb/Resources/Classes/ImageViewController/8/ImageViewController.xib +++ b/linphone.ldb/Resources/Classes/ImageViewController/9/ImageViewController.xib @@ -252,10 +252,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/InCallViewController/4/InCallViewController.xib b/linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib similarity index 98% rename from linphone.ldb/Resources/Classes/InCallViewController/4/InCallViewController.xib rename to linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib index 03d8739de..a35dfab43 100644 --- a/linphone.ldb/Resources/Classes/InCallViewController/4/InCallViewController.xib +++ b/linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib @@ -447,10 +447,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/linphone.ldb/Resources/Classes/IncomingCallViewController/3/IncomingCallViewController.xib b/linphone.ldb/Resources/Classes/IncomingCallViewController/4/IncomingCallViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/IncomingCallViewController/3/IncomingCallViewController.xib rename to linphone.ldb/Resources/Classes/IncomingCallViewController/4/IncomingCallViewController.xib index 12fa76ae0..f51eba906 100644 --- a/linphone.ldb/Resources/Classes/IncomingCallViewController/3/IncomingCallViewController.xib +++ b/linphone.ldb/Resources/Classes/IncomingCallViewController/4/IncomingCallViewController.xib @@ -4836,10 +4836,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/WizardViewController/14/WizardViewController.xib b/linphone.ldb/Resources/Classes/WizardViewController/15/WizardViewController.xib similarity index 98% rename from linphone.ldb/Resources/Classes/WizardViewController/14/WizardViewController.xib rename to linphone.ldb/Resources/Classes/WizardViewController/15/WizardViewController.xib index 19ddd7f5d..314276a32 100644 --- a/linphone.ldb/Resources/Classes/WizardViewController/14/WizardViewController.xib +++ b/linphone.ldb/Resources/Classes/WizardViewController/15/WizardViewController.xib @@ -425,10 +425,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/WizardViewController~ipad/10/WizardViewController~ipad.xib b/linphone.ldb/Resources/Classes/WizardViewController~ipad/11/WizardViewController~ipad.xib similarity index 99% rename from linphone.ldb/Resources/Classes/WizardViewController~ipad/10/WizardViewController~ipad.xib rename to linphone.ldb/Resources/Classes/WizardViewController~ipad/11/WizardViewController~ipad.xib index 0b2e69b39..3644e0e0f 100644 --- a/linphone.ldb/Resources/Classes/WizardViewController~ipad/10/WizardViewController~ipad.xib +++ b/linphone.ldb/Resources/Classes/WizardViewController~ipad/11/WizardViewController~ipad.xib @@ -770,10 +770,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Classes/WizardViews/16/WizardViews.xib b/linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib similarity index 99% rename from linphone.ldb/Resources/Classes/WizardViews/16/WizardViews.xib rename to linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib index 4f88a1172..d1584ea80 100644 --- a/linphone.ldb/Resources/Classes/WizardViews/16/WizardViews.xib +++ b/linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib @@ -1538,10 +1538,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar/7/UICallBar.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib similarity index 89% rename from linphone.ldb/Resources/LinphoneUI/UICallBar/7/UICallBar.xib rename to linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib index 7454c922c..6074ef8ad 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallBar/7/UICallBar.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib @@ -42,6 +42,7 @@ -2147483356 {{0, 335}, {320, 125}} + _NS:9 1 @@ -63,6 +64,7 @@ 274 {281, 260} + _NS:9 2 @@ -78,6 +80,7 @@ 292 {{-20, 10}, {107, 54}} + 1 @@ -121,6 +124,7 @@ 292 {{87, 10}, {106, 54}} + NO NO @@ -148,6 +152,7 @@ 292 {{193, 10}, {107, 54}} + NO NO @@ -175,6 +180,7 @@ 292 {{-20, 72}, {107, 54}} + NO NO @@ -202,6 +208,7 @@ 292 {{87, 72}, {106, 54}} + NO NO @@ -229,6 +236,7 @@ 292 {{193, 72}, {107, 54}} + NO NO @@ -256,6 +264,7 @@ 292 {{-20, 134}, {107, 54}} + NO NO @@ -283,6 +292,7 @@ 292 {{87, 134}, {106, 54}} + NO NO @@ -310,6 +320,7 @@ 292 {{193, 134}, {107, 54}} + NO NO @@ -337,6 +348,7 @@ 292 {{-20, 196}, {107, 54}} + NO NO @@ -364,6 +376,7 @@ 292 {{87, 196}, {106, 54}} + NO NO @@ -391,6 +404,7 @@ 292 {{193, 196}, {107, 54}} + NO NO @@ -416,6 +430,7 @@ {{20, 57}, {281, 260}} + _NS:9 @@ -434,6 +449,7 @@ 292 {{3, 0}, {77, 68}} + _NS:9 NO @@ -489,8 +505,9 @@ 292 - {{3, 61}, {77, 68}} + {{3, 58}, {77, 68}} + _NS:9 NO @@ -528,8 +545,9 @@ - {{240, 205}, {80, 129}} + {{240, 208}, {80, 126}} + _NS:9 @@ -545,6 +563,7 @@ 290 {{0, 135}, {320, 2000}} + _NS:9 @@ -559,6 +578,7 @@ 292 {80, 67} + _NS:9 NO @@ -605,6 +625,7 @@ -2147483356 {{20, 20}, {37, 37}} + _NS:9 NO @@ -617,6 +638,7 @@ 292 {{80, 0}, {80, 67}} + _NS:9 NO @@ -663,6 +685,7 @@ 292 {{160, 0}, {80, 67}} + _NS:9 NO @@ -709,6 +732,7 @@ 292 {{240, 0}, {80, 67}} + _NS:9 NO @@ -755,6 +779,7 @@ 264 {{0, 67}, {105, 68}} + _NS:9 NO @@ -791,6 +816,7 @@ -2147483384 {{0, 67}, {105, 68}} + _NS:9 NO @@ -820,6 +846,7 @@ 264 {{105, 67}, {111, 68}} + _NS:9 NO @@ -849,6 +876,7 @@ 264 {{215, 67}, {105, 68}} + _NS:9 NO @@ -884,6 +912,7 @@ {{0, 325}, {320, 135}} + _NS:9 @@ -893,6 +922,7 @@ {320, 460} + _NS:9 @@ -908,6 +938,7 @@ -2147483356 {{0, 248}, {480, 72}} + _NS:9 @@ -930,6 +961,7 @@ 274 {281, 260} + _NS:9 2 @@ -942,6 +974,7 @@ 292 {{-20, 10}, {107, 54}} + 1 @@ -964,6 +997,7 @@ 292 {{87, 10}, {106, 54}} + NO NO @@ -982,6 +1016,7 @@ 292 {{193, 10}, {107, 54}} + NO NO @@ -1000,6 +1035,7 @@ 292 {{-20, 72}, {107, 54}} + NO NO @@ -1018,6 +1054,7 @@ 292 {{87, 72}, {106, 54}} + NO NO @@ -1036,6 +1073,7 @@ 292 {{193, 72}, {107, 54}} + NO NO @@ -1054,6 +1092,7 @@ 292 {{-20, 134}, {107, 54}} + NO NO @@ -1072,6 +1111,7 @@ 292 {{87, 134}, {106, 54}} + NO NO @@ -1090,6 +1130,7 @@ 292 {{193, 134}, {107, 54}} + NO NO @@ -1108,6 +1149,7 @@ 292 {{-20, 196}, {107, 54}} + NO NO @@ -1126,6 +1168,7 @@ 292 {{87, 196}, {106, 54}} + NO NO @@ -1144,6 +1187,7 @@ 292 {{193, 196}, {107, 54}} + NO NO 14 @@ -1159,6 +1203,7 @@ {{91, 0}, {281, 260}} + _NS:9 @@ -1174,6 +1219,7 @@ 292 {65, 55} + _NS:9 NO @@ -1215,6 +1261,7 @@ 292 {{0, 51}, {65, 55}} + _NS:9 NO @@ -1254,6 +1301,7 @@ {{415, 140}, {65, 105}} + _NS:9 @@ -1269,6 +1317,7 @@ 290 {{0, 82}, {480, 2000}} + _NS:9 @@ -1283,6 +1332,7 @@ 292 {{65, 0}, {65, 82}} + _NS:9 NO @@ -1329,6 +1379,7 @@ -2147483356 {{79, 20}, {37, 37}} + _NS:9 NO @@ -1341,6 +1392,7 @@ 292 {{130, 0}, {65, 82}} + _NS:9 NO @@ -1387,6 +1439,7 @@ 292 {{285, 0}, {65, 82}} + _NS:9 NO @@ -1433,6 +1486,7 @@ 292 {{350, 0}, {65, 82}} + _NS:9 NO @@ -1479,6 +1533,7 @@ 264 {65, 82} + _NS:9 NO @@ -1512,6 +1567,7 @@ -2147483384 {65, 82} + _NS:9 NO @@ -1541,6 +1597,7 @@ 264 {{195, 0}, {90, 82}} + _NS:9 NO @@ -1570,6 +1627,7 @@ 264 {{415, 0}, {65, 82}} + _NS:9 NO @@ -1602,6 +1660,7 @@ {{0, 238}, {480, 82}} + _NS:9 @@ -1611,6 +1670,7 @@ {480, 320} + _NS:9 @@ -2607,13 +2667,289 @@ 142 - + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + UICallBar + TPMultiLayoutViewController + + id + id + id + id + id + + + + onConferenceClick: + id + + + onOptionsAddClick: + id + + + onOptionsClick: + id + + + onOptionsTransferClick: + id + + + onPadClick: + id + + + + UIButton + UIToggleButton + UIDigitButton + UIDigitButton + UIDigitButton + UIHangUpButton + UIMicroButton + UIDigitButton + UIDigitButton + UIButton + UIToggleButton + UIButton + UIView + UIView + UIPauseButton + UIDigitButton + UIDigitButton + UIDigitButton + UISpeakerButton + UIDigitButton + UIDigitButton + UIDigitButton + UIVideoButton + UIDigitButton + + + + conferenceButton + UIButton + + + dialerButton + UIToggleButton + + + eightButton + UIDigitButton + + + fiveButton + UIDigitButton + + + fourButton + UIDigitButton + + + hangupButton + UIHangUpButton + + + microButton + UIMicroButton + + + nineButton + UIDigitButton + + + oneButton + UIDigitButton + + + optionsAddButton + UIButton + + + optionsButton + UIToggleButton + + + optionsTransferButton + UIButton + + + optionsView + UIView + + + padView + UIView + + + pauseButton + UIPauseButton + + + sevenButton + UIDigitButton + + + sharpButton + UIDigitButton + + + sixButton + UIDigitButton + + + speakerButton + UISpeakerButton + + + starButton + UIDigitButton + + + threeButton + UIDigitButton + + + twoButton + UIDigitButton + + + videoButton + UIVideoButton + + + zeroButton + UIDigitButton + + + + IBProjectSource + ./Classes/UICallBar.h + + + + UIDigitButton + UILongTouchButton + + addressField + UITextField + + + addressField + + addressField + UITextField + + + + IBProjectSource + ./Classes/UIDigitButton.h + + + + UIHangUpButton + UIButton + + IBProjectSource + ./Classes/UIHangUpButton.h + + + + UILongTouchButton + UIButton + + IBProjectSource + ./Classes/UILongTouchButton.h + + + + UIMicroButton + UIToggleButton + + IBProjectSource + ./Classes/UIMicroButton.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UISpeakerButton + UIToggleButton + + IBProjectSource + ./Classes/UISpeakerButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + UITransparentView + UIView + + IBProjectSource + ./Classes/UITransparentView.h + + + + UIVideoButton + UIToggleButton + + waitView + UIActivityIndicatorView + + + waitView + + waitView + UIActivityIndicatorView + + + + IBProjectSource + ./Classes/UIVideoButton.h + + + + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/6/UICallBar~ipad.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib similarity index 99% rename from linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/6/UICallBar~ipad.xib rename to linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib index a213bd86a..56b82da9b 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/6/UICallBar~ipad.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib @@ -2803,10 +2803,6 @@ 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/LinphoneUI/UICallCell/4/UICallCell.xib b/linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib similarity index 86% rename from linphone.ldb/Resources/LinphoneUI/UICallCell/4/UICallCell.xib rename to linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib index 5d5c2fe24..8bdb77a3e 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallCell/4/UICallCell.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib @@ -37,96 +37,689 @@ 290 - + 290 - - - 290 - {{0, 63}, {320, 250}} - - - - _NS:9 - - 3 - MCAwAA - - NO - - - - IBCocoaTouchFramework - 0 - 0 - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - + + 293 - {{0, 48}, {320, 262}} - + + + + 290 + {320, 250} + + + + _NS:9 + + 3 + MCAwAA + + NO + + + + IBCocoaTouchFramework + 0 + 0 + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 293 + {{0, -15}, {320, 262}} + + + + _NS:9 + + NO + IBCocoaTouchFramework + + NSImage + avatar_shadow.png + + + + + 293 + {{80, 2}, {160, 170}} + + + + _NS:9 + + NO + + Contact's avatar + + + + IBCocoaTouchFramework + + NSImage + avatar_unknown.png + + + + {{0, 63}, {320, 237}} + - + _NS:9 - NO IBCocoaTouchFramework - - NSImage - avatar_shadow.png - - - + + 293 - {{80, 65}, {160, 170}} - + + + + 293 + {{10, 21}, {300, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio section + + IBCocoaTouchFramework + Audio + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + + + 0 + + 2 + 22 + + + Helvetica-Bold + 22 + 16 + + NO + + + + 295 + + + + 292 + {60, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Codec: + + 0 + 10 + + 2 + 17 + + + Helvetica-Bold + 17 + 16 + + + + + 290 + {{68, 0}, {232, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio codec + + + IBCocoaTouchFramework + SILK + + 0 + 10 + + 1 + 17 + + + Helvetica + 17 + 16 + + + + {{10, 50}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {160, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Upload bandwidth: + + 0 + 10 + + + + + + 290 + {{168, 0}, {132, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio upload bandwidth + + + IBCocoaTouchFramework + 2 KB/s + + 0 + 10 + + + + + {{10, 80}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {182, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Download bandwidth: + + 0 + 10 + + + + + + 290 + {{190, 0}, {110, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video upload bandwidth + + + IBCocoaTouchFramework + 10.0 KB/s + + 0 + 10 + + + + + {{10, 110}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {142, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + ICE connectivity: + + 0 + 10 + + + + + + 290 + {{150, 0}, {150, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio ICE connectivity state + + + IBCocoaTouchFramework + not activated + + 0 + 10 + + + + + {{10, 140}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + {{0, 63}, {320, 237}} + - + + _NS:9 + + IBCocoaTouchFramework + + + + 293 + + + + 293 + {{10, 21}, {300, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video section + + IBCocoaTouchFramework + Video + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + + + 0 + + + NO + + + + 295 + + + + 292 + {60, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Codec: + + 0 + 10 + + + + + + 290 + {{68, 0}, {232, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video codec + + + IBCocoaTouchFramework + SILK + + 0 + 10 + + + + + {{10, 50}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {160, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Upload bandwidth: + + 0 + 10 + + + + + + 290 + {{168, 0}, {132, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video upload bandwidth + + + IBCocoaTouchFramework + 2 KB/s + + 0 + 10 + + + + + {{10, 80}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {182, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Download bandwidth: + + 0 + 10 + + + + + + 290 + {{190, 0}, {110, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Audio download bandwidth + + + IBCocoaTouchFramework + 10.0 KB/s + + 0 + 10 + + + + + {{10, 110}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 295 + + + + 292 + {142, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + ICE connectivity: + + 0 + 10 + + + + + + 290 + {{150, 0}, {150, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Video ICE connectivity state + + + IBCocoaTouchFramework + not activated + + 0 + 10 + + + + + {{10, 140}, {300, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + + + {{0, 63}, {320, 237}} + + + _NS:9 - NO - - Contact's avatar - - - IBCocoaTouchFramework - - NSImage - avatar_unknown.png - {320, 300} - + _NS:9 - NO IBCocoaTouchFramework @@ -4703,7 +5296,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 290 - {{0, 5}, {200, 40}} + {200, 63} @@ -4734,7 +5327,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 300} - + _NS:9 IBCocoaTouchFramework @@ -4753,14 +5346,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - - - avatarImage - - - - 34 - addressLabel @@ -4785,14 +5370,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 32 - - - avatarView - - - - 41 - headerView @@ -4849,6 +5426,174 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 59 + + + avatarView + + + + 41 + + + + avatarImage + + + + 34 + + + + otherView + + + + 78 + + + + audioCodecHeaderLabel + + + + 113 + + + + audioCodecLabel + + + + 114 + + + + audioDownloadBandwidthHeaderLabel + + + + 115 + + + + audioDownloadBandwidthLabel + + + + 116 + + + + audioIceConnectivityHeaderLabel + + + + 117 + + + + audioIceConnectivityLabel + + + + 118 + + + + audioStatsView + + + + 119 + + + + audioUploadBandwidthHeaderLabel + + + + 120 + + + + audioUploadBandwidthLabel + + + + 121 + + + + videoCodecHeaderLabel + + + + 122 + + + + videoCodecLabel + + + + 123 + + + + videoDownloadBandwidthHeaderLabel + + + + 124 + + + + videoDownloadBandwidthLabel + + + + 125 + + + + videoIceConnectivityHeaderLabel + + + + 126 + + + + videoIceConnectivityLabel + + + + 127 + + + + videoStatsView + + + + 128 + + + + videoUploadBandwidthHeaderLabel + + + + 129 + + + + videoUploadBandwidthLabel + + + + 130 + doHeaderClick: @@ -4891,28 +5636,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 16 - + - - 31 - - - - - - - - avatarView - - - 29 - - - avatarImage - 36 @@ -4947,17 +5675,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE stateLabel - - 30 - - - avatarShadowImage - - - 44 - - - 45 @@ -4994,6 +5711,259 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE headerBackgroundHighlightImage + + 77 + + + + + + + + otherView + + + 76 + + + + + + + + + + audioStatsView + + + 31 + + + + + + + + avatarView + + + 44 + + + + + 29 + + + avatarImage + + + 30 + + + avatarShadowImage + + + 83 + + + + + + + audioCodecView + + + 85 + + + audioCodecHeaderLabel + + + 84 + + + audioCodecLabel + + + 89 + + + + + + + audioUploadBandwidthView + + + 90 + + + audioUploadBandwidthLabel + + + 91 + + + audioUploadBandwidthHeaderLabel + + + 92 + + + + + + + audioDownloadBandwidthView + + + 93 + + + audioDownloadBandwidthHeaderLabel + + + 94 + + + audioDownloadBandwidthLabel + + + 95 + + + audioLabel + + + 96 + + + + + + + audioIceConnectivityView + + + 97 + + + audioIceConnectivityLabel + + + 98 + + + audioIceConnectivityHeaderLabel + + + 99 + + + + + + + + + + videoStatsView + + + 100 + + + + + + + audioIceConnectivityView + + + 101 + + + videoLabel + + + 102 + + + + + + + audioDownloadBandwidthView + + + 103 + + + + + + + videoUploadBandwidthView + + + 104 + + + + + + + videoCodecView + + + 105 + + + videoCodecHeaderLabel + + + 106 + + + videoCodecLabel + + + 107 + + + videoUploadBandwidthHeaderLabel + + + 108 + + + videoUploadBandwidthLabel + + + 109 + + + videoDownloadBandwidthLabel + + + 110 + + + videoDownloadBandwidthHeaderLabel + + + 111 + + + videoIceConnectivityHeaderLabel + + + 112 + + + videoIceConnectivityLabel + @@ -5001,6 +5971,19 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 + 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 @@ -5021,12 +6004,28 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 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 + 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 - 75 + 130 @@ -5034,10 +6033,15 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UICallCell UITableViewCell + UISwipeGestureRecognizer id id + + doDetailsSwipe: + UISwipeGestureRecognizer + doHeaderClick: id @@ -5049,21 +6053,78 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UIView + UILabel + UILabel UIImageView UIView + UISwipeGestureRecognizer + UISwipeGestureRecognizer UIImageView UIImageView UIView + UIView UIPauseButton UIButton UIImageView UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UILabel + UIView + UILabel + UILabel addressLabel UILabel + + audioCodecHeaderLabel + UILabel + + + audioCodecLabel + UILabel + + + audioDownloadBandwidthHeaderLabel + UILabel + + + audioDownloadBandwidthLabel + UILabel + + + audioIceConnectivityHeaderLabel + UILabel + + + audioIceConnectivityLabel + UILabel + + + audioStatsView + UIView + + + audioUploadBandwidthHeaderLabel + UILabel + + + audioUploadBandwidthLabel + UILabel + avatarImage UIImageView @@ -5072,6 +6133,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE avatarView UIView + + detailsLeftSwipeGestureRecognizer + UISwipeGestureRecognizer + + + detailsRightSwipeGestureRecognizer + UISwipeGestureRecognizer + headerBackgroundHighlightImage UIImageView @@ -5084,6 +6153,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE headerView UIView + + otherView + UIView + pauseButton UIPauseButton @@ -5100,6 +6173,42 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE stateLabel UILabel + + videoCodecHeaderLabel + UILabel + + + videoCodecLabel + UILabel + + + videoDownloadBandwidthHeaderLabel + UILabel + + + videoDownloadBandwidthLabel + UILabel + + + videoIceConnectivityHeaderLabel + UILabel + + + videoIceConnectivityLabel + UILabel + + + videoStatsView + UIView + + + videoUploadBandwidthHeaderLabel + UILabel + + + videoUploadBandwidthLabel + UILabel + IBProjectSource @@ -5126,10 +6235,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/2/UIConferenceHeader.xib b/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib similarity index 80% rename from linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/2/UIConferenceHeader.xib rename to linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib index 2e72dd919..a70dc3dc7 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/2/UIConferenceHeader.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -41,7 +41,6 @@ 290 {320, 68} - _NS:9 NO @@ -61,7 +60,6 @@ 289 {{224, 14}, {25, 25}} - _NS:9 NO IBCocoaTouchFramework @@ -71,7 +69,6 @@ 289 {{216, 6}, {41, 41}} - _NS:9 NO @@ -116,7 +113,6 @@ {320, 68} - _NS:9 @@ -224,54 +220,9 @@ 14 - - - - UIConferenceHeader - UIViewController - - UIPauseButton - UIImageView - - - - pauseButton - UIPauseButton - - - stateImage - UIImageView - - - - IBProjectSource - ./Classes/UIConferenceHeader.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 @@ -280,6 +231,6 @@ {43, 46} {640, 135} - 1498 + 1926 diff --git a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/2/UIContactDetailsFooter.xib b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib similarity index 80% rename from linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/2/UIContactDetailsFooter.xib rename to linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib index 0d353a385..51314ac12 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/2/UIContactDetailsFooter.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib @@ -163,49 +163,9 @@ 10 - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/3/UIContactDetailsHeader.xib b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib similarity index 98% rename from linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/3/UIContactDetailsHeader.xib rename to linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib index cf2310c07..3448c3439 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/3/UIContactDetailsHeader.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib @@ -373,10 +373,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/LinphoneUI/UIMainBar/8/UIMainBar.xib b/linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib similarity index 99% rename from linphone.ldb/Resources/LinphoneUI/UIMainBar/8/UIMainBar.xib rename to linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib index da3794cab..6248592a3 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIMainBar/8/UIMainBar.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib @@ -702,10 +702,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/7/UIMainBar~ipad.xib b/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib similarity index 99% rename from linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/7/UIMainBar~ipad.xib rename to linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib index d72f12f02..3ab58826c 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/7/UIMainBar~ipad.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib @@ -1170,10 +1170,6 @@ 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index a962fb583..d9ac6f854 100644 Binary files a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings and b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 5b3cd4243..67c14caf3 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -154,6 +154,8 @@ D3012CC51610467D007CD926 /* linphone_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D3012CC31610467D007CD926 /* linphone_logo.png */; }; D3012CC616105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; }; D3012CC716105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; }; + D306459E1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; }; + D306459F1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; }; D30BBD1815D402A7000F93DD /* contact_ok_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */; }; D30BBD1915D402A7000F93DD /* contact_ok_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */; }; D3119E7215B6A4710005D4A4 /* contacts_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3119E7015B6A4710005D4A4 /* contacts_back_default.png */; }; @@ -1606,6 +1608,8 @@ C9C8254B15AE207B00D493FA /* options_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_selected.png; path = Resources/options_selected.png; sourceTree = ""; }; C9C8254E15AE256100D493FA /* transfer_call_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = transfer_call_disabled.png; path = Resources/transfer_call_disabled.png; sourceTree = ""; }; D3012CC31610467D007CD926 /* linphone_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_logo.png; path = Resources/linphone_logo.png; sourceTree = ""; }; + D306459C1611EC2900BB571E /* UILoadingImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILoadingImageView.h; sourceTree = ""; }; + D306459D1611EC2900BB571E /* UILoadingImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILoadingImageView.m; sourceTree = ""; }; D30BBD1215D3EFEB000F93DD /* ContactDetailsDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactDetailsDelegate.h; sourceTree = ""; }; D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_ok_disabled.png; path = Resources/contact_ok_disabled.png; sourceTree = ""; }; D3119E7015B6A4710005D4A4 /* contacts_back_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_back_default.png; path = Resources/contacts_back_default.png; sourceTree = ""; }; @@ -2695,6 +2699,8 @@ D35E91F7160CA4FF0023116B /* UILinphoneButton.m */, D35E91F2160CA10B0023116B /* UILinphoneTextField.h */, D35E91F3160CA10B0023116B /* UILinphoneTextField.m */, + D306459C1611EC2900BB571E /* UILoadingImageView.h */, + D306459D1611EC2900BB571E /* UILoadingImageView.m */, D32409C1158B49A600C8C119 /* UILongTouchButton.h */, D32409C2158B49A600C8C119 /* UILongTouchButton.m */, D3ED3E841586291B006C0DE4 /* UIMainBar.h */, @@ -4729,6 +4735,7 @@ D374D3FD16071762003D25FF /* ImageSharing.m in Sources */, D35E91F4160CA10B0023116B /* UILinphoneTextField.m in Sources */, D35E91F8160CA4FF0023116B /* UILinphoneButton.m in Sources */, + D306459E1611EC2A00BB571E /* UILoadingImageView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4825,6 +4832,7 @@ D374D3FE16071762003D25FF /* ImageSharing.m in Sources */, D35E91F5160CA10B0023116B /* UILinphoneTextField.m in Sources */, D35E91F9160CA4FF0023116B /* UILinphoneButton.m in Sources */, + D306459F1611EC2A00BB571E /* UILoadingImageView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };