diff --git a/Classes/ChatRoomTableViewController.m b/Classes/ChatRoomTableViewController.m index 9dea07a78..349b80f8f 100644 --- a/Classes/ChatRoomTableViewController.m +++ b/Classes/ChatRoomTableViewController.m @@ -41,11 +41,6 @@ #pragma mark - ViewController Functions -- (void)viewDidLoad { - [super viewDidLoad]; - [self.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 -} - - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; [TUNinePatchCache flushCache]; // Clear cache diff --git a/Classes/ChatRoomViewController.h b/Classes/ChatRoomViewController.h index aeb721217..b79d4102a 100644 --- a/Classes/ChatRoomViewController.h +++ b/Classes/ChatRoomViewController.h @@ -41,11 +41,9 @@ @property (nonatomic, retain) IBOutlet UILabel *addressLabel; @property (nonatomic, retain) IBOutlet UIImageView *avatarImage; @property (nonatomic, retain) IBOutlet UIView *headerView; -@property (nonatomic, retain) IBOutlet UIView *footerView; @property (nonatomic, retain) IBOutlet UIView *chatView; @property (nonatomic, retain) IBOutlet UIView *messageView; @property (nonatomic, retain) IBOutlet UIImageView *messageBackgroundImage; -@property (nonatomic, retain) IBOutlet UIImageView *footerBackgroundImage; @property (nonatomic, retain) IBOutlet UIImageView *transferBackgroundImage; @property (nonatomic, retain) IBOutlet UITapGestureRecognizer *listTapGestureRecognizer; diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index 7e113f581..fcbbaa54b 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -34,11 +34,9 @@ @synthesize addressLabel; @synthesize avatarImage; @synthesize headerView; -@synthesize footerView; @synthesize chatView; @synthesize messageView; @synthesize messageBackgroundImage; -@synthesize footerBackgroundImage; @synthesize transferBackgroundImage; @synthesize listTapGestureRecognizer; @synthesize pictureButton; @@ -54,6 +52,7 @@ if (self != nil) { self->chatRoom = NULL; self->imageSharing = NULL; + self->listTapGestureRecognizer = [[UITapGestureRecognizer alloc] init]; } return self; } @@ -68,10 +67,8 @@ [addressLabel release]; [avatarImage release]; [headerView release]; - [footerView release]; [messageView release]; [messageBackgroundImage release]; - [footerBackgroundImage release]; [transferBackgroundImage release]; [listTapGestureRecognizer release]; @@ -98,7 +95,7 @@ static UICompositeViewDescription *compositeDescription = nil; tabBar:/*@"UIMainBar"*/nil tabBarEnabled:false /*to keep room for chat*/ fullscreen:false - landscapeMode:[LinphoneManager runningOnIpad] + landscapeMode:true portraitMode:true]; } return compositeDescription; @@ -112,17 +109,24 @@ static UICompositeViewDescription *compositeDescription = nil; [tableController setChatRoomDelegate:self]; // Set selected+over background: IB lack ! - [editButton setImage:[UIImage imageNamed:@"chat_ok_over.png"] + [editButton setBackgroundImage:[UIImage imageNamed:@"chat_ok_over.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [LinphoneUtils buttonFixStates:editButton]; + messageField.minNumberOfLines = 1; messageField.maxNumberOfLines = ([LinphoneManager runningOnIpad])?10:3; messageField.delegate = self; messageField.font = [UIFont systemFontOfSize:18.0f]; - messageField.contentInset = UIEdgeInsetsZero; + messageField.contentInset = UIEdgeInsetsMake(1, 1, 0, 0); messageField.backgroundColor = [UIColor clearColor]; [sendButton setEnabled:FALSE]; + + [listTapGestureRecognizer addTarget:self action:@selector(onListTap:)]; + [tableController.tableView addGestureRecognizer:listTapGestureRecognizer]; [listTapGestureRecognizer setEnabled:FALSE]; + + [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 } @@ -150,29 +154,11 @@ static UICompositeViewDescription *compositeDescription = nil; [[tableController tableView] reloadData]; [messageBackgroundImage setImage:[TUNinePatchCache imageOfSize:[messageBackgroundImage bounds].size - forNinePatchNamed:@"chat_field"]]; - [footerBackgroundImage setImage:[TUNinePatchCache imageOfSize:[footerBackgroundImage bounds].size - forNinePatchNamed:@"chat_background"]]; - [transferBackgroundImage setImage:[TUNinePatchCache imageOfSize:[transferBackgroundImage bounds].size - forNinePatchNamed:@"chat_background"]]; + forNinePatchNamed:@"chat_message_background"]]; BOOL fileSharingEnabled = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"] != NULL && [[[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"] length]>0; - - CGRect pictureFrame = pictureButton.frame; - CGRect messageframe = messageView.frame; - CGRect sendFrame = sendButton.frame; - if (fileSharingEnabled) { - [pictureButton setHidden:FALSE]; - messageframe.origin.x = pictureFrame.origin.x + pictureFrame.size.width; - messageframe.size.width = sendFrame.origin.x - messageframe.origin.x; - } else { - [pictureButton setHidden:TRUE]; - messageframe.origin.x = pictureFrame.origin.x; - messageframe.size.width = sendFrame.origin.x - messageframe.origin.x; - } - [messageView setFrame:messageframe]; - + [pictureButton setEnabled:fileSharingEnabled]; } - (void)viewWillDisappear:(BOOL)animated { @@ -202,6 +188,17 @@ static UICompositeViewDescription *compositeDescription = nil; object:nil]; } +- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { + [super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; + [messageBackgroundImage setImage:[TUNinePatchCache imageOfSize:[messageBackgroundImage bounds].size + forNinePatchNamed:@"chat_message_background"]]; +} + +- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { + [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration]; + +} + -(void)didReceiveMemoryWarning { [TUNinePatchCache flushCache]; // will remove any images cache (freeing any cached but unused images) } @@ -361,10 +358,10 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta - (void)growingTextView:(HPGrowingTextView *)growingTextView willChangeHeight:(float)height { int diff = height - growingTextView.bounds.size.height; - CGRect footerRect = [footerView frame]; - footerRect.origin.y -= diff; - footerRect.size.height += diff; - [footerView setFrame:footerRect]; + CGRect messageRect = [messageView frame]; + messageRect.origin.y -= diff; + messageRect.size.height += diff; + [messageView setFrame:messageRect]; // Always stay at bottom CGPoint contentPt = [tableController.tableView contentOffset]; @@ -376,10 +373,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [tableController.view setFrame:tableRect]; [messageBackgroundImage setImage:[TUNinePatchCache imageOfSize:[messageBackgroundImage bounds].size - forNinePatchNamed:@"chat_field"]]; - - [footerBackgroundImage setImage:[TUNinePatchCache imageOfSize:[footerBackgroundImage bounds].size - forNinePatchNamed:@"chat_background"]]; + forNinePatchNamed:@"chat_message_background"]]; } @@ -448,7 +442,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta - (BOOL)chatRoomStartImageDownload:(NSURL*)url userInfo:(id)userInfo { if(imageSharing == nil) { imageSharing = [ImageSharing imageSharingDownload:url delegate:self userInfo:userInfo]; - [footerView setHidden:TRUE]; + [messageView setHidden:TRUE]; [transferView setHidden:FALSE]; return TRUE; } @@ -459,7 +453,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta if(imageSharing == nil) { NSString *urlString = [[LinphoneManager instance] lpConfigStringForKey:@"sharing_server_preference"]; imageSharing = [ImageSharing imageSharingUpload:[NSURL URLWithString:urlString] image:image delegate:self userInfo:url]; - [footerView setHidden:TRUE]; + [messageView setHidden:TRUE]; [transferView setHidden:FALSE]; return TRUE; } @@ -474,13 +468,13 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta } - (void)imageSharingAborted:(ImageSharing*)aimageSharing { - [footerView setHidden:FALSE]; + [messageView setHidden:FALSE]; [transferView setHidden:TRUE]; imageSharing = NULL; } - (void)imageSharingError:(ImageSharing*)aimageSharing error:(NSError *)error { - [footerView setHidden:FALSE]; + [messageView setHidden:FALSE]; [transferView setHidden:TRUE]; NSString *url = [aimageSharing.connection.currentRequest.URL absoluteString]; if (aimageSharing.upload) { @@ -512,13 +506,13 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [self sendMessage:nil withExterlBodyUrl:url withInternalUrl:imageURL]; - [footerView setHidden:FALSE]; + [messageView setHidden:FALSE]; [transferView setHidden:TRUE]; imageSharing = NULL; } - (void)imageSharingDownloadDone:(ImageSharing*)aimageSharing image:(UIImage *)image { - [footerView setHidden:FALSE]; + [messageView setHidden:FALSE]; [transferView setHidden:TRUE]; ChatModel *chat = (ChatModel *)[imageSharing userInfo]; @@ -608,7 +602,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta CGRect tableFrame = [tableController.view frame]; tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height; double diff = tableFrame.size.height; - tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y; + tableFrame.size.height = [messageView frame].origin.y - tableFrame.origin.y; diff = tableFrame.size.height - diff; [tableController.view setFrame:tableFrame]; @@ -663,7 +657,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta { CGRect tableFrame = [tableController.view frame]; tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height; - tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y; + tableFrame.size.height = [messageView frame].origin.y - tableFrame.origin.y; [tableController.view setFrame:tableFrame]; } diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m index ffd9008de..264c7b47f 100644 --- a/Classes/ChatViewController.m +++ b/Classes/ChatViewController.m @@ -50,8 +50,12 @@ [super viewDidLoad]; // Set selected+over background: IB lack ! - [editButton setImage:[UIImage imageNamed:@"chat_ok_over.png"] + [editButton setBackgroundImage:[UIImage imageNamed:@"chat_ok_over.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:editButton]; + + [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 } - (void)viewWillAppear:(BOOL)animated { diff --git a/Classes/ConsoleViewController.m b/Classes/ConsoleViewController.m index 6e289805b..fe6a09f4c 100644 --- a/Classes/ConsoleViewController.m +++ b/Classes/ConsoleViewController.m @@ -83,11 +83,12 @@ static UICompositeViewDescription *compositeDescription = nil; [logsView setDelegate:self]; + UIScrollView *scrollView = [ConsoleViewController defaultScrollView:logsView]; UIEdgeInsets inset = {0, 0, 10, 0}; - [logsView.scrollView setContentInset:inset]; - [logsView.scrollView setScrollIndicatorInsets:inset]; + [scrollView setContentInset:inset]; + [scrollView setScrollIndicatorInsets:inset]; - [logsView.scrollView setBounces:FALSE]; + [scrollView setBounces:FALSE]; } @@ -115,6 +116,21 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - ++ (UIScrollView *)defaultScrollView:(UIWebView *)webView { + UIScrollView *scrollView = nil; + + if ([[UIDevice currentDevice].systemVersion doubleValue] >= 5.0) { + return webView.scrollView; + } else { + for (UIView *subview in [webView subviews]) { + if ([subview isKindOfClass:[UIScrollView class]]) { + scrollView = (UIScrollView *)subview; + } + } + } + return scrollView; +} + - (void)clear { NSString *js = @"document.getElementById('content').innerHTML += ''"; [logsView stringByEvaluatingJavaScriptFromString:js]; diff --git a/Classes/ConsoleViewController.xib b/Classes/ConsoleViewController.xib index 2276a8ec7..85f825ff3 100644 --- a/Classes/ConsoleViewController.xib +++ b/Classes/ConsoleViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -46,9 +46,9 @@ _NS:9 - + 3 - MQA + MCAwAA IBCocoaTouchFramework @@ -57,10 +57,7 @@ - - 3 - MCAwAA - + NO IBCocoaTouchFramework @@ -191,7 +188,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -199,6 +196,6 @@ YES 3 - 1498 + 1926 diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 4ee53e10b..762d8cc0e 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -117,7 +117,6 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C [super viewDidLoad]; [headerController view]; // Force view load [footerController view]; // Force view load - [self.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 } - (void)viewDidDisappear:(BOOL)animated { diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m index 071f038d3..8f00b37b4 100644 --- a/Classes/ContactDetailsViewController.m +++ b/Classes/ContactDetailsViewController.m @@ -202,12 +202,16 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf [super viewDidLoad]; // Set selected+over background: IB lack ! - [editButton setImage:[UIImage imageNamed:@"contact_ok_over.png"] + [editButton setBackgroundImage:[UIImage imageNamed:@"contact_ok_over.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; // Set selected+disabled background: IB lack ! - [editButton setImage:[UIImage imageNamed:@"contact_ok_disabled.png"] + [editButton setBackgroundImage:[UIImage imageNamed:@"contact_ok_disabled.png"] forState:(UIControlStateDisabled | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:editButton]; + + [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 } - (void)viewWillDisappear:(BOOL)animated { diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index 287b4148b..f4c6b8157 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -154,12 +154,18 @@ static UICompositeViewDescription *compositeDescription = nil; [self changeView:History_All]; // Set selected+over background: IB lack ! - [linphoneButton setImage:[UIImage imageNamed:@"contacts_linphone_selected.png"] + [linphoneButton setBackgroundImage:[UIImage imageNamed:@"contacts_linphone_selected.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [LinphoneUtils buttonFixStates:linphoneButton]; + // Set selected+over background: IB lack ! - [allButton setImage:[UIImage imageNamed:@"contacts_all_selected.png"] + [allButton setBackgroundImage:[UIImage imageNamed:@"contacts_all_selected.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:allButton]; + + [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 } diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index 68fe4ed06..b16c175f1 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -146,9 +146,11 @@ static UICompositeViewDescription *compositeDescription = nil; if(linphone_core_video_enabled(lc) && linphone_core_video_preview_enabled(lc)) { linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview); [backgroundView setHidden:FALSE]; + [videoCameraSwitch setHidden:FALSE]; } else { linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL); [backgroundView setHidden:TRUE]; + [videoCameraSwitch setHidden:TRUE]; } } } @@ -235,9 +237,11 @@ static UICompositeViewDescription *compositeDescription = nil; if(linphone_core_video_enabled(lc) && linphone_core_video_preview_enabled(lc)) { linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview); [backgroundView setHidden:FALSE]; + [videoCameraSwitch setHidden:FALSE]; } else { linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL); [backgroundView setHidden:TRUE]; + [videoCameraSwitch setHidden:TRUE]; } } } diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m index 0883b41aa..0f5410f44 100644 --- a/Classes/HistoryViewController.m +++ b/Classes/HistoryViewController.m @@ -83,8 +83,10 @@ static UICompositeViewDescription *compositeDescription = nil; [tableController viewWillAppear:animated]; } - if([tableController isEditing]) + if([tableController isEditing]) { [tableController setEditing:FALSE animated:FALSE]; + } + [deleteButton setHidden:TRUE]; [editButton setOff]; [self changeView: History_All]; @@ -120,16 +122,24 @@ static UICompositeViewDescription *compositeDescription = nil; [self changeView: History_All]; // Set selected+over background: IB lack ! - [editButton setImage:[UIImage imageNamed:@"history_ok_over.png"] + [editButton setBackgroundImage:[UIImage imageNamed:@"history_ok_over.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; - // Set selected+over background: IB lack ! - [allButton setImage:[UIImage imageNamed:@"history_all_selected.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [LinphoneUtils buttonFixStates:editButton]; // Set selected+over background: IB lack ! - [missedButton setImage:[UIImage imageNamed:@"history_missed_selected.png"] + [allButton setBackgroundImage:[UIImage imageNamed:@"history_all_selected.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStatesForTabs:allButton]; + + // Set selected+over background: IB lack ! + [missedButton setBackgroundImage:[UIImage imageNamed:@"history_missed_selected.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStatesForTabs:missedButton]; + + [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 } diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m index b6a02a307..553291178 100644 --- a/Classes/LinphoneUI/UICallBar.m +++ b/Classes/LinphoneUI/UICallBar.m @@ -125,73 +125,95 @@ [sharpButton setDigit:'#']; [sharpButton setDtmf:true]; - // Set selected+disabled background: IB lack ! - [videoButton setImage:[UIImage imageNamed:@"video_on_disabled.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[videoButton tag]] - setImage:[UIImage imageNamed:@"video_on_disabled_landscape.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; + { + UIButton *videoButtonLandscape = (UIButton*)[landscapeView viewWithTag:[videoButton tag]]; + // Set selected+disabled background: IB lack ! + [videoButton setBackgroundImage:[UIImage imageNamed:@"video_on_disabled.png"] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + [videoButtonLandscape setBackgroundImage:[UIImage imageNamed:@"video_on_disabled_landscape.png"] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + + // Set selected+over background: IB lack ! + [videoButton setBackgroundImage:[UIImage imageNamed:@"video_on_over.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [videoButtonLandscape setBackgroundImage:[UIImage imageNamed:@"video_on_over_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:videoButton]; + [LinphoneUtils buttonFixStates:videoButtonLandscape]; + } - // Set selected+over background: IB lack ! - [videoButton setImage:[UIImage imageNamed:@"video_on_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[videoButton tag]] - setImage:[UIImage imageNamed:@"video_on_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; + { + UIButton *speakerButtonLandscape = (UIButton*) [landscapeView viewWithTag:[speakerButton tag]]; + // Set selected+disabled background: IB lack ! + [speakerButton setBackgroundImage:[UIImage imageNamed:@"speaker_on_disabled.png"] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + [speakerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"speaker_on_disabled_landscape.png"] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + + // Set selected+over background: IB lack ! + [speakerButton setBackgroundImage:[UIImage imageNamed:@"speaker_on_over.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [speakerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"sspeaker_on_over_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:speakerButton]; + [LinphoneUtils buttonFixStates:speakerButtonLandscape]; + } + { + UIButton *microButtonLandscape = (UIButton*) [landscapeView viewWithTag:[microButton tag]]; + // Set selected+disabled background: IB lack ! + [microButton setBackgroundImage:[UIImage imageNamed:@"micro_on_disabled.png"] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + [microButtonLandscape setBackgroundImage:[UIImage imageNamed:@"micro_on_disabled_landscape.png"] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + + // Set selected+over background: IB lack ! + [microButton setBackgroundImage:[UIImage imageNamed:@"micro_on_over.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [microButtonLandscape setBackgroundImage:[UIImage imageNamed:@"micro_on_over_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:microButton]; + [LinphoneUtils buttonFixStates:microButtonLandscape]; + } - // Set selected+disabled background: IB lack ! - [speakerButton setImage:[UIImage imageNamed:@"speaker_on_disabled.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[speakerButton tag]] - setImage:[UIImage imageNamed:@"speaker_on_disabled_landscape.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; + { + UIButton *optionsButtonLandscape = (UIButton*) [landscapeView viewWithTag:[optionsButton tag]]; + // Set selected+over background: IB lack ! + [optionsButton setBackgroundImage:[UIImage imageNamed:@"options_over.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [optionsButtonLandscape setBackgroundImage:[UIImage imageNamed:@"options_over_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:optionsButton]; + [LinphoneUtils buttonFixStates:optionsButtonLandscape]; + } - // Set selected+over background: IB lack ! - [speakerButton setImage:[UIImage imageNamed:@"speaker_on_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[speakerButton tag]] - setImage:[UIImage imageNamed:@"sspeaker_on_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; + { + UIButton *pauseButtonLandscape = (UIButton*) [landscapeView viewWithTag:[pauseButton tag]]; + // Set selected+over background: IB lack ! + [pauseButton setBackgroundImage:[UIImage imageNamed:@"pause_on_over.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [pauseButtonLandscape setBackgroundImage:[UIImage imageNamed:@"pause_on_over_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:pauseButton]; + [LinphoneUtils buttonFixStates:pauseButtonLandscape]; + } - - // Set selected+disabled background: IB lack ! - [microButton setImage:[UIImage imageNamed:@"micro_on_disabled.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[microButton tag]] - setImage:[UIImage imageNamed:@"micro_on_disabled_landscape.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - - // Set selected+over background: IB lack ! - [microButton setImage:[UIImage imageNamed:@"micro_on_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[microButton tag]] - setImage:[UIImage imageNamed:@"micro_on_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - - // Set selected+over background: IB lack ! - [pauseButton setImage:[UIImage imageNamed:@"pause_on_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[pauseButton tag]] - setImage:[UIImage imageNamed:@"pause_on_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - - // Set selected+over background: IB lack ! - [optionsButton setImage:[UIImage imageNamed:@"options_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[optionsButton tag]] - setImage:[UIImage imageNamed:@"options_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - - // Set selected+over background: IB lack ! - [dialerButton setImage:[UIImage imageNamed:@"dialer_alt_back_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [(UIButton*) [landscapeView viewWithTag:[dialerButton tag]] - setImage:[UIImage imageNamed:@"dialer_alt_back_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; + { + UIButton *dialerButtonLandscape = (UIButton*) [landscapeView viewWithTag:[dialerButton tag]] ; + // Set selected+over background: IB lack ! + [dialerButton setBackgroundImage:[UIImage imageNamed:@"dialer_alt_back_over.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [dialerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"dialer_alt_back_over_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:dialerButton]; + [LinphoneUtils buttonFixStates:dialerButtonLandscape]; + } [super viewDidLoad]; } @@ -422,21 +444,7 @@ [attributes setObject:[NSValue valueWithCGRect:view.bounds] forKey:@"bounds"]; if([view isKindOfClass:[UIButton class]]) { UIButton *button = (UIButton *)view; - [UICallBar addDictEntry:attributes item:[button imageForState:UIControlStateNormal] key:@"image-normal"]; - [UICallBar addDictEntry:attributes item:[button imageForState:UIControlStateHighlighted] key:@"image-highlighted"]; - [UICallBar addDictEntry:attributes item:[button imageForState:UIControlStateDisabled] key:@"image-disabled"]; - [UICallBar addDictEntry:attributes item:[button imageForState:UIControlStateSelected] key:@"image-selected"]; - [UICallBar addDictEntry:attributes item:[button imageForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"image-disabled-highlighted"]; - [UICallBar addDictEntry:attributes item:[button imageForState:UIControlStateSelected | UIControlStateHighlighted] key:@"image-selected-highlighted"]; - [UICallBar addDictEntry:attributes item:[button imageForState:UIControlStateSelected | UIControlStateDisabled] key:@"image-selected-disabled"]; - - [UICallBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateNormal] key:@"background-normal"]; - [UICallBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateHighlighted] key:@"background-highlighted"]; - [UICallBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateDisabled] key:@"background-disabled"]; - [UICallBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected] key:@"background-selected"]; - [UICallBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"background-disabled-highlighted"]; - [UICallBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected | UIControlStateHighlighted] key:@"background-selected-highlighted"]; - [UICallBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected | UIControlStateDisabled] key:@"background-selected-disabled"]; + [LinphoneUtils buttonMultiViewAddAttributes:attributes button:button]; } [attributes setObject:[NSNumber numberWithInteger:view.autoresizingMask] forKey:@"autoresizingMask"]; @@ -448,36 +456,9 @@ view.bounds = [[attributes objectForKey:@"bounds"] CGRectValue]; if([view isKindOfClass:[UIButton class]]) { UIButton *button = (UIButton *)view; - [button setImage:[UICallBar getDictEntry:attributes key:@"image-normal"] forState:UIControlStateNormal]; - [button setImage:[UICallBar getDictEntry:attributes key:@"image-highlighted"] forState:UIControlStateHighlighted]; - [button setImage:[UICallBar getDictEntry:attributes key:@"image-disabled"] forState:UIControlStateDisabled]; - [button setImage:[UICallBar getDictEntry:attributes key:@"image-selected"] forState:UIControlStateSelected]; - [button setImage:[UICallBar getDictEntry:attributes key:@"image-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; - [button setImage:[UICallBar getDictEntry:attributes key:@"image-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; - [button setImage:[UICallBar getDictEntry:attributes key:@"image-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; - - [button setBackgroundImage:[UICallBar getDictEntry:attributes key:@"background-normal"] forState:UIControlStateNormal]; - [button setBackgroundImage:[UICallBar getDictEntry:attributes key:@"background-highlighted"] forState:UIControlStateHighlighted]; - [button setBackgroundImage:[UICallBar getDictEntry:attributes key:@"background-disabled"] forState:UIControlStateDisabled]; - [button setBackgroundImage:[UICallBar getDictEntry:attributes key:@"background-selected"] forState:UIControlStateSelected]; - [button setBackgroundImage:[UICallBar getDictEntry:attributes key:@"background-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; - [button setBackgroundImage:[UICallBar getDictEntry:attributes key:@"background-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; - [button setBackgroundImage:[UICallBar getDictEntry:attributes key:@"background-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; + [LinphoneUtils buttonMultiViewApplyAttributes:attributes button:button]; } view.autoresizingMask = [[attributes objectForKey:@"autoresizingMask"] integerValue]; } -+ (void)addDictEntry:(NSMutableDictionary*)dict item:(id)item key:(id)key { - if(item != nil && key != nil) { - [dict setObject:item forKey:key]; - } -} - -+ (id)getDictEntry:(NSDictionary*)dict key:(id)key { - if(key != nil) { - return [dict objectForKey:key]; - } - return nil; -} - @end diff --git a/Classes/LinphoneUI/UIChatCell.xib b/Classes/LinphoneUI/UIChatCell.xib index 7bf9dcf3c..1dc63ea7f 100644 --- a/Classes/LinphoneUI/UIChatCell.xib +++ b/Classes/LinphoneUI/UIChatCell.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -42,7 +42,6 @@ 292 {{10, 8}, {27, 27}} - _NS:9 NO @@ -57,7 +56,6 @@ 274 {{45, 0}, {60, 44}} - _NS:328 NO @@ -73,6 +71,7 @@ 1 MCAwIDAAA + darkTextColor 1 @@ -93,7 +92,6 @@ 274 {{110, 0}, {170, 44}} - _NS:328 NO @@ -126,7 +124,6 @@ 257 {{276, 0}, {44, 44}} - _NS:9 NO @@ -165,7 +162,6 @@ 257 {{276, 0}, {44, 44}} - _NS:9 NO IBCocoaTouchFramework @@ -191,7 +187,6 @@ {320, 44} - _NS:9 @@ -347,66 +342,12 @@ 38 - - - - UIChatCell - UITableViewCell - - id - id - - - - onDeleteClick: - id - - - onDetailsClick: - id - - - - UILabel - UIImageView - UILabel - UIButton - UIButton - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - chatContentLabel - UILabel - - - deleteButton - UIButton - - - detailsButton - UIButton - - - - IBProjectSource - ./Classes/UIChatCell.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -417,6 +358,6 @@ {45, 45} {45, 45} - 1498 + 1926 diff --git a/Classes/LinphoneUI/UIChatRoomCell.h b/Classes/LinphoneUI/UIChatRoomCell.h index 94a6303b1..94261b982 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.h +++ b/Classes/LinphoneUI/UIChatRoomCell.h @@ -36,6 +36,7 @@ @property (nonatomic, retain) IBOutlet UILabel *dateLabel; @property (nonatomic, retain) IBOutlet UIImageView* statusImage; @property (nonatomic, retain) IBOutlet UIButton* downloadButton; +@property (nonatomic, retain) IBOutlet UITapGestureRecognizer* imageTapGestureRecognizer; - (id)initWithIdentifier:(NSString*)identifier; + (CGFloat)height:(ChatModel*)chat width:(int)width; diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index 1ea21b7fc..cb6027ad5 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -40,6 +40,7 @@ @synthesize statusImage; @synthesize downloadButton; @synthesize chatRoomDelegate; +@synthesize imageTapGestureRecognizer; static const CGFloat CELL_MIN_HEIGHT = 40.0f; static const CGFloat CELL_MIN_WIDTH = 150.0f; @@ -58,6 +59,8 @@ static UIFont *CELL_FONT = nil; [[NSBundle mainBundle] loadNibNamed:@"UIChatRoomCell" owner:self options:nil]; + imageTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onImageClick:)]; + [messageImageView addGestureRecognizer:imageTapGestureRecognizer]; [self addSubview:innerView]; [deleteButton setAlpha:0.0f]; } @@ -76,6 +79,7 @@ static UIFont *CELL_FONT = nil; [statusImage release]; [chat release]; [downloadButton release]; + [imageTapGestureRecognizer release]; [super dealloc]; } diff --git a/Classes/LinphoneUI/UIChatRoomCell.xib b/Classes/LinphoneUI/UIChatRoomCell.xib index 1faf62b94..6014ce950 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.xib +++ b/Classes/LinphoneUI/UIChatRoomCell.xib @@ -1,21 +1,20 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject IBUIButton IBUIImageView IBUILabel - IBUITapGestureRecognizer IBUIView @@ -109,6 +108,7 @@ 16 NO + 294 @@ -270,7 +270,6 @@ IBCocoaTouchFramework - @@ -371,16 +370,6 @@ 32 - - - gestureRecognizers - - - NSArray - YES - - 41 - onDownloadClick: @@ -390,14 +379,6 @@ 39 - - - onImageClick: - - - - 42 - @@ -506,11 +487,6 @@ downloadButton - - 40 - - - @@ -530,7 +506,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -569,7 +544,7 @@ UIView UILabel UIButton - UIButton + UITapGestureRecognizer UIView UIImageView UILabel @@ -594,7 +569,7 @@ downloadButton - UIButton + UITapGestureRecognizer innerView @@ -624,7 +599,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -634,6 +609,6 @@ {45, 45} {45, 45} - 1498 + 1926 diff --git a/Classes/LinphoneUI/UIHistoryCell.xib b/Classes/LinphoneUI/UIHistoryCell.xib index e2fe52aa4..2c6aae6c4 100644 --- a/Classes/LinphoneUI/UIHistoryCell.xib +++ b/Classes/LinphoneUI/UIHistoryCell.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -42,7 +42,6 @@ 292 {{10, 8}, {27, 27}} - _NS:9 NO @@ -53,7 +52,6 @@ 274 {{45, 0}, {236, 44}} - _NS:328 NO @@ -69,6 +67,7 @@ 1 MCAwIDAAA + darkTextColor 1 @@ -89,7 +88,6 @@ 257 {{276, 0}, {44, 44}} - _NS:9 NO @@ -128,7 +126,6 @@ 257 {{276, 0}, {44, 44}} - _NS:9 NO IBCocoaTouchFramework @@ -154,7 +151,6 @@ {320, 44} - _NS:9 @@ -348,7 +344,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -358,6 +354,6 @@ {45, 45} {45, 45} - 1498 + 1926 diff --git a/Classes/LinphoneUI/UIMainBar.m b/Classes/LinphoneUI/UIMainBar.m index 7e868a9f3..fd2929318 100644 --- a/Classes/LinphoneUI/UIMainBar.m +++ b/Classes/LinphoneUI/UIMainBar.m @@ -96,25 +96,73 @@ name:UIApplicationWillEnterForegroundNotification object:nil]; - // Set selected+over background: IB lack ! - [historyButton setImage:[UIImage imageNamed:@"history_selected.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; + { + UIButton *historyButtonLandscape = (UIButton*) [landscapeView viewWithTag:[historyButton tag]]; + // Set selected+over background: IB lack ! + [historyButton setBackgroundImage:[UIImage imageNamed:@"history_selected.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over background: IB lack ! + [historyButtonLandscape setBackgroundImage:[UIImage imageNamed:@"history_selected_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStatesForTabs:historyButton]; + [LinphoneUtils buttonFixStatesForTabs:historyButtonLandscape]; + } - // Set selected+over background: IB lack ! - [contactsButton setImage:[UIImage imageNamed:@"contacts_selected.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; + { + UIButton *contactsButtonLandscape = (UIButton*) [landscapeView viewWithTag:[contactsButton tag]]; + // Set selected+over background: IB lack ! + [contactsButton setBackgroundImage:[UIImage imageNamed:@"contacts_selected.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over background: IB lack ! + [contactsButtonLandscape setBackgroundImage:[UIImage imageNamed:@"contacts_selected_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStatesForTabs:contactsButton]; + [LinphoneUtils buttonFixStatesForTabs:contactsButtonLandscape]; + } + { + UIButton *dialerButtonLandscape = (UIButton*) [landscapeView viewWithTag:[dialerButton tag]]; + // Set selected+over background: IB lack ! + [dialerButton setBackgroundImage:[UIImage imageNamed:@"dialer_selected.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over background: IB lack ! + [dialerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"dialer_selected_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStatesForTabs:dialerButton]; + [LinphoneUtils buttonFixStatesForTabs:dialerButtonLandscape]; + } + { + UIButton *settingsButtonLandscape = (UIButton*) [landscapeView viewWithTag:[settingsButton tag]]; + // Set selected+over background: IB lack ! + [settingsButton setBackgroundImage:[UIImage imageNamed:@"settings_selected.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over background: IB lack ! + [settingsButtonLandscape setBackgroundImage:[UIImage imageNamed:@"settings_selected_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStatesForTabs:settingsButton]; + [LinphoneUtils buttonFixStatesForTabs:settingsButtonLandscape]; + } - // Set selected+over background: IB lack ! - [dialerButton setImage:[UIImage imageNamed:@"dialer_selected.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - // Set selected+over background: IB lack ! - [settingsButton setImage:[UIImage imageNamed:@"settings_selected.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - // Set selected+over background: IB lack ! - [chatButton setImage:[UIImage imageNamed:@"chat_selected.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; + { + UIButton *chatButtonLandscape = (UIButton*) [landscapeView viewWithTag:[chatButton tag]]; + // Set selected+over background: IB lack ! + [chatButton setBackgroundImage:[UIImage imageNamed:@"chat_selected.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over background: IB lack ! + [chatButtonLandscape setBackgroundImage:[UIImage imageNamed:@"chat_selected_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStatesForTabs:chatButton]; + [LinphoneUtils buttonFixStatesForTabs:chatButtonLandscape]; + } [super viewDidLoad]; // Have to be after due to TPMultiLayoutViewController } @@ -333,6 +381,7 @@ [[PhoneMainView instance] changeCurrentView:[ChatViewController compositeViewDescription]]; } + #pragma mark - TPMultiLayoutViewController Functions - (NSDictionary*)attributesForView:(UIView*)view { @@ -342,21 +391,7 @@ [attributes setObject:[NSValue valueWithCGRect:view.bounds] forKey:@"bounds"]; if([view isKindOfClass:[UIButton class]]) { UIButton *button = (UIButton *)view; - [UIMainBar addDictEntry:attributes item:[button imageForState:UIControlStateNormal] key:@"image-normal"]; - [UIMainBar addDictEntry:attributes item:[button imageForState:UIControlStateHighlighted] key:@"image-highlighted"]; - [UIMainBar addDictEntry:attributes item:[button imageForState:UIControlStateDisabled] key:@"image-disabled"]; - [UIMainBar addDictEntry:attributes item:[button imageForState:UIControlStateSelected] key:@"image-selected"]; - [UIMainBar addDictEntry:attributes item:[button imageForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"image-disabled-highlighted"]; - [UIMainBar addDictEntry:attributes item:[button imageForState:UIControlStateSelected | UIControlStateHighlighted] key:@"image-selected-highlighted"]; - [UIMainBar addDictEntry:attributes item:[button imageForState:UIControlStateSelected | UIControlStateDisabled] key:@"image-selected-disabled"]; - - [UIMainBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateNormal] key:@"background-normal"]; - [UIMainBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateHighlighted] key:@"background-highlighted"]; - [UIMainBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateDisabled] key:@"background-disabled"]; - [UIMainBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected] key:@"background-selected"]; - [UIMainBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"background-disabled-highlighted"]; - [UIMainBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected | UIControlStateHighlighted] key:@"background-selected-highlighted"]; - [UIMainBar addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected | UIControlStateDisabled] key:@"background-selected-disabled"]; + [LinphoneUtils buttonMultiViewAddAttributes:attributes button:button]; } [attributes setObject:[NSNumber numberWithInteger:view.autoresizingMask] forKey:@"autoresizingMask"]; @@ -368,36 +403,9 @@ view.bounds = [[attributes objectForKey:@"bounds"] CGRectValue]; if([view isKindOfClass:[UIButton class]]) { UIButton *button = (UIButton *)view; - [button setImage:[UIMainBar getDictEntry:attributes key:@"image-normal"] forState:UIControlStateNormal]; - [button setImage:[UIMainBar getDictEntry:attributes key:@"image-highlighted"] forState:UIControlStateHighlighted]; - [button setImage:[UIMainBar getDictEntry:attributes key:@"image-disabled"] forState:UIControlStateDisabled]; - [button setImage:[UIMainBar getDictEntry:attributes key:@"image-selected"] forState:UIControlStateSelected]; - [button setImage:[UIMainBar getDictEntry:attributes key:@"image-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; - [button setImage:[UIMainBar getDictEntry:attributes key:@"image-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; - [button setImage:[UIMainBar getDictEntry:attributes key:@"image-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; - - [button setBackgroundImage:[UIMainBar getDictEntry:attributes key:@"background-normal"] forState:UIControlStateNormal]; - [button setBackgroundImage:[UIMainBar getDictEntry:attributes key:@"background-highlighted"] forState:UIControlStateHighlighted]; - [button setBackgroundImage:[UIMainBar getDictEntry:attributes key:@"background-disabled"] forState:UIControlStateDisabled]; - [button setBackgroundImage:[UIMainBar getDictEntry:attributes key:@"background-selected"] forState:UIControlStateSelected]; - [button setBackgroundImage:[UIMainBar getDictEntry:attributes key:@"background-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; - [button setBackgroundImage:[UIMainBar getDictEntry:attributes key:@"background-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; - [button setBackgroundImage:[UIMainBar getDictEntry:attributes key:@"background-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; + [LinphoneUtils buttonMultiViewApplyAttributes:attributes button:button]; } view.autoresizingMask = [[attributes objectForKey:@"autoresizingMask"] integerValue]; } -+ (void)addDictEntry:(NSMutableDictionary*)dict item:(id)item key:(id)key { - if(item != nil && key != nil) { - [dict setObject:item forKey:key]; - } -} - -+ (id)getDictEntry:(NSDictionary*)dict key:(id)key { - if(key != nil) { - return [dict objectForKey:key]; - } - return nil; -} - @end diff --git a/Classes/LinphoneUI/UIStateBar.xib b/Classes/LinphoneUI/UIStateBar.xib index 45a65aa71..2b45cc5cc 100644 --- a/Classes/LinphoneUI/UIStateBar.xib +++ b/Classes/LinphoneUI/UIStateBar.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 @@ 274 {320, 23} - _NS:9 1 @@ -57,7 +56,6 @@ 292 {{6, 6}, {10, 10}} - _NS:567 2 @@ -77,7 +75,6 @@ 290 {{22, 0}, {222, 20}} - _NS:328 NO @@ -112,7 +109,6 @@ 289 {{252, 3}, {27, 17}} - _NS:567 4 @@ -127,8 +123,6 @@ 289 {{287, 3}, {27, 17}} - - _NS:567 1 5 @@ -141,7 +135,6 @@ {320, 23} - _NS:196 @@ -159,7 +152,6 @@ 274 {480, 23} - _NS:9 1 @@ -172,7 +164,6 @@ 292 {{6, 6}, {10, 10}} - _NS:567 2 @@ -185,7 +176,6 @@ 290 {{22, 0}, {382, 20}} - _NS:328 NO @@ -207,7 +197,6 @@ 289 {{412, 3}, {27, 17}} - _NS:567 4 @@ -219,8 +208,6 @@ 289 {{447, 3}, {27, 17}} - - _NS:567 1 5 @@ -230,7 +217,6 @@ {480, 23} - _NS:196 @@ -489,7 +475,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -497,6 +483,6 @@ {18, 17} {640, 46} - 1498 + 1926 diff --git a/Classes/LinphoneUI/en.lproj/UICallBar.xib b/Classes/LinphoneUI/en.lproj/UICallBar.xib index dba37abd8..7454c922c 100644 --- a/Classes/LinphoneUI/en.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/en.lproj/UICallBar.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -42,8 +42,6 @@ -2147483356 {{0, 335}, {320, 125}} - - _NS:9 1 @@ -65,7 +63,6 @@ 274 {281, 260} - _NS:9 2 @@ -81,7 +78,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -125,7 +121,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -153,7 +148,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -181,7 +175,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -209,7 +202,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -237,7 +229,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -265,7 +256,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -293,7 +283,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -321,7 +310,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -349,7 +337,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -377,7 +364,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -405,7 +391,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -431,7 +416,6 @@ {{20, 57}, {281, 260}} - _NS:9 @@ -450,7 +434,6 @@ 292 {{3, 0}, {77, 68}} - _NS:9 NO @@ -463,31 +446,51 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfer + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + - + NSImage options_transfer_over.png - + NSImage options_transfer_disabled.png - + NSImage options_transfer_default.png - - 2 - 15 + + 1 + 13 + + + Helvetica + 13 + 16 - 292 {{3, 61}, {77, 68}} - _NS:9 NO @@ -500,26 +503,33 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Add call + + + - + NSImage options_add_over.png - + NSImage options_add_disabled.png - + NSImage options_add_default.png - - + + {{240, 205}, {80, 129}} - _NS:9 @@ -535,7 +545,6 @@ 290 {{0, 135}, {320, 2000}} - _NS:9 @@ -550,7 +559,6 @@ 292 {80, 67} - _NS:9 NO @@ -563,32 +571,40 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Video + + + + - + NSImage video_off_over.png - + NSImage video_off_disabled.png - + NSImage video_on_default.png - + NSImage video_off_default.png - - + + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -601,7 +617,6 @@ 292 {{80, 0}, {80, 67}} - _NS:9 NO @@ -614,32 +629,40 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over.png - + NSImage micro_off_disabled.png - + NSImage micro_on_default.png - + NSImage micro_off_default.png - - + + 292 {{160, 0}, {80, 67}} - _NS:9 NO @@ -652,32 +675,40 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Speaker + + + + - + NSImage speaker_off_over.png - + NSImage speaker_off_disabled.png - + NSImage speaker_on_default.png - + NSImage speaker_off_default.png - - + + 292 {{240, 0}, {80, 67}} - _NS:9 NO @@ -690,32 +721,40 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over.png - + NSImage options_disabled.png - + NSImage options_selected.png - + NSImage options_default.png - - + + 264 {{0, 67}, {105, 68}} - _NS:9 NO @@ -741,7 +780,10 @@ NSImage pause_off_default.png - + + 2 + 15 + @@ -749,7 +791,6 @@ -2147483384 {{0, 67}, {105, 68}} - _NS:9 NO @@ -779,7 +820,6 @@ 264 {{105, 67}, {111, 68}} - _NS:9 NO @@ -809,7 +849,6 @@ 264 {{215, 67}, {105, 68}} - _NS:9 NO @@ -827,6 +866,10 @@ NSImage dialer_alt_over.png + + NSImage + dialer_alt_disabled.png + NSImage dialer_alt_back_default.png @@ -841,7 +884,6 @@ {{0, 325}, {320, 135}} - _NS:9 @@ -851,7 +893,6 @@ {320, 460} - _NS:9 @@ -867,7 +908,6 @@ -2147483356 {{0, 248}, {480, 72}} - _NS:9 @@ -890,7 +930,6 @@ 274 {281, 260} - _NS:9 2 @@ -903,7 +942,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -926,7 +964,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -945,7 +982,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -964,7 +1000,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -983,7 +1018,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -1002,7 +1036,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -1021,7 +1054,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -1040,7 +1072,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -1059,7 +1090,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -1078,7 +1108,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -1097,7 +1126,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -1116,8 +1144,6 @@ 292 {{193, 196}, {107, 54}} - - NO NO 14 @@ -1133,7 +1159,6 @@ {{91, 0}, {281, 260}} - _NS:9 @@ -1149,7 +1174,6 @@ 292 {65, 55} - _NS:9 NO @@ -1162,28 +1186,35 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfer + + + - + NSImage options_transfer_over_landscape.png - + NSImage options_transfer_disabled_landscape.png - + NSImage options_transfer_default_landscape.png - - + + 292 {{0, 51}, {65, 55}} - _NS:9 NO @@ -1196,26 +1227,33 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Add call + + + - + NSImage options_add_over_landscape.png - + NSImage options_add_disabled_landscape.png - + NSImage options_add_default_landscape.png - - + + {{415, 140}, {65, 105}} - _NS:9 @@ -1231,7 +1269,6 @@ 290 {{0, 82}, {480, 2000}} - _NS:9 @@ -1246,7 +1283,6 @@ 292 {{65, 0}, {65, 82}} - _NS:9 NO @@ -1259,32 +1295,40 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Video + + + + - + NSImage video_off_over_landscape.png - + NSImage video_off_disabled_landscape.png - + NSImage video_on_default_landscape.png - + NSImage video_off_default_landscape.png - - + + -2147483356 {{79, 20}, {37, 37}} - _NS:9 NO @@ -1297,7 +1341,6 @@ 292 {{130, 0}, {65, 82}} - _NS:9 NO @@ -1310,32 +1353,40 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over_landscape.png - + NSImage micro_off_disabled_landscape.png - + NSImage micro_on_default_landscape.png - + NSImage micro_off_default_landscape.png - - + + 292 {{285, 0}, {65, 82}} - _NS:9 NO @@ -1348,32 +1399,40 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Speaker + + + + - + NSImage speaker_off_over_landscape.png - + NSImage speaker_off_disabled_landscape.png - + NSImage speaker_on_default_landscape.png - + NSImage speaker_off_default_landscape.png - - + + 292 {{350, 0}, {65, 82}} - _NS:9 NO @@ -1386,32 +1445,40 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over_landscape.png - + NSImage options_disabled_landscape.png - + NSImage options_selected_landscape.png - + NSImage options_default_landscape.png - - + + 264 {65, 82} - _NS:9 NO @@ -1445,7 +1512,6 @@ -2147483384 {65, 82} - _NS:9 NO @@ -1475,7 +1541,6 @@ 264 {{195, 0}, {90, 82}} - _NS:9 NO @@ -1505,7 +1570,6 @@ 264 {{415, 0}, {65, 82}} - _NS:9 NO @@ -1523,21 +1587,21 @@ NSImage dialer_alt_over_landscape.png + + NSImage + dialer_alt_default_landscape.png + NSImage dialer_alt_back_default_landscape.png - - NSImage - dialer_alt_default_landscape.png - + {{0, 238}, {480, 82}} - _NS:9 @@ -1547,7 +1611,6 @@ {480, 320} - _NS:9 @@ -2383,7 +2446,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2393,10 +2457,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIPauseButton @@ -2404,18 +2468,23 @@ UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton @@ -2435,7 +2504,8 @@ UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2458,8 +2528,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2473,7 +2545,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2500,7 +2572,7 @@ UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2515,14 +2587,17 @@ UIPauseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2532,292 +2607,12 @@ 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 @@ -2831,6 +2626,7 @@ {530, 526} {209, 136} {130, 163} + {209, 136} {209, 136} {130, 163} {222, 136} @@ -2912,6 +2708,6 @@ {160, 134} {130, 163} - 1498 + 1926 diff --git a/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib b/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib index 001250eae..a213bd86a 100644 --- a/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib +++ b/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -42,7 +42,6 @@ -2147483356 {{0, 680}, {1024, 68}} - _NS:9 @@ -65,7 +64,6 @@ 274 {281, 260} - _NS:9 2 @@ -81,7 +79,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -122,7 +119,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -147,7 +143,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -172,7 +167,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -197,7 +191,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -222,7 +215,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -247,7 +239,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -272,7 +263,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -297,7 +287,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -322,7 +311,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -347,7 +335,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -372,7 +359,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -395,7 +381,6 @@ {{372, 244}, {281, 260}} - _NS:9 @@ -414,7 +399,6 @@ 292 {81, 69} - _NS:9 NO @@ -427,32 +411,52 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfer + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + - + NSImage options_transfer_over_landscape~ipad.png - + NSImage options_transfer_disabled_landscape~ipad.png - + NSImage options_transfer_default_landscape~ipad.png - - 2 - 15 + + 1 + 13 + + + Helvetica + 13 + 16 - 292 {{0, 65}, {81, 69}} - - _NS:9 NO 17 @@ -464,26 +468,34 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Add call + + + + - + NSImage options_add_over_landscape~ipad.png - + NSImage options_add_disabled_landscape~ipad.png - + NSImage options_add_default_landscape~ipad.png - - + + {{239, 552}, {81, 133}} - _NS:9 @@ -499,7 +511,6 @@ 290 {{0, 85}, {1024, 2000}} - _NS:9 @@ -514,7 +525,6 @@ 292 {80, 85} - _NS:9 NO @@ -527,32 +537,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Video + + + + - + NSImage video_off_over_landscape~ipad.png - + NSImage video_off_disabled_landscape~ipad.png - + NSImage video_on_default_landscape~ipad.png - + NSImage video_off_default_landscape~ipad.png - - + + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -565,7 +583,6 @@ 292 {{80, 0}, {80, 85}} - _NS:9 NO @@ -578,32 +595,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over_landscape~ipad.png - + NSImage micro_off_disabled_landscape~ipad.png - + NSImage micro_on_default_landscape~ipad.png - + NSImage micro_off_default_landscape~ipad.png - - + + 292 {{160, 0}, {80, 85}} - _NS:9 NO @@ -616,32 +641,41 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Speaker + Speaker + + + + - + NSImage speaker_off_over_landscape~ipad.png - + NSImage speaker_off_disabled_landscape~ipad.png - + NSImage speaker_on_default_landscape~ipad.png - + NSImage speaker_off_default_landscape~ipad.png - - + + 292 {{240, 0}, {80, 85}} - _NS:9 NO @@ -654,32 +688,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over_landscape~ipad.png - + NSImage options_disabled_landscape~ipad.png - + NSImage options_selected_landscape~ipad.png - + NSImage options_default_landscape~ipad.png - - + + 264 {{701, 0}, {87, 85}} - _NS:9 NO @@ -705,7 +747,10 @@ NSImage pause_off_default_landscape~ipad.png - + + 2 + 15 + @@ -713,7 +758,6 @@ -2147483384 {{701, 0}, {87, 85}} - _NS:9 NO @@ -743,7 +787,6 @@ 264 {{875, 0}, {149, 85}} - _NS:9 NO @@ -773,7 +816,6 @@ 264 {{788, 0}, {87, 85}} - _NS:9 NO @@ -791,21 +833,21 @@ NSImage dialer_alt_over_landscape~ipad.png + + NSImage + dialer_alt_default_landscape~ipad.png + NSImage dialer_alt_back_default_landscape~ipad.png - - NSImage - dialer_alt_default_landscape~ipad.png - + {{0, 663}, {1024, 85}} - _NS:9 @@ -815,7 +857,6 @@ {1024, 748} - _NS:9 @@ -835,7 +876,6 @@ -2147483356 {{0, 936}, {768, 68}} - _NS:9 @@ -858,7 +898,6 @@ 274 {281, 260} - _NS:9 2 @@ -871,7 +910,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -897,7 +935,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -919,7 +956,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -941,7 +977,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -963,7 +998,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -985,7 +1019,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -1007,7 +1040,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -1029,7 +1061,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -1051,7 +1082,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -1073,7 +1103,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -1095,7 +1124,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -1117,7 +1145,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -1137,7 +1164,6 @@ {{244, 372}, {281, 260}} - _NS:9 @@ -1153,7 +1179,6 @@ 292 {81, 69} - _NS:9 NO @@ -1166,29 +1191,36 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfer + + + + - + NSImage options_transfer_over~ipad.png - + NSImage options_transfer_disabled~ipad.png - + NSImage options_transfer_default~ipad.png - - + + 292 {{0, 64}, {81, 69}} - - _NS:9 NO 17 @@ -1200,26 +1232,30 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Add call + + + + - + NSImage options_add_over~ipad.png - - NSImage - options_add_disabled~ipad.png - - + NSImage options_add_default~ipad.png - - + + {{239, 809}, {81, 133}} - _NS:9 @@ -1235,7 +1271,6 @@ 290 {{0, 85}, {768, 2000}} - _NS:9 @@ -1250,7 +1285,6 @@ 292 {80, 85} - _NS:9 NO @@ -1263,32 +1297,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Video + + + + - + NSImage video_off_over~ipad.png - + NSImage video_off_disabled~ipad.png - + NSImage video_on_default~ipad.png - + NSImage video_off_default~ipad.png - - + + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -1301,7 +1343,6 @@ 292 {{80, 0}, {80, 85}} - _NS:9 NO @@ -1314,32 +1355,36 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over~ipad.png - - NSImage - micro_off_disabled~ipad.png - - + NSImage micro_on_default~ipad.png - + NSImage micro_off_default~ipad.png - - + + 292 {{160, 0}, {80, 85}} - _NS:9 NO @@ -1352,32 +1397,41 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Speaker + Speaker + + + + - + NSImage speaker_off_over~ipad.png - + NSImage speaker_off_disabled~ipad.png - + NSImage speaker_on_default~ipad.png - + NSImage speaker_off_default~ipad.png - - + + 292 {{240, 0}, {80, 85}} - _NS:9 NO @@ -1390,32 +1444,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over~ipad.png - + NSImage options_disabled~ipad.png - + NSImage options_selected~ipad.png - + NSImage options_default~ipad.png - - + + 264 {{445, 0}, {87, 85}} - _NS:9 NO @@ -1449,7 +1511,6 @@ -2147483384 {{445, 0}, {87, 85}} - _NS:9 NO @@ -1479,7 +1540,6 @@ 264 {{619, 0}, {149, 85}} - _NS:9 NO @@ -1509,7 +1569,6 @@ 264 {{532, 0}, {87, 85}} - _NS:9 NO @@ -1527,21 +1586,21 @@ NSImage dialer_alt_over~ipad.png + + NSImage + dialer_alt_default~ipad.png + NSImage dialer_alt_back_default~ipad.png - - NSImage - dialer_alt_default~ipad.png - + {{0, 919}, {768, 85}} - _NS:9 @@ -1551,7 +1610,6 @@ {768, 1004} - _NS:9 @@ -2301,7 +2359,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2312,16 +2370,20 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2364,9 +2426,11 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2374,23 +2438,27 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIPauseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIHangUpButton @@ -2437,8 +2505,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2735,7 +2805,7 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -2758,7 +2828,6 @@ {159, 170} {159, 170} {159, 170} - {159, 170} {159, 170} {159, 170} {159, 170} @@ -2790,7 +2859,6 @@ {162, 137} {162, 137} {162, 137} - {162, 137} {162, 137} {162, 137} {162, 170} @@ -2830,6 +2898,6 @@ {162, 170} {162, 170} - 1498 + 1926 diff --git a/Classes/LinphoneUI/en.lproj/UICallCell.xib b/Classes/LinphoneUI/en.lproj/UICallCell.xib index a41e70d36..1a70be243 100644 --- a/Classes/LinphoneUI/en.lproj/UICallCell.xib +++ b/Classes/LinphoneUI/en.lproj/UICallCell.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -46,7 +46,6 @@ 290 {{0, 63}, {320, 250}} - _NS:9 @@ -87,7 +86,6 @@ 293 {{0, 48}, {320, 262}} - _NS:9 @@ -103,7 +101,6 @@ 293 {{80, 65}, {160, 170}} - _NS:9 @@ -122,7 +119,6 @@ {320, 300} - _NS:9 @@ -138,7 +134,6 @@ 290 {320, 63} - _NS:9 NO @@ -153,7 +148,6 @@ 290 {320, 63} - _NS:9 0.0 @@ -165,7 +159,6 @@ 290 {{10, 0}, {206, 51}} - _NS:9 NO @@ -4587,7 +4580,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 289 {{224, 14}, {25, 25}} - _NS:9 NO @@ -4603,7 +4595,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483359 {{216, 6}, {41, 41}} - _NS:9 NO @@ -4636,7 +4627,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483359 {{216, 6}, {41, 41}} - _NS:9 NO @@ -4673,8 +4663,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 289 {{262, 12}, {50, 29}} - - _NS:9 NO YES @@ -4706,7 +4694,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 290 {{0, 5}, {200, 40}} - _NS:9 NO @@ -4725,7 +4712,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 63} - _NS:9 @@ -4734,7 +4720,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 300} - _NS:9 @@ -4745,8 +4730,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 292 {320, 460} - - _NS:9 NO @@ -5030,107 +5013,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 75 - - - - UICallCell - UITableViewCell - - id - id - - - - doHeaderClick: - id - - - doRemoveClick: - id - - - - UILabel - UIImageView - UIView - UIImageView - UIImageView - UIView - UIPauseButton - UIButton - UIImageView - UILabel - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - avatarView - UIView - - - headerBackgroundHighlightImage - UIImageView - - - headerBackgroundImage - UIImageView - - - headerView - UIView - - - pauseButton - UIPauseButton - - - removeButton - UIButton - - - stateImage - UIImageView - - - stateLabel - UILabel - - - - IBProjectSource - ./Classes/UICallCell.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -5144,6 +5032,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {43, 46} {640, 125} - 1498 + 1926 diff --git a/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib b/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib index 3fa734501..2e72dd919 100644 --- a/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib +++ b/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib @@ -34,11 +34,11 @@ - 292 + 290 - 292 + 290 {320, 68} @@ -58,18 +58,17 @@ - 292 + 289 {{224, 14}, {25, 25}} - _NS:9 NO IBCocoaTouchFramework - 292 + 289 {{216, 6}, {41, 41}} diff --git a/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib b/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib index 57c5e91bd..0d353a385 100644 --- a/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib +++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -40,8 +40,6 @@ 301 {{23, 25}, {275, 50}} - - _NS:9 3 @@ -80,7 +78,6 @@ {320, 80} - _NS:9 @@ -207,7 +204,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -215,6 +212,6 @@ {550, 101} {550, 101} - 1498 + 1926 diff --git a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib index 6e7ff2aca..c5069b9d0 100644 --- a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -43,7 +43,6 @@ 292 {{-13, -5}, {131, 107}} - _NS:9 NO @@ -58,7 +57,6 @@ 292 {{20, 6}, {65, 65}} - _NS:9 NO @@ -73,7 +71,6 @@ 292 {{20, 6}, {65, 65}} - _NS:9 NO @@ -115,7 +112,6 @@ 290 {{0, 37}, {199, 43}} - _NS:9 NO @@ -147,7 +143,6 @@ {{101, 0}, {219, 80}} - _NS:9 @@ -165,63 +160,10 @@ 274 {219, 130} - - _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -238,7 +180,6 @@ AAgACAAIAAEAAQABAAE {{101, 0}, {219, 130}} - _NS:9 @@ -247,7 +188,6 @@ AAgACAAIAAEAAQABAAE {320, 130} - _NS:9 @@ -491,7 +431,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -499,6 +439,6 @@ AAgACAAIAAEAAQABAAE {262, 214} {131, 131} - 1498 + 1926 diff --git a/Classes/LinphoneUI/en.lproj/UIMainBar.xib b/Classes/LinphoneUI/en.lproj/UIMainBar.xib index ea6cfc924..cb27c7c36 100644 --- a/Classes/LinphoneUI/en.lproj/UIMainBar.xib +++ b/Classes/LinphoneUI/en.lproj/UIMainBar.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -62,7 +62,6 @@ {{0, 77}, {320, 2000}} - _NS:9 1 @@ -87,29 +86,46 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + History + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC44MTE3NjQ3MTcxIDAuMjk4MDM5MjI3NyAwLjE2MDc4NDMxOQA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_over.png - + NSImage history_selected.png - + NSImage history_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -158,15 +174,8 @@ 0 10 1 - - 1 - 14 - - - Helvetica - 14 - 16 - + + {{38, 1}, {21, 21}} @@ -198,26 +207,34 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Contacts + + + - + NSImage contacts_over.png - + NSImage contacts_selected.png - + NSImage contacts_default.png - - + + 292 - {{192, 0}, {64, 77}} + {{256, 0}, {64, 77}} @@ -230,21 +247,29 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Settings + + + - + NSImage settings_over.png - + NSImage settings_selected.png - + NSImage settings_default.png - - + + @@ -275,13 +300,20 @@ NSImage dialer_default.png - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 - {{256, 0}, {64, 77}} + {{192, 0}, {64, 77}} @@ -294,21 +326,29 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Chat + + + - + NSImage chat_over.png - + NSImage chat_selected.png - + NSImage chat_default.png - - + + @@ -350,10 +390,10 @@ 10 1 - + - {{261, 1}, {21, 21}} + {{197, 1}, {21, 21}} @@ -573,12 +613,6 @@ contacts - - 9 - - - settings - 7 @@ -635,6 +669,12 @@ background + + 9 + + + settings + @@ -653,15 +693,19 @@ 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 - + + @@ -785,7 +829,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -807,6 +851,6 @@ {128, 154} {128, 154} - 1498 + 1926 diff --git a/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib b/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib index b3907761d..e8646ae44 100644 --- a/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib +++ b/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -88,29 +88,46 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + History + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_over~ipad.png - + NSImage history_selected~ipad.png - + NSImage history_default~ipad.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -159,18 +176,11 @@ 0 10 1 - - 1 - 14 - - - Helvetica - 14 - 16 - + + - {{140, 1}, {21, 21}} + {{144, 1}, {21, 21}} @@ -201,21 +211,29 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Contacts + + + - + NSImage contacts_over~ipad.png - + NSImage contacts_selected~ipad.png - + NSImage contacts_default~ipad.png - - + + @@ -223,7 +241,7 @@ {{350, -1}, {68, 80}} - + _NS:9 NO 4 @@ -247,16 +265,23 @@ NSImage dialer_default.png - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 - {{418, 0}, {175, 77}} + {{593, 0}, {175, 77}} - + _NS:9 NO 5 @@ -267,29 +292,37 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Settings + + + - + NSImage settings_over~ipad.png - + NSImage settings_selected~ipad.png - + NSImage settings_default~ipad.png - - + + 292 - {{593, 0}, {175, 77}} + {{418, 0}, {175, 77}} - + _NS:9 NO 6 @@ -300,21 +333,29 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Chat + + + - + NSImage chat_over~ipad.png - + NSImage chat_selected~ipad.png - + NSImage chat_default~ipad.png - - + + @@ -338,7 +379,6 @@ {{2, 2}, {17, 17}} - _NS:9 NO YES @@ -356,10 +396,10 @@ 10 1 - + - {{605, 1}, {21, 21}} + {{428, 1}, {21, 21}} @@ -438,21 +478,29 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + History + + + - + NSImage history_over_landscape~ipad.png - + NSImage history_selected_landscape~ipad.png - + NSImage history_default_landscape~ipad.png - - + + @@ -490,10 +538,10 @@ 10 1 - + - {{208, 1}, {21, 21}} + {{209, 1}, {21, 21}} @@ -521,21 +569,29 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Contacts + + + - + NSImage contacts_over_landscape~ipad.png - + NSImage contacts_selected_landscape~ipad.png - + NSImage contacts_default_landscape~ipad.png - - + + @@ -543,7 +599,7 @@ {{480, 8}, {68, 80}} - + _NS:9 NO 4 @@ -559,15 +615,14 @@ - + 292 - {{544, 0}, {240, 86}} + {{784, 0}, {240, 86}} - _NS:9 NO 5 @@ -578,26 +633,34 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Settings + + + - + NSImage settings_over_landscape~ipad.png - + NSImage settings_selected_landscape~ipad.png - + NSImage settings_default_landscape~ipad.png - - + + 292 - {{784, 0}, {240, 86}} + {{548, 0}, {240, 86}} @@ -611,21 +674,29 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Chat + + + - + NSImage chat_over_landscape~ipad.png - + NSImage chat_selected_landscape~ipad.png - + NSImage chat_default_landscape~ipad.png - - + + @@ -649,7 +720,7 @@ {{2, 2}, {17, 17}} - + _NS:9 NO YES @@ -663,10 +734,10 @@ 10 1 - + - {{792, 1}, {21, 21}} + {{558, 1}, {21, 21}} @@ -860,13 +931,13 @@ - - + + Portrait View @@ -904,12 +975,6 @@ mask - - 7 - - - chat - 8 @@ -946,12 +1011,6 @@ chatNotificationLabel - - 10 - - - settings - 28 @@ -960,11 +1019,11 @@ - + Landscape View @@ -1062,6 +1121,18 @@ background + + 10 + + + settings + + + 7 + + + chat + @@ -1070,7 +1141,8 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1082,12 +1154,16 @@ 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 @@ -1104,11 +1180,14 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + @@ -1232,17 +1311,17 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {480, 170} - {353, 153} - {480, 170} - {353, 153} - {480, 170} - {353, 153} + {480, 171} + {350, 153} + {480, 171} + {350, 153} + {480, 171} + {350, 153} {480, 171} {352, 153} {480, 171} @@ -1260,12 +1339,12 @@ {480, 171} {353, 153} {480, 171} - {350, 153} + {353, 153} {480, 171} - {350, 153} + {353, 153} {480, 171} - {350, 153} + {353, 153} - 1498 + 1926 diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar.xib b/Classes/LinphoneUI/fr.lproj/UICallBar.xib index bb58b859a..784673776 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallBar.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -446,24 +446,45 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfert + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + - + NSImage options_transfer_over.png - + NSImage options_transfer_disabled.png - + NSImage options_transfer_default.png - - 2 - 15 + + 1 + 13 + + + Helvetica + 13 + 16 - @@ -482,21 +503,29 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Ajouter un appel + + + - + NSImage options_add_over.png - + NSImage options_add_disabled.png - + NSImage options_add_default.png - - + + {{240, 205}, {80, 129}} @@ -542,25 +571,34 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Vidéo + + + + - + NSImage video_off_over.png - + NSImage video_off_disabled.png - + NSImage video_on_default.png - + NSImage video_off_default.png - - + + @@ -591,25 +629,34 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over.png - + NSImage micro_off_disabled.png - + NSImage micro_on_default.png - + NSImage micro_off_default.png - - + + @@ -628,25 +675,34 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Haut parleur + + + + - + NSImage speaker_off_over.png - + NSImage speaker_off_disabled.png - + NSImage speaker_on_default.png - + NSImage speaker_off_default.png - - + + @@ -665,25 +721,34 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over.png - + NSImage options_disabled.png - + NSImage options_selected.png - + NSImage options_default.png - - + + @@ -715,7 +780,10 @@ NSImage pause_off_default.png - + + 2 + 15 + @@ -798,6 +866,10 @@ NSImage dialer_alt_over.png + + NSImage + dialer_alt_disabled.png + NSImage dialer_alt_back_default.png @@ -1113,21 +1185,29 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfert + + + - + NSImage options_transfer_over_landscape.png - + NSImage options_transfer_disabled_landscape.png - + NSImage options_transfer_default_landscape.png - - + + @@ -1146,21 +1226,29 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Ajouter appel + + + - + NSImage options_add_over_landscape.png - + NSImage options_add_disabled_landscape.png - + NSImage options_add_default_landscape.png - - + + {{415, 140}, {65, 105}} @@ -1206,25 +1294,34 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Vidéo + + + + - + NSImage video_off_over_landscape.png - + NSImage video_off_disabled_landscape.png - + NSImage video_on_default_landscape.png - + NSImage video_off_default_landscape.png - - + + @@ -1255,25 +1352,34 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over_landscape.png - + NSImage micro_off_disabled_landscape.png - + NSImage micro_on_default_landscape.png - + NSImage micro_off_default_landscape.png - - + + @@ -1292,25 +1398,34 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Haut parleur + + + + - + NSImage speaker_off_over_landscape.png - + NSImage speaker_off_disabled_landscape.png - + NSImage speaker_on_default_landscape.png - + NSImage speaker_off_default_landscape.png - - + + @@ -1329,25 +1444,34 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over_landscape.png - + NSImage options_disabled_landscape.png - + NSImage options_selected_landscape.png - + NSImage options_default_landscape.png - - + + @@ -1462,14 +1586,15 @@ NSImage dialer_alt_over_landscape.png + + NSImage + dialer_alt_default_landscape.png + NSImage dialer_alt_back_default_landscape.png - - NSImage - dialer_alt_default_landscape.png - + @@ -2319,7 +2444,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2329,10 +2455,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIPauseButton @@ -2340,18 +2466,23 @@ UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton @@ -2371,7 +2502,8 @@ UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2394,8 +2526,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2409,7 +2543,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2436,7 +2570,7 @@ UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2451,14 +2585,17 @@ UIPauseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2468,292 +2605,12 @@ 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 @@ -2767,6 +2624,7 @@ {530, 526} {209, 136} {130, 163} + {209, 136} {209, 136} {130, 163} {222, 136} diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib b/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib index 297903251..f2b86dd03 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -411,24 +411,46 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfert + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + - + NSImage options_transfer_over_landscape~ipad.png - + NSImage options_transfer_disabled_landscape~ipad.png - + NSImage options_transfer_default_landscape~ipad.png - - 2 - 15 + + 1 + 13 + + + Helvetica + 13 + 16 - @@ -446,21 +468,30 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Ajouter appel + + + + - + NSImage options_add_over_landscape~ipad.png - + NSImage options_add_disabled_landscape~ipad.png - + NSImage options_add_default_landscape~ipad.png - - + + {{239, 552}, {81, 133}} @@ -506,25 +537,34 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Vidéo + + + + - + NSImage video_off_over_landscape~ipad.png - + NSImage video_off_disabled_landscape~ipad.png - + NSImage video_on_default_landscape~ipad.png - + NSImage video_off_default_landscape~ipad.png - - + + @@ -555,25 +595,34 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over_landscape~ipad.png - + NSImage micro_off_disabled_landscape~ipad.png - + NSImage micro_on_default_landscape~ipad.png - + NSImage micro_off_default_landscape~ipad.png - - + + @@ -592,25 +641,35 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Haut parleur + Haut parleur + + + + - + NSImage speaker_off_over_landscape~ipad.png - + NSImage speaker_off_disabled_landscape~ipad.png - + NSImage speaker_on_default_landscape~ipad.png - + NSImage speaker_off_default_landscape~ipad.png - - + + @@ -629,25 +688,34 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over_landscape~ipad.png - + NSImage options_disabled_landscape~ipad.png - + NSImage options_selected_landscape~ipad.png - + NSImage options_default_landscape~ipad.png - - + + @@ -679,7 +747,10 @@ NSImage pause_off_default_landscape~ipad.png - + + 2 + 15 + @@ -762,14 +833,15 @@ NSImage dialer_alt_over_landscape~ipad.png + + NSImage + dialer_alt_default_landscape~ipad.png + NSImage dialer_alt_back_default_landscape~ipad.png - - NSImage - dialer_alt_default_landscape~ipad.png - + @@ -1118,21 +1190,30 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfert + + + + - + NSImage options_transfer_over~ipad.png - + NSImage options_transfer_disabled~ipad.png - + NSImage options_transfer_default~ipad.png - - + + @@ -1150,21 +1231,26 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Ajouter appel + + + + - + NSImage options_add_over~ipad.png - - NSImage - options_add_disabled~ipad.png - - + NSImage options_add_default~ipad.png - - + + {{239, 809}, {81, 133}} @@ -1210,25 +1296,34 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Vidéo + + + + - + NSImage video_off_over~ipad.png - + NSImage video_off_disabled~ipad.png - + NSImage video_on_default~ipad.png - + NSImage video_off_default~ipad.png - - + + @@ -1259,25 +1354,30 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over~ipad.png - - NSImage - micro_off_disabled~ipad.png - - + NSImage micro_on_default~ipad.png - + NSImage micro_off_default~ipad.png - - + + @@ -1296,25 +1396,35 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Haut parleur + Haut parleur + + + + - + NSImage speaker_off_over~ipad.png - + NSImage speaker_off_disabled~ipad.png - + NSImage speaker_on_default~ipad.png - + NSImage speaker_off_default~ipad.png - - + + @@ -1333,25 +1443,34 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over~ipad.png - + NSImage options_disabled~ipad.png - + NSImage options_selected~ipad.png - + NSImage options_default~ipad.png - - + + @@ -1466,14 +1585,15 @@ NSImage dialer_alt_over~ipad.png + + NSImage + dialer_alt_default~ipad.png + NSImage dialer_alt_back_default~ipad.png - - NSImage - dialer_alt_default~ipad.png - + @@ -2237,7 +2357,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2248,16 +2368,20 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2300,9 +2424,11 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2310,23 +2436,27 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIPauseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIHangUpButton @@ -2373,8 +2503,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2671,7 +2803,7 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -2694,7 +2826,6 @@ {159, 170} {159, 170} {159, 170} - {159, 170} {159, 170} {159, 170} {159, 170} @@ -2726,7 +2857,6 @@ {162, 137} {162, 137} {162, 137} - {162, 137} {162, 137} {162, 137} {162, 170} diff --git a/Classes/LinphoneUI/fr.lproj/UICallCell.xib b/Classes/LinphoneUI/fr.lproj/UICallCell.xib index 96798df7e..daf569dc7 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallCell.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallCell.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -5011,107 +5011,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 75 - - - - UICallCell - UITableViewCell - - id - id - - - - doHeaderClick: - id - - - doRemoveClick: - id - - - - UILabel - UIImageView - UIView - UIImageView - UIImageView - UIView - UIPauseButton - UIButton - UIImageView - UILabel - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - avatarView - UIView - - - headerBackgroundHighlightImage - UIImageView - - - headerBackgroundImage - UIImageView - - - headerView - UIView - - - pauseButton - UIPauseButton - - - removeButton - UIButton - - - stateImage - UIImageView - - - stateLabel - UILabel - - - - IBProjectSource - ./Classes/UICallCell.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/UIConferenceHeader.xib b/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib index de81b0289..db6aa3690 100644 --- a/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib +++ b/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib @@ -34,11 +34,11 @@ - 292 + 290 - 292 + 290 {320, 68} @@ -57,7 +57,7 @@ - 292 + 289 {{224, 14}, {25, 25}} _NS:9 @@ -66,7 +66,7 @@ - 292 + 289 {{216, 6}, {41, 41}} diff --git a/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib b/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib index 582a7e738..ea17ccc53 100644 --- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib +++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -203,7 +203,7 @@ 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 16e92f7d8..6d0e3738d 100644 --- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -481,7 +481,7 @@ AAgACAAIAAEAAQABAAE 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 1cf955ebf..e813e9190 100644 --- a/Classes/LinphoneUI/fr.lproj/UIMainBar.xib +++ b/Classes/LinphoneUI/fr.lproj/UIMainBar.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -83,29 +83,46 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Historique + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC44MTE3NjQ3MTcxIDAuMjk4MDM5MjI3NyAwLjE2MDc4NDMxOQA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_over.png - + NSImage history_selected.png - + NSImage history_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -152,15 +169,8 @@ 0 10 1 - - 1 - 14 - - - Helvetica - 14 - 16 - + + {{38, 1}, {21, 21}} @@ -190,26 +200,34 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Contacts + + + - + NSImage contacts_over.png - + NSImage contacts_selected.png - + NSImage contacts_default.png - - + + 292 - {{192, 0}, {64, 77}} + {{256, 0}, {64, 77}} _NS:9 @@ -221,21 +239,29 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Options + + + - + NSImage settings_over.png - + NSImage settings_selected.png - + NSImage settings_default.png - - + + @@ -265,13 +291,20 @@ NSImage dialer_default.png - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 - {{256, 0}, {64, 77}} + {{192, 0}, {64, 77}} _NS:9 @@ -283,21 +316,29 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Chat + + + - + NSImage chat_over.png - + NSImage chat_selected.png - + NSImage chat_default.png - - + + @@ -337,10 +378,10 @@ 10 1 - + - {{261, 1}, {21, 21}} + {{197, 1}, {21, 21}} _NS:9 @@ -557,12 +598,6 @@ contacts - - 9 - - - settings - 7 @@ -619,6 +654,12 @@ background + + 9 + + + settings + @@ -637,15 +678,19 @@ 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 - + + @@ -769,7 +814,7 @@ 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 620a1143a..c06698b75 100644 --- a/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib +++ b/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -85,29 +85,46 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Historique + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_over~ipad.png - + NSImage history_selected~ipad.png - + NSImage history_default~ipad.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -154,18 +171,11 @@ 0 10 1 - - 1 - 14 - - - Helvetica - 14 - 16 - + + - {{140, 1}, {21, 21}} + {{144, 1}, {21, 21}} _NS:9 @@ -194,28 +204,36 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Contacts + + + - + NSImage contacts_over~ipad.png - + NSImage contacts_selected~ipad.png - + NSImage contacts_default~ipad.png - - + + 288 {{350, -1}, {68, 80}} - + _NS:9 NO 4 @@ -239,15 +257,22 @@ NSImage dialer_default.png - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 - {{418, 0}, {175, 77}} + {{593, 0}, {175, 77}} - + _NS:9 NO 5 @@ -258,28 +283,36 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Options + + + - + NSImage settings_over~ipad.png - + NSImage settings_selected~ipad.png - + NSImage settings_default~ipad.png - - + + 292 - {{593, 0}, {175, 77}} + {{418, 0}, {175, 77}} - + _NS:9 NO 6 @@ -290,21 +323,29 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Chat + + + - + NSImage chat_over~ipad.png - + NSImage chat_selected~ipad.png - + NSImage chat_default~ipad.png - - + + @@ -343,10 +384,10 @@ 10 1 - + - {{605, 1}, {21, 21}} + {{428, 1}, {21, 21}} _NS:9 @@ -419,21 +460,29 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Historique + + + - + NSImage history_over_landscape~ipad.png - + NSImage history_selected_landscape~ipad.png - + NSImage history_default_landscape~ipad.png - - + + @@ -469,10 +518,10 @@ 10 1 - + - {{208, 1}, {21, 21}} + {{209, 1}, {21, 21}} _NS:9 @@ -498,28 +547,36 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Contacts + + + - + NSImage contacts_over_landscape~ipad.png - + NSImage contacts_selected_landscape~ipad.png - + NSImage contacts_default_landscape~ipad.png - - + + 288 {{480, 8}, {68, 80}} - + _NS:9 NO 4 @@ -535,14 +592,13 @@ - + 292 - {{544, 0}, {240, 86}} + {{784, 0}, {240, 86}} - _NS:9 NO 5 @@ -553,26 +609,34 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Options + + + - + NSImage settings_over_landscape~ipad.png - + NSImage settings_selected_landscape~ipad.png - + NSImage settings_default_landscape~ipad.png - - + + 292 - {{784, 0}, {240, 86}} + {{548, 0}, {240, 86}} _NS:9 @@ -585,21 +649,29 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Chat + + + - + NSImage chat_over_landscape~ipad.png - + NSImage chat_selected_landscape~ipad.png - + NSImage chat_default_landscape~ipad.png - - + + @@ -621,6 +693,7 @@ 256 {{2, 2}, {17, 17}} + _NS:9 NO YES @@ -634,10 +707,10 @@ 10 1 - + - {{792, 1}, {21, 21}} + {{558, 1}, {21, 21}} _NS:9 @@ -828,13 +901,13 @@ - - + + Portrait View @@ -872,12 +945,6 @@ mask - - 7 - - - chat - 8 @@ -914,12 +981,6 @@ chatNotificationLabel - - 10 - - - settings - 28 @@ -928,11 +989,11 @@ - + Landscape View @@ -1030,6 +1091,18 @@ background + + 10 + + + settings + + + 7 + + + chat + @@ -1038,7 +1111,8 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1050,12 +1124,16 @@ 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 @@ -1072,11 +1150,14 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + @@ -1200,17 +1281,17 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {480, 170} - {353, 153} - {480, 170} - {353, 153} - {480, 170} - {353, 153} + {480, 171} + {350, 153} + {480, 171} + {350, 153} + {480, 171} + {350, 153} {480, 171} {352, 153} {480, 171} @@ -1228,11 +1309,11 @@ {480, 171} {353, 153} {480, 171} - {350, 153} + {353, 153} {480, 171} - {350, 153} + {353, 153} {480, 171} - {350, 153} + {353, 153} 933 diff --git a/Classes/MoreViewController.xib b/Classes/MoreViewController.xib index f035483ed..1a57b09a7 100644 --- a/Classes/MoreViewController.xib +++ b/Classes/MoreViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -44,66 +44,9 @@ 274 {320, 247} - - 10 - - 549453824 - {512, 1} - - YES - - YES - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor NO @@ -127,7 +70,7 @@ AAgACAAIAAEAAQABAAE NO - + 292 YES @@ -164,9 +107,12 @@ AAgACAAIAAEAAQABAAE - {300, 44} + {300, 43} - + + 3 + MCAwAA + NO YES 4 @@ -175,6 +121,7 @@ AAgACAAIAAEAAQABAAE {320, 44} + 1 MSAxIDEAA @@ -185,7 +132,7 @@ AAgACAAIAAEAAQABAAE - + 292 YES @@ -207,6 +154,7 @@ AAgACAAIAAEAAQABAAE 1 MCAwIDAAA + darkTextColor 1 @@ -226,6 +174,7 @@ AAgACAAIAAEAAQABAAE {320, 44} + NO IBCocoaTouchFramework @@ -233,7 +182,7 @@ AAgACAAIAAEAAQABAAE - + 292 YES @@ -299,7 +248,7 @@ AAgACAAIAAEAAQABAAE - {322, 230} + {322, 229} NO @@ -310,6 +259,7 @@ AAgACAAIAAEAAQABAAE {322, 230} + NO NO @@ -515,72 +465,7 @@ AAgACAAIAAEAAQABAAE 50 - - - YES - - MoreViewController - UITableViewController - - YES - - YES - console - credit - creditText - web - weburi - - - YES - UITableViewCell - UITableViewCell - UITextView - UITableViewCell - UILabel - - - - YES - - YES - console - credit - creditText - web - weburi - - - YES - - console - UITableViewCell - - - credit - UITableViewCell - - - creditText - UITextView - - - web - UITableViewCell - - - weburi - UILabel - - - - - IBProjectSource - ./Classes/MoreViewController.h - - - - + 0 IBCocoaTouchFramework @@ -589,7 +474,7 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -601,6 +486,6 @@ AAgACAAIAAEAAQABAAE linphone-banner.png {300, 100} - 1498 + 1926 diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index fb81bca47..b1146322f 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -45,7 +45,6 @@ 274 {320, 480} - _NS:9 1 NO @@ -58,7 +57,6 @@ {320, 480} - _NS:9 @@ -182,117 +180,7 @@ 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 @@ -301,7 +189,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -313,6 +201,6 @@ background.png {640, 523} - 1498 + 1926 diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index a2629cdd5..846b30b98 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -189,6 +189,15 @@ [targetViewController release]; } +- (void)viewDidLoad { + [super viewDidLoad]; + + UIEdgeInsets inset = {0, 0, 10, 0}; + UIScrollView *scrollView = self.tableView; + [scrollView setContentInset:inset]; + [scrollView setScrollIndicatorInsets:inset]; +} + - (id)initWithStyle:(UITableViewStyle)style { self = [super initWithStyle:style]; if(self != nil) { diff --git a/Classes/Utils/GrowingTextView/HPGrowingTextView.m b/Classes/Utils/GrowingTextView/HPGrowingTextView.m index 5094a59a6..40a088a6f 100755 --- a/Classes/Utils/GrowingTextView/HPGrowingTextView.m +++ b/Classes/Utils/GrowingTextView/HPGrowingTextView.m @@ -101,9 +101,10 @@ [super layoutSubviews]; CGRect r = self.bounds; - r.origin.y = 0; - r.origin.x = contentInset.left; + r.origin.y = contentInset.top; + r.origin.x = contentInset.left; r.size.width -= contentInset.left + contentInset.right; + r.size.height -= contentInset.top + contentInset.bottom; internalTextView.frame = r; } @@ -113,9 +114,10 @@ contentInset = inset; CGRect r = self.frame; - r.origin.y = inset.top - inset.bottom; - r.origin.x = inset.left; - r.size.width -= inset.left + inset.right; + r.origin.y = contentInset.top; + r.origin.x = contentInset.left; + r.size.width -= contentInset.left + contentInset.right; + r.size.height -= contentInset.top + contentInset.bottom; internalTextView.frame = r; diff --git a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj index 8cd815711..22312f246 100755 --- a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj +++ b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj @@ -223,7 +223,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0450; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "NinePatch" */; compatibilityVersion = "Xcode 3.2"; @@ -312,6 +312,7 @@ CODE_SIGN_IDENTITY = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; + GCC_THUMB_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; @@ -330,6 +331,7 @@ ); CODE_SIGN_IDENTITY = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_THUMB_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; @@ -348,6 +350,7 @@ ); CODE_SIGN_IDENTITY = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_THUMB_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; @@ -384,6 +387,7 @@ ); CODE_SIGN_IDENTITY = "Don't Code Sign"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_THUMB_SUPPORT = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; diff --git a/Classes/Utils/Utils.h b/Classes/Utils/Utils.h index 8568aca78..0863afd9d 100644 --- a/Classes/Utils/Utils.h +++ b/Classes/Utils/Utils.h @@ -43,4 +43,14 @@ typedef enum _LinphoneLoggerSeverity { @end +@interface LinphoneUtils : NSObject { + +} ++ (void)buttonFixStates:(UIButton*)button; ++ (void)buttonFixStatesForTabs:(UIButton*)button; ++ (void)buttonMultiViewAddAttributes:(NSMutableDictionary*)attributes button:(UIButton*)button; ++ (void)buttonMultiViewApplyAttributes:(NSDictionary*)attributes button:(UIButton*)button; + +@end + #endif diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index 1ae8a0230..b1045e3a1 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -59,4 +59,131 @@ va_end (args); } +@end + +@implementation LinphoneUtils + ++ (void)buttonFixStates:(UIButton*)button { + // Set selected+over title: IB lack ! + [button setTitle:[button titleForState:UIControlStateSelected] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over titleColor: IB lack ! + [button setTitleColor:[button titleColorForState:UIControlStateHighlighted] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+disabled title: IB lack ! + [button setTitle:[button titleForState:UIControlStateSelected] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + + // Set selected+disabled titleColor: IB lack ! + [button setTitleColor:[button titleColorForState:UIControlStateDisabled] + forState:(UIControlStateDisabled | UIControlStateSelected)]; +} + ++ (void)buttonFixStatesForTabs:(UIButton*)button { + // Set selected+over title: IB lack ! + [button setTitle:[button titleForState:UIControlStateSelected] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over titleColor: IB lack ! + [button setTitleColor:[button titleColorForState:UIControlStateSelected] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+disabled title: IB lack ! + [button setTitle:[button titleForState:UIControlStateSelected] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + + // Set selected+disabled titleColor: IB lack ! + [button setTitleColor:[button titleColorForState:UIControlStateDisabled] + forState:(UIControlStateDisabled | UIControlStateSelected)]; +} + ++ (void)buttonMultiViewAddAttributes:(NSMutableDictionary*)attributes button:(UIButton*)button { + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateNormal] key:@"title-normal"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateHighlighted] key:@"title-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateDisabled] key:@"title-disabled"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateSelected] key:@"title-selected"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"title-disabled-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateSelected | UIControlStateHighlighted] key:@"title-selected-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateSelected | UIControlStateDisabled] key:@"title-selected-disabled"]; + + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateNormal] key:@"title-color-normal"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateHighlighted] key:@"title-color-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateDisabled] key:@"title-color-disabled"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateSelected] key:@"title-color-selected"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"title-color-disabled-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateSelected | UIControlStateHighlighted] key:@"title-color-selected-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateSelected | UIControlStateDisabled] key:@"title-color-selected-disabled"]; + + [LinphoneUtils addDictEntry:attributes item:NSStringFromUIEdgeInsets([button titleEdgeInsets]) key:@"title-edge"]; + + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateNormal] key:@"image-normal"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateHighlighted] key:@"image-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateDisabled] key:@"image-disabled"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateSelected] key:@"image-selected"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"image-disabled-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateSelected | UIControlStateHighlighted] key:@"image-selected-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateSelected | UIControlStateDisabled] key:@"image-selected-disabled"]; + + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateNormal] key:@"background-normal"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateHighlighted] key:@"background-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateDisabled] key:@"background-disabled"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected] key:@"background-selected"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"background-disabled-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected | UIControlStateHighlighted] key:@"background-selected-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected | UIControlStateDisabled] key:@"background-selected-disabled"]; +} + ++ (void)buttonMultiViewApplyAttributes:(NSDictionary*)attributes button:(UIButton*)button { + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-normal"] forState:UIControlStateNormal]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-highlighted"] forState:UIControlStateHighlighted]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-disabled"] forState:UIControlStateDisabled]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-selected"] forState:UIControlStateSelected]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; + + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-normal"] forState:UIControlStateNormal]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-highlighted"] forState:UIControlStateHighlighted]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-disabled"] forState:UIControlStateDisabled]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-selected"] forState:UIControlStateSelected]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; + + [button setTitleEdgeInsets:UIEdgeInsetsFromString([LinphoneUtils getDictEntry:attributes key:@"title-edge"])]; + + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-normal"] forState:UIControlStateNormal]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-highlighted"] forState:UIControlStateHighlighted]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-disabled"] forState:UIControlStateDisabled]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-selected"] forState:UIControlStateSelected]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; + + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-normal"] forState:UIControlStateNormal]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-highlighted"] forState:UIControlStateHighlighted]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-disabled"] forState:UIControlStateDisabled]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-selected"] forState:UIControlStateSelected]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; +} + + ++ (void)addDictEntry:(NSMutableDictionary*)dict item:(id)item key:(id)key { + if(item != nil && key != nil) { + [dict setObject:item forKey:key]; + } +} + ++ (id)getDictEntry:(NSDictionary*)dict key:(id)key { + if(key != nil) { + return [dict objectForKey:key]; + } + return nil; +} + + @end diff --git a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj index aacacdabc..9a134ca1f 100755 --- a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj +++ b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj @@ -378,10 +378,10 @@ "$(ARCHS_STANDARD_32_BIT)", armv6, ); + IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; - VALID_ARCHS = "armv6 armv7"; }; name = Release; }; @@ -409,10 +409,10 @@ "$(ARCHS_STANDARD_32_BIT)", armv6, ); + IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; - VALID_ARCHS = "armv6 armv7"; }; name = Debug; }; @@ -441,10 +441,10 @@ "$(ARCHS_STANDARD_32_BIT)", armv6, ); + IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; - VALID_ARCHS = "armv6 armv7"; }; name = Distribution; }; @@ -472,10 +472,10 @@ "$(ARCHS_STANDARD_32_BIT)", armv6, ); + IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; - VALID_ARCHS = "armv6 armv7"; }; name = DistributionAdhoc; }; diff --git a/Classes/WizardViewController.h b/Classes/WizardViewController.h index 6140edc44..79ae3ad85 100644 --- a/Classes/WizardViewController.h +++ b/Classes/WizardViewController.h @@ -21,7 +21,7 @@ #import #import "UICompositeViewController.h" -@interface WizardViewController : UIViewController { +@interface WizardViewController : TPMultiLayoutViewController { @private UITextField *activeTextField; UIView *currentView; diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index f68b5de17..c0698ebb1 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -58,6 +58,9 @@ typedef enum _ViewElement { - (id)init { self = [super initWithNibName:@"WizardViewController" bundle:[NSBundle mainBundle]]; if (self != nil) { + [[NSBundle mainBundle] loadNibNamed:@"WizardViews" + owner:self + options:nil]; self->historyViews = [[NSMutableArray alloc] init]; self->currentView = nil; } @@ -143,8 +146,25 @@ static UICompositeViewDescription *compositeDescription = nil; } +- (void)viewDidLoad { + [super viewDidLoad]; + [WizardViewController adjustFontSize:self.view mult:2.0f]; +} + + #pragma mark - ++ (void)adjustFontSize:(UIView*)view mult:(float)mult{ + if([view isKindOfClass:[UILabel class]]) { + UILabel *label = (UILabel*)view; + [label setAdjustsFontSizeToFitWidth:TRUE]; // Not put it in IB: issue with placeholder size + } else { + for(UIView *subView in [view subviews]) { + [WizardViewController adjustFontSize:subView mult:mult]; + } + } +} + + (void)cleanTextField:(UIView*)view { if([view isKindOfClass:[UITextField class]]) { [(UITextField*)view setText:@""]; @@ -522,7 +542,7 @@ static UICompositeViewDescription *compositeDescription = nil; [UIView setAnimationBeginsFromCurrentState:TRUE]; // Move view - UIEdgeInsets inset = {0,0,0,0}; + UIEdgeInsets inset = {0, 0, 0, 0}; [contentView setContentInset:inset]; [contentView setScrollIndicatorInsets:inset]; [contentView setShowsVerticalScrollIndicator:FALSE]; @@ -657,4 +677,29 @@ static UICompositeViewDescription *compositeDescription = nil; } + +#pragma mark - TPMultiLayoutViewController Functions + +- (NSDictionary*)attributesForView:(UIView*)view { + NSMutableDictionary *attributes = [NSMutableDictionary dictionary]; + [attributes setObject:[NSValue valueWithCGRect:view.frame] forKey:@"frame"]; + [attributes setObject:[NSValue valueWithCGRect:view.bounds] forKey:@"bounds"]; + if([view isKindOfClass:[UIButton class]]) { + UIButton *button = (UIButton *)view; + [LinphoneUtils buttonMultiViewAddAttributes:attributes button:button]; + } + [attributes setObject:[NSNumber numberWithInteger:view.autoresizingMask] forKey:@"autoresizingMask"]; + return attributes; +} + +- (void)applyAttributes:(NSDictionary*)attributes toView:(UIView*)view { + view.frame = [[attributes objectForKey:@"frame"] CGRectValue]; + view.bounds = [[attributes objectForKey:@"bounds"] CGRectValue]; + if([view isKindOfClass:[UIButton class]]) { + UIButton *button = (UIButton *)view; + [LinphoneUtils buttonMultiViewApplyAttributes:attributes button:button]; + } + view.autoresizingMask = [[attributes objectForKey:@"autoresizingMask"] integerValue]; +} + @end diff --git a/Classes/en.lproj/ChatRoomViewController.xib b/Classes/en.lproj/ChatRoomViewController.xib index b121e1665..e60678397 100644 --- a/Classes/en.lproj/ChatRoomViewController.xib +++ b/Classes/en.lproj/ChatRoomViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -18,7 +18,6 @@ IBUIProgressView IBUITableView IBUITableViewController - IBUITapGestureRecognizer IBUIView @@ -135,7 +134,7 @@ 274 - {{0, 80}, {320, 277}} + {{0, 80}, {320, 279}} @@ -161,7 +160,7 @@ 274 - {320, 59} + {320, 57} @@ -169,7 +168,7 @@ NO IBCocoaTouchFramework - + NSImage chat_background.png @@ -177,7 +176,7 @@ 297 - {{250, 0}, {70, 59}} + {{262, 0}, {58, 57}} @@ -189,7 +188,7 @@ IBCocoaTouchFramework 0 0 - Cancel + NO 1 @@ -199,6 +198,14 @@ 3 MC41AA + + NSImage + chat_cancel_over.png + + + NSImage + chat_cancel_default.png + 2 15 @@ -212,7 +219,7 @@ 298 - {{20, 25}, {213, 9}} + {{20, 24}, {222, 9}} @@ -226,7 +233,7 @@ 0.5 - {{0, 357}, {320, 59}} + {{0, 359}, {320, 57}} @@ -241,33 +248,26 @@ 274 - {320, 59} - - - - _NS:9 - - NO - IBCocoaTouchFramework - - - - - 274 - {320, 59} + {320, 57} _NS:9 + NO IBCocoaTouchFramework + + NSImage + chat_message_background.png + 297 - {{250, 0}, {70, 59}} + {{262, 0}, {58, 57}} + _NS:9 NO @@ -279,29 +279,53 @@ 0 NO NO + 30 + 0.0 + 0.0 + 0.0 + Send + + 2 + MCAwIDAAA + + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + - + NSImage chat_send_over.png - + NSImage chat_send_disabled.png - + NSImage chat_send_default.png - - + + 1 + 14 + + + Helvetica + 14 + 16 + 300 - {40, 59} + {35, 57} - + _NS:9 NO @@ -310,57 +334,42 @@ IBCocoaTouchFramework 0 0 - Pict + NO + NO 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + NSImage + chat_photo_over.png + + + NSImage + chat_photo_disabled.png + + + NSImage + chat_photo_default.png + - + 274 - - - - 274 - {210, 59} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - chat_field.png - - - - - 274 - {{10, 10}, {190, 39}} - - - - _NS:9 - - IBCocoaTouchFramework - - - {{40, 0}, {210, 59}} + {{33, 10}, {232, 37}} - + _NS:9 IBCocoaTouchFramework - {{0, 357}, {320, 59}} + {{0, 359}, {320, 57}} @@ -404,6 +413,10 @@ _NS:9 + + 2 + MCAwIDAAA + NO Back @@ -412,17 +425,27 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + - + NSImage chat_back_over.png - + NSImage chat_back_default.png - - + + @@ -432,6 +455,7 @@ _NS:9 + NO Edit @@ -440,21 +464,30 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + + - + NSImage chat_edit_over.png - + NSImage chat_ok_default.png - + NSImage chat_edit_default.png - - + + {320, 44} @@ -485,7 +518,6 @@ IBCocoaTouchFramework NO - @@ -537,22 +569,6 @@ 44 - - - footerView - - - - 46 - - - - sendButton - - - - 27 - chatView @@ -561,46 +577,6 @@ 54 - - - footerBackgroundImage - - - - 67 - - - - messageField - - - - 64 - - - - messageBackgroundImage - - - - 69 - - - - messageView - - - - 70 - - - - listTapGestureRecognizer - - - - 71 - imageTransferProgressBar @@ -641,6 +617,38 @@ 88 + + + sendButton + + + + 27 + + + + messageField + + + + 64 + + + + messageView + + + + 89 + + + + messageBackgroundImage + + + + 90 + dataSource @@ -657,16 +665,6 @@ 31 - - - gestureRecognizers - - - NSArray - YES - - 61 - onBackClick: @@ -702,14 +700,6 @@ 33 - - - onListTap: - - - - 62 - onPictureClick: @@ -844,67 +834,26 @@ 14 - - - + + - footerView - - - 15 - - - sendButton - - - 58 - - - listTapGestureRecognizer + messageView 66 - footerBackgroundImage - - - 68 - - - - - - - messageView - - - 21 - - messageBackgroundImage - - 63 - - - messageField - 73 pictureButton - - 82 - - - normalView - 72 @@ -934,6 +883,18 @@ transfertBackgroundImage + + 15 + + + sendButton + + + 63 + + + messageField + @@ -943,11 +904,12 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + ChatRoomTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -956,29 +918,28 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin HPGrowingTextView 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 - - + + - 88 + 90 @@ -1038,8 +999,6 @@ UIButton UIView UIToggleButton - UIImageView - UIView UIView UIProgressView UITapGestureRecognizer @@ -1073,14 +1032,6 @@ editButton UIToggleButton - - footerBackgroundImage - UIImageView - - - footerView - UIView - headerView UIView @@ -1151,10 +1102,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 @@ -1162,16 +1109,21 @@ {131, 131} {320, 88} {320, 88} - {640, 117} + {16, 16} + {116, 115} + {116, 115} {320, 88} {320, 88} - {500, 117} + {640, 117} {320, 88} - {140, 117} - {140, 117} - {140, 117} - {5, 117} + {71, 115} + {71, 115} + {71, 115} + {117, 115} + {117, 115} + {117, 115} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/ChatViewController.xib b/Classes/en.lproj/ChatViewController.xib index 20eedaf14..2e6558bf6 100644 --- a/Classes/en.lproj/ChatViewController.xib +++ b/Classes/en.lproj/ChatViewController.xib @@ -1,20 +1,19 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject IBUIButton IBUIImageView - IBUILabel IBUITableView IBUITableViewController IBUITextField @@ -50,7 +49,7 @@ {320, 44} - + _NS:9 NO IBCocoaTouchFramework @@ -65,7 +64,7 @@ {160, 44} - + _NS:9 NO @@ -75,25 +74,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + New discussion + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage chat_add_over.png - + NSImage chat_add_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -103,7 +115,7 @@ {{160, 0}, {160, 44}} - + _NS:9 NO @@ -113,21 +125,33 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + - + NSImage chat_edit_over.png - + NSImage chat_ok_default.png - + NSImage chat_edit_default.png - - + + {320, 44} @@ -147,13 +171,14 @@ 274 - {{0, 74}, {320, 378}} + {{0, 79}, {320, 381}} + _NS:9 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -167,6 +192,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -176,11 +205,15 @@ 292 - {{24, 44}, {296, 30}} + {{25, 44}, {271, 35}} _NS:9 + + 3 + MCAwAA + NO YES @@ -189,6 +222,7 @@ IBCocoaTouchFramework 0 + To: 3 MAA @@ -199,52 +233,28 @@ IBCocoaTouchFramework + + NSImage + chat_address.png + 1 - + 1 17 - + Helvetica 17 16 - - - 292 - {{0, 44}, {24, 30}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - To: - - 1 - MCAwIDAAA - - - 0 - 10 - - - {320, 460} _NS:9 - - 3 - MQA - - + IBCocoaTouchFramework @@ -375,7 +385,6 @@ - @@ -420,11 +429,6 @@ addressField - - 26 - - - @@ -433,10 +437,10 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin ChatTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -444,6 +448,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -517,18 +522,19 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 {320, 88} {320, 88} + {542, 70} {320, 88} {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/ContactDetailsLabelViewController.xib b/Classes/en.lproj/ContactDetailsLabelViewController.xib index d31c015f8..182c718cd 100644 --- a/Classes/en.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/en.lproj/ContactDetailsLabelViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -90,25 +90,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage contact_back_over.png - + NSImage contact_back_default.png - 2 - 15 + 1 + 14 - Helvetica-Bold - 15 + Helvetica + 14 16 @@ -135,62 +148,8 @@ _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -218,7 +177,10 @@ AAgACAAIAAEAAQABAAE - + + 3 + MCAwAA + IBCocoaTouchFramework @@ -342,6 +304,7 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -388,7 +351,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -396,8 +359,8 @@ AAgACAAIAAEAAQABAAE {640, 523} {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/ContactDetailsViewController.xib b/Classes/en.lproj/ContactDetailsViewController.xib index 437f20b94..369a774f5 100644 --- a/Classes/en.lproj/ContactDetailsViewController.xib +++ b/Classes/en.lproj/ContactDetailsViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -74,25 +74,34 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage contact_back_over.png - + NSImage contact_back_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -112,17 +121,27 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MCAwIDAAA + + - + NSImage contact_cancel_over.png - + NSImage contact_cancel_default.png - - + + @@ -140,21 +159,30 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + + - + NSImage contact_edit_over.png - + NSImage contact_ok_default.png - + NSImage contact_edit_default.png - - + + {320, 44} @@ -177,65 +205,10 @@ {{0, 44}, {320, 416}} - _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -263,7 +236,10 @@ AAgACAAIAAEAAQABAAE - + + 3 + MCAwAA + IBCocoaTouchFramework @@ -532,7 +508,8 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIContactDetailsFooter com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -540,8 +517,10 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -730,7 +709,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -742,8 +721,8 @@ AAgACAAIAAEAAQABAAE {320, 88} {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/ContactsViewController.xib b/Classes/en.lproj/ContactsViewController.xib index f452a385d..935011ea2 100644 --- a/Classes/en.lproj/ContactsViewController.xib +++ b/Classes/en.lproj/ContactsViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -47,7 +47,6 @@ 290 {320, 44} - _NS:9 NO @@ -57,80 +56,117 @@ toolsbar_background.png - + - 289 - {{120, 0}, {80, 44}} + 293 + + + + 292 + {107, 44} + + + _NS:9 + NO + + All contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + All + + 2 + MC45NzY0NzA2NDkyIDAuOTc2NDcwNjQ5MiAwLjk3NjQ3MDY0OTIAA + + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + contacts_all_selected.png + + + + NSImage + contacts_all_default.png + + + 1 + 12 + + + Helvetica + 12 + 16 + + + + + 289 + {{107, 0}, {107, 44}} + + + _NS:9 + NO + + Linphone contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Linphone + + + + + + NSImage + contacts_linphone_selected.png + + + + NSImage + contacts_linphone_default.png + + + + + + {{106, 0}, {214, 44}} - - + _NS:9 - NO - - All contacts filter - - IBCocoaTouchFramework - 0 - 0 - NO - + 3 - MC41AA - - - NSImage - contacts_all_selected.png - - - - NSImage - contacts_all_default.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 289 - {{200, 0}, {80, 44}} - - - - _NS:9 - NO - - Linphone contacts filter + MQA + + 2 + IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - contacts_linphone_selected.png - - - - NSImage - contacts_linphone_default.png - - - 292 - {80, 44} + {107, 44} - _NS:9 NO @@ -141,25 +177,44 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Add contact + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + - + NSImage contacts_add_over.png - + NSImage contacts_add_default.png - - + + 1 + 14 + + + Helvetica + 14 + 16 + -2147483356 - {80, 44} + {107, 44} - - + _NS:9 NO @@ -169,30 +224,34 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + - + NSImage contacts_back_over.png - + NSImage contacts_back_default.png - - + + {320, 44} - _NS:9 3 MQA - - 2 - + IBCocoaTouchFramework @@ -201,12 +260,10 @@ 274 {{0, 44}, {320, 416}} - - _NS:10 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -221,6 +278,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -230,13 +291,11 @@ {320, 460} - _NS:9 3 - MQA - + MCAwAA IBCocoaTouchFramework @@ -261,22 +320,6 @@ 16 - - - allButton - - - - 27 - - - - linphoneButton - - - - 31 - tableController @@ -309,6 +352,22 @@ 91 + + + allButton + + + + 27 + + + + linphoneButton + + + + 31 + onAllClick: @@ -404,25 +463,12 @@ - - + toolBar - - 4 - - - allButton - - - 5 - - - linphoneButton - 6 @@ -454,6 +500,28 @@ background + + 93 + + + + + + + switchView + + + 4 + + + allButton + + + 5 + + + linphoneButton + @@ -464,121 +532,49 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin ContactsTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 92 - - - - - 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 - - - + 93 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {160, 88} - {160, 88} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {5, 117} + {214, 88} + {214, 88} + {213, 88} + {213, 88} + {214, 88} + {214, 88} + {213, 88} + {213, 88} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/DialerViewController.xib b/Classes/en.lproj/DialerViewController.xib index 00b0844df..ac00637cf 100644 --- a/Classes/en.lproj/DialerViewController.xib +++ b/Classes/en.lproj/DialerViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -51,7 +51,6 @@ 292 {320, 80} - _NS:9 NO @@ -66,7 +65,6 @@ 292 {320, 60} - 3 @@ -106,7 +104,6 @@ {320, 80} - _NS:9 @@ -129,7 +126,6 @@ 292 {{0, 11}, {107, 54}} - 1 @@ -172,7 +168,6 @@ 292 {{107, 11}, {106, 54}} - NO NO @@ -199,7 +194,6 @@ 292 {{213, 11}, {107, 54}} - NO NO @@ -226,7 +220,6 @@ 292 {{0, 73}, {107, 54}} - NO NO @@ -253,7 +246,6 @@ 292 {{107, 73}, {106, 54}} - NO NO @@ -280,7 +272,6 @@ 292 {{213, 73}, {107, 54}} - NO NO @@ -307,7 +298,6 @@ 292 {{0, 135}, {107, 54}} - NO NO @@ -334,7 +324,6 @@ 292 {{107, 135}, {106, 54}} - NO NO @@ -361,7 +350,6 @@ 292 {{213, 135}, {107, 54}} - NO NO @@ -388,7 +376,6 @@ 292 {{0, 197}, {107, 54}} - NO NO @@ -415,7 +402,6 @@ 292 {{107, 197}, {106, 54}} - NO NO @@ -442,7 +428,6 @@ 292 {{213, 197}, {107, 54}} - NO NO @@ -467,7 +452,6 @@ {{0, 58}, {320, 260}} - _NS:9 @@ -486,7 +470,6 @@ 292 {106, 69} - _NS:9 NO @@ -523,7 +506,6 @@ -2147483356 {106, 69} - _NS:9 NO @@ -556,7 +538,6 @@ 292 {{106, 0}, {108, 69}} - _NS:9 NO @@ -590,7 +571,6 @@ -2147483356 {{106, 0}, {108, 69}} - _NS:9 NO @@ -624,7 +604,6 @@ -2147483356 {{106, 0}, {108, 69}} - _NS:9 NO @@ -658,8 +637,6 @@ 292 {{214, 0}, {106, 69}} - - _NS:9 NO @@ -690,7 +667,6 @@ {{0, 305}, {320, 69}} - _NS:9 @@ -703,7 +679,6 @@ {320, 460} - _NS:9 @@ -1388,301 +1363,7 @@ 254 - - - YES - - DialerViewController - UIViewController - - YES - - YES - onAddContactClick: - onAddressChange: - onBackClick: - - - YES - id - id - id - - - - YES - - YES - onAddContactClick: - onAddressChange: - onBackClick: - - - YES - - onAddContactClick: - id - - - onAddressChange: - id - - - onBackClick: - id - - - - - YES - - YES - addCallButton - addContactButton - addressField - backButton - callButton - eightButton - eraseButton - fiveButton - fourButton - nineButton - oneButton - sevenButton - sharpButton - sixButton - starButton - threeButton - transferButton - twoButton - zeroButton - - - YES - UICallButton - UIButton - UITextField - UIButton - UICallButton - UIDigitButton - UIEraseButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UITransferButton - UIDigitButton - UIDigitButton - - - - YES - - YES - addCallButton - addContactButton - addressField - backButton - callButton - eightButton - eraseButton - fiveButton - fourButton - nineButton - oneButton - sevenButton - sharpButton - sixButton - starButton - threeButton - transferButton - twoButton - zeroButton - - - YES - - addCallButton - UICallButton - - - addContactButton - UIButton - - - addressField - UITextField - - - backButton - UIButton - - - 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 - - - zeroButton - UIDigitButton - - - - - IBProjectSource - ./Classes/DialerViewController.h - - - - UIAddressTextField - UITextField - - IBProjectSource - ./Classes/UIAddressTextField.h - - - - UICallButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UICallButton.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 IBCocoaTouchFramework @@ -1691,7 +1372,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -1794,6 +1475,6 @@ {214, 138} - 1498 + 1926 diff --git a/Classes/en.lproj/DialerViewController~ipad.xib b/Classes/en.lproj/DialerViewController~ipad.xib index 60f9db3be..ae1c56e6a 100644 --- a/Classes/en.lproj/DialerViewController~ipad.xib +++ b/Classes/en.lproj/DialerViewController~ipad.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -37,12 +37,26 @@ 292 + + + 301 + {{127, 150}, {510, 460}} + + + _NS:9 + 1 + NO + IBIPadFramework + + NSImage + logo_linphone_trame_background.png + + 301 {{-1000, -1000}, {2768, 2900}} - _NS:9 @@ -56,7 +70,6 @@ 274 {{0, 58}, {768, 842}} - 3 @@ -68,10 +81,9 @@ -2147483356 - {{0, 77}, {85, 33}} + {{20, 90}, {85, 33}} - - + _NS:9 NO @@ -113,7 +125,6 @@ 290 {768, 80} - _NS:9 NO @@ -128,7 +139,6 @@ 290 {700, 60} - 3 @@ -170,7 +180,6 @@ 289 {{698, 4}, {70, 51}} - _NS:9 NO @@ -206,7 +215,6 @@ {768, 80} - _NS:9 @@ -228,7 +236,6 @@ 274 {320, 280} - _NS:9 2 @@ -244,7 +251,6 @@ 292 {{0, 11}, {107, 54}} - 1 @@ -280,7 +286,6 @@ 292 {{107, 11}, {106, 54}} - NO NO @@ -307,7 +312,6 @@ 292 {{213, 11}, {107, 54}} - NO NO @@ -334,7 +338,6 @@ 292 {{0, 73}, {107, 54}} - NO NO @@ -361,7 +364,6 @@ 292 {{107, 73}, {106, 54}} - NO NO @@ -388,7 +390,6 @@ 292 {{213, 73}, {107, 54}} - NO NO @@ -415,7 +416,6 @@ 292 {{0, 135}, {107, 54}} - NO NO @@ -442,7 +442,6 @@ 292 {{107, 135}, {106, 54}} - NO NO @@ -469,7 +468,6 @@ 292 {{213, 135}, {107, 54}} - NO NO @@ -496,7 +494,6 @@ 292 {{0, 197}, {107, 54}} - NO NO @@ -523,7 +520,6 @@ 292 {{107, 197}, {106, 54}} - NO NO @@ -550,7 +546,6 @@ 292 {{213, 197}, {107, 54}} - NO NO @@ -575,7 +570,6 @@ {{0, 640}, {320, 260}} - _NS:9 @@ -590,7 +584,6 @@ 292 {126, 85} - _NS:9 NO @@ -624,7 +617,6 @@ -2147483356 {126, 85} - _NS:9 NO @@ -657,7 +649,6 @@ 292 {{126, 0}, {186, 85}} - _NS:9 NO @@ -691,7 +682,6 @@ -2147483356 {{126, 0}, {186, 85}} - _NS:9 NO @@ -725,8 +715,6 @@ -2147483356 {{126, 0}, {186, 85}} - - _NS:9 NO @@ -757,7 +745,6 @@ {{456, 815}, {312, 85}} - _NS:9 @@ -770,7 +757,6 @@ {768, 900} - _NS:9 @@ -1156,6 +1142,7 @@ + @@ -1324,12 +1311,6 @@ backspaceButton - - 70 - - - preview - 71 @@ -1345,9 +1326,22 @@ 76 + backgroundView + + 78 + + + backgroundImage + + + 70 + + + preview + @@ -1415,6 +1409,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1426,7 +1421,7 @@ - 77 + 78 @@ -1688,7 +1683,7 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -1710,6 +1705,7 @@ {371, 170} {371, 170} {640, 135} + {1019, 920} {220, 113} {220, 113} {220, 113} @@ -1734,12 +1730,12 @@ {220, 113} {220, 113} {220, 113} - {170, 65} - {170, 65} + {151, 51} + {151, 51} {371, 170} {371, 170} {371, 170} - 1498 + 1926 diff --git a/Classes/en.lproj/FirstLoginViewController.xib b/Classes/en.lproj/FirstLoginViewController.xib index 80faa334c..992646430 100644 --- a/Classes/en.lproj/FirstLoginViewController.xib +++ b/Classes/en.lproj/FirstLoginViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -46,7 +46,6 @@ 292 {{33, 312}, {255, 50}} - _NS:9 NO @@ -58,9 +57,13 @@ 0 NO Login + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + - 3 - MC4zMzMzMzMzMzMzAA + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA 3 @@ -89,8 +92,6 @@ -2147483356 {{60, 420}, {200, 37}} - - NO NO IBCocoaTouchFramework @@ -122,7 +123,6 @@ 292 {{60, 170}, {200, 31}} - NO NO @@ -165,7 +165,6 @@ 292 {{60, 220}, {200, 31}} - NO NO @@ -204,7 +203,6 @@ 292 {{142, 211}, {37, 37}} - NO NO @@ -217,7 +215,6 @@ {320, 460} - 3 @@ -230,7 +227,6 @@ {320, 460} - _NS:9 @@ -432,7 +428,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -450,104 +446,7 @@ 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 @@ -556,7 +455,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -579,6 +478,6 @@ {542, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/HistoryDetailsViewController.xib b/Classes/en.lproj/HistoryDetailsViewController.xib index afce0f1a5..516273d34 100644 --- a/Classes/en.lproj/HistoryDetailsViewController.xib +++ b/Classes/en.lproj/HistoryDetailsViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -46,7 +46,6 @@ 290 {320, 44} - _NS:9 NO @@ -61,7 +60,6 @@ 292 {160, 44} - _NS:9 NO @@ -72,25 +70,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_details_back_over.png - + NSImage history_details_back_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -99,7 +110,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -110,22 +120,28 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Add to contacts + + - + NSImage history_details_add_over.png - + NSImage history_details_add_default.png - - + + {320, 44} - _NS:9 @@ -146,7 +162,6 @@ 292 {320, 100} - _NS:9 NO @@ -165,15 +180,21 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 {{-13, -5}, {131, 107}} - _NS:9 NO @@ -188,7 +209,6 @@ 292 {{20, 6}, {65, 65}} - _NS:9 NO @@ -208,7 +228,6 @@ 290 {{101, 37}, {199, 43}} - _NS:9 NO @@ -240,7 +259,6 @@ {{0, 44}, {320, 100}} - _NS:9 @@ -258,7 +276,6 @@ 292 {49, 21} - _NS:9 NO @@ -288,7 +305,6 @@ 290 {{57, 0}, {223, 21}} - _NS:9 NO @@ -317,7 +333,6 @@ {{20, 166}, {280, 21}} - _NS:9 @@ -332,7 +347,6 @@ 292 {80, 21} - _NS:9 NO @@ -355,7 +369,6 @@ 290 {{88, 0}, {192, 21}} - _NS:9 NO @@ -377,7 +390,6 @@ {{20, 195}, {280, 21}} - _NS:9 @@ -392,7 +404,6 @@ 292 {57, 21} - _NS:9 NO @@ -415,7 +426,6 @@ 290 {{65, 0}, {215, 21}} - _NS:9 NO @@ -437,7 +447,6 @@ {{20, 224}, {280, 21}} - _NS:9 @@ -448,7 +457,6 @@ 293 {{33, 323}, {255, 50}} - _NS:9 NO @@ -487,7 +495,6 @@ {320, 460} - IBCocoaTouchFramework @@ -814,10 +821,12 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -826,101 +835,12 @@ 53 - - - - HistoryDetailsViewController - UIViewController - - id - id - id - id - - - - onAddContactClick: - id - - - onAddressClick: - id - - - onBackClick: - id - - - onContactClick: - id - - - - UIButton - UIButton - UILabel - UIImageView - UILabel - UILabel - UILabel - UILabel - UILabel - UILabel - - - - addContactButton - UIButton - - - addressButton - UIButton - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - dateHeaderLabel - UILabel - - - dateLabel - UILabel - - - durationHeaderLabel - UILabel - - - durationLabel - UILabel - - - typeHeaderLabel - UILabel - - - typeLabel - UILabel - - - - IBProjectSource - ./Classes/HistoryDetailsViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -932,9 +852,9 @@ {320, 88} {320, 88} {320, 88} - {320, 117} - {5, 117} + {320, 88} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/HistoryViewController.xib b/Classes/en.lproj/HistoryViewController.xib index 8761a2255..f8e45dcac 100644 --- a/Classes/en.lproj/HistoryViewController.xib +++ b/Classes/en.lproj/HistoryViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -47,7 +47,6 @@ 290 {320, 44} - _NS:9 NO @@ -59,11 +58,10 @@ - -2147483356 + 292 {80, 44} - - + _NS:9 NO @@ -72,93 +70,149 @@ IBCocoaTouchFramework 0 0 - Del - - 3 - MQA - - - 1 + NO + 18 + 0.0 + 0.0 + 0.0 + Delete all + + 2 MCAwIDAAA + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - - 2 - 15 + + NSImage + history_delete_over.png - - Helvetica-Bold - 15 + + NSImage + history_delete_default.png + + + 1 + 14 + + + Helvetica + 14 16 - + - 292 - {{80, 0}, {80, 44}} + 293 + + + + 292 + {80, 44} + + + _NS:9 + + 2 + MC45NzY0NzA2NDkyIDAuOTc2NDcwNjQ5MiAwLjk3NjQ3MDY0OTIAA + + NO + + All contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + All + + + + + + NSImage + history_all_selected.png + + + + NSImage + history_all_default.png + + + 1 + 12 + + + Helvetica + 12 + 16 + + + + + 289 + {{80, 0}, {80, 44}} + + + _NS:9 + + NO + + Missed contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Missed + + + + + + NSImage + history_missed_selected.png + + + + NSImage + history_missed_default.png + + + + + + {{80, 0}, {160, 44}} - - + _NS:9 - NO - - All contacts filter + + 3 + MQA + + 2 + IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - history_all_selected.png - - - - NSImage - history_all_default.png - - - - - - - 292 - {{160, 0}, {80, 44}} - - - - _NS:9 - NO - - Missed contacts filter - - IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - history_missed_selected.png - - - - NSImage - history_missed_default.png - - - 289 {{240, 0}, {80, 44}} - _NS:9 NO @@ -169,34 +223,39 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + - + NSImage history_edit_over.png - + NSImage history_ok_default.png - + NSImage history_edit_default.png - - + + {320, 44} - _NS:9 3 MQA - - 2 - + IBCocoaTouchFramework @@ -205,12 +264,10 @@ 274 {{0, 44}, {320, 416}} - - _NS:9 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -224,6 +281,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -233,13 +294,11 @@ {320, 460} - _NS:9 3 - MQA - + MCAwAA IBCocoaTouchFramework @@ -272,22 +331,6 @@ 26 - - - allButton - - - - 27 - - - - missedButton - - - - 28 - tableView @@ -312,6 +355,22 @@ 36 + + + allButton + + + + 27 + + + + missedButton + + + + 28 + onAllClick: @@ -405,27 +464,14 @@ 3 - - + toolsBar - - 4 - - - allButton - - - 5 - - - missedButton - 6 @@ -455,7 +501,29 @@ 35 - delAllButton + deleteButton + + + 38 + + + + + + + switchView + + + 4 + + + allButton + + + 5 + + + missedButton @@ -471,124 +539,47 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + - 37 - - - - - HistoryTableViewController - UITableViewController - - IBProjectSource - ./Classes/HistoryTableViewController.h - - - - HistoryViewController - UIViewController - - id - id - id - id - - - - onAllClick: - id - - - onDeleteClick: - id - - - onEditClick: - id - - - onMissedClick: - id - - - - UIButton - UIButton - UIToggleButton - UIButton - HistoryTableViewController - UITableView - - - - allButton - UIButton - - - deleteButton - UIButton - - - editButton - UIToggleButton - - - missedButton - UIButton - - - tableController - HistoryTableViewController - - - tableView - UITableView - - - - IBProjectSource - ./Classes/HistoryViewController.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - + 38 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {213, 117} - {213, 117} + {160, 88} + {160, 88} + {160, 88} + {160, 88} {160, 88} {160, 88} - {213, 117} - {213, 117} + {160, 88} + {160, 88} {160, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/ImageViewController.xib b/Classes/en.lproj/ImageViewController.xib index 6db298265..c3e4877f0 100644 --- a/Classes/en.lproj/ImageViewController.xib +++ b/Classes/en.lproj/ImageViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -41,8 +41,6 @@ 274 {{0, 44}, {320, 416}} - - _NS:9 3 @@ -61,7 +59,6 @@ 290 {320, 44} - _NS:9 NO @@ -76,7 +73,6 @@ 292 {160, 44} - _NS:9 NO @@ -88,13 +84,18 @@ 0 NO NO + 18 + 0.0 + 0.0 + 0.0 + Back - 3 - MQA + 2 + MCAwIDAAA - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA 3 @@ -109,19 +110,18 @@ image_back_default.png - 2 - 15 + 1 + 14 - Helvetica-Bold - 15 + Helvetica + 14 16 {320, 44} - _NS:9 @@ -130,7 +130,6 @@ {{0, 20}, {320, 460}} - @@ -241,7 +240,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + @@ -249,56 +249,20 @@ 11 - - - - ImageViewController - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - UIButton - UIImageView - - - - backButton - UIButton - - - imageView - UIImageView - - - - IBProjectSource - ./Classes/ImageViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/InCallViewController.xib b/Classes/en.lproj/InCallViewController.xib index 87f56054e..03d8739de 100644 --- a/Classes/en.lproj/InCallViewController.xib +++ b/Classes/en.lproj/InCallViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -52,7 +52,6 @@ 301 {{-1000, -1000}, {2000, 2000}} - _NS:9 @@ -66,7 +65,6 @@ 274 {320, 460} - _NS:196 @@ -80,7 +78,6 @@ 283 {{220, 360}, {100, 100}} - 1 @@ -91,7 +88,6 @@ 301 {{141, 212}, {37, 37}} - _NS:1030 NO @@ -103,7 +99,6 @@ {320, 460} - _NS:196 @@ -114,7 +109,6 @@ 274 {{0, -10}, {320, 480}} - _NS:418 @@ -143,9 +137,8 @@ -2147483356 - {{0, 23}, {85, 33}} + {{20, 40}, {85, 33}} - _NS:9 NO @@ -181,7 +174,6 @@ {320, 460} - NO @@ -448,120 +440,7 @@ 173 - - - YES - - InCallTableViewController - UITableViewController - - IBProjectSource - ./Classes/InCallTableViewController.h - - - - InCallViewController - UIViewController - - YES - - YES - callTableController - callTableView - testVideoView - videoCameraSwitch - videoGroup - videoPreview - videoView - videoWaitingForFirstImage - - - YES - InCallTableViewController - UITableView - UIView - UICamSwitch - UIView - UIView - UIView - UIActivityIndicatorView - - - - YES - - YES - callTableController - callTableView - testVideoView - videoCameraSwitch - videoGroup - videoPreview - videoView - videoWaitingForFirstImage - - - YES - - callTableController - InCallTableViewController - - - callTableView - UITableView - - - testVideoView - UIView - - - videoCameraSwitch - UICamSwitch - - - videoGroup - UIView - - - videoPreview - UIView - - - videoView - UIView - - - videoWaitingForFirstImage - UIActivityIndicatorView - - - - - IBProjectSource - ./Classes/InCallViewController.h - - - - UICamSwitch - UIButton - - preview - UIView - - - preview - - preview - UIView - - - - IBProjectSource - ./Classes/UICamSwitch.h - - - - + 0 IBCocoaTouchFramework @@ -570,7 +449,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -587,10 +466,10 @@ YES - {170, 65} - {170, 65} + {151, 51} + {151, 51} - 1498 + 1926 diff --git a/Classes/en.lproj/IncomingCallViewController.xib b/Classes/en.lproj/IncomingCallViewController.xib index 2f8fa4b70..12fa76ae0 100644 --- a/Classes/en.lproj/IncomingCallViewController.xib +++ b/Classes/en.lproj/IncomingCallViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -42,7 +42,6 @@ 274 {320, 460} - _NS:9 NO @@ -64,7 +63,6 @@ 290 {{0, 49}, {320, 63}} - _NS:9 NO @@ -79,7 +77,6 @@ 290 {320, 68} - _NS:9 NO @@ -98,7 +95,6 @@ 292 {{10, 53}, {300, 51}} - _NS:9 NO @@ -4522,7 +4518,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 293 {{0, 96}, {320, 262}} - _NS:9 NO @@ -4537,7 +4532,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 293 {{80, 113}, {160, 170}} - _NS:9 NO @@ -4555,7 +4549,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 395} - _NS:9 @@ -4570,7 +4563,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483374 {{0, 10}, {320, 67}} - _NS:9 @@ -4589,7 +4581,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 278 {160, 77} - _NS:9 NO @@ -4626,8 +4617,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 275 {{160, 0}, {160, 77}} - - _NS:9 NO @@ -4651,7 +4640,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {{0, 383}, {320, 77}} - _NS:9 @@ -4660,7 +4648,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 460} - _NS:9 @@ -4846,51 +4833,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 30 - - - - IncomingCallViewController - UIViewController - - id - id - - - - onAcceptClick: - id - - - onDeclineClick: - id - - - - UILabel - UIImageView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - - IBProjectSource - ./Classes/IncomingCallViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -4905,6 +4853,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 154} {640, 135} - 1498 + 1926 diff --git a/Classes/en.lproj/WizardViewController.xib b/Classes/en.lproj/WizardViewController.xib index ab9756a64..19ddd7f5d 100644 --- a/Classes/en.lproj/WizardViewController.xib +++ b/Classes/en.lproj/WizardViewController.xib @@ -1,23 +1,20 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject IBUIActivityIndicatorView IBUIButton - IBUIImageView - IBUILabel IBUIScrollView - IBUITextField IBUIView @@ -42,14 +39,14 @@ - 268 + 274 {320, 394} - _NS:9 YES YES + 1 IBCocoaTouchFramework NO NO @@ -63,10 +60,10 @@ 294 {160, 77} - _NS:9 NO + 3 Cancel @@ -75,6 +72,19 @@ 0 NO NO + 35 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA @@ -91,13 +101,13 @@ NSImage setup_cancel_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -106,10 +116,10 @@ 291 {{160, 0}, {160, 77}} - _NS:9 NO + 4 Start @@ -118,6 +128,13 @@ 0 NO NO + 35 + 0.0 + 10 + 0.0 + Start + + NSImage @@ -127,17 +144,17 @@ NSImage setup_start_default.png - - + + -2147483357 {{160, 0}, {160, 77}} - _NS:9 NO + 5 Back @@ -146,6 +163,13 @@ 0 NO NO + 35 + 0.0 + 10 + 0.0 + Back + + NSImage @@ -159,19 +183,19 @@ NSImage setup_back_default.png - - + + {{0, 383}, {320, 77}} - _NS:9 3 MCAwAA + 2 IBCocoaTouchFramework @@ -180,13 +204,13 @@ - 292 - {{141, 212}, {37, 37}} + 301 + {{142, 211}, {37, 37}} - _NS:9 NO + 7 IBCocoaTouchFramework NO YES @@ -195,903 +219,23 @@ {320, 460} - _NS:9 3 MSAwLjUAA + 6 IBCocoaTouchFramework {320, 460} - _NS:9 IBCocoaTouchFramework - - - 274 - - - - 311 - {{60, 80}, {201, 129}} - - - - _NS:9 - NO - - Linphone setup assistant icon - - - IBCocoaTouchFramework - - NSImage - setup_welcome_logo.png - - - - - 282 - {{40, 290}, {240, 44}} - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - This assistant will help you to use a SIP account for your calls. - - 3 - MC4zMzMzMzMzMzMzAA - - - 0 - 10 - 0 - 1 - - 1 - 12 - - - Helvetica - 12 - 16 - - NO - - - {320, 394} - - - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - - _NS:9 - NO - - Account setup assistant - - - IBCocoaTouchFramework - - NSImage - setup_title_assistant.png - - - - - 319 - {{33, 141}, {255, 50}} - - - - _NS:9 - NO - - Create linphone.org account - - - IBCocoaTouchFramework - 0 - 0 - NO - Create an account on linphone.org - - - - NSImage - button_background_over.png - - - NSImage - button_background_default.png - - - 2 - 13 - - - Helvetica-Bold - 13 - 16 - - - - - 319 - {{33, 205}, {255, 50}} - - - - _NS:9 - NO - - Sign in linphone.org account - - - IBCocoaTouchFramework - 0 - 0 - NO - I have already a linphone.org account - - - - - - - - - - 319 - {{33, 269}, {255, 50}} - - - _NS:9 - NO - - Sign in SIP account - - - IBCocoaTouchFramework - 0 - 0 - NO - I have already a SIP account - - - - - - - - - {320, 394} - - - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - - _NS:9 - NO - - Account setup assistant - - - IBCocoaTouchFramework - - - - - 298 - {{39, 80}, {240, 44}} - - - - _NS:9 - NO - YES - 7 - 200 - NO - IBCocoaTouchFramework - Enter your username and password with your email address - - - 0 - 10 - 0 - 1 - - - NO - - - - 319 - {{32, 140}, {255, 31}} - - - - _NS:9 - NO - YES - 100 - - Username - - IBCocoaTouchFramework - 0 - - Username - - 3 - MAA - - 2 - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - NSImage - field_background.png - - - 1 - 14 - - - Helvetica - 14 - 16 - - - - - 319 - {{32, 185}, {255, 31}} - - - - _NS:9 - NO - YES - 101 - - Password - - IBCocoaTouchFramework - 0 - - Password - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - 319 - {{32, 230}, {255, 31}} - - - - _NS:9 - NO - YES - 102 - - Password again - - IBCocoaTouchFramework - 0 - - Password - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - 319 - {{32, 275}, {255, 31}} - - - - _NS:9 - NO - YES - 103 - - Email - - IBCocoaTouchFramework - 0 - - Email - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - - 287 - {{33, 330}, {255, 50}} - - - _NS:9 - NO - - Register - - IBCocoaTouchFramework - 0 - 0 - NO - Register - - - - - - 2 - 20 - - - Helvetica-Bold - 20 - 16 - - - - {320, 394} - - - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - - _NS:9 - NO - - Account setup assistant - - - IBCocoaTouchFramework - - - - - 298 - {{40, 80}, {240, 44}} - - - - _NS:9 - NO - YES - 7 - 200 - NO - IBCocoaTouchFramework - Enter your username and password of your linphone.org account - - - 0 - 10 - 0 - 1 - - - NO - - - - 287 - {{32, 330}, {255, 50}} - - - _NS:9 - NO - - Sign in - - IBCocoaTouchFramework - 0 - 0 - NO - Sign in - - - - - - - - - - 319 - {{32, 185}, {255, 31}} - - - - _NS:9 - NO - YES - 101 - - Password - - IBCocoaTouchFramework - 0 - - Password - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - 319 - {{32, 140}, {255, 31}} - - - - _NS:9 - NO - YES - 100 - - Username - - IBCocoaTouchFramework - 0 - - Username - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - {320, 394} - - - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - - _NS:9 - NO - - Account setup assistant - - - IBCocoaTouchFramework - - - - - 298 - {{40, 80}, {240, 44}} - - - - _NS:9 - NO - YES - 7 - 200 - NO - IBCocoaTouchFramework - Enter your username and password with your SIP domain - - - 0 - 10 - 0 - 1 - - - NO - - - - 319 - {{33, 140}, {255, 31}} - - - - _NS:9 - NO - YES - 100 - - Username - - IBCocoaTouchFramework - 0 - - Username - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - - 319 - {{33, 185}, {255, 31}} - - - - _NS:9 - NO - YES - 101 - - Password - - IBCocoaTouchFramework - 0 - - Password - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - 319 - {{33, 230}, {255, 31}} - - - - _NS:9 - NO - YES - 104 - - Domain - - IBCocoaTouchFramework - 0 - - Domain - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - - 287 - {{34, 330}, {255, 50}} - - - _NS:9 - NO - - Sign in - - IBCocoaTouchFramework - 0 - 0 - NO - Sign in - - - - - - - - - {320, 394} - - - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - - _NS:9 - NO - - Account setup assistant - - - IBCocoaTouchFramework - - - - - 298 - {{40, 80}, {240, 44}} - - - - _NS:9 - NO - YES - 7 - 200 - NO - IBCocoaTouchFramework - Your account is created. Please check your mails in order to validate your account. - - - 0 - 10 - 0 - 1 - - - NO - - - - 287 - {{32, 330}, {255, 50}} - - - _NS:9 - NO - - Check validation - - IBCocoaTouchFramework - 0 - 0 - NO - Check validation - - - - - - - - - - -2147483329 - {{32, 185}, {255, 31}} - - - - _NS:9 - NO - YES - 101 - - - - IBCocoaTouchFramework - 0 - - Password - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - -2147483329 - {{32, 140}, {255, 31}} - - - - _NS:9 - NO - YES - 100 - - - - IBCocoaTouchFramework - 0 - - Username - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - {320, 394} - - - - _NS:9 - - IBCocoaTouchFramework - @@ -1121,43 +265,11 @@ - welcomeView + contentView - + - 28 - - - - choiceView - - - - 40 - - - - createAccountView - - - - 70 - - - - connectAccountView - - - - 71 - - - - externalAccountView - - - - 72 + 99 @@ -1169,19 +281,11 @@ - contentView + portraitView - + - 99 - - - - validateAccountView - - - - 112 + 117 @@ -1210,157 +314,6 @@ 24 - - - onCreateAccountClick: - - - 7 - - 42 - - - - onConnectAccountClick: - - - 7 - - 41 - - - - onExternalAccountClick: - - - 7 - - 43 - - - - delegate - - - - 86 - - - - delegate - - - - 87 - - - - delegate - - - - 88 - - - - onSignInExternalClick: - - - 7 - - 115 - - - - onSignInClick: - - - 7 - - 116 - - - - delegate - - - - 85 - - - - delegate - - - - 81 - - - - delegate - - - - 80 - - - - delegate - - - - 82 - - - - delegate - - - - 83 - - - - onRegisterClick: - - - 7 - - 113 - - - - delegate - - - - 84 - - - - onCheckValidationClick: - - - 7 - - 114 - - - - delegate - - - - 109 - - - - delegate - - - - 110 - @@ -1386,11 +339,17 @@ - + + + 98 + + + contentView + 14 @@ -1402,6 +361,12 @@ tabBar + + 18 + + + cancelButton + 16 @@ -1414,220 +379,6 @@ backButton - - 18 - - - cancelButton - - - 21 - - - - - - - welcomeView - - - 19 - - - iconImage - - - 22 - - - label - - - 33 - - - - - - - - - choiceView - - - 37 - - - titleImage - - - 44 - - - - - - - - - - - - createAccountView - - - 48 - - - titleImage - - - 52 - - - - - - - - - - connectAccountView - - - 53 - - - titleImage - - - 56 - - - - - - - - - - - externalAccountView - - - 57 - - - titleImage - - - 58 - - - label - - - 59 - - - usernameField - - - 60 - - - passwordField - - - 61 - - - domainField - - - 62 - - - signInButton - - - 64 - - - signInButton - - - 66 - - - passwordField - - - 67 - - - label - - - 68 - - - usernameField - - - 73 - - - label - - - 74 - - - usernameField - - - 75 - - - passwordField - - - 76 - - - password2Field - - - 77 - - - registerButton - - - 79 - - - emailField - - - 39 - - - externalAccountButton - - - 38 - - - connectAccountButton - - - 36 - - - createAccountButton - 91 @@ -1643,55 +394,6 @@ activityIndicatorView - - 98 - - - contentView - - - 101 - - - - - - - - - - validateAccountView - - - 103 - - - checkValidationButton - - - 105 - - - label - - - 107 - - - titleImage - - - 104 - - - usernameField - - - 106 - - - passwordField - @@ -1699,56 +401,17 @@ 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 - - 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 - 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 @@ -1757,140 +420,18 @@ - 116 - - - - - WizardViewController - UIViewController - - id - id - id - id - id - id - id - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onCheckValidationClick: - id - - - onConnectAccountClick: - id - - - onCreateAccountClick: - id - - - onExternalAccountClick: - id - - - onRegisterClick: - id - - - onSignInClick: - id - - - onSignInExternalClick: - id - - - onStartClick: - id - - - - UIButton - UIView - UIView - UIScrollView - UIView - UIView - UIButton - UIView - UIView - UIView - - - - backButton - UIButton - - - choiceView - UIView - - - connectAccountView - UIView - - - contentView - UIScrollView - - - createAccountView - UIView - - - externalAccountView - UIView - - - startButton - UIButton - - - validateAccountView - UIView - - - waitView - UIView - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/WizardViewController.h - - - + 117 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {550, 101} - {550, 101} - {542, 88} {320, 154} {320, 154} {320, 154} @@ -1899,9 +440,7 @@ {320, 154} {320, 154} {320, 154} - {516, 48} - {402, 258} - 1498 + 1926 diff --git a/Classes/en.lproj/WizardViewController~ipad.xib b/Classes/en.lproj/WizardViewController~ipad.xib new file mode 100644 index 000000000..0b2e69b39 --- /dev/null +++ b/Classes/en.lproj/WizardViewController~ipad.xib @@ -0,0 +1,799 @@ + + + + 1536 + 11E53 + 2840 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + + IBProxyObject + IBUIActivityIndicatorView + IBUIButton + IBUIScrollView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + {768, 966} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {768, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {384, 77} + + + _NS:9 + NO + 3 + + Cancel + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + setup_cancel_over~ipad.png + + + NSImage + setup_cancel_disabled~ipad.png + + + NSImage + setup_cancel_default~ipad.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 291 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 4 + + Start + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Start + + + + + NSImage + setup_start_over~ipad.png + + + NSImage + setup_start_default~ipad.png + + + + + + + -2147483357 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 5 + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Back + + + + + NSImage + setup_back_over~ipad.png + + + NSImage + setup_back_disabled~ipad.png + + + NSImage + setup_back_default~ipad.png + + + + + + {{0, 947}, {768, 77}} + + + _NS:9 + + 3 + MCAwAA + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{366, 492}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {768, 1024} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {768, 1024} + + + _NS:9 + + IBCocoaTouchFramework + + + + 292 + + + + 274 + {1024, 711} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {1024, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {512, 77} + + + _NS:9 + NO + 3 + + Cancel + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + + NSImage + setup_cancel_over_landscape~ipad.png + + + NSImage + setup_cancel_disabled_landscape~ipad.png + + + NSImage + setup_cancel_default_landscape~ipad.png + + + + + + + 291 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 4 + + Start + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Start + + + + + NSImage + setup_start_over_landscape~ipad.png + + + NSImage + setup_start_default_landscape~ipad.png + + + + + + + -2147483357 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 5 + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Back + + + + + NSImage + setup_back_over_landscape~ipad.png + + + NSImage + setup_back_disabled_landscape~ipad.png + + + NSImage + setup_back_default_landscape~ipad.png + + + + + + {{0, 691}, {1024, 77}} + + + _NS:9 + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{494, 364}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {1024, 768} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {1024, 768} + + + _NS:9 + + IBCocoaTouchFramework + + + + + + + view + + + + 20 + + + + startButton + + + + 26 + + + + backButton + + + + 27 + + + + contentView + + + + 99 + + + + portraitView + + + + 117 + + + + waitView + + + + 131 + + + + landscapeView + + + + 134 + + + + onStartClick: + + + 7 + + 25 + + + + onBackClick: + + + 7 + + 23 + + + + onCancelClick: + + + 7 + + 24 + + + + onCancelClick: + + + 7 + + 128 + + + + onStartClick: + + + 7 + + 126 + + + + onBackClick: + + + 7 + + 127 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 12 + + + + + + + + Portrait View + + + 98 + + + contentView + + + 14 + + + + + + + + + tabBar + + + 18 + + + cancelButton + + + 16 + + + startButton + + + 17 + + + backButton + + + 118 + + + + + + + + Landscape View + + + 119 + + + contentView + + + 120 + + + + + + + + + tabBar + + + 122 + + + cancelButton + + + 123 + + + startButton + + + 124 + + + backButton + + + 129 + + + + + + waitView + + + 130 + + + activityIndicatorView + + + 132 + + + + + + waitView + + + 133 + + + activityIndicatorView + + + 137 + + + background + + + 136 + + + background + + + + + WizardViewController + 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 + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 137 + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + + 1926 + + diff --git a/linphone.ldb/Resources/Classes/WizardViewController/3/WizardViewController.xib b/Classes/en.lproj/WizardViews.xib similarity index 76% rename from linphone.ldb/Resources/Classes/WizardViewController/3/WizardViewController.xib rename to Classes/en.lproj/WizardViews.xib index ab9756a64..a215fb722 100644 --- a/linphone.ldb/Resources/Classes/WizardViewController/3/WizardViewController.xib +++ b/Classes/en.lproj/WizardViews.xib @@ -1,22 +1,20 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject - IBUIActivityIndicatorView IBUIButton IBUIImageView IBUILabel - IBUIScrollView IBUITextField IBUIView @@ -36,183 +34,6 @@ IBFirstResponder IBCocoaTouchFramework - - - 292 - - - - 268 - {320, 394} - - - - _NS:9 - YES - YES - IBCocoaTouchFramework - NO - NO - - - - 266 - - - - 294 - {160, 77} - - - - _NS:9 - NO - - Cancel - - IBCocoaTouchFramework - 0 - 0 - NO - NO - - 3 - MC41AA - - - NSImage - setup_cancel_over.png - - - NSImage - setup_cancel_disabled.png - - - NSImage - setup_cancel_default.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 291 - {{160, 0}, {160, 77}} - - - - _NS:9 - NO - - Start - - IBCocoaTouchFramework - 0 - 0 - NO - NO - - - NSImage - setup_start_over.png - - - NSImage - setup_start_default.png - - - - - - - -2147483357 - {{160, 0}, {160, 77}} - - - _NS:9 - NO - - Back - - IBCocoaTouchFramework - 0 - 0 - NO - NO - - - NSImage - setup_back_over.png - - - NSImage - setup_back_disabled.png - - - NSImage - setup_back_default.png - - - - - - {{0, 383}, {320, 77}} - - - - _NS:9 - - 3 - MCAwAA - - IBCocoaTouchFramework - - - - -2147483374 - - - - 292 - {{141, 212}, {37, 37}} - - - - _NS:9 - NO - IBCocoaTouchFramework - NO - YES - 0 - - - {320, 460} - - - - _NS:9 - - 3 - MSAwLjUAA - - IBCocoaTouchFramework - - - {320, 460} - - - - _NS:9 - - IBCocoaTouchFramework - 274 @@ -225,6 +46,7 @@ _NS:9 + 1 NO Linphone setup assistant icon @@ -236,12 +58,54 @@ setup_welcome_logo.png + + + 311 + {{31, 230}, {258, 40}} + + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + 1 + MCAwIDAAA + darkTextColor + + + + 3 + MC4zMzMzMzMzMzMzAA + + {-1, -1} + 0 + 10 + 1 + + 3 + 20 + + + Helvetica-Oblique + 20 + 16 + + 282 {{40, 290}, {240, 44}} + _NS:9 NO YES @@ -249,10 +113,7 @@ NO IBCocoaTouchFramework This assistant will help you to use a SIP account for your calls. - - 3 - MC4zMzMzMzMzMzMzAA - + 0 10 @@ -268,38 +129,50 @@ 16 NO + 240 {320, 394} - + _NS:9 - + + 3 + MCAwAA + IBCocoaTouchFramework 274 - + 311 - {{31, 50}, {258, 24}} + {{31, 34}, {258, 40}} _NS:9 + NO + YES + 7 NO Account setup assistant - IBCocoaTouchFramework - - NSImage - setup_title_assistant.png - + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + @@ -319,8 +192,18 @@ 0 NO Create an account on linphone.org - - + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + NSImage button_background_over.png @@ -357,7 +240,8 @@ 0 NO I have already a linphone.org account - + + @@ -370,6 +254,7 @@ {{33, 269}, {255, 50}} + _NS:9 NO @@ -381,7 +266,8 @@ 0 NO I have already a SIP account - + + @@ -392,7 +278,7 @@ {320, 394} - + _NS:9 IBCocoaTouchFramework @@ -401,21 +287,32 @@ 274 - + 311 - {{31, 50}, {258, 24}} + {{31, 34}, {258, 40}} _NS:9 + NO + YES + 7 NO Account setup assistant - IBCocoaTouchFramework - + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + @@ -431,7 +328,7 @@ 200 NO IBCocoaTouchFramework - Enter your username and password with your email address + Enter your username and password with your email address. 0 @@ -441,6 +338,7 @@ NO + 240 @@ -467,8 +365,7 @@ 2 - YES - 17 + 10 1 IBCocoaTouchFramework @@ -481,7 +378,7 @@ 1 14 - + Helvetica 14 16 @@ -510,8 +407,7 @@ MAA - YES - 17 + 10 1 YES @@ -519,7 +415,7 @@ - + @@ -544,8 +440,7 @@ MAA - YES - 17 + 10 1 YES @@ -553,7 +448,7 @@ - + @@ -578,15 +473,14 @@ MAA - YES - 17 + 10 1 IBCocoaTouchFramework - + @@ -594,6 +488,7 @@ {{33, 330}, {255, 50}} + _NS:9 NO @@ -604,7 +499,8 @@ 0 NO Register - + + @@ -622,7 +518,7 @@ {320, 394} - + _NS:9 IBCocoaTouchFramework @@ -631,21 +527,32 @@ 274 - + 311 - {{31, 50}, {258, 24}} + {{31, 34}, {258, 40}} _NS:9 + NO + YES + 7 NO Account setup assistant - IBCocoaTouchFramework - + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + @@ -661,7 +568,7 @@ 200 NO IBCocoaTouchFramework - Enter your username and password of your linphone.org account + Enter your username and password of your linphone.org account. 0 @@ -671,29 +578,7 @@ NO - - - - 287 - {{32, 330}, {255, 50}} - - - _NS:9 - NO - - Sign in - - IBCocoaTouchFramework - 0 - 0 - NO - Sign in - - - - - - + 240 @@ -718,8 +603,7 @@ MAA - YES - 17 + 10 1 YES @@ -727,7 +611,7 @@ - + @@ -752,21 +636,45 @@ MAA - YES - 17 + 10 1 IBCocoaTouchFramework - + + + + + 287 + {{32, 330}, {255, 50}} + + + + _NS:9 + NO + + Sign in + + IBCocoaTouchFramework + 0 + 0 + NO + Sign in + + + + + + + {320, 394} - + _NS:9 IBCocoaTouchFramework @@ -775,21 +683,32 @@ 274 - + 311 - {{31, 50}, {258, 24}} + {{31, 34}, {258, 40}} _NS:9 + NO + YES + 7 NO Account setup assistant - IBCocoaTouchFramework - + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + @@ -805,7 +724,7 @@ 200 NO IBCocoaTouchFramework - Enter your username and password with your SIP domain + Enter your username and password with your SIP domain. 0 @@ -815,6 +734,7 @@ NO + 240 @@ -839,15 +759,14 @@ MAA - YES - 17 + 10 1 IBCocoaTouchFramework - + @@ -872,8 +791,7 @@ MAA - YES - 17 + 10 1 YES @@ -881,7 +799,7 @@ - + @@ -906,15 +824,14 @@ MAA - YES - 17 + 10 1 IBCocoaTouchFramework - + @@ -922,6 +839,7 @@ {{34, 330}, {255, 50}} + _NS:9 NO @@ -932,7 +850,8 @@ 0 NO Sign in - + + @@ -943,7 +862,7 @@ {320, 394} - + _NS:9 IBCocoaTouchFramework @@ -952,21 +871,32 @@ 274 - + 311 - {{31, 50}, {258, 24}} + {{31, 34}, {258, 40}} _NS:9 + NO + YES + 7 NO Account setup assistant - IBCocoaTouchFramework - + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + @@ -992,29 +922,7 @@ NO - - - - 287 - {{32, 330}, {255, 50}} - - - _NS:9 - NO - - Check validation - - IBCocoaTouchFramework - 0 - 0 - NO - Check validation - - - - - - + 240 @@ -1039,8 +947,7 @@ MAA - YES - 17 + 10 1 YES @@ -1048,7 +955,7 @@ - + @@ -1073,21 +980,45 @@ MAA - YES - 17 + 10 1 IBCocoaTouchFramework - + + + + + 287 + {{32, 330}, {255, 50}} + + + + _NS:9 + NO + + Check validation + + IBCocoaTouchFramework + 0 + 0 + NO + Check validation + + + + + + + {320, 394} - + _NS:9 IBCocoaTouchFramework @@ -1095,30 +1026,6 @@ - - - view - - - - 20 - - - - startButton - - - - 26 - - - - backButton - - - - 27 - welcomeView @@ -1159,22 +1066,6 @@ 72 - - - waitView - - - - 96 - - - - contentView - - - - 99 - validateAccountView @@ -1183,33 +1074,6 @@ 112 - - - onStartClick: - - - 7 - - 25 - - - - onBackClick: - - - 7 - - 23 - - - - onCancelClick: - - - 7 - - 24 - onCreateAccountClick: @@ -1381,51 +1245,13 @@ - - 12 - - - - - - - - - - 14 - - - - - - - - tabBar - - - 16 - - - startButton - - - 17 - - - backButton - - - 18 - - - cancelButton - 21 + welcomeView @@ -1446,80 +1272,56 @@ 33 - + choiceView - - 37 - - - titleImage - 44 - + createAccountView - - 48 - - - titleImage - 52 - + connectAccountView - - 53 - - - titleImage - 56 - + externalAccountView - - 57 - - - titleImage - 58 @@ -1550,12 +1352,6 @@ signInButton - - 64 - - - signInButton - 66 @@ -1628,36 +1424,15 @@ createAccountButton - - 91 - - - - - - waitView - - - 90 - - - activityIndicatorView - - - 98 - - - contentView - 101 - - + + validateAccountView @@ -1674,12 +1449,6 @@ label - - 107 - - - titleImage - 104 @@ -1692,6 +1461,48 @@ passwordField + + 117 + + + title + + + 122 + + + title + + + 123 + + + title + + + 124 + + + title + + + 126 + + + title + + + 64 + + + signInButton + + + 127 + + + title + @@ -1705,32 +1516,25 @@ 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 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 @@ -1749,21 +1553,40 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 116 + 127 - WizardViewController + TPMultiLayoutViewController UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + WizardViewController + TPMultiLayoutViewController id id @@ -1883,7 +1706,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -1891,17 +1714,8 @@ {550, 101} {550, 101} {542, 88} - {320, 154} - {320, 154} - {320, 154} - {320, 154} - {320, 154} - {320, 154} - {320, 154} - {320, 154} - {516, 48} - {402, 258} + {179, 161} - 1498 + 1926 diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib index 43ba72799..ceff4af70 100644 --- a/Classes/fr.lproj/ChatRoomViewController.xib +++ b/Classes/fr.lproj/ChatRoomViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1280 11E53 1938 1138.47 @@ -16,7 +16,6 @@ IBUILabel IBProxyObject IBUIProgressView - IBUITapGestureRecognizer IBUITableViewController IBUITableView IBUIButton @@ -131,7 +130,7 @@ 274 - {{0, 80}, {320, 277}} + {{0, 80}, {320, 279}} _NS:9 @@ -156,14 +155,14 @@ 274 - {320, 59} + {320, 57} _NS:9 NO IBCocoaTouchFramework - + NSImage chat_background.png @@ -171,7 +170,7 @@ 297 - {{250, 0}, {70, 59}} + {{262, 0}, {58, 57}} _NS:9 @@ -182,7 +181,7 @@ IBCocoaTouchFramework 0 0 - Annuler + NO 1 @@ -192,6 +191,14 @@ 3 MC41AA + + NSImage + chat_cancel_over.png + + + NSImage + chat_cancel_default.png + 2 15 @@ -205,7 +212,7 @@ 298 - {{20, 25}, {213, 9}} + {{20, 24}, {222, 9}} _NS:9 @@ -218,7 +225,7 @@ 0.5 - {{0, 357}, {320, 59}} + {{0, 359}, {320, 57}} _NS:9 @@ -232,29 +239,22 @@ 274 - {320, 59} - - - _NS:9 - - NO - IBCocoaTouchFramework - - - - - 274 - {320, 59} + {320, 57} _NS:9 + NO IBCocoaTouchFramework + + NSImage + chat_message_background.png + 297 - {{250, 0}, {70, 59}} + {{262, 0}, {58, 57}} _NS:9 NO @@ -267,28 +267,52 @@ 0 NO NO + 30 + 0.0 + 0.0 + 0.0 + Envoyez + + 2 + MCAwIDAAA + + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + - + NSImage chat_send_over.png - + NSImage chat_send_disabled.png - + NSImage chat_send_default.png - - + + 1 + 14 + + + Helvetica + 14 + 16 + 300 - {40, 59} + {35, 57} - + _NS:9 NO @@ -297,54 +321,41 @@ IBCocoaTouchFramework 0 0 - Img + NO + NO 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + NSImage + chat_photo_over.png + + + NSImage + chat_photo_disabled.png + + + NSImage + chat_photo_default.png + - + 274 - - - - 274 - {210, 59} - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - chat_field.png - - - - - 274 - {{10, 10}, {190, 39}} - - - _NS:9 - - IBCocoaTouchFramework - - - {{40, 0}, {210, 59}} + {{33, 10}, {232, 37}} - + _NS:9 IBCocoaTouchFramework - {{0, 357}, {320, 59}} + {{0, 359}, {320, 57}} _NS:9 @@ -384,6 +395,10 @@ _NS:9 + + 2 + MCAwIDAAA + NO Retour @@ -392,17 +407,27 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Retour + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + - + NSImage chat_back_over.png - + NSImage chat_back_default.png - - + + @@ -411,6 +436,7 @@ _NS:9 + NO Éditer @@ -419,21 +445,30 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Éditer + + + - + NSImage chat_edit_over.png - + NSImage chat_ok_default.png - + NSImage chat_edit_default.png - - + + {320, 44} @@ -461,7 +496,6 @@ IBCocoaTouchFramework NO - @@ -513,22 +547,6 @@ 44 - - - footerView - - - - 46 - - - - sendButton - - - - 27 - chatView @@ -537,46 +555,6 @@ 54 - - - footerBackgroundImage - - - - 67 - - - - messageField - - - - 64 - - - - messageBackgroundImage - - - - 69 - - - - messageView - - - - 70 - - - - listTapGestureRecognizer - - - - 71 - imageTransferProgressBar @@ -617,6 +595,38 @@ 88 + + + sendButton + + + + 27 + + + + messageField + + + + 64 + + + + messageView + + + + 89 + + + + messageBackgroundImage + + + + 90 + dataSource @@ -633,16 +643,6 @@ 31 - - - gestureRecognizers - - - NSArray - YES - - 61 - onBackClick: @@ -678,14 +678,6 @@ 33 - - - onListTap: - - - - 62 - onPictureClick: @@ -820,67 +812,26 @@ 14 - - - + + - footerView - - - 15 - - - sendButton - - - 58 - - - listTapGestureRecognizer + messageView 66 - footerBackgroundImage - - - 68 - - - - - - - messageView - - - 21 - - messageBackgroundImage - - 63 - - - messageField - 73 pictureButton - - 82 - - - normalView - 72 @@ -910,6 +861,18 @@ transfertBackgroundImage + + 15 + + + sendButton + + + 63 + + + messageField + @@ -919,11 +882,12 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + ChatRoomTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -932,29 +896,28 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin HPGrowingTextView 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 - - + + - 88 + 90 @@ -1014,8 +977,6 @@ UIButton UIView UIToggleButton - UIImageView - UIView UIView UIProgressView UITapGestureRecognizer @@ -1049,14 +1010,6 @@ editButton UIToggleButton - - footerBackgroundImage - UIImageView - - - footerView - UIView - headerView UIView @@ -1127,10 +1080,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 @@ -1138,15 +1087,20 @@ {131, 131} {320, 88} {320, 88} - {640, 117} + {16, 16} + {116, 115} + {116, 115} {320, 88} {320, 88} - {500, 117} + {640, 117} {320, 88} - {140, 117} - {140, 117} - {140, 117} - {5, 117} + {71, 115} + {71, 115} + {71, 115} + {117, 115} + {117, 115} + {117, 115} + {5, 88} 933 diff --git a/Classes/fr.lproj/ChatViewController.xib b/Classes/fr.lproj/ChatViewController.xib index ba35e017a..679701ddf 100644 --- a/Classes/fr.lproj/ChatViewController.xib +++ b/Classes/fr.lproj/ChatViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -14,7 +14,6 @@ IBUIButton IBUIImageView IBProxyObject - IBUILabel IBUITextField IBUITableViewController IBUITableView @@ -49,7 +48,7 @@ 290 {320, 44} - + _NS:9 NO IBCocoaTouchFramework @@ -63,7 +62,7 @@ 292 {160, 44} - + _NS:9 NO @@ -73,25 +72,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Nouvelle discussion + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage chat_add_over.png - + NSImage chat_add_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -100,7 +112,7 @@ 289 {{160, 0}, {160, 44}} - + _NS:9 NO @@ -110,21 +122,33 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Éditer + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + - + NSImage chat_edit_over.png - + NSImage chat_ok_default.png - + NSImage chat_edit_default.png - - + + {320, 44} @@ -143,12 +167,12 @@ 274 - {{0, 74}, {320, 378}} + {{0, 79}, {320, 381}} _NS:9 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -162,6 +186,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -171,10 +199,14 @@ 292 - {{24, 44}, {296, 30}} + {{25, 44}, {271, 35}} _NS:9 + + 3 + MCAwAA + NO YES @@ -183,6 +215,7 @@ IBCocoaTouchFramework 0 + À: 3 MAA @@ -193,49 +226,26 @@ IBCocoaTouchFramework + + NSImage + chat_address.png + 1 - + 1 17 - + Helvetica 17 16 - - - 292 - {{0, 44}, {24, 30}} - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - À: - - 1 - MCAwIDAAA - - - 0 - 10 - - - {320, 460} _NS:9 - - 3 - MQA - - + IBCocoaTouchFramework @@ -366,7 +376,6 @@ - @@ -411,11 +420,6 @@ addressField - - 26 - - - @@ -424,10 +428,10 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin ChatTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -435,6 +439,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -508,17 +513,18 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 {320, 88} {320, 88} + {542, 70} {320, 88} {320, 88} {320, 88} - {5, 117} + {5, 88} 933 diff --git a/Classes/fr.lproj/ContactDetailsLabelViewController.xib b/Classes/fr.lproj/ContactDetailsLabelViewController.xib index 15c4fce44..45845b9da 100644 --- a/Classes/fr.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/fr.lproj/ContactDetailsLabelViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -87,25 +87,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Retour + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage contact_back_over.png - + NSImage contact_back_default.png - 2 - 15 + 1 + 14 - Helvetica-Bold - 15 + Helvetica + 14 16 @@ -181,7 +194,7 @@ AAgACAAIAAEAAQABAAE - + 3 MCAwAA @@ -211,7 +224,7 @@ AAgACAAIAAEAAQABAAE {320, 460} - + IBCocoaTouchFramework @@ -335,6 +348,7 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -381,7 +395,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -389,7 +403,7 @@ AAgACAAIAAEAAQABAAE {640, 523} {320, 88} {320, 88} - {5, 117} + {5, 88} 933 diff --git a/Classes/fr.lproj/ContactDetailsViewController.xib b/Classes/fr.lproj/ContactDetailsViewController.xib index 6bfa7f648..4c3934262 100644 --- a/Classes/fr.lproj/ContactDetailsViewController.xib +++ b/Classes/fr.lproj/ContactDetailsViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -72,25 +72,34 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Retour + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage contact_back_over.png - + NSImage contact_back_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -109,17 +118,27 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Annuler + + 2 + MCAwIDAAA + + - + NSImage contact_cancel_over.png - + NSImage contact_cancel_default.png - - + + @@ -136,21 +155,30 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Éditer + + + - + NSImage contact_edit_over.png - + NSImage contact_ok_default.png - + NSImage contact_edit_default.png - - + + {320, 44} @@ -224,7 +252,7 @@ AAgACAAIAAEAAQABAAE - + 3 MCAwAA @@ -254,7 +282,7 @@ AAgACAAIAAEAAQABAAE {320, 460} - + IBCocoaTouchFramework @@ -523,7 +551,8 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIContactDetailsFooter com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -531,8 +560,10 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -721,7 +752,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -733,7 +764,7 @@ AAgACAAIAAEAAQABAAE {320, 88} {320, 88} {320, 88} - {5, 117} + {5, 88} 933 diff --git a/Classes/fr.lproj/ContactsViewController.xib b/Classes/fr.lproj/ContactsViewController.xib index cc6c3a6dd..d90d9d8f8 100644 --- a/Classes/fr.lproj/ContactsViewController.xib +++ b/Classes/fr.lproj/ContactsViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -56,76 +56,116 @@ toolsbar_background.png - + - 289 - {{120, 0}, {80, 44}} + 293 + + + + 292 + {107, 44} + + + _NS:9 + NO + + Afficher tout les contacts + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Tous + + 2 + MC45NzY0NzA2NDkyIDAuOTc2NDcwNjQ5MiAwLjk3NjQ3MDY0OTIAA + + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + contacts_all_selected.png + + + + NSImage + contacts_all_default.png + + + 1 + 12 + + + Helvetica + 12 + 16 + + + + + 289 + {{107, 0}, {107, 44}} + + + _NS:9 + NO + + Afficher les contacts Linphone + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Linphone + + + + + + NSImage + contacts_linphone_selected.png + + + + NSImage + contacts_linphone_default.png + + + + + + {{106, 0}, {214, 44}} - + _NS:9 - NO - - Afficher tout les contacts - - IBCocoaTouchFramework - 0 - 0 - NO - + 3 - MC41AA - - - NSImage - contacts_all_selected.png - - - - NSImage - contacts_all_default.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 289 - {{200, 0}, {80, 44}} - - - _NS:9 - NO - - Afficher les contacts Linphone + MQA + + 2 + IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - contacts_linphone_selected.png - - - - NSImage - contacts_linphone_default.png - - - 292 - {80, 44} + {107, 44} _NS:9 @@ -137,24 +177,44 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ajouter un contact + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + - + NSImage contacts_add_over.png - + NSImage contacts_add_default.png - - + + 1 + 14 + + + Helvetica + 14 + 16 + -2147483356 - {80, 44} + {107, 44} - + _NS:9 NO @@ -164,17 +224,24 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Retour + + - + NSImage contacts_back_over.png - + NSImage contacts_back_default.png - - + + {320, 44} @@ -184,9 +251,7 @@ 3 MQA - - 2 - + IBCocoaTouchFramework @@ -197,8 +262,8 @@ _NS:10 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -213,6 +278,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -225,8 +294,7 @@ _NS:9 3 - MQA - + MCAwAA IBCocoaTouchFramework @@ -251,22 +319,6 @@ 16 - - - allButton - - - - 27 - - - - linphoneButton - - - - 31 - tableController @@ -299,6 +351,22 @@ 91 + + + allButton + + + + 27 + + + + linphoneButton + + + + 31 + onAllClick: @@ -394,25 +462,12 @@ - - + toolBar - - 4 - - - allButton - - - 5 - - - linphoneButton - 6 @@ -444,6 +499,28 @@ background + + 93 + + + + + + + switchView + + + 4 + + + allButton + + + 5 + + + linphoneButton + @@ -454,120 +531,48 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin ContactsTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 92 - - - - - 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 - - - + 93 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {160, 88} - {160, 88} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {5, 117} + {214, 88} + {214, 88} + {213, 88} + {213, 88} + {214, 88} + {214, 88} + {213, 88} + {213, 88} + {5, 88} 933 diff --git a/Classes/fr.lproj/DialerViewController.xib b/Classes/fr.lproj/DialerViewController.xib index f112f691d..c0ef305a4 100644 --- a/Classes/fr.lproj/DialerViewController.xib +++ b/Classes/fr.lproj/DialerViewController.xib @@ -1362,301 +1362,7 @@ 254 - - - YES - - DialerViewController - UIViewController - - YES - - YES - onAddContactClick: - onAddressChange: - onBackClick: - - - YES - id - id - id - - - - YES - - YES - onAddContactClick: - onAddressChange: - onBackClick: - - - YES - - onAddContactClick: - id - - - onAddressChange: - id - - - onBackClick: - id - - - - - YES - - YES - addCallButton - addContactButton - addressField - backButton - callButton - eightButton - eraseButton - fiveButton - fourButton - nineButton - oneButton - sevenButton - sharpButton - sixButton - starButton - threeButton - transferButton - twoButton - zeroButton - - - YES - UICallButton - UIButton - UITextField - UIButton - UICallButton - UIDigitButton - UIEraseButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UITransferButton - UIDigitButton - UIDigitButton - - - - YES - - YES - addCallButton - addContactButton - addressField - backButton - callButton - eightButton - eraseButton - fiveButton - fourButton - nineButton - oneButton - sevenButton - sharpButton - sixButton - starButton - threeButton - transferButton - twoButton - zeroButton - - - YES - - addCallButton - UICallButton - - - addContactButton - UIButton - - - addressField - UITextField - - - backButton - UIButton - - - 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 - - - zeroButton - UIDigitButton - - - - - IBProjectSource - ./Classes/DialerViewController.h - - - - UIAddressTextField - UITextField - - IBProjectSource - ./Classes/UIAddressTextField.h - - - - UICallButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UICallButton.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 IBCocoaTouchFramework @@ -1665,7 +1371,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/fr.lproj/DialerViewController~ipad.xib b/Classes/fr.lproj/DialerViewController~ipad.xib index 90e271b5c..fde581ced 100644 --- a/Classes/fr.lproj/DialerViewController~ipad.xib +++ b/Classes/fr.lproj/DialerViewController~ipad.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -37,6 +37,21 @@ 292 + + + 301 + {{127, 150}, {510, 460}} + + + _NS:9 + 1 + NO + IBIPadFramework + + NSImage + logo_linphone_trame_background.png + + 301 @@ -66,9 +81,9 @@ -2147483356 - {{0, 77}, {85, 33}} + {{20, 90}, {85, 33}} - + _NS:9 NO @@ -1126,6 +1141,7 @@ + @@ -1294,12 +1310,6 @@ backspaceButton - - 70 - - - preview - 71 @@ -1315,9 +1325,22 @@ 76 + backgroundView + + 78 + + + backgroundImage + + + 70 + + + preview + @@ -1385,6 +1408,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1396,7 +1420,7 @@ - 77 + 78 @@ -1658,7 +1682,7 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -1680,6 +1704,7 @@ {371, 170} {371, 170} {640, 135} + {1019, 920} {220, 113} {220, 113} {220, 113} @@ -1704,8 +1729,8 @@ {220, 113} {220, 113} {220, 113} - {170, 65} - {170, 65} + {151, 51} + {151, 51} {371, 170} {371, 170} {371, 170} diff --git a/Classes/fr.lproj/FirstLoginViewController.xib b/Classes/fr.lproj/FirstLoginViewController.xib index b39ab6eb2..31720be7e 100644 --- a/Classes/fr.lproj/FirstLoginViewController.xib +++ b/Classes/fr.lproj/FirstLoginViewController.xib @@ -57,9 +57,13 @@ 0 NO S'enregistrer + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + - 3 - MC4zMzMzMzMzMzMzAA + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA 3 @@ -423,7 +427,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -441,104 +445,7 @@ 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 @@ -547,7 +454,7 @@ 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 a34626363..e518aefd3 100644 --- a/Classes/fr.lproj/HistoryDetailsViewController.xib +++ b/Classes/fr.lproj/HistoryDetailsViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -70,25 +70,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Retour + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_details_back_over.png - + NSImage history_details_back_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -107,17 +120,24 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ajouter aux contacts + + - + NSImage history_details_add_over.png - + NSImage history_details_add_default.png - - + + {320, 44} @@ -160,8 +180,15 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + @@ -793,10 +820,12 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -805,101 +834,12 @@ 53 - - - - HistoryDetailsViewController - UIViewController - - id - id - id - id - - - - onAddContactClick: - id - - - onAddressClick: - id - - - onBackClick: - id - - - onContactClick: - id - - - - UIButton - UIButton - UILabel - UIImageView - UILabel - UILabel - UILabel - UILabel - UILabel - UILabel - - - - addContactButton - UIButton - - - addressButton - UIButton - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - dateHeaderLabel - UILabel - - - dateLabel - UILabel - - - durationHeaderLabel - UILabel - - - durationLabel - UILabel - - - typeHeaderLabel - UILabel - - - typeLabel - UILabel - - - - IBProjectSource - ./Classes/HistoryDetailsViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -911,8 +851,8 @@ {320, 88} {320, 88} {320, 88} - {320, 117} - {5, 117} + {320, 88} + {5, 88} 933 diff --git a/Classes/fr.lproj/HistoryViewController.xib b/Classes/fr.lproj/HistoryViewController.xib index a226f3825..93d618a89 100644 --- a/Classes/fr.lproj/HistoryViewController.xib +++ b/Classes/fr.lproj/HistoryViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -58,10 +58,10 @@ - -2147483356 + 292 {80, 44} - + _NS:9 NO @@ -70,83 +70,143 @@ IBCocoaTouchFramework 0 0 - Del - - 3 - MQA - - - 1 + NO + 18 + 0.0 + 0.0 + 0.0 + Supprimer tout + + 2 MCAwIDAAA + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - - 2 - 15 + + NSImage + history_delete_over.png - - Helvetica-Bold - 15 + + NSImage + history_delete_default.png + + + 1 + 14 + + + Helvetica + 14 16 - + - 292 - {{80, 0}, {80, 44}} + 293 + + + + 292 + {80, 44} + + + _NS:9 + + 2 + MC45NzY0NzA2NDkyIDAuOTc2NDcwNjQ5MiAwLjk3NjQ3MDY0OTIAA + + NO + + Afficher tout les contacts + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Tous + + + + + + NSImage + history_all_selected.png + + + + NSImage + history_all_default.png + + + 1 + 12 + + + Helvetica + 12 + 16 + + + + + 289 + {{80, 0}, {80, 44}} + + + _NS:9 + + NO + + Afficher les contacts Linphone + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Manqués + + + + + + NSImage + history_missed_selected.png + + + + NSImage + history_missed_default.png + + + + + + {{80, 0}, {160, 44}} - + _NS:9 - NO - - Afficher tout les contacts + + 3 + MQA + + 2 + IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - history_all_selected.png - - - NSImage - history_all_default.png - - - - - - - 292 - {{160, 0}, {80, 44}} - - - _NS:9 - NO - - Afficher les contacts Linphone - - IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - history_missed_selected.png - - - - NSImage - history_missed_default.png - - - @@ -163,21 +223,29 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Éditer + + - + NSImage history_edit_over.png - + NSImage history_ok_default.png - + NSImage history_edit_default.png - - + + {320, 44} @@ -187,9 +255,7 @@ 3 MQA - - 2 - + IBCocoaTouchFramework @@ -200,8 +266,8 @@ _NS:9 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -215,6 +281,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -227,8 +297,7 @@ _NS:9 3 - MQA - + MCAwAA IBCocoaTouchFramework @@ -261,22 +330,6 @@ 26 - - - allButton - - - - 27 - - - - missedButton - - - - 28 - tableView @@ -301,6 +354,22 @@ 36 + + + allButton + + + + 27 + + + + missedButton + + + + 28 + onAllClick: @@ -394,27 +463,14 @@ 3 - - + toolsBar - - 4 - - - allButton - - - 5 - - - missedButton - 6 @@ -444,7 +500,29 @@ 35 - delAllButton + deleteButton + + + 38 + + + + + + + switchView + + + 4 + + + allButton + + + 5 + + + missedButton @@ -460,123 +538,46 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + - 37 - - - - - HistoryTableViewController - UITableViewController - - IBProjectSource - ./Classes/HistoryTableViewController.h - - - - HistoryViewController - UIViewController - - id - id - id - id - - - - onAllClick: - id - - - onDeleteClick: - id - - - onEditClick: - id - - - onMissedClick: - id - - - - UIButton - UIButton - UIToggleButton - UIButton - HistoryTableViewController - UITableView - - - - allButton - UIButton - - - deleteButton - UIButton - - - editButton - UIToggleButton - - - missedButton - UIButton - - - tableController - HistoryTableViewController - - - tableView - UITableView - - - - IBProjectSource - ./Classes/HistoryViewController.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - + 38 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {213, 117} - {213, 117} + {160, 88} + {160, 88} + {160, 88} + {160, 88} {160, 88} {160, 88} - {213, 117} - {213, 117} + {160, 88} + {160, 88} {160, 88} - {5, 117} + {5, 88} 933 diff --git a/Classes/fr.lproj/ImageViewController.xib b/Classes/fr.lproj/ImageViewController.xib index ad5e29808..708556ae8 100644 --- a/Classes/fr.lproj/ImageViewController.xib +++ b/Classes/fr.lproj/ImageViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -84,13 +84,18 @@ 0 NO NO + 18 + 0.0 + 0.0 + 0.0 + Retour - 3 - MQA + 2 + MCAwIDAAA - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA 3 @@ -105,12 +110,12 @@ image_back_default.png - 2 - 15 + 1 + 14 - Helvetica-Bold - 15 + Helvetica + 14 16 @@ -234,7 +239,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + @@ -242,55 +248,19 @@ 11 - - - - ImageViewController - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - UIButton - UIImageView - - - - backButton - UIButton - - - imageView - UIImageView - - - - IBProjectSource - ./Classes/ImageViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 {320, 88} {320, 88} - {5, 117} + {5, 88} 933 diff --git a/Classes/fr.lproj/InCallViewController.xib b/Classes/fr.lproj/InCallViewController.xib index 774bd64f0..e62df6703 100644 --- a/Classes/fr.lproj/InCallViewController.xib +++ b/Classes/fr.lproj/InCallViewController.xib @@ -137,7 +137,7 @@ -2147483356 - {{0, 23}, {85, 33}} + {{20, 40}, {85, 33}} _NS:9 NO @@ -439,120 +439,7 @@ 173 - - - YES - - InCallTableViewController - UITableViewController - - IBProjectSource - ./Classes/InCallTableViewController.h - - - - InCallViewController - UIViewController - - YES - - YES - callTableController - callTableView - testVideoView - videoCameraSwitch - videoGroup - videoPreview - videoView - videoWaitingForFirstImage - - - YES - InCallTableViewController - UITableView - UIView - UICamSwitch - UIView - UIView - UIView - UIActivityIndicatorView - - - - YES - - YES - callTableController - callTableView - testVideoView - videoCameraSwitch - videoGroup - videoPreview - videoView - videoWaitingForFirstImage - - - YES - - callTableController - InCallTableViewController - - - callTableView - UITableView - - - testVideoView - UIView - - - videoCameraSwitch - UICamSwitch - - - videoGroup - UIView - - - videoPreview - UIView - - - videoView - UIView - - - videoWaitingForFirstImage - UIActivityIndicatorView - - - - - IBProjectSource - ./Classes/InCallViewController.h - - - - UICamSwitch - UIButton - - preview - UIView - - - preview - - preview - UIView - - - - IBProjectSource - ./Classes/UICamSwitch.h - - - - + 0 IBCocoaTouchFramework @@ -561,7 +448,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -578,8 +465,8 @@ YES - {170, 65} - {170, 65} + {151, 51} + {151, 51} 933 diff --git a/Classes/fr.lproj/IncomingCallViewController.xib b/Classes/fr.lproj/IncomingCallViewController.xib index fe841cbf7..ef0b1ed02 100644 --- a/Classes/fr.lproj/IncomingCallViewController.xib +++ b/Classes/fr.lproj/IncomingCallViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -4832,51 +4832,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 30 - - - - IncomingCallViewController - UIViewController - - id - id - - - - onAcceptClick: - id - - - onDeclineClick: - id - - - - UILabel - UIImageView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - - IBProjectSource - ./Classes/IncomingCallViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 diff --git a/Classes/fr.lproj/WizardViewController.xib b/Classes/fr.lproj/WizardViewController.xib index 93e61e955..f72df4827 100644 --- a/Classes/fr.lproj/WizardViewController.xib +++ b/Classes/fr.lproj/WizardViewController.xib @@ -1,7 +1,7 @@ - 1296 + 1536 11E53 1938 1138.47 @@ -11,14 +11,11 @@ 933 - IBUIView - IBUIImageView - IBUILabel - IBProxyObject - IBUIActivityIndicatorView - IBUITextField - IBUIScrollView IBUIButton + IBUIActivityIndicatorView + IBUIView + IBUIScrollView + IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -42,13 +39,14 @@ - 268 + 274 {320, 394} _NS:9 YES YES + 1 IBCocoaTouchFramework NO NO @@ -65,6 +63,7 @@ _NS:9 NO + 3 Annuler @@ -73,6 +72,19 @@ 0 NO NO + 35 + 0.0 + 0.0 + 0.0 + Annuler + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA @@ -89,13 +101,13 @@ NSImage setup_cancel_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -107,6 +119,7 @@ _NS:9 NO + 4 Démarrer @@ -115,6 +128,13 @@ 0 NO NO + 35 + 0.0 + 10 + 0.0 + Démarrer + + NSImage @@ -124,8 +144,8 @@ NSImage setup_start_default.png - - + + @@ -134,6 +154,7 @@ _NS:9 NO + 5 Retour @@ -142,6 +163,13 @@ 0 NO NO + 35 + 0.0 + 10 + 0.0 + Retour + + NSImage @@ -155,8 +183,8 @@ NSImage setup_back_default.png - - + + {{0, 383}, {320, 77}} @@ -167,6 +195,7 @@ 3 MCAwAA + 2 IBCocoaTouchFramework @@ -175,12 +204,13 @@ - 292 - {{141, 212}, {37, 37}} + 301 + {{142, 211}, {37, 37}} _NS:9 NO + 7 IBCocoaTouchFramework NO YES @@ -195,6 +225,7 @@ 3 MSAwLjUAA + 6 IBCocoaTouchFramework @@ -204,844 +235,6 @@ IBCocoaTouchFramework - - - 274 - - - - 311 - {{60, 80}, {201, 129}} - - - _NS:9 - NO - - Icône de l'assistant de configuration de compte - - - IBCocoaTouchFramework - - NSImage - setup_welcome_logo.png - - - - - 282 - {{40, 290}, {240, 44}} - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Cet assistant va vous aider à utiliser votre compte SIP pour vos appels. - - 3 - MC4zMzMzMzMzMzMzAA - - - 0 - NO - 10 - 0 - 1 - - 1 - 12 - - - Helvetica - 12 - 16 - - - - {320, 394} - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - _NS:9 - NO - - Assistant de configuration de compte - - - IBCocoaTouchFramework - - NSImage - setup_title_assistant.png - - - - - 319 - {{33, 141}, {255, 50}} - - - _NS:9 - NO - - Créer un compte linphone.org - - - IBCocoaTouchFramework - 0 - 0 - NO - Crée un compte linphone.org - - - - NSImage - button_background_over.png - - - NSImage - button_background_default.png - - - 2 - 13 - - - Helvetica-Bold - 13 - 16 - - - - - 319 - {{33, 205}, {255, 50}} - - - _NS:9 - NO - - S'enregistrer sur un compte linphone.org - - - IBCocoaTouchFramework - 0 - 0 - NO - J'ai déjà un compte linphone.org - - - - - - - - - - 319 - {{33, 269}, {255, 50}} - - _NS:9 - NO - - S'enregistrer sur un compte SIP - - - IBCocoaTouchFramework - 0 - 0 - NO - J'ai déjà un compte SIP - - - - - - - - - {320, 394} - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - _NS:9 - NO - - Assistant de configuration de compte - - - IBCocoaTouchFramework - - - - - 298 - {{39, 80}, {240, 44}} - - - _NS:9 - NO - YES - 7 - 200 - NO - IBCocoaTouchFramework - Entrer votre nom d'utilisateur, votre mot de passe ainsi que votre addresse email - - - 0 - NO - 10 - 0 - 1 - - - - - - 319 - {{32, 140}, {255, 31}} - - - _NS:9 - NO - YES - 100 - - Nom d'utilisateur - - IBCocoaTouchFramework - 0 - - Nom d'utilisateur - - 3 - MAA - - 2 - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - NSImage - field_background.png - - - 1 - 14 - - - Helvetica - 14 - 16 - - - - - 319 - {{32, 185}, {255, 31}} - - - _NS:9 - NO - YES - 101 - - Mot de passe - - IBCocoaTouchFramework - 0 - - Mot de passe - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - 319 - {{32, 230}, {255, 31}} - - - _NS:9 - NO - YES - 102 - - Mot de passe à nouveau - - IBCocoaTouchFramework - 0 - - Mot de passe - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - 319 - {{32, 275}, {255, 31}} - - - _NS:9 - NO - YES - 103 - - Email - - IBCocoaTouchFramework - 0 - - Email - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - - 287 - {{33, 330}, {255, 50}} - - _NS:9 - NO - - Créer - - IBCocoaTouchFramework - 0 - 0 - NO - S'enregistrer - - - - - - 2 - 20 - - - Helvetica-Bold - 20 - 16 - - - - {320, 394} - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - _NS:9 - NO - - Assistant de configuration de compte - - - IBCocoaTouchFramework - - - - - 298 - {{40, 80}, {240, 44}} - - - _NS:9 - NO - YES - 7 - 200 - NO - IBCocoaTouchFramework - Entrez le nom d'utilisateur et le mot de passe de votre compte linphone.org - - - 0 - NO - 10 - 0 - 1 - - - - - - 287 - {{32, 330}, {255, 50}} - - _NS:9 - NO - - S'enregistrer - - IBCocoaTouchFramework - 0 - 0 - NO - S'enregistrer - - - - - - - - - - 319 - {{32, 185}, {255, 31}} - - - _NS:9 - NO - YES - 101 - - Mot de passe - - IBCocoaTouchFramework - 0 - - Mot de passe - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - 319 - {{32, 140}, {255, 31}} - - - _NS:9 - NO - YES - 100 - - Nom d'utilisateur - - IBCocoaTouchFramework - 0 - - Nom d'utilisateur - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - {320, 394} - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - _NS:9 - NO - - Assistant de configuration de compte - - - IBCocoaTouchFramework - - - - - 298 - {{40, 80}, {240, 44}} - - - _NS:9 - NO - YES - 7 - 200 - NO - IBCocoaTouchFramework - Entrez votre nom d'utilisateur, votre mot de passe ainsi que votre domaine SIP - - - 0 - NO - 10 - 0 - 1 - - - - - - 319 - {{33, 140}, {255, 31}} - - - _NS:9 - NO - YES - 100 - - Nom d'utilisateur - - IBCocoaTouchFramework - 0 - - Nom d'utilisateur - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - - 319 - {{33, 185}, {255, 31}} - - - _NS:9 - NO - YES - 101 - - Mot de passe - - IBCocoaTouchFramework - 0 - - Mot de passe - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - 319 - {{33, 230}, {255, 31}} - - - _NS:9 - NO - YES - 104 - - Domaine - - IBCocoaTouchFramework - 0 - - Domaine - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - - 287 - {{34, 330}, {255, 50}} - - _NS:9 - NO - - S'enregistrer - - IBCocoaTouchFramework - 0 - 0 - NO - S'enregistrer - - - - - - - - - {320, 394} - - _NS:9 - - IBCocoaTouchFramework - - - - 274 - - - - 311 - {{31, 50}, {258, 24}} - - - _NS:9 - NO - - Assistant de configuration de compte - - - IBCocoaTouchFramework - - - - - 298 - {{40, 80}, {240, 44}} - - - _NS:9 - NO - YES - 7 - 200 - NO - IBCocoaTouchFramework - Votre compte est crée. Vérifier vos emails pour valider votre compte. - - - 0 - NO - 10 - 0 - 1 - - - - - - 287 - {{32, 330}, {255, 50}} - - _NS:9 - NO - - Vérifier la validation - - IBCocoaTouchFramework - 0 - 0 - NO - Verifiez la validation - - - - - - - - - - -2147483329 - {{32, 185}, {255, 31}} - - - _NS:9 - NO - YES - 101 - - - - IBCocoaTouchFramework - 0 - - Mot de passe - - 3 - MAA - - - YES - 17 - - 1 - YES - IBCocoaTouchFramework - - - - - - - - -2147483329 - {{32, 140}, {255, 31}} - - - _NS:9 - NO - YES - 100 - - - - IBCocoaTouchFramework - 0 - - Nom d'utilisateur - - 3 - MAA - - - YES - 17 - - 1 - IBCocoaTouchFramework - - - - - - - {320, 394} - - _NS:9 - - IBCocoaTouchFramework - @@ -1071,43 +264,11 @@ - welcomeView + contentView - + - 28 - - - - choiceView - - - - 40 - - - - createAccountView - - - - 70 - - - - connectAccountView - - - - 71 - - - - externalAccountView - - - - 72 + 99 @@ -1119,19 +280,11 @@ - contentView + portraitView - + - 99 - - - - validateAccountView - - - - 112 + 117 @@ -1160,157 +313,6 @@ 24 - - - onCreateAccountClick: - - - 7 - - 42 - - - - onConnectAccountClick: - - - 7 - - 41 - - - - onExternalAccountClick: - - - 7 - - 43 - - - - delegate - - - - 86 - - - - delegate - - - - 87 - - - - delegate - - - - 88 - - - - onSignInExternalClick: - - - 7 - - 115 - - - - onSignInClick: - - - 7 - - 116 - - - - delegate - - - - 85 - - - - delegate - - - - 81 - - - - delegate - - - - 80 - - - - delegate - - - - 82 - - - - delegate - - - - 83 - - - - onRegisterClick: - - - 7 - - 113 - - - - delegate - - - - 84 - - - - onCheckValidationClick: - - - 7 - - 114 - - - - delegate - - - - 109 - - - - delegate - - - - 110 - @@ -1336,11 +338,17 @@ - + + + 98 + + + contentView + 14 @@ -1352,6 +360,12 @@ tabBar + + 18 + + + cancelButton + 16 @@ -1364,220 +378,6 @@ backButton - - 18 - - - cancelButton - - - 21 - - - - - - - welcomeView - - - 19 - - - iconImage - - - 22 - - - label - - - 33 - - - - - - - - - choiceView - - - 37 - - - titleImage - - - 44 - - - - - - - - - - - - createAccountView - - - 48 - - - titleImage - - - 52 - - - - - - - - - - connectAccountView - - - 53 - - - titleImage - - - 56 - - - - - - - - - - - externalAccountView - - - 57 - - - titleImage - - - 58 - - - label - - - 59 - - - usernameField - - - 60 - - - passwordField - - - 61 - - - domainField - - - 62 - - - signInButton - - - 64 - - - signInButton - - - 66 - - - passwordField - - - 67 - - - label - - - 68 - - - usernameField - - - 73 - - - label - - - 74 - - - usernameField - - - 75 - - - passwordField - - - 76 - - - password2Field - - - 77 - - - registerButton - - - 79 - - - emailField - - - 39 - - - externalAccountButton - - - 38 - - - connectAccountButton - - - 36 - - - createAccountButton - 91 @@ -1593,55 +393,6 @@ activityIndicatorView - - 98 - - - contentView - - - 101 - - - - - - - - - - validateAccountView - - - 103 - - - checkValidationButton - - - 105 - - - label - - - 107 - - - titleImage - - - 104 - - - usernameField - - - 106 - - - passwordField - @@ -1649,56 +400,17 @@ 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 - - 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 - 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 @@ -1707,140 +419,18 @@ - 116 - - - - - WizardViewController - UIViewController - - id - id - id - id - id - id - id - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onCheckValidationClick: - id - - - onConnectAccountClick: - id - - - onCreateAccountClick: - id - - - onExternalAccountClick: - id - - - onRegisterClick: - id - - - onSignInClick: - id - - - onSignInExternalClick: - id - - - onStartClick: - id - - - - UIButton - UIView - UIView - UIScrollView - UIView - UIView - UIButton - UIView - UIView - UIView - - - - backButton - UIButton - - - choiceView - UIView - - - connectAccountView - UIView - - - contentView - UIScrollView - - - createAccountView - UIView - - - externalAccountView - UIView - - - startButton - UIButton - - - validateAccountView - UIView - - - waitView - UIView - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/WizardViewController.h - - - + 117 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {550, 101} - {550, 101} - {542, 88} {320, 154} {320, 154} {320, 154} @@ -1849,8 +439,6 @@ {320, 154} {320, 154} {320, 154} - {516, 48} - {402, 258} 933 diff --git a/Classes/fr.lproj/WizardViewController~ipad.xib b/Classes/fr.lproj/WizardViewController~ipad.xib new file mode 100644 index 000000000..97bad9d75 --- /dev/null +++ b/Classes/fr.lproj/WizardViewController~ipad.xib @@ -0,0 +1,797 @@ + + + + 1536 + 11E53 + 1938 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 933 + + + IBUIButton + IBUIActivityIndicatorView + IBUIView + IBUIScrollView + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + {768, 966} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {768, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {384, 77} + + + _NS:9 + NO + 3 + + Annuler + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Annuler + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + setup_cancel_over~ipad.png + + + NSImage + setup_cancel_disabled~ipad.png + + + NSImage + setup_cancel_default~ipad.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 291 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 4 + + Démarrer + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Démarrer + + + + + NSImage + setup_start_over~ipad.png + + + NSImage + setup_start_default~ipad.png + + + + + + + -2147483357 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 5 + + Retour + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Retour + + + + + NSImage + setup_back_over~ipad.png + + + NSImage + setup_back_disabled~ipad.png + + + NSImage + setup_back_default~ipad.png + + + + + + {{0, 947}, {768, 77}} + + + _NS:9 + + 3 + MCAwAA + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{366, 492}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {768, 1024} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {768, 1024} + + _NS:9 + + IBCocoaTouchFramework + + + + 292 + + + + 274 + {1024, 711} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {1024, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {512, 77} + + + _NS:9 + NO + 3 + + Annuler + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Annuler + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + + NSImage + setup_cancel_over_landscape~ipad.png + + + NSImage + setup_cancel_disabled_landscape~ipad.png + + + NSImage + setup_cancel_default_landscape~ipad.png + + + + + + + 291 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 4 + + Démarrer + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Démarrer + + + + + NSImage + setup_start_over_landscape~ipad.png + + + NSImage + setup_start_default_landscape~ipad.png + + + + + + + -2147483357 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 5 + + Retour + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Retour + + + + + NSImage + setup_back_over_landscape~ipad.png + + + NSImage + setup_back_disabled_landscape~ipad.png + + + NSImage + setup_back_default_landscape~ipad.png + + + + + + {{0, 691}, {1024, 77}} + + + _NS:9 + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{494, 364}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {1024, 768} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {1024, 768} + + _NS:9 + + IBCocoaTouchFramework + + + + + + + view + + + + 20 + + + + startButton + + + + 26 + + + + backButton + + + + 27 + + + + contentView + + + + 99 + + + + portraitView + + + + 117 + + + + waitView + + + + 131 + + + + landscapeView + + + + 134 + + + + onStartClick: + + + 7 + + 25 + + + + onBackClick: + + + 7 + + 23 + + + + onCancelClick: + + + 7 + + 24 + + + + onCancelClick: + + + 7 + + 128 + + + + onStartClick: + + + 7 + + 126 + + + + onBackClick: + + + 7 + + 127 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 12 + + + + + + + + Portrait View + + + 98 + + + contentView + + + 14 + + + + + + + + + tabBar + + + 18 + + + cancelButton + + + 16 + + + startButton + + + 17 + + + backButton + + + 118 + + + + + + + + Landscape View + + + 119 + + + contentView + + + 120 + + + + + + + + + tabBar + + + 122 + + + cancelButton + + + 123 + + + startButton + + + 124 + + + backButton + + + 129 + + + + + + waitView + + + 130 + + + activityIndicatorView + + + 132 + + + + + + waitView + + + 133 + + + activityIndicatorView + + + 137 + + + background + + + 136 + + + background + + + + + WizardViewController + 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 + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 137 + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + + 933 + + diff --git a/Classes/fr.lproj/WizardViews.xib b/Classes/fr.lproj/WizardViews.xib new file mode 100644 index 000000000..5075b9f5e --- /dev/null +++ b/Classes/fr.lproj/WizardViews.xib @@ -0,0 +1,1667 @@ + + + + 1536 + 11E53 + 1938 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 933 + + + IBUITextField + IBUIButton + IBUIImageView + IBUIView + IBUILabel + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{60, 80}, {201, 129}} + + + _NS:9 + 1 + NO + + Icône de l'assistant de configuration de compte + + + IBCocoaTouchFramework + + NSImage + setup_welcome_logo.png + + + + + 311 + {{31, 230}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + 1 + MCAwIDAAA + + + + 3 + MC4zMzMzMzMzMzMzAA + + {-1, -1} + 0 + 10 + 1 + + 3 + 20 + + + Helvetica-Oblique + 20 + 16 + + + + + 282 + {{40, 290}, {240, 44}} + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Cet assistant va vous aider à utiliser votre compte SIP pour vos appels. + + + 0 + NO + 10 + 0 + 1 + + 1 + 12 + + + Helvetica + 12 + 16 + + + + {320, 394} + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 319 + {{33, 141}, {255, 50}} + + + _NS:9 + NO + + Créer un compte linphone.org + + + IBCocoaTouchFramework + 0 + 0 + NO + Créer un compte sur linphone.org + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + button_background_over.png + + + NSImage + button_background_default.png + + + 2 + 13 + + + Helvetica-Bold + 13 + 16 + + + + + 319 + {{33, 205}, {255, 50}} + + + _NS:9 + NO + + S'enregistrer sur un compte linphone.org + + + IBCocoaTouchFramework + 0 + 0 + NO + J'ai déjà un compte linphone.org + + + + + + + + + + + 319 + {{33, 269}, {255, 50}} + + _NS:9 + NO + + S'enregistrer sur un compte SIP + + + IBCocoaTouchFramework + 0 + 0 + NO + J'ai déjà un compte SIP + + + + + + + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 298 + {{39, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Entrez votre nom d'utilsateur, votre mot de passe ainsi que votre adresse email. + + + 0 + NO + 10 + 0 + 1 + + + + + + 319 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Nom d'utilisateur + + IBCocoaTouchFramework + 0 + + Nom d'utilisateur + + 3 + MAA + + 2 + + + 10 + + 1 + IBCocoaTouchFramework + + + NSImage + field_background.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 319 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Mot de passe + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 230}, {255, 31}} + + + _NS:9 + NO + YES + 102 + + Mot de passe à nouveau + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 275}, {255, 31}} + + + _NS:9 + NO + YES + 103 + + Email + + IBCocoaTouchFramework + 0 + + Email + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{33, 330}, {255, 50}} + + _NS:9 + NO + + S'enregistrer + + IBCocoaTouchFramework + 0 + 0 + NO + S'enregistrer + + + + + + + 2 + 20 + + + Helvetica-Bold + 20 + 16 + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 298 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Entrez votre nom d'utilisateur et votre mot de passe de votre compte linphone.org. + + + 0 + NO + 10 + 0 + 1 + + + + + + 319 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Mot de passe + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Nom d'utilisateur + + IBCocoaTouchFramework + 0 + + Nom d'utilisateur + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{32, 330}, {255, 50}} + + _NS:9 + NO + + S'enregistrer + + IBCocoaTouchFramework + 0 + 0 + NO + S'enregistrer + + + + + + + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 298 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Entrez votre nom d'utilisateur, votre mot de passe ainsi que votre domaine SIP. + + + 0 + NO + 10 + 0 + 1 + + + + + + 319 + {{33, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Nom d'utilisateur + + IBCocoaTouchFramework + 0 + + Nom d'utilisateur + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 319 + {{33, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Mot de passe + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{33, 230}, {255, 31}} + + + _NS:9 + NO + YES + 104 + + Domaine + + IBCocoaTouchFramework + 0 + + Domaine + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{34, 330}, {255, 50}} + + _NS:9 + NO + + S'enregistrer + + IBCocoaTouchFramework + 0 + 0 + NO + S'enregistrer + + + + + + + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 298 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Votre compte est crée. Vérifier vos emails pour valider votre compte. + + + 0 + NO + 10 + 0 + 1 + + + + + + -2147483329 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + -2147483329 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + + + IBCocoaTouchFramework + 0 + + Nom d'utilisateur + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{32, 330}, {255, 50}} + + _NS:9 + NO + + Vérifier la validation + + IBCocoaTouchFramework + 0 + 0 + NO + Vérifier la validation + + + + + + + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + + + + welcomeView + + + + 28 + + + + choiceView + + + + 40 + + + + createAccountView + + + + 70 + + + + connectAccountView + + + + 71 + + + + externalAccountView + + + + 72 + + + + validateAccountView + + + + 112 + + + + onCreateAccountClick: + + + 7 + + 42 + + + + onConnectAccountClick: + + + 7 + + 41 + + + + onExternalAccountClick: + + + 7 + + 43 + + + + delegate + + + + 86 + + + + delegate + + + + 87 + + + + delegate + + + + 88 + + + + onSignInExternalClick: + + + 7 + + 115 + + + + onSignInClick: + + + 7 + + 116 + + + + delegate + + + + 85 + + + + delegate + + + + 81 + + + + delegate + + + + 80 + + + + delegate + + + + 82 + + + + delegate + + + + 83 + + + + onRegisterClick: + + + 7 + + 113 + + + + delegate + + + + 84 + + + + onCheckValidationClick: + + + 7 + + 114 + + + + delegate + + + + 109 + + + + delegate + + + + 110 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 21 + + + + + + + + welcomeView + + + 19 + + + iconImage + + + 22 + + + label + + + 33 + + + + + + + + + choiceView + + + 44 + + + + + + + + + + + + createAccountView + + + 52 + + + + + + + + + + connectAccountView + + + 56 + + + + + + + + + + + externalAccountView + + + 58 + + + label + + + 59 + + + usernameField + + + 60 + + + passwordField + + + 61 + + + domainField + + + 62 + + + signInButton + + + 66 + + + passwordField + + + 67 + + + label + + + 68 + + + usernameField + + + 73 + + + label + + + 74 + + + usernameField + + + 75 + + + passwordField + + + 76 + + + password2Field + + + 77 + + + registerButton + + + 79 + + + emailField + + + 39 + + + externalAccountButton + + + 38 + + + connectAccountButton + + + 36 + + + createAccountButton + + + 101 + + + + + + + + + + validateAccountView + + + 103 + + + checkValidationButton + + + 105 + + + label + + + 104 + + + usernameField + + + 106 + + + passwordField + + + 117 + + + title + + + 122 + + + title + + + 123 + + + title + + + 124 + + + title + + + 126 + + + title + + + 64 + + + signInButton + + + 127 + + + title + + + + + WizardViewController + 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 + + 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 + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 127 + + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + WizardViewController + TPMultiLayoutViewController + + id + id + id + id + id + id + id + id + id + id + + + + onBackClick: + id + + + onCancelClick: + id + + + onCheckValidationClick: + id + + + onConnectAccountClick: + id + + + onCreateAccountClick: + id + + + onExternalAccountClick: + id + + + onRegisterClick: + id + + + onSignInClick: + id + + + onSignInExternalClick: + id + + + onStartClick: + id + + + + UIButton + UIView + UIView + UIScrollView + UIView + UIView + UIButton + UIView + UIView + UIView + + + + backButton + UIButton + + + choiceView + UIView + + + connectAccountView + UIView + + + contentView + UIScrollView + + + createAccountView + UIView + + + externalAccountView + UIView + + + startButton + UIButton + + + validateAccountView + UIView + + + waitView + UIView + + + welcomeView + UIView + + + + IBProjectSource + ./Classes/WizardViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {550, 101} + {550, 101} + {542, 88} + {179, 161} + + 933 + + diff --git a/Resources/accept_default.png b/Resources/accept_default.png index c0beb94b7..5a58ead67 100644 Binary files a/Resources/accept_default.png and b/Resources/accept_default.png differ diff --git a/Resources/accept_over.png b/Resources/accept_over.png index a867303e8..274529d6b 100644 Binary files a/Resources/accept_over.png and b/Resources/accept_over.png differ diff --git a/Resources/bubble.png b/Resources/bubble.png new file mode 100644 index 000000000..6644f4f98 Binary files /dev/null and b/Resources/bubble.png differ diff --git a/Resources/cancel_default.png b/Resources/cancel_default.png index 069a5185d..1535fe32d 100644 Binary files a/Resources/cancel_default.png and b/Resources/cancel_default.png differ diff --git a/Resources/cancel_over.png b/Resources/cancel_over.png index 8da4f454f..adc42242b 100644 Binary files a/Resources/cancel_over.png and b/Resources/cancel_over.png differ diff --git a/Resources/chat_add_default.png b/Resources/chat_add_default.png index c179581e3..14811328c 100644 Binary files a/Resources/chat_add_default.png and b/Resources/chat_add_default.png differ diff --git a/Resources/chat_add_over.png b/Resources/chat_add_over.png index 14cbb745c..e63d15a94 100644 Binary files a/Resources/chat_add_over.png and b/Resources/chat_add_over.png differ diff --git a/Resources/chat_address.png b/Resources/chat_address.png new file mode 100644 index 000000000..5825587e7 Binary files /dev/null and b/Resources/chat_address.png differ diff --git a/Resources/chat_back_default.png b/Resources/chat_back_default.png index 60412bd95..18ec0869e 100644 Binary files a/Resources/chat_back_default.png and b/Resources/chat_back_default.png differ diff --git a/Resources/chat_back_over.png b/Resources/chat_back_over.png index bbc3f4ee3..8f4563934 100644 Binary files a/Resources/chat_back_over.png and b/Resources/chat_back_over.png differ diff --git a/Resources/chat_background.9.png b/Resources/chat_background.9.png deleted file mode 100644 index 9119454eb..000000000 Binary files a/Resources/chat_background.9.png and /dev/null differ diff --git a/Resources/chat_background.9@2x.png b/Resources/chat_background.9@2x.png deleted file mode 100644 index 2094325bf..000000000 Binary files a/Resources/chat_background.9@2x.png and /dev/null differ diff --git a/Resources/chat_cancel_default.png b/Resources/chat_cancel_default.png new file mode 100644 index 000000000..b5e87a2e1 Binary files /dev/null and b/Resources/chat_cancel_default.png differ diff --git a/Resources/chat_cancel_over.png b/Resources/chat_cancel_over.png new file mode 100644 index 000000000..5d2abd3f8 Binary files /dev/null and b/Resources/chat_cancel_over.png differ diff --git a/Resources/chat_default.png b/Resources/chat_default.png index 5e9716cc8..e9c671361 100644 Binary files a/Resources/chat_default.png and b/Resources/chat_default.png differ diff --git a/Resources/chat_default_landscape~ipad.png b/Resources/chat_default_landscape~ipad.png index e9c14df72..65948d8c5 100644 Binary files a/Resources/chat_default_landscape~ipad.png and b/Resources/chat_default_landscape~ipad.png differ diff --git a/Resources/chat_default~ipad.png b/Resources/chat_default~ipad.png index 09e2acd5a..cef5de443 100644 Binary files a/Resources/chat_default~ipad.png and b/Resources/chat_default~ipad.png differ diff --git a/Resources/chat_edit_default.png b/Resources/chat_edit_default.png index 10833f922..09226ff9e 100644 Binary files a/Resources/chat_edit_default.png and b/Resources/chat_edit_default.png differ diff --git a/Resources/chat_edit_over.png b/Resources/chat_edit_over.png index 6ac8c31cb..6a800364a 100644 Binary files a/Resources/chat_edit_over.png and b/Resources/chat_edit_over.png differ diff --git a/Resources/chat_field.9.png b/Resources/chat_field.9.png deleted file mode 100644 index 0b8b3e91f..000000000 Binary files a/Resources/chat_field.9.png and /dev/null differ diff --git a/Resources/chat_field.9@2x.png b/Resources/chat_field.9@2x.png deleted file mode 100644 index d85255114..000000000 Binary files a/Resources/chat_field.9@2x.png and /dev/null differ diff --git a/Resources/chat_field.png b/Resources/chat_field.png deleted file mode 100644 index 17a1bee8d..000000000 Binary files a/Resources/chat_field.png and /dev/null differ diff --git a/Resources/chat_message_background.9.png b/Resources/chat_message_background.9.png new file mode 100644 index 000000000..90fefbc6d Binary files /dev/null and b/Resources/chat_message_background.9.png differ diff --git a/Resources/chat_message_background.9@2x.png b/Resources/chat_message_background.9@2x.png new file mode 100644 index 000000000..5fa3959b7 Binary files /dev/null and b/Resources/chat_message_background.9@2x.png differ diff --git a/Resources/chat_background.png b/Resources/chat_message_background.png similarity index 100% rename from Resources/chat_background.png rename to Resources/chat_message_background.png diff --git a/Resources/chat_message_delivered.png b/Resources/chat_message_delivered.png index e788e2b07..f8edc012d 100644 Binary files a/Resources/chat_message_delivered.png and b/Resources/chat_message_delivered.png differ diff --git a/Resources/chat_message_inprogress.png b/Resources/chat_message_inprogress.png index d2fe9da56..f725a3eb9 100644 Binary files a/Resources/chat_message_inprogress.png and b/Resources/chat_message_inprogress.png differ diff --git a/Resources/chat_message_not_delivered.png b/Resources/chat_message_not_delivered.png index e7617832b..c174df390 100644 Binary files a/Resources/chat_message_not_delivered.png and b/Resources/chat_message_not_delivered.png differ diff --git a/Resources/chat_ok_default.png b/Resources/chat_ok_default.png index ae1980c38..afc875957 100644 Binary files a/Resources/chat_ok_default.png and b/Resources/chat_ok_default.png differ diff --git a/Resources/chat_ok_over.png b/Resources/chat_ok_over.png index 514c9ca01..3b12187f2 100644 Binary files a/Resources/chat_ok_over.png and b/Resources/chat_ok_over.png differ diff --git a/Resources/chat_over.png b/Resources/chat_over.png index 1d945dbfd..415b33a84 100644 Binary files a/Resources/chat_over.png and b/Resources/chat_over.png differ diff --git a/Resources/chat_over_landscape~ipad.png b/Resources/chat_over_landscape~ipad.png index e58933823..9fa7332c2 100644 Binary files a/Resources/chat_over_landscape~ipad.png and b/Resources/chat_over_landscape~ipad.png differ diff --git a/Resources/chat_over~ipad.png b/Resources/chat_over~ipad.png index c6ff510b2..741a78bf2 100644 Binary files a/Resources/chat_over~ipad.png and b/Resources/chat_over~ipad.png differ diff --git a/Resources/chat_photo_default.png b/Resources/chat_photo_default.png new file mode 100644 index 000000000..98b1a452b Binary files /dev/null and b/Resources/chat_photo_default.png differ diff --git a/Resources/chat_photo_disabled.png b/Resources/chat_photo_disabled.png new file mode 100644 index 000000000..950f52623 Binary files /dev/null and b/Resources/chat_photo_disabled.png differ diff --git a/Resources/chat_photo_over.png b/Resources/chat_photo_over.png new file mode 100644 index 000000000..c8b9783f7 Binary files /dev/null and b/Resources/chat_photo_over.png differ diff --git a/Resources/chat_progressbar_background.png b/Resources/chat_progressbar_background.png new file mode 100644 index 000000000..abd966e86 Binary files /dev/null and b/Resources/chat_progressbar_background.png differ diff --git a/Resources/chat_selected.png b/Resources/chat_selected.png index 2638c0c10..a7fff16a8 100644 Binary files a/Resources/chat_selected.png and b/Resources/chat_selected.png differ diff --git a/Resources/chat_selected_landscape~ipad.png b/Resources/chat_selected_landscape~ipad.png index 68df46139..9b38ab106 100644 Binary files a/Resources/chat_selected_landscape~ipad.png and b/Resources/chat_selected_landscape~ipad.png differ diff --git a/Resources/chat_selected~ipad.png b/Resources/chat_selected~ipad.png index ac50aa1f7..c75a19e0f 100644 Binary files a/Resources/chat_selected~ipad.png and b/Resources/chat_selected~ipad.png differ diff --git a/Resources/chat_send_default.png b/Resources/chat_send_default.png index c4f4dfd1f..2ded0fc46 100644 Binary files a/Resources/chat_send_default.png and b/Resources/chat_send_default.png differ diff --git a/Resources/chat_send_disabled.png b/Resources/chat_send_disabled.png index 237317251..2efe5869f 100644 Binary files a/Resources/chat_send_disabled.png and b/Resources/chat_send_disabled.png differ diff --git a/Resources/chat_send_over.png b/Resources/chat_send_over.png index 0bf29fffb..ef07e43ce 100644 Binary files a/Resources/chat_send_over.png and b/Resources/chat_send_over.png differ diff --git a/Resources/contact_back_default.png b/Resources/contact_back_default.png index 331e5b494..18ec0869e 100644 Binary files a/Resources/contact_back_default.png and b/Resources/contact_back_default.png differ diff --git a/Resources/contact_back_over.png b/Resources/contact_back_over.png index 4d8d8ca64..8f4563934 100644 Binary files a/Resources/contact_back_over.png and b/Resources/contact_back_over.png differ diff --git a/Resources/contact_cancel_default.png b/Resources/contact_cancel_default.png index d6714b155..80dd44944 100644 Binary files a/Resources/contact_cancel_default.png and b/Resources/contact_cancel_default.png differ diff --git a/Resources/contact_cancel_over.png b/Resources/contact_cancel_over.png index 256e9b0cd..9cfebd8d6 100644 Binary files a/Resources/contact_cancel_over.png and b/Resources/contact_cancel_over.png differ diff --git a/Resources/contact_edit_default.png b/Resources/contact_edit_default.png index aa3289317..09226ff9e 100644 Binary files a/Resources/contact_edit_default.png and b/Resources/contact_edit_default.png differ diff --git a/Resources/contact_edit_over.png b/Resources/contact_edit_over.png index 8cc680e16..6a800364a 100644 Binary files a/Resources/contact_edit_over.png and b/Resources/contact_edit_over.png differ diff --git a/Resources/contact_ok_default.png b/Resources/contact_ok_default.png index 121961e6a..afc875957 100644 Binary files a/Resources/contact_ok_default.png and b/Resources/contact_ok_default.png differ diff --git a/Resources/contact_ok_disabled.png b/Resources/contact_ok_disabled.png index fa7e9fcb8..5e72c3f55 100644 Binary files a/Resources/contact_ok_disabled.png and b/Resources/contact_ok_disabled.png differ diff --git a/Resources/contact_ok_over.png b/Resources/contact_ok_over.png index 4fe6248f8..3b12187f2 100644 Binary files a/Resources/contact_ok_over.png and b/Resources/contact_ok_over.png differ diff --git a/Resources/contacts_add_default.png b/Resources/contacts_add_default.png index 1126d63f0..09936c840 100644 Binary files a/Resources/contacts_add_default.png and b/Resources/contacts_add_default.png differ diff --git a/Resources/contacts_add_over.png b/Resources/contacts_add_over.png index a20ead0f5..38cc680e1 100644 Binary files a/Resources/contacts_add_over.png and b/Resources/contacts_add_over.png differ diff --git a/Resources/contacts_all_default.png b/Resources/contacts_all_default.png index d062ce11c..2aceb2b41 100644 Binary files a/Resources/contacts_all_default.png and b/Resources/contacts_all_default.png differ diff --git a/Resources/contacts_all_selected.png b/Resources/contacts_all_selected.png index 18e7eebd4..d5dd11195 100644 Binary files a/Resources/contacts_all_selected.png and b/Resources/contacts_all_selected.png differ diff --git a/Resources/contacts_back_default.png b/Resources/contacts_back_default.png index 416ecfa4b..55a03444d 100644 Binary files a/Resources/contacts_back_default.png and b/Resources/contacts_back_default.png differ diff --git a/Resources/contacts_back_over.png b/Resources/contacts_back_over.png index dc9baad61..eccbad3cd 100644 Binary files a/Resources/contacts_back_over.png and b/Resources/contacts_back_over.png differ diff --git a/Resources/contacts_default.png b/Resources/contacts_default.png index 88039d6c5..fb2146a91 100644 Binary files a/Resources/contacts_default.png and b/Resources/contacts_default.png differ diff --git a/Resources/contacts_default_landscape~ipad.png b/Resources/contacts_default_landscape~ipad.png index c2a18a84f..65bdf1ac0 100644 Binary files a/Resources/contacts_default_landscape~ipad.png and b/Resources/contacts_default_landscape~ipad.png differ diff --git a/Resources/contacts_default~ipad.png b/Resources/contacts_default~ipad.png index 4c754a33b..804169f9e 100644 Binary files a/Resources/contacts_default~ipad.png and b/Resources/contacts_default~ipad.png differ diff --git a/Resources/contacts_linphone_default.png b/Resources/contacts_linphone_default.png index 0a75d15f0..c4a013fd5 100644 Binary files a/Resources/contacts_linphone_default.png and b/Resources/contacts_linphone_default.png differ diff --git a/Resources/contacts_linphone_selected.png b/Resources/contacts_linphone_selected.png index 9d240afeb..eff04f247 100644 Binary files a/Resources/contacts_linphone_selected.png and b/Resources/contacts_linphone_selected.png differ diff --git a/Resources/contacts_over.png b/Resources/contacts_over.png index 1cf7fd7ab..7e0f661ba 100644 Binary files a/Resources/contacts_over.png and b/Resources/contacts_over.png differ diff --git a/Resources/contacts_over_landscape~ipad.png b/Resources/contacts_over_landscape~ipad.png index d9fa24f10..9362d7c69 100644 Binary files a/Resources/contacts_over_landscape~ipad.png and b/Resources/contacts_over_landscape~ipad.png differ diff --git a/Resources/contacts_over~ipad.png b/Resources/contacts_over~ipad.png index af9886500..0dbf32da5 100644 Binary files a/Resources/contacts_over~ipad.png and b/Resources/contacts_over~ipad.png differ diff --git a/Resources/contacts_selected.png b/Resources/contacts_selected.png index 002335b08..04f579806 100644 Binary files a/Resources/contacts_selected.png and b/Resources/contacts_selected.png differ diff --git a/Resources/contacts_selected_landscape~ipad.png b/Resources/contacts_selected_landscape~ipad.png index a392db350..96e4f90da 100644 Binary files a/Resources/contacts_selected_landscape~ipad.png and b/Resources/contacts_selected_landscape~ipad.png differ diff --git a/Resources/contacts_selected~ipad.png b/Resources/contacts_selected~ipad.png index 397f71f8c..575088e31 100644 Binary files a/Resources/contacts_selected~ipad.png and b/Resources/contacts_selected~ipad.png differ diff --git a/Resources/decline_default.png b/Resources/decline_default.png index 9b06bc3e7..4e4fbc0e5 100644 Binary files a/Resources/decline_default.png and b/Resources/decline_default.png differ diff --git a/Resources/decline_over.png b/Resources/decline_over.png index aa21a54e7..a5460064d 100644 Binary files a/Resources/decline_over.png and b/Resources/decline_over.png differ diff --git a/Resources/dialer_address_background_landscape~ipad.png b/Resources/dialer_address_background_landscape~ipad.png index 21bc36a51..c5fc9c755 100644 Binary files a/Resources/dialer_address_background_landscape~ipad.png and b/Resources/dialer_address_background_landscape~ipad.png differ diff --git a/Resources/dialer_address_background~ipad.png b/Resources/dialer_address_background~ipad.png index 302d82d5d..489781e12 100644 Binary files a/Resources/dialer_address_background~ipad.png and b/Resources/dialer_address_background~ipad.png differ diff --git a/Resources/dialer_alt_disabled.png b/Resources/dialer_alt_disabled.png new file mode 100644 index 000000000..d85d7fa76 Binary files /dev/null and b/Resources/dialer_alt_disabled.png differ diff --git a/Resources/dialer_alt_disabled_landscape.png b/Resources/dialer_alt_disabled_landscape.png new file mode 100644 index 000000000..00a72ac47 Binary files /dev/null and b/Resources/dialer_alt_disabled_landscape.png differ diff --git a/Resources/dialer_alt_disabled_landscape~ipad.png b/Resources/dialer_alt_disabled_landscape~ipad.png new file mode 100644 index 000000000..24441f3fe Binary files /dev/null and b/Resources/dialer_alt_disabled_landscape~ipad.png differ diff --git a/Resources/dialer_alt_disabled~ipad.png b/Resources/dialer_alt_disabled~ipad.png new file mode 100644 index 000000000..dc5c084d2 Binary files /dev/null and b/Resources/dialer_alt_disabled~ipad.png differ diff --git a/Resources/dialer_default.png b/Resources/dialer_default.png index b23fcbb41..2fc61b3af 100644 Binary files a/Resources/dialer_default.png and b/Resources/dialer_default.png differ diff --git a/Resources/dialer_over.png b/Resources/dialer_over.png index 3727c5fba..7b718469f 100644 Binary files a/Resources/dialer_over.png and b/Resources/dialer_over.png differ diff --git a/Resources/dialer_selected.png b/Resources/dialer_selected.png index 5883398d2..80cd520f5 100644 Binary files a/Resources/dialer_selected.png and b/Resources/dialer_selected.png differ diff --git a/Resources/form_invalid.png b/Resources/form_invalid.png new file mode 100644 index 000000000..c174df390 Binary files /dev/null and b/Resources/form_invalid.png differ diff --git a/Resources/form_valid.png b/Resources/form_valid.png new file mode 100644 index 000000000..f8edc012d Binary files /dev/null and b/Resources/form_valid.png differ diff --git a/Resources/header_conference.png b/Resources/header_conference.png index 4e37e2512..47ec0a043 100644 Binary files a/Resources/header_conference.png and b/Resources/header_conference.png differ diff --git a/Resources/header_incoming.png b/Resources/header_incoming.png index caacf5d18..7214ac413 100644 Binary files a/Resources/header_incoming.png and b/Resources/header_incoming.png differ diff --git a/Resources/history_all_default.png b/Resources/history_all_default.png index 9790cc945..d063f0242 100644 Binary files a/Resources/history_all_default.png and b/Resources/history_all_default.png differ diff --git a/Resources/history_all_selected.png b/Resources/history_all_selected.png index fe9f61f2f..927d1228f 100644 Binary files a/Resources/history_all_selected.png and b/Resources/history_all_selected.png differ diff --git a/Resources/history_default.png b/Resources/history_default.png index 866a25a77..92a298d2f 100644 Binary files a/Resources/history_default.png and b/Resources/history_default.png differ diff --git a/Resources/history_default_landscape~ipad.png b/Resources/history_default_landscape~ipad.png index 62eaaab9f..df85f226d 100644 Binary files a/Resources/history_default_landscape~ipad.png and b/Resources/history_default_landscape~ipad.png differ diff --git a/Resources/history_default~ipad.png b/Resources/history_default~ipad.png index ad31bf9b8..7fe690c29 100644 Binary files a/Resources/history_default~ipad.png and b/Resources/history_default~ipad.png differ diff --git a/Resources/history_delete_default.png b/Resources/history_delete_default.png new file mode 100644 index 000000000..dce0ad0b3 Binary files /dev/null and b/Resources/history_delete_default.png differ diff --git a/Resources/history_delete_over.png b/Resources/history_delete_over.png new file mode 100644 index 000000000..b8d99e352 Binary files /dev/null and b/Resources/history_delete_over.png differ diff --git a/Resources/history_details_add_default.png b/Resources/history_details_add_default.png index 92924be3b..6ce83f41a 100644 Binary files a/Resources/history_details_add_default.png and b/Resources/history_details_add_default.png differ diff --git a/Resources/history_details_add_over.png b/Resources/history_details_add_over.png index 9363e5ba1..3fb6320f7 100644 Binary files a/Resources/history_details_add_over.png and b/Resources/history_details_add_over.png differ diff --git a/Resources/history_details_back_default.png b/Resources/history_details_back_default.png index 932043c49..18ec0869e 100644 Binary files a/Resources/history_details_back_default.png and b/Resources/history_details_back_default.png differ diff --git a/Resources/history_details_back_over.png b/Resources/history_details_back_over.png index 6c9f1a5fa..8f4563934 100644 Binary files a/Resources/history_details_back_over.png and b/Resources/history_details_back_over.png differ diff --git a/Resources/history_edit_default.png b/Resources/history_edit_default.png index 05e18afdb..9cb5d942f 100644 Binary files a/Resources/history_edit_default.png and b/Resources/history_edit_default.png differ diff --git a/Resources/history_edit_over.png b/Resources/history_edit_over.png index d1c7d156b..7b29cfb5b 100644 Binary files a/Resources/history_edit_over.png and b/Resources/history_edit_over.png differ diff --git a/Resources/history_missed_default.png b/Resources/history_missed_default.png index cb413d997..4cc4a5c96 100644 Binary files a/Resources/history_missed_default.png and b/Resources/history_missed_default.png differ diff --git a/Resources/history_missed_selected.png b/Resources/history_missed_selected.png index 0f2f99b4e..498e62c22 100644 Binary files a/Resources/history_missed_selected.png and b/Resources/history_missed_selected.png differ diff --git a/Resources/history_ok_default.png b/Resources/history_ok_default.png index 6b6f4e80f..4b402b50c 100644 Binary files a/Resources/history_ok_default.png and b/Resources/history_ok_default.png differ diff --git a/Resources/history_ok_over.png b/Resources/history_ok_over.png index deebf0507..325d61378 100644 Binary files a/Resources/history_ok_over.png and b/Resources/history_ok_over.png differ diff --git a/Resources/history_over.png b/Resources/history_over.png index fbcaec907..1d2ddf91c 100644 Binary files a/Resources/history_over.png and b/Resources/history_over.png differ diff --git a/Resources/history_over_landscape~ipad.png b/Resources/history_over_landscape~ipad.png index bdd2b7ea8..f7a79f397 100644 Binary files a/Resources/history_over_landscape~ipad.png and b/Resources/history_over_landscape~ipad.png differ diff --git a/Resources/history_over~ipad.png b/Resources/history_over~ipad.png index 54944e122..6a483b1f6 100644 Binary files a/Resources/history_over~ipad.png and b/Resources/history_over~ipad.png differ diff --git a/Resources/history_selected.png b/Resources/history_selected.png index b672b21f3..bf1a0867c 100644 Binary files a/Resources/history_selected.png and b/Resources/history_selected.png differ diff --git a/Resources/history_selected_landscape~ipad.png b/Resources/history_selected_landscape~ipad.png index d45616b41..d21790090 100644 Binary files a/Resources/history_selected_landscape~ipad.png and b/Resources/history_selected_landscape~ipad.png differ diff --git a/Resources/history_selected~ipad.png b/Resources/history_selected~ipad.png index e880fb325..751866a9f 100644 Binary files a/Resources/history_selected~ipad.png and b/Resources/history_selected~ipad.png differ diff --git a/Resources/image_back_default.png b/Resources/image_back_default.png index 60412bd95..18ec0869e 100644 Binary files a/Resources/image_back_default.png and b/Resources/image_back_default.png differ diff --git a/Resources/image_back_over.png b/Resources/image_back_over.png index bbc3f4ee3..8f4563934 100644 Binary files a/Resources/image_back_over.png and b/Resources/image_back_over.png differ diff --git a/Resources/linphone-splashscreen.png b/Resources/linphone-splashscreen.png new file mode 100644 index 000000000..1ec650be8 Binary files /dev/null and b/Resources/linphone-splashscreen.png differ diff --git a/Resources/linphone-splashscreen@2x.png b/Resources/linphone-splashscreen@2x.png new file mode 100644 index 000000000..ce8263422 Binary files /dev/null and b/Resources/linphone-splashscreen@2x.png differ diff --git a/Resources/logo_linphone_trame_background.png b/Resources/logo_linphone_trame_background.png new file mode 100644 index 000000000..749d70f30 Binary files /dev/null and b/Resources/logo_linphone_trame_background.png differ diff --git a/Resources/micro_off_default.png b/Resources/micro_off_default.png index 2ec3be550..a877f654c 100644 Binary files a/Resources/micro_off_default.png and b/Resources/micro_off_default.png differ diff --git a/Resources/micro_off_default_landscape.png b/Resources/micro_off_default_landscape.png index abb1dcef6..297071951 100644 Binary files a/Resources/micro_off_default_landscape.png and b/Resources/micro_off_default_landscape.png differ diff --git a/Resources/micro_off_default_landscape~ipad.png b/Resources/micro_off_default_landscape~ipad.png index 6512dee9d..45a5e3686 100644 Binary files a/Resources/micro_off_default_landscape~ipad.png and b/Resources/micro_off_default_landscape~ipad.png differ diff --git a/Resources/micro_off_default~ipad.png b/Resources/micro_off_default~ipad.png index 6512dee9d..33e86a703 100644 Binary files a/Resources/micro_off_default~ipad.png and b/Resources/micro_off_default~ipad.png differ diff --git a/Resources/micro_off_disabled.png b/Resources/micro_off_disabled.png index 39f55197e..4baf0de70 100644 Binary files a/Resources/micro_off_disabled.png and b/Resources/micro_off_disabled.png differ diff --git a/Resources/micro_off_disabled_landscape.png b/Resources/micro_off_disabled_landscape.png index fadfcbafa..ef133210a 100644 Binary files a/Resources/micro_off_disabled_landscape.png and b/Resources/micro_off_disabled_landscape.png differ diff --git a/Resources/micro_off_disabled_landscape~ipad.png b/Resources/micro_off_disabled_landscape~ipad.png index 4e69a2135..1a890b399 100644 Binary files a/Resources/micro_off_disabled_landscape~ipad.png and b/Resources/micro_off_disabled_landscape~ipad.png differ diff --git a/Resources/micro_off_disabled~ipad.png b/Resources/micro_off_disabled~ipad.png index 4e69a2135..546155e91 100644 Binary files a/Resources/micro_off_disabled~ipad.png and b/Resources/micro_off_disabled~ipad.png differ diff --git a/Resources/micro_off_over.png b/Resources/micro_off_over.png index 7c898d75d..8663a11ef 100644 Binary files a/Resources/micro_off_over.png and b/Resources/micro_off_over.png differ diff --git a/Resources/micro_off_over_landscape.png b/Resources/micro_off_over_landscape.png index d19bfcad5..772d734fb 100644 Binary files a/Resources/micro_off_over_landscape.png and b/Resources/micro_off_over_landscape.png differ diff --git a/Resources/micro_off_over_landscape~ipad.png b/Resources/micro_off_over_landscape~ipad.png index b9230d6e4..747f22b75 100644 Binary files a/Resources/micro_off_over_landscape~ipad.png and b/Resources/micro_off_over_landscape~ipad.png differ diff --git a/Resources/micro_off_over~ipad.png b/Resources/micro_off_over~ipad.png index b9230d6e4..704a59e1e 100644 Binary files a/Resources/micro_off_over~ipad.png and b/Resources/micro_off_over~ipad.png differ diff --git a/Resources/micro_on_default.png b/Resources/micro_on_default.png index ca63b44ff..8c73609fe 100644 Binary files a/Resources/micro_on_default.png and b/Resources/micro_on_default.png differ diff --git a/Resources/micro_on_default_landscape.png b/Resources/micro_on_default_landscape.png index 2a551232d..0f8be95ea 100644 Binary files a/Resources/micro_on_default_landscape.png and b/Resources/micro_on_default_landscape.png differ diff --git a/Resources/micro_on_default_landscape~ipad.png b/Resources/micro_on_default_landscape~ipad.png index e1677a4fd..29cdd5723 100644 Binary files a/Resources/micro_on_default_landscape~ipad.png and b/Resources/micro_on_default_landscape~ipad.png differ diff --git a/Resources/micro_on_default~ipad.png b/Resources/micro_on_default~ipad.png index e1677a4fd..4c99b34d4 100644 Binary files a/Resources/micro_on_default~ipad.png and b/Resources/micro_on_default~ipad.png differ diff --git a/Resources/micro_on_disabled.png b/Resources/micro_on_disabled.png index 87fee6aa1..35fb4bfeb 100644 Binary files a/Resources/micro_on_disabled.png and b/Resources/micro_on_disabled.png differ diff --git a/Resources/micro_on_disabled_landscape.png b/Resources/micro_on_disabled_landscape.png index d3632a238..9165841a8 100644 Binary files a/Resources/micro_on_disabled_landscape.png and b/Resources/micro_on_disabled_landscape.png differ diff --git a/Resources/micro_on_disabled_landscape~ipad.png b/Resources/micro_on_disabled_landscape~ipad.png index f8e3c49c3..9221d6277 100644 Binary files a/Resources/micro_on_disabled_landscape~ipad.png and b/Resources/micro_on_disabled_landscape~ipad.png differ diff --git a/Resources/micro_on_disabled~ipad.png b/Resources/micro_on_disabled~ipad.png index f8e3c49c3..762b400fd 100644 Binary files a/Resources/micro_on_disabled~ipad.png and b/Resources/micro_on_disabled~ipad.png differ diff --git a/Resources/micro_on_over.png b/Resources/micro_on_over.png index fd9d00a84..96f645d52 100644 Binary files a/Resources/micro_on_over.png and b/Resources/micro_on_over.png differ diff --git a/Resources/micro_on_over_landscape.png b/Resources/micro_on_over_landscape.png index bafe54db7..8afa26cee 100644 Binary files a/Resources/micro_on_over_landscape.png and b/Resources/micro_on_over_landscape.png differ diff --git a/Resources/micro_on_over_landscape~ipad.png b/Resources/micro_on_over_landscape~ipad.png index 585fb8aa3..1f47f646c 100644 Binary files a/Resources/micro_on_over_landscape~ipad.png and b/Resources/micro_on_over_landscape~ipad.png differ diff --git a/Resources/micro_on_over~ipad.png b/Resources/micro_on_over~ipad.png index 585fb8aa3..975e12123 100644 Binary files a/Resources/micro_on_over~ipad.png and b/Resources/micro_on_over~ipad.png differ diff --git a/Resources/options_add_default.png b/Resources/options_add_default.png index e8ca669f5..59ea816e7 100644 Binary files a/Resources/options_add_default.png and b/Resources/options_add_default.png differ diff --git a/Resources/options_add_default_landscape.png b/Resources/options_add_default_landscape.png index 9da363493..f85f44628 100644 Binary files a/Resources/options_add_default_landscape.png and b/Resources/options_add_default_landscape.png differ diff --git a/Resources/options_add_default_landscape~ipad.png b/Resources/options_add_default_landscape~ipad.png index f3aa84165..16e482c1a 100644 Binary files a/Resources/options_add_default_landscape~ipad.png and b/Resources/options_add_default_landscape~ipad.png differ diff --git a/Resources/options_add_default~ipad.png b/Resources/options_add_default~ipad.png index f3aa84165..13406878a 100644 Binary files a/Resources/options_add_default~ipad.png and b/Resources/options_add_default~ipad.png differ diff --git a/Resources/options_add_disabled.png b/Resources/options_add_disabled.png index aa7b03b4f..a8d6f75d8 100644 Binary files a/Resources/options_add_disabled.png and b/Resources/options_add_disabled.png differ diff --git a/Resources/options_add_disabled_landscape.png b/Resources/options_add_disabled_landscape.png index bc55521e0..2b9997731 100644 Binary files a/Resources/options_add_disabled_landscape.png and b/Resources/options_add_disabled_landscape.png differ diff --git a/Resources/options_add_disabled_landscape~ipad.png b/Resources/options_add_disabled_landscape~ipad.png index 60874af11..d515be37f 100644 Binary files a/Resources/options_add_disabled_landscape~ipad.png and b/Resources/options_add_disabled_landscape~ipad.png differ diff --git a/Resources/options_add_disabled~ipad.png b/Resources/options_add_disabled~ipad.png index 60874af11..48323660d 100644 Binary files a/Resources/options_add_disabled~ipad.png and b/Resources/options_add_disabled~ipad.png differ diff --git a/Resources/options_add_over.png b/Resources/options_add_over.png index cea0c0d00..06ec439f1 100644 Binary files a/Resources/options_add_over.png and b/Resources/options_add_over.png differ diff --git a/Resources/options_add_over_landscape.png b/Resources/options_add_over_landscape.png index d0e991647..eddae5444 100644 Binary files a/Resources/options_add_over_landscape.png and b/Resources/options_add_over_landscape.png differ diff --git a/Resources/options_add_over_landscape~ipad.png b/Resources/options_add_over_landscape~ipad.png index 59caf0945..44b79256d 100644 Binary files a/Resources/options_add_over_landscape~ipad.png and b/Resources/options_add_over_landscape~ipad.png differ diff --git a/Resources/options_add_over~ipad.png b/Resources/options_add_over~ipad.png index 59caf0945..511a72640 100644 Binary files a/Resources/options_add_over~ipad.png and b/Resources/options_add_over~ipad.png differ diff --git a/Resources/options_default.png b/Resources/options_default.png index 2a2c832e6..cdec05400 100644 Binary files a/Resources/options_default.png and b/Resources/options_default.png differ diff --git a/Resources/options_default_landscape.png b/Resources/options_default_landscape.png index 7667b014a..e835f0829 100644 Binary files a/Resources/options_default_landscape.png and b/Resources/options_default_landscape.png differ diff --git a/Resources/options_default_landscape~ipad.png b/Resources/options_default_landscape~ipad.png index 891847836..77379da0e 100644 Binary files a/Resources/options_default_landscape~ipad.png and b/Resources/options_default_landscape~ipad.png differ diff --git a/Resources/options_default~ipad.png b/Resources/options_default~ipad.png index 891847836..7e765d8cc 100644 Binary files a/Resources/options_default~ipad.png and b/Resources/options_default~ipad.png differ diff --git a/Resources/options_disabled.png b/Resources/options_disabled.png index 3f5a32482..6199d95b9 100644 Binary files a/Resources/options_disabled.png and b/Resources/options_disabled.png differ diff --git a/Resources/options_disabled_landscape.png b/Resources/options_disabled_landscape.png index ba6b19454..25bee610a 100644 Binary files a/Resources/options_disabled_landscape.png and b/Resources/options_disabled_landscape.png differ diff --git a/Resources/options_disabled_landscape~ipad.png b/Resources/options_disabled_landscape~ipad.png index 9927bc551..c56fae1ca 100644 Binary files a/Resources/options_disabled_landscape~ipad.png and b/Resources/options_disabled_landscape~ipad.png differ diff --git a/Resources/options_disabled~ipad.png b/Resources/options_disabled~ipad.png index 9927bc551..20e8abe6e 100644 Binary files a/Resources/options_disabled~ipad.png and b/Resources/options_disabled~ipad.png differ diff --git a/Resources/options_over.png b/Resources/options_over.png index 4c33e642b..4000c7b53 100644 Binary files a/Resources/options_over.png and b/Resources/options_over.png differ diff --git a/Resources/options_over_landscape.png b/Resources/options_over_landscape.png index 56f739db5..dc2bb8404 100644 Binary files a/Resources/options_over_landscape.png and b/Resources/options_over_landscape.png differ diff --git a/Resources/options_over_landscape~ipad.png b/Resources/options_over_landscape~ipad.png index e69476a04..b32bd7274 100644 Binary files a/Resources/options_over_landscape~ipad.png and b/Resources/options_over_landscape~ipad.png differ diff --git a/Resources/options_over~ipad.png b/Resources/options_over~ipad.png index e69476a04..35605bd12 100644 Binary files a/Resources/options_over~ipad.png and b/Resources/options_over~ipad.png differ diff --git a/Resources/options_selected.png b/Resources/options_selected.png index dda796353..ab105de64 100644 Binary files a/Resources/options_selected.png and b/Resources/options_selected.png differ diff --git a/Resources/options_selected_landscape.png b/Resources/options_selected_landscape.png index d25a73d2d..4de39f880 100644 Binary files a/Resources/options_selected_landscape.png and b/Resources/options_selected_landscape.png differ diff --git a/Resources/options_selected_landscape~ipad.png b/Resources/options_selected_landscape~ipad.png index 69e81213d..4dde52145 100644 Binary files a/Resources/options_selected_landscape~ipad.png and b/Resources/options_selected_landscape~ipad.png differ diff --git a/Resources/options_selected~ipad.png b/Resources/options_selected~ipad.png index 69e81213d..09ffcfe12 100644 Binary files a/Resources/options_selected~ipad.png and b/Resources/options_selected~ipad.png differ diff --git a/Resources/options_transfer_default.png b/Resources/options_transfer_default.png index 0a4e18919..409193c81 100644 Binary files a/Resources/options_transfer_default.png and b/Resources/options_transfer_default.png differ diff --git a/Resources/options_transfer_default_landscape.png b/Resources/options_transfer_default_landscape.png index 9ba3017f4..3c9ad5cb1 100644 Binary files a/Resources/options_transfer_default_landscape.png and b/Resources/options_transfer_default_landscape.png differ diff --git a/Resources/options_transfer_default_landscape~ipad.png b/Resources/options_transfer_default_landscape~ipad.png index 113291d4f..17d2efa75 100644 Binary files a/Resources/options_transfer_default_landscape~ipad.png and b/Resources/options_transfer_default_landscape~ipad.png differ diff --git a/Resources/options_transfer_default~ipad.png b/Resources/options_transfer_default~ipad.png index 113291d4f..35387e901 100644 Binary files a/Resources/options_transfer_default~ipad.png and b/Resources/options_transfer_default~ipad.png differ diff --git a/Resources/options_transfer_disabled.png b/Resources/options_transfer_disabled.png index 9da015b6a..6e8cd79a2 100644 Binary files a/Resources/options_transfer_disabled.png and b/Resources/options_transfer_disabled.png differ diff --git a/Resources/options_transfer_disabled_landscape.png b/Resources/options_transfer_disabled_landscape.png index 179f16614..95fea9ef3 100644 Binary files a/Resources/options_transfer_disabled_landscape.png and b/Resources/options_transfer_disabled_landscape.png differ diff --git a/Resources/options_transfer_disabled_landscape~ipad.png b/Resources/options_transfer_disabled_landscape~ipad.png index 322d744c4..10aba5a24 100644 Binary files a/Resources/options_transfer_disabled_landscape~ipad.png and b/Resources/options_transfer_disabled_landscape~ipad.png differ diff --git a/Resources/options_transfer_disabled~ipad.png b/Resources/options_transfer_disabled~ipad.png index 322d744c4..b39220651 100644 Binary files a/Resources/options_transfer_disabled~ipad.png and b/Resources/options_transfer_disabled~ipad.png differ diff --git a/Resources/options_transfer_over.png b/Resources/options_transfer_over.png index a97416089..ea07e8d7f 100644 Binary files a/Resources/options_transfer_over.png and b/Resources/options_transfer_over.png differ diff --git a/Resources/options_transfer_over_landscape.png b/Resources/options_transfer_over_landscape.png index 1f5950fca..4e13b8a6a 100644 Binary files a/Resources/options_transfer_over_landscape.png and b/Resources/options_transfer_over_landscape.png differ diff --git a/Resources/options_transfer_over_landscape~ipad.png b/Resources/options_transfer_over_landscape~ipad.png index 31bb2a738..c90279aa6 100644 Binary files a/Resources/options_transfer_over_landscape~ipad.png and b/Resources/options_transfer_over_landscape~ipad.png differ diff --git a/Resources/options_transfer_over~ipad.png b/Resources/options_transfer_over~ipad.png index 31bb2a738..96c5fb1ca 100644 Binary files a/Resources/options_transfer_over~ipad.png and b/Resources/options_transfer_over~ipad.png differ diff --git a/Resources/settings_default.png b/Resources/settings_default.png index ecf4ab11b..8acb31e7c 100644 Binary files a/Resources/settings_default.png and b/Resources/settings_default.png differ diff --git a/Resources/settings_default_landscape~ipad.png b/Resources/settings_default_landscape~ipad.png index b19d0ba3b..70e72c43d 100644 Binary files a/Resources/settings_default_landscape~ipad.png and b/Resources/settings_default_landscape~ipad.png differ diff --git a/Resources/settings_default~ipad.png b/Resources/settings_default~ipad.png index 0000e2465..da8f27fe7 100644 Binary files a/Resources/settings_default~ipad.png and b/Resources/settings_default~ipad.png differ diff --git a/Resources/settings_over.png b/Resources/settings_over.png index 37339b4af..c73168440 100644 Binary files a/Resources/settings_over.png and b/Resources/settings_over.png differ diff --git a/Resources/settings_over_landscape~ipad.png b/Resources/settings_over_landscape~ipad.png index 62cf3141d..0dbd9da35 100644 Binary files a/Resources/settings_over_landscape~ipad.png and b/Resources/settings_over_landscape~ipad.png differ diff --git a/Resources/settings_over~ipad.png b/Resources/settings_over~ipad.png index 0e93432ee..ffa58e3e6 100644 Binary files a/Resources/settings_over~ipad.png and b/Resources/settings_over~ipad.png differ diff --git a/Resources/settings_selected.png b/Resources/settings_selected.png index 1befba3bf..6070b2c09 100644 Binary files a/Resources/settings_selected.png and b/Resources/settings_selected.png differ diff --git a/Resources/settings_selected_landscape~ipad.png b/Resources/settings_selected_landscape~ipad.png index de988d97a..0c374fb14 100644 Binary files a/Resources/settings_selected_landscape~ipad.png and b/Resources/settings_selected_landscape~ipad.png differ diff --git a/Resources/settings_selected~ipad.png b/Resources/settings_selected~ipad.png index b1f1a1092..8918116e5 100644 Binary files a/Resources/settings_selected~ipad.png and b/Resources/settings_selected~ipad.png differ diff --git a/Resources/setup_back_default.png b/Resources/setup_back_default.png index d71825b83..ddb63847f 100644 Binary files a/Resources/setup_back_default.png and b/Resources/setup_back_default.png differ diff --git a/Resources/setup_back_default_landscape~ipad.png b/Resources/setup_back_default_landscape~ipad.png new file mode 100644 index 000000000..24df95c3b Binary files /dev/null and b/Resources/setup_back_default_landscape~ipad.png differ diff --git a/Resources/setup_back_default~ipad.png b/Resources/setup_back_default~ipad.png new file mode 100644 index 000000000..8da3a3da0 Binary files /dev/null and b/Resources/setup_back_default~ipad.png differ diff --git a/Resources/setup_back_disabled.png b/Resources/setup_back_disabled.png index 805084589..bbc23f190 100644 Binary files a/Resources/setup_back_disabled.png and b/Resources/setup_back_disabled.png differ diff --git a/Resources/setup_back_disabled_landscape~ipad.png b/Resources/setup_back_disabled_landscape~ipad.png new file mode 100644 index 000000000..a3bf99b0a Binary files /dev/null and b/Resources/setup_back_disabled_landscape~ipad.png differ diff --git a/Resources/setup_back_disabled~ipad.png b/Resources/setup_back_disabled~ipad.png new file mode 100644 index 000000000..9bd7d70f1 Binary files /dev/null and b/Resources/setup_back_disabled~ipad.png differ diff --git a/Resources/setup_back_over.png b/Resources/setup_back_over.png index ed550a18d..aa86ad542 100644 Binary files a/Resources/setup_back_over.png and b/Resources/setup_back_over.png differ diff --git a/Resources/setup_back_over_landscape~ipad.png b/Resources/setup_back_over_landscape~ipad.png new file mode 100644 index 000000000..b4b2cc8b7 Binary files /dev/null and b/Resources/setup_back_over_landscape~ipad.png differ diff --git a/Resources/setup_back_over~ipad.png b/Resources/setup_back_over~ipad.png new file mode 100644 index 000000000..6e0a20d98 Binary files /dev/null and b/Resources/setup_back_over~ipad.png differ diff --git a/Resources/setup_cancel_default.png b/Resources/setup_cancel_default.png index 43635712e..411381928 100644 Binary files a/Resources/setup_cancel_default.png and b/Resources/setup_cancel_default.png differ diff --git a/Resources/setup_cancel_default_landscape~ipad.png b/Resources/setup_cancel_default_landscape~ipad.png new file mode 100644 index 000000000..a0557c5e9 Binary files /dev/null and b/Resources/setup_cancel_default_landscape~ipad.png differ diff --git a/Resources/setup_cancel_default~ipad.png b/Resources/setup_cancel_default~ipad.png new file mode 100644 index 000000000..766ba949a Binary files /dev/null and b/Resources/setup_cancel_default~ipad.png differ diff --git a/Resources/setup_cancel_disabled.png b/Resources/setup_cancel_disabled.png index 30b9978fa..97674e02c 100644 Binary files a/Resources/setup_cancel_disabled.png and b/Resources/setup_cancel_disabled.png differ diff --git a/Resources/setup_cancel_disabled_landscape~ipad.png b/Resources/setup_cancel_disabled_landscape~ipad.png new file mode 100644 index 000000000..e72f7b4d5 Binary files /dev/null and b/Resources/setup_cancel_disabled_landscape~ipad.png differ diff --git a/Resources/setup_cancel_disabled~ipad.png b/Resources/setup_cancel_disabled~ipad.png new file mode 100644 index 000000000..6e6a394a3 Binary files /dev/null and b/Resources/setup_cancel_disabled~ipad.png differ diff --git a/Resources/setup_cancel_over.png b/Resources/setup_cancel_over.png index 470da607e..cf48a5173 100644 Binary files a/Resources/setup_cancel_over.png and b/Resources/setup_cancel_over.png differ diff --git a/Resources/setup_cancel_over_landscape~ipad.png b/Resources/setup_cancel_over_landscape~ipad.png new file mode 100644 index 000000000..edf9a2624 Binary files /dev/null and b/Resources/setup_cancel_over_landscape~ipad.png differ diff --git a/Resources/setup_cancel_over~ipad.png b/Resources/setup_cancel_over~ipad.png new file mode 100644 index 000000000..a8be0feb8 Binary files /dev/null and b/Resources/setup_cancel_over~ipad.png differ diff --git a/Resources/setup_start_default.png b/Resources/setup_start_default.png index 8719b6507..342a59a6c 100644 Binary files a/Resources/setup_start_default.png and b/Resources/setup_start_default.png differ diff --git a/Resources/setup_start_default_landscape~ipad.png b/Resources/setup_start_default_landscape~ipad.png new file mode 100644 index 000000000..8d1af16b9 Binary files /dev/null and b/Resources/setup_start_default_landscape~ipad.png differ diff --git a/Resources/setup_start_default~ipad.png b/Resources/setup_start_default~ipad.png new file mode 100644 index 000000000..753f7ddbd Binary files /dev/null and b/Resources/setup_start_default~ipad.png differ diff --git a/Resources/setup_start_disabled.png b/Resources/setup_start_disabled.png index 1c66451b3..c57868e0a 100644 Binary files a/Resources/setup_start_disabled.png and b/Resources/setup_start_disabled.png differ diff --git a/Resources/setup_start_disabled_landscape~ipad.png b/Resources/setup_start_disabled_landscape~ipad.png new file mode 100644 index 000000000..20b0b5b73 Binary files /dev/null and b/Resources/setup_start_disabled_landscape~ipad.png differ diff --git a/Resources/setup_start_disabled~ipad.png b/Resources/setup_start_disabled~ipad.png new file mode 100644 index 000000000..da787553b Binary files /dev/null and b/Resources/setup_start_disabled~ipad.png differ diff --git a/Resources/setup_start_over.png b/Resources/setup_start_over.png index 160a9e1c2..7fc26c6fd 100644 Binary files a/Resources/setup_start_over.png and b/Resources/setup_start_over.png differ diff --git a/Resources/setup_start_over_landscape~ipad.png b/Resources/setup_start_over_landscape~ipad.png new file mode 100644 index 000000000..fc030704e Binary files /dev/null and b/Resources/setup_start_over_landscape~ipad.png differ diff --git a/Resources/setup_start_over~ipad.png b/Resources/setup_start_over~ipad.png new file mode 100644 index 000000000..ab7cb0e06 Binary files /dev/null and b/Resources/setup_start_over~ipad.png differ diff --git a/Resources/setup_title_assistant.png b/Resources/setup_title_assistant.png deleted file mode 100644 index 275ed24b1..000000000 Binary files a/Resources/setup_title_assistant.png and /dev/null differ diff --git a/Resources/setup_welcome_logo.png b/Resources/setup_welcome_logo.png index d257f3158..f3992007a 100644 Binary files a/Resources/setup_welcome_logo.png and b/Resources/setup_welcome_logo.png differ diff --git a/Resources/setup_welcome_logo~ipad.png b/Resources/setup_welcome_logo~ipad.png new file mode 100644 index 000000000..1d7ab1d73 Binary files /dev/null and b/Resources/setup_welcome_logo~ipad.png differ diff --git a/Resources/speaker_off_default.png b/Resources/speaker_off_default.png index 5094dd200..43f95c20f 100644 Binary files a/Resources/speaker_off_default.png and b/Resources/speaker_off_default.png differ diff --git a/Resources/speaker_off_default_landscape.png b/Resources/speaker_off_default_landscape.png index b77b4ef25..a8c06fa29 100644 Binary files a/Resources/speaker_off_default_landscape.png and b/Resources/speaker_off_default_landscape.png differ diff --git a/Resources/speaker_off_default_landscape~ipad.png b/Resources/speaker_off_default_landscape~ipad.png index 7c6cbd752..4b611178c 100644 Binary files a/Resources/speaker_off_default_landscape~ipad.png and b/Resources/speaker_off_default_landscape~ipad.png differ diff --git a/Resources/speaker_off_default~ipad.png b/Resources/speaker_off_default~ipad.png index 7c6cbd752..f2beb56ac 100644 Binary files a/Resources/speaker_off_default~ipad.png and b/Resources/speaker_off_default~ipad.png differ diff --git a/Resources/speaker_off_disabled.png b/Resources/speaker_off_disabled.png index cb5a1dcf7..440af308e 100644 Binary files a/Resources/speaker_off_disabled.png and b/Resources/speaker_off_disabled.png differ diff --git a/Resources/speaker_off_disabled_landscape.png b/Resources/speaker_off_disabled_landscape.png index 4c844e33f..71e614e16 100644 Binary files a/Resources/speaker_off_disabled_landscape.png and b/Resources/speaker_off_disabled_landscape.png differ diff --git a/Resources/speaker_off_disabled_landscape~ipad.png b/Resources/speaker_off_disabled_landscape~ipad.png index 3eb0f62bb..ebd857da7 100644 Binary files a/Resources/speaker_off_disabled_landscape~ipad.png and b/Resources/speaker_off_disabled_landscape~ipad.png differ diff --git a/Resources/speaker_off_disabled~ipad.png b/Resources/speaker_off_disabled~ipad.png index 3eb0f62bb..5f12dfb26 100644 Binary files a/Resources/speaker_off_disabled~ipad.png and b/Resources/speaker_off_disabled~ipad.png differ diff --git a/Resources/speaker_off_over.png b/Resources/speaker_off_over.png index bd1779182..0b42163d2 100644 Binary files a/Resources/speaker_off_over.png and b/Resources/speaker_off_over.png differ diff --git a/Resources/speaker_off_over_landscape.png b/Resources/speaker_off_over_landscape.png index 4049e7b75..66d3c8992 100644 Binary files a/Resources/speaker_off_over_landscape.png and b/Resources/speaker_off_over_landscape.png differ diff --git a/Resources/speaker_off_over_landscape~ipad.png b/Resources/speaker_off_over_landscape~ipad.png index b2f3a9316..a68c3eb9b 100644 Binary files a/Resources/speaker_off_over_landscape~ipad.png and b/Resources/speaker_off_over_landscape~ipad.png differ diff --git a/Resources/speaker_off_over~ipad.png b/Resources/speaker_off_over~ipad.png index b2f3a9316..5a78dc698 100644 Binary files a/Resources/speaker_off_over~ipad.png and b/Resources/speaker_off_over~ipad.png differ diff --git a/Resources/speaker_on_default.png b/Resources/speaker_on_default.png index 2f4f58440..ffc9d1763 100644 Binary files a/Resources/speaker_on_default.png and b/Resources/speaker_on_default.png differ diff --git a/Resources/speaker_on_default_landscape.png b/Resources/speaker_on_default_landscape.png index 90f75c124..5f9ffbbb1 100644 Binary files a/Resources/speaker_on_default_landscape.png and b/Resources/speaker_on_default_landscape.png differ diff --git a/Resources/speaker_on_default_landscape~ipad.png b/Resources/speaker_on_default_landscape~ipad.png index 120aa0058..75a192643 100644 Binary files a/Resources/speaker_on_default_landscape~ipad.png and b/Resources/speaker_on_default_landscape~ipad.png differ diff --git a/Resources/speaker_on_default~ipad.png b/Resources/speaker_on_default~ipad.png index 120aa0058..c50b97172 100644 Binary files a/Resources/speaker_on_default~ipad.png and b/Resources/speaker_on_default~ipad.png differ diff --git a/Resources/speaker_on_disabled.png b/Resources/speaker_on_disabled.png index a07dc1f5c..1869a1327 100644 Binary files a/Resources/speaker_on_disabled.png and b/Resources/speaker_on_disabled.png differ diff --git a/Resources/speaker_on_disabled_landscape.png b/Resources/speaker_on_disabled_landscape.png index 1235ab82b..7a8c6023a 100644 Binary files a/Resources/speaker_on_disabled_landscape.png and b/Resources/speaker_on_disabled_landscape.png differ diff --git a/Resources/speaker_on_disabled_landscape~ipad.png b/Resources/speaker_on_disabled_landscape~ipad.png index 6fa314087..d2447d870 100644 Binary files a/Resources/speaker_on_disabled_landscape~ipad.png and b/Resources/speaker_on_disabled_landscape~ipad.png differ diff --git a/Resources/speaker_on_disabled~ipad.png b/Resources/speaker_on_disabled~ipad.png index 6fa314087..41b2d0af8 100644 Binary files a/Resources/speaker_on_disabled~ipad.png and b/Resources/speaker_on_disabled~ipad.png differ diff --git a/Resources/speaker_on_over.png b/Resources/speaker_on_over.png index e9b54f839..adc72500d 100644 Binary files a/Resources/speaker_on_over.png and b/Resources/speaker_on_over.png differ diff --git a/Resources/speaker_on_over_landscape.png b/Resources/speaker_on_over_landscape.png index e3ff2f8fd..db44d5a07 100644 Binary files a/Resources/speaker_on_over_landscape.png and b/Resources/speaker_on_over_landscape.png differ diff --git a/Resources/speaker_on_over_landscape~ipad.png b/Resources/speaker_on_over_landscape~ipad.png index bb8277584..28483bf59 100644 Binary files a/Resources/speaker_on_over_landscape~ipad.png and b/Resources/speaker_on_over_landscape~ipad.png differ diff --git a/Resources/speaker_on_over~ipad.png b/Resources/speaker_on_over~ipad.png index bb8277584..0bfd8df64 100644 Binary files a/Resources/speaker_on_over~ipad.png and b/Resources/speaker_on_over~ipad.png differ diff --git a/Resources/switch_camera_default.png b/Resources/switch_camera_default.png index 2145e1db3..01a51b8ce 100644 Binary files a/Resources/switch_camera_default.png and b/Resources/switch_camera_default.png differ diff --git a/Resources/switch_camera_over.png b/Resources/switch_camera_over.png index 649861e9f..b8086a045 100644 Binary files a/Resources/switch_camera_over.png and b/Resources/switch_camera_over.png differ diff --git a/Resources/toolsbar_background.png b/Resources/toolsbar_background.png index e3638e197..033f7c052 100644 Binary files a/Resources/toolsbar_background.png and b/Resources/toolsbar_background.png differ diff --git a/Resources/video_off_default.png b/Resources/video_off_default.png index 8e80dd7a6..088412bd7 100644 Binary files a/Resources/video_off_default.png and b/Resources/video_off_default.png differ diff --git a/Resources/video_off_default_landscape.png b/Resources/video_off_default_landscape.png index 037a41397..bdf806f04 100644 Binary files a/Resources/video_off_default_landscape.png and b/Resources/video_off_default_landscape.png differ diff --git a/Resources/video_off_default_landscape~ipad.png b/Resources/video_off_default_landscape~ipad.png index eacab0085..c479bf714 100644 Binary files a/Resources/video_off_default_landscape~ipad.png and b/Resources/video_off_default_landscape~ipad.png differ diff --git a/Resources/video_off_default~ipad.png b/Resources/video_off_default~ipad.png index eacab0085..d7ac1ca51 100644 Binary files a/Resources/video_off_default~ipad.png and b/Resources/video_off_default~ipad.png differ diff --git a/Resources/video_off_disabled.png b/Resources/video_off_disabled.png index d9806305d..cccfe8d25 100644 Binary files a/Resources/video_off_disabled.png and b/Resources/video_off_disabled.png differ diff --git a/Resources/video_off_disabled_landscape.png b/Resources/video_off_disabled_landscape.png index 80cc968b9..bba655b46 100644 Binary files a/Resources/video_off_disabled_landscape.png and b/Resources/video_off_disabled_landscape.png differ diff --git a/Resources/video_off_disabled_landscape~ipad.png b/Resources/video_off_disabled_landscape~ipad.png index 327a67cd4..036ec556d 100644 Binary files a/Resources/video_off_disabled_landscape~ipad.png and b/Resources/video_off_disabled_landscape~ipad.png differ diff --git a/Resources/video_off_disabled~ipad.png b/Resources/video_off_disabled~ipad.png index 327a67cd4..fdbb7e40e 100644 Binary files a/Resources/video_off_disabled~ipad.png and b/Resources/video_off_disabled~ipad.png differ diff --git a/Resources/video_off_over.png b/Resources/video_off_over.png index 26a00c41e..b4bb25bda 100644 Binary files a/Resources/video_off_over.png and b/Resources/video_off_over.png differ diff --git a/Resources/video_off_over_landscape.png b/Resources/video_off_over_landscape.png index afdbe9e4e..f93047c62 100644 Binary files a/Resources/video_off_over_landscape.png and b/Resources/video_off_over_landscape.png differ diff --git a/Resources/video_off_over_landscape~ipad.png b/Resources/video_off_over_landscape~ipad.png index 5b9598b10..292042214 100644 Binary files a/Resources/video_off_over_landscape~ipad.png and b/Resources/video_off_over_landscape~ipad.png differ diff --git a/Resources/video_off_over~ipad.png b/Resources/video_off_over~ipad.png index 5b9598b10..46162cefe 100644 Binary files a/Resources/video_off_over~ipad.png and b/Resources/video_off_over~ipad.png differ diff --git a/Resources/video_on_default.png b/Resources/video_on_default.png index dde8964d9..5c852ac03 100644 Binary files a/Resources/video_on_default.png and b/Resources/video_on_default.png differ diff --git a/Resources/video_on_default_landscape.png b/Resources/video_on_default_landscape.png index 46a88e074..3ca9fabdf 100644 Binary files a/Resources/video_on_default_landscape.png and b/Resources/video_on_default_landscape.png differ diff --git a/Resources/video_on_default_landscape~ipad.png b/Resources/video_on_default_landscape~ipad.png index a85287600..fa3976e72 100644 Binary files a/Resources/video_on_default_landscape~ipad.png and b/Resources/video_on_default_landscape~ipad.png differ diff --git a/Resources/video_on_default~ipad.png b/Resources/video_on_default~ipad.png index a85287600..39c1a7a84 100644 Binary files a/Resources/video_on_default~ipad.png and b/Resources/video_on_default~ipad.png differ diff --git a/Resources/video_on_disabled.png b/Resources/video_on_disabled.png index 02a1cc236..bdfcbe8f6 100644 Binary files a/Resources/video_on_disabled.png and b/Resources/video_on_disabled.png differ diff --git a/Resources/video_on_disabled_landscape.png b/Resources/video_on_disabled_landscape.png index 3074faae3..f122718f0 100644 Binary files a/Resources/video_on_disabled_landscape.png and b/Resources/video_on_disabled_landscape.png differ diff --git a/Resources/video_on_disabled_landscape~ipad.png b/Resources/video_on_disabled_landscape~ipad.png index 35c27a72a..52a3515d3 100644 Binary files a/Resources/video_on_disabled_landscape~ipad.png and b/Resources/video_on_disabled_landscape~ipad.png differ diff --git a/Resources/video_on_disabled~ipad.png b/Resources/video_on_disabled~ipad.png index 35c27a72a..f5701af1e 100644 Binary files a/Resources/video_on_disabled~ipad.png and b/Resources/video_on_disabled~ipad.png differ diff --git a/Resources/video_on_over.png b/Resources/video_on_over.png index 20fa87e9b..13dd3546e 100644 Binary files a/Resources/video_on_over.png and b/Resources/video_on_over.png differ diff --git a/Resources/video_on_over_landscape.png b/Resources/video_on_over_landscape.png index 665973f26..252f88441 100644 Binary files a/Resources/video_on_over_landscape.png and b/Resources/video_on_over_landscape.png differ diff --git a/Resources/video_on_over_landscape~ipad.png b/Resources/video_on_over_landscape~ipad.png index 3d04d5423..23abeffa5 100644 Binary files a/Resources/video_on_over_landscape~ipad.png and b/Resources/video_on_over_landscape~ipad.png differ diff --git a/Resources/video_on_over~ipad.png b/Resources/video_on_over~ipad.png index 3d04d5423..cd1ec1e0d 100644 Binary files a/Resources/video_on_over~ipad.png and b/Resources/video_on_over~ipad.png differ diff --git a/linphone-Info.plist b/linphone-Info.plist index 029fc86db..02915007e 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -2,6 +2,8 @@ + UILaunchImageFile~iphone + linphone-splashscreen CFBundleDevelopmentRegion English CFBundleDisplayName diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index a624c3930..fc68f31fd 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -24,17 +24,17 @@ backup - 1 + 3 class BLWrapperHandle name - Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib + Classes/ContactDetailsViewController/3/ContactDetailsViewController.xib change date - 2012-09-10T15:02:37Z + 2012-09-20T15:19:32Z changed values class @@ -44,7 +44,7 @@ flags 0 hash - 9441c4e7e9f4a58b8eb373d379d8ca85 + 1caa10b45e5b72c0b45d43ff5ee656a6 name ContactDetailsViewController.xib @@ -75,6 +75,56 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Edit"; ObjectID = "8"; + errors + + flags + 0 + key + 8.normalTitle + localizations + + en + Edit + fr + Éditer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; selectedTitle = "Ok"; ObjectID = "8"; + errors + + flags + 0 + key + 8.selectedTitle + localizations + + en + Ok + fr + Ok + + snapshots + + change date 2001-01-01T00:00:00Z @@ -100,6 +150,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "9"; + errors + + flags + 0 + key + 9.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + change date 2001-01-01T00:00:00Z @@ -125,6 +200,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "47"; + errors + + flags + 0 + key + 47.normalTitle + localizations + + en + Cancel + fr + Annuler + + snapshots + + old objects @@ -133,9 +233,9 @@ versions en - 1 + 3 fr - 1 + 3 @@ -143,17 +243,17 @@ backup - 1 + 3 class BLWrapperHandle name - Classes/ContactDetailsLabelViewController/1/ContactDetailsLabelViewController.xib + Classes/ContactDetailsLabelViewController/3/ContactDetailsLabelViewController.xib change date - 2012-09-10T15:03:08Z + 2012-09-20T15:19:31Z changed values class @@ -163,7 +263,7 @@ flags 0 hash - 2b192e9fe7d3719ea8c6dfdde2642766 + 08525b9077736429caae65f799b0dc2e name ContactDetailsLabelViewController.xib @@ -194,6 +294,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "8"; + errors + + flags + 0 + key + 8.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + old objects @@ -202,9 +327,9 @@ versions en - 1 + 3 fr - 1 + 3 @@ -212,17 +337,17 @@ backup - 17 + 27 class BLWrapperHandle name - Classes/ChatRoomViewController/17/ChatRoomViewController.xib + Classes/ChatRoomViewController/27/ChatRoomViewController.xib change date - 2012-09-18T15:40:57Z + 2012-09-20T15:39:51Z changed values class @@ -232,7 +357,7 @@ flags 0 hash - 0d54842000213c11a77cc9d1e2698245 + 627c45d39e108a9f3439b16112541cf7 name ChatRoomViewController.xib @@ -263,6 +388,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "9"; + errors + + flags + 0 + key + 9.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + change date 2001-01-01T00:00:00Z @@ -288,6 +438,56 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Edit"; ObjectID = "10"; + errors + + flags + 0 + key + 10.normalTitle + localizations + + en + Edit + fr + Éditer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; selectedTitle = "Ok"; ObjectID = "10"; + errors + + flags + 0 + key + 10.selectedTitle + localizations + + en + Ok + fr + Ok + + snapshots + + change date 2001-01-01T00:00:00Z @@ -313,6 +513,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Send"; ObjectID = "15"; + errors + + flags + 0 + key + 15.normalTitle + localizations + + en + Send + fr + Envoyez + + snapshots + + change date 2001-01-01T00:00:00Z @@ -411,31 +636,6 @@ snapshots - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - Class = "IBUIButton"; normalTitle = "Pict"; ObjectID = "73"; - errors - - flags - 0 - key - 73.normalTitle - localizations - - en - Pict - fr - Img - - snapshots - - change date 2001-01-01T00:00:00Z @@ -486,31 +686,6 @@ snapshots - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "75"; - errors - - flags - 0 - key - 75.normalTitle - localizations - - en - Cancel - fr - Annuler - - snapshots - - old objects @@ -562,15 +737,65 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Pict"; ObjectID = "73"; + errors + + flags + 0 + key + 73.normalTitle + localizations + + en + Pict + fr + Img + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "75"; + errors + + flags + 0 + key + 75.normalTitle + localizations + + en + Cancel + fr + Annuler + + snapshots + + snapshots versions en - 17 + 27 fr - 17 + 27 @@ -578,17 +803,17 @@ backup - 3 + 10 class BLWrapperHandle name - Classes/ChatViewController/3/ChatViewController.xib + Classes/ChatViewController/10/ChatViewController.xib change date - 2012-09-14T12:06:16Z + 2012-09-20T16:15:28Z changed values class @@ -598,7 +823,7 @@ flags 0 hash - e5821f865fd72c1ed8f4c7762f6f37ea + e0afb50675144133f9d15d4e1145a053 name ChatViewController.xib @@ -629,6 +854,56 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Edit"; ObjectID = "9"; + errors + + flags + 0 + key + 9.normalTitle + localizations + + en + Edit + fr + Éditer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; selectedTitle = "Ok"; ObjectID = "9"; + errors + + flags + 0 + key + 9.selectedTitle + localizations + + en + Ok + fr + Ok + + snapshots + + change date 2001-01-01T00:00:00Z @@ -654,6 +929,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "New discussion"; ObjectID = "10"; + errors + + flags + 0 + key + 10.normalTitle + localizations + + en + New discussion + fr + Nouvelle discussion + + snapshots + + change date 2001-01-01T00:00:00Z @@ -679,6 +979,34 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "To:"; ObjectID = "25"; + errors + + flags + 0 + key + 25.placeholder + localizations + + en + To: + fr + À: + + snapshots + + + + old objects + change date 2001-01-01T00:00:00Z @@ -705,16 +1033,14 @@ - old objects - snapshots versions en - 3 + 10 fr - 3 + 10 @@ -722,17 +1048,17 @@ backup - 1 + 11 class BLWrapperHandle name - Classes/ContactsViewController/1/ContactsViewController.xib + Classes/ContactsViewController/11/ContactsViewController.xib change date - 2012-09-10T15:18:11Z + 2012-09-20T15:21:49Z changed values class @@ -742,7 +1068,7 @@ flags 0 hash - 513f01ab42b113fe6fec168d6a5b7dc6 + 1a4d8e84ad8a21cabafe3ef48710b34b name ContactsViewController.xib @@ -773,6 +1099,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "All"; ObjectID = "4"; + errors + + flags + 0 + key + 4.normalTitle + localizations + + en + All + fr + Tous + + snapshots + + change date 2001-01-01T00:00:00Z @@ -798,6 +1149,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Linphone"; ObjectID = "5"; + errors + + flags + 0 + key + 5.normalTitle + localizations + + en + Linphone + fr + Linphone + + snapshots + + change date 2001-01-01T00:00:00Z @@ -823,6 +1199,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Add contact"; ObjectID = "6"; + errors + + flags + 0 + key + 6.normalTitle + localizations + + en + Add contact + fr + Ajouter un contact + + snapshots + + change date 2001-01-01T00:00:00Z @@ -848,17 +1249,118 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "87"; + errors + + flags + 0 + key + 87.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + old objects - + + + change date + 2001-01-01T00:00:00Z + changed values + + fr + + class + BLStringKeyObject + comment + Class = "IBUIButton"; selectedTitle = "Linphone"; ObjectID = "5"; + errors + + flags + 0 + key + 5.selectedTitle + localizations + + en + Linphone + fr + Linphone + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; selectedTitle = "All"; ObjectID = "4"; + errors + + flags + 0 + key + 4.selectedTitle + localizations + + en + All + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; highlightedTitle = "Add contact"; ObjectID = "6"; + errors + + flags + 0 + key + 6.highlightedTitle + localizations + + en + Add contact + fr + Ajouter un contact + + snapshots + + + snapshots versions en - 1 + 11 fr - 1 + 11 @@ -866,17 +1368,17 @@ backup - 2 + 3 class BLWrapperHandle name - Classes/DialerViewController/2/DialerViewController.xib + Classes/DialerViewController/3/DialerViewController.xib change date - 2012-09-11T07:20:07Z + 2012-09-20T15:21:49Z changed values class @@ -886,7 +1388,7 @@ flags 0 hash - 1061080157a1d2f471718344fb1449a0 + 964fdf71f31dffd3f6cc28ead8aa2d3e name DialerViewController.xib @@ -1400,9 +1902,9 @@ versions en - 2 + 3 fr - 2 + 3 @@ -1410,17 +1912,17 @@ backup - 7 + 9 class BLWrapperHandle name - Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib + Classes/DialerViewController~ipad/9/DialerViewController~ipad.xib change date - 2012-09-17T15:00:19Z + 2012-09-20T15:21:48Z changed values class @@ -1430,7 +1932,7 @@ flags 0 hash - 2ba8580f9c2559276f0f27f8ec043517 + 9e024b6bdd4eea1304fefc8b28855794 name DialerViewController~ipad.xib @@ -1969,9 +2471,9 @@ versions en - 7 + 9 fr - 7 + 9 @@ -1979,17 +2481,17 @@ backup - 1 + 3 class BLWrapperHandle name - Classes/FirstLoginViewController/1/FirstLoginViewController.xib + Classes/FirstLoginViewController/3/FirstLoginViewController.xib change date - 2012-09-10T15:14:10Z + 2012-09-20T15:21:48Z changed values class @@ -1999,7 +2501,7 @@ flags 0 hash - 24ce0752284c3c6fd4b51c7368558504 + 683cfa0503d04d09dd67daf0e7a58035 name FirstLoginViewController.xib @@ -2163,9 +2665,9 @@ versions en - 1 + 3 fr - 1 + 3 @@ -2173,17 +2675,17 @@ backup - 2 + 4 class BLWrapperHandle name - Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib + Classes/HistoryDetailsViewController/4/HistoryDetailsViewController.xib change date - 2012-09-11T12:08:15Z + 2012-09-20T15:21:47Z changed values class @@ -2193,7 +2695,7 @@ flags 0 hash - 5772e41dc8ea1406d99370f79cb51bce + 76e9fd5b54782273c07d00a96c0c4859 name HistoryDetailsViewController.xib @@ -2224,6 +2726,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "9"; + errors + + flags + 0 + key + 9.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + change date 2001-01-01T00:00:00Z @@ -2589,6 +3116,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Add to contacts"; ObjectID = "50"; + errors + + flags + 0 + key + 50.normalTitle + localizations + + en + Add to contacts + fr + Ajouter aux contacts + + snapshots + + old objects @@ -2597,9 +3149,9 @@ versions en - 2 + 4 fr - 2 + 4 @@ -2607,17 +3159,17 @@ backup - 2 + 11 class BLWrapperHandle name - Classes/HistoryViewController/2/HistoryViewController.xib + Classes/HistoryViewController/11/HistoryViewController.xib change date - 2012-09-14T12:14:28Z + 2012-09-20T15:21:47Z changed values class @@ -2627,7 +3179,7 @@ flags 0 hash - 186d9f6cd76ac4df197bc2a1eb51921e + 74cb66e1edce45c588eb919f833b5612 name HistoryViewController.xib @@ -2658,6 +3210,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "All"; ObjectID = "4"; + errors + + flags + 0 + key + 4.normalTitle + localizations + + en + All + fr + Tous + + snapshots + + change date 2001-01-01T00:00:00Z @@ -2683,6 +3260,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Missed"; ObjectID = "5"; + errors + + flags + 0 + key + 5.normalTitle + localizations + + en + Missed + fr + Manqués + + snapshots + + change date 2001-01-01T00:00:00Z @@ -2708,6 +3310,56 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Edit"; ObjectID = "6"; + errors + + flags + 0 + key + 6.normalTitle + localizations + + en + Edit + fr + Éditer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; selectedTitle = "Ok"; ObjectID = "6"; + errors + + flags + 0 + key + 6.selectedTitle + localizations + + en + Ok + fr + Ok + + snapshots + + change date 2001-01-01T00:00:00Z @@ -2741,7 +3393,7 @@ class BLStringKeyObject comment - Class = "IBUIButton"; normalTitle = "Del"; ObjectID = "35"; + Class = "IBUIButton"; normalTitle = "Delete all"; ObjectID = "35"; errors flags @@ -2751,9 +3403,9 @@ localizations en - Del + Delete all fr - Del + Supprimer tout snapshots @@ -2766,9 +3418,9 @@ versions en - 2 + 11 fr - 2 + 11 @@ -2776,17 +3428,17 @@ backup - 2 + 4 class BLWrapperHandle name - Classes/InCallViewController/2/InCallViewController.xib + Classes/InCallViewController/4/InCallViewController.xib change date - 2012-09-17T15:00:02Z + 2012-09-20T15:21:46Z changed values class @@ -2796,7 +3448,7 @@ flags 0 hash - 43dc274f749d7ce59719b7aff1ab2889 + 69a923b81b02ce81e0d4fb038ffd0b4f name InCallViewController.xib @@ -2835,9 +3487,9 @@ versions en - 2 + 4 fr - 2 + 4 @@ -2845,17 +3497,17 @@ backup - 1 + 3 class BLWrapperHandle name - Classes/IncomingCallViewController/1/IncomingCallViewController.xib + Classes/IncomingCallViewController/3/IncomingCallViewController.xib change date - 2012-09-10T15:21:18Z + 2012-09-20T15:21:46Z changed values class @@ -2865,7 +3517,7 @@ flags 0 hash - 6b6854fd566e71a7fa5ca6490dc64ca8 + 4d010445881216ef3cfc44aac4e542e1 name IncomingCallViewController.xib @@ -3027,9 +3679,9 @@ versions en - 1 + 3 fr - 1 + 3 @@ -3037,17 +3689,17 @@ backup - 3 + 12 class BLWrapperHandle name - Classes/WizardViewController/3/WizardViewController.xib + Classes/WizardViewController/12/WizardViewController.xib change date - 2012-09-17T09:57:03Z + 2012-09-20T15:24:01Z changed values class @@ -3057,7 +3709,7 @@ flags 0 hash - ae1a75bdceef90126c40e63243b77c0c + e1fc10096ab7b22c55089d5dccdf2015 name WizardViewController.xib @@ -3088,6 +3740,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Start"; ObjectID = "16"; + errors + + flags + 0 + key + 16.normalTitle + localizations + + en + Start + fr + Démarrer + + snapshots + + change date 2001-01-01T00:00:00Z @@ -3113,6 +3790,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "17"; + errors + + flags + 0 + key + 17.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + change date 2001-01-01T00:00:00Z @@ -3138,6 +3840,34 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "18"; + errors + + flags + 0 + key + 18.normalTitle + localizations + + en + Cancel + fr + Annuler + + snapshots + + + + old objects + change date 2001-01-01T00:00:00Z @@ -4264,16 +4994,14 @@ - old objects - snapshots versions en - 3 + 12 fr - 3 + 12 @@ -4281,17 +5009,17 @@ backup - 6 + 8 class BLWrapperHandle name - Classes/ImageViewController/6/ImageViewController.xib + Classes/ImageViewController/8/ImageViewController.xib change date - 2012-09-18T15:26:33Z + 2012-09-20T15:21:46Z changed values class @@ -4301,7 +5029,7 @@ flags 0 hash - b3e155c6a9c76213208e70d8dc9bd3df + cf069e97eab14629cf2aa49715fd2362 name ImageViewController.xib @@ -4332,6 +5060,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "7"; + errors + + flags + 0 + key + 7.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + old objects @@ -4340,9 +5093,1815 @@ versions en - 6 + 8 fr - 6 + 8 + + + + attachments + + backup + + 10 + + class + BLWrapperHandle + name + Classes/WizardViews/10/WizardViews.xib + + + + change date + 2012-09-20T15:29:36Z + changed values + + class + BLNibFileObject + errors + + flags + 0 + hash + 030aa3527c7b0ff2fd4cb7911bd7dcac + + name + WizardViews.xib + objects + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIImageView"; accessibilityLabel = "Linphone setup assistant icon"; ObjectID = "19"; + errors + + flags + 0 + key + 19.accessibilityLabel + localizations + + en + Linphone setup assistant icon + fr + Icône de l'assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "This assistant will help you to use a SIP account for your calls."; ObjectID = "22"; + errors + + flags + 0 + key + 22.text + localizations + + en + This assistant will help you to use a SIP account for your calls. + fr + Cet assistant va vous aider à utiliser votre compte SIP pour vos appels. + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Create linphone.org account"; ObjectID = "36"; + errors + + flags + 0 + key + 36.accessibilityLabel + localizations + + en + Create linphone.org account + fr + Créer un compte linphone.org + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Create an account on linphone.org"; ObjectID = "36"; + errors + + flags + 0 + key + 36.normalTitle + localizations + + en + Create an account on linphone.org + fr + Créer un compte sur linphone.org + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Sign in linphone.org account"; ObjectID = "38"; + errors + + flags + 0 + key + 38.accessibilityLabel + localizations + + en + Sign in linphone.org account + fr + S'enregistrer sur un compte linphone.org + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "I have already a linphone.org account"; ObjectID = "38"; + errors + + flags + 0 + key + 38.normalTitle + localizations + + en + I have already a linphone.org account + fr + J'ai déjà un compte linphone.org + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Sign in SIP account"; ObjectID = "39"; + errors + + flags + 0 + key + 39.accessibilityLabel + localizations + + en + Sign in SIP account + fr + S'enregistrer sur un compte SIP + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "I have already a SIP account"; ObjectID = "39"; + errors + + flags + 0 + key + 39.normalTitle + localizations + + en + I have already a SIP account + fr + J'ai déjà un compte SIP + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Enter your username and password with your SIP domain."; ObjectID = "58"; + errors + + flags + 0 + key + 58.text + localizations + + en + Enter your username and password with your SIP domain. + fr + Entrez votre nom d'utilisateur, votre mot de passe ainsi que votre domaine SIP. + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Username"; ObjectID = "59"; + errors + + flags + 0 + key + 59.accessibilityLabel + localizations + + en + Username + fr + Nom d'utilisateur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Username"; ObjectID = "59"; + errors + + flags + 0 + key + 59.placeholder + localizations + + en + Username + fr + Nom d'utilisateur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Password"; ObjectID = "60"; + errors + + flags + 0 + key + 60.accessibilityLabel + localizations + + en + Password + fr + Mot de passe + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Password"; ObjectID = "60"; + errors + + flags + 0 + key + 60.placeholder + localizations + + en + Password + fr + Mot de passe + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Domain"; ObjectID = "61"; + errors + + flags + 0 + key + 61.accessibilityLabel + localizations + + en + Domain + fr + Domaine + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Domain"; ObjectID = "61"; + errors + + flags + 0 + key + 61.placeholder + localizations + + en + Domain + fr + Domaine + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Sign in"; ObjectID = "62"; + errors + + flags + 0 + key + 62.accessibilityLabel + localizations + + en + Sign in + fr + S'enregistrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Sign in"; ObjectID = "62"; + errors + + flags + 0 + key + 62.normalTitle + localizations + + en + Sign in + fr + S'enregistrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Sign in"; ObjectID = "64"; + errors + + flags + 0 + key + 64.accessibilityLabel + localizations + + en + Sign in + fr + S'enregistrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Sign in"; ObjectID = "64"; + errors + + flags + 0 + key + 64.normalTitle + localizations + + en + Sign in + fr + S'enregistrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Password"; ObjectID = "66"; + errors + + flags + 0 + key + 66.accessibilityLabel + localizations + + en + Password + fr + Mot de passe + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Password"; ObjectID = "66"; + errors + + flags + 0 + key + 66.placeholder + localizations + + en + Password + fr + Mot de passe + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Enter your username and password of your linphone.org account."; ObjectID = "67"; + errors + + flags + 0 + key + 67.text + localizations + + en + Enter your username and password of your linphone.org account. + fr + Entrez votre nom d'utilisateur et votre mot de passe de votre compte linphone.org. + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Username"; ObjectID = "68"; + errors + + flags + 0 + key + 68.accessibilityLabel + localizations + + en + Username + fr + Nom d'utilisateur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Username"; ObjectID = "68"; + errors + + flags + 0 + key + 68.placeholder + localizations + + en + Username + fr + Nom d'utilisateur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Enter your username and password with your email address."; ObjectID = "73"; + errors + + flags + 0 + key + 73.text + localizations + + en + Enter your username and password with your email address. + fr + Entrez votre nom d'utilsateur, votre mot de passe ainsi que votre adresse email. + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Username"; ObjectID = "74"; + errors + + flags + 0 + key + 74.accessibilityLabel + localizations + + en + Username + fr + Nom d'utilisateur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Username"; ObjectID = "74"; + errors + + flags + 0 + key + 74.placeholder + localizations + + en + Username + fr + Nom d'utilisateur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Password"; ObjectID = "75"; + errors + + flags + 0 + key + 75.accessibilityLabel + localizations + + en + Password + fr + Mot de passe + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Password"; ObjectID = "75"; + errors + + flags + 0 + key + 75.placeholder + localizations + + en + Password + fr + Mot de passe + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Password again"; ObjectID = "76"; + errors + + flags + 0 + key + 76.accessibilityLabel + localizations + + en + Password again + fr + Mot de passe à nouveau + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Password"; ObjectID = "76"; + errors + + flags + 0 + key + 76.placeholder + localizations + + en + Password + fr + Mot de passe + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Register"; ObjectID = "77"; + errors + + flags + 0 + key + 77.accessibilityLabel + localizations + + en + Register + fr + S'enregistrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Register"; ObjectID = "77"; + errors + + flags + 0 + key + 77.normalTitle + localizations + + en + Register + fr + S'enregistrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; accessibilityLabel = "Email"; ObjectID = "79"; + errors + + flags + 0 + key + 79.accessibilityLabel + localizations + + en + Email + fr + Email + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Email"; ObjectID = "79"; + errors + + flags + 0 + key + 79.placeholder + localizations + + en + Email + fr + Email + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Check validation"; ObjectID = "103"; + errors + + flags + 0 + key + 103.accessibilityLabel + localizations + + en + Check validation + fr + Vérifier la validation + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Check validation"; ObjectID = "103"; + errors + + flags + 0 + key + 103.normalTitle + localizations + + en + Check validation + fr + Vérifier la validation + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Username"; ObjectID = "104"; + errors + + flags + 0 + key + 104.placeholder + localizations + + en + Username + fr + Nom d'utilisateur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Your account is created. Please check your mails in order to validate your account."; ObjectID = "105"; + errors + + flags + 0 + key + 105.text + localizations + + en + Your account is created. Please check your mails in order to validate your account. + fr + Votre compte est crée. Vérifier vos emails pour valider votre compte. + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUITextField"; placeholder = "Password"; ObjectID = "106"; + errors + + flags + 0 + key + 106.placeholder + localizations + + en + Password + fr + Mot de passe + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Account setup assistant"; ObjectID = "117"; + errors + + flags + 0 + key + 117.accessibilityLabel + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Account setup assistant"; ObjectID = "117"; + errors + + flags + 0 + key + 117.text + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Account setup assistant"; ObjectID = "122"; + errors + + flags + 0 + key + 122.accessibilityLabel + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Account setup assistant"; ObjectID = "122"; + errors + + flags + 0 + key + 122.text + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Account setup assistant"; ObjectID = "123"; + errors + + flags + 0 + key + 123.accessibilityLabel + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Account setup assistant"; ObjectID = "123"; + errors + + flags + 0 + key + 123.text + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Account setup assistant"; ObjectID = "124"; + errors + + flags + 0 + key + 124.accessibilityLabel + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Account setup assistant"; ObjectID = "124"; + errors + + flags + 0 + key + 124.text + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Account setup assistant"; ObjectID = "126"; + errors + + flags + 0 + key + 126.accessibilityLabel + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Account setup assistant"; ObjectID = "126"; + errors + + flags + 0 + key + 126.text + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Account setup assistant"; ObjectID = "127"; + errors + + flags + 0 + key + 127.accessibilityLabel + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Account setup assistant"; ObjectID = "127"; + errors + + flags + 0 + key + 127.text + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + old objects + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIImageView"; accessibilityLabel = "Account setup assistant"; ObjectID = "48"; + errors + + flags + 0 + key + 48.accessibilityLabel + localizations + + en + Account setup assistant + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIImageView"; accessibilityLabel = "Account setup assistant"; ObjectID = "53"; + errors + + flags + 0 + key + 53.accessibilityLabel + localizations + + en + Account setup assistant + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIImageView"; accessibilityLabel = "Account setup assistant"; ObjectID = "57"; + errors + + flags + 0 + key + 57.accessibilityLabel + localizations + + en + Account setup assistant + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIImageView"; accessibilityLabel = "Account setup assistant"; ObjectID = "107"; + errors + + flags + 0 + key + 107.accessibilityLabel + localizations + + en + Account setup assistant + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIImageView"; accessibilityLabel = "Account setup assistant"; ObjectID = "37"; + errors + + flags + 0 + key + 37.accessibilityLabel + localizations + + en + Account setup assistant + fr + Assistant de configuration de compte + + snapshots + + + + snapshots + + versions + + en + 10 + fr + 10 + + + + attachments + + backup + + 8 + + class + BLWrapperHandle + name + Classes/WizardViewController~ipad/8/WizardViewController~ipad.xib + + + + change date + 2012-09-20T15:24:02Z + changed values + + class + BLNibFileObject + errors + + flags + 0 + hash + 950141adce6aab34f1068654a47edf3c + + name + WizardViewController~ipad.xib + objects + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Start"; ObjectID = "16"; + errors + + flags + 0 + key + 16.accessibilityLabel + localizations + + en + Start + fr + Démarrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Start"; ObjectID = "16"; + errors + + flags + 0 + key + 16.normalTitle + localizations + + en + Start + fr + Démarrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Back"; ObjectID = "17"; + errors + + flags + 0 + key + 17.accessibilityLabel + localizations + + en + Back + fr + Retour + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "17"; + errors + + flags + 0 + key + 17.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Cancel"; ObjectID = "18"; + errors + + flags + 0 + key + 18.accessibilityLabel + localizations + + en + Cancel + fr + Annuler + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "18"; + errors + + flags + 0 + key + 18.normalTitle + localizations + + en + Cancel + fr + Annuler + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Cancel"; ObjectID = "122"; + errors + + flags + 0 + key + 122.accessibilityLabel + localizations + + en + Cancel + fr + Annuler + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "122"; + errors + + flags + 0 + key + 122.normalTitle + localizations + + en + Cancel + fr + Annuler + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Start"; ObjectID = "123"; + errors + + flags + 0 + key + 123.accessibilityLabel + localizations + + en + Start + fr + Démarrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Start"; ObjectID = "123"; + errors + + flags + 0 + key + 123.normalTitle + localizations + + en + Start + fr + Démarrer + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Back"; ObjectID = "124"; + errors + + flags + 0 + key + 124.accessibilityLabel + localizations + + en + Back + fr + Retour + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Back"; ObjectID = "124"; + errors + + flags + 0 + key + 124.normalTitle + localizations + + en + Back + fr + Retour + + snapshots + + + + old objects + + snapshots + + versions + + en + 8 + fr + 8 @@ -4377,17 +6936,17 @@ backup - 2 + 7 class BLWrapperHandle name - LinphoneUI/UICallBar/2/UICallBar.xib + LinphoneUI/UICallBar/7/UICallBar.xib change date - 2012-09-11T07:54:30Z + 2012-09-20T15:21:45Z changed values class @@ -4397,7 +6956,7 @@ flags 0 hash - 29c97d00d72b5ceb34645a57ea2f296f + 3d9fb2748e85ed54a71f223656d2f5a4 name UICallBar.xib @@ -4503,6 +7062,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Speaker"; ObjectID = "9"; + errors + + flags + 0 + key + 9.normalTitle + localizations + + en + Speaker + fr + Haut parleur + + snapshots + + change date 2001-01-01T00:00:00Z @@ -4528,6 +7112,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Options"; ObjectID = "10"; + errors + + flags + 0 + key + 10.normalTitle + localizations + + en + Options + fr + Options + + snapshots + + change date 2001-01-01T00:00:00Z @@ -4553,6 +7162,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Micro"; ObjectID = "11"; + errors + + flags + 0 + key + 11.normalTitle + localizations + + en + Micro + fr + Micro + + snapshots + + change date 2001-01-01T00:00:00Z @@ -4578,6 +7212,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Video"; ObjectID = "12"; + errors + + flags + 0 + key + 12.normalTitle + localizations + + en + Video + fr + Vidéo + + snapshots + + change date 2001-01-01T00:00:00Z @@ -4928,6 +7587,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Add call"; ObjectID = "88"; + errors + + flags + 1 + key + 88.normalTitle + localizations + + en + Add call + fr + Ajouter un appel + + snapshots + + change date 2001-01-01T00:00:00Z @@ -4953,6 +7637,181 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Transfer"; ObjectID = "90"; + errors + + flags + 0 + key + 90.normalTitle + localizations + + en + Transfer + fr + Transfert + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Options"; ObjectID = "110"; + errors + + flags + 0 + key + 110.normalTitle + localizations + + en + Options + fr + Options + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Speaker"; ObjectID = "111"; + errors + + flags + 0 + key + 111.normalTitle + localizations + + en + Speaker + fr + Haut parleur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Micro"; ObjectID = "112"; + errors + + flags + 0 + key + 112.normalTitle + localizations + + en + Micro + fr + Micro + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Video"; ObjectID = "113"; + errors + + flags + 0 + key + 113.normalTitle + localizations + + en + Video + fr + Vidéo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Add call"; ObjectID = "127"; + errors + + flags + 0 + key + 127.normalTitle + localizations + + en + Add call + fr + Ajouter appel + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Transfer"; ObjectID = "128"; + errors + + flags + 0 + key + 128.normalTitle + localizations + + en + Transfer + fr + Transfert + + snapshots + + old objects @@ -5199,9 +8058,9 @@ versions en - 2 + 7 fr - 2 + 7 @@ -5209,17 +8068,17 @@ backup - 2 + 6 class BLWrapperHandle name - LinphoneUI/UICallBar~ipad/2/UICallBar~ipad.xib + LinphoneUI/UICallBar~ipad/6/UICallBar~ipad.xib change date - 2012-09-11T07:54:16Z + 2012-09-20T15:24:01Z changed values class @@ -5229,7 +8088,7 @@ flags 0 hash - 8c4903cac7f135d809c9b2c0b019ecef + 388aee3f3bd637d1a4e4f01b09cdac8b name UICallBar~ipad.xib @@ -5360,6 +8219,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Options"; ObjectID = "14"; + errors + + flags + 0 + key + 14.normalTitle + localizations + + en + Options + fr + Options + + snapshots + + change date 2001-01-01T00:00:00Z @@ -5385,6 +8269,56 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; disabledTitle = "Speaker"; ObjectID = "15"; + errors + + flags + 0 + key + 15.disabledTitle + localizations + + en + Speaker + fr + Haut parleur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Speaker"; ObjectID = "15"; + errors + + flags + 0 + key + 15.normalTitle + localizations + + en + Speaker + fr + Haut parleur + + snapshots + + change date 2001-01-01T00:00:00Z @@ -5410,6 +8344,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Micro"; ObjectID = "16"; + errors + + flags + 0 + key + 16.normalTitle + localizations + + en + Micro + fr + Micro + + snapshots + + change date 2001-01-01T00:00:00Z @@ -5435,6 +8394,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Video"; ObjectID = "17"; + errors + + flags + 0 + key + 17.normalTitle + localizations + + en + Video + fr + Vidéo + + snapshots + + change date 2001-01-01T00:00:00Z @@ -5760,6 +8744,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Add call"; ObjectID = "31"; + errors + + flags + 0 + key + 31.normalTitle + localizations + + en + Add call + fr + Ajouter appel + + snapshots + + change date 2001-01-01T00:00:00Z @@ -5785,6 +8794,206 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Transfer"; ObjectID = "32"; + errors + + flags + 0 + key + 32.normalTitle + localizations + + en + Transfer + fr + Transfert + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Options"; ObjectID = "39"; + errors + + flags + 0 + key + 39.normalTitle + localizations + + en + Options + fr + Options + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Video"; ObjectID = "40"; + errors + + flags + 0 + key + 40.normalTitle + localizations + + en + Video + fr + Vidéo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Micro"; ObjectID = "41"; + errors + + flags + 0 + key + 41.normalTitle + localizations + + en + Micro + fr + Micro + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; disabledTitle = "Speaker"; ObjectID = "42"; + errors + + flags + 0 + key + 42.disabledTitle + localizations + + en + Speaker + fr + Haut parleur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Speaker"; ObjectID = "42"; + errors + + flags + 0 + key + 42.normalTitle + localizations + + en + Speaker + fr + Haut parleur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Add call"; ObjectID = "60"; + errors + + flags + 0 + key + 60.normalTitle + localizations + + en + Add call + fr + Ajouter appel + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Transfer"; ObjectID = "61"; + errors + + flags + 0 + key + 61.normalTitle + localizations + + en + Transfer + fr + Transfert + + snapshots + + old objects @@ -6024,9 +9233,9 @@ versions en - 2 + 6 fr - 2 + 6 @@ -6041,10 +9250,17 @@ name LinphoneUI/UIConferenceHeader/1/UIConferenceHeader.xib + 2 + + class + BLWrapperHandle + name + LinphoneUI/UIConferenceHeader/2/UIConferenceHeader.xib + change date - 2012-09-10T15:25:36Z + 2012-09-19T14:21:28Z changed values class @@ -6054,7 +9270,7 @@ flags 0 hash - 0178fd143e6193631ff7cef0c9406532 + 89c4c1d271514b74c615584d0de71eab name UIConferenceHeader.xib @@ -6118,9 +9334,9 @@ versions en - 1 + 2 fr - 1 + 2 fr_FR 1 @@ -6130,17 +9346,17 @@ backup - 1 + 2 class BLWrapperHandle name - LinphoneUI/UIContactDetailsFooter/1/UIContactDetailsFooter.xib + LinphoneUI/UIContactDetailsFooter/2/UIContactDetailsFooter.xib change date - 2012-09-10T15:25:42Z + 2012-09-20T15:24:01Z changed values class @@ -6150,7 +9366,7 @@ flags 0 hash - 0bc7c38f764c5c69721ba92aaaad7292 + 4982cb7d83d9ace9fae48e656fb999d2 name UIContactDetailsFooter.xib @@ -6214,9 +9430,9 @@ versions en - 1 + 2 fr - 1 + 2 @@ -6224,17 +9440,17 @@ backup - 2 + 6 class BLWrapperHandle name - LinphoneUI/UIMainBar/2/UIMainBar.xib + LinphoneUI/UIMainBar/6/UIMainBar.xib change date - 2012-09-11T08:02:48Z + 2012-09-20T15:02:25Z changed values class @@ -6244,7 +9460,7 @@ flags 0 hash - 8bc9a094a2fba0f004e847ed8f520c9f + 188f1463d35316609315281b42709088 name UIMainBar.xib @@ -6275,6 +9491,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Chat"; ObjectID = "5"; + errors + + flags + 0 + key + 5.normalTitle + localizations + + en + Chat + fr + Chat + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6300,6 +9541,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "History"; ObjectID = "6"; + errors + + flags + 0 + key + 6.normalTitle + localizations + + en + History + fr + Historique + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6350,6 +9616,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Contacts"; ObjectID = "8"; + errors + + flags + 0 + key + 8.normalTitle + localizations + + en + Contacts + fr + Contacts + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6375,6 +9666,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Settings"; ObjectID = "9"; + errors + + flags + 0 + key + 9.normalTitle + localizations + + en + Settings + fr + Options + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6479,9 +9795,9 @@ versions en - 2 + 6 fr - 2 + 6 @@ -6489,17 +9805,17 @@ backup - 2 + 6 class BLWrapperHandle name - LinphoneUI/UIMainBar~ipad/2/UIMainBar~ipad.xib + LinphoneUI/UIMainBar~ipad/6/UIMainBar~ipad.xib change date - 2012-09-11T08:04:14Z + 2012-09-20T15:02:34Z changed values class @@ -6509,7 +9825,7 @@ flags 0 hash - 970b92610d2a68797043e496662a777d + 0573baad5d18951a19a8f58c27eb183b name UIMainBar~ipad.xib @@ -6565,6 +9881,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Chat"; ObjectID = "7"; + errors + + flags + 0 + key + 7.normalTitle + localizations + + en + Chat + fr + Chat + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6590,6 +9931,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "History"; ObjectID = "8"; + errors + + flags + 0 + key + 8.normalTitle + localizations + + en + History + fr + Historique + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6615,6 +9981,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Contacts"; ObjectID = "9"; + errors + + flags + 0 + key + 9.normalTitle + localizations + + en + Contacts + fr + Contacts + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6640,6 +10031,31 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Settings"; ObjectID = "10"; + errors + + flags + 0 + key + 10.normalTitle + localizations + + en + Settings + fr + Options + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6736,6 +10152,106 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Settings"; ObjectID = "30"; + errors + + flags + 0 + key + 30.normalTitle + localizations + + en + Settings + fr + Options + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Contacts"; ObjectID = "31"; + errors + + flags + 0 + key + 31.normalTitle + localizations + + en + Contacts + fr + Contacts + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "History"; ObjectID = "32"; + errors + + flags + 0 + key + 32.normalTitle + localizations + + en + History + fr + Historique + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Chat"; ObjectID = "33"; + errors + + flags + 0 + key + 33.normalTitle + localizations + + en + Chat + fr + Chat + + snapshots + + change date 2001-01-01T00:00:00Z @@ -6925,9 +10441,9 @@ versions en - 2 + 6 fr - 2 + 6 @@ -6935,17 +10451,17 @@ backup - 1 + 2 class BLWrapperHandle name - LinphoneUI/UIContactDetailsHeader/1/UIContactDetailsHeader.xib + LinphoneUI/UIContactDetailsHeader/2/UIContactDetailsHeader.xib change date - 2012-09-10T15:33:00Z + 2012-09-20T15:24:01Z changed values class @@ -6955,7 +10471,7 @@ flags 0 hash - 63c3d2093e6051f9a56cdc2c5931554f + 5c771336b97589e59711a5c00dc7d3bc name UIContactDetailsHeader.xib @@ -7042,9 +10558,9 @@ versions en - 1 + 2 fr - 1 + 2 @@ -7052,17 +10568,17 @@ backup - 2 + 3 class BLWrapperHandle name - LinphoneUI/UICallCell/2/UICallCell.xib + LinphoneUI/UICallCell/3/UICallCell.xib change date - 2012-09-11T07:57:05Z + 2012-09-20T15:21:45Z changed values class @@ -7072,7 +10588,7 @@ flags 0 hash - b4d5d9456e9ba50e6f6232c1b27a3ef2 + 00d461a22aedf4b4195a0d82fe11becb name UICallCell.xib @@ -7307,9 +10823,9 @@ versions en - 2 + 3 fr - 2 + 3 @@ -7354,7 +10870,7 @@ change date - 2012-09-18T14:20:34Z + 2012-09-20T12:25:53Z changed values class @@ -9686,6 +13202,306 @@ 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 + Camera + localizations + + en + Camera + fr + Appareil photo + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Cancel + localizations + + en + Cancel + fr + Annuler + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Cannot transfer file from remote contact + localizations + + en + Cannot transfer file from remote contact + fr + Impossible de transferer depuis le destinataire + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Cannot transfer file to remote contact + localizations + + en + Cannot transfer file to remote contact + fr + Impossible de transferer au destinataire + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Cannot write image to photo library + localizations + + en + Cannot write image to photo library + fr + Impossible d'enregistrer l'image dans l'album photo + + 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 + 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 + Select picture source + localizations + + en + Select picture source + fr + Selectionner une source d'image + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Transfer error + localizations + + en + Transfer error + fr + Erreur de transfert + + 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 + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + No SIP account defined + localizations + + en + No SIP account defined + fr + Aucun compte SIP défini + + snapshots + + plist file diff --git a/linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib b/linphone.ldb/Resources/Classes/ChatRoomViewController/27/ChatRoomViewController.xib similarity index 83% rename from linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib rename to linphone.ldb/Resources/Classes/ChatRoomViewController/27/ChatRoomViewController.xib index b121e1665..e60678397 100644 --- a/linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/27/ChatRoomViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -18,7 +18,6 @@ IBUIProgressView IBUITableView IBUITableViewController - IBUITapGestureRecognizer IBUIView @@ -135,7 +134,7 @@ 274 - {{0, 80}, {320, 277}} + {{0, 80}, {320, 279}} @@ -161,7 +160,7 @@ 274 - {320, 59} + {320, 57} @@ -169,7 +168,7 @@ NO IBCocoaTouchFramework - + NSImage chat_background.png @@ -177,7 +176,7 @@ 297 - {{250, 0}, {70, 59}} + {{262, 0}, {58, 57}} @@ -189,7 +188,7 @@ IBCocoaTouchFramework 0 0 - Cancel + NO 1 @@ -199,6 +198,14 @@ 3 MC41AA + + NSImage + chat_cancel_over.png + + + NSImage + chat_cancel_default.png + 2 15 @@ -212,7 +219,7 @@ 298 - {{20, 25}, {213, 9}} + {{20, 24}, {222, 9}} @@ -226,7 +233,7 @@ 0.5 - {{0, 357}, {320, 59}} + {{0, 359}, {320, 57}} @@ -241,33 +248,26 @@ 274 - {320, 59} - - - - _NS:9 - - NO - IBCocoaTouchFramework - - - - - 274 - {320, 59} + {320, 57} _NS:9 + NO IBCocoaTouchFramework + + NSImage + chat_message_background.png + 297 - {{250, 0}, {70, 59}} + {{262, 0}, {58, 57}} + _NS:9 NO @@ -279,29 +279,53 @@ 0 NO NO + 30 + 0.0 + 0.0 + 0.0 + Send + + 2 + MCAwIDAAA + + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + - + NSImage chat_send_over.png - + NSImage chat_send_disabled.png - + NSImage chat_send_default.png - - + + 1 + 14 + + + Helvetica + 14 + 16 + 300 - {40, 59} + {35, 57} - + _NS:9 NO @@ -310,57 +334,42 @@ IBCocoaTouchFramework 0 0 - Pict + NO + NO 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + NSImage + chat_photo_over.png + + + NSImage + chat_photo_disabled.png + + + NSImage + chat_photo_default.png + - + 274 - - - - 274 - {210, 59} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - chat_field.png - - - - - 274 - {{10, 10}, {190, 39}} - - - - _NS:9 - - IBCocoaTouchFramework - - - {{40, 0}, {210, 59}} + {{33, 10}, {232, 37}} - + _NS:9 IBCocoaTouchFramework - {{0, 357}, {320, 59}} + {{0, 359}, {320, 57}} @@ -404,6 +413,10 @@ _NS:9 + + 2 + MCAwIDAAA + NO Back @@ -412,17 +425,27 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + - + NSImage chat_back_over.png - + NSImage chat_back_default.png - - + + @@ -432,6 +455,7 @@ _NS:9 + NO Edit @@ -440,21 +464,30 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + + - + NSImage chat_edit_over.png - + NSImage chat_ok_default.png - + NSImage chat_edit_default.png - - + + {320, 44} @@ -485,7 +518,6 @@ IBCocoaTouchFramework NO - @@ -537,22 +569,6 @@ 44 - - - footerView - - - - 46 - - - - sendButton - - - - 27 - chatView @@ -561,46 +577,6 @@ 54 - - - footerBackgroundImage - - - - 67 - - - - messageField - - - - 64 - - - - messageBackgroundImage - - - - 69 - - - - messageView - - - - 70 - - - - listTapGestureRecognizer - - - - 71 - imageTransferProgressBar @@ -641,6 +617,38 @@ 88 + + + sendButton + + + + 27 + + + + messageField + + + + 64 + + + + messageView + + + + 89 + + + + messageBackgroundImage + + + + 90 + dataSource @@ -657,16 +665,6 @@ 31 - - - gestureRecognizers - - - NSArray - YES - - 61 - onBackClick: @@ -702,14 +700,6 @@ 33 - - - onListTap: - - - - 62 - onPictureClick: @@ -844,67 +834,26 @@ 14 - - - + + - footerView - - - 15 - - - sendButton - - - 58 - - - listTapGestureRecognizer + messageView 66 - footerBackgroundImage - - - 68 - - - - - - - messageView - - - 21 - - messageBackgroundImage - - 63 - - - messageField - 73 pictureButton - - 82 - - - normalView - 72 @@ -934,6 +883,18 @@ transfertBackgroundImage + + 15 + + + sendButton + + + 63 + + + messageField + @@ -943,11 +904,12 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + ChatRoomTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -956,29 +918,28 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin HPGrowingTextView 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 - - + + - 88 + 90 @@ -1038,8 +999,6 @@ UIButton UIView UIToggleButton - UIImageView - UIView UIView UIProgressView UITapGestureRecognizer @@ -1073,14 +1032,6 @@ editButton UIToggleButton - - footerBackgroundImage - UIImageView - - - footerView - UIView - headerView UIView @@ -1151,10 +1102,6 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 @@ -1162,16 +1109,21 @@ {131, 131} {320, 88} {320, 88} - {640, 117} + {16, 16} + {116, 115} + {116, 115} {320, 88} {320, 88} - {500, 117} + {640, 117} {320, 88} - {140, 117} - {140, 117} - {140, 117} - {5, 117} + {71, 115} + {71, 115} + {71, 115} + {117, 115} + {117, 115} + {117, 115} + {5, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/ChatViewController/3/ChatViewController.xib b/linphone.ldb/Resources/Classes/ChatViewController/10/ChatViewController.xib similarity index 85% rename from linphone.ldb/Resources/Classes/ChatViewController/3/ChatViewController.xib rename to linphone.ldb/Resources/Classes/ChatViewController/10/ChatViewController.xib index 20eedaf14..2e6558bf6 100644 --- a/linphone.ldb/Resources/Classes/ChatViewController/3/ChatViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatViewController/10/ChatViewController.xib @@ -1,20 +1,19 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject IBUIButton IBUIImageView - IBUILabel IBUITableView IBUITableViewController IBUITextField @@ -50,7 +49,7 @@ {320, 44} - + _NS:9 NO IBCocoaTouchFramework @@ -65,7 +64,7 @@ {160, 44} - + _NS:9 NO @@ -75,25 +74,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + New discussion + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage chat_add_over.png - + NSImage chat_add_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -103,7 +115,7 @@ {{160, 0}, {160, 44}} - + _NS:9 NO @@ -113,21 +125,33 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + - + NSImage chat_edit_over.png - + NSImage chat_ok_default.png - + NSImage chat_edit_default.png - - + + {320, 44} @@ -147,13 +171,14 @@ 274 - {{0, 74}, {320, 378}} + {{0, 79}, {320, 381}} + _NS:9 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -167,6 +192,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -176,11 +205,15 @@ 292 - {{24, 44}, {296, 30}} + {{25, 44}, {271, 35}} _NS:9 + + 3 + MCAwAA + NO YES @@ -189,6 +222,7 @@ IBCocoaTouchFramework 0 + To: 3 MAA @@ -199,52 +233,28 @@ IBCocoaTouchFramework + + NSImage + chat_address.png + 1 - + 1 17 - + Helvetica 17 16 - - - 292 - {{0, 44}, {24, 30}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - To: - - 1 - MCAwIDAAA - - - 0 - 10 - - - {320, 460} _NS:9 - - 3 - MQA - - + IBCocoaTouchFramework @@ -375,7 +385,6 @@ - @@ -420,11 +429,6 @@ addressField - - 26 - - - @@ -433,10 +437,10 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin ChatTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -444,6 +448,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -517,18 +522,19 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 {320, 88} {320, 88} + {542, 70} {320, 88} {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/1/ContactDetailsLabelViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/3/ContactDetailsLabelViewController.xib similarity index 77% rename from linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/1/ContactDetailsLabelViewController.xib rename to linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/3/ContactDetailsLabelViewController.xib index d31c015f8..182c718cd 100644 --- a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/1/ContactDetailsLabelViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/3/ContactDetailsLabelViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -90,25 +90,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage contact_back_over.png - + NSImage contact_back_default.png - 2 - 15 + 1 + 14 - Helvetica-Bold - 15 + Helvetica + 14 16 @@ -135,62 +148,8 @@ _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -218,7 +177,10 @@ AAgACAAIAAEAAQABAAE - + + 3 + MCAwAA + IBCocoaTouchFramework @@ -342,6 +304,7 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -388,7 +351,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -396,8 +359,8 @@ AAgACAAIAAEAAQABAAE {640, 523} {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsViewController/3/ContactDetailsViewController.xib similarity index 85% rename from linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib rename to linphone.ldb/Resources/Classes/ContactDetailsViewController/3/ContactDetailsViewController.xib index 412214f08..369a774f5 100644 --- a/linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactDetailsViewController/3/ContactDetailsViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -36,7 +36,7 @@ IBCocoaTouchFramework - + 274 @@ -48,6 +48,7 @@ 290 {320, 44} + _NS:9 NO @@ -62,6 +63,7 @@ 292 {160, 44} + _NS:9 NO @@ -72,25 +74,34 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage contact_back_over.png - + NSImage contact_back_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -99,6 +110,7 @@ -2147483356 {160, 44} + _NS:9 NO @@ -109,23 +121,34 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MCAwIDAAA + + - + NSImage contact_cancel_over.png - + NSImage contact_cancel_default.png - - + + 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -136,25 +159,35 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + + - + NSImage contact_edit_over.png - + NSImage contact_ok_default.png - + NSImage contact_edit_default.png - - + + {320, 44} + _NS:9 @@ -171,64 +204,11 @@ 306 {{0, 44}, {320, 416}} + _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -253,8 +233,13 @@ AAgACAAIAAEAAQABAAE {320, 460} + + - + + 3 + MCAwAA + IBCocoaTouchFramework @@ -523,7 +508,8 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIContactDetailsFooter com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -531,8 +517,10 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -721,7 +709,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -733,8 +721,8 @@ AAgACAAIAAEAAQABAAE {320, 88} {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/ContactsViewController/1/ContactsViewController.xib b/linphone.ldb/Resources/Classes/ContactsViewController/11/ContactsViewController.xib similarity index 65% rename from linphone.ldb/Resources/Classes/ContactsViewController/1/ContactsViewController.xib rename to linphone.ldb/Resources/Classes/ContactsViewController/11/ContactsViewController.xib index f452a385d..935011ea2 100644 --- a/linphone.ldb/Resources/Classes/ContactsViewController/1/ContactsViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactsViewController/11/ContactsViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -47,7 +47,6 @@ 290 {320, 44} - _NS:9 NO @@ -57,80 +56,117 @@ toolsbar_background.png - + - 289 - {{120, 0}, {80, 44}} + 293 + + + + 292 + {107, 44} + + + _NS:9 + NO + + All contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + All + + 2 + MC45NzY0NzA2NDkyIDAuOTc2NDcwNjQ5MiAwLjk3NjQ3MDY0OTIAA + + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + contacts_all_selected.png + + + + NSImage + contacts_all_default.png + + + 1 + 12 + + + Helvetica + 12 + 16 + + + + + 289 + {{107, 0}, {107, 44}} + + + _NS:9 + NO + + Linphone contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Linphone + + + + + + NSImage + contacts_linphone_selected.png + + + + NSImage + contacts_linphone_default.png + + + + + + {{106, 0}, {214, 44}} - - + _NS:9 - NO - - All contacts filter - - IBCocoaTouchFramework - 0 - 0 - NO - + 3 - MC41AA - - - NSImage - contacts_all_selected.png - - - - NSImage - contacts_all_default.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 289 - {{200, 0}, {80, 44}} - - - - _NS:9 - NO - - Linphone contacts filter + MQA + + 2 + IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - contacts_linphone_selected.png - - - - NSImage - contacts_linphone_default.png - - - 292 - {80, 44} + {107, 44} - _NS:9 NO @@ -141,25 +177,44 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Add contact + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + - + NSImage contacts_add_over.png - + NSImage contacts_add_default.png - - + + 1 + 14 + + + Helvetica + 14 + 16 + -2147483356 - {80, 44} + {107, 44} - - + _NS:9 NO @@ -169,30 +224,34 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + - + NSImage contacts_back_over.png - + NSImage contacts_back_default.png - - + + {320, 44} - _NS:9 3 MQA - - 2 - + IBCocoaTouchFramework @@ -201,12 +260,10 @@ 274 {{0, 44}, {320, 416}} - - _NS:10 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -221,6 +278,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -230,13 +291,11 @@ {320, 460} - _NS:9 3 - MQA - + MCAwAA IBCocoaTouchFramework @@ -261,22 +320,6 @@ 16 - - - allButton - - - - 27 - - - - linphoneButton - - - - 31 - tableController @@ -309,6 +352,22 @@ 91 + + + allButton + + + + 27 + + + + linphoneButton + + + + 31 + onAllClick: @@ -404,25 +463,12 @@ - - + toolBar - - 4 - - - allButton - - - 5 - - - linphoneButton - 6 @@ -454,6 +500,28 @@ background + + 93 + + + + + + + switchView + + + 4 + + + allButton + + + 5 + + + linphoneButton + @@ -464,121 +532,49 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin ContactsTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 92 - - - - - 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 - - - + 93 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {160, 88} - {160, 88} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {213, 117} - {5, 117} + {214, 88} + {214, 88} + {213, 88} + {213, 88} + {214, 88} + {214, 88} + {213, 88} + {213, 88} + {5, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/DialerViewController/2/DialerViewController.xib b/linphone.ldb/Resources/Classes/DialerViewController/3/DialerViewController.xib similarity index 83% rename from linphone.ldb/Resources/Classes/DialerViewController/2/DialerViewController.xib rename to linphone.ldb/Resources/Classes/DialerViewController/3/DialerViewController.xib index 00b0844df..ac00637cf 100644 --- a/linphone.ldb/Resources/Classes/DialerViewController/2/DialerViewController.xib +++ b/linphone.ldb/Resources/Classes/DialerViewController/3/DialerViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -51,7 +51,6 @@ 292 {320, 80} - _NS:9 NO @@ -66,7 +65,6 @@ 292 {320, 60} - 3 @@ -106,7 +104,6 @@ {320, 80} - _NS:9 @@ -129,7 +126,6 @@ 292 {{0, 11}, {107, 54}} - 1 @@ -172,7 +168,6 @@ 292 {{107, 11}, {106, 54}} - NO NO @@ -199,7 +194,6 @@ 292 {{213, 11}, {107, 54}} - NO NO @@ -226,7 +220,6 @@ 292 {{0, 73}, {107, 54}} - NO NO @@ -253,7 +246,6 @@ 292 {{107, 73}, {106, 54}} - NO NO @@ -280,7 +272,6 @@ 292 {{213, 73}, {107, 54}} - NO NO @@ -307,7 +298,6 @@ 292 {{0, 135}, {107, 54}} - NO NO @@ -334,7 +324,6 @@ 292 {{107, 135}, {106, 54}} - NO NO @@ -361,7 +350,6 @@ 292 {{213, 135}, {107, 54}} - NO NO @@ -388,7 +376,6 @@ 292 {{0, 197}, {107, 54}} - NO NO @@ -415,7 +402,6 @@ 292 {{107, 197}, {106, 54}} - NO NO @@ -442,7 +428,6 @@ 292 {{213, 197}, {107, 54}} - NO NO @@ -467,7 +452,6 @@ {{0, 58}, {320, 260}} - _NS:9 @@ -486,7 +470,6 @@ 292 {106, 69} - _NS:9 NO @@ -523,7 +506,6 @@ -2147483356 {106, 69} - _NS:9 NO @@ -556,7 +538,6 @@ 292 {{106, 0}, {108, 69}} - _NS:9 NO @@ -590,7 +571,6 @@ -2147483356 {{106, 0}, {108, 69}} - _NS:9 NO @@ -624,7 +604,6 @@ -2147483356 {{106, 0}, {108, 69}} - _NS:9 NO @@ -658,8 +637,6 @@ 292 {{214, 0}, {106, 69}} - - _NS:9 NO @@ -690,7 +667,6 @@ {{0, 305}, {320, 69}} - _NS:9 @@ -703,7 +679,6 @@ {320, 460} - _NS:9 @@ -1388,301 +1363,7 @@ 254 - - - YES - - DialerViewController - UIViewController - - YES - - YES - onAddContactClick: - onAddressChange: - onBackClick: - - - YES - id - id - id - - - - YES - - YES - onAddContactClick: - onAddressChange: - onBackClick: - - - YES - - onAddContactClick: - id - - - onAddressChange: - id - - - onBackClick: - id - - - - - YES - - YES - addCallButton - addContactButton - addressField - backButton - callButton - eightButton - eraseButton - fiveButton - fourButton - nineButton - oneButton - sevenButton - sharpButton - sixButton - starButton - threeButton - transferButton - twoButton - zeroButton - - - YES - UICallButton - UIButton - UITextField - UIButton - UICallButton - UIDigitButton - UIEraseButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UIDigitButton - UITransferButton - UIDigitButton - UIDigitButton - - - - YES - - YES - addCallButton - addContactButton - addressField - backButton - callButton - eightButton - eraseButton - fiveButton - fourButton - nineButton - oneButton - sevenButton - sharpButton - sixButton - starButton - threeButton - transferButton - twoButton - zeroButton - - - YES - - addCallButton - UICallButton - - - addContactButton - UIButton - - - addressField - UITextField - - - backButton - UIButton - - - 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 - - - zeroButton - UIDigitButton - - - - - IBProjectSource - ./Classes/DialerViewController.h - - - - UIAddressTextField - UITextField - - IBProjectSource - ./Classes/UIAddressTextField.h - - - - UICallButton - UIButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UICallButton.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 IBCocoaTouchFramework @@ -1691,7 +1372,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -1794,6 +1475,6 @@ {214, 138} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib b/linphone.ldb/Resources/Classes/DialerViewController~ipad/9/DialerViewController~ipad.xib similarity index 97% rename from linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib rename to linphone.ldb/Resources/Classes/DialerViewController~ipad/9/DialerViewController~ipad.xib index 60f9db3be..ae1c56e6a 100644 --- a/linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib +++ b/linphone.ldb/Resources/Classes/DialerViewController~ipad/9/DialerViewController~ipad.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -37,12 +37,26 @@ 292 + + + 301 + {{127, 150}, {510, 460}} + + + _NS:9 + 1 + NO + IBIPadFramework + + NSImage + logo_linphone_trame_background.png + + 301 {{-1000, -1000}, {2768, 2900}} - _NS:9 @@ -56,7 +70,6 @@ 274 {{0, 58}, {768, 842}} - 3 @@ -68,10 +81,9 @@ -2147483356 - {{0, 77}, {85, 33}} + {{20, 90}, {85, 33}} - - + _NS:9 NO @@ -113,7 +125,6 @@ 290 {768, 80} - _NS:9 NO @@ -128,7 +139,6 @@ 290 {700, 60} - 3 @@ -170,7 +180,6 @@ 289 {{698, 4}, {70, 51}} - _NS:9 NO @@ -206,7 +215,6 @@ {768, 80} - _NS:9 @@ -228,7 +236,6 @@ 274 {320, 280} - _NS:9 2 @@ -244,7 +251,6 @@ 292 {{0, 11}, {107, 54}} - 1 @@ -280,7 +286,6 @@ 292 {{107, 11}, {106, 54}} - NO NO @@ -307,7 +312,6 @@ 292 {{213, 11}, {107, 54}} - NO NO @@ -334,7 +338,6 @@ 292 {{0, 73}, {107, 54}} - NO NO @@ -361,7 +364,6 @@ 292 {{107, 73}, {106, 54}} - NO NO @@ -388,7 +390,6 @@ 292 {{213, 73}, {107, 54}} - NO NO @@ -415,7 +416,6 @@ 292 {{0, 135}, {107, 54}} - NO NO @@ -442,7 +442,6 @@ 292 {{107, 135}, {106, 54}} - NO NO @@ -469,7 +468,6 @@ 292 {{213, 135}, {107, 54}} - NO NO @@ -496,7 +494,6 @@ 292 {{0, 197}, {107, 54}} - NO NO @@ -523,7 +520,6 @@ 292 {{107, 197}, {106, 54}} - NO NO @@ -550,7 +546,6 @@ 292 {{213, 197}, {107, 54}} - NO NO @@ -575,7 +570,6 @@ {{0, 640}, {320, 260}} - _NS:9 @@ -590,7 +584,6 @@ 292 {126, 85} - _NS:9 NO @@ -624,7 +617,6 @@ -2147483356 {126, 85} - _NS:9 NO @@ -657,7 +649,6 @@ 292 {{126, 0}, {186, 85}} - _NS:9 NO @@ -691,7 +682,6 @@ -2147483356 {{126, 0}, {186, 85}} - _NS:9 NO @@ -725,8 +715,6 @@ -2147483356 {{126, 0}, {186, 85}} - - _NS:9 NO @@ -757,7 +745,6 @@ {{456, 815}, {312, 85}} - _NS:9 @@ -770,7 +757,6 @@ {768, 900} - _NS:9 @@ -1156,6 +1142,7 @@ + @@ -1324,12 +1311,6 @@ backspaceButton - - 70 - - - preview - 71 @@ -1345,9 +1326,22 @@ 76 + backgroundView + + 78 + + + backgroundImage + + + 70 + + + preview + @@ -1415,6 +1409,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1426,7 +1421,7 @@ - 77 + 78 @@ -1688,7 +1683,7 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -1710,6 +1705,7 @@ {371, 170} {371, 170} {640, 135} + {1019, 920} {220, 113} {220, 113} {220, 113} @@ -1734,12 +1730,12 @@ {220, 113} {220, 113} {220, 113} - {170, 65} - {170, 65} + {151, 51} + {151, 51} {371, 170} {371, 170} {371, 170} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/FirstLoginViewController/1/FirstLoginViewController.xib b/linphone.ldb/Resources/Classes/FirstLoginViewController/3/FirstLoginViewController.xib similarity index 82% rename from linphone.ldb/Resources/Classes/FirstLoginViewController/1/FirstLoginViewController.xib rename to linphone.ldb/Resources/Classes/FirstLoginViewController/3/FirstLoginViewController.xib index 80faa334c..992646430 100644 --- a/linphone.ldb/Resources/Classes/FirstLoginViewController/1/FirstLoginViewController.xib +++ b/linphone.ldb/Resources/Classes/FirstLoginViewController/3/FirstLoginViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -46,7 +46,6 @@ 292 {{33, 312}, {255, 50}} - _NS:9 NO @@ -58,9 +57,13 @@ 0 NO Login + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + - 3 - MC4zMzMzMzMzMzMzAA + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA 3 @@ -89,8 +92,6 @@ -2147483356 {{60, 420}, {200, 37}} - - NO NO IBCocoaTouchFramework @@ -122,7 +123,6 @@ 292 {{60, 170}, {200, 31}} - NO NO @@ -165,7 +165,6 @@ 292 {{60, 220}, {200, 31}} - NO NO @@ -204,7 +203,6 @@ 292 {{142, 211}, {37, 37}} - NO NO @@ -217,7 +215,6 @@ {320, 460} - 3 @@ -230,7 +227,6 @@ {320, 460} - _NS:9 @@ -432,7 +428,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -450,104 +446,7 @@ 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 @@ -556,7 +455,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -579,6 +478,6 @@ {542, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/4/HistoryDetailsViewController.xib similarity index 86% rename from linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib rename to linphone.ldb/Resources/Classes/HistoryDetailsViewController/4/HistoryDetailsViewController.xib index afce0f1a5..516273d34 100644 --- a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/4/HistoryDetailsViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -46,7 +46,6 @@ 290 {320, 44} - _NS:9 NO @@ -61,7 +60,6 @@ 292 {160, 44} - _NS:9 NO @@ -72,25 +70,38 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Back + + 2 + MCAwIDAAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_details_back_over.png - + NSImage history_details_back_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -99,7 +110,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -110,22 +120,28 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Add to contacts + + - + NSImage history_details_add_over.png - + NSImage history_details_add_default.png - - + + {320, 44} - _NS:9 @@ -146,7 +162,6 @@ 292 {320, 100} - _NS:9 NO @@ -165,15 +180,21 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 {{-13, -5}, {131, 107}} - _NS:9 NO @@ -188,7 +209,6 @@ 292 {{20, 6}, {65, 65}} - _NS:9 NO @@ -208,7 +228,6 @@ 290 {{101, 37}, {199, 43}} - _NS:9 NO @@ -240,7 +259,6 @@ {{0, 44}, {320, 100}} - _NS:9 @@ -258,7 +276,6 @@ 292 {49, 21} - _NS:9 NO @@ -288,7 +305,6 @@ 290 {{57, 0}, {223, 21}} - _NS:9 NO @@ -317,7 +333,6 @@ {{20, 166}, {280, 21}} - _NS:9 @@ -332,7 +347,6 @@ 292 {80, 21} - _NS:9 NO @@ -355,7 +369,6 @@ 290 {{88, 0}, {192, 21}} - _NS:9 NO @@ -377,7 +390,6 @@ {{20, 195}, {280, 21}} - _NS:9 @@ -392,7 +404,6 @@ 292 {57, 21} - _NS:9 NO @@ -415,7 +426,6 @@ 290 {{65, 0}, {215, 21}} - _NS:9 NO @@ -437,7 +447,6 @@ {{20, 224}, {280, 21}} - _NS:9 @@ -448,7 +457,6 @@ 293 {{33, 323}, {255, 50}} - _NS:9 NO @@ -487,7 +495,6 @@ {320, 460} - IBCocoaTouchFramework @@ -814,10 +821,12 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -826,101 +835,12 @@ 53 - - - - HistoryDetailsViewController - UIViewController - - id - id - id - id - - - - onAddContactClick: - id - - - onAddressClick: - id - - - onBackClick: - id - - - onContactClick: - id - - - - UIButton - UIButton - UILabel - UIImageView - UILabel - UILabel - UILabel - UILabel - UILabel - UILabel - - - - addContactButton - UIButton - - - addressButton - UIButton - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - dateHeaderLabel - UILabel - - - dateLabel - UILabel - - - durationHeaderLabel - UILabel - - - durationLabel - UILabel - - - typeHeaderLabel - UILabel - - - typeLabel - UILabel - - - - IBProjectSource - ./Classes/HistoryDetailsViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -932,9 +852,9 @@ {320, 88} {320, 88} {320, 88} - {320, 117} - {5, 117} + {320, 88} + {5, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/HistoryViewController/2/HistoryViewController.xib b/linphone.ldb/Resources/Classes/HistoryViewController/11/HistoryViewController.xib similarity index 66% rename from linphone.ldb/Resources/Classes/HistoryViewController/2/HistoryViewController.xib rename to linphone.ldb/Resources/Classes/HistoryViewController/11/HistoryViewController.xib index 8761a2255..f8e45dcac 100644 --- a/linphone.ldb/Resources/Classes/HistoryViewController/2/HistoryViewController.xib +++ b/linphone.ldb/Resources/Classes/HistoryViewController/11/HistoryViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -47,7 +47,6 @@ 290 {320, 44} - _NS:9 NO @@ -59,11 +58,10 @@ - -2147483356 + 292 {80, 44} - - + _NS:9 NO @@ -72,93 +70,149 @@ IBCocoaTouchFramework 0 0 - Del - - 3 - MQA - - - 1 + NO + 18 + 0.0 + 0.0 + 0.0 + Delete all + + 2 MCAwIDAAA + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - - 2 - 15 + + NSImage + history_delete_over.png - - Helvetica-Bold - 15 + + NSImage + history_delete_default.png + + + 1 + 14 + + + Helvetica + 14 16 - + - 292 - {{80, 0}, {80, 44}} + 293 + + + + 292 + {80, 44} + + + _NS:9 + + 2 + MC45NzY0NzA2NDkyIDAuOTc2NDcwNjQ5MiAwLjk3NjQ3MDY0OTIAA + + NO + + All contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + All + + + + + + NSImage + history_all_selected.png + + + + NSImage + history_all_default.png + + + 1 + 12 + + + Helvetica + 12 + 16 + + + + + 289 + {{80, 0}, {80, 44}} + + + _NS:9 + + NO + + Missed contacts filter + + IBCocoaTouchFramework + 0 + 0 + NO + 16 + 0.0 + 0.0 + 0.0 + Missed + + + + + + NSImage + history_missed_selected.png + + + + NSImage + history_missed_default.png + + + + + + {{80, 0}, {160, 44}} - - + _NS:9 - NO - - All contacts filter + + 3 + MQA + + 2 + IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - history_all_selected.png - - - - NSImage - history_all_default.png - - - - - - - 292 - {{160, 0}, {80, 44}} - - - - _NS:9 - NO - - Missed contacts filter - - IBCocoaTouchFramework - 0 - 0 - NO - - - NSImage - history_missed_selected.png - - - - NSImage - history_missed_default.png - - - 289 {{240, 0}, {80, 44}} - _NS:9 NO @@ -169,34 +223,39 @@ 0 0 NO + 18 + 0.0 + 0.0 + 0.0 + Ok + Edit + + - + NSImage history_edit_over.png - + NSImage history_ok_default.png - + NSImage history_edit_default.png - - + + {320, 44} - _NS:9 3 MQA - - 2 - + IBCocoaTouchFramework @@ -205,12 +264,10 @@ 274 {{0, 44}, {320, 416}} - - _NS:9 - 1 - MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA + 3 + MQA YES IBCocoaTouchFramework @@ -224,6 +281,10 @@ 0.0 0.0 1 + + 2 + MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA + 0 YES 44 @@ -233,13 +294,11 @@ {320, 460} - _NS:9 3 - MQA - + MCAwAA IBCocoaTouchFramework @@ -272,22 +331,6 @@ 26 - - - allButton - - - - 27 - - - - missedButton - - - - 28 - tableView @@ -312,6 +355,22 @@ 36 + + + allButton + + + + 27 + + + + missedButton + + + + 28 + onAllClick: @@ -405,27 +464,14 @@ 3 - - + toolsBar - - 4 - - - allButton - - - 5 - - - missedButton - 6 @@ -455,7 +501,29 @@ 35 - delAllButton + deleteButton + + + 38 + + + + + + + switchView + + + 4 + + + allButton + + + 5 + + + missedButton @@ -471,124 +539,47 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + - 37 - - - - - HistoryTableViewController - UITableViewController - - IBProjectSource - ./Classes/HistoryTableViewController.h - - - - HistoryViewController - UIViewController - - id - id - id - id - - - - onAllClick: - id - - - onDeleteClick: - id - - - onEditClick: - id - - - onMissedClick: - id - - - - UIButton - UIButton - UIToggleButton - UIButton - HistoryTableViewController - UITableView - - - - allButton - UIButton - - - deleteButton - UIButton - - - editButton - UIToggleButton - - - missedButton - UIButton - - - tableController - HistoryTableViewController - - - tableView - UITableView - - - - IBProjectSource - ./Classes/HistoryViewController.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - + 38 + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {213, 117} - {213, 117} + {160, 88} + {160, 88} + {160, 88} + {160, 88} {160, 88} {160, 88} - {213, 117} - {213, 117} + {160, 88} + {160, 88} {160, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib b/linphone.ldb/Resources/Classes/ImageViewController/8/ImageViewController.xib similarity index 80% rename from linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib rename to linphone.ldb/Resources/Classes/ImageViewController/8/ImageViewController.xib index 6db298265..c3e4877f0 100644 --- a/linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib +++ b/linphone.ldb/Resources/Classes/ImageViewController/8/ImageViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -41,8 +41,6 @@ 274 {{0, 44}, {320, 416}} - - _NS:9 3 @@ -61,7 +59,6 @@ 290 {320, 44} - _NS:9 NO @@ -76,7 +73,6 @@ 292 {160, 44} - _NS:9 NO @@ -88,13 +84,18 @@ 0 NO NO + 18 + 0.0 + 0.0 + 0.0 + Back - 3 - MQA + 2 + MCAwIDAAA - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA 3 @@ -109,19 +110,18 @@ image_back_default.png - 2 - 15 + 1 + 14 - Helvetica-Bold - 15 + Helvetica + 14 16 {320, 44} - _NS:9 @@ -130,7 +130,6 @@ {{0, 20}, {320, 460}} - @@ -241,7 +240,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + @@ -249,56 +249,20 @@ 11 - - - - ImageViewController - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - UIButton - UIImageView - - - - backButton - UIButton - - - imageView - UIImageView - - - - IBProjectSource - ./Classes/ImageViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib b/linphone.ldb/Resources/Classes/InCallViewController/4/InCallViewController.xib similarity index 79% rename from linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib rename to linphone.ldb/Resources/Classes/InCallViewController/4/InCallViewController.xib index 87f56054e..03d8739de 100644 --- a/linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib +++ b/linphone.ldb/Resources/Classes/InCallViewController/4/InCallViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 YES @@ -52,7 +52,6 @@ 301 {{-1000, -1000}, {2000, 2000}} - _NS:9 @@ -66,7 +65,6 @@ 274 {320, 460} - _NS:196 @@ -80,7 +78,6 @@ 283 {{220, 360}, {100, 100}} - 1 @@ -91,7 +88,6 @@ 301 {{141, 212}, {37, 37}} - _NS:1030 NO @@ -103,7 +99,6 @@ {320, 460} - _NS:196 @@ -114,7 +109,6 @@ 274 {{0, -10}, {320, 480}} - _NS:418 @@ -143,9 +137,8 @@ -2147483356 - {{0, 23}, {85, 33}} + {{20, 40}, {85, 33}} - _NS:9 NO @@ -181,7 +174,6 @@ {320, 460} - NO @@ -448,120 +440,7 @@ 173 - - - YES - - InCallTableViewController - UITableViewController - - IBProjectSource - ./Classes/InCallTableViewController.h - - - - InCallViewController - UIViewController - - YES - - YES - callTableController - callTableView - testVideoView - videoCameraSwitch - videoGroup - videoPreview - videoView - videoWaitingForFirstImage - - - YES - InCallTableViewController - UITableView - UIView - UICamSwitch - UIView - UIView - UIView - UIActivityIndicatorView - - - - YES - - YES - callTableController - callTableView - testVideoView - videoCameraSwitch - videoGroup - videoPreview - videoView - videoWaitingForFirstImage - - - YES - - callTableController - InCallTableViewController - - - callTableView - UITableView - - - testVideoView - UIView - - - videoCameraSwitch - UICamSwitch - - - videoGroup - UIView - - - videoPreview - UIView - - - videoView - UIView - - - videoWaitingForFirstImage - UIActivityIndicatorView - - - - - IBProjectSource - ./Classes/InCallViewController.h - - - - UICamSwitch - UIButton - - preview - UIView - - - preview - - preview - UIView - - - - IBProjectSource - ./Classes/UICamSwitch.h - - - - + 0 IBCocoaTouchFramework @@ -570,7 +449,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -587,10 +466,10 @@ YES - {170, 65} - {170, 65} + {151, 51} + {151, 51} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/IncomingCallViewController/1/IncomingCallViewController.xib b/linphone.ldb/Resources/Classes/IncomingCallViewController/3/IncomingCallViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/IncomingCallViewController/1/IncomingCallViewController.xib rename to linphone.ldb/Resources/Classes/IncomingCallViewController/3/IncomingCallViewController.xib index 2f8fa4b70..12fa76ae0 100644 --- a/linphone.ldb/Resources/Classes/IncomingCallViewController/1/IncomingCallViewController.xib +++ b/linphone.ldb/Resources/Classes/IncomingCallViewController/3/IncomingCallViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -42,7 +42,6 @@ 274 {320, 460} - _NS:9 NO @@ -64,7 +63,6 @@ 290 {{0, 49}, {320, 63}} - _NS:9 NO @@ -79,7 +77,6 @@ 290 {320, 68} - _NS:9 NO @@ -98,7 +95,6 @@ 292 {{10, 53}, {300, 51}} - _NS:9 NO @@ -4522,7 +4518,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 293 {{0, 96}, {320, 262}} - _NS:9 NO @@ -4537,7 +4532,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 293 {{80, 113}, {160, 170}} - _NS:9 NO @@ -4555,7 +4549,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 395} - _NS:9 @@ -4570,7 +4563,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483374 {{0, 10}, {320, 67}} - _NS:9 @@ -4589,7 +4581,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 278 {160, 77} - _NS:9 NO @@ -4626,8 +4617,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 275 {{160, 0}, {160, 77}} - - _NS:9 NO @@ -4651,7 +4640,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {{0, 383}, {320, 77}} - _NS:9 @@ -4660,7 +4648,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 460} - _NS:9 @@ -4846,51 +4833,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 30 - - - - IncomingCallViewController - UIViewController - - id - id - - - - onAcceptClick: - id - - - onDeclineClick: - id - - - - UILabel - UIImageView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - - IBProjectSource - ./Classes/IncomingCallViewController.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -4905,6 +4853,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 154} {640, 135} - 1498 + 1926 diff --git a/linphone.ldb/Resources/Classes/WizardViewController/12/WizardViewController.xib b/linphone.ldb/Resources/Classes/WizardViewController/12/WizardViewController.xib new file mode 100644 index 000000000..19ddd7f5d --- /dev/null +++ b/linphone.ldb/Resources/Classes/WizardViewController/12/WizardViewController.xib @@ -0,0 +1,446 @@ + + + + 1536 + 11E53 + 2840 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + + IBProxyObject + IBUIActivityIndicatorView + IBUIButton + IBUIScrollView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + {320, 394} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 294 + {160, 77} + + + _NS:9 + NO + 3 + + Cancel + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 35 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + setup_cancel_over.png + + + NSImage + setup_cancel_disabled.png + + + NSImage + setup_cancel_default.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 291 + {{160, 0}, {160, 77}} + + + _NS:9 + NO + 4 + + Start + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 35 + 0.0 + 10 + 0.0 + Start + + + + + NSImage + setup_start_over.png + + + NSImage + setup_start_default.png + + + + + + + -2147483357 + {{160, 0}, {160, 77}} + + _NS:9 + NO + 5 + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 35 + 0.0 + 10 + 0.0 + Back + + + + + NSImage + setup_back_over.png + + + NSImage + setup_back_disabled.png + + + NSImage + setup_back_default.png + + + + + + {{0, 383}, {320, 77}} + + + _NS:9 + + 3 + MCAwAA + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{142, 211}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {320, 460} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {320, 460} + + + _NS:9 + + IBCocoaTouchFramework + + + + + + + view + + + + 20 + + + + startButton + + + + 26 + + + + backButton + + + + 27 + + + + contentView + + + + 99 + + + + waitView + + + + 96 + + + + portraitView + + + + 117 + + + + onStartClick: + + + 7 + + 25 + + + + onBackClick: + + + 7 + + 23 + + + + onCancelClick: + + + 7 + + 24 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 12 + + + + + + + + + + 98 + + + contentView + + + 14 + + + + + + + + tabBar + + + 18 + + + cancelButton + + + 16 + + + startButton + + + 17 + + + backButton + + + 91 + + + + + + waitView + + + 90 + + + activityIndicatorView + + + + + WizardViewController + 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 + + + + + + 117 + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {320, 154} + {320, 154} + {320, 154} + {320, 154} + {320, 154} + {320, 154} + {320, 154} + {320, 154} + + 1926 + + diff --git a/linphone.ldb/Resources/Classes/WizardViewController~ipad/8/WizardViewController~ipad.xib b/linphone.ldb/Resources/Classes/WizardViewController~ipad/8/WizardViewController~ipad.xib new file mode 100644 index 000000000..0b2e69b39 --- /dev/null +++ b/linphone.ldb/Resources/Classes/WizardViewController~ipad/8/WizardViewController~ipad.xib @@ -0,0 +1,799 @@ + + + + 1536 + 11E53 + 2840 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + + IBProxyObject + IBUIActivityIndicatorView + IBUIButton + IBUIScrollView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + {768, 966} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {768, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {384, 77} + + + _NS:9 + NO + 3 + + Cancel + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + setup_cancel_over~ipad.png + + + NSImage + setup_cancel_disabled~ipad.png + + + NSImage + setup_cancel_default~ipad.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 291 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 4 + + Start + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Start + + + + + NSImage + setup_start_over~ipad.png + + + NSImage + setup_start_default~ipad.png + + + + + + + -2147483357 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 5 + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Back + + + + + NSImage + setup_back_over~ipad.png + + + NSImage + setup_back_disabled~ipad.png + + + NSImage + setup_back_default~ipad.png + + + + + + {{0, 947}, {768, 77}} + + + _NS:9 + + 3 + MCAwAA + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{366, 492}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {768, 1024} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {768, 1024} + + + _NS:9 + + IBCocoaTouchFramework + + + + 292 + + + + 274 + {1024, 711} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {1024, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {512, 77} + + + _NS:9 + NO + 3 + + Cancel + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + + NSImage + setup_cancel_over_landscape~ipad.png + + + NSImage + setup_cancel_disabled_landscape~ipad.png + + + NSImage + setup_cancel_default_landscape~ipad.png + + + + + + + 291 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 4 + + Start + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Start + + + + + NSImage + setup_start_over_landscape~ipad.png + + + NSImage + setup_start_default_landscape~ipad.png + + + + + + + -2147483357 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 5 + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Back + + + + + NSImage + setup_back_over_landscape~ipad.png + + + NSImage + setup_back_disabled_landscape~ipad.png + + + NSImage + setup_back_default_landscape~ipad.png + + + + + + {{0, 691}, {1024, 77}} + + + _NS:9 + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{494, 364}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {1024, 768} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {1024, 768} + + + _NS:9 + + IBCocoaTouchFramework + + + + + + + view + + + + 20 + + + + startButton + + + + 26 + + + + backButton + + + + 27 + + + + contentView + + + + 99 + + + + portraitView + + + + 117 + + + + waitView + + + + 131 + + + + landscapeView + + + + 134 + + + + onStartClick: + + + 7 + + 25 + + + + onBackClick: + + + 7 + + 23 + + + + onCancelClick: + + + 7 + + 24 + + + + onCancelClick: + + + 7 + + 128 + + + + onStartClick: + + + 7 + + 126 + + + + onBackClick: + + + 7 + + 127 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 12 + + + + + + + + Portrait View + + + 98 + + + contentView + + + 14 + + + + + + + + + tabBar + + + 18 + + + cancelButton + + + 16 + + + startButton + + + 17 + + + backButton + + + 118 + + + + + + + + Landscape View + + + 119 + + + contentView + + + 120 + + + + + + + + + tabBar + + + 122 + + + cancelButton + + + 123 + + + startButton + + + 124 + + + backButton + + + 129 + + + + + + waitView + + + 130 + + + activityIndicatorView + + + 132 + + + + + + waitView + + + 133 + + + activityIndicatorView + + + 137 + + + background + + + 136 + + + background + + + + + WizardViewController + 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 + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 137 + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + + 1926 + + diff --git a/linphone.ldb/Resources/Classes/WizardViews/10/WizardViews.xib b/linphone.ldb/Resources/Classes/WizardViews/10/WizardViews.xib new file mode 100644 index 000000000..a215fb722 --- /dev/null +++ b/linphone.ldb/Resources/Classes/WizardViews/10/WizardViews.xib @@ -0,0 +1,1721 @@ + + + + 1536 + 11E53 + 2840 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + + IBProxyObject + IBUIButton + IBUIImageView + IBUILabel + IBUITextField + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{60, 80}, {201, 129}} + + + + _NS:9 + 1 + NO + + Linphone setup assistant icon + + + IBCocoaTouchFramework + + NSImage + setup_welcome_logo.png + + + + + 311 + {{31, 230}, {258, 40}} + + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + 1 + MCAwIDAAA + darkTextColor + + + + 3 + MC4zMzMzMzMzMzMzAA + + {-1, -1} + 0 + 10 + 1 + + 3 + 20 + + + Helvetica-Oblique + 20 + 16 + + + + + 282 + {{40, 290}, {240, 44}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + This assistant will help you to use a SIP account for your calls. + + + 0 + 10 + 0 + 1 + + 1 + 12 + + + Helvetica + 12 + 16 + + NO + 240 + + + {320, 394} + + + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 319 + {{33, 141}, {255, 50}} + + + + _NS:9 + NO + + Create linphone.org account + + + IBCocoaTouchFramework + 0 + 0 + NO + Create an account on linphone.org + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + button_background_over.png + + + NSImage + button_background_default.png + + + 2 + 13 + + + Helvetica-Bold + 13 + 16 + + + + + 319 + {{33, 205}, {255, 50}} + + + + _NS:9 + NO + + Sign in linphone.org account + + + IBCocoaTouchFramework + 0 + 0 + NO + I have already a linphone.org account + + + + + + + + + + + 319 + {{33, 269}, {255, 50}} + + + + _NS:9 + NO + + Sign in SIP account + + + IBCocoaTouchFramework + 0 + 0 + NO + I have already a SIP account + + + + + + + + + + {320, 394} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 298 + {{39, 80}, {240, 44}} + + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Enter your username and password with your email address. + + + 0 + 10 + 0 + 1 + + + NO + 240 + + + + 319 + {{32, 140}, {255, 31}} + + + + _NS:9 + NO + YES + 100 + + Username + + IBCocoaTouchFramework + 0 + + Username + + 3 + MAA + + 2 + + + 10 + + 1 + IBCocoaTouchFramework + + + NSImage + field_background.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 319 + {{32, 185}, {255, 31}} + + + + _NS:9 + NO + YES + 101 + + Password + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 230}, {255, 31}} + + + + _NS:9 + NO + YES + 102 + + Password again + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 275}, {255, 31}} + + + + _NS:9 + NO + YES + 103 + + Email + + IBCocoaTouchFramework + 0 + + Email + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{33, 330}, {255, 50}} + + + + _NS:9 + NO + + Register + + IBCocoaTouchFramework + 0 + 0 + NO + Register + + + + + + + 2 + 20 + + + Helvetica-Bold + 20 + 16 + + + + {320, 394} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 298 + {{40, 80}, {240, 44}} + + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Enter your username and password of your linphone.org account. + + + 0 + 10 + 0 + 1 + + + NO + 240 + + + + 319 + {{32, 185}, {255, 31}} + + + + _NS:9 + NO + YES + 101 + + Password + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 140}, {255, 31}} + + + + _NS:9 + NO + YES + 100 + + Username + + IBCocoaTouchFramework + 0 + + Username + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{32, 330}, {255, 50}} + + + + _NS:9 + NO + + Sign in + + IBCocoaTouchFramework + 0 + 0 + NO + Sign in + + + + + + + + + + {320, 394} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 298 + {{40, 80}, {240, 44}} + + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Enter your username and password with your SIP domain. + + + 0 + 10 + 0 + 1 + + + NO + 240 + + + + 319 + {{33, 140}, {255, 31}} + + + + _NS:9 + NO + YES + 100 + + Username + + IBCocoaTouchFramework + 0 + + Username + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 319 + {{33, 185}, {255, 31}} + + + + _NS:9 + NO + YES + 101 + + Password + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{33, 230}, {255, 31}} + + + + _NS:9 + NO + YES + 104 + + Domain + + IBCocoaTouchFramework + 0 + + Domain + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{34, 330}, {255, 50}} + + + + _NS:9 + NO + + Sign in + + IBCocoaTouchFramework + 0 + 0 + NO + Sign in + + + + + + + + + + {320, 394} + + + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 298 + {{40, 80}, {240, 44}} + + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Your account is created. Please check your mails in order to validate your account. + + + 0 + 10 + 0 + 1 + + + NO + 240 + + + + -2147483329 + {{32, 185}, {255, 31}} + + + + _NS:9 + NO + YES + 101 + + + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + -2147483329 + {{32, 140}, {255, 31}} + + + + _NS:9 + NO + YES + 100 + + + + IBCocoaTouchFramework + 0 + + Username + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{32, 330}, {255, 50}} + + + + _NS:9 + NO + + Check validation + + IBCocoaTouchFramework + 0 + 0 + NO + Check validation + + + + + + + + + + {320, 394} + + + + _NS:9 + + IBCocoaTouchFramework + + + + + + + welcomeView + + + + 28 + + + + choiceView + + + + 40 + + + + createAccountView + + + + 70 + + + + connectAccountView + + + + 71 + + + + externalAccountView + + + + 72 + + + + validateAccountView + + + + 112 + + + + onCreateAccountClick: + + + 7 + + 42 + + + + onConnectAccountClick: + + + 7 + + 41 + + + + onExternalAccountClick: + + + 7 + + 43 + + + + delegate + + + + 86 + + + + delegate + + + + 87 + + + + delegate + + + + 88 + + + + onSignInExternalClick: + + + 7 + + 115 + + + + onSignInClick: + + + 7 + + 116 + + + + delegate + + + + 85 + + + + delegate + + + + 81 + + + + delegate + + + + 80 + + + + delegate + + + + 82 + + + + delegate + + + + 83 + + + + onRegisterClick: + + + 7 + + 113 + + + + delegate + + + + 84 + + + + onCheckValidationClick: + + + 7 + + 114 + + + + delegate + + + + 109 + + + + delegate + + + + 110 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 21 + + + + + + + + welcomeView + + + 19 + + + iconImage + + + 22 + + + label + + + 33 + + + + + + + + + choiceView + + + 44 + + + + + + + + + + + + createAccountView + + + 52 + + + + + + + + + + connectAccountView + + + 56 + + + + + + + + + + + externalAccountView + + + 58 + + + label + + + 59 + + + usernameField + + + 60 + + + passwordField + + + 61 + + + domainField + + + 62 + + + signInButton + + + 66 + + + passwordField + + + 67 + + + label + + + 68 + + + usernameField + + + 73 + + + label + + + 74 + + + usernameField + + + 75 + + + passwordField + + + 76 + + + password2Field + + + 77 + + + registerButton + + + 79 + + + emailField + + + 39 + + + externalAccountButton + + + 38 + + + connectAccountButton + + + 36 + + + createAccountButton + + + 101 + + + + + + + + + + validateAccountView + + + 103 + + + checkValidationButton + + + 105 + + + label + + + 104 + + + usernameField + + + 106 + + + passwordField + + + 117 + + + title + + + 122 + + + title + + + 123 + + + title + + + 124 + + + title + + + 126 + + + title + + + 64 + + + signInButton + + + 127 + + + title + + + + + WizardViewController + 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 + + 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 + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 127 + + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + WizardViewController + TPMultiLayoutViewController + + id + id + id + id + id + id + id + id + id + id + + + + onBackClick: + id + + + onCancelClick: + id + + + onCheckValidationClick: + id + + + onConnectAccountClick: + id + + + onCreateAccountClick: + id + + + onExternalAccountClick: + id + + + onRegisterClick: + id + + + onSignInClick: + id + + + onSignInExternalClick: + id + + + onStartClick: + id + + + + UIButton + UIView + UIView + UIScrollView + UIView + UIView + UIButton + UIView + UIView + UIView + + + + backButton + UIButton + + + choiceView + UIView + + + connectAccountView + UIView + + + contentView + UIScrollView + + + createAccountView + UIView + + + externalAccountView + UIView + + + startButton + UIButton + + + validateAccountView + UIView + + + waitView + UIView + + + welcomeView + UIView + + + + IBProjectSource + ./Classes/WizardViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {550, 101} + {550, 101} + {542, 88} + {179, 161} + + 1926 + + diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar/2/UICallBar.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar/7/UICallBar.xib similarity index 85% rename from linphone.ldb/Resources/LinphoneUI/UICallBar/2/UICallBar.xib rename to linphone.ldb/Resources/LinphoneUI/UICallBar/7/UICallBar.xib index dba37abd8..7454c922c 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallBar/2/UICallBar.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallBar/7/UICallBar.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -42,8 +42,6 @@ -2147483356 {{0, 335}, {320, 125}} - - _NS:9 1 @@ -65,7 +63,6 @@ 274 {281, 260} - _NS:9 2 @@ -81,7 +78,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -125,7 +121,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -153,7 +148,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -181,7 +175,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -209,7 +202,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -237,7 +229,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -265,7 +256,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -293,7 +283,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -321,7 +310,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -349,7 +337,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -377,7 +364,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -405,7 +391,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -431,7 +416,6 @@ {{20, 57}, {281, 260}} - _NS:9 @@ -450,7 +434,6 @@ 292 {{3, 0}, {77, 68}} - _NS:9 NO @@ -463,31 +446,51 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfer + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + - + NSImage options_transfer_over.png - + NSImage options_transfer_disabled.png - + NSImage options_transfer_default.png - - 2 - 15 + + 1 + 13 + + + Helvetica + 13 + 16 - 292 {{3, 61}, {77, 68}} - _NS:9 NO @@ -500,26 +503,33 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Add call + + + - + NSImage options_add_over.png - + NSImage options_add_disabled.png - + NSImage options_add_default.png - - + + {{240, 205}, {80, 129}} - _NS:9 @@ -535,7 +545,6 @@ 290 {{0, 135}, {320, 2000}} - _NS:9 @@ -550,7 +559,6 @@ 292 {80, 67} - _NS:9 NO @@ -563,32 +571,40 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Video + + + + - + NSImage video_off_over.png - + NSImage video_off_disabled.png - + NSImage video_on_default.png - + NSImage video_off_default.png - - + + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -601,7 +617,6 @@ 292 {{80, 0}, {80, 67}} - _NS:9 NO @@ -614,32 +629,40 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over.png - + NSImage micro_off_disabled.png - + NSImage micro_on_default.png - + NSImage micro_off_default.png - - + + 292 {{160, 0}, {80, 67}} - _NS:9 NO @@ -652,32 +675,40 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Speaker + + + + - + NSImage speaker_off_over.png - + NSImage speaker_off_disabled.png - + NSImage speaker_on_default.png - + NSImage speaker_off_default.png - - + + 292 {{240, 0}, {80, 67}} - _NS:9 NO @@ -690,32 +721,40 @@ 0 NO NO + 38 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over.png - + NSImage options_disabled.png - + NSImage options_selected.png - + NSImage options_default.png - - + + 264 {{0, 67}, {105, 68}} - _NS:9 NO @@ -741,7 +780,10 @@ NSImage pause_off_default.png - + + 2 + 15 + @@ -749,7 +791,6 @@ -2147483384 {{0, 67}, {105, 68}} - _NS:9 NO @@ -779,7 +820,6 @@ 264 {{105, 67}, {111, 68}} - _NS:9 NO @@ -809,7 +849,6 @@ 264 {{215, 67}, {105, 68}} - _NS:9 NO @@ -827,6 +866,10 @@ NSImage dialer_alt_over.png + + NSImage + dialer_alt_disabled.png + NSImage dialer_alt_back_default.png @@ -841,7 +884,6 @@ {{0, 325}, {320, 135}} - _NS:9 @@ -851,7 +893,6 @@ {320, 460} - _NS:9 @@ -867,7 +908,6 @@ -2147483356 {{0, 248}, {480, 72}} - _NS:9 @@ -890,7 +930,6 @@ 274 {281, 260} - _NS:9 2 @@ -903,7 +942,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -926,7 +964,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -945,7 +982,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -964,7 +1000,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -983,7 +1018,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -1002,7 +1036,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -1021,7 +1054,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -1040,7 +1072,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -1059,7 +1090,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -1078,7 +1108,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -1097,7 +1126,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -1116,8 +1144,6 @@ 292 {{193, 196}, {107, 54}} - - NO NO 14 @@ -1133,7 +1159,6 @@ {{91, 0}, {281, 260}} - _NS:9 @@ -1149,7 +1174,6 @@ 292 {65, 55} - _NS:9 NO @@ -1162,28 +1186,35 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfer + + + - + NSImage options_transfer_over_landscape.png - + NSImage options_transfer_disabled_landscape.png - + NSImage options_transfer_default_landscape.png - - + + 292 {{0, 51}, {65, 55}} - _NS:9 NO @@ -1196,26 +1227,33 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Add call + + + - + NSImage options_add_over_landscape.png - + NSImage options_add_disabled_landscape.png - + NSImage options_add_default_landscape.png - - + + {{415, 140}, {65, 105}} - _NS:9 @@ -1231,7 +1269,6 @@ 290 {{0, 82}, {480, 2000}} - _NS:9 @@ -1246,7 +1283,6 @@ 292 {{65, 0}, {65, 82}} - _NS:9 NO @@ -1259,32 +1295,40 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Video + + + + - + NSImage video_off_over_landscape.png - + NSImage video_off_disabled_landscape.png - + NSImage video_on_default_landscape.png - + NSImage video_off_default_landscape.png - - + + -2147483356 {{79, 20}, {37, 37}} - _NS:9 NO @@ -1297,7 +1341,6 @@ 292 {{130, 0}, {65, 82}} - _NS:9 NO @@ -1310,32 +1353,40 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over_landscape.png - + NSImage micro_off_disabled_landscape.png - + NSImage micro_on_default_landscape.png - + NSImage micro_off_default_landscape.png - - + + 292 {{285, 0}, {65, 82}} - _NS:9 NO @@ -1348,32 +1399,40 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Speaker + + + + - + NSImage speaker_off_over_landscape.png - + NSImage speaker_off_disabled_landscape.png - + NSImage speaker_on_default_landscape.png - + NSImage speaker_off_default_landscape.png - - + + 292 {{350, 0}, {65, 82}} - _NS:9 NO @@ -1386,32 +1445,40 @@ 0 NO NO + 24 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over_landscape.png - + NSImage options_disabled_landscape.png - + NSImage options_selected_landscape.png - + NSImage options_default_landscape.png - - + + 264 {65, 82} - _NS:9 NO @@ -1445,7 +1512,6 @@ -2147483384 {65, 82} - _NS:9 NO @@ -1475,7 +1541,6 @@ 264 {{195, 0}, {90, 82}} - _NS:9 NO @@ -1505,7 +1570,6 @@ 264 {{415, 0}, {65, 82}} - _NS:9 NO @@ -1523,21 +1587,21 @@ NSImage dialer_alt_over_landscape.png + + NSImage + dialer_alt_default_landscape.png + NSImage dialer_alt_back_default_landscape.png - - NSImage - dialer_alt_default_landscape.png - + {{0, 238}, {480, 82}} - _NS:9 @@ -1547,7 +1611,6 @@ {480, 320} - _NS:9 @@ -2383,7 +2446,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2393,10 +2457,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIPauseButton @@ -2404,18 +2468,23 @@ UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton @@ -2435,7 +2504,8 @@ UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2458,8 +2528,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2473,7 +2545,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2500,7 +2572,7 @@ UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2515,14 +2587,17 @@ UIPauseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2532,292 +2607,12 @@ 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 @@ -2831,6 +2626,7 @@ {530, 526} {209, 136} {130, 163} + {209, 136} {209, 136} {130, 163} {222, 136} @@ -2912,6 +2708,6 @@ {160, 134} {130, 163} - 1498 + 1926 diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/2/UICallBar~ipad.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/6/UICallBar~ipad.xib similarity index 90% rename from linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/2/UICallBar~ipad.xib rename to linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/6/UICallBar~ipad.xib index 001250eae..a213bd86a 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/2/UICallBar~ipad.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/6/UICallBar~ipad.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -42,7 +42,6 @@ -2147483356 {{0, 680}, {1024, 68}} - _NS:9 @@ -65,7 +64,6 @@ 274 {281, 260} - _NS:9 2 @@ -81,7 +79,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -122,7 +119,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -147,7 +143,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -172,7 +167,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -197,7 +191,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -222,7 +215,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -247,7 +239,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -272,7 +263,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -297,7 +287,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -322,7 +311,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -347,7 +335,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -372,7 +359,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -395,7 +381,6 @@ {{372, 244}, {281, 260}} - _NS:9 @@ -414,7 +399,6 @@ 292 {81, 69} - _NS:9 NO @@ -427,32 +411,52 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfer + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + - + NSImage options_transfer_over_landscape~ipad.png - + NSImage options_transfer_disabled_landscape~ipad.png - + NSImage options_transfer_default_landscape~ipad.png - - 2 - 15 + + 1 + 13 + + + Helvetica + 13 + 16 - 292 {{0, 65}, {81, 69}} - - _NS:9 NO 17 @@ -464,26 +468,34 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Add call + + + + - + NSImage options_add_over_landscape~ipad.png - + NSImage options_add_disabled_landscape~ipad.png - + NSImage options_add_default_landscape~ipad.png - - + + {{239, 552}, {81, 133}} - _NS:9 @@ -499,7 +511,6 @@ 290 {{0, 85}, {1024, 2000}} - _NS:9 @@ -514,7 +525,6 @@ 292 {80, 85} - _NS:9 NO @@ -527,32 +537,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Video + + + + - + NSImage video_off_over_landscape~ipad.png - + NSImage video_off_disabled_landscape~ipad.png - + NSImage video_on_default_landscape~ipad.png - + NSImage video_off_default_landscape~ipad.png - - + + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -565,7 +583,6 @@ 292 {{80, 0}, {80, 85}} - _NS:9 NO @@ -578,32 +595,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over_landscape~ipad.png - + NSImage micro_off_disabled_landscape~ipad.png - + NSImage micro_on_default_landscape~ipad.png - + NSImage micro_off_default_landscape~ipad.png - - + + 292 {{160, 0}, {80, 85}} - _NS:9 NO @@ -616,32 +641,41 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Speaker + Speaker + + + + - + NSImage speaker_off_over_landscape~ipad.png - + NSImage speaker_off_disabled_landscape~ipad.png - + NSImage speaker_on_default_landscape~ipad.png - + NSImage speaker_off_default_landscape~ipad.png - - + + 292 {{240, 0}, {80, 85}} - _NS:9 NO @@ -654,32 +688,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over_landscape~ipad.png - + NSImage options_disabled_landscape~ipad.png - + NSImage options_selected_landscape~ipad.png - + NSImage options_default_landscape~ipad.png - - + + 264 {{701, 0}, {87, 85}} - _NS:9 NO @@ -705,7 +747,10 @@ NSImage pause_off_default_landscape~ipad.png - + + 2 + 15 + @@ -713,7 +758,6 @@ -2147483384 {{701, 0}, {87, 85}} - _NS:9 NO @@ -743,7 +787,6 @@ 264 {{875, 0}, {149, 85}} - _NS:9 NO @@ -773,7 +816,6 @@ 264 {{788, 0}, {87, 85}} - _NS:9 NO @@ -791,21 +833,21 @@ NSImage dialer_alt_over_landscape~ipad.png + + NSImage + dialer_alt_default_landscape~ipad.png + NSImage dialer_alt_back_default_landscape~ipad.png - - NSImage - dialer_alt_default_landscape~ipad.png - + {{0, 663}, {1024, 85}} - _NS:9 @@ -815,7 +857,6 @@ {1024, 748} - _NS:9 @@ -835,7 +876,6 @@ -2147483356 {{0, 936}, {768, 68}} - _NS:9 @@ -858,7 +898,6 @@ 274 {281, 260} - _NS:9 2 @@ -871,7 +910,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -897,7 +935,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -919,7 +956,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -941,7 +977,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -963,7 +998,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -985,7 +1019,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -1007,7 +1040,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -1029,7 +1061,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -1051,7 +1082,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -1073,7 +1103,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -1095,7 +1124,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -1117,7 +1145,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -1137,7 +1164,6 @@ {{244, 372}, {281, 260}} - _NS:9 @@ -1153,7 +1179,6 @@ 292 {81, 69} - _NS:9 NO @@ -1166,29 +1191,36 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Transfer + + + + - + NSImage options_transfer_over~ipad.png - + NSImage options_transfer_disabled~ipad.png - + NSImage options_transfer_default~ipad.png - - + + 292 {{0, 64}, {81, 69}} - - _NS:9 NO 17 @@ -1200,26 +1232,30 @@ 0 NO NO + 28 + 0.0 + 0.0 + 0.0 + Add call + + + + - + NSImage options_add_over~ipad.png - - NSImage - options_add_disabled~ipad.png - - + NSImage options_add_default~ipad.png - - + + {{239, 809}, {81, 133}} - _NS:9 @@ -1235,7 +1271,6 @@ 290 {{0, 85}, {768, 2000}} - _NS:9 @@ -1250,7 +1285,6 @@ 292 {80, 85} - _NS:9 NO @@ -1263,32 +1297,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Video + + + + - + NSImage video_off_over~ipad.png - + NSImage video_off_disabled~ipad.png - + NSImage video_on_default~ipad.png - + NSImage video_off_default~ipad.png - - + + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -1301,7 +1343,6 @@ 292 {{80, 0}, {80, 85}} - _NS:9 NO @@ -1314,32 +1355,36 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Micro + + + + - + NSImage micro_off_over~ipad.png - - NSImage - micro_off_disabled~ipad.png - - + NSImage micro_on_default~ipad.png - + NSImage micro_off_default~ipad.png - - + + 292 {{160, 0}, {80, 85}} - _NS:9 NO @@ -1352,32 +1397,41 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Speaker + Speaker + + + + - + NSImage speaker_off_over~ipad.png - + NSImage speaker_off_disabled~ipad.png - + NSImage speaker_on_default~ipad.png - + NSImage speaker_off_default~ipad.png - - + + 292 {{240, 0}, {80, 85}} - _NS:9 NO @@ -1390,32 +1444,40 @@ 0 NO NO + 54 + 0.0 + 0.0 + 0.0 + Options + + + + - + NSImage options_over~ipad.png - + NSImage options_disabled~ipad.png - + NSImage options_selected~ipad.png - + NSImage options_default~ipad.png - - + + 264 {{445, 0}, {87, 85}} - _NS:9 NO @@ -1449,7 +1511,6 @@ -2147483384 {{445, 0}, {87, 85}} - _NS:9 NO @@ -1479,7 +1540,6 @@ 264 {{619, 0}, {149, 85}} - _NS:9 NO @@ -1509,7 +1569,6 @@ 264 {{532, 0}, {87, 85}} - _NS:9 NO @@ -1527,21 +1586,21 @@ NSImage dialer_alt_over~ipad.png + + NSImage + dialer_alt_default~ipad.png + NSImage dialer_alt_back_default~ipad.png - - NSImage - dialer_alt_default~ipad.png - + {{0, 919}, {768, 85}} - _NS:9 @@ -1551,7 +1610,6 @@ {768, 1004} - _NS:9 @@ -2301,7 +2359,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2312,16 +2370,20 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2364,9 +2426,11 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2374,23 +2438,27 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIPauseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIHangUpButton @@ -2437,8 +2505,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2735,7 +2805,7 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -2758,7 +2828,6 @@ {159, 170} {159, 170} {159, 170} - {159, 170} {159, 170} {159, 170} {159, 170} @@ -2790,7 +2859,6 @@ {162, 137} {162, 137} {162, 137} - {162, 137} {162, 137} {162, 137} {162, 170} @@ -2830,6 +2898,6 @@ {162, 170} {162, 170} - 1498 + 1926 diff --git a/linphone.ldb/Resources/LinphoneUI/UICallCell/2/UICallCell.xib b/linphone.ldb/Resources/LinphoneUI/UICallCell/3/UICallCell.xib similarity index 98% rename from linphone.ldb/Resources/LinphoneUI/UICallCell/2/UICallCell.xib rename to linphone.ldb/Resources/LinphoneUI/UICallCell/3/UICallCell.xib index a41e70d36..1a70be243 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallCell/2/UICallCell.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallCell/3/UICallCell.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -46,7 +46,6 @@ 290 {{0, 63}, {320, 250}} - _NS:9 @@ -87,7 +86,6 @@ 293 {{0, 48}, {320, 262}} - _NS:9 @@ -103,7 +101,6 @@ 293 {{80, 65}, {160, 170}} - _NS:9 @@ -122,7 +119,6 @@ {320, 300} - _NS:9 @@ -138,7 +134,6 @@ 290 {320, 63} - _NS:9 NO @@ -153,7 +148,6 @@ 290 {320, 63} - _NS:9 0.0 @@ -165,7 +159,6 @@ 290 {{10, 0}, {206, 51}} - _NS:9 NO @@ -4587,7 +4580,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 289 {{224, 14}, {25, 25}} - _NS:9 NO @@ -4603,7 +4595,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483359 {{216, 6}, {41, 41}} - _NS:9 NO @@ -4636,7 +4627,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483359 {{216, 6}, {41, 41}} - _NS:9 NO @@ -4673,8 +4663,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 289 {{262, 12}, {50, 29}} - - _NS:9 NO YES @@ -4706,7 +4694,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 290 {{0, 5}, {200, 40}} - _NS:9 NO @@ -4725,7 +4712,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 63} - _NS:9 @@ -4734,7 +4720,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 300} - _NS:9 @@ -4745,8 +4730,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 292 {320, 460} - - _NS:9 NO @@ -5030,107 +5013,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 75 - - - - UICallCell - UITableViewCell - - id - id - - - - doHeaderClick: - id - - - doRemoveClick: - id - - - - UILabel - UIImageView - UIView - UIImageView - UIImageView - UIView - UIPauseButton - UIButton - UIImageView - UILabel - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - avatarView - UIView - - - headerBackgroundHighlightImage - UIImageView - - - headerBackgroundImage - UIImageView - - - headerView - UIView - - - pauseButton - UIPauseButton - - - removeButton - UIButton - - - stateImage - UIImageView - - - stateLabel - UILabel - - - - IBProjectSource - ./Classes/UICallCell.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -5144,6 +5032,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {43, 46} {640, 125} - 1498 + 1926 diff --git a/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/2/UIConferenceHeader.xib b/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/2/UIConferenceHeader.xib new file mode 100644 index 000000000..2e72dd919 --- /dev/null +++ b/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/2/UIConferenceHeader.xib @@ -0,0 +1,285 @@ + + + + 1296 + 11E53 + 2549 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1498 + + + IBProxyObject + IBUIButton + IBUIImageView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 290 + + + + 290 + {320, 68} + + + + _NS:9 + NO + + Conference + + + + IBCocoaTouchFramework + + NSImage + header_conference.png + + + + + 289 + {{224, 14}, {25, 25}} + + + _NS:9 + NO + IBCocoaTouchFramework + + + + 289 + {{216, 6}, {41, 41}} + + + + _NS:9 + NO + + Pause + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 8 + 8 + 8 + 8 + + 3 + MC41AA + + + NSImage + call_state_play_over.png + + + NSImage + call_state_pause_default.png + + + NSImage + call_state_play_default.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + {320, 68} + + + + _NS:9 + + 3 + MQA + + 2 + + + NO + IBCocoaTouchFramework + + + + + + + view + + + + 5 + + + + stateImage + + + + 9 + + + + pauseButton + + + + 14 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + + + + + + + + 7 + + + backgroundImage + + + 8 + + + stateImage + + + 13 + + + pauseButton + + + + + UIConferenceHeader + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIPauseButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 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 + + {43, 50} + {43, 46} + {43, 46} + {640, 135} + + 1498 + + diff --git a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/1/UIContactDetailsFooter.xib b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/2/UIContactDetailsFooter.xib similarity index 96% rename from linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/1/UIContactDetailsFooter.xib rename to linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/2/UIContactDetailsFooter.xib index 57c5e91bd..0d353a385 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/1/UIContactDetailsFooter.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/2/UIContactDetailsFooter.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -40,8 +40,6 @@ 301 {{23, 25}, {275, 50}} - - _NS:9 3 @@ -80,7 +78,6 @@ {320, 80} - _NS:9 @@ -207,7 +204,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -215,6 +212,6 @@ {550, 101} {550, 101} - 1498 + 1926 diff --git a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/1/UIContactDetailsHeader.xib b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/2/UIContactDetailsHeader.xib similarity index 82% rename from linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/1/UIContactDetailsHeader.xib rename to linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/2/UIContactDetailsHeader.xib index 6e7ff2aca..c5069b9d0 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/1/UIContactDetailsHeader.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/2/UIContactDetailsHeader.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -43,7 +43,6 @@ 292 {{-13, -5}, {131, 107}} - _NS:9 NO @@ -58,7 +57,6 @@ 292 {{20, 6}, {65, 65}} - _NS:9 NO @@ -73,7 +71,6 @@ 292 {{20, 6}, {65, 65}} - _NS:9 NO @@ -115,7 +112,6 @@ 290 {{0, 37}, {199, 43}} - _NS:9 NO @@ -147,7 +143,6 @@ {{101, 0}, {219, 80}} - _NS:9 @@ -165,63 +160,10 @@ 274 {219, 130} - - _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -238,7 +180,6 @@ AAgACAAIAAEAAQABAAE {{101, 0}, {219, 130}} - _NS:9 @@ -247,7 +188,6 @@ AAgACAAIAAEAAQABAAE {320, 130} - _NS:9 @@ -491,7 +431,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -499,6 +439,6 @@ AAgACAAIAAEAAQABAAE {262, 214} {131, 131} - 1498 + 1926 diff --git a/linphone.ldb/Resources/LinphoneUI/UIMainBar/2/UIMainBar.xib b/linphone.ldb/Resources/LinphoneUI/UIMainBar/6/UIMainBar.xib similarity index 87% rename from linphone.ldb/Resources/LinphoneUI/UIMainBar/2/UIMainBar.xib rename to linphone.ldb/Resources/LinphoneUI/UIMainBar/6/UIMainBar.xib index ea6cfc924..cb27c7c36 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIMainBar/2/UIMainBar.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar/6/UIMainBar.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -62,7 +62,6 @@ {{0, 77}, {320, 2000}} - _NS:9 1 @@ -87,29 +86,46 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + History + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC44MTE3NjQ3MTcxIDAuMjk4MDM5MjI3NyAwLjE2MDc4NDMxOQA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_over.png - + NSImage history_selected.png - + NSImage history_default.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -158,15 +174,8 @@ 0 10 1 - - 1 - 14 - - - Helvetica - 14 - 16 - + + {{38, 1}, {21, 21}} @@ -198,26 +207,34 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Contacts + + + - + NSImage contacts_over.png - + NSImage contacts_selected.png - + NSImage contacts_default.png - - + + 292 - {{192, 0}, {64, 77}} + {{256, 0}, {64, 77}} @@ -230,21 +247,29 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Settings + + + - + NSImage settings_over.png - + NSImage settings_selected.png - + NSImage settings_default.png - - + + @@ -275,13 +300,20 @@ NSImage dialer_default.png - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 - {{256, 0}, {64, 77}} + {{192, 0}, {64, 77}} @@ -294,21 +326,29 @@ 0 0 NO + 40 + 0.0 + 0.0 + 0.0 + Chat + + + - + NSImage chat_over.png - + NSImage chat_selected.png - + NSImage chat_default.png - - + + @@ -350,10 +390,10 @@ 10 1 - + - {{261, 1}, {21, 21}} + {{197, 1}, {21, 21}} @@ -573,12 +613,6 @@ contacts - - 9 - - - settings - 7 @@ -635,6 +669,12 @@ background + + 9 + + + settings + @@ -653,15 +693,19 @@ 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 - + + @@ -785,7 +829,7 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 @@ -807,6 +851,6 @@ {128, 154} {128, 154} - 1498 + 1926 diff --git a/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/2/UIMainBar~ipad.xib b/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/6/UIMainBar~ipad.xib similarity index 85% rename from linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/2/UIMainBar~ipad.xib rename to linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/6/UIMainBar~ipad.xib index b3907761d..e8646ae44 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/2/UIMainBar~ipad.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/6/UIMainBar~ipad.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -88,29 +88,46 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + History + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + 3 MC41AA - + NSImage history_over~ipad.png - + NSImage history_selected~ipad.png - + NSImage history_default~ipad.png - - 2 - 15 + + 1 + 14 - - Helvetica-Bold - 15 + + Helvetica + 14 16 @@ -159,18 +176,11 @@ 0 10 1 - - 1 - 14 - - - Helvetica - 14 - 16 - + + - {{140, 1}, {21, 21}} + {{144, 1}, {21, 21}} @@ -201,21 +211,29 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Contacts + + + - + NSImage contacts_over~ipad.png - + NSImage contacts_selected~ipad.png - + NSImage contacts_default~ipad.png - - + + @@ -223,7 +241,7 @@ {{350, -1}, {68, 80}} - + _NS:9 NO 4 @@ -247,16 +265,23 @@ NSImage dialer_default.png - - + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 - {{418, 0}, {175, 77}} + {{593, 0}, {175, 77}} - + _NS:9 NO 5 @@ -267,29 +292,37 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Settings + + + - + NSImage settings_over~ipad.png - + NSImage settings_selected~ipad.png - + NSImage settings_default~ipad.png - - + + 292 - {{593, 0}, {175, 77}} + {{418, 0}, {175, 77}} - + _NS:9 NO 6 @@ -300,21 +333,29 @@ 0 0 NO + 10 + 0.0 + 60 + 0.0 + Chat + + + - + NSImage chat_over~ipad.png - + NSImage chat_selected~ipad.png - + NSImage chat_default~ipad.png - - + + @@ -338,7 +379,6 @@ {{2, 2}, {17, 17}} - _NS:9 NO YES @@ -356,10 +396,10 @@ 10 1 - + - {{605, 1}, {21, 21}} + {{428, 1}, {21, 21}} @@ -438,21 +478,29 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + History + + + - + NSImage history_over_landscape~ipad.png - + NSImage history_selected_landscape~ipad.png - + NSImage history_default_landscape~ipad.png - - + + @@ -490,10 +538,10 @@ 10 1 - + - {{208, 1}, {21, 21}} + {{209, 1}, {21, 21}} @@ -521,21 +569,29 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Contacts + + + - + NSImage contacts_over_landscape~ipad.png - + NSImage contacts_selected_landscape~ipad.png - + NSImage contacts_default_landscape~ipad.png - - + + @@ -543,7 +599,7 @@ {{480, 8}, {68, 80}} - + _NS:9 NO 4 @@ -559,15 +615,14 @@ - + 292 - {{544, 0}, {240, 86}} + {{784, 0}, {240, 86}} - _NS:9 NO 5 @@ -578,26 +633,34 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Settings + + + - + NSImage settings_over_landscape~ipad.png - + NSImage settings_selected_landscape~ipad.png - + NSImage settings_default_landscape~ipad.png - - + + 292 - {{784, 0}, {240, 86}} + {{548, 0}, {240, 86}} @@ -611,21 +674,29 @@ 0 0 NO + 16 + 0.0 + 60 + 0.0 + Chat + + + - + NSImage chat_over_landscape~ipad.png - + NSImage chat_selected_landscape~ipad.png - + NSImage chat_default_landscape~ipad.png - - + + @@ -649,7 +720,7 @@ {{2, 2}, {17, 17}} - + _NS:9 NO YES @@ -663,10 +734,10 @@ 10 1 - + - {{792, 1}, {21, 21}} + {{558, 1}, {21, 21}} @@ -860,13 +931,13 @@ - - + + Portrait View @@ -904,12 +975,6 @@ mask - - 7 - - - chat - 8 @@ -946,12 +1011,6 @@ chatNotificationLabel - - 10 - - - settings - 28 @@ -960,11 +1019,11 @@ - + Landscape View @@ -1062,6 +1121,18 @@ background + + 10 + + + settings + + + 7 + + + chat + @@ -1070,7 +1141,8 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1082,12 +1154,16 @@ 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 @@ -1104,11 +1180,14 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + + @@ -1232,17 +1311,17 @@ IBIPadFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - {480, 170} - {353, 153} - {480, 170} - {353, 153} - {480, 170} - {353, 153} + {480, 171} + {350, 153} + {480, 171} + {350, 153} + {480, 171} + {350, 153} {480, 171} {352, 153} {480, 171} @@ -1260,12 +1339,12 @@ {480, 171} {353, 153} {480, 171} - {350, 153} + {353, 153} {480, 171} - {350, 153} + {353, 153} {480, 171} - {350, 153} + {353, 153} - 1498 + 1926 diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 46ef8db41..ab5670a81 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -216,6 +216,14 @@ D32B9DFD15A2F131000B6DEC /* FastAddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = D32B9DFB15A2F131000B6DEC /* FastAddressBook.m */; }; D32D5AA715ADE5D9008593F3 /* button_alert_background_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D32D5AA515ADE5D9008593F3 /* button_alert_background_default.png */; }; D32D5AA915ADE5D9008593F3 /* button_alert_background_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D32D5AA615ADE5D9008593F3 /* button_alert_background_over.png */; }; + D3328646160B5BC300E6435D /* dialer_alt_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = D3328642160B5BC300E6435D /* dialer_alt_disabled_landscape.png */; }; + D3328647160B5BC300E6435D /* dialer_alt_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = D3328642160B5BC300E6435D /* dialer_alt_disabled_landscape.png */; }; + D3328648160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3328643160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png */; }; + D3328649160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3328643160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png */; }; + D332864A160B5BC300E6435D /* dialer_alt_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3328644160B5BC300E6435D /* dialer_alt_disabled.png */; }; + D332864B160B5BC300E6435D /* dialer_alt_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3328644160B5BC300E6435D /* dialer_alt_disabled.png */; }; + D332864C160B5BC300E6435D /* dialer_alt_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3328645160B5BC300E6435D /* dialer_alt_disabled~ipad.png */; }; + D332864D160B5BC300E6435D /* dialer_alt_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3328645160B5BC300E6435D /* dialer_alt_disabled~ipad.png */; }; D33988B415C6DD1600CAF1E4 /* conference_default_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D339888C15C6DD1600CAF1E4 /* conference_default_landscape~ipad.png */; }; D33988B515C6DD1600CAF1E4 /* conference_default_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D339888C15C6DD1600CAF1E4 /* conference_default_landscape~ipad.png */; }; D33988B615C6DD1600CAF1E4 /* conference_over_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D339888D15C6DD1600CAF1E4 /* conference_over_landscape~ipad.png */; }; @@ -540,7 +548,6 @@ D34BD6FC15C13DB70070C209 /* setup_start_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21815A43D3400149E54 /* setup_start_default.png */; }; D34BD6FD15C13DB70070C209 /* setup_start_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7A15A6CC3200F96BE5 /* setup_start_disabled.png */; }; D34BD6FE15C13DB70070C209 /* setup_start_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21915A43D3400149E54 /* setup_start_over.png */; }; - D34BD6FF15C13DB70070C209 /* setup_title_assistant.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21A15A43D3400149E54 /* setup_title_assistant.png */; }; D34BD70015C13DB70070C209 /* setup_welcome_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21B15A43D3400149E54 /* setup_welcome_logo.png */; }; D34BD70115C13DB70070C209 /* speaker_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F83EFC158205A100336684 /* speaker_off_default.png */; }; D34BD70215C13DB70070C209 /* speaker_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = D3C31A2315BD8DED008ED271 /* speaker_off_default_landscape.png */; }; @@ -599,10 +606,15 @@ D350F22415A43D3400149E54 /* field_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21715A43D3400149E54 /* field_background.png */; }; D350F22615A43D3400149E54 /* setup_start_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21815A43D3400149E54 /* setup_start_default.png */; }; D350F22815A43D3400149E54 /* setup_start_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21915A43D3400149E54 /* setup_start_over.png */; }; - D350F22A15A43D3400149E54 /* setup_title_assistant.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21A15A43D3400149E54 /* setup_title_assistant.png */; }; D350F22C15A43D3400149E54 /* setup_welcome_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21B15A43D3400149E54 /* setup_welcome_logo.png */; }; D35406F715A47E9E007E7E81 /* button_background_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F515A47E9E007E7E81 /* button_background_default.png */; }; D35406F915A47E9E007E7E81 /* button_background_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F615A47E9E007E7E81 /* button_background_over.png */; }; + D354944C160B615A0027E44E /* linphone-splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone-splashscreen.png */; }; + D354944D160B615A0027E44E /* linphone-splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone-splashscreen.png */; }; + D354944E160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */; }; + D354944F160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */; }; + D354946C160B75B70027E44E /* chat_address.png in Resources */ = {isa = PBXBuildFile; fileRef = D354946B160B75B70027E44E /* chat_address.png */; }; + D354946D160B75B70027E44E /* chat_address.png in Resources */ = {isa = PBXBuildFile; fileRef = D354946B160B75B70027E44E /* chat_address.png */; }; D35497FE15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; }; D35497FF15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; }; D354980615875534000081D8 /* contacts_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* contacts_all_selected.png */; }; @@ -763,8 +775,6 @@ D381881615FE3F7F00C3EDCA /* UIContactDetailsHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = D381881815FE3F7F00C3EDCA /* UIContactDetailsHeader.xib */; }; D381881915FE3FCA00C3EDCA /* InCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D381881C15FE3FCA00C3EDCA /* InCallViewController.xib */; }; D381881A15FE3FCA00C3EDCA /* InCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D381881C15FE3FCA00C3EDCA /* InCallViewController.xib */; }; - D381883E15FE447200C3EDCA /* ChatRoomViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187B015FE340100C3EDCA /* ChatRoomViewController.xib */; }; - D381883F15FE447200C3EDCA /* ChatRoomViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187B015FE340100C3EDCA /* ChatRoomViewController.xib */; }; D381884415FE447200C3EDCA /* ChatViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187B415FE340500C3EDCA /* ChatViewController.xib */; }; D381884515FE447200C3EDCA /* ChatViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187B415FE340500C3EDCA /* ChatViewController.xib */; }; D381885415FE448400C3EDCA /* UICallBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187E415FE349700C3EDCA /* UICallBar.xib */; }; @@ -966,10 +976,6 @@ D3A74F5715C69392001500B9 /* video_on_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74EB015C69392001500B9 /* video_on_disabled~ipad.png */; }; D3A74F5815C69392001500B9 /* video_on_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74EB115C69392001500B9 /* video_on_over~ipad.png */; }; D3A74F5915C69392001500B9 /* video_on_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74EB115C69392001500B9 /* video_on_over~ipad.png */; }; - D3A74F5B15C6AA0B001500B9 /* chat_field.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74F5A15C6AA0B001500B9 /* chat_field.9.png */; }; - D3A74F5C15C6AA0B001500B9 /* chat_field.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74F5A15C6AA0B001500B9 /* chat_field.9.png */; }; - D3A74F5E15C6ADA9001500B9 /* chat_field.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74F5D15C6ADA9001500B9 /* chat_field.9@2x.png */; }; - D3A74F5F15C6ADA9001500B9 /* chat_field.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74F5D15C6ADA9001500B9 /* chat_field.9@2x.png */; }; D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; }; D3A8BB7115A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; }; D3A8BB7415A6C81A00F96BE5 /* UIChatRoomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7315A6C81A00F96BE5 /* UIChatRoomCell.xib */; }; @@ -1039,6 +1045,18 @@ D3C6526D15AC228A0092A874 /* contact_ok_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3C6526A15AC228A0092A874 /* contact_ok_over.png */; }; D3C714B3159DB84400705B8E /* hold.wav in Resources */ = {isa = PBXBuildFile; fileRef = D3C714B2159DB84400705B8E /* hold.wav */; }; D3D14E7C15A711700074A527 /* avatar_shadow_small.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D14E7B15A711700074A527 /* avatar_shadow_small.png */; }; + D3D5124E160B213900946DF8 /* setup_cancel_default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D5124C160B213900946DF8 /* setup_cancel_default~ipad.png */; }; + D3D5124F160B213900946DF8 /* setup_cancel_default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D5124C160B213900946DF8 /* setup_cancel_default~ipad.png */; }; + D3D51250160B213900946DF8 /* setup_cancel_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D5124D160B213900946DF8 /* setup_cancel_over~ipad.png */; }; + D3D51251160B213900946DF8 /* setup_cancel_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D5124D160B213900946DF8 /* setup_cancel_over~ipad.png */; }; + D3D51255160B35CB00946DF8 /* chat_message_background.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D51252160B35CB00946DF8 /* chat_message_background.9.png */; }; + D3D51256160B35CB00946DF8 /* chat_message_background.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D51252160B35CB00946DF8 /* chat_message_background.9.png */; }; + D3D51257160B35CB00946DF8 /* chat_message_background.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D51253160B35CB00946DF8 /* chat_message_background.9@2x.png */; }; + D3D51258160B35CB00946DF8 /* chat_message_background.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D51253160B35CB00946DF8 /* chat_message_background.9@2x.png */; }; + D3D5126C160B3A8E00946DF8 /* WizardViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126A160B3A8E00946DF8 /* WizardViews.xib */; }; + D3D5126D160B3A8E00946DF8 /* WizardViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126A160B3A8E00946DF8 /* WizardViews.xib */; }; + D3D51270160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */; }; + D3D51271160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */; }; D3D6A39E159B0EEF005F692C /* add_call_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D6A39B159B0EEF005F692C /* add_call_default.png */; }; D3D6A3A0159B0EEF005F692C /* add_call_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D6A39C159B0EEF005F692C /* add_call_disabled.png */; }; D3D6A3A2159B0EEF005F692C /* add_call_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D6A39D159B0EEF005F692C /* add_call_over.png */; }; @@ -1096,16 +1114,64 @@ D3ED401A1602172200BF332B /* HPGrowingTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED40161602172200BF332B /* HPGrowingTextView.m */; }; D3ED401B1602172200BF332B /* HPTextViewInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED40181602172200BF332B /* HPTextViewInternal.m */; }; D3ED401C1602172200BF332B /* HPTextViewInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED40181602172200BF332B /* HPTextViewInternal.m */; }; - D3ED40241602257400BF332B /* chat_background.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED40221602257400BF332B /* chat_background.9.png */; }; - D3ED40251602257400BF332B /* chat_background.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED40221602257400BF332B /* chat_background.9.png */; }; - D3ED40261602257400BF332B /* chat_background.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED40231602257400BF332B /* chat_background.9@2x.png */; }; - D3ED40271602257400BF332B /* chat_background.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED40231602257400BF332B /* chat_background.9@2x.png */; }; D3F26BF115986B73005F9CAB /* IncomingCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F26BEF15986B71005F9CAB /* IncomingCallViewController.m */; }; D3F26BF215986B73005F9CAB /* IncomingCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F26BEF15986B71005F9CAB /* IncomingCallViewController.m */; }; D3F26BF715986DAD005F9CAB /* history_ok_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F26BF515986DAD005F9CAB /* history_ok_default.png */; }; D3F26BF915986DAD005F9CAB /* history_ok_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F26BF615986DAD005F9CAB /* history_ok_over.png */; }; D3F26BFC15987083005F9CAB /* header_incoming.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F26BFB15987083005F9CAB /* header_incoming.png */; }; D3F34F301599B008005BE94F /* avatar_shadow.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F34F2F1599B008005BE94F /* avatar_shadow.png */; }; + D3F5F8F71609A86700D3DA1A /* chat_cancel_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DA1609A86700D3DA1A /* chat_cancel_default.png */; }; + D3F5F8F81609A86700D3DA1A /* chat_cancel_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DA1609A86700D3DA1A /* chat_cancel_default.png */; }; + D3F5F8F91609A86700D3DA1A /* chat_cancel_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DB1609A86700D3DA1A /* chat_cancel_over.png */; }; + D3F5F8FA1609A86700D3DA1A /* chat_cancel_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DB1609A86700D3DA1A /* chat_cancel_over.png */; }; + D3F5F8FB1609A86700D3DA1A /* chat_photo_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DC1609A86700D3DA1A /* chat_photo_default.png */; }; + D3F5F8FC1609A86700D3DA1A /* chat_photo_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DC1609A86700D3DA1A /* chat_photo_default.png */; }; + D3F5F8FD1609A86700D3DA1A /* chat_photo_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DD1609A86700D3DA1A /* chat_photo_disabled.png */; }; + D3F5F8FE1609A86700D3DA1A /* chat_photo_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DD1609A86700D3DA1A /* chat_photo_disabled.png */; }; + D3F5F8FF1609A86700D3DA1A /* chat_photo_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DE1609A86700D3DA1A /* chat_photo_over.png */; }; + D3F5F9001609A86700D3DA1A /* chat_photo_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8DE1609A86700D3DA1A /* chat_photo_over.png */; }; + D3F5F9071609A86700D3DA1A /* history_delete_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E21609A86700D3DA1A /* history_delete_default.png */; }; + D3F5F9081609A86700D3DA1A /* history_delete_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E21609A86700D3DA1A /* history_delete_default.png */; }; + D3F5F9091609A86700D3DA1A /* history_delete_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E31609A86700D3DA1A /* history_delete_over.png */; }; + D3F5F90A1609A86700D3DA1A /* history_delete_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E31609A86700D3DA1A /* history_delete_over.png */; }; + D3F5F90B1609A86700D3DA1A /* logo_linphone_trame_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E41609A86700D3DA1A /* logo_linphone_trame_background.png */; }; + D3F5F90C1609A86700D3DA1A /* logo_linphone_trame_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E41609A86700D3DA1A /* logo_linphone_trame_background.png */; }; + D3F5F90D1609A86700D3DA1A /* setup_back_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E51609A86700D3DA1A /* setup_back_disabled~ipad.png */; }; + D3F5F90E1609A86700D3DA1A /* setup_back_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E51609A86700D3DA1A /* setup_back_disabled~ipad.png */; }; + D3F5F90F1609A86700D3DA1A /* setup_back_over_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E61609A86700D3DA1A /* setup_back_over_landscape~ipad.png */; }; + D3F5F9101609A86700D3DA1A /* setup_back_over_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E61609A86700D3DA1A /* setup_back_over_landscape~ipad.png */; }; + D3F5F9111609A86700D3DA1A /* setup_back_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E71609A86700D3DA1A /* setup_back_over~ipad.png */; }; + D3F5F9121609A86700D3DA1A /* setup_back_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E71609A86700D3DA1A /* setup_back_over~ipad.png */; }; + D3F5F9131609A86700D3DA1A /* setup_cancel_default_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E81609A86700D3DA1A /* setup_cancel_default_landscape~ipad.png */; }; + D3F5F9141609A86700D3DA1A /* setup_cancel_default_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8E81609A86700D3DA1A /* setup_cancel_default_landscape~ipad.png */; }; + D3F5F9171609A86700D3DA1A /* setup_cancel_disabled_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EA1609A86700D3DA1A /* setup_cancel_disabled_landscape~ipad.png */; }; + D3F5F9181609A86700D3DA1A /* setup_cancel_disabled_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EA1609A86700D3DA1A /* setup_cancel_disabled_landscape~ipad.png */; }; + D3F5F9191609A86700D3DA1A /* setup_cancel_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EB1609A86700D3DA1A /* setup_cancel_disabled~ipad.png */; }; + D3F5F91A1609A86700D3DA1A /* setup_cancel_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EB1609A86700D3DA1A /* setup_cancel_disabled~ipad.png */; }; + D3F5F91B1609A86700D3DA1A /* setup_cancel_over_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EC1609A86700D3DA1A /* setup_cancel_over_landscape~ipad.png */; }; + D3F5F91C1609A86700D3DA1A /* setup_cancel_over_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EC1609A86700D3DA1A /* setup_cancel_over_landscape~ipad.png */; }; + D3F5F91F1609A86700D3DA1A /* setup_start_default_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EE1609A86700D3DA1A /* setup_start_default_landscape~ipad.png */; }; + D3F5F9201609A86700D3DA1A /* setup_start_default_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EE1609A86700D3DA1A /* setup_start_default_landscape~ipad.png */; }; + D3F5F9211609A86700D3DA1A /* setup_start_default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EF1609A86700D3DA1A /* setup_start_default~ipad.png */; }; + D3F5F9221609A86700D3DA1A /* setup_start_default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8EF1609A86700D3DA1A /* setup_start_default~ipad.png */; }; + D3F5F9231609A86700D3DA1A /* setup_start_disabled_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F01609A86700D3DA1A /* setup_start_disabled_landscape~ipad.png */; }; + D3F5F9241609A86700D3DA1A /* setup_start_disabled_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F01609A86700D3DA1A /* setup_start_disabled_landscape~ipad.png */; }; + D3F5F9251609A86700D3DA1A /* setup_start_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F11609A86700D3DA1A /* setup_start_disabled~ipad.png */; }; + D3F5F9261609A86700D3DA1A /* setup_start_disabled~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F11609A86700D3DA1A /* setup_start_disabled~ipad.png */; }; + D3F5F9271609A86700D3DA1A /* setup_start_over_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F21609A86700D3DA1A /* setup_start_over_landscape~ipad.png */; }; + D3F5F9281609A86700D3DA1A /* setup_start_over_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F21609A86700D3DA1A /* setup_start_over_landscape~ipad.png */; }; + D3F5F9291609A86700D3DA1A /* setup_start_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F31609A86700D3DA1A /* setup_start_over~ipad.png */; }; + D3F5F92A1609A86700D3DA1A /* setup_start_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F31609A86700D3DA1A /* setup_start_over~ipad.png */; }; + D3F5F92B1609A86700D3DA1A /* setup_welcome_logo~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F41609A86700D3DA1A /* setup_welcome_logo~ipad.png */; }; + D3F5F92C1609A86700D3DA1A /* setup_welcome_logo~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8F41609A86700D3DA1A /* setup_welcome_logo~ipad.png */; }; + D3F5F987160B1A0900D3DA1A /* chat_progressbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F983160B1A0800D3DA1A /* chat_progressbar_background.png */; }; + D3F5F988160B1A0900D3DA1A /* chat_progressbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F983160B1A0800D3DA1A /* chat_progressbar_background.png */; }; + D3F5F989160B1A0900D3DA1A /* setup_back_default_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F984160B1A0800D3DA1A /* setup_back_default_landscape~ipad.png */; }; + D3F5F98A160B1A0900D3DA1A /* setup_back_default_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F984160B1A0800D3DA1A /* setup_back_default_landscape~ipad.png */; }; + D3F5F98B160B1A0900D3DA1A /* setup_back_default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F985160B1A0800D3DA1A /* setup_back_default~ipad.png */; }; + D3F5F98C160B1A0900D3DA1A /* setup_back_default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F985160B1A0800D3DA1A /* setup_back_default~ipad.png */; }; + D3F5F98D160B1A0900D3DA1A /* setup_back_disabled_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F986160B1A0900D3DA1A /* setup_back_disabled_landscape~ipad.png */; }; + D3F5F98E160B1A0900D3DA1A /* setup_back_disabled_landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F986160B1A0900D3DA1A /* setup_back_disabled_landscape~ipad.png */; }; D3F795D615A582810077328B /* ChatRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F795D415A582800077328B /* ChatRoomViewController.m */; }; D3F795D715A582810077328B /* ChatRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F795D415A582800077328B /* ChatRoomViewController.m */; }; D3F795DD15A5831C0077328B /* chat_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F795DB15A5831C0077328B /* chat_back_default.png */; }; @@ -1590,6 +1656,10 @@ D32B9DFB15A2F131000B6DEC /* FastAddressBook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FastAddressBook.m; path = Utils/FastAddressBook.m; sourceTree = ""; }; D32D5AA515ADE5D9008593F3 /* button_alert_background_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_alert_background_default.png; path = Resources/button_alert_background_default.png; sourceTree = ""; }; D32D5AA615ADE5D9008593F3 /* button_alert_background_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_alert_background_over.png; path = Resources/button_alert_background_over.png; sourceTree = ""; }; + D3328642160B5BC300E6435D /* dialer_alt_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dialer_alt_disabled_landscape.png; path = Resources/dialer_alt_disabled_landscape.png; sourceTree = ""; }; + D3328643160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer_alt_disabled_landscape~ipad.png"; path = "Resources/dialer_alt_disabled_landscape~ipad.png"; sourceTree = ""; }; + D3328644160B5BC300E6435D /* dialer_alt_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dialer_alt_disabled.png; path = Resources/dialer_alt_disabled.png; sourceTree = ""; }; + D3328645160B5BC300E6435D /* dialer_alt_disabled~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer_alt_disabled~ipad.png"; path = "Resources/dialer_alt_disabled~ipad.png"; sourceTree = ""; }; D339888C15C6DD1600CAF1E4 /* conference_default_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "conference_default_landscape~ipad.png"; path = "Resources/conference_default_landscape~ipad.png"; sourceTree = ""; }; D339888D15C6DD1600CAF1E4 /* conference_over_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "conference_over_landscape~ipad.png"; path = "Resources/conference_over_landscape~ipad.png"; sourceTree = ""; }; D339888E15C6DD1600CAF1E4 /* dialer_alt_default_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer_alt_default_landscape~ipad.png"; path = "Resources/dialer_alt_default_landscape~ipad.png"; sourceTree = ""; }; @@ -1655,10 +1725,12 @@ D350F21715A43D3400149E54 /* field_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = field_background.png; path = Resources/field_background.png; sourceTree = ""; }; D350F21815A43D3400149E54 /* setup_start_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = setup_start_default.png; path = Resources/setup_start_default.png; sourceTree = ""; }; D350F21915A43D3400149E54 /* setup_start_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = setup_start_over.png; path = Resources/setup_start_over.png; sourceTree = ""; }; - D350F21A15A43D3400149E54 /* setup_title_assistant.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = setup_title_assistant.png; path = Resources/setup_title_assistant.png; sourceTree = ""; }; D350F21B15A43D3400149E54 /* setup_welcome_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = setup_welcome_logo.png; path = Resources/setup_welcome_logo.png; sourceTree = ""; }; D35406F515A47E9E007E7E81 /* button_background_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background_default.png; path = Resources/button_background_default.png; sourceTree = ""; }; D35406F615A47E9E007E7E81 /* button_background_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background_over.png; path = Resources/button_background_over.png; sourceTree = ""; }; + D354944A160B615A0027E44E /* linphone-splashscreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-splashscreen.png"; path = "Resources/linphone-splashscreen.png"; sourceTree = ""; }; + D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-splashscreen@2x.png"; path = "Resources/linphone-splashscreen@2x.png"; sourceTree = ""; }; + D354946B160B75B70027E44E /* chat_address.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_address.png; path = Resources/chat_address.png; sourceTree = ""; }; D35497FB15875372000081D8 /* ContactsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsViewController.h; sourceTree = ""; }; D35497FC15875372000081D8 /* ContactsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ContactsViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; D354980215875534000081D8 /* contacts_all_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_all_selected.png; path = Resources/contacts_all_selected.png; sourceTree = ""; }; @@ -1920,8 +1992,6 @@ D3A74EAF15C69392001500B9 /* video_on_default~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "video_on_default~ipad.png"; path = "Resources/video_on_default~ipad.png"; sourceTree = ""; }; D3A74EB015C69392001500B9 /* video_on_disabled~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "video_on_disabled~ipad.png"; path = "Resources/video_on_disabled~ipad.png"; sourceTree = ""; }; D3A74EB115C69392001500B9 /* video_on_over~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "video_on_over~ipad.png"; path = "Resources/video_on_over~ipad.png"; sourceTree = ""; }; - D3A74F5A15C6AA0B001500B9 /* chat_field.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_field.9.png; path = Resources/chat_field.9.png; sourceTree = ""; }; - D3A74F5D15C6ADA9001500B9 /* chat_field.9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "chat_field.9@2x.png"; path = "Resources/chat_field.9@2x.png"; sourceTree = ""; }; D3A8BB6E15A6C7D500F96BE5 /* UIChatRoomCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIChatRoomCell.h; sourceTree = ""; }; D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIChatRoomCell.m; sourceTree = ""; }; D3A8BB7315A6C81A00F96BE5 /* UIChatRoomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIChatRoomCell.xib; sourceTree = ""; }; @@ -1933,7 +2003,6 @@ D3ACB09915C6D59500E15894 /* dialer_alt_back_default~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer_alt_back_default~ipad.png"; path = "Resources/dialer_alt_back_default~ipad.png"; sourceTree = ""; }; D3ACB09A15C6D59500E15894 /* dialer_alt_back_over~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer_alt_back_over~ipad.png"; path = "Resources/dialer_alt_back_over~ipad.png"; sourceTree = ""; }; D3B90E1115C2CB5700F64F8C /* NinePatch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = NinePatch.xcodeproj; path = Utils/NinePatch/NinePatch.xcodeproj; sourceTree = ""; }; - D3B9A3DA15A58C440096EA4E /* chat_field.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_field.png; path = Resources/chat_field.png; sourceTree = ""; }; D3B9A3DB15A58C440096EA4E /* chat_ok_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_ok_default.png; path = Resources/chat_ok_default.png; sourceTree = ""; }; D3B9A3DC15A58C440096EA4E /* chat_ok_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_ok_over.png; path = Resources/chat_ok_over.png; sourceTree = ""; }; D3B9A3DD15A58C440096EA4E /* chat_send_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_send_default.png; path = Resources/chat_send_default.png; sourceTree = ""; }; @@ -1990,6 +2059,15 @@ D3C6526A15AC228A0092A874 /* contact_ok_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_ok_over.png; path = Resources/contact_ok_over.png; sourceTree = ""; }; D3C714B2159DB84400705B8E /* hold.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = hold.wav; path = Resources/hold.wav; sourceTree = ""; }; D3D14E7B15A711700074A527 /* avatar_shadow_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = avatar_shadow_small.png; path = Resources/avatar_shadow_small.png; sourceTree = ""; }; + D3D5124C160B213900946DF8 /* setup_cancel_default~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_cancel_default~ipad.png"; path = "Resources/setup_cancel_default~ipad.png"; sourceTree = ""; }; + D3D5124D160B213900946DF8 /* setup_cancel_over~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_cancel_over~ipad.png"; path = "Resources/setup_cancel_over~ipad.png"; sourceTree = ""; }; + D3D51252160B35CB00946DF8 /* chat_message_background.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_background.9.png; path = Resources/chat_message_background.9.png; sourceTree = ""; }; + D3D51253160B35CB00946DF8 /* chat_message_background.9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "chat_message_background.9@2x.png"; path = "Resources/chat_message_background.9@2x.png"; sourceTree = ""; }; + D3D51254160B35CB00946DF8 /* chat_message_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_background.png; path = Resources/chat_message_background.png; sourceTree = ""; }; + D3D5126B160B3A8E00946DF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/WizardViews.xib; sourceTree = ""; }; + D3D5126F160B3AD400946DF8 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = "en.lproj/WizardViewController~ipad.xib"; sourceTree = ""; }; + D3D51272160B3E5000946DF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = "fr.lproj/WizardViewController~ipad.xib"; sourceTree = ""; }; + D3D51273160B3E5000946DF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/WizardViews.xib; sourceTree = ""; }; D3D6A39B159B0EEF005F692C /* add_call_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_call_default.png; path = Resources/add_call_default.png; sourceTree = ""; }; D3D6A39C159B0EEF005F692C /* add_call_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_call_disabled.png; path = Resources/add_call_disabled.png; sourceTree = ""; }; D3D6A39D159B0EEF005F692C /* add_call_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_call_over.png; path = Resources/add_call_over.png; sourceTree = ""; }; @@ -2048,15 +2126,41 @@ D3ED40161602172200BF332B /* HPGrowingTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HPGrowingTextView.m; sourceTree = ""; }; D3ED40171602172200BF332B /* HPTextViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPTextViewInternal.h; sourceTree = ""; }; D3ED40181602172200BF332B /* HPTextViewInternal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HPTextViewInternal.m; sourceTree = ""; }; - D3ED401D1602223B00BF332B /* chat_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_background.png; path = Resources/chat_background.png; sourceTree = ""; }; - D3ED40221602257400BF332B /* chat_background.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_background.9.png; path = Resources/chat_background.9.png; sourceTree = ""; }; - D3ED40231602257400BF332B /* chat_background.9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "chat_background.9@2x.png"; path = "Resources/chat_background.9@2x.png"; sourceTree = ""; }; D3F26BEE15986B71005F9CAB /* IncomingCallViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IncomingCallViewController.h; sourceTree = ""; }; D3F26BEF15986B71005F9CAB /* IncomingCallViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IncomingCallViewController.m; sourceTree = ""; }; D3F26BF515986DAD005F9CAB /* history_ok_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_ok_default.png; path = Resources/history_ok_default.png; sourceTree = ""; }; D3F26BF615986DAD005F9CAB /* history_ok_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_ok_over.png; path = Resources/history_ok_over.png; sourceTree = ""; }; D3F26BFB15987083005F9CAB /* header_incoming.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = header_incoming.png; path = Resources/header_incoming.png; sourceTree = ""; }; D3F34F2F1599B008005BE94F /* avatar_shadow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = avatar_shadow.png; path = Resources/avatar_shadow.png; sourceTree = ""; }; + D3F5F8D91609A86700D3DA1A /* bubble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bubble.png; path = Resources/bubble.png; sourceTree = ""; }; + D3F5F8DA1609A86700D3DA1A /* chat_cancel_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_cancel_default.png; path = Resources/chat_cancel_default.png; sourceTree = ""; }; + D3F5F8DB1609A86700D3DA1A /* chat_cancel_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_cancel_over.png; path = Resources/chat_cancel_over.png; sourceTree = ""; }; + D3F5F8DC1609A86700D3DA1A /* chat_photo_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_photo_default.png; path = Resources/chat_photo_default.png; sourceTree = ""; }; + D3F5F8DD1609A86700D3DA1A /* chat_photo_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_photo_disabled.png; path = Resources/chat_photo_disabled.png; sourceTree = ""; }; + D3F5F8DE1609A86700D3DA1A /* chat_photo_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_photo_over.png; path = Resources/chat_photo_over.png; sourceTree = ""; }; + D3F5F8E01609A86700D3DA1A /* form_invalid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = form_invalid.png; path = Resources/form_invalid.png; sourceTree = ""; }; + D3F5F8E11609A86700D3DA1A /* form_valid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = form_valid.png; path = Resources/form_valid.png; sourceTree = ""; }; + D3F5F8E21609A86700D3DA1A /* history_delete_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_delete_default.png; path = Resources/history_delete_default.png; sourceTree = ""; }; + D3F5F8E31609A86700D3DA1A /* history_delete_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_delete_over.png; path = Resources/history_delete_over.png; sourceTree = ""; }; + D3F5F8E41609A86700D3DA1A /* logo_linphone_trame_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = logo_linphone_trame_background.png; path = Resources/logo_linphone_trame_background.png; sourceTree = ""; }; + D3F5F8E51609A86700D3DA1A /* setup_back_disabled~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_back_disabled~ipad.png"; path = "Resources/setup_back_disabled~ipad.png"; sourceTree = ""; }; + D3F5F8E61609A86700D3DA1A /* setup_back_over_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_back_over_landscape~ipad.png"; path = "Resources/setup_back_over_landscape~ipad.png"; sourceTree = ""; }; + D3F5F8E71609A86700D3DA1A /* setup_back_over~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_back_over~ipad.png"; path = "Resources/setup_back_over~ipad.png"; sourceTree = ""; }; + D3F5F8E81609A86700D3DA1A /* setup_cancel_default_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_cancel_default_landscape~ipad.png"; path = "Resources/setup_cancel_default_landscape~ipad.png"; sourceTree = ""; }; + D3F5F8EA1609A86700D3DA1A /* setup_cancel_disabled_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_cancel_disabled_landscape~ipad.png"; path = "Resources/setup_cancel_disabled_landscape~ipad.png"; sourceTree = ""; }; + D3F5F8EB1609A86700D3DA1A /* setup_cancel_disabled~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_cancel_disabled~ipad.png"; path = "Resources/setup_cancel_disabled~ipad.png"; sourceTree = ""; }; + D3F5F8EC1609A86700D3DA1A /* setup_cancel_over_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_cancel_over_landscape~ipad.png"; path = "Resources/setup_cancel_over_landscape~ipad.png"; sourceTree = ""; }; + D3F5F8EE1609A86700D3DA1A /* setup_start_default_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_start_default_landscape~ipad.png"; path = "Resources/setup_start_default_landscape~ipad.png"; sourceTree = ""; }; + D3F5F8EF1609A86700D3DA1A /* setup_start_default~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_start_default~ipad.png"; path = "Resources/setup_start_default~ipad.png"; sourceTree = ""; }; + D3F5F8F01609A86700D3DA1A /* setup_start_disabled_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_start_disabled_landscape~ipad.png"; path = "Resources/setup_start_disabled_landscape~ipad.png"; sourceTree = ""; }; + D3F5F8F11609A86700D3DA1A /* setup_start_disabled~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_start_disabled~ipad.png"; path = "Resources/setup_start_disabled~ipad.png"; sourceTree = ""; }; + D3F5F8F21609A86700D3DA1A /* setup_start_over_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_start_over_landscape~ipad.png"; path = "Resources/setup_start_over_landscape~ipad.png"; sourceTree = ""; }; + D3F5F8F31609A86700D3DA1A /* setup_start_over~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_start_over~ipad.png"; path = "Resources/setup_start_over~ipad.png"; sourceTree = ""; }; + D3F5F8F41609A86700D3DA1A /* setup_welcome_logo~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_welcome_logo~ipad.png"; path = "Resources/setup_welcome_logo~ipad.png"; sourceTree = ""; }; + D3F5F983160B1A0800D3DA1A /* chat_progressbar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_progressbar_background.png; path = Resources/chat_progressbar_background.png; sourceTree = ""; }; + D3F5F984160B1A0800D3DA1A /* setup_back_default_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_back_default_landscape~ipad.png"; path = "Resources/setup_back_default_landscape~ipad.png"; sourceTree = ""; }; + D3F5F985160B1A0800D3DA1A /* setup_back_default~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_back_default~ipad.png"; path = "Resources/setup_back_default~ipad.png"; sourceTree = ""; }; + D3F5F986160B1A0900D3DA1A /* setup_back_disabled_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "setup_back_disabled_landscape~ipad.png"; path = "Resources/setup_back_disabled_landscape~ipad.png"; sourceTree = ""; }; D3F795D315A582800077328B /* ChatRoomViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatRoomViewController.h; sourceTree = ""; }; D3F795D415A582800077328B /* ChatRoomViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatRoomViewController.m; sourceTree = ""; }; D3F795DB15A5831C0077328B /* chat_back_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_back_default.png; path = Resources/chat_back_default.png; sourceTree = ""; }; @@ -2307,6 +2411,8 @@ D350F20B15A43BB100149E54 /* WizardViewController.h */, D350F20C15A43BB100149E54 /* WizardViewController.m */, D38187E015FE348A00C3EDCA /* WizardViewController.xib */, + D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */, + D3D5126A160B3A8E00946DF8 /* WizardViews.xib */, ); path = Classes; sourceTree = ""; @@ -2775,6 +2881,7 @@ D3A74E6915C69392001500B9 /* backspace_disabled~ipad.png */, D3ED3E7715861B1B006C0DE4 /* backspace_over.png */, D3A74E6A15C69392001500B9 /* backspace_over~ipad.png */, + D3F5F8D91609A86700D3DA1A /* bubble.png */, D32D5AA515ADE5D9008593F3 /* button_alert_background_default.png */, D32D5AA615ADE5D9008593F3 /* button_alert_background_over.png */, D35406F515A47E9E007E7E81 /* button_background_default.png */, @@ -2809,23 +2916,23 @@ D36C43CD158F2F370048BA40 /* cell_conference.png */, D3EA5401159852080037DC6B /* chat_add_default.png */, D3EA5402159852080037DC6B /* chat_add_over.png */, + D354946B160B75B70027E44E /* chat_address.png */, D3F795DB15A5831C0077328B /* chat_back_default.png */, D3F795DC15A5831C0077328B /* chat_back_over.png */, - D3ED40221602257400BF332B /* chat_background.9.png */, - D3ED40231602257400BF332B /* chat_background.9@2x.png */, - D3ED401D1602223B00BF332B /* chat_background.png */, D389363715A6D53200A3A3AA /* chat_bubble_incoming.9.png */, D3A8BB7715A6CC3200F96BE5 /* chat_bubble_incoming.png */, D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */, D3A8BB7615A6CC3200F96BE5 /* chat_bubble_outgoing.png */, + D3F5F8DA1609A86700D3DA1A /* chat_cancel_default.png */, + D3F5F8DB1609A86700D3DA1A /* chat_cancel_over.png */, D38327F11580FE3A00FA0D23 /* chat_default.png */, D3A74E6E15C69392001500B9 /* chat_default_landscape~ipad.png */, D3A74E6F15C69392001500B9 /* chat_default~ipad.png */, D3EA53FF159852080037DC6B /* chat_edit_default.png */, D3EA5400159852080037DC6B /* chat_edit_over.png */, - D3A74F5A15C6AA0B001500B9 /* chat_field.9.png */, - D3A74F5D15C6ADA9001500B9 /* chat_field.9@2x.png */, - D3B9A3DA15A58C440096EA4E /* chat_field.png */, + D3D51252160B35CB00946DF8 /* chat_message_background.9.png */, + D3D51253160B35CB00946DF8 /* chat_message_background.9@2x.png */, + D3D51254160B35CB00946DF8 /* chat_message_background.png */, 2234C8E715EE2F7F00E18E83 /* chat_message_delivered.png */, 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */, 2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */, @@ -2834,6 +2941,10 @@ D38327FF158100E400FA0D23 /* chat_over.png */, D3A74E7015C69392001500B9 /* chat_over_landscape~ipad.png */, D3A74E7115C69392001500B9 /* chat_over~ipad.png */, + D3F5F8DC1609A86700D3DA1A /* chat_photo_default.png */, + D3F5F8DD1609A86700D3DA1A /* chat_photo_disabled.png */, + D3F5F8DE1609A86700D3DA1A /* chat_photo_over.png */, + D3F5F983160B1A0800D3DA1A /* chat_progressbar_background.png */, D38327F21580FE3A00FA0D23 /* chat_selected.png */, D3A74E7215C69392001500B9 /* chat_selected_landscape~ipad.png */, D3A74E7315C69392001500B9 /* chat_selected~ipad.png */, @@ -2894,6 +3005,10 @@ D3C31A0B15BD8DED008ED271 /* dialer_alt_default_landscape.png */, D339888E15C6DD1600CAF1E4 /* dialer_alt_default_landscape~ipad.png */, D3A74E7E15C69392001500B9 /* dialer_alt_default~ipad.png */, + D3328644160B5BC300E6435D /* dialer_alt_disabled.png */, + D3328642160B5BC300E6435D /* dialer_alt_disabled_landscape.png */, + D3328643160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png */, + D3328645160B5BC300E6435D /* dialer_alt_disabled~ipad.png */, D36C43D0158F2F370048BA40 /* dialer_alt_over.png */, D3C31A0C15BD8DED008ED271 /* dialer_alt_over_landscape.png */, D339888F15C6DD1600CAF1E4 /* dialer_alt_over_landscape~ipad.png */, @@ -2902,6 +3017,8 @@ D38327EE1580FE3A00FA0D23 /* dialer_over.png */, D3C2814A15A2D38D0098AA42 /* dialer_selected.png */, D350F21715A43D3400149E54 /* field_background.png */, + D3F5F8E01609A86700D3DA1A /* form_invalid.png */, + D3F5F8E11609A86700D3DA1A /* form_valid.png */, D3F83EFA158205A100336684 /* hangup_default.png */, D3C31A0D15BD8DED008ED271 /* hangup_default_landscape.png */, D339889015C6DD1600CAF1E4 /* hangup_default_landscape~ipad.png */, @@ -2917,6 +3034,8 @@ D347347C1580E5F8003C7B8C /* history_default.png */, D3A74E8215C69392001500B9 /* history_default_landscape~ipad.png */, D3A74E8315C69392001500B9 /* history_default~ipad.png */, + D3F5F8E21609A86700D3DA1A /* history_delete_default.png */, + D3F5F8E31609A86700D3DA1A /* history_delete_over.png */, D3157A8815B4466F00DD8C4C /* history_details_add_default.png */, D3157A8915B4466F00DD8C4C /* history_details_add_over.png */, D3157A8E15B446CB00DD8C4C /* history_details_back_default.png */, @@ -2943,6 +3062,8 @@ D3432A6F158A45AF001C6B0B /* led_inprogress.png */, 225CB2F911ABB76400628906 /* linphone-banner.png */, 8D1107310486CEB800E47090 /* linphone-Info.plist */, + D354944A160B615A0027E44E /* linphone-splashscreen.png */, + D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */, 22058C70116E305000B08DDD /* linphone_icon_57.png */, D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */, 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */, @@ -2956,6 +3077,7 @@ D354981815876FE7000081D8 /* list_details_default.png */, D354981915876FE7000081D8 /* list_details_over.png */, 2214783B1386A2030020F8B8 /* Localizable.strings */, + D3F5F8E41609A86700D3DA1A /* logo_linphone_trame_background.png */, D3F83EF4158205A100336684 /* micro_off_default.png */, D3C31A0F15BD8DED008ED271 /* micro_off_default_landscape.png */, D339889215C6DD1600CAF1E4 /* micro_off_default_landscape~ipad.png */, @@ -3079,16 +3201,34 @@ D3A74EA015C69392001500B9 /* settings_selected_landscape~ipad.png */, D3A74EA115C69392001500B9 /* settings_selected~ipad.png */, D350F21315A43D3400149E54 /* setup_back_default.png */, + D3F5F984160B1A0800D3DA1A /* setup_back_default_landscape~ipad.png */, + D3F5F985160B1A0800D3DA1A /* setup_back_default~ipad.png */, D3A8BB7815A6CC3200F96BE5 /* setup_back_disabled.png */, + D3F5F986160B1A0900D3DA1A /* setup_back_disabled_landscape~ipad.png */, + D3F5F8E51609A86700D3DA1A /* setup_back_disabled~ipad.png */, D350F21415A43D3400149E54 /* setup_back_over.png */, + D3F5F8E61609A86700D3DA1A /* setup_back_over_landscape~ipad.png */, + D3F5F8E71609A86700D3DA1A /* setup_back_over~ipad.png */, D350F21515A43D3400149E54 /* setup_cancel_default.png */, + D3F5F8E81609A86700D3DA1A /* setup_cancel_default_landscape~ipad.png */, + D3D5124C160B213900946DF8 /* setup_cancel_default~ipad.png */, D3A8BB7915A6CC3200F96BE5 /* setup_cancel_disabled.png */, + D3F5F8EA1609A86700D3DA1A /* setup_cancel_disabled_landscape~ipad.png */, + D3F5F8EB1609A86700D3DA1A /* setup_cancel_disabled~ipad.png */, D350F21615A43D3400149E54 /* setup_cancel_over.png */, + D3F5F8EC1609A86700D3DA1A /* setup_cancel_over_landscape~ipad.png */, + D3D5124D160B213900946DF8 /* setup_cancel_over~ipad.png */, D350F21815A43D3400149E54 /* setup_start_default.png */, + D3F5F8EE1609A86700D3DA1A /* setup_start_default_landscape~ipad.png */, + D3F5F8EF1609A86700D3DA1A /* setup_start_default~ipad.png */, D3A8BB7A15A6CC3200F96BE5 /* setup_start_disabled.png */, + D3F5F8F01609A86700D3DA1A /* setup_start_disabled_landscape~ipad.png */, + D3F5F8F11609A86700D3DA1A /* setup_start_disabled~ipad.png */, D350F21915A43D3400149E54 /* setup_start_over.png */, - D350F21A15A43D3400149E54 /* setup_title_assistant.png */, + D3F5F8F21609A86700D3DA1A /* setup_start_over_landscape~ipad.png */, + D3F5F8F31609A86700D3DA1A /* setup_start_over~ipad.png */, D350F21B15A43D3400149E54 /* setup_welcome_logo.png */, + D3F5F8F41609A86700D3DA1A /* setup_welcome_logo~ipad.png */, D3F83EFC158205A100336684 /* speaker_off_default.png */, D3C31A2315BD8DED008ED271 /* speaker_off_default_landscape.png */, D33988A615C6DD1600CAF1E4 /* speaker_off_default_landscape~ipad.png */, @@ -3636,7 +3776,6 @@ D350F22415A43D3400149E54 /* field_background.png in Resources */, D350F22615A43D3400149E54 /* setup_start_default.png in Resources */, D350F22815A43D3400149E54 /* setup_start_over.png in Resources */, - D350F22A15A43D3400149E54 /* setup_title_assistant.png in Resources */, D350F22C15A43D3400149E54 /* setup_welcome_logo.png in Resources */, D35406F715A47E9E007E7E81 /* button_background_default.png in Resources */, D35406F915A47E9E007E7E81 /* button_background_over.png in Resources */, @@ -3821,8 +3960,6 @@ D3A74F5415C69392001500B9 /* video_on_default~ipad.png in Resources */, D3A74F5615C69392001500B9 /* video_on_disabled~ipad.png in Resources */, D3A74F5815C69392001500B9 /* video_on_over~ipad.png in Resources */, - D3A74F5B15C6AA0B001500B9 /* chat_field.9.png in Resources */, - D3A74F5E15C6ADA9001500B9 /* chat_field.9@2x.png in Resources */, D38187C515FE345F00C3EDCA /* DialerViewController~ipad.xib in Resources */, D3BDB9B915C6B5B1007BEAC1 /* transfer_call_disabled~ipad.png in Resources */, D38187E515FE349D00C3EDCA /* UICallBar~ipad.xib in Resources */, @@ -3886,15 +4023,51 @@ D37EE10D16035793003608A6 /* ImageViewController.xib in Resources */, D381881115FE3F0B00C3EDCA /* UICallCell.xib in Resources */, D381881915FE3FCA00C3EDCA /* InCallViewController.xib in Resources */, - D381883E15FE447200C3EDCA /* ChatRoomViewController.xib in Resources */, D381884415FE447200C3EDCA /* ChatViewController.xib in Resources */, D381885415FE448400C3EDCA /* UICallBar.xib in Resources */, D381885615FE448400C3EDCA /* UICallBar~ipad.xib in Resources */, - D3ED40241602257400BF332B /* chat_background.9.png in Resources */, - D3ED40261602257400BF332B /* chat_background.9@2x.png in Resources */, D3998D0416031937009DD22C /* background_alt.png in Resources */, D3866C281608CA1600830F95 /* image_back_default.png in Resources */, D3866C2A1608CA1600830F95 /* image_back_over.png in Resources */, + D3F5F8F71609A86700D3DA1A /* chat_cancel_default.png in Resources */, + D3F5F8F91609A86700D3DA1A /* chat_cancel_over.png in Resources */, + D3F5F8FB1609A86700D3DA1A /* chat_photo_default.png in Resources */, + D3F5F8FD1609A86700D3DA1A /* chat_photo_disabled.png in Resources */, + D3F5F8FF1609A86700D3DA1A /* chat_photo_over.png in Resources */, + D3F5F9071609A86700D3DA1A /* history_delete_default.png in Resources */, + D3F5F9091609A86700D3DA1A /* history_delete_over.png in Resources */, + D3F5F90B1609A86700D3DA1A /* logo_linphone_trame_background.png in Resources */, + D3F5F90D1609A86700D3DA1A /* setup_back_disabled~ipad.png in Resources */, + D3F5F90F1609A86700D3DA1A /* setup_back_over_landscape~ipad.png in Resources */, + D3F5F9111609A86700D3DA1A /* setup_back_over~ipad.png in Resources */, + D3F5F9131609A86700D3DA1A /* setup_cancel_default_landscape~ipad.png in Resources */, + D3F5F9171609A86700D3DA1A /* setup_cancel_disabled_landscape~ipad.png in Resources */, + D3F5F9191609A86700D3DA1A /* setup_cancel_disabled~ipad.png in Resources */, + D3F5F91B1609A86700D3DA1A /* setup_cancel_over_landscape~ipad.png in Resources */, + D3F5F91F1609A86700D3DA1A /* setup_start_default_landscape~ipad.png in Resources */, + D3F5F9211609A86700D3DA1A /* setup_start_default~ipad.png in Resources */, + D3F5F9231609A86700D3DA1A /* setup_start_disabled_landscape~ipad.png in Resources */, + D3F5F9251609A86700D3DA1A /* setup_start_disabled~ipad.png in Resources */, + D3F5F9271609A86700D3DA1A /* setup_start_over_landscape~ipad.png in Resources */, + D3F5F9291609A86700D3DA1A /* setup_start_over~ipad.png in Resources */, + D3F5F92B1609A86700D3DA1A /* setup_welcome_logo~ipad.png in Resources */, + D3F5F987160B1A0900D3DA1A /* chat_progressbar_background.png in Resources */, + D3F5F989160B1A0900D3DA1A /* setup_back_default_landscape~ipad.png in Resources */, + D3F5F98B160B1A0900D3DA1A /* setup_back_default~ipad.png in Resources */, + D3F5F98D160B1A0900D3DA1A /* setup_back_disabled_landscape~ipad.png in Resources */, + D3D5124E160B213900946DF8 /* setup_cancel_default~ipad.png in Resources */, + D3D51250160B213900946DF8 /* setup_cancel_over~ipad.png in Resources */, + D3D51255160B35CB00946DF8 /* chat_message_background.9.png in Resources */, + D3D51257160B35CB00946DF8 /* chat_message_background.9@2x.png in Resources */, + D3D5126C160B3A8E00946DF8 /* WizardViews.xib in Resources */, + D3D51270160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */, + D3328646160B5BC300E6435D /* dialer_alt_disabled_landscape.png in Resources */, + D3328648160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png in Resources */, + D332864A160B5BC300E6435D /* dialer_alt_disabled.png in Resources */, + D332864C160B5BC300E6435D /* dialer_alt_disabled~ipad.png in Resources */, + D354944C160B615A0027E44E /* linphone-splashscreen.png in Resources */, + D354944E160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */, + D354946C160B75B70027E44E /* chat_address.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4151,7 +4324,6 @@ D34BD6FC15C13DB70070C209 /* setup_start_default.png in Resources */, D34BD6FD15C13DB70070C209 /* setup_start_disabled.png in Resources */, D34BD6FE15C13DB70070C209 /* setup_start_over.png in Resources */, - D34BD6FF15C13DB70070C209 /* setup_title_assistant.png in Resources */, D34BD70015C13DB70070C209 /* setup_welcome_logo.png in Resources */, D34BD70115C13DB70070C209 /* speaker_off_default.png in Resources */, D34BD70215C13DB70070C209 /* speaker_off_default_landscape.png in Resources */, @@ -4275,8 +4447,6 @@ D3A74F5515C69392001500B9 /* video_on_default~ipad.png in Resources */, D3A74F5715C69392001500B9 /* video_on_disabled~ipad.png in Resources */, D3A74F5915C69392001500B9 /* video_on_over~ipad.png in Resources */, - D3A74F5C15C6AA0B001500B9 /* chat_field.9.png in Resources */, - D3A74F5F15C6ADA9001500B9 /* chat_field.9@2x.png in Resources */, D38187C615FE345F00C3EDCA /* DialerViewController~ipad.xib in Resources */, D3BDB9BA15C6B5B1007BEAC1 /* transfer_call_disabled~ipad.png in Resources */, D38187E615FE349D00C3EDCA /* UICallBar~ipad.xib in Resources */, @@ -4340,15 +4510,51 @@ D37EE10E16035793003608A6 /* ImageViewController.xib in Resources */, D381881215FE3F0B00C3EDCA /* UICallCell.xib in Resources */, D381881A15FE3FCA00C3EDCA /* InCallViewController.xib in Resources */, - D381883F15FE447200C3EDCA /* ChatRoomViewController.xib in Resources */, D381884515FE447200C3EDCA /* ChatViewController.xib in Resources */, D381885515FE448400C3EDCA /* UICallBar.xib in Resources */, D381885715FE448400C3EDCA /* UICallBar~ipad.xib in Resources */, - D3ED40251602257400BF332B /* chat_background.9.png in Resources */, - D3ED40271602257400BF332B /* chat_background.9@2x.png in Resources */, D3998D0516031937009DD22C /* background_alt.png in Resources */, D3866C291608CA1600830F95 /* image_back_default.png in Resources */, D3866C2B1608CA1600830F95 /* image_back_over.png in Resources */, + D3F5F8F81609A86700D3DA1A /* chat_cancel_default.png in Resources */, + D3F5F8FA1609A86700D3DA1A /* chat_cancel_over.png in Resources */, + D3F5F8FC1609A86700D3DA1A /* chat_photo_default.png in Resources */, + D3F5F8FE1609A86700D3DA1A /* chat_photo_disabled.png in Resources */, + D3F5F9001609A86700D3DA1A /* chat_photo_over.png in Resources */, + D3F5F9081609A86700D3DA1A /* history_delete_default.png in Resources */, + D3F5F90A1609A86700D3DA1A /* history_delete_over.png in Resources */, + D3F5F90C1609A86700D3DA1A /* logo_linphone_trame_background.png in Resources */, + D3F5F90E1609A86700D3DA1A /* setup_back_disabled~ipad.png in Resources */, + D3F5F9101609A86700D3DA1A /* setup_back_over_landscape~ipad.png in Resources */, + D3F5F9121609A86700D3DA1A /* setup_back_over~ipad.png in Resources */, + D3F5F9141609A86700D3DA1A /* setup_cancel_default_landscape~ipad.png in Resources */, + D3F5F9181609A86700D3DA1A /* setup_cancel_disabled_landscape~ipad.png in Resources */, + D3F5F91A1609A86700D3DA1A /* setup_cancel_disabled~ipad.png in Resources */, + D3F5F91C1609A86700D3DA1A /* setup_cancel_over_landscape~ipad.png in Resources */, + D3F5F9201609A86700D3DA1A /* setup_start_default_landscape~ipad.png in Resources */, + D3F5F9221609A86700D3DA1A /* setup_start_default~ipad.png in Resources */, + D3F5F9241609A86700D3DA1A /* setup_start_disabled_landscape~ipad.png in Resources */, + D3F5F9261609A86700D3DA1A /* setup_start_disabled~ipad.png in Resources */, + D3F5F9281609A86700D3DA1A /* setup_start_over_landscape~ipad.png in Resources */, + D3F5F92A1609A86700D3DA1A /* setup_start_over~ipad.png in Resources */, + D3F5F92C1609A86700D3DA1A /* setup_welcome_logo~ipad.png in Resources */, + D3F5F988160B1A0900D3DA1A /* chat_progressbar_background.png in Resources */, + D3F5F98A160B1A0900D3DA1A /* setup_back_default_landscape~ipad.png in Resources */, + D3F5F98C160B1A0900D3DA1A /* setup_back_default~ipad.png in Resources */, + D3F5F98E160B1A0900D3DA1A /* setup_back_disabled_landscape~ipad.png in Resources */, + D3D5124F160B213900946DF8 /* setup_cancel_default~ipad.png in Resources */, + D3D51251160B213900946DF8 /* setup_cancel_over~ipad.png in Resources */, + D3D51256160B35CB00946DF8 /* chat_message_background.9.png in Resources */, + D3D51258160B35CB00946DF8 /* chat_message_background.9@2x.png in Resources */, + D3D5126D160B3A8E00946DF8 /* WizardViews.xib in Resources */, + D3D51271160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */, + D3328647160B5BC300E6435D /* dialer_alt_disabled_landscape.png in Resources */, + D3328649160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png in Resources */, + D332864B160B5BC300E6435D /* dialer_alt_disabled.png in Resources */, + D332864D160B5BC300E6435D /* dialer_alt_disabled~ipad.png in Resources */, + D354944D160B615A0027E44E /* linphone-splashscreen.png in Resources */, + D354944F160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */, + D354946D160B75B70027E44E /* chat_address.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4805,6 +5011,24 @@ name = InCallViewController.xib; sourceTree = ""; }; + D3D5126A160B3A8E00946DF8 /* WizardViews.xib */ = { + isa = PBXVariantGroup; + children = ( + D3D5126B160B3A8E00946DF8 /* en */, + D3D51273160B3E5000946DF8 /* fr */, + ); + name = WizardViews.xib; + sourceTree = ""; + }; + D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */ = { + isa = PBXVariantGroup; + children = ( + D3D5126F160B3AD400946DF8 /* en */, + D3D51272160B3E5000946DF8 /* fr */, + ); + name = "WizardViewController~ipad.xib"; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */