diff --git a/Classes/CallHistoryTableViewController.m b/Classes/CallHistoryTableViewController.m deleted file mode 100644 index def9679e0..000000000 --- a/Classes/CallHistoryTableViewController.m +++ /dev/null @@ -1,245 +0,0 @@ -/* CallHistoryTableViewController.m - * - * Copyright (C) 2009 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import "CallHistoryTableViewController.h" -#import "LinphoneManager.h" - - -@implementation CallHistoryTableViewController -/* -- (id)initWithStyle:(UITableViewStyle)style { - // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. - if (self = [super initWithStyle:style]) { - } - return self; -} -*/ -/* -- (void)viewDidLoad { - [super viewDidLoad]; -} -*/ -/* -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; -} -*/ -/* -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - -} -*/ -/* -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; -} -*/ -/* -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; -} -*/ - -/* -// Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationPortrait); -} -*/ - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - --(void) doAction:(id)sender { - linphone_core_clear_call_logs([LinphoneManager getLc]); - [self.tableView reloadData]; -} - -#pragma mark Table view methods - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - - -// Customize the number of rows in the table view. -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - const MSList * logs = linphone_core_get_call_logs([LinphoneManager getLc]); - return ms_list_size(logs); -} - - -// Customize the appearance of table view cells. -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - - static NSString *CellIdentifier = @"Cell"; - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier] autorelease]; - [cell.textLabel setTextColor:[UIColor colorWithRed:0.7 green:0.745 blue:0.78 alpha:1.0]]; - [cell.detailTextLabel setTextColor:cell.textLabel.textColor]; - } - - // Set up the cell... - LinphoneAddress* partyToDisplay; - const MSList * logs = linphone_core_get_call_logs([LinphoneManager getLc]); - LinphoneCallLog* callLogs = ms_list_nth_data(logs, indexPath.row) ; - - NSString *path; - if (callLogs->dir == LinphoneCallIncoming) { - if (callLogs->status == LinphoneCallSuccess) { - path = [[NSBundle mainBundle] pathForResource:callLogs->video_enabled?@"in_call_video":@"in_call" ofType:@"png"]; - } else { - //missed call - path = [[NSBundle mainBundle] pathForResource:@"missed_call" ofType:@"png"]; - } - partyToDisplay=callLogs->from; - - } else { - path = [[NSBundle mainBundle] pathForResource:callLogs->video_enabled?@"out_call_video":@"out_call" ofType:@"png"]; - partyToDisplay=callLogs->to; - - } - UIImage *image = [UIImage imageWithContentsOfFile:path]; - cell.imageView.image = image; - cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton; - - const char* username = linphone_address_get_username(partyToDisplay)!=0?linphone_address_get_username(partyToDisplay):""; - const char* displayName = linphone_address_get_display_name(partyToDisplay); - - if (displayName) { - NSString* str1 = [NSString stringWithFormat:@"%s", displayName]; - [cell.textLabel setText:str1]; - NSString* str2 = [NSString stringWithFormat:@"%s"/* [%s]"*/,username/*,callLogs->start_date*/]; - [cell.detailTextLabel setText:str2]; - } else { - NSString* str1 = [NSString stringWithFormat:@"%s", username]; - [cell.textLabel setText:str1]; - [cell.detailTextLabel setText:nil]; - } - - return cell; -} - - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // Navigation logic may go here. Create and push another view controller. - // AnotherViewController *anotherViewController = [[AnotherViewController alloc] initWithNibName:@"AnotherView" bundle:nil]; - // [self.navigationController pushViewController:anotherViewController]; - // [anotherViewController release]; - [tableView deselectRowAtIndexPath:indexPath animated:NO]; - - const MSList * logs = linphone_core_get_call_logs([LinphoneManager getLc]); - LinphoneCallLog* callLogs = ms_list_nth_data(logs, indexPath.row) ; - LinphoneAddress* partyToCall; - if (callLogs->dir == LinphoneCallIncoming) { - partyToCall=callLogs->from; - - } else { - partyToCall=callLogs->to; - - } - const char* username = linphone_address_get_username(partyToCall)!=0?linphone_address_get_username(partyToCall):""; - const char* displayName = linphone_address_get_display_name(partyToCall)!=0?linphone_address_get_display_name(partyToCall):""; - const char* domain = linphone_address_get_domain(partyToCall); - - LinphoneProxyConfig* proxyCfg; - linphone_core_get_default_proxy([LinphoneManager getLc],&proxyCfg); - - NSString* phoneNumber; - - if (proxyCfg && (strcmp(domain, linphone_proxy_config_get_domain(proxyCfg)) == 0)) { - phoneNumber = [[NSString alloc] initWithCString:username encoding:[NSString defaultCStringEncoding]]; - } else { - phoneNumber = [[NSString alloc] initWithCString:linphone_address_as_string_uri_only(partyToCall) encoding:[NSString defaultCStringEncoding]]; - } - - NSString* dispName = [[NSString alloc] initWithCString:displayName encoding:[NSString defaultCStringEncoding]]; - - - [[LinphoneManager instance] changeView:PhoneView_Dialer]; - - //TODO - /*[[LinphoneManager instance].callDelegate displayDialerFromUI:self - forUser:phoneNumber - withDisplayName:dispName];*/ - [phoneNumber release]; - [dispName release]; -} - - -/* -// Override to support conditional editing of the table view. -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the specified item to be editable. - return YES; -} -*/ - - -/* -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source - [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES]; - } - else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } -} -*/ - - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { -} -*/ - - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ - -- (void)dealloc { - [super dealloc]; -} - - -@end - diff --git a/Classes/ConferenceCallDetailView.m b/Classes/ConferenceCallDetailView.m index d31b9cf57..a33907976 100644 --- a/Classes/ConferenceCallDetailView.m +++ b/Classes/ConferenceCallDetailView.m @@ -18,9 +18,10 @@ */ #import "ConferenceCallDetailView.h" -#import "linphonecore.h" #import "LinphoneManager.h" -#import "IncallViewController.h" +#import "InCallViewController.h" + +#include "linphonecore.h" @implementation ConferenceCallDetailView @@ -86,8 +87,8 @@ NSTimer *callQualityRefresher; -(void) viewWillAppear:(BOOL)animated { [table reloadData]; - [mute reset]; - [speaker reset]; + [mute update]; + [speaker update]; [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; [super viewWillAppear:animated]; } diff --git a/Classes/ConsoleViewController.h b/Classes/ConsoleViewController.h index 2956112a2..5ae2f3a28 100644 --- a/Classes/ConsoleViewController.h +++ b/Classes/ConsoleViewController.h @@ -17,20 +17,18 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #import -#import "LogView.h" +#import "LogView.h" @interface ConsoleViewController : UIViewController { UITextView* logs; UIView* logsView; - - } + -(void) doAction; + @property (nonatomic, retain) IBOutlet UITextView* logs; @property (nonatomic, retain) IBOutlet UIView* logsView; - @end diff --git a/Classes/ConsoleViewController.m b/Classes/ConsoleViewController.m index 246ced0eb..46e8c8cb4 100644 --- a/Classes/ConsoleViewController.m +++ b/Classes/ConsoleViewController.m @@ -20,25 +20,13 @@ #import "ConsoleViewController.h" - @implementation ConsoleViewController + NSMutableString* MoreViewController_logs; @synthesize logs; @synthesize logsView; -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - // Custom initialization - } - return self; -} -*/ - - -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. - (void)viewDidLoad { [super viewDidLoad]; UIBarButtonItem* clear = [[[UIBarButtonItem alloc] @@ -48,34 +36,12 @@ NSMutableString* MoreViewController_logs; [self.navigationItem setRightBarButtonItem:clear]; } - -/* -// Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationPortrait); -} -*/ - --(void) viewWillAppear:(BOOL)animated { +- (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; [logs setText:MoreViewController_logs]; } -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - --(void) addLog:(NSString*) log { +- (void)addLog:(NSString*) log { @synchronized(self) { if (!MoreViewController_logs) { MoreViewController_logs = [[NSMutableString alloc] init]; @@ -87,7 +53,8 @@ NSMutableString* MoreViewController_logs; } } } --(void) doAction{ + +- (void)doAction{ @synchronized(self) { NSMutableString* oldString = MoreViewController_logs; MoreViewController_logs = [[NSMutableString alloc] init]; @@ -96,11 +63,8 @@ NSMutableString* MoreViewController_logs; } } - - - (void)dealloc { [super dealloc]; } - @end diff --git a/Classes/ContactTableViewController.h b/Classes/ContactTableViewController.h index 5141d7a03..97c0717e3 100644 --- a/Classes/ContactTableViewController.h +++ b/Classes/ContactTableViewController.h @@ -18,8 +18,8 @@ */ #import -#import #import + #import "OrderedDictionary.h" @interface ContactTableViewController : UITableViewController { diff --git a/Classes/ContactTableViewController.m b/Classes/ContactTableViewController.m index 03383d73b..70a8129cc 100644 --- a/Classes/ContactTableViewController.m +++ b/Classes/ContactTableViewController.m @@ -19,7 +19,7 @@ #include "ContactTableViewController.h" #import "FastAddressBook.h" -#import "ContactCell.h" +#import "UIContactCell.h" @implementation ContactTableViewController @@ -36,20 +36,25 @@ void sync_toc_address_book (ABAddressBookRef addressBook, CFDictionaryRef info, NSArray *lContacts = (NSArray *)ABAddressBookCopyArrayOfAllPeople(addressBook); for (id lPerson in lContacts) { - CFStringRef lValue = ABRecordCopyValue((ABRecordRef)lPerson, kABPersonFirstNameProperty); - CFStringRef lLocalizedLabel = ABAddressBookCopyLocalizedLabel(lValue); - + CFStringRef lFirstName = ABRecordCopyValue((ABRecordRef)lPerson, kABPersonFirstNameProperty); + CFStringRef lLocalizedFirstName = ABAddressBookCopyLocalizedLabel(lFirstName); + CFStringRef lLastName = ABRecordCopyValue((ABRecordRef)lPerson, kABPersonLastNameProperty); + CFStringRef lLocalizedLastName = ABAddressBookCopyLocalizedLabel(lLastName); + NSString *name =[NSString stringWithFormat:@"%@%@", [(NSString *)lLocalizedFirstName retain], [(NSString *)lLocalizedLastName retain]]; + // Put in correct subDic - NSString *firstChar = [[(NSString *)lLocalizedLabel substringToIndex:1] uppercaseString]; + NSString *firstChar = [[name substringToIndex:1] uppercaseString]; OrderedDictionary *subDic =[lAddressBookMap objectForKey: firstChar]; if(subDic == nil) { subDic = [[OrderedDictionary alloc] init]; [lAddressBookMap insertObject:subDic forKey:firstChar selector:@selector(caseInsensitiveCompare:)]; } - [subDic insertObject:lPerson forKey:[(NSString *)lLocalizedLabel retain] selector:@selector(caseInsensitiveCompare:)]; - - if (lLocalizedLabel) CFRelease(lLocalizedLabel); - CFRelease(lValue); + [subDic insertObject:lPerson forKey:name selector:@selector(caseInsensitiveCompare:)]; + + CFRelease(lLocalizedLastName); + CFRelease(lLastName); + CFRelease(lLocalizedFirstName); + CFRelease(lFirstName); } CFRelease(lContacts); } @@ -72,14 +77,29 @@ void sync_toc_address_book (ABAddressBookRef addressBook, CFDictionaryRef info, } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - ContactCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ContactCell"]; + UIContactCell *cell = [tableView dequeueReusableCellWithIdentifier:@"UIContactCell"]; if (cell == nil) { - cell = [[ContactCell alloc] init]; + cell = [[UIContactCell alloc] init]; } OrderedDictionary *subDic = [addressBookMap objectForKey: [addressBookMap keyAtIndex: [indexPath section]]]; - [cell.label setText: (NSString *)[[subDic allKeys] objectAtIndex:[indexPath row]]]; + NSString *key = [[subDic allKeys] objectAtIndex:[indexPath row]]; + ABRecordRef record = [subDic objectForKey:key]; + + CFStringRef lFirstName = ABRecordCopyValue(record, kABPersonFirstNameProperty); + CFStringRef lLocalizedFirstName = ABAddressBookCopyLocalizedLabel(lFirstName); + CFStringRef lLastName = ABRecordCopyValue(record, kABPersonLastNameProperty); + CFStringRef lLocalizedLastName = ABAddressBookCopyLocalizedLabel(lLastName); + + [cell.firstName setText: [(NSString *)lLocalizedFirstName retain]]; + [cell.lastName setText: [(NSString *)lLocalizedLastName retain]]; + [cell update]; + + CFRelease(lLocalizedLastName); + CFRelease(lLastName); + CFRelease(lLocalizedFirstName); + CFRelease(lFirstName); return cell; } diff --git a/Classes/ContactsController.h b/Classes/ContactsViewController.h similarity index 94% rename from Classes/ContactsController.h rename to Classes/ContactsViewController.h index 2676c9d1b..f1244803b 100644 --- a/Classes/ContactsController.h +++ b/Classes/ContactsViewController.h @@ -1,4 +1,4 @@ -/* HistoryController.h +/* ContactsViewController.h * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -19,14 +19,17 @@ #import -@interface ContactsController : UIViewController { +@interface ContactsViewController : UIViewController { UITableViewController *tableController; UIButton *allButton; UIButton *linphoneButton; } + @property (nonatomic, retain) IBOutlet UITableViewController* tableController; @property (nonatomic, retain) IBOutlet UIButton* allButton; @property (nonatomic, retain) IBOutlet UIButton* linphoneButton; + -(IBAction) onAllClick: (id) event; -(IBAction) onLinphoneClick: (id) event; + @end diff --git a/Classes/ContactsController.m b/Classes/ContactsViewController.m similarity index 94% rename from Classes/ContactsController.m rename to Classes/ContactsViewController.m index 515784419..52ee33ce9 100644 --- a/Classes/ContactsController.m +++ b/Classes/ContactsViewController.m @@ -1,4 +1,4 @@ -/* HistoryController.m +/* ContactsViewController.m * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -17,11 +17,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#import "ContactsViewController.h" -#import "ContactsController.h" #import "AddressBook/ABPerson.h" -@implementation ContactsController +@implementation ContactsViewController @synthesize tableController; @synthesize allButton; diff --git a/Classes/ContactsController.xib b/Classes/ContactsViewController.xib similarity index 97% rename from Classes/ContactsController.xib rename to Classes/ContactsViewController.xib index 4273e7de4..6b12285d4 100644 --- a/Classes/ContactsController.xib +++ b/Classes/ContactsViewController.xib @@ -39,7 +39,7 @@ - 274 + 288 @@ -156,6 +156,7 @@ {{0, 58}, {320, 402}} + _NS:10 3 @@ -165,6 +166,10 @@ YES NO IBCocoaTouchFramework + 0.0 + 15 + 0.0 + 0.0 YES YES NO @@ -189,6 +194,7 @@ IBCocoaTouchFramework + NO 1 @@ -348,7 +354,7 @@ - ContactsController + ContactsViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -381,7 +387,7 @@ - ContactsController + ContactsViewController UIViewController id @@ -418,7 +424,7 @@ IBProjectSource - ./Classes/ContactsController.h + ./Classes/ContactsViewController.h diff --git a/Classes/CallHistoryTableViewController.h b/Classes/HistoryTableViewController.h similarity index 91% rename from Classes/CallHistoryTableViewController.h rename to Classes/HistoryTableViewController.h index 21b4abac5..990881727 100644 --- a/Classes/CallHistoryTableViewController.h +++ b/Classes/HistoryTableViewController.h @@ -1,4 +1,4 @@ -/* CallHistoryTableViewController.h +/* HistoryTableViewController.h * * Copyright (C) 2009 Belledonne Comunications, Grenoble, France * @@ -19,6 +19,8 @@ #import -@interface CallHistoryTableViewController : UITableViewController { +@interface HistoryTableViewController : UITableViewController { + } + @end diff --git a/Classes/HistoryTableViewController.m b/Classes/HistoryTableViewController.m new file mode 100644 index 000000000..ae8fc4aae --- /dev/null +++ b/Classes/HistoryTableViewController.m @@ -0,0 +1,133 @@ +/* HistoryTableViewController.m + * + * Copyright (C) 2009 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "HistoryTableViewController.h" +#import "UIHistoryCell.h" +#import "LinphoneManager.h" + +@implementation HistoryTableViewController + +-(void) doAction:(id)sender { + linphone_core_clear_call_logs([LinphoneManager getLc]); + [self.tableView reloadData]; +} + +#pragma mark Table view methods + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + const MSList * logs = linphone_core_get_call_logs([LinphoneManager getLc]); + return ms_list_size(logs); +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UIHistoryCell *cell = [tableView dequeueReusableCellWithIdentifier:@"UIHistoryCell"]; + if (cell == nil) { + cell = [[UIHistoryCell alloc] init]; + } + + // Set up the cell... + LinphoneAddress* partyToDisplay; + const MSList * logs = linphone_core_get_call_logs([LinphoneManager getLc]); + LinphoneCallLog* callLogs = ms_list_nth_data(logs, indexPath.row) ; + + NSString *path; + if (callLogs->dir == LinphoneCallIncoming) { + if (callLogs->status == LinphoneCallSuccess) { + path = [[NSBundle mainBundle] pathForResource:callLogs->video_enabled?@"appel-entrant":@"appel-entrant" ofType:@"png"]; + } else { + //missed call + path = [[NSBundle mainBundle] pathForResource:@"appel-manque" ofType:@"png"]; + } + partyToDisplay=callLogs->from; + + } else { + path = [[NSBundle mainBundle] pathForResource:callLogs->video_enabled?@"appel-sortant":@"appel-sortant" ofType:@"png"]; + partyToDisplay=callLogs->to; + + } + UIImage *image = [UIImage imageWithContentsOfFile:path]; + + const char* username = linphone_address_get_username(partyToDisplay)!=0?linphone_address_get_username(partyToDisplay):""; + + //TODO + //const char* displayName = linphone_address_get_display_name(partyToDisplay); + + [cell.displayName setText:[NSString stringWithFormat:@"%s", username]]; + cell.imageView.image = image; + + return cell; +} + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + [tableView deselectRowAtIndexPath:indexPath animated:NO]; + + const MSList * logs = linphone_core_get_call_logs([LinphoneManager getLc]); + LinphoneCallLog* callLogs = ms_list_nth_data(logs, indexPath.row) ; + LinphoneAddress* partyToCall; + if (callLogs->dir == LinphoneCallIncoming) { + partyToCall=callLogs->from; + + } else { + partyToCall=callLogs->to; + + } + const char* username = linphone_address_get_username(partyToCall)!=0?linphone_address_get_username(partyToCall):""; + const char* displayName = linphone_address_get_display_name(partyToCall)!=0?linphone_address_get_display_name(partyToCall):""; + const char* domain = linphone_address_get_domain(partyToCall); + + LinphoneProxyConfig* proxyCfg; + linphone_core_get_default_proxy([LinphoneManager getLc],&proxyCfg); + + NSString* phoneNumber; + + if (proxyCfg && (strcmp(domain, linphone_proxy_config_get_domain(proxyCfg)) == 0)) { + phoneNumber = [[NSString alloc] initWithCString:username encoding:[NSString defaultCStringEncoding]]; + } else { + phoneNumber = [[NSString alloc] initWithCString:linphone_address_as_string_uri_only(partyToCall) encoding:[NSString defaultCStringEncoding]]; + } + + NSString* dispName = [[NSString alloc] initWithCString:displayName encoding:[NSString defaultCStringEncoding]]; + + // Go to dialer view + NSDictionary *dict = [[NSDictionary alloc] initWithObjectsAndKeys: + [[NSDictionary alloc] initWithObjectsAndKeys: + [[NSArray alloc] initWithObjects: dispName, nil] + , @"setText:", nil] + , @"mDisplayName", + [[NSDictionary alloc] initWithObjectsAndKeys: + [[NSArray alloc] initWithObjects: phoneNumber, nil] + , @"setText:", nil] + , @"address", + nil]; + [[LinphoneManager instance] changeView:PhoneView_Dialer dict:dict]; + + [phoneNumber release]; + [dispName release]; +} + +- (void)dealloc { + [super dealloc]; +} + +@end + diff --git a/Classes/HistoryController.h b/Classes/HistoryViewController.h similarity index 83% rename from Classes/HistoryController.h rename to Classes/HistoryViewController.h index 265f608ed..bfd90386e 100644 --- a/Classes/HistoryController.h +++ b/Classes/HistoryViewController.h @@ -1,4 +1,4 @@ -/* HistoryController.h +/* HistoryViewController.h * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -18,16 +18,20 @@ */ #import -#import "CallHistoryTableViewController.h" -@interface HistoryController : UIViewController { - CallHistoryTableViewController *tableController; +#import "HistoryTableViewController.h" + +@interface HistoryViewController : UIViewController { + HistoryTableViewController *tableController; UIButton *allButton; UIButton *missedButton; } -@property (nonatomic, retain) IBOutlet CallHistoryTableViewController* tableController; + +@property (nonatomic, retain) IBOutlet HistoryTableViewController* tableController; @property (nonatomic, retain) IBOutlet UIButton* allButton; @property (nonatomic, retain) IBOutlet UIButton* missedButton; + -(IBAction) onAllClick: (id) event; -(IBAction) onMissedClick: (id) event; + @end diff --git a/Classes/HistoryController.m b/Classes/HistoryViewController.m similarity index 87% rename from Classes/HistoryController.m rename to Classes/HistoryViewController.m index cdd746907..502827320 100644 --- a/Classes/HistoryController.m +++ b/Classes/HistoryViewController.m @@ -1,4 +1,4 @@ -/* HistoryController.m +/* HistoryViewController.m * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -17,11 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#import "HistoryViewController.h" -#import "HistoryController.h" +@implementation HistoryViewController - -@implementation HistoryController @synthesize tableController; @synthesize allButton; @synthesize missedButton; @@ -32,8 +31,7 @@ typedef enum _HistoryView { History_MAX } HistoryView; - -- (void) changeView: (HistoryView) view { +- (void)changeView: (HistoryView) view { if(view == History_All) { allButton.selected = TRUE; } else { @@ -47,16 +45,16 @@ typedef enum _HistoryView { } } -- (void) viewDidLoad { +- (void)viewDidLoad { [super viewDidLoad]; [self changeView: History_All]; } --(IBAction) onAllClick: (id) event { +- (IBAction)onAllClick: (id) event { [self changeView: History_All]; } --(IBAction) onMissedClick: (id) event { +- (IBAction)onMissedClick: (id) event { [self changeView: History_Missed]; } diff --git a/Classes/HistoryController.xib b/Classes/HistoryViewController.xib similarity index 95% rename from Classes/HistoryController.xib rename to Classes/HistoryViewController.xib index 3f23429e4..9fb67afc8 100644 --- a/Classes/HistoryController.xib +++ b/Classes/HistoryViewController.xib @@ -39,7 +39,7 @@ - 274 + 288 @@ -164,6 +164,10 @@ YES IBCocoaTouchFramework + 0.0 + 15 + 0.0 + 0.0 YES 1 0 @@ -186,6 +190,7 @@ IBCocoaTouchFramework + NO 1 @@ -345,12 +350,12 @@ - HistoryController + HistoryViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - CallHistoryTableViewController + HistoryTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -370,15 +375,15 @@ - CallHistoryTableViewController + HistoryTableViewController UITableViewController IBProjectSource - ./Classes/CallHistoryTableViewController.h + ./Classes/HistoryTableViewController.h - HistoryController + HistoryViewController UIViewController id @@ -397,7 +402,7 @@ UIButton UIButton - CallHistoryTableViewController + HistoryTableViewController @@ -410,12 +415,12 @@ tableController - CallHistoryTableViewController + HistoryTableViewController IBProjectSource - ./Classes/HistoryController.h + ./Classes/HistoryViewController.h diff --git a/Classes/InCallViewController.h b/Classes/InCallViewController.h index fa5006ced..ccb5f3779 100644 --- a/Classes/InCallViewController.h +++ b/Classes/InCallViewController.h @@ -23,7 +23,7 @@ #import "linphonecore.h" #import "PhoneViewController.h" #import "ConferenceCallDetailView.h" -#import "UIToggleVideoButton.h" +#import "UIVideoButton.h" #import "VideoZoomHandler.h" #include "UILinphone.h" @@ -37,11 +37,7 @@ UIButton* endCtrl; UIButton* dialer; - UIMicroButton* mute; - UIButton* pause; - UISpeakerButton* speaker; UIButton* contacts; - UIToggleVideoButton* addVideo; UITableView* callTableView; UIButton* addCall, *mergeCalls; UIButton* transfer; @@ -114,11 +110,7 @@ @property (nonatomic, retain) IBOutlet UIButton* endCtrl; @property (nonatomic, retain) IBOutlet UIButton* dialer; -@property (nonatomic, retain) IBOutlet UIButton* mute; -@property (nonatomic, retain) IBOutlet UIButton* pause; -@property (nonatomic, retain) IBOutlet UIButton* speaker; @property (nonatomic, retain) IBOutlet UIButton* contacts; -@property (nonatomic, retain) IBOutlet UIToggleVideoButton* addVideo; @property (nonatomic, retain) IBOutlet UITableView* callTableView; @property (nonatomic, retain) IBOutlet UIButton* addCall; @property (nonatomic, retain) IBOutlet UIButton* mergeCalls; diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index f2de7fd9b..943341133 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -45,10 +45,7 @@ const NSInteger SECURE_BUTTON_TAG=5; @synthesize endCtrl; @synthesize close; -@synthesize mute; -@synthesize pause; @synthesize dialer; -@synthesize speaker; @synthesize contacts; @synthesize callTableView; @synthesize addCall; @@ -80,7 +77,7 @@ const NSInteger SECURE_BUTTON_TAG=5; @synthesize testVideoView; #endif -@synthesize addVideo; +//@synthesize addVideo; +(void) updateIndicator:(UIImageView*) indicator withCallQuality:(float) quality { @@ -167,12 +164,13 @@ void addAnimationFadeTransition(UIView* view, float duration) { [UIView beginAnimations:nil context:NULL]; [UIView setAnimationDuration:0.2f]; endCtrl.imageView.transform = transform; - mute.imageView.transform = transform; - speaker.imageView.transform = transform; - pause.imageView.transform = transform; + //TODO + //mute.imageView.transform = transform; + //speaker.imageView.transform = transform; + //pause.imageView.transform = transform; contacts.imageView.transform = transform; addCall.imageView.transform = transform; - addVideo.imageView.transform = transform; + //addVideo.imageView.transform = transform; dialer.imageView.transform = transform; videoCallQuality.transform = transform; [UIView commitAnimations]; @@ -310,9 +308,10 @@ void addAnimationFadeTransition(UIView* view, float duration) { /* restore buttons orientation */ endCtrl.imageView.transform = CGAffineTransformIdentity; - mute.imageView.transform = CGAffineTransformIdentity; - speaker.imageView.transform = CGAffineTransformIdentity; - pause.imageView.transform = CGAffineTransformIdentity; + //TODO + //mute.imageView.transform = CGAffineTransformIdentity; + //speaker.imageView.transform = CGAffineTransformIdentity; + //pause.imageView.transform = CGAffineTransformIdentity; contacts.imageView.transform = CGAffineTransformIdentity; addCall.imageView.transform = CGAffineTransformIdentity; dialer.imageView.transform = CGAffineTransformIdentity; @@ -334,57 +333,24 @@ void addAnimationFadeTransition(UIView* view, float duration) { return; } // 1 call: show pause button, otherwise show merge btn - [LinphoneManager set:pause hidden:(callCount(lc) > 1) withName:"PAUSE button" andReason:"call count"]; - [LinphoneManager set:mergeCalls hidden:!pause.hidden withName:"MERGE button" andReason:"call count"]; + // [LinphoneManager set:mergeCalls hidden:!pause.hidden withName:"MERGE button" andReason:"call count"]; // reload table (glow update + call duration) [callTableView reloadData]; LinphoneCall* currentCall = linphone_core_get_current_call([LinphoneManager getLc]); - int callsCount = linphone_core_get_calls_nb(lc); // hide pause/resume if in conference if (currentCall) { - [mute reset]; - if (linphone_core_is_in_conference(lc)) { - [LinphoneManager set:pause hidden:YES withName:"PAUSE button" andReason:"is in conference"]; - } - else if (callCount(lc) == callsCount && callsCount == 1) { - [LinphoneManager set:pause hidden:NO withName:"PAUSE button" andReason:"call count == 1"]; - pause.selected = NO; - } else { - [LinphoneManager set:pause hidden:YES withName:"PAUSE button" andReason:AT]; - } - if (fullUpdate) { videoUpdateIndicator.hidden = YES; LinphoneCallState state = linphone_call_get_state(currentCall); if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdated || state == LinphoneCallUpdatedByRemote) { - if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) { - [addVideo setTitle:NSLocalizedString(@"-video", nil) forState:UIControlStateNormal]; - [InCallViewController updateIndicator: videoCallQuality withCallQuality:linphone_call_get_average_quality(currentCall)]; - } else { - [addVideo setTitle:NSLocalizedString(@"+video", nil) forState:UIControlStateNormal]; - } - [addVideo setEnabled:YES]; } else { - [addVideo setEnabled:NO]; [videoCallQuality setImage:nil]; } } - } else { - if (callsCount == 1) { - LinphoneCall* c = (LinphoneCall*)linphone_core_get_calls(lc)->data; - if (linphone_call_get_state(c) == LinphoneCallPaused || - linphone_call_get_state(c) == LinphoneCallPausing) { - pause.selected = YES; - } - [LinphoneManager set:pause hidden:NO withName:"PAUSE button" andReason:AT]; - } else { - [LinphoneManager set:pause hidden:YES withName:"PAUSE button" andReason:AT]; - } - [addVideo setEnabled:NO]; - } - [LinphoneManager set:mergeCalls hidden:!pause.hidden withName:"MERGE button" andReason:AT]; + } + // [LinphoneManager set:mergeCalls hidden:!pause.hidden withName:"MERGE button" andReason:AT]; // update conference details view if displayed if (self.presentedViewController == conferenceDetail) { @@ -464,7 +430,7 @@ void addAnimationFadeTransition(UIView* view, float duration) { [videoCameraSwitch setPreview:videoPreview]; - addVideo.videoUpdateIndicator = videoUpdateIndicator; + //addVideo.videoUpdateIndicator = videoUpdateIndicator; [transfer addTarget:self action:@selector(transferPressed) forControlEvents:UIControlEventTouchUpInside]; @@ -593,7 +559,7 @@ void addAnimationFadeTransition(UIView* view, float duration) { bool enableVideo = [[NSUserDefaults standardUserDefaults] boolForKey:@"enable_video_preference"]; [LinphoneManager set:contacts hidden:enableVideo withName:"CONTACT button" andReason:AT]; - [LinphoneManager set:addVideo hidden:!contacts.hidden withName:"ADD_VIDEO button" andReason:AT]; + //[LinphoneManager set:addVideo hidden:!contacts.hidden withName:"ADD_VIDEO button" andReason:AT]; } } } @@ -747,6 +713,12 @@ static void hideSpinner(LinphoneCall* lc, void* user_data); } break; + } + case LinphoneCallPausing: + case LinphoneCallPaused: + { + [self disableVideoDisplay]; + break; } case LinphoneCallError: { if (canHideInCallView) { diff --git a/Classes/InCallViewController.xib b/Classes/InCallViewController.xib index 9a6774b53..f8880c72f 100644 --- a/Classes/InCallViewController.xib +++ b/Classes/InCallViewController.xib @@ -185,7 +185,6 @@ {{119, 251}, {82, 52}} - NO NO @@ -1020,7 +1019,6 @@ YES addCall - addVideo callTableView close conferenceDetail @@ -1034,14 +1032,11 @@ hangUpView hash mergeCalls - mute nine one padSubView - pause seven six - speaker star testVideoView three @@ -1060,7 +1055,6 @@ YES UIButton - UIToggleVideoButton UITableView UIButton UIViewController @@ -1076,13 +1070,10 @@ UIButton UIButton UIButton - UIButton UIView UIButton UIButton UIButton - UIButton - UIButton UIView UIButton UIButton @@ -1103,7 +1094,6 @@ YES addCall - addVideo callTableView close conferenceDetail @@ -1117,14 +1107,11 @@ hangUpView hash mergeCalls - mute nine one padSubView - pause seven six - speaker star testVideoView three @@ -1146,10 +1133,6 @@ addCall UIButton - - addVideo - UIToggleVideoButton - callTableView UITableView @@ -1202,10 +1185,6 @@ mergeCalls UIButton - - mute - UIButton - nine UIButton @@ -1218,10 +1197,6 @@ padSubView UIView - - pause - UIButton - seven UIButton @@ -1230,10 +1205,6 @@ six UIButton - - speaker - UIButton - star UIButton @@ -1333,11 +1304,11 @@ - UIMuteButton + UIMicroButton UIToggleButton IBProjectSource - ./Classes/UIMuteButton.h + ./Classes/UIMicroButton.h @@ -1348,25 +1319,6 @@ ./Classes/UIToggleButton.h - - UIToggleVideoButton - UIButton - - videoUpdateIndicator - UIActivityIndicatorView - - - videoUpdateIndicator - - videoUpdateIndicator - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIToggleVideoButton.h - - VideoViewController UIViewController @@ -1412,9 +1364,9 @@ UIHangUpButton UIView UIView - UIMuteButton - UIMuteButton - UIMuteButton + UIMicroButton + UIMicroButton + UIMicroButton UIView UIView UIView @@ -1507,15 +1459,15 @@ mMute - UIMuteButton + UIMicroButton mMuteLandLeft - UIMuteButton + UIMicroButton mMuteLandRight - UIMuteButton + UIMicroButton mPortrait diff --git a/Classes/LinphoneUI/ContactCell.xib b/Classes/LinphoneUI/ContactCell.xib deleted file mode 100644 index 98886f8ae..000000000 --- a/Classes/LinphoneUI/ContactCell.xib +++ /dev/null @@ -1,195 +0,0 @@ - - - - 1296 - 11E53 - 2182 - 1138.47 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1181 - - - IBProxyObject - IBUILabel - IBUITableViewCell - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 292 - - - - 256 - - - - 274 - {{10, 0}, {310, 39}} - - - _NS:328 - NO - YES - 7 - 2 - NO - IBCocoaTouchFramework - Texte de test - - 1 - MCAwIDAAA - - - 1 - 10 - - 1 - 25 - - - Helvetica - 25 - 16 - - - - {320, 39} - - - - _NS:395 - - 3 - MCAwAA - - NO - YES - 4 - YES - IBCocoaTouchFramework - - - {320, 40} - - - - _NS:384 - IBCocoaTouchFramework - - ConferenceDetailCellIdentifier - - - - - - - - label - - - - 9 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - - cell - - - 6 - - - label - - - - - ContactCell - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 9 - - - - - ContactCell - UITableViewCell - - label - UILabel - - - label - - label - UILabel - - - - IBProjectSource - ./Classes/ContactCell.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - YES - 3 - 1181 - - diff --git a/Classes/LinphoneUI/LinphoneCallBar.m b/Classes/LinphoneUI/LinphoneCallBar.m deleted file mode 100644 index 41ff73d57..000000000 --- a/Classes/LinphoneUI/LinphoneCallBar.m +++ /dev/null @@ -1,152 +0,0 @@ -/* LinphoneCallBar.m - * - * Copyright (C) 2012 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import "LinphoneCallBar.h" -#import "LinphoneManager.h" - -#include "linphonecore.h" -#include "private.h" - -#define STRINGIFY(x) #x -#define TOSTRING(x) STRINGIFY(x) -#define AT __FILE__ ":" TOSTRING(__LINE__) - -@implementation LinphoneCallBar - -@synthesize pauseButton; -@synthesize videoButton; -@synthesize microButton; -@synthesize speakerButton; - -- (void) viewDidLoad { - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(callUpdate:) name:@"LinphoneCallUpdate" object:nil]; -} - -bool isInConference2(LinphoneCall* call) { - if (!call) - return false; - return linphone_call_get_current_params(call)->in_conference; -} - -int callCount2(LinphoneCore* lc) { - int count = 0; - const MSList* calls = linphone_core_get_calls(lc); - - while (calls != 0) { - if (!isInConference2((LinphoneCall*)calls->data)) { - count++; - } - calls = calls->next; - } - return count; -} - --(IBAction) onPauseClick: (id) event { - [LinphoneManager logUIElementPressed:"PAUSE button"]; - - LinphoneCore* lc = [LinphoneManager getLc]; - LinphoneCall* currentCall = linphone_core_get_current_call(lc); - if (currentCall) { - if (linphone_call_get_state(currentCall) == LinphoneCallStreamsRunning) { - [pauseButton setSelected:NO]; - linphone_core_pause_call(lc, currentCall); - - // hide video view - //TODO - //[self disableVideoDisplay]; - } - } else { - if (linphone_core_get_calls_nb(lc) == 1) { - LinphoneCall* c = (LinphoneCall*) linphone_core_get_calls(lc)->data; - if (linphone_call_get_state(c) == LinphoneCallPaused) { - linphone_core_resume_call(lc, c); - [pauseButton setSelected:YES]; - - const LinphoneCallParams* p = linphone_call_get_current_params(c); - if (linphone_call_params_video_enabled(p)) { - //TODO - //[self enableVideoDisplay]; - } - } - } - } -} - -- (void) callUpdate: (NSNotification*) notif { - bool fullUpdate = true; - // check LinphoneCore is initialized - LinphoneCore* lc = nil; - @try { - lc = [LinphoneManager getLc]; - } @catch (NSException* exc) { - return; - } - // 1 call: show pause button, otherwise show merge btn - [LinphoneManager set:pauseButton enabled:(callCount2(lc) == 1) withName:"PAUSE button" andReason:"call count"]; - //TODO - //[LinphoneManager set:mergeCalls hidden:!pause.hidden withName:"MERGE button" andReason:"call count"]; - - LinphoneCall* currentCall = linphone_core_get_current_call([LinphoneManager getLc]); - int callsCount = linphone_core_get_calls_nb(lc); - - // hide pause/resume if in conference - if (currentCall) { - [microButton reset]; - if (linphone_core_is_in_conference(lc)) { - [LinphoneManager set:pauseButton enabled:FALSE withName:"PAUSE button" andReason:"is in conference"]; - } - else if (callCount2(lc) == callsCount && callsCount == 1) { - [LinphoneManager set:pauseButton enabled:TRUE withName:"PAUSE button" andReason:"call count == 1"]; - pauseButton.selected = NO; - } else { - [LinphoneManager set:pauseButton enabled:FALSE withName:"PAUSE button" andReason:AT]; - } - - if (fullUpdate) { - //TODO - //videoUpdateIndicator.hidden = YES; - LinphoneCallState state = linphone_call_get_state(currentCall); - if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdated || state == LinphoneCallUpdatedByRemote) { - if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) { - [videoButton setSelected:TRUE]; - } else { - [videoButton setSelected:FALSE]; - } - [videoButton setEnabled:YES]; - } else { - [videoButton setEnabled:NO]; - //[videoCallQuality setImage:nil]; - } - } - } else { - if (callsCount == 1) { - LinphoneCall* c = (LinphoneCall*)linphone_core_get_calls(lc)->data; - if (linphone_call_get_state(c) == LinphoneCallPaused || - linphone_call_get_state(c) == LinphoneCallPausing) { - pauseButton.selected = YES; - } - [LinphoneManager set:pauseButton enabled:TRUE withName:"PAUSE button" andReason:AT]; - } else { - [LinphoneManager set:pauseButton enabled:FALSE withName:"PAUSE button" andReason:AT]; - } - [videoButton setEnabled:NO]; - } -} - -@end diff --git a/Classes/LinphoneUI/LinphoneManager.h b/Classes/LinphoneUI/LinphoneManager.h index 60869ddd4..36bb3e922 100644 --- a/Classes/LinphoneUI/LinphoneManager.h +++ b/Classes/LinphoneUI/LinphoneManager.h @@ -92,7 +92,7 @@ typedef struct _LinphoneCallAppData { +(void) set:(UIView*)view hidden: (BOOL) hidden withName:(const char*)name andReason:(const char*) reason; +(void) set:(UIButton*)view enabled: (BOOL) enabled withName:(const char*)name andReason:(const char*) reason; +(void) logUIElementPressed:(const char*) name; - ++ (void)abstractCall:(id) object dict:(NSDictionary *) dict; -(void) registerLogView:(id) view; -(void) startLibLinphone; diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 3102f382f..31655c117 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -80,21 +80,21 @@ extern void libmsbcg729_init(); return theLinphoneManager; } --(void) changeView:(PhoneView) view { +- (void)changeView:(PhoneView) view { [self changeView:view dict:nil]; } --(void) changeView:(PhoneView) view dict:(NSDictionary *)dict { +- (void)changeView:(PhoneView) view dict:(NSDictionary *)dict { currentView = view; NSMutableDictionary* mdict = [NSMutableDictionary dictionaryWithObject: [NSNumber numberWithInt:currentView] forKey:@"view"]; if(dict != nil) - [mdict addEntriesFromDictionary:dict]; + [mdict setObject:dict forKey:@"args"]; [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:mdict]; } --(PhoneView) currentView { +- (PhoneView)currentView { return currentView; } @@ -1025,5 +1025,26 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach ms_message("UI - '%s' pressed", name); } - ++ (void)abstractCall:(id) object dict:(NSDictionary *) dict { + for (NSString* identifier in dict) { + if([identifier characterAtIndex:([identifier length] -1)] == ':') { + NSArray *arguments = [dict objectForKey:identifier]; + SEL selector = NSSelectorFromString(identifier); + NSMethodSignature *signature = [object methodSignatureForSelector:selector]; + NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature]; + [invocation setTarget:object]; + [invocation setSelector:selector]; + for(int i=0; i<[arguments count]; i++) + { + id arg = [arguments objectAtIndex:i]; + [invocation setArgument:&arg atIndex:i+2]; // The first two arguments are the hidden arguments self and _cmd + } + [invocation invoke]; // Invoke the selector + } else { + NSDictionary *arguments = [dict objectForKey:identifier]; + id new_object = [object performSelector:NSSelectorFromString(identifier)]; + [LinphoneManager abstractCall:new_object dict:arguments]; + } + } +} @end diff --git a/Classes/LinphoneUI/LinphoneCallBar.h b/Classes/LinphoneUI/UICallBar.h similarity index 65% rename from Classes/LinphoneUI/LinphoneCallBar.h rename to Classes/LinphoneUI/UICallBar.h index 0a4b18262..28c0cfc14 100644 --- a/Classes/LinphoneUI/LinphoneCallBar.h +++ b/Classes/LinphoneUI/UICallBar.h @@ -1,4 +1,4 @@ -/* LinphoneCallBar.h +/* UICallBar.h * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -20,17 +20,20 @@ #import #import "UIMicroButton.h" +#import "UIPauseButton.h" +#import "UISpeakerButton.h" +#import "UIVideoButton.h" -@interface LinphoneCallBar : UIViewController { - UIButton* pauseButton; - UIButton* videoButton; - UIMicroButton* microButton; - UIButton* speakerButton; +@interface UICallBar: UIViewController { + UIPauseButton* pauseButton; + UIVideoButton* videoButton; + UIMicroButton* microButton; + UISpeakerButton* speakerButton; } -@property (nonatomic, retain) IBOutlet UIButton* pauseButton; -@property (nonatomic, retain) IBOutlet UIButton* videoButton; -@property (nonatomic, retain) IBOutlet UIMicroButton* microButton; -@property (nonatomic, retain) IBOutlet UIButton* speakerButton; --(IBAction) onPauseClick: (id) event; +@property (nonatomic, retain) IBOutlet UIPauseButton* pauseButton; +@property (nonatomic, retain) IBOutlet UIVideoButton* videoButton; +@property (nonatomic, retain) IBOutlet UIMicroButton* microButton; +@property (nonatomic, retain) IBOutlet UISpeakerButton* speakerButton; + @end diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m new file mode 100644 index 000000000..0171dfccf --- /dev/null +++ b/Classes/LinphoneUI/UICallBar.m @@ -0,0 +1,54 @@ +/* UICallBar.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "UICallBar.h" +#import "LinphoneManager.h" + +#include "linphonecore.h" +#include "private.h" + +@implementation UICallBar + +@synthesize pauseButton; +@synthesize videoButton; +@synthesize microButton; +@synthesize speakerButton; + +- (void)viewDidLoad { + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(callUpdate:) name:@"LinphoneCallUpdate" object:nil]; +} + +- (void)callUpdate: (NSNotification*) notif { + // check LinphoneCore is initialized + LinphoneCore* lc = nil; + @try { + lc = [LinphoneManager getLc]; + } @catch (NSException* exc) { + return; + } + + //TODO + //[LinphoneManager set:mergeCalls hidden:!pause.hidden withName:"MERGE button" andReason:"call count"]; + + [microButton update]; + [pauseButton update]; + [videoButton update]; +} + +@end diff --git a/Classes/LinphoneUI/LinphoneCallBar.xib b/Classes/LinphoneUI/UICallBar.xib similarity index 94% rename from Classes/LinphoneUI/LinphoneCallBar.xib rename to Classes/LinphoneUI/UICallBar.xib index a9dda05bd..2b55621c8 100644 --- a/Classes/LinphoneUI/LinphoneCallBar.xib +++ b/Classes/LinphoneUI/UICallBar.xib @@ -167,11 +167,14 @@ NSImage speacker-ON-over.png - + + NSImage + speacker-ON-actif.png + + NSImage speacker-OFF-actif.png - @@ -343,14 +346,6 @@ 15 - - - speakerButton - - - - 16 - videoButton @@ -368,13 +363,12 @@ 14 - - onPauseClick: - - - 7 + + speakerButton + + - 18 + 16 @@ -437,12 +431,6 @@ pause - - 9 - - - speaker - 10 @@ -461,10 +449,16 @@ micro + + 9 + + + speaker + - LinphoneCallBar + UICallBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -473,7 +467,7 @@ UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIToggleVideoButton + UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -483,11 +477,12 @@ UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIPauseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + @@ -498,24 +493,13 @@ - LinphoneCallBar + UICallBar UIViewController - - onPauseClick: - id - - - onPauseClick: - - onPauseClick: - id - - UIMicroButton - UIButton - UIButton - UIButton + UIPauseButton + UISpeakerButton + UIVideoButton @@ -524,20 +508,20 @@ pauseButton - UIButton + UIPauseButton speakerButton - UIButton + UISpeakerButton videoButton - UIButton + UIVideoButton IBProjectSource - ./Classes/LinphoneCallBar.h + ./Classes/UICallBar.h @@ -556,6 +540,14 @@ ./Classes/UIMicroButton.h + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + UISpeakerButton UIToggleButton @@ -573,8 +565,8 @@ - UIToggleVideoButton - UIButton + UIVideoButton + UIToggleButton videoUpdateIndicator UIActivityIndicatorView @@ -588,7 +580,7 @@ IBProjectSource - ./Classes/UIToggleVideoButton.h + ./Classes/UIVideoButton.h @@ -614,6 +606,7 @@ {222, 136} {222, 136} {160, 134} + {160, 134} {160, 134} {160, 134} {160, 134} diff --git a/Classes/LinphoneUI/ContactCell.h b/Classes/LinphoneUI/UIContactCell.h similarity index 81% rename from Classes/LinphoneUI/ContactCell.h rename to Classes/LinphoneUI/UIContactCell.h index fafb4d8cd..4990ce768 100644 --- a/Classes/LinphoneUI/ContactCell.h +++ b/Classes/LinphoneUI/UIContactCell.h @@ -1,4 +1,4 @@ -/* ContactCell.h +/* UIContactCell.h * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -19,9 +19,13 @@ #import -@interface ContactCell : UITableViewCell { - UILabel *label; +@interface UIContactCell : UITableViewCell { + UILabel *firstName; + UILabel *lastName; } -@property (nonatomic, retain) IBOutlet UILabel* label; +@property (nonatomic, retain) IBOutlet UILabel* firstName; +@property (nonatomic, retain) IBOutlet UILabel* lastName; + +- (void) update; @end diff --git a/Classes/LinphoneUI/UIContactCell.m b/Classes/LinphoneUI/UIContactCell.m new file mode 100644 index 000000000..ea8980070 --- /dev/null +++ b/Classes/LinphoneUI/UIContactCell.m @@ -0,0 +1,76 @@ +/* UIContactCell.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "UIContactCell.h" + +@implementation UIContactCell + +@synthesize firstName; +@synthesize lastName; + +- (id)init { + if ((self = [super init]) != nil) { + NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"UIContactCell" + owner:self + options:nil]; + + if ([arrayOfViews count] >= 1) { + [self addSubview:[[arrayOfViews objectAtIndex:0] retain]]; + } + } + return self; +} + +- (void)touchUp:(id) sender { + [self setHighlighted:true animated:true]; +} + +- (void)touchDown:(id) sender { + [self setHighlighted:false animated:true]; +} + +- (void) update { + CGRect firstNameFrame = [firstName frame]; + CGRect lastNameFrame = [lastName frame]; + + lastNameFrame.origin.x -= firstNameFrame.size.width; + + // Compute firstName size + CGSize contraints; + contraints.height = [firstName frame].size.height; + contraints.width = ([lastName frame].size.width + [lastName frame].origin.x) - [firstName frame].origin.x; + CGSize firstNameSize = [[firstName text] sizeWithFont:[firstName font] constrainedToSize: contraints]; + firstNameFrame.size.width = firstNameSize.width; + + // Compute lastName size & position + lastNameFrame.origin.x += firstNameFrame.size.width; + lastNameFrame.size.width = (contraints.width + [firstName frame].origin.x) - lastNameFrame.origin.x; + + [firstName setFrame: firstNameFrame]; + [lastName setFrame: lastNameFrame]; +} + +- (void) dealloc { + [firstName release]; + [lastName release]; + + [super dealloc]; +} + +@end diff --git a/Classes/LinphoneUI/UIContactCell.xib b/Classes/LinphoneUI/UIContactCell.xib new file mode 100644 index 000000000..8544ad63c --- /dev/null +++ b/Classes/LinphoneUI/UIContactCell.xib @@ -0,0 +1,287 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBUIButton + IBUIView + IBUILabel + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 292 + {320, 44} + + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + NO + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 274 + {{10, 0}, {55, 44}} + + + + _NS:328 + NO + YES + 7 + 2 + NO + + Firstname + + IBCocoaTouchFramework + John + + 1 + MCAwIDAAA + + + 1 + 10 + + 1 + 25 + + + Helvetica + 25 + 16 + + NO + + + + 274 + {{75, 0}, {200, 44}} + + + + _NS:328 + NO + YES + 7 + 2 + NO + + Lastname + + IBCocoaTouchFramework + Doe + + + 1 + 10 + + 2 + 25 + + + Helvetica-Bold + 25 + 16 + + NO + + + {320, 44} + + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + + + + backgroundView + + + + 15 + + + + firstName + + + + 11 + + + + lastName + + + + 12 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 16 + + + + + + + + + + 14 + + + background + + + 6 + + + firstName + + + 10 + + + lastName + + + + + UIContactCell + 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 + + + + + + 16 + + + + + UIContactCell + UITableViewCell + + UILabel + UILabel + + + + firstName + UILabel + + + lastName + UILabel + + + + IBProjectSource + ./Classes/UIContactCell.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + 1181 + + diff --git a/Classes/LinphoneUI/UIHistoryCell.h b/Classes/LinphoneUI/UIHistoryCell.h new file mode 100644 index 000000000..9af692820 --- /dev/null +++ b/Classes/LinphoneUI/UIHistoryCell.h @@ -0,0 +1,32 @@ +/* UIHistoryCell.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import + +@interface UIHistoryCell : UITableViewCell { + UIImageView* imageView; + UILabel* displayName; +} + +@property (nonatomic, retain) IBOutlet UIImageView* imageView; +@property (nonatomic, retain) IBOutlet UILabel* displayName; + +-(IBAction) onDetails: (id) event; + +@end diff --git a/Classes/LinphoneUI/ContactCell.m b/Classes/LinphoneUI/UIHistoryCell.m similarity index 69% rename from Classes/LinphoneUI/ContactCell.m rename to Classes/LinphoneUI/UIHistoryCell.m index cbc0288b0..98924d8c6 100644 --- a/Classes/LinphoneUI/ContactCell.m +++ b/Classes/LinphoneUI/UIHistoryCell.m @@ -1,4 +1,4 @@ -/* ContactCell.m +/* UIHistoryCell.m * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -15,23 +15,37 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ + */ -#import "ContactCell.h" +#import "UIHistoryCell.h" -@implementation ContactCell +@implementation UIHistoryCell -@synthesize label; -- (id) init { - if((self = [super init]) != nil) { - NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"ContactCell" - owner:self - options:nil]; - - if ([arrayOfViews count] >= 1){ +@synthesize displayName; +@synthesize imageView; + +- (id)init { + if ((self = [super init]) != nil) { + NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"UIHistoryCell" + owner:self + options:nil]; + + if ([arrayOfViews count] >= 1) { [self addSubview:[[arrayOfViews objectAtIndex:0] retain]]; } } return self; } + +-(IBAction) onDetails: (id) event { + +} + +- (void) dealloc { + [displayName release]; + [imageView release]; + + [super dealloc]; +} + @end diff --git a/Classes/LinphoneUI/UIHistoryCell.xib b/Classes/LinphoneUI/UIHistoryCell.xib new file mode 100644 index 000000000..50980973a --- /dev/null +++ b/Classes/LinphoneUI/UIHistoryCell.xib @@ -0,0 +1,282 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBUIButton + IBUIImageView + IBUIView + IBUILabel + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 292 + {{10, 8}, {27, 27}} + + + + _NS:9 + NO + IBCocoaTouchFramework + + + + 274 + {{45, 0}, {236, 44}} + + + + _NS:328 + NO + YES + 7 + 2 + NO + + Firstname + + IBCocoaTouchFramework + John + + 1 + MCAwIDAAA + + + 1 + 10 + + 1 + 25 + + + Helvetica + 25 + 16 + + NO + + + + 292 + {{289, 11}, {22, 22}} + + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + NO + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + NSImage + bouton-detail-contact-over.png + + + NSImage + bouton-detail-contact-actif.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + {320, 44} + + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + + + + imageView + + + + 11 + + + + displayName + + + + 8 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 12 + + + + + + + + + + 6 + + + imageView + + + 5 + + + firstName + + + 7 + + + details + + + + + UIHistoryCell + 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 + + + + + + + 12 + + + + + UIHistoryCell + UITableViewCell + + onDetails: + id + + + onDetails: + + onDetails: + id + + + + UILabel + UIImageView + + + + displayName + UILabel + + + imageView + UIImageView + + + + IBProjectSource + ./Classes/UIHistoryCell.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {45, 45} + {45, 45} + + 1181 + + diff --git a/Classes/LinphoneUI/LinphoneMainBar.h b/Classes/LinphoneUI/UIMainBar.h similarity index 96% rename from Classes/LinphoneUI/LinphoneMainBar.h rename to Classes/LinphoneUI/UIMainBar.h index a059fa8a8..efb58843e 100644 --- a/Classes/LinphoneUI/LinphoneMainBar.h +++ b/Classes/LinphoneUI/UIMainBar.h @@ -1,4 +1,4 @@ -/* LinphoneMainBar.m +/* UIMainBar.m * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -19,7 +19,7 @@ #import -@interface LinphoneMainBar : UIViewController { +@interface UIMainBar : UIViewController { UIButton *historyButton; UIButton *contactsButton; UIButton *dialerButton; diff --git a/Classes/LinphoneUI/LinphoneMainBar.m b/Classes/LinphoneUI/UIMainBar.m similarity index 86% rename from Classes/LinphoneUI/LinphoneMainBar.m rename to Classes/LinphoneUI/UIMainBar.m index e3f858e21..32f84cbe1 100644 --- a/Classes/LinphoneUI/LinphoneMainBar.m +++ b/Classes/LinphoneUI/UIMainBar.m @@ -1,4 +1,4 @@ -/* LinphoneMainBar.m +/* UIMainBar.m * * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * @@ -17,10 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#import "LinphoneMainBar.h" +#import "UIMainBar.h" #import "PhoneMainView.h" -@implementation LinphoneMainBar +@implementation UIMainBar @synthesize historyButton; @synthesize contactsButton; @@ -28,11 +28,11 @@ @synthesize settingsButton; @synthesize chatButton; -- (void) viewDidLoad { +- (void)viewDidLoad { [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLinphoneMainViewChangeEvent:) name:@"LinphoneMainViewChange" object:nil]; } -- (void) receiveLinphoneMainViewChangeEvent: (NSNotification*) notif { +- (void)receiveLinphoneMainViewChangeEvent: (NSNotification*) notif { PhoneView view = [[notif.userInfo objectForKey: @"view"] intValue]; if(view == PhoneView_History) { historyButton.selected = TRUE; @@ -61,7 +61,7 @@ } } -- (void) viewDidUnload { +- (void)viewDidUnload { [[NSNotificationCenter defaultCenter] removeObserver:self]; [historyButton release]; [contactsButton release]; @@ -70,28 +70,28 @@ [chatButton release]; } -- (void) dealloc { +- (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; [super dealloc]; } -- (IBAction) onHistoryClick: (id) sender { +- (IBAction)onHistoryClick: (id) sender { [[LinphoneManager instance] changeView:PhoneView_History]; } --(IBAction) onContactsClick: (id) event { +- (IBAction)onContactsClick: (id) event { [[LinphoneManager instance] changeView:PhoneView_Contacts]; } --(IBAction) onDialerClick: (id) event { +- (IBAction)onDialerClick: (id) event { [[LinphoneManager instance] changeView:PhoneView_Dialer]; } --(IBAction) onSettingsClick: (id) event { +- (IBAction)onSettingsClick: (id) event { [[LinphoneManager instance] changeView:PhoneView_Settings]; } --(IBAction) onChatClick: (id) event { +- (IBAction)onChatClick: (id) event { [[LinphoneManager instance] changeView:PhoneView_Chat]; } diff --git a/Classes/LinphoneUI/LinphoneMainBar.xib b/Classes/LinphoneUI/UIMainBar.xib similarity index 99% rename from Classes/LinphoneUI/LinphoneMainBar.xib rename to Classes/LinphoneUI/UIMainBar.xib index e22c6d913..bdd3c6dba 100644 --- a/Classes/LinphoneUI/LinphoneMainBar.xib +++ b/Classes/LinphoneUI/UIMainBar.xib @@ -212,6 +212,7 @@ {{256, 0}, {64, 72}} + _NS:9 NO @@ -424,7 +425,7 @@ - LinphoneMainBar + UIMainBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -451,7 +452,7 @@ - LinphoneMainBar + UIMainBar UIViewController id @@ -513,7 +514,7 @@ IBProjectSource - ./Classes/LinphoneMainBar.h + ./Classes/UIMainBar.h diff --git a/Classes/LinphoneUI/UIMicroButton.h b/Classes/LinphoneUI/UIMicroButton.h index eab24d82b..40a208b0f 100644 --- a/Classes/LinphoneUI/UIMicroButton.h +++ b/Classes/LinphoneUI/UIMicroButton.h @@ -1,4 +1,4 @@ -/* UIMuteButton.h +/* UIMicroButton.h * * Copyright (C) 2011 Belledonne Comunications, Grenoble, France * @@ -18,8 +18,8 @@ */ #import -#import "UIToggleButton.h" +#import "UIToggleButton.h" @interface UIMicroButton : UIToggleButton { diff --git a/Classes/LinphoneUI/UIMicroButton.m b/Classes/LinphoneUI/UIMicroButton.m index 20b85983a..1238d0580 100644 --- a/Classes/LinphoneUI/UIMicroButton.m +++ b/Classes/LinphoneUI/UIMicroButton.m @@ -1,4 +1,4 @@ -/* UIMuteButton.m +/* UIMicroButton.m * * Copyright (C) 2011 Belledonne Comunications, Grenoble, France * @@ -31,7 +31,7 @@ linphone_core_mute_mic([LinphoneManager getLc], true); } -- (bool)isInitialStateOn { +- (bool)onUpdate { @try { return linphone_core_is_mic_muted([LinphoneManager getLc]) == false; } @catch(NSException* e) { diff --git a/Classes/LinphoneUI/UIPauseButton.h b/Classes/LinphoneUI/UIPauseButton.h new file mode 100644 index 000000000..963378287 --- /dev/null +++ b/Classes/LinphoneUI/UIPauseButton.h @@ -0,0 +1,25 @@ +/* UIPauseButton.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "UIToggleButton.h" + +@interface UIPauseButton : UIToggleButton { + +} +@end diff --git a/Classes/LinphoneUI/UIPauseButton.m b/Classes/LinphoneUI/UIPauseButton.m new file mode 100644 index 000000000..b271839ef --- /dev/null +++ b/Classes/LinphoneUI/UIPauseButton.m @@ -0,0 +1,106 @@ +/* UIPauseButton.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "UIPauseButton.h" +#import "LinphoneManager.h" + +#include "linphonecore.h" +#include "private.h" + +@implementation UIPauseButton + +- (void)onOn { + LinphoneCall* currentCall = [UIPauseButton getCall]; + if (currentCall != nil) { + linphone_core_pause_call([LinphoneManager getLc], currentCall); + } +} + +- (void)onOff { + LinphoneCall* currentCall = [UIPauseButton getCall]; + if (currentCall != nil) { + linphone_core_resume_call([LinphoneManager getLc], currentCall); + } +} + ++ (bool)isInConference: (LinphoneCall*) call { + if (!call) + return false; + return linphone_call_get_current_params(call)->in_conference; +} + ++ (int)notInConferenceCallCount: (LinphoneCore*) lc { + int count = 0; + const MSList* calls = linphone_core_get_calls(lc); + + while (calls != 0) { + if (![UIPauseButton isInConference: (LinphoneCall*)calls->data]) { + count++; + } + calls = calls->next; + } + return count; +} + +- (bool)onUpdate { + // TODO: disable pause on not running call + @try { + bool ret = false; + LinphoneCall* currentCall = [UIPauseButton getCall]; + if (currentCall != nil) { + LinphoneCallState state = linphone_call_get_state(currentCall); + if(state == LinphoneCallPaused || state == LinphoneCallPausing) { + ret = true; + } + } + LinphoneCore* lc = [LinphoneManager getLc]; + int callsCount = linphone_core_get_calls_nb(lc); + + if (currentCall) { + if (linphone_core_is_in_conference(lc)) { + [LinphoneManager set:self enabled:FALSE withName:"PAUSE button" andReason:"is in conference"]; + } else if ([UIPauseButton notInConferenceCallCount: lc] == callsCount && callsCount == 1) { + [LinphoneManager set:self enabled:TRUE withName:"PAUSE button" andReason:"call count == 1"]; + } else { + [LinphoneManager set:self enabled:FALSE withName:"PAUSE button" andReason:""]; + } + } else { + [LinphoneManager set:self enabled:FALSE withName:"PAUSE button" andReason:""]; + } + return ret; + } @catch(NSException* e) { + //not ready yet + return false; + } +} + ++ (LinphoneCall*)getCall { + LinphoneCore* lc = [LinphoneManager getLc]; + LinphoneCall* currentCall = linphone_core_get_current_call(lc); + if (currentCall == nil && linphone_core_get_calls_nb(lc) == 1) { + currentCall = (LinphoneCall*) linphone_core_get_calls(lc)->data; + } + return currentCall; +} + +- (void)dealloc { + [super dealloc]; +} + +@end diff --git a/Classes/LinphoneUI/UISpeakerButton.h b/Classes/LinphoneUI/UISpeakerButton.h index fb64c3e1f..02e723c84 100644 --- a/Classes/LinphoneUI/UISpeakerButton.h +++ b/Classes/LinphoneUI/UISpeakerButton.h @@ -18,8 +18,8 @@ */ #import -#import "UIToggleButton.h" +#import "UIToggleButton.h" @interface UISpeakerButton : UIToggleButton { diff --git a/Classes/LinphoneUI/UISpeakerButton.m b/Classes/LinphoneUI/UISpeakerButton.m index 3cf561365..6665fb799 100644 --- a/Classes/LinphoneUI/UISpeakerButton.m +++ b/Classes/LinphoneUI/UISpeakerButton.m @@ -31,7 +31,7 @@ static void audioRouteChangeListenerCallback ( const void *inPropertyValue // 4 ) { if (inPropertyID != kAudioSessionProperty_AudioRouteChange) return; // 5 - [(UISpeakerButton*)inUserData reset]; + [(UISpeakerButton*)inUserData update]; } @@ -48,7 +48,7 @@ static void audioRouteChangeListenerCallback ( } --(void) onOn { +- (void)onOn { //redirect audio to speaker UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_Speaker; AudioSessionSetProperty (kAudioSessionProperty_OverrideAudioRoute @@ -56,13 +56,13 @@ static void audioRouteChangeListenerCallback ( , &audioRouteOverride); } --(void) onOff { +- (void)onOff { UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_None; AudioSessionSetProperty (kAudioSessionProperty_OverrideAudioRoute , sizeof (audioRouteOverride) , &audioRouteOverride); } --(bool) isInitialStateOn { +- (bool)onUpdate { CFStringRef lNewRoute=CFSTR("Unknown"); UInt32 lNewRouteSize = sizeof(lNewRoute); OSStatus lStatus = AudioSessionGetProperty(kAudioSessionProperty_AudioRoute @@ -78,15 +78,6 @@ static void audioRouteChangeListenerCallback ( return false; } - -/* - // Only override drawRect: if you perform custom drawing. - // An empty implementation adversely affects performance during animation. - - (void)drawRect:(CGRect)rect { - // Drawing code. - } - */ - - (void)dealloc { OSStatus lStatus = AudioSessionRemovePropertyListenerWithUserData(routeChangeID, audioRouteChangeListenerCallback, self); if (lStatus) { @@ -95,5 +86,4 @@ static void audioRouteChangeListenerCallback ( [super dealloc]; } - @end diff --git a/Classes/LinphoneUI/LinphoneStatusBar.h b/Classes/LinphoneUI/UIStateBar.h similarity index 88% rename from Classes/LinphoneUI/LinphoneStatusBar.h rename to Classes/LinphoneUI/UIStateBar.h index bbd2d02c2..33a4a9ca5 100644 --- a/Classes/LinphoneUI/LinphoneStatusBar.h +++ b/Classes/LinphoneUI/UIStateBar.h @@ -1,6 +1,6 @@ -/* StatusSubViewController.h +/* UIStateBar.h * - * Copyright (C) 2011 Belledonne Comunications, Grenoble, France + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,10 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#import -#include "linphonecore.h" -@interface LinphoneStatusBar : UIViewController { +#import + +@interface UIStateBar : UIViewController { UIImageView* image; UIActivityIndicatorView* spinner; UILabel* label; diff --git a/Classes/LinphoneUI/LinphoneStatusBar.m b/Classes/LinphoneUI/UIStateBar.m similarity index 86% rename from Classes/LinphoneUI/LinphoneStatusBar.m rename to Classes/LinphoneUI/UIStateBar.m index 472202c9f..22059760b 100644 --- a/Classes/LinphoneUI/LinphoneStatusBar.m +++ b/Classes/LinphoneUI/UIStateBar.m @@ -1,6 +1,6 @@ -/* StatusSubViewController.h +/* UIStateBar.m * - * Copyright (C) 2011 Belledonne Comunications, Grenoble, France + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,25 +17,25 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#import "LinphoneStatusBar.h" +#import "UIStateBar.h" #import "LinphoneManager.h" -@implementation LinphoneStatusBar +#include "linphonecore.h" + +@implementation UIStateBar @synthesize image; @synthesize spinner; @synthesize label; -- (void)viewDidLoad -{ +- (void)viewDidLoad { [super viewDidLoad]; // Set observer [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationUpdate:) name:@"LinphoneRegistrationUpdate" object:nil]; } -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation -{ +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { return (interfaceOrientation == UIInterfaceOrientationPortrait); } @@ -76,22 +76,22 @@ [label setText:message != nil ? message : NSLocalizedString(@"No SIP account defined", nil)];*/ case LinphoneRegistrationFailed: image.hidden = NO; - [image setImage:[UIImage imageNamed:@"status_red.png"]]; + [image setImage:[UIImage imageNamed:@"status_error.png"]]; [spinner stopAnimating]; [label setText:message]; case LinphoneRegistrationNone: image.hidden = NO; - [image setImage:[UIImage imageNamed:@"status_gray.png"]]; + [image setImage:[UIImage imageNamed:@"status_disconnected.png"]]; [spinner stopAnimating]; [label setText:message]; case LinphoneRegistrationProgress: - image.hidden = YES; - spinner.hidden = NO; - [spinner startAnimating]; + image.hidden = NO; + [image setImage:[UIImage imageNamed:@"status_inprogress.png"]]; + [spinner stopAnimating]; [label setText:message]; case LinphoneRegistrationOk: image.hidden = NO; - [image setImage:[UIImage imageNamed:@"status_green.png"]]; + [image setImage:[UIImage imageNamed:@"status_connected.png"]]; [spinner stopAnimating]; [label setText:message]; } diff --git a/Classes/LinphoneUI/LinphoneStatusBar.xib b/Classes/LinphoneUI/UIStateBar.xib similarity index 75% rename from Classes/LinphoneUI/LinphoneStatusBar.xib rename to Classes/LinphoneUI/UIStateBar.xib index 11c18af81..013370200 100644 --- a/Classes/LinphoneUI/LinphoneStatusBar.xib +++ b/Classes/LinphoneUI/UIStateBar.xib @@ -12,7 +12,6 @@ IBUIImageView - IBUIActivityIndicatorView IBUIView IBUILabel IBProxyObject @@ -43,7 +42,7 @@ {320, 23} - + _NS:9 NO IBCocoaTouchFramework @@ -55,10 +54,10 @@ -2147483356 - {{0, -1}, {25, 23}} + {{6, 6}, {10, 10}} - + _NS:567 NO IBCocoaTouchFramework @@ -67,22 +66,10 @@ status_gray.png - - - -2147483356 - {{0, 1}, {20, 20}} - - - - _NS:1030 - NO - IBCocoaTouchFramework - 2 - -2147483356 - {{28, 0}, {280, 21}} + {{22, 0}, {298, 20}} @@ -114,7 +101,7 @@ {320, 23} - + _NS:196 3 @@ -141,14 +128,6 @@ 9 - - - spinner - - - - 10 - view @@ -181,24 +160,17 @@ 4 - - - 7 - - - spin - 6 - label + status 5 @@ -215,7 +187,7 @@ - LinphoneStatusBar + UIStateBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -223,7 +195,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -231,37 +202,7 @@ 12 - - - - LinphoneStatusBar - UIViewController - - UIImageView - UILabel - UIActivityIndicatorView - - - - image - UIImageView - - - label - UILabel - - - spinner - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/LinphoneStatusBar.h - - - - + 0 IBCocoaTouchFramework diff --git a/Classes/LinphoneUI/UIToggleButton.h b/Classes/LinphoneUI/UIToggleButton.h index 50d8a6268..433fe8840 100644 --- a/Classes/LinphoneUI/UIToggleButton.h +++ b/Classes/LinphoneUI/UIToggleButton.h @@ -22,12 +22,12 @@ @protocol UIToggleButtonDelegate -(void) onOn; -(void) onOff; - -(bool) isInitialStateOn; + -(bool) onUpdate; @end @interface UIToggleButton : UIButton { } --(bool) reset; +-(bool) update; -(bool) toggle; @end diff --git a/Classes/LinphoneUI/UIToggleButton.m b/Classes/LinphoneUI/UIToggleButton.m index 0c34e15f2..73e3caae3 100644 --- a/Classes/LinphoneUI/UIToggleButton.m +++ b/Classes/LinphoneUI/UIToggleButton.m @@ -36,13 +36,13 @@ return self.selected; } -- (bool)reset { - self.selected = [self isInitialStateOn]; +- (bool)update { + self.selected = [self onUpdate]; return self.selected; } - (id) init { - [self reset]; + [self update]; [self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside]; return self; } @@ -75,7 +75,7 @@ [NSException raise:NSInternalInconsistencyException format:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]; } --(bool) isInitialStateOn { +-(bool) onUpdate { [NSException raise:NSInternalInconsistencyException format:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]; return false; diff --git a/Classes/LinphoneUI/UIToggleVideoButton.m b/Classes/LinphoneUI/UIToggleVideoButton.m deleted file mode 100644 index da69d7174..000000000 --- a/Classes/LinphoneUI/UIToggleVideoButton.m +++ /dev/null @@ -1,75 +0,0 @@ -/* UIToggleVideoButton.m - * - * Copyright (C) 2011 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import "UIToggleVideoButton.h" -#include "LinphoneManager.h" - -@implementation UIToggleVideoButton - -@synthesize videoUpdateIndicator; - --(void) touchUp:(id) sender { - LinphoneCore* lc = [LinphoneManager getLc]; - - if (!linphone_core_video_enabled(lc)) - return; - - [videoUpdateIndicator startAnimating]; - videoUpdateIndicator.hidden = NO; - self.enabled = NO; - - LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); - if (call) { - LinphoneCallParams* call_params = linphone_call_params_copy(linphone_call_get_current_params(call)); - if (linphone_call_params_video_enabled(call_params)) { - ms_message("Disabling video"); - linphone_call_params_enable_video(call_params, FALSE); - } else { - ms_message("Enabling video"); - linphone_call_params_enable_video(call_params, TRUE); - } - linphone_core_update_call(lc, call, call_params); - linphone_call_params_destroy(call_params); - } else { - ms_warning("Cannot toggle video, because no current call"); - } -} - -- (id) init { - [self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside]; - return self; -} - -- (id)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - [self init]; - } - return self; -} - -- (id)initWithCoder:(NSCoder *)decoder { - self = [super initWithCoder:decoder]; - if (self) { - [self init]; - } - return self; -} - -@end diff --git a/Classes/LinphoneUI/UIToggleVideoButton.h b/Classes/LinphoneUI/UIVideoButton.h similarity index 91% rename from Classes/LinphoneUI/UIToggleVideoButton.h rename to Classes/LinphoneUI/UIVideoButton.h index 37a712ddd..17d588343 100644 --- a/Classes/LinphoneUI/UIToggleVideoButton.h +++ b/Classes/LinphoneUI/UIVideoButton.h @@ -1,4 +1,4 @@ -/* UIToggleVideoButton.h +/* UIVideoButton.h * * Copyright (C) 2011 Belledonne Comunications, Grenoble, France * @@ -19,11 +19,12 @@ #import -@interface UIToggleVideoButton : UIButton { +#import "UIToggleButton.h" + +@interface UIVideoButton : UIToggleButton { UIActivityIndicatorView* videoUpdateIndicator; } -- (id)initWithCoder:(NSCoder *)decoder; @property (nonatomic, retain) IBOutlet UIActivityIndicatorView* videoUpdateIndicator; diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m new file mode 100644 index 000000000..8d13c0495 --- /dev/null +++ b/Classes/LinphoneUI/UIVideoButton.m @@ -0,0 +1,92 @@ +/* UIToggleVideoButton.m + * + * Copyright (C) 2011 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "UIVideoButton.h" +#include "LinphoneManager.h" + +@implementation UIVideoButton + +@synthesize videoUpdateIndicator; + +- (void)onOn { + LinphoneCore* lc = [LinphoneManager getLc]; + + if (!linphone_core_video_enabled(lc)) + return; + + [videoUpdateIndicator startAnimating]; + [videoUpdateIndicator setHidden: FALSE]; + [self setEnabled: FALSE]; + LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); + if (call) { + LinphoneCallParams* call_params = linphone_call_params_copy(linphone_call_get_current_params(call)); + linphone_call_params_enable_video(call_params, TRUE); + linphone_core_update_call(lc, call, call_params); + linphone_call_params_destroy(call_params); + } else { + ms_warning("Cannot toggle video, because no current call"); + } + +} + +- (void)onOff { + LinphoneCore* lc = [LinphoneManager getLc]; + + if (!linphone_core_video_enabled(lc)) + return; + + [videoUpdateIndicator startAnimating]; + [videoUpdateIndicator setHidden: FALSE]; + [self setEnabled: FALSE]; + LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); + if (call) { + LinphoneCallParams* call_params = linphone_call_params_copy(linphone_call_get_current_params(call)); + linphone_call_params_enable_video(call_params, FALSE); + linphone_core_update_call(lc, call, call_params); + linphone_call_params_destroy(call_params); + } else { + ms_warning("Cannot toggle video, because no current call"); + } +} + +- (bool)onUpdate { + @try { + bool val = false; + LinphoneCall* currentCall = linphone_core_get_current_call([LinphoneManager getLc]); + if (currentCall) { + LinphoneCallState state = linphone_call_get_state(currentCall); + if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdated || state == LinphoneCallUpdatedByRemote) { + if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) { + val = true; + } + [self setEnabled:TRUE]; + } else { + [self setEnabled:FALSE]; + } + } else { + [self setEnabled:FALSE]; + } + return val; + } @catch(NSException* e) { + //not ready yet + return false; + } +} + +@end diff --git a/Classes/MainScreenWithVideoPreview.xib b/Classes/MainScreenWithVideoPreview.xib index 813695dc9..9eadcbda7 100644 --- a/Classes/MainScreenWithVideoPreview.xib +++ b/Classes/MainScreenWithVideoPreview.xib @@ -44,6 +44,7 @@ 292 {768, 1024} + _NS:196 3 @@ -68,12 +69,19 @@ IBIPadFramework NO - - + + History + + History + + NSImage + history-orange.png + IBIPadFramework - 5 + + 1 1 @@ -82,25 +90,7 @@ NO - - History - - History - - NSImage - history-orange.png - - IBIPadFramework - - - - - 1 - 1 - - IBIPadFramework - NO - + Dialer @@ -109,6 +99,7 @@ dialer-orange.png IBIPadFramework + PhoneViewController-ipad @@ -120,11 +111,25 @@ IBIPadFramework NO - + + + IBIPadFramework + + 5 + + + + 1 + 1 + + IBIPadFramework + NO + IBIPadFramework + 0 @@ -142,12 +147,20 @@ 266 {{0, 975}, {768, 49}} + 3 MCAwAA NO IBIPadFramework + + + + + + + @@ -156,6 +169,7 @@ 274 {{0, 20}, {768, 1004}} + _NS:212 1 @@ -355,7 +369,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin PhoneViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin - CallHistoryTableViewController + HistoryTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin MoreViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -376,7 +390,228 @@ 44 - + + + + HistoryTableViewController + UITableViewController + + IBProjectSource + ./Classes/HistoryTableViewController.h + + + + MainScreenWithVideoPreview + UIViewController + + PhoneViewController + UIWindow + + + + phoneMainView + PhoneViewController + + + window + UIWindow + + + + IBProjectSource + ./Classes/MainScreenWithVideoPreview.h + + + + MoreViewController + UITableViewController + + UITableViewCell + UITableViewCell + UITextView + UITableViewCell + UILabel + + + + console + UITableViewCell + + + credit + UITableViewCell + + + creditText + UITextView + + + web + UITableViewCell + + + weburi + UILabel + + + + IBProjectSource + ./Classes/MoreViewController.h + + + + PhoneViewController + UIViewController + + onAddContact: + id + + + onAddContact: + + onAddContact: + id + + + + UITextField + UIButton + UIButton + UIButton + UIView + UIButton + UIEraseButton + UIButton + UIButton + UIButton + UILabel + MainScreenWithVideoPreview + UITabBarController + UIButton + UIButton + UIButton + UIButton + UIButton + UILabel + UIView + UIButton + UIButton + UIButton + UIButton + + + + address + UITextField + + + backToCallView + UIButton + + + callLarge + UIButton + + + callShort + UIButton + + + dialerView + UIView + + + eight + UIButton + + + erase + UIEraseButton + + + five + UIButton + + + four + UIButton + + + hash + UIButton + + + mDisplayName + UILabel + + + mMainScreenWithVideoPreview + MainScreenWithVideoPreview + + + myTabBarController + UITabBarController + + + nine + UIButton + + + one + UIButton + + + seven + UIButton + + + six + UIButton + + + star + UIButton + + + status + UILabel + + + statusViewHolder + UIView + + + switchCamera + UIButton + + + three + UIButton + + + two + UIButton + + + zero + UIButton + + + + IBProjectSource + ./Classes/PhoneViewController.h + + + + UIEraseButton + UIButton + + IBProjectSource + ./Classes/UIEraseButton.h + + + + 0 IBIPadFramework diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index 85e829d48..d730d95e8 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -21,27 +21,26 @@ #import "LinphoneManager.h" @interface PhoneMainView : UIViewController { - UIView *statusBarView; + UIView *stateBarView; UIView *contentView; UIView *tabBarView; - PhoneView currentView; @private NSMutableDictionary *viewDescriptions; NSArray *views; - UIViewController *statusBarController; + UIViewController *stateBarController; UIViewController *callTabBarController; UIViewController *mainTabBarController; UIViewController *incomingCallTabBarController; } -@property (nonatomic, retain) IBOutlet UIView* statusBarView; +@property (nonatomic, retain) IBOutlet UIView* stateBarView; @property (nonatomic, retain) IBOutlet UIView* contentView; @property (nonatomic, retain) IBOutlet UIView* tabBarView; -@property (nonatomic, retain) IBOutlet UIViewController* statusBarController; +@property (nonatomic, retain) IBOutlet UIViewController* stateBarController; @property (nonatomic, retain) IBOutlet UIViewController* callTabBarController; @property (nonatomic, retain) IBOutlet UIViewController* mainTabBarController; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 788272d0d..fbc5c5301 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -19,8 +19,8 @@ #import "PhoneMainView.h" #import "PhoneViewController.h" -#import "HistoryController.h" -#import "ContactsController.h" +#import "HistoryViewController.h" +#import "ContactsViewController.h" #import "InCallViewController.h" typedef enum _TabBar { @@ -41,11 +41,11 @@ typedef enum _TabBar { @implementation PhoneMainView -@synthesize statusBarView; +@synthesize stateBarView; @synthesize contentView; @synthesize tabBarView; -@synthesize statusBarController; +@synthesize stateBarController; @synthesize callTabBarController; @synthesize mainTabBarController; @@ -64,14 +64,15 @@ typedef enum _TabBar { if(description == nil) return; - [contentView addSubview: description->content.view]; + UIView *innerView = description->content.view; + [contentView addSubview: innerView]; CGRect contentFrame = contentView.frame; if(description->statusEnabled) { - statusBarView.hidden = false; - contentFrame.origin.y = statusBarView.frame.size.height + statusBarView.frame.origin.y; + stateBarView.hidden = false; + contentFrame.origin.y = stateBarView.frame.size.height + stateBarView.frame.origin.y; } else { - statusBarView.hidden = true; + stateBarView.hidden = true; contentFrame.origin.y = 0; } @@ -85,7 +86,7 @@ typedef enum _TabBar { tabFrame.size.width = description->tabBar.view.frame.size.width; tabFrame.origin.y -= tabFrame.size.height; tabFrame.origin.x -= tabFrame.size.width; - tabBarView.frame = tabFrame; + [tabBarView setFrame: tabFrame]; contentFrame.size.height = tabFrame.origin.y - contentFrame.origin.y; for (UIView *view in description->tabBar.view.subviews) { if(view.tag == -1) { @@ -99,7 +100,14 @@ typedef enum _TabBar { contentFrame.size.height = tabFrame.origin.y - tabFrame.size.height; } - contentView.frame = contentFrame; + [contentView setFrame: contentFrame]; + CGRect innerContentFrame = innerView.frame; + innerContentFrame.size = contentFrame.size; + [innerView setFrame: innerContentFrame]; + + NSDictionary *dict = [notif.userInfo objectForKey: @"args"]; + if(dict != nil) + [LinphoneManager abstractCall:description->content dict:dict]; } - (void)viewDidLoad { @@ -113,14 +121,14 @@ typedef enum _TabBar { dumb = mainTabBarController.view; // Status Bar - [statusBarView addSubview: statusBarController.view]; + [stateBarView addSubview: stateBarController.view]; // // Main View // PhoneViewController* myPhoneViewController = [[PhoneViewController alloc] - initWithNibName:@"PhoneViewController" - bundle:[NSBundle mainBundle]]; + initWithNibName:@"PhoneViewController" + bundle:[NSBundle mainBundle]]; //[myPhoneViewController loadView]; ViewsDescription *mainViewDescription = [ViewsDescription alloc]; mainViewDescription->content = myPhoneViewController; @@ -132,9 +140,9 @@ typedef enum _TabBar { // // Contacts View // - ContactsController* myContactsController = [[ContactsController alloc] - initWithNibName:@"ContactsController" - bundle:[NSBundle mainBundle]]; + ContactsViewController* myContactsController = [[ContactsViewController alloc] + initWithNibName:@"ContactsViewController" + bundle:[NSBundle mainBundle]]; //[myContactsController loadView]; ViewsDescription *contactsDescription = [ViewsDescription alloc]; contactsDescription->content = myContactsController; @@ -146,9 +154,9 @@ typedef enum _TabBar { // // Call History View // - HistoryController* myHistoryController = [[HistoryController alloc] - initWithNibName:@"HistoryController" - bundle:[NSBundle mainBundle]]; + HistoryViewController* myHistoryController = [[HistoryViewController alloc] + initWithNibName:@"HistoryViewController" + bundle:[NSBundle mainBundle]]; //[myHistoryController loadView]; ViewsDescription *historyDescription = [ViewsDescription alloc]; historyDescription->content = myHistoryController; @@ -161,8 +169,8 @@ typedef enum _TabBar { // InCall View // InCallViewController* myInCallController = [[InCallViewController alloc] - initWithNibName:@"InCallViewController" - bundle:[NSBundle mainBundle]]; + initWithNibName:@"InCallViewController" + bundle:[NSBundle mainBundle]]; //[myHistoryController loadView]; ViewsDescription *inCallDescription = [ViewsDescription alloc]; inCallDescription->content = myInCallController; @@ -180,11 +188,13 @@ typedef enum _TabBar { } - (void)dealloc { - [super dealloc]; - [viewDescriptions dealloc]; - [statusBarView dealloc]; - [statusBarController dealloc]; - [mainTabBarController dealloc]; [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [viewDescriptions release]; + [stateBarView release]; + [stateBarController release]; + [mainTabBarController release]; + + [super dealloc]; } @end \ No newline at end of file diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index 9451833ab..178a8c774 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -49,11 +49,8 @@ _NS:9 - 3 - MQA - - 2 - + 1 + MCAxIDAuMDkwOTI0NTczOTEAA YES IBCocoaTouchFramework @@ -66,10 +63,6 @@ _NS:9 - - 1 - MCAxIDAuMDkwOTI0NTczOTEgMAA - YES IBCocoaTouchFramework @@ -79,6 +72,7 @@ {{0, 400}, {320, 60}} + _NS:9 1 @@ -96,7 +90,9 @@ 3 MQA - + + 2 + IBCocoaTouchFramework @@ -173,6 +169,7 @@ {{160, 0}, {160, 77}} + _NS:9 NO @@ -271,6 +268,7 @@ {{192, 0}, {128, 72}} + _NS:9 NO @@ -344,6 +342,7 @@ NO + UIMainBar 1 @@ -354,6 +353,7 @@ NO + UICallBar 1 @@ -364,6 +364,7 @@ NO + UIStatusBar 1 @@ -400,14 +401,6 @@ 159 - - - statusBarView - - - - 176 - mainTabBarController @@ -416,14 +409,6 @@ 192 - - - statusBarController - - - - 193 - callTabBarController @@ -432,6 +417,22 @@ 196 + + + stateBarController + + + + 201 + + + + stateBarView + + + + 202 + @@ -559,25 +560,25 @@ 175 - statusBar + stateBar 178 - mainBarController + mainTabBarController 190 - statusBarController + stateBarController 194 - callBarController + callTabBarController @@ -637,11 +638,11 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - LinphoneMainBar + UIMainBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin - LinphoneStatusBar + UIStateBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin - LinphoneCallBar + UICallBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -658,29 +659,280 @@ - 196 + 202 YES - LinphoneCallBar + PhoneMainView UIViewController + + YES + + YES + callTabBarController + contentView + incomingCallTabBarController + mainTabBarController + stateBarController + stateBarView + tabBarView + + + YES + UIViewController + UIView + UIViewController + UIViewController + UIViewController + UIView + UIView + + + + YES + + YES + callTabBarController + contentView + incomingCallTabBarController + mainTabBarController + stateBarController + stateBarView + tabBarView + + + YES + + callTabBarController + UIViewController + + + contentView + UIView + + + incomingCallTabBarController + UIViewController + + + mainTabBarController + UIViewController + + + stateBarController + UIViewController + + + stateBarView + UIView + + + tabBarView + UIView + + + IBProjectSource - ./Classes/LinphoneCallBar.h + ./Classes/PhoneMainView.h - LinphoneMainBar + UICallBar UIViewController + + YES + + YES + microButton + pauseButton + speakerButton + videoButton + + + YES + UIMicroButton + UIPauseButton + UISpeakerButton + UIVideoButton + + + + YES + + YES + microButton + pauseButton + speakerButton + videoButton + + + YES + + microButton + UIMicroButton + + + pauseButton + UIPauseButton + + + speakerButton + UISpeakerButton + + + videoButton + UIVideoButton + + + IBProjectSource - ./Classes/LinphoneMainBar.h + ./Classes/UICallBar.h - LinphoneStatusBar + UIMainBar + UIViewController + + YES + + YES + onChatClick: + onContactsClick: + onDialerClick: + onHistoryClick: + onSettingsClick: + + + YES + id + id + id + id + id + + + + YES + + YES + onChatClick: + onContactsClick: + onDialerClick: + onHistoryClick: + onSettingsClick: + + + YES + + onChatClick: + id + + + onContactsClick: + id + + + onDialerClick: + id + + + onHistoryClick: + id + + + onSettingsClick: + id + + + + + YES + + YES + chatButton + contactsButton + dialerButton + historyButton + settingsButton + + + YES + UIButton + UIButton + UIButton + UIButton + UIButton + + + + YES + + YES + chatButton + contactsButton + dialerButton + historyButton + settingsButton + + + YES + + chatButton + UIButton + + + contactsButton + UIButton + + + dialerButton + UIButton + + + historyButton + UIButton + + + settingsButton + UIButton + + + + + IBProjectSource + ./Classes/UIMainBar.h + + + + UIMicroButton + UIToggleButton + + IBProjectSource + ./Classes/UIMicroButton.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UISpeakerButton + UIToggleButton + + IBProjectSource + ./Classes/UISpeakerButton.h + + + + UIStateBar UIViewController YES @@ -723,82 +975,34 @@ IBProjectSource - ./Classes/LinphoneStatusBar.h + ./Classes/UIStateBar.h - PhoneMainView - UIViewController + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + UIVideoButton + UIToggleButton - YES - - YES - callTabBarController - contentView - incomingCallTabBarController - mainTabBarController - statusBarController - statusBarView - tabBarView - - - YES - UIViewController - UIView - UIViewController - UIViewController - UIViewController - UIView - UIView - + videoUpdateIndicator + UIActivityIndicatorView - YES - - YES - callTabBarController - contentView - incomingCallTabBarController - mainTabBarController - statusBarController - statusBarView - tabBarView - - - YES - - callTabBarController - UIViewController - - - contentView - UIView - - - incomingCallTabBarController - UIViewController - - - mainTabBarController - UIViewController - - - statusBarController - UIViewController - - - statusBarView - UIView - - - tabBarView - UIView - + videoUpdateIndicator + + videoUpdateIndicator + UIActivityIndicatorView IBProjectSource - ./Classes/PhoneMainView.h + ./Classes/UIVideoButton.h diff --git a/Classes/PhoneViewController.h b/Classes/PhoneViewController.h index 5c99d57be..2312ce397 100644 --- a/Classes/PhoneViewController.h +++ b/Classes/PhoneViewController.h @@ -70,6 +70,7 @@ @property (nonatomic, retain) IBOutlet UIView* dialerView; @property (nonatomic, retain) IBOutlet UITextField* address; +@property (nonatomic, retain) IBOutlet UILabel* mDisplayName; @property (nonatomic, retain) IBOutlet UIButton* callShort; @property (nonatomic, retain) IBOutlet UIButton* callLarge; @property (nonatomic, retain) IBOutlet UILabel* status; diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index 2f3feda4d..e8a7f5a48 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -31,6 +31,7 @@ @implementation PhoneViewController @synthesize dialerView; +@synthesize mDisplayName; @synthesize address; @synthesize callShort; @synthesize callLarge; diff --git a/Classes/Utils/OrderedDictionary.h b/Classes/Utils/OrderedDictionary.h new file mode 100644 index 000000000..2a3ecaa9d --- /dev/null +++ b/Classes/Utils/OrderedDictionary.h @@ -0,0 +1,37 @@ +// +// OrderedDictionary.h +// OrderedDictionary +// +// Created by Matt Gallagher on 19/12/08. +// Copyright 2008 Matt Gallagher. All rights reserved. +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. Permission is granted to anyone to +// use this software for any purpose, including commercial applications, and to +// alter it and redistribute it freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source +// distribution. +// + +@interface OrderedDictionary : NSMutableDictionary +{ + NSMutableDictionary *dictionary; + NSMutableArray *array; +} + +- (void)insertObject:(id)anObject forKey:(id)aKey atIndex:(NSUInteger)anIndex; +// Added by Diorcet Yann +- (void)insertObject:(id)anObject forKey:(id)aKey selector:(SEL) sel; +// +- (id)keyAtIndex:(NSUInteger)anIndex; +- (NSEnumerator *)reverseKeyEnumerator; + +@end diff --git a/Classes/Utils/OrderedDictionary.m b/Classes/Utils/OrderedDictionary.m new file mode 100644 index 000000000..8678ed0dd --- /dev/null +++ b/Classes/Utils/OrderedDictionary.m @@ -0,0 +1,170 @@ +// +// OrderedDictionary.m +// OrderedDictionary +// +// Created by Matt Gallagher on 19/12/08. +// Copyright 2008 Matt Gallagher. All rights reserved. +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. Permission is granted to anyone to +// use this software for any purpose, including commercial applications, and to +// alter it and redistribute it freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source +// distribution. +// + +#import "OrderedDictionary.h" + +NSString *DescriptionForObject(NSObject *object, id locale, NSUInteger indent) +{ + NSString *objectString; + if ([object isKindOfClass:[NSString class]]) + { + objectString = (NSString *)[[object retain] autorelease]; + } + else if ([object respondsToSelector:@selector(descriptionWithLocale:indent:)]) + { + objectString = [(NSDictionary *)object descriptionWithLocale:locale indent:indent]; + } + else if ([object respondsToSelector:@selector(descriptionWithLocale:)]) + { + objectString = [(NSSet *)object descriptionWithLocale:locale]; + } + else + { + objectString = [object description]; + } + return objectString; +} + +@implementation OrderedDictionary + +- (id)init +{ + return [self initWithCapacity:0]; +} + +- (id)initWithCapacity:(NSUInteger)capacity +{ + self = [super init]; + if (self != nil) + { + dictionary = [[NSMutableDictionary alloc] initWithCapacity:capacity]; + array = [[NSMutableArray alloc] initWithCapacity:capacity]; + } + return self; +} + +- (void)dealloc +{ + [dictionary release]; + [array release]; + [super dealloc]; +} + +- (id)copy +{ + return [self mutableCopy]; +} + +- (void)setObject:(id)anObject forKey:(id)aKey +{ + if (![dictionary objectForKey:aKey]) + { + [array addObject:aKey]; + } + [dictionary setObject:anObject forKey:aKey]; +} + +- (void)removeObjectForKey:(id)aKey +{ + [dictionary removeObjectForKey:aKey]; + [array removeObject:aKey]; +} + +- (NSUInteger)count +{ + return [dictionary count]; +} + +- (id)objectForKey:(id)aKey +{ + return [dictionary objectForKey:aKey]; +} + +- (NSEnumerator *)keyEnumerator +{ + return [array objectEnumerator]; +} + +- (NSEnumerator *)reverseKeyEnumerator +{ + return [array reverseObjectEnumerator]; +} + + +// Added by Diorcet Yann +- (void)insertObject:(id)anObject forKey:(id)aKey selector:(SEL)comparator +{ + if ([dictionary objectForKey:aKey]) + { + [self removeObjectForKey:aKey]; + } + NSUInteger anIndex; + for(anIndex = 0; anIndex < [array count]; ++anIndex) { + NSComparisonResult result = (NSComparisonResult) [aKey performSelector:comparator withObject:[array objectAtIndex: anIndex]]; + if(result <= 0) { + break; + } + } + [array insertObject:aKey atIndex:anIndex]; + [dictionary setObject:anObject forKey:aKey]; +} +// + +- (void)insertObject:(id)anObject forKey:(id)aKey atIndex:(NSUInteger)anIndex +{ + if ([dictionary objectForKey:aKey]) + { + [self removeObjectForKey:aKey]; + } + [array insertObject:aKey atIndex:anIndex]; + [dictionary setObject:anObject forKey:aKey]; +} + +- (id)keyAtIndex:(NSUInteger)anIndex +{ + return [array objectAtIndex:anIndex]; +} + +- (NSString *)descriptionWithLocale:(id)locale indent:(NSUInteger)level +{ + NSMutableString *indentString = [NSMutableString string]; + NSUInteger i, count = level; + for (i = 0; i < count; i++) + { + [indentString appendFormat:@" "]; + } + + NSMutableString *description = [NSMutableString string]; + [description appendFormat:@"%@{\n", indentString]; + for (NSObject *key in self) + { + [description appendFormat:@"%@ %@ = %@;\n", + indentString, + DescriptionForObject(key, locale, level), + DescriptionForObject([self objectForKey:key], locale, level)]; + } + [description appendFormat:@"%@}\n", indentString]; + return description; +} + +@end diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m index f885a5513..2da07cf5c 100644 --- a/Classes/VideoViewController.m +++ b/Classes/VideoViewController.m @@ -190,9 +190,9 @@ NSTimer *callQualityRefresher; [self performSelectorOnMainThread:@selector(configureOrientation) withObject:nil waitUntilDone:YES]; - [mMute reset]; - [mMuteLandRight reset]; - [mMuteLandLeft reset]; + [mMute update]; + [mMuteLandRight update]; + [mMuteLandLeft update]; maxCall = linphone_core_get_max_calls([LinphoneManager getLc]); linphone_core_set_max_calls([LinphoneManager getLc], 1); } @@ -218,9 +218,9 @@ NSTimer *callQualityRefresher; - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { [self configureOrientation:self.interfaceOrientation]; - [mMute reset]; - [mMuteLandRight reset]; - [mMuteLandLeft reset]; + [mMute update]; + [mMuteLandRight update]; + [mMuteLandLeft update]; } - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { [mLandscapeLeft removeFromSuperview]; diff --git a/Resources/HP.png b/Resources/HP.png deleted file mode 100755 index b3527b782..000000000 Binary files a/Resources/HP.png and /dev/null differ diff --git a/Resources/HP_inverse.png b/Resources/HP_inverse.png deleted file mode 100755 index 983f799de..000000000 Binary files a/Resources/HP_inverse.png and /dev/null differ diff --git a/Resources/ajouter.png b/Resources/ajouter.png deleted file mode 100755 index 22127c463..000000000 Binary files a/Resources/ajouter.png and /dev/null differ diff --git a/Resources/appel-entrant.png b/Resources/appel-entrant.png new file mode 100644 index 000000000..2ce5c676e Binary files /dev/null and b/Resources/appel-entrant.png differ diff --git a/Resources/appel-manque.png b/Resources/appel-manque.png new file mode 100644 index 000000000..426dee899 Binary files /dev/null and b/Resources/appel-manque.png differ diff --git a/Resources/appel-sortant.png b/Resources/appel-sortant.png new file mode 100644 index 000000000..645875ce1 Binary files /dev/null and b/Resources/appel-sortant.png differ diff --git a/Resources/clavier-01-106px.png b/Resources/clavier-01-106px.png deleted file mode 100644 index d3ca4b813..000000000 Binary files a/Resources/clavier-01-106px.png and /dev/null differ diff --git a/Resources/clavier-01-108px.png b/Resources/clavier-01-108px.png deleted file mode 100644 index 9c84cb3dd..000000000 Binary files a/Resources/clavier-01-108px.png and /dev/null differ diff --git a/Resources/clavier-01-160px.png b/Resources/clavier-01-160px.png deleted file mode 100644 index e30025f84..000000000 Binary files a/Resources/clavier-01-160px.png and /dev/null differ diff --git a/Resources/clavier.png b/Resources/clavier.png deleted file mode 100755 index df1026b65..000000000 Binary files a/Resources/clavier.png and /dev/null differ diff --git a/Resources/contact.png b/Resources/contact.png deleted file mode 100755 index 32a5aee96..000000000 Binary files a/Resources/contact.png and /dev/null differ diff --git a/Resources/contact_vide.png b/Resources/contact_vide.png deleted file mode 100755 index dda753a32..000000000 Binary files a/Resources/contact_vide.png and /dev/null differ diff --git a/Resources/effacer.png b/Resources/effacer.png deleted file mode 100755 index eee5833b3..000000000 Binary files a/Resources/effacer.png and /dev/null differ diff --git a/Resources/fond-detail-numero.png b/Resources/fond-detail-numero.png new file mode 100644 index 000000000..31efad8aa Binary files /dev/null and b/Resources/fond-detail-numero.png differ diff --git a/Resources/grouper.png b/Resources/grouper.png deleted file mode 100755 index 6ca595e43..000000000 Binary files a/Resources/grouper.png and /dev/null differ diff --git a/Resources/in_call.png b/Resources/in_call.png deleted file mode 100644 index 1e20bac2b..000000000 Binary files a/Resources/in_call.png and /dev/null differ diff --git a/Resources/in_call_video.png b/Resources/in_call_video.png deleted file mode 100644 index 87fcb5b64..000000000 Binary files a/Resources/in_call_video.png and /dev/null differ diff --git a/Resources/micro.png b/Resources/micro.png deleted file mode 100755 index 1eee9ceef..000000000 Binary files a/Resources/micro.png and /dev/null differ diff --git a/Resources/micro_inverse.png b/Resources/micro_inverse.png deleted file mode 100755 index b4cd9f588..000000000 Binary files a/Resources/micro_inverse.png and /dev/null differ diff --git a/Resources/missed_call.png b/Resources/missed_call.png deleted file mode 100644 index 58d745612..000000000 Binary files a/Resources/missed_call.png and /dev/null differ diff --git a/Resources/out_call.png b/Resources/out_call.png deleted file mode 100644 index 3077fdb08..000000000 Binary files a/Resources/out_call.png and /dev/null differ diff --git a/Resources/out_call_video.png b/Resources/out_call_video.png deleted file mode 100644 index fb6447f8e..000000000 Binary files a/Resources/out_call_video.png and /dev/null differ diff --git a/Resources/pause.png b/Resources/pause.png deleted file mode 100755 index 4875f41c2..000000000 Binary files a/Resources/pause.png and /dev/null differ diff --git a/Resources/pause_inactif.png b/Resources/pause_inactif.png deleted file mode 100755 index c43d5fbce..000000000 Binary files a/Resources/pause_inactif.png and /dev/null differ diff --git a/Resources/quality-call-0.png b/Resources/quality-call-0.png new file mode 100644 index 000000000..7bdaf40ab Binary files /dev/null and b/Resources/quality-call-0.png differ diff --git a/Resources/quality-call-1.png b/Resources/quality-call-1.png new file mode 100644 index 000000000..2cca9b39c Binary files /dev/null and b/Resources/quality-call-1.png differ diff --git a/Resources/quality-call-2.png b/Resources/quality-call-2.png new file mode 100644 index 000000000..adab949fc Binary files /dev/null and b/Resources/quality-call-2.png differ diff --git a/Resources/quality-call-3.png b/Resources/quality-call-3.png new file mode 100644 index 000000000..91118ff60 Binary files /dev/null and b/Resources/quality-call-3.png differ diff --git a/Resources/registration_inprogress.png b/Resources/registration_inprogress.png new file mode 100644 index 000000000..17c3dad7d Binary files /dev/null and b/Resources/registration_inprogress.png differ diff --git a/Resources/secured.png b/Resources/secured.png deleted file mode 100644 index 61042339f..000000000 Binary files a/Resources/secured.png and /dev/null differ diff --git a/Resources/startcall-gray.png b/Resources/startcall-gray.png deleted file mode 100644 index 360e7baa0..000000000 Binary files a/Resources/startcall-gray.png and /dev/null differ diff --git a/Resources/stat_sys_signal_0.png b/Resources/stat_sys_signal_0.png deleted file mode 100644 index 0b7a04f44..000000000 Binary files a/Resources/stat_sys_signal_0.png and /dev/null differ diff --git a/Resources/stat_sys_signal_1.png b/Resources/stat_sys_signal_1.png deleted file mode 100644 index 5376e9258..000000000 Binary files a/Resources/stat_sys_signal_1.png and /dev/null differ diff --git a/Resources/stat_sys_signal_2.png b/Resources/stat_sys_signal_2.png deleted file mode 100644 index fd543636c..000000000 Binary files a/Resources/stat_sys_signal_2.png and /dev/null differ diff --git a/Resources/stat_sys_signal_3.png b/Resources/stat_sys_signal_3.png deleted file mode 100644 index 6c4873af3..000000000 Binary files a/Resources/stat_sys_signal_3.png and /dev/null differ diff --git a/Resources/stat_sys_signal_4.png b/Resources/stat_sys_signal_4.png deleted file mode 100644 index a3320cbb4..000000000 Binary files a/Resources/stat_sys_signal_4.png and /dev/null differ diff --git a/Resources/status_connected.png b/Resources/status_connected.png new file mode 100644 index 000000000..e788e2b07 Binary files /dev/null and b/Resources/status_connected.png differ diff --git a/Resources/status_disconnected.png b/Resources/status_disconnected.png new file mode 100644 index 000000000..11455fb1b Binary files /dev/null and b/Resources/status_disconnected.png differ diff --git a/Resources/status_error.png b/Resources/status_error.png new file mode 100644 index 000000000..e7617832b Binary files /dev/null and b/Resources/status_error.png differ diff --git a/Resources/status_gray.png b/Resources/status_gray.png deleted file mode 100644 index b4f871f3e..000000000 Binary files a/Resources/status_gray.png and /dev/null differ diff --git a/Resources/status_green.png b/Resources/status_green.png deleted file mode 100644 index 1a39a4242..000000000 Binary files a/Resources/status_green.png and /dev/null differ diff --git a/Resources/status_inprogress.png b/Resources/status_inprogress.png new file mode 100644 index 000000000..d2fe9da56 Binary files /dev/null and b/Resources/status_inprogress.png differ diff --git a/Resources/status_orange.png b/Resources/status_orange.png deleted file mode 100644 index f2e66d34d..000000000 Binary files a/Resources/status_orange.png and /dev/null differ diff --git a/Resources/status_red.png b/Resources/status_red.png deleted file mode 100644 index e7a0ec98a..000000000 Binary files a/Resources/status_red.png and /dev/null differ diff --git a/Resources/unverified.png b/Resources/unverified.png deleted file mode 100644 index f824d40c4..000000000 Binary files a/Resources/unverified.png and /dev/null differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 9b21ff9ef..cfcb1e8a0 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -7,16 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1AE0A49A14AC5C64002C99BD /* stat_sys_signal_0.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49314AC5C64002C99BD /* stat_sys_signal_0.png */; }; - 1AE0A49B14AC5C64002C99BD /* stat_sys_signal_0.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49314AC5C64002C99BD /* stat_sys_signal_0.png */; }; - 1AE0A49C14AC5C64002C99BD /* stat_sys_signal_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49414AC5C64002C99BD /* stat_sys_signal_1.png */; }; - 1AE0A49D14AC5C64002C99BD /* stat_sys_signal_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49414AC5C64002C99BD /* stat_sys_signal_1.png */; }; - 1AE0A49E14AC5C64002C99BD /* stat_sys_signal_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49514AC5C64002C99BD /* stat_sys_signal_2.png */; }; - 1AE0A49F14AC5C64002C99BD /* stat_sys_signal_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49514AC5C64002C99BD /* stat_sys_signal_2.png */; }; - 1AE0A4A014AC5C64002C99BD /* stat_sys_signal_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49614AC5C64002C99BD /* stat_sys_signal_3.png */; }; - 1AE0A4A114AC5C64002C99BD /* stat_sys_signal_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49614AC5C64002C99BD /* stat_sys_signal_3.png */; }; - 1AE0A4A214AC5C64002C99BD /* stat_sys_signal_4.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49714AC5C64002C99BD /* stat_sys_signal_4.png */; }; - 1AE0A4A314AC5C64002C99BD /* stat_sys_signal_4.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AE0A49714AC5C64002C99BD /* stat_sys_signal_4.png */; }; 1D3623260D0F684500981E51 /* LinphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */; }; 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; @@ -31,28 +21,6 @@ 2211DB95147564B400DEE054 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2211DB94147564B400DEE054 /* Settings.bundle */; }; 2211DBBE14769C8300DEE054 /* CallDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2211DBBB14769C8200DEE054 /* CallDelegate.m */; }; 2211DBBF14769C8300DEE054 /* CallDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2211DBBB14769C8200DEE054 /* CallDelegate.m */; }; - 2211DBD51476BE7300DEE054 /* ajouter.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCA1476BE7300DEE054 /* ajouter.png */; }; - 2211DBD61476BE7300DEE054 /* ajouter.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCA1476BE7300DEE054 /* ajouter.png */; }; - 2211DBD71476BE7300DEE054 /* clavier.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCB1476BE7300DEE054 /* clavier.png */; }; - 2211DBD81476BE7300DEE054 /* clavier.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCB1476BE7300DEE054 /* clavier.png */; }; - 2211DBD91476BE7300DEE054 /* contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCC1476BE7300DEE054 /* contact.png */; }; - 2211DBDA1476BE7300DEE054 /* contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCC1476BE7300DEE054 /* contact.png */; }; - 2211DBDB1476BE7300DEE054 /* effacer.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCD1476BE7300DEE054 /* effacer.png */; }; - 2211DBDC1476BE7300DEE054 /* effacer.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCD1476BE7300DEE054 /* effacer.png */; }; - 2211DBDD1476BE7300DEE054 /* grouper.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCE1476BE7300DEE054 /* grouper.png */; }; - 2211DBDE1476BE7300DEE054 /* grouper.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCE1476BE7300DEE054 /* grouper.png */; }; - 2211DBDF1476BE7300DEE054 /* HP_inverse.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCF1476BE7300DEE054 /* HP_inverse.png */; }; - 2211DBE01476BE7300DEE054 /* HP_inverse.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBCF1476BE7300DEE054 /* HP_inverse.png */; }; - 2211DBE11476BE7300DEE054 /* HP.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD01476BE7300DEE054 /* HP.png */; }; - 2211DBE21476BE7300DEE054 /* HP.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD01476BE7300DEE054 /* HP.png */; }; - 2211DBE31476BE7300DEE054 /* micro_inverse.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD11476BE7300DEE054 /* micro_inverse.png */; }; - 2211DBE41476BE7300DEE054 /* micro_inverse.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD11476BE7300DEE054 /* micro_inverse.png */; }; - 2211DBE51476BE7300DEE054 /* micro.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD21476BE7300DEE054 /* micro.png */; }; - 2211DBE61476BE7300DEE054 /* micro.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD21476BE7300DEE054 /* micro.png */; }; - 2211DBE71476BE7300DEE054 /* pause_inactif.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD31476BE7300DEE054 /* pause_inactif.png */; }; - 2211DBE81476BE7300DEE054 /* pause_inactif.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD31476BE7300DEE054 /* pause_inactif.png */; }; - 2211DBE91476BE7300DEE054 /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD41476BE7300DEE054 /* pause.png */; }; - 2211DBEA1476BE7300DEE054 /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 2211DBD41476BE7300DEE054 /* pause.png */; }; 2214783D1386A2030020F8B8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; }; 2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB7912F846B1002A5394 /* UICallButton.m */; }; 2214EB8912F84EBB002A5394 /* UIHangUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */; }; @@ -70,17 +38,12 @@ 223148E61178A09900637D6A /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; }; 2237D4091084D7A9001383EE /* oldphone-mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* oldphone-mono.wav */; }; 223963171393CFAF001DE689 /* FastAddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = 223963161393CFAF001DE689 /* FastAddressBook.m */; }; - 2242D91610D66BF300E9963F /* in_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91410D66BF300E9963F /* in_call.png */; }; - 2242D91710D66BF300E9963F /* out_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91510D66BF300E9963F /* out_call.png */; }; 2242E313125235120061DDCE /* oldphone-mono-30s.caf in Resources */ = {isa = PBXBuildFile; fileRef = 2242E312125235120061DDCE /* oldphone-mono-30s.caf */; }; 2245671D107699F700F10948 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2245671C107699F700F10948 /* Settings.bundle */; }; 224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; 2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; }; 2248E99F12F801C200220D9C /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E99E12F801C200220D9C /* LinphoneManager.m */; }; - 225CB2EA11ABB51000628906 /* clavier-01-106px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E811ABB51000628906 /* clavier-01-106px.png */; }; - 225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E911ABB51000628906 /* clavier-01-108px.png */; }; - 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; 226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; }; 226183AE1472527D0037138E /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AB1472527D0037138E /* libsrtp.a */; }; @@ -113,22 +76,16 @@ 22D8F121147548E2008C97DB /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 22F254801073D99800AC9B3F /* ringback.wav */; }; 22D8F124147548E2008C97DB /* untitled.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22F51EF5107FA66500F98953 /* untitled.plist */; }; 22D8F125147548E2008C97DB /* oldphone-mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* oldphone-mono.wav */; }; - 22D8F127147548E2008C97DB /* in_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91410D66BF300E9963F /* in_call.png */; }; - 22D8F128147548E2008C97DB /* out_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91510D66BF300E9963F /* out_call.png */; }; 22D8F12D147548E2008C97DB /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; 22D8F12E147548E2008C97DB /* icone-linphone-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* icone-linphone-57.png */; }; 22D8F12F147548E2008C97DB /* startcall-green.png in Resources */ = {isa = PBXBuildFile; fileRef = 22226C11118197C0000CA27B /* startcall-green.png */; }; 22D8F130147548E2008C97DB /* stopcall-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 22226C13118197EC000CA27B /* stopcall-red.png */; }; - 22D8F134147548E2008C97DB /* clavier-01-106px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E811ABB51000628906 /* clavier-01-106px.png */; }; - 22D8F135147548E2008C97DB /* clavier-01-108px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E911ABB51000628906 /* clavier-01-108px.png */; }; - 22D8F136147548E2008C97DB /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; 22D8F137147548E2008C97DB /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; 22D8F138147548E2008C97DB /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; 22D8F139147548E2008C97DB /* oldphone-mono-30s.caf in Resources */ = {isa = PBXBuildFile; fileRef = 2242E312125235120061DDCE /* oldphone-mono-30s.caf */; }; 22D8F13B147548E2008C97DB /* FirstLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2218A92412FBE1340088A667 /* FirstLoginViewController.xib */; }; 22D8F13C147548E2008C97DB /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 228B19AE130290C500F154D3 /* iTunesArtwork */; }; 22D8F13D147548E2008C97DB /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; }; - 22D8F13E147548E2008C97DB /* missed_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E19E47138A67A000FBFE87 /* missed_call.png */; }; 22D8F13F147548E2008C97DB /* VideoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E028B613B4CCBD0068A713 /* VideoViewController.xib */; }; 22D8F140147548E2008C97DB /* audio.plist in Resources */ = {isa = PBXBuildFile; fileRef = 226B563E13CAF1CD00921595 /* audio.plist */; }; 22D8F141147548E2008C97DB /* video.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22E1A9E713CAF4AA00219531 /* video.plist */; }; @@ -189,7 +146,6 @@ 22E0A822111C44E100B04932 /* MoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* MoreViewController.m */; }; 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; 22E0A824111C44E100B04932 /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; }; - 22E19E48138A67A000FBFE87 /* missed_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E19E47138A67A000FBFE87 /* missed_call.png */; }; 22E1A9E813CAF4AA00219531 /* video.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22E1A9E713CAF4AA00219531 /* video.plist */; }; 22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; }; 22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AE133B5EA20044EA25 /* libcrypto.a */; }; @@ -200,22 +156,12 @@ 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 340751971506459A00B89C47 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340751961506459A00B89C47 /* CoreTelephony.framework */; }; 34075199150645A300B89C47 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340751961506459A00B89C47 /* CoreTelephony.framework */; }; - 340751E7150F38FD00B89C47 /* UIToggleVideoButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 340751E6150F38FD00B89C47 /* UIToggleVideoButton.m */; }; - 340751E8150F38FD00B89C47 /* UIToggleVideoButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 340751E6150F38FD00B89C47 /* UIToggleVideoButton.m */; }; + 340751E7150F38FD00B89C47 /* UIVideoButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 340751E6150F38FD00B89C47 /* UIVideoButton.m */; }; + 340751E8150F38FD00B89C47 /* UIVideoButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 340751E6150F38FD00B89C47 /* UIVideoButton.m */; }; 340A75B014C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */; }; 340A75B114C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */; }; 3418843714C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */; }; 3418843814C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */; }; - 3418844D14C6D1CE00EA48C7 /* startcall-gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */; }; - 3418844E14C6D1CE00EA48C7 /* startcall-gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */; }; - 3418845314C6F66F00EA48C7 /* status_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844F14C6F66E00EA48C7 /* status_green.png */; }; - 3418845414C6F66F00EA48C7 /* status_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844F14C6F66E00EA48C7 /* status_green.png */; }; - 3418845714C6F66F00EA48C7 /* status_orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845114C6F66F00EA48C7 /* status_orange.png */; }; - 3418845814C6F66F00EA48C7 /* status_orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845114C6F66F00EA48C7 /* status_orange.png */; }; - 3418845914C6F66F00EA48C7 /* status_red.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845214C6F66F00EA48C7 /* status_red.png */; }; - 3418845A14C6F66F00EA48C7 /* status_red.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845214C6F66F00EA48C7 /* status_red.png */; }; - 3418845C14C7077400EA48C7 /* status_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845B14C7077400EA48C7 /* status_gray.png */; }; - 3418845D14C7077400EA48C7 /* status_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845B14C7077400EA48C7 /* status_gray.png */; }; 341FCA8E149798210084BC26 /* linphonerc-ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-ipad */; }; 341FCA8F149798210084BC26 /* linphonerc-ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-ipad */; }; 34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */; }; @@ -230,16 +176,10 @@ 344ABD78147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 344ABD76147FCB68007420B6 /* ConferenceCallDetailView.m */; }; 344ABD7A147FD32B007420B6 /* ConferenceCallDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */; }; 344ABD7B147FD32B007420B6 /* ConferenceCallDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */; }; - 344ABDE51483E596007420B6 /* unverified.png in Resources */ = {isa = PBXBuildFile; fileRef = 344ABDE41483E596007420B6 /* unverified.png */; }; - 344ABDE61483E596007420B6 /* unverified.png in Resources */ = {isa = PBXBuildFile; fileRef = 344ABDE41483E596007420B6 /* unverified.png */; }; 344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDE71484E723007420B6 /* libzrtpcpp.a */; }; 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 3485649F152C423F003FE041 /* in_call_video.png in Resources */ = {isa = PBXBuildFile; fileRef = 3485649D152C423F003FE041 /* in_call_video.png */; }; - 348564A0152C423F003FE041 /* out_call_video.png in Resources */ = {isa = PBXBuildFile; fileRef = 3485649E152C423F003FE041 /* out_call_video.png */; }; - 34957F3F147D3FBF00DD7A09 /* secured.png in Resources */ = {isa = PBXBuildFile; fileRef = 34957F3E147D3FBF00DD7A09 /* secured.png */; }; 34A6ECEB14CF13CB00460C04 /* icone-linphone-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECEA14CF13CB00460C04 /* icone-linphone-72.png */; }; - 34C7646914CD51CD008E9607 /* contact_vide.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646814CD51CD008E9607 /* contact_vide.png */; }; 34C7646C14CD5585008E9607 /* dialer-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646A14CD5585008E9607 /* dialer-orange.png */; }; 34C7646D14CD5585008E9607 /* history-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646B14CD5585008E9607 /* history-orange.png */; }; 34CA852F148F646700503C01 /* MainScreenWithVideoPreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA852E148F646700503C01 /* MainScreenWithVideoPreview.xib */; }; @@ -254,21 +194,49 @@ 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; }; 70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; }; 70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F413E147EB002BA2C0 /* QuartzCore.framework */; }; + D31AC4B0158A29C600C2638B /* UIHistoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D31AC4AF158A29C600C2638B /* UIHistoryCell.xib */; }; + D31AC4B1158A29C600C2638B /* UIHistoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D31AC4AF158A29C600C2638B /* UIHistoryCell.xib */; }; + D31C9C8A158A179A00756B45 /* fond-detail-numero.png in Resources */ = {isa = PBXBuildFile; fileRef = D31C9C89158A179A00756B45 /* fond-detail-numero.png */; }; + D31C9C8B158A179A00756B45 /* fond-detail-numero.png in Resources */ = {isa = PBXBuildFile; fileRef = D31C9C89158A179A00756B45 /* fond-detail-numero.png */; }; + D31C9C90158A1C1000756B45 /* appel-entrant.png in Resources */ = {isa = PBXBuildFile; fileRef = D31C9C8D158A1C1000756B45 /* appel-entrant.png */; }; + D31C9C91158A1C1000756B45 /* appel-entrant.png in Resources */ = {isa = PBXBuildFile; fileRef = D31C9C8D158A1C1000756B45 /* appel-entrant.png */; }; + D31C9C92158A1C1000756B45 /* appel-manque.png in Resources */ = {isa = PBXBuildFile; fileRef = D31C9C8E158A1C1000756B45 /* appel-manque.png */; }; + D31C9C93158A1C1000756B45 /* appel-manque.png in Resources */ = {isa = PBXBuildFile; fileRef = D31C9C8E158A1C1000756B45 /* appel-manque.png */; }; + D31C9C94158A1C1000756B45 /* appel-sortant.png in Resources */ = {isa = PBXBuildFile; fileRef = D31C9C8F158A1C1000756B45 /* appel-sortant.png */; }; + D31C9C95158A1C1000756B45 /* appel-sortant.png in Resources */ = {isa = PBXBuildFile; fileRef = D31C9C8F158A1C1000756B45 /* appel-sortant.png */; }; + D31C9C98158A1CDF00756B45 /* UIHistoryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D31C9C97158A1CDE00756B45 /* UIHistoryCell.m */; }; + D31C9C99158A1CDF00756B45 /* UIHistoryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D31C9C97158A1CDE00756B45 /* UIHistoryCell.m */; }; D326483815887D5200930C67 /* OrderedDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483715887D5200930C67 /* OrderedDictionary.m */; }; D326483915887D5200930C67 /* OrderedDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483715887D5200930C67 /* OrderedDictionary.m */; }; - D326483E1588950F00930C67 /* LinphoneCallBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483C1588950F00930C67 /* LinphoneCallBar.m */; }; - D326483F1588950F00930C67 /* LinphoneCallBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483C1588950F00930C67 /* LinphoneCallBar.m */; }; - D32648401588950F00930C67 /* LinphoneCallBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D326483D1588950F00930C67 /* LinphoneCallBar.xib */; }; - D32648411588950F00930C67 /* LinphoneCallBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D326483D1588950F00930C67 /* LinphoneCallBar.xib */; }; + D326483E1588950F00930C67 /* UICallBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483C1588950F00930C67 /* UICallBar.m */; }; + D326483F1588950F00930C67 /* UICallBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483C1588950F00930C67 /* UICallBar.m */; }; + D32648401588950F00930C67 /* UICallBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D326483D1588950F00930C67 /* UICallBar.xib */; }; + D32648411588950F00930C67 /* UICallBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D326483D1588950F00930C67 /* UICallBar.xib */; }; D32648441588F6FC00930C67 /* UIToggleButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D32648431588F6FB00930C67 /* UIToggleButton.m */; }; D32648451588F6FC00930C67 /* UIToggleButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D32648431588F6FB00930C67 /* UIToggleButton.m */; }; + D3432A62158A4446001C6B0B /* status_connected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5C158A4446001C6B0B /* status_connected.png */; }; + D3432A63158A4446001C6B0B /* status_connected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5C158A4446001C6B0B /* status_connected.png */; }; + D3432A64158A4446001C6B0B /* status_error.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5D158A4446001C6B0B /* status_error.png */; }; + D3432A65158A4446001C6B0B /* status_error.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5D158A4446001C6B0B /* status_error.png */; }; + D3432A66158A4446001C6B0B /* quality-call-0.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5E158A4446001C6B0B /* quality-call-0.png */; }; + D3432A67158A4446001C6B0B /* quality-call-0.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5E158A4446001C6B0B /* quality-call-0.png */; }; + D3432A68158A4446001C6B0B /* quality-call-1.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5F158A4446001C6B0B /* quality-call-1.png */; }; + D3432A69158A4446001C6B0B /* quality-call-1.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5F158A4446001C6B0B /* quality-call-1.png */; }; + D3432A6A158A4446001C6B0B /* quality-call-2.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A60158A4446001C6B0B /* quality-call-2.png */; }; + D3432A6B158A4446001C6B0B /* quality-call-2.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A60158A4446001C6B0B /* quality-call-2.png */; }; + D3432A6C158A4446001C6B0B /* quality-call-3.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A61158A4446001C6B0B /* quality-call-3.png */; }; + D3432A6D158A4446001C6B0B /* quality-call-3.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A61158A4446001C6B0B /* quality-call-3.png */; }; + D3432A71158A45AF001C6B0B /* status_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A6F158A45AF001C6B0B /* status_inprogress.png */; }; + D3432A72158A45AF001C6B0B /* status_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A6F158A45AF001C6B0B /* status_inprogress.png */; }; + D3432A73158A45AF001C6B0B /* status_disconnected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A70158A45AF001C6B0B /* status_disconnected.png */; }; + D3432A74158A45AF001C6B0B /* status_disconnected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A70158A45AF001C6B0B /* status_disconnected.png */; }; D347347A1580DDF1003C7B8C /* PhoneMainView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D34734791580DDF1003C7B8C /* PhoneMainView.xib */; }; D347347E1580E5F8003C7B8C /* history-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D347347C1580E5F8003C7B8C /* history-actif.png */; }; D347347F1580E5F8003C7B8C /* history-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D347347D1580E5F8003C7B8C /* history-selectionne.png */; }; - D35497FE15875372000081D8 /* ContactsController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsController.m */; }; - D35497FF15875372000081D8 /* ContactsController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsController.m */; }; - D354980015875372000081D8 /* ContactsController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35497FD15875372000081D8 /* ContactsController.xib */; }; - D354980115875372000081D8 /* ContactsController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35497FD15875372000081D8 /* ContactsController.xib */; }; + D35497FE15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; }; + D35497FF15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; }; + D354980015875372000081D8 /* ContactsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35497FD15875372000081D8 /* ContactsViewController.xib */; }; + D354980115875372000081D8 /* ContactsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35497FD15875372000081D8 /* ContactsViewController.xib */; }; D354980615875534000081D8 /* all-contacts-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* all-contacts-actif.png */; }; D354980715875534000081D8 /* all-contacts-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* all-contacts-actif.png */; }; D354980815875534000081D8 /* all-contacts-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980315875534000081D8 /* all-contacts-selectionne.png */; }; @@ -287,10 +255,12 @@ D354981B15876FE7000081D8 /* bouton-detail-contact-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354981815876FE7000081D8 /* bouton-detail-contact-actif.png */; }; D354981C15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D354981915876FE7000081D8 /* bouton-detail-contact-over.png */; }; D354981D15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D354981915876FE7000081D8 /* bouton-detail-contact-over.png */; }; - D35498211587716B000081D8 /* LinphoneStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D354981F1587716B000081D8 /* LinphoneStatusBar.m */; }; - D35498221587716B000081D8 /* LinphoneStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D354981F1587716B000081D8 /* LinphoneStatusBar.m */; }; - D35498231587716B000081D8 /* LinphoneStatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35498201587716B000081D8 /* LinphoneStatusBar.xib */; }; - D35498241587716B000081D8 /* LinphoneStatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35498201587716B000081D8 /* LinphoneStatusBar.xib */; }; + D35498211587716B000081D8 /* UIStateBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D354981F1587716B000081D8 /* UIStateBar.m */; }; + D35498221587716B000081D8 /* UIStateBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D354981F1587716B000081D8 /* UIStateBar.m */; }; + D35498231587716B000081D8 /* UIStateBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35498201587716B000081D8 /* UIStateBar.xib */; }; + D35498241587716B000081D8 /* UIStateBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35498201587716B000081D8 /* UIStateBar.xib */; }; + D36FB2D51589EF7C0036F6F2 /* UIPauseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */; }; + D36FB2D61589EF7C0036F6F2 /* UIPauseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */; }; D38327F31580FE3A00FA0D23 /* contacts-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327EB1580FE3A00FA0D23 /* contacts-actif.png */; }; D38327F41580FE3A00FA0D23 /* contacts-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327EC1580FE3A00FA0D23 /* contacts-selectionne.png */; }; D38327F51580FE3A00FA0D23 /* dialer-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327ED1580FE3A00FA0D23 /* dialer-actif.png */; }; @@ -303,10 +273,10 @@ D3832801158100E400FA0D23 /* history-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FD158100E400FA0D23 /* history-over.png */; }; D3832802158100E400FA0D23 /* settings-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FE158100E400FA0D23 /* settings-over.png */; }; D3832803158100E400FA0D23 /* tchat-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FF158100E400FA0D23 /* tchat-over.png */; }; - D3A55FBC15877E5E003FD403 /* ContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* ContactCell.m */; }; - D3A55FBD15877E5E003FD403 /* ContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* ContactCell.m */; }; - D3A55FBF15877E69003FD403 /* ContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* ContactCell.xib */; }; - D3A55FC015877E69003FD403 /* ContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* ContactCell.xib */; }; + D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; }; + D3A55FBD15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; }; + D3A55FBF15877E69003FD403 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* UIContactCell.xib */; }; + D3A55FC015877E69003FD403 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* UIContactCell.xib */; }; D3ED3E411585FB4A006C0DE4 /* fond-clavier.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E401585FB4A006C0DE4 /* fond-clavier.png */; }; D3ED3E421585FB4A006C0DE4 /* fond-clavier.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E401585FB4A006C0DE4 /* fond-clavier.png */; }; D3ED3E451585FB8C006C0DE4 /* champ-saisie-numero.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E441585FB8C006C0DE4 /* champ-saisie-numero.png */; }; @@ -327,10 +297,10 @@ D3ED3E7915861B1B006C0DE4 /* backspace-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E7615861B1B006C0DE4 /* backspace-actif.png */; }; D3ED3E7A15861B1B006C0DE4 /* backspace-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E7715861B1B006C0DE4 /* backspace-over.png */; }; D3ED3E7B15861B1B006C0DE4 /* backspace-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E7715861B1B006C0DE4 /* backspace-over.png */; }; - D3ED3E871586291E006C0DE4 /* LinphoneMainBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E851586291B006C0DE4 /* LinphoneMainBar.m */; }; - D3ED3E881586291E006C0DE4 /* LinphoneMainBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E851586291B006C0DE4 /* LinphoneMainBar.m */; }; - D3ED3E891586291E006C0DE4 /* LinphoneMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */; }; - D3ED3E8A1586291E006C0DE4 /* LinphoneMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */; }; + D3ED3E871586291E006C0DE4 /* UIMainBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E851586291B006C0DE4 /* UIMainBar.m */; }; + D3ED3E881586291E006C0DE4 /* UIMainBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E851586291B006C0DE4 /* UIMainBar.m */; }; + D3ED3E891586291E006C0DE4 /* UIMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E861586291C006C0DE4 /* UIMainBar.xib */; }; + D3ED3E8A1586291E006C0DE4 /* UIMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E861586291C006C0DE4 /* UIMainBar.xib */; }; D3ED3E9815872EF1006C0DE4 /* all-call-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9215872EF1006C0DE4 /* all-call-actif.png */; }; D3ED3E9915872EF1006C0DE4 /* all-call-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9215872EF1006C0DE4 /* all-call-actif.png */; }; D3ED3E9A15872EF1006C0DE4 /* all-call-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9315872EF1006C0DE4 /* all-call-selectionne.png */; }; @@ -343,12 +313,12 @@ D3ED3EA115872EF1006C0DE4 /* missed-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9615872EF1006C0DE4 /* missed-actif.png */; }; D3ED3EA215872EF1006C0DE4 /* missed-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9715872EF1006C0DE4 /* missed-selectionne.png */; }; D3ED3EA315872EF1006C0DE4 /* missed-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9715872EF1006C0DE4 /* missed-selectionne.png */; }; - D3ED3EA71587334E006C0DE4 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EA51587334C006C0DE4 /* CallHistoryTableViewController.m */; }; - D3ED3EA81587334E006C0DE4 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EA51587334C006C0DE4 /* CallHistoryTableViewController.m */; }; - D3ED3EB3158738FB006C0DE4 /* HistoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3EB2158738FA006C0DE4 /* HistoryController.xib */; }; - D3ED3EB4158738FB006C0DE4 /* HistoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3EB2158738FA006C0DE4 /* HistoryController.xib */; }; - D3ED3EB81587392C006C0DE4 /* HistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EB615873929006C0DE4 /* HistoryController.m */; }; - D3ED3EB91587392C006C0DE4 /* HistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EB615873929006C0DE4 /* HistoryController.m */; }; + D3ED3EA71587334E006C0DE4 /* HistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */; }; + D3ED3EA81587334E006C0DE4 /* HistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */; }; + D3ED3EB3158738FB006C0DE4 /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */; }; + D3ED3EB4158738FB006C0DE4 /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */; }; + D3ED3EB81587392C006C0DE4 /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EB615873929006C0DE4 /* HistoryViewController.m */; }; + D3ED3EB91587392C006C0DE4 /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EB615873929006C0DE4 /* HistoryViewController.m */; }; D3F83EEC1582021700336684 /* InCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83EEA1582021700336684 /* InCallViewController.m */; }; D3F83EED1582021700336684 /* InCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83EEA1582021700336684 /* InCallViewController.m */; }; D3F83EEE1582021700336684 /* InCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83EEB1582021700336684 /* InCallViewController.xib */; }; @@ -487,11 +457,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1AE0A49314AC5C64002C99BD /* stat_sys_signal_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stat_sys_signal_0.png; path = Resources/stat_sys_signal_0.png; sourceTree = ""; }; - 1AE0A49414AC5C64002C99BD /* stat_sys_signal_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stat_sys_signal_1.png; path = Resources/stat_sys_signal_1.png; sourceTree = ""; }; - 1AE0A49514AC5C64002C99BD /* stat_sys_signal_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stat_sys_signal_2.png; path = Resources/stat_sys_signal_2.png; sourceTree = ""; }; - 1AE0A49614AC5C64002C99BD /* stat_sys_signal_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stat_sys_signal_3.png; path = Resources/stat_sys_signal_3.png; sourceTree = ""; }; - 1AE0A49714AC5C64002C99BD /* stat_sys_signal_4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stat_sys_signal_4.png; path = Resources/stat_sys_signal_4.png; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D3623240D0F684500981E51 /* LinphoneAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneAppDelegate.h; sourceTree = ""; }; 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneAppDelegate.m; sourceTree = ""; }; @@ -616,17 +581,6 @@ 2211DB911475562600DEE054 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; 2211DB94147564B400DEE054 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = "nogpl-thirdparties/Settings.bundle"; sourceTree = ""; }; 2211DBBB14769C8200DEE054 /* CallDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallDelegate.m; sourceTree = ""; }; - 2211DBCA1476BE7300DEE054 /* ajouter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ajouter.png; path = Resources/ajouter.png; sourceTree = ""; }; - 2211DBCB1476BE7300DEE054 /* clavier.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = clavier.png; path = Resources/clavier.png; sourceTree = ""; }; - 2211DBCC1476BE7300DEE054 /* contact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact.png; path = Resources/contact.png; sourceTree = ""; }; - 2211DBCD1476BE7300DEE054 /* effacer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = effacer.png; path = Resources/effacer.png; sourceTree = ""; }; - 2211DBCE1476BE7300DEE054 /* grouper.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = grouper.png; path = Resources/grouper.png; sourceTree = ""; }; - 2211DBCF1476BE7300DEE054 /* HP_inverse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HP_inverse.png; path = Resources/HP_inverse.png; sourceTree = ""; }; - 2211DBD01476BE7300DEE054 /* HP.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HP.png; path = Resources/HP.png; sourceTree = ""; }; - 2211DBD11476BE7300DEE054 /* micro_inverse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = micro_inverse.png; path = Resources/micro_inverse.png; sourceTree = ""; }; - 2211DBD21476BE7300DEE054 /* micro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = micro.png; path = Resources/micro.png; sourceTree = ""; }; - 2211DBD31476BE7300DEE054 /* pause_inactif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_inactif.png; path = Resources/pause_inactif.png; sourceTree = ""; }; - 2211DBD41476BE7300DEE054 /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = Resources/pause.png; sourceTree = ""; }; 2214783C1386A2030020F8B8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = ""; }; 2214EB7812F846B1002A5394 /* UICallButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICallButton.h; sourceTree = ""; }; 2214EB7912F846B1002A5394 /* UICallButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICallButton.m; sourceTree = ""; }; @@ -651,8 +605,6 @@ 2237D4081084D7A9001383EE /* oldphone-mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "oldphone-mono.wav"; path = "liblinphone-sdk/apple-darwin/share/sounds/linphone/rings/oldphone-mono.wav"; sourceTree = ""; }; 223963151393CFAE001DE689 /* FastAddressBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastAddressBook.h; sourceTree = ""; }; 223963161393CFAF001DE689 /* FastAddressBook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FastAddressBook.m; sourceTree = ""; }; - 2242D91410D66BF300E9963F /* in_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = in_call.png; path = Resources/in_call.png; sourceTree = ""; }; - 2242D91510D66BF300E9963F /* out_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = out_call.png; path = Resources/out_call.png; sourceTree = ""; }; 2242E312125235120061DDCE /* oldphone-mono-30s.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "oldphone-mono-30s.caf"; path = "liblinphone-sdk/apple-darwin/share/sounds/linphone/rings/oldphone-mono-30s.caf"; sourceTree = ""; }; 2245671C107699F700F10948 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; 224567C1107B968500F10948 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; @@ -661,9 +613,6 @@ 2248E99D12F801C200220D9C /* LinphoneManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneManager.h; sourceTree = ""; }; 2248E99E12F801C200220D9C /* LinphoneManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneManager.m; sourceTree = ""; }; 2258633C11410BAC00C5A737 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; - 225CB2E811ABB51000628906 /* clavier-01-106px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-106px.png"; path = "Resources/clavier-01-106px.png"; sourceTree = ""; }; - 225CB2E911ABB51000628906 /* clavier-01-108px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-108px.png"; path = "Resources/clavier-01-108px.png"; sourceTree = ""; }; - 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-160px.png"; path = "Resources/clavier-01-160px.png"; sourceTree = ""; }; 225CB2F911ABB76400628906 /* linphone-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-banner.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-banner.png"; sourceTree = ""; }; 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = ""; }; 226183AB1472527D0037138E /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = ""; }; @@ -778,7 +727,6 @@ 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConsoleViewController.xib; sourceTree = ""; }; 22E0A81F111C44E100B04932 /* ConsoleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConsoleViewController.m; sourceTree = ""; }; 22E0A820111C44E100B04932 /* ConsoleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleViewController.h; sourceTree = ""; }; - 22E19E47138A67A000FBFE87 /* missed_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = missed_call.png; path = Resources/missed_call.png; sourceTree = ""; }; 22E1A9E713CAF4AA00219531 /* video.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = video.plist; path = Settings.bundle/video.plist; sourceTree = ""; }; 22E5B0AD133B5EA20044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; 22E5B0AE133B5EA20044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; @@ -792,15 +740,10 @@ 32CA4F630368D1EE00C91783 /* linphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphone_Prefix.pch; sourceTree = ""; }; 340751961506459A00B89C47 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; 340751E4150E4D0200B89C47 /* CallDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallDelegate.h; sourceTree = ""; }; - 340751E5150F38FC00B89C47 /* UIToggleVideoButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIToggleVideoButton.h; sourceTree = ""; }; - 340751E6150F38FD00B89C47 /* UIToggleVideoButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIToggleVideoButton.m; sourceTree = ""; }; + 340751E5150F38FC00B89C47 /* UIVideoButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoButton.h; sourceTree = ""; }; + 340751E6150F38FD00B89C47 /* UIVideoButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIVideoButton.m; sourceTree = ""; }; 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "ConferenceCallDetailView-ipad.xib"; sourceTree = ""; }; 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = nowebcamCIF.jpg; path = submodules/linphone/mediastreamer2/src/nowebcamCIF.jpg; sourceTree = ""; }; - 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "startcall-gray.png"; path = "Resources/startcall-gray.png"; sourceTree = ""; }; - 3418844F14C6F66E00EA48C7 /* status_green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_green.png; path = Resources/status_green.png; sourceTree = ""; }; - 3418845114C6F66F00EA48C7 /* status_orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_orange.png; path = Resources/status_orange.png; sourceTree = ""; }; - 3418845214C6F66F00EA48C7 /* status_red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_red.png; path = Resources/status_red.png; sourceTree = ""; }; - 3418845B14C7077400EA48C7 /* status_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_gray.png; path = Resources/status_gray.png; sourceTree = ""; }; 341FCA8D149798210084BC26 /* linphonerc-ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-ipad"; sourceTree = ""; }; 34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoZoomHandler.h; path = LinphoneUI/VideoZoomHandler.h; sourceTree = ""; }; 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VideoZoomHandler.m; path = LinphoneUI/VideoZoomHandler.m; sourceTree = ""; }; @@ -810,15 +753,10 @@ 344ABD75147FCB68007420B6 /* ConferenceCallDetailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConferenceCallDetailView.h; sourceTree = ""; }; 344ABD76147FCB68007420B6 /* ConferenceCallDetailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConferenceCallDetailView.m; sourceTree = ""; }; 344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConferenceCallDetailCell.xib; sourceTree = ""; }; - 344ABDE41483E596007420B6 /* unverified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = unverified.png; path = Resources/unverified.png; sourceTree = ""; }; 344ABDE71484E723007420B6 /* libzrtpcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzrtpcpp.a; path = "liblinphone-sdk/apple-darwin/lib/libzrtpcpp.a"; sourceTree = ""; }; 344ABDEF14850AE9007420B6 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; }; 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; }; - 3485649D152C423F003FE041 /* in_call_video.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = in_call_video.png; path = Resources/in_call_video.png; sourceTree = ""; }; - 3485649E152C423F003FE041 /* out_call_video.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = out_call_video.png; path = Resources/out_call_video.png; sourceTree = ""; }; - 34957F3E147D3FBF00DD7A09 /* secured.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = secured.png; path = Resources/secured.png; sourceTree = ""; }; 34A6ECEA14CF13CB00460C04 /* icone-linphone-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icone-linphone-72.png"; path = "Resources/icone-linphone-72.png"; sourceTree = ""; }; - 34C7646814CD51CD008E9607 /* contact_vide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_vide.png; path = Resources/contact_vide.png; sourceTree = ""; }; 34C7646A14CD5585008E9607 /* dialer-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer-orange.png"; path = "submodules/linphone/pixmaps/dialer-orange.png"; sourceTree = ""; }; 34C7646B14CD5585008E9607 /* history-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-orange.png"; path = "submodules/linphone/pixmaps/history-orange.png"; sourceTree = ""; }; 34CA852E148F646700503C01 /* MainScreenWithVideoPreview.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainScreenWithVideoPreview.xib; sourceTree = ""; }; @@ -830,19 +768,34 @@ 70E542F213E147E3002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 70E542F413E147EB002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; + D31AC4AF158A29C600C2638B /* UIHistoryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIHistoryCell.xib; sourceTree = ""; }; + D31C9C89158A179A00756B45 /* fond-detail-numero.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fond-detail-numero.png"; path = "Resources/fond-detail-numero.png"; sourceTree = ""; }; + D31C9C8D158A1C1000756B45 /* appel-entrant.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "appel-entrant.png"; path = "Resources/appel-entrant.png"; sourceTree = ""; }; + D31C9C8E158A1C1000756B45 /* appel-manque.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "appel-manque.png"; path = "Resources/appel-manque.png"; sourceTree = ""; }; + D31C9C8F158A1C1000756B45 /* appel-sortant.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "appel-sortant.png"; path = "Resources/appel-sortant.png"; sourceTree = ""; }; + D31C9C96158A1CDE00756B45 /* UIHistoryCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHistoryCell.h; sourceTree = ""; }; + D31C9C97158A1CDE00756B45 /* UIHistoryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIHistoryCell.m; sourceTree = ""; }; D326483615887D5200930C67 /* OrderedDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderedDictionary.h; path = Utils/OrderedDictionary.h; sourceTree = ""; }; D326483715887D5200930C67 /* OrderedDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderedDictionary.m; path = Utils/OrderedDictionary.m; sourceTree = ""; }; - D326483B1588950F00930C67 /* LinphoneCallBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneCallBar.h; sourceTree = ""; }; - D326483C1588950F00930C67 /* LinphoneCallBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneCallBar.m; sourceTree = ""; }; - D326483D1588950F00930C67 /* LinphoneCallBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneCallBar.xib; sourceTree = ""; }; + D326483B1588950F00930C67 /* UICallBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICallBar.h; sourceTree = ""; }; + D326483C1588950F00930C67 /* UICallBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICallBar.m; sourceTree = ""; }; + D326483D1588950F00930C67 /* UICallBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UICallBar.xib; sourceTree = ""; }; D32648421588F6FA00930C67 /* UIToggleButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIToggleButton.h; sourceTree = ""; }; D32648431588F6FB00930C67 /* UIToggleButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIToggleButton.m; sourceTree = ""; }; + D3432A5C158A4446001C6B0B /* status_connected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_connected.png; path = Resources/status_connected.png; sourceTree = ""; }; + D3432A5D158A4446001C6B0B /* status_error.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_error.png; path = Resources/status_error.png; sourceTree = ""; }; + D3432A5E158A4446001C6B0B /* quality-call-0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "quality-call-0.png"; path = "Resources/quality-call-0.png"; sourceTree = ""; }; + D3432A5F158A4446001C6B0B /* quality-call-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "quality-call-1.png"; path = "Resources/quality-call-1.png"; sourceTree = ""; }; + D3432A60158A4446001C6B0B /* quality-call-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "quality-call-2.png"; path = "Resources/quality-call-2.png"; sourceTree = ""; }; + D3432A61158A4446001C6B0B /* quality-call-3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "quality-call-3.png"; path = "Resources/quality-call-3.png"; sourceTree = ""; }; + D3432A6F158A45AF001C6B0B /* status_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_inprogress.png; path = Resources/status_inprogress.png; sourceTree = ""; }; + D3432A70158A45AF001C6B0B /* status_disconnected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_disconnected.png; path = Resources/status_disconnected.png; sourceTree = ""; }; D34734791580DDF1003C7B8C /* PhoneMainView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PhoneMainView.xib; sourceTree = ""; }; D347347C1580E5F8003C7B8C /* history-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-actif.png"; path = "Resources/history-actif.png"; sourceTree = ""; }; D347347D1580E5F8003C7B8C /* history-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-selectionne.png"; path = "Resources/history-selectionne.png"; sourceTree = ""; }; - D35497FB15875372000081D8 /* ContactsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsController.h; sourceTree = ""; }; - D35497FC15875372000081D8 /* ContactsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactsController.m; sourceTree = ""; }; - D35497FD15875372000081D8 /* ContactsController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactsController.xib; 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; path = ContactsViewController.m; sourceTree = ""; }; + D35497FD15875372000081D8 /* ContactsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactsViewController.xib; sourceTree = ""; }; D354980215875534000081D8 /* all-contacts-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "all-contacts-actif.png"; path = "Resources/all-contacts-actif.png"; sourceTree = ""; }; D354980315875534000081D8 /* all-contacts-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "all-contacts-selectionne.png"; path = "Resources/all-contacts-selectionne.png"; sourceTree = ""; }; D354980415875534000081D8 /* linphone-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-actif.png"; path = "Resources/linphone-actif.png"; sourceTree = ""; }; @@ -853,9 +806,11 @@ D3549815158761D0000081D8 /* ContactTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactTableViewController.m; sourceTree = ""; }; D354981815876FE7000081D8 /* bouton-detail-contact-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bouton-detail-contact-actif.png"; path = "Resources/bouton-detail-contact-actif.png"; sourceTree = ""; }; D354981915876FE7000081D8 /* bouton-detail-contact-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bouton-detail-contact-over.png"; path = "Resources/bouton-detail-contact-over.png"; sourceTree = ""; }; - D354981E1587716B000081D8 /* LinphoneStatusBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneStatusBar.h; sourceTree = ""; }; - D354981F1587716B000081D8 /* LinphoneStatusBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneStatusBar.m; sourceTree = ""; }; - D35498201587716B000081D8 /* LinphoneStatusBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneStatusBar.xib; sourceTree = ""; }; + D354981E1587716B000081D8 /* UIStateBar.h */ = {isa = PBXFileReference; fileEncoding = 4; path = UIStateBar.h; sourceTree = ""; }; + D354981F1587716B000081D8 /* UIStateBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIStateBar.m; sourceTree = ""; }; + D35498201587716B000081D8 /* UIStateBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIStateBar.xib; sourceTree = ""; }; + D36FB2D31589EF7C0036F6F2 /* UIPauseButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIPauseButton.h; sourceTree = ""; }; + D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIPauseButton.m; sourceTree = ""; }; D38327EB1580FE3A00FA0D23 /* contacts-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contacts-actif.png"; path = "Resources/contacts-actif.png"; sourceTree = ""; }; D38327EC1580FE3A00FA0D23 /* contacts-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contacts-selectionne.png"; path = "Resources/contacts-selectionne.png"; sourceTree = ""; }; D38327ED1580FE3A00FA0D23 /* dialer-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer-actif.png"; path = "Resources/dialer-actif.png"; sourceTree = ""; }; @@ -868,9 +823,9 @@ D38327FD158100E400FA0D23 /* history-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-over.png"; path = "Resources/history-over.png"; sourceTree = ""; }; D38327FE158100E400FA0D23 /* settings-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "settings-over.png"; path = "Resources/settings-over.png"; sourceTree = ""; }; D38327FF158100E400FA0D23 /* tchat-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "tchat-over.png"; path = "Resources/tchat-over.png"; sourceTree = ""; }; - D3A55FBA15877E5E003FD403 /* ContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactCell.h; sourceTree = ""; }; - D3A55FBB15877E5E003FD403 /* ContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactCell.m; sourceTree = ""; }; - D3A55FBE15877E69003FD403 /* ContactCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactCell.xib; sourceTree = ""; }; + D3A55FBA15877E5E003FD403 /* UIContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIContactCell.h; sourceTree = ""; }; + D3A55FBB15877E5E003FD403 /* UIContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIContactCell.m; sourceTree = ""; }; + D3A55FBE15877E69003FD403 /* UIContactCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIContactCell.xib; sourceTree = ""; }; D3ED3E401585FB4A006C0DE4 /* fond-clavier.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fond-clavier.png"; path = "Resources/fond-clavier.png"; sourceTree = ""; }; D3ED3E441585FB8C006C0DE4 /* champ-saisie-numero.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "champ-saisie-numero.png"; path = "Resources/champ-saisie-numero.png"; sourceTree = ""; }; D3ED3E511585FFFD006C0DE4 /* barre-noire-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "barre-noire-top.png"; path = "Resources/barre-noire-top.png"; sourceTree = ""; }; @@ -881,20 +836,20 @@ D3ED3E7115861ABD006C0DE4 /* appeler-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "appeler-over.png"; path = "Resources/appeler-over.png"; sourceTree = ""; }; D3ED3E7615861B1B006C0DE4 /* backspace-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "backspace-actif.png"; path = "Resources/backspace-actif.png"; sourceTree = ""; }; D3ED3E7715861B1B006C0DE4 /* backspace-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "backspace-over.png"; path = "Resources/backspace-over.png"; sourceTree = ""; }; - D3ED3E841586291B006C0DE4 /* LinphoneMainBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneMainBar.h; sourceTree = ""; }; - D3ED3E851586291B006C0DE4 /* LinphoneMainBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneMainBar.m; sourceTree = ""; }; - D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneMainBar.xib; sourceTree = ""; }; + D3ED3E841586291B006C0DE4 /* UIMainBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMainBar.h; sourceTree = ""; }; + D3ED3E851586291B006C0DE4 /* UIMainBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMainBar.m; sourceTree = ""; }; + D3ED3E861586291C006C0DE4 /* UIMainBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIMainBar.xib; sourceTree = ""; }; D3ED3E9215872EF1006C0DE4 /* all-call-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "all-call-actif.png"; path = "Resources/all-call-actif.png"; sourceTree = ""; }; D3ED3E9315872EF1006C0DE4 /* all-call-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "all-call-selectionne.png"; path = "Resources/all-call-selectionne.png"; sourceTree = ""; }; D3ED3E9415872EF1006C0DE4 /* edit-history-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "edit-history-actif.png"; path = "Resources/edit-history-actif.png"; sourceTree = ""; }; D3ED3E9515872EF1006C0DE4 /* edit-history-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "edit-history-over.png"; path = "Resources/edit-history-over.png"; sourceTree = ""; }; D3ED3E9615872EF1006C0DE4 /* missed-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "missed-actif.png"; path = "Resources/missed-actif.png"; sourceTree = ""; }; D3ED3E9715872EF1006C0DE4 /* missed-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "missed-selectionne.png"; path = "Resources/missed-selectionne.png"; sourceTree = ""; }; - D3ED3EA41587334B006C0DE4 /* CallHistoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallHistoryTableViewController.h; sourceTree = ""; }; - D3ED3EA51587334C006C0DE4 /* CallHistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallHistoryTableViewController.m; sourceTree = ""; }; - D3ED3EB2158738FA006C0DE4 /* HistoryController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryController.xib; sourceTree = ""; }; - D3ED3EB515873928006C0DE4 /* HistoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryController.h; sourceTree = ""; }; - D3ED3EB615873929006C0DE4 /* HistoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryController.m; sourceTree = ""; }; + D3ED3EA41587334B006C0DE4 /* HistoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryTableViewController.h; sourceTree = ""; }; + D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryTableViewController.m; sourceTree = ""; }; + D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryViewController.xib; sourceTree = ""; }; + D3ED3EB515873928006C0DE4 /* HistoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryViewController.h; sourceTree = ""; }; + D3ED3EB615873929006C0DE4 /* HistoryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryViewController.m; sourceTree = ""; }; D3F83EE91582021700336684 /* InCallViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InCallViewController.h; sourceTree = ""; }; D3F83EEA1582021700336684 /* InCallViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InCallViewController.m; sourceTree = ""; }; D3F83EEB1582021700336684 /* InCallViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InCallViewController.xib; sourceTree = ""; }; @@ -1056,11 +1011,8 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( - D326483415887D4400930C67 /* Utils */, 340751E4150E4D0200B89C47 /* CallDelegate.h */, 2211DBBB14769C8200DEE054 /* CallDelegate.m */, - D3ED3EA41587334B006C0DE4 /* CallHistoryTableViewController.h */, - D3ED3EA51587334C006C0DE4 /* CallHistoryTableViewController.m */, 344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */, 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */, 344ABD75147FCB68007420B6 /* ConferenceCallDetailView.h */, @@ -1069,17 +1021,19 @@ 22E0A820111C44E100B04932 /* ConsoleViewController.h */, 22E0A81F111C44E100B04932 /* ConsoleViewController.m */, 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */, - D35497FB15875372000081D8 /* ContactsController.h */, - D35497FC15875372000081D8 /* ContactsController.m */, - D35497FD15875372000081D8 /* ContactsController.xib */, + D35497FB15875372000081D8 /* ContactsViewController.h */, + D35497FC15875372000081D8 /* ContactsViewController.m */, + D35497FD15875372000081D8 /* ContactsViewController.xib */, D3549814158761CF000081D8 /* ContactTableViewController.h */, D3549815158761D0000081D8 /* ContactTableViewController.m */, 2218A92212FBE1340088A667 /* FirstLoginViewController.h */, 2218A92312FBE1340088A667 /* FirstLoginViewController.m */, 2218A92412FBE1340088A667 /* FirstLoginViewController.xib */, - D3ED3EB515873928006C0DE4 /* HistoryController.h */, - D3ED3EB615873929006C0DE4 /* HistoryController.m */, - D3ED3EB2158738FA006C0DE4 /* HistoryController.xib */, + D3ED3EB515873928006C0DE4 /* HistoryViewController.h */, + D3ED3EB615873929006C0DE4 /* HistoryViewController.m */, + D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */, + D3ED3EA41587334B006C0DE4 /* HistoryTableViewController.h */, + D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */, 3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */, D3F83EE91582021700336684 /* InCallViewController.h */, D3F83EEA1582021700336684 /* InCallViewController.m */, @@ -1101,6 +1055,7 @@ 22F2508B107141E100AC9B3F /* PhoneViewController.h */, 22F2508C107141E100AC9B3F /* PhoneViewController.m */, 22F2508D107141E100AC9B3F /* PhoneViewController.xib */, + D326483415887D4400930C67 /* Utils */, 34CA8534148F669900503C01 /* VideoViewController-ipad.xib */, 22E028B413B4CCBD0068A713 /* VideoViewController.h */, 22E028B513B4CCBD0068A713 /* VideoViewController.m */, @@ -1319,29 +1274,23 @@ 2214EB7012F84668002A5394 /* LinphoneUI */ = { isa = PBXGroup; children = ( - D3A55FBA15877E5E003FD403 /* ContactCell.h */, - D3A55FBB15877E5E003FD403 /* ContactCell.m */, - D3A55FBE15877E69003FD403 /* ContactCell.xib */, 223963151393CFAE001DE689 /* FastAddressBook.h */, 223963161393CFAF001DE689 /* FastAddressBook.m */, - D326483B1588950F00930C67 /* LinphoneCallBar.h */, - D326483C1588950F00930C67 /* LinphoneCallBar.m */, - D326483D1588950F00930C67 /* LinphoneCallBar.xib */, - D3ED3E841586291B006C0DE4 /* LinphoneMainBar.h */, - D3ED3E851586291B006C0DE4 /* LinphoneMainBar.m */, - D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */, 2248E99D12F801C200220D9C /* LinphoneManager.h */, 2248E99E12F801C200220D9C /* LinphoneManager.m */, - D354981E1587716B000081D8 /* LinphoneStatusBar.h */, - D354981F1587716B000081D8 /* LinphoneStatusBar.m */, - D35498201587716B000081D8 /* LinphoneStatusBar.xib */, 2218A5CE12F973450088A667 /* LogView.h */, 22C7555E1317E59C007BC101 /* UIBluetoothButton.h */, 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */, + D326483B1588950F00930C67 /* UICallBar.h */, + D326483C1588950F00930C67 /* UICallBar.m */, + D326483D1588950F00930C67 /* UICallBar.xib */, 2214EB7812F846B1002A5394 /* UICallButton.h */, 2214EB7912F846B1002A5394 /* UICallButton.m */, 22AA8AFF13D83F6300B30535 /* UICamSwitch.h */, 22AA8B0013D83F6300B30535 /* UICamSwitch.m */, + D3A55FBA15877E5E003FD403 /* UIContactCell.h */, + D3A55FBB15877E5E003FD403 /* UIContactCell.m */, + D3A55FBE15877E69003FD403 /* UIContactCell.xib */, 2248E90C12F7E4CF00220D9C /* UIDigitButton.h */, 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */, 22968A8612F87C2000588287 /* UIDuration.h */, @@ -1350,15 +1299,26 @@ 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */, 2214EB8712F84EBB002A5394 /* UIHangUpButton.h */, 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */, + D31C9C96158A1CDE00756B45 /* UIHistoryCell.h */, + D31C9C97158A1CDE00756B45 /* UIHistoryCell.m */, + D31AC4AF158A29C600C2638B /* UIHistoryCell.xib */, 2214EB8A12F84FE9002A5394 /* UILinphone.h */, + D3ED3E841586291B006C0DE4 /* UIMainBar.h */, + D3ED3E851586291B006C0DE4 /* UIMainBar.m */, + D3ED3E861586291C006C0DE4 /* UIMainBar.xib */, 2214EBF112F86360002A5394 /* UIMicroButton.h */, 2214EBF212F86360002A5394 /* UIMicroButton.m */, + D36FB2D31589EF7C0036F6F2 /* UIPauseButton.h */, + D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */, + D354981E1587716B000081D8 /* UIStateBar.h */, + D354981F1587716B000081D8 /* UIStateBar.m */, + D35498201587716B000081D8 /* UIStateBar.xib */, 22968A5D12F875C600588287 /* UISpeakerButton.h */, 22968A5E12F875C600588287 /* UISpeakerButton.m */, D32648421588F6FA00930C67 /* UIToggleButton.h */, D32648431588F6FB00930C67 /* UIToggleButton.m */, - 340751E5150F38FC00B89C47 /* UIToggleVideoButton.h */, - 340751E6150F38FD00B89C47 /* UIToggleVideoButton.m */, + 340751E5150F38FC00B89C47 /* UIVideoButton.h */, + 340751E6150F38FD00B89C47 /* UIVideoButton.m */, ); path = LinphoneUI; sourceTree = ""; @@ -1545,11 +1505,13 @@ D354980F15875608000081D8 /* add-contact-depuis-detail-over.png */, D3ED3E6815861A53006C0DE4 /* add-contact-inactif.png */, D3ED3E6915861A53006C0DE4 /* add-contact-over.png */, - 2211DBCA1476BE7300DEE054 /* ajouter.png */, D3ED3E9215872EF1006C0DE4 /* all-call-actif.png */, D3ED3E9315872EF1006C0DE4 /* all-call-selectionne.png */, D354980215875534000081D8 /* all-contacts-actif.png */, D354980315875534000081D8 /* all-contacts-selectionne.png */, + D31C9C8D158A1C1000756B45 /* appel-entrant.png */, + D31C9C8E158A1C1000756B45 /* appel-manque.png */, + D31C9C8F158A1C1000756B45 /* appel-sortant.png */, D3ED3E7015861ABD006C0DE4 /* appeler-actif.png */, D3ED3E7115861ABD006C0DE4 /* appeler-over.png */, D3ED3E7615861B1B006C0DE4 /* backspace-actif.png */, @@ -1560,14 +1522,8 @@ D3F83F801582278D00336684 /* cancel-actif.png */, D3F83F811582278D00336684 /* cancel-over.png */, D3ED3E441585FB8C006C0DE4 /* champ-saisie-numero.png */, - 225CB2E811ABB51000628906 /* clavier-01-106px.png */, - 225CB2E911ABB51000628906 /* clavier-01-108px.png */, - 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */, - 2211DBCB1476BE7300DEE054 /* clavier.png */, D3F83F821582278D00336684 /* contact-actif-add-call.png */, D3F83F831582278D00336684 /* contact-over-add-call.png */, - 2211DBCC1476BE7300DEE054 /* contact.png */, - 34C7646814CD51CD008E9607 /* contact_vide.png */, D38327EB1580FE3A00FA0D23 /* contacts-actif.png */, D38327FC158100E400FA0D23 /* contacts-over.png */, D38327EC1580FE3A00FA0D23 /* contacts-selectionne.png */, @@ -1582,21 +1538,16 @@ D3F83F411582223B00336684 /* diese-over.png */, D3ED3E9415872EF1006C0DE4 /* edit-history-actif.png */, D3ED3E9515872EF1006C0DE4 /* edit-history-over.png */, - 2211DBCD1476BE7300DEE054 /* effacer.png */, D3F83F421582223B00336684 /* etoile-actif.png */, D3F83F431582223B00336684 /* etoile-over.png */, D3ED3E401585FB4A006C0DE4 /* fond-clavier.png */, - 2211DBCE1476BE7300DEE054 /* grouper.png */, + D31C9C89158A179A00756B45 /* fond-detail-numero.png */, D347347C1580E5F8003C7B8C /* history-actif.png */, 34C7646B14CD5585008E9607 /* history-orange.png */, D38327FD158100E400FA0D23 /* history-over.png */, D347347D1580E5F8003C7B8C /* history-selectionne.png */, - 2211DBD01476BE7300DEE054 /* HP.png */, - 2211DBCF1476BE7300DEE054 /* HP_inverse.png */, 22058C70116E305000B08DDD /* icone-linphone-57.png */, 34A6ECEA14CF13CB00460C04 /* icone-linphone-72.png */, - 2242D91410D66BF300E9963F /* in_call.png */, - 3485649D152C423F003FE041 /* in_call_video.png */, 228B19AE130290C500F154D3 /* iTunesArtwork */, D354980415875534000081D8 /* linphone-actif.png */, 225CB2F911ABB76400628906 /* linphone-banner.png */, @@ -1608,27 +1559,23 @@ D3F83EF5158205A100336684 /* micro-OFF-over.png */, D3F83EF6158205A100336684 /* micro-ON-actif.png */, D3F83EF7158205A100336684 /* micro-ON-over.png */, - 2211DBD21476BE7300DEE054 /* micro.png */, - 2211DBD11476BE7300DEE054 /* micro_inverse.png */, D3ED3E9615872EF1006C0DE4 /* missed-actif.png */, D3ED3E9715872EF1006C0DE4 /* missed-selectionne.png */, - 22E19E47138A67A000FBFE87 /* missed_call.png */, 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */, 2242E312125235120061DDCE /* oldphone-mono-30s.caf */, 2237D4081084D7A9001383EE /* oldphone-mono.wav */, - 2242D91510D66BF300E9963F /* out_call.png */, - 3485649E152C423F003FE041 /* out_call_video.png */, D3F83EF8158205A100336684 /* pause-actif.png */, D3F83EF9158205A100336684 /* pause-over.png */, - 2211DBD41476BE7300DEE054 /* pause.png */, - 2211DBD31476BE7300DEE054 /* pause_inactif.png */, + D3432A5E158A4446001C6B0B /* quality-call-0.png */, + D3432A5F158A4446001C6B0B /* quality-call-1.png */, + D3432A60158A4446001C6B0B /* quality-call-2.png */, + D3432A61158A4446001C6B0B /* quality-call-3.png */, D3F83EFA158205A100336684 /* raccrocher-actif.png */, D3F83EFB158205A100336684 /* raccrocher-over.png */, D3F83F761582253100336684 /* refuser-actif.png */, D3F83F771582253100336684 /* refuser-over.png */, 22F254801073D99800AC9B3F /* ringback.wav */, 70571E1913FABCB000CDD3C2 /* rootca.pem */, - 34957F3E147D3FBF00DD7A09 /* secured.png */, D38327EF1580FE3A00FA0D23 /* settings-actif.png */, D38327FE158100E400FA0D23 /* settings-over.png */, D38327F01580FE3A00FA0D23 /* settings-selectionne.png */, @@ -1636,22 +1583,15 @@ D3F83EFD158205A100336684 /* speacker-OFF-over.png */, D3F83EFE158205A100336684 /* speacker-ON-actif.png */, D3F83EFF158205A100336684 /* speacker-ON-over.png */, - 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */, 22226C11118197C0000CA27B /* startcall-green.png */, - 1AE0A49314AC5C64002C99BD /* stat_sys_signal_0.png */, - 1AE0A49414AC5C64002C99BD /* stat_sys_signal_1.png */, - 1AE0A49514AC5C64002C99BD /* stat_sys_signal_2.png */, - 1AE0A49614AC5C64002C99BD /* stat_sys_signal_3.png */, - 1AE0A49714AC5C64002C99BD /* stat_sys_signal_4.png */, - 3418845B14C7077400EA48C7 /* status_gray.png */, - 3418844F14C6F66E00EA48C7 /* status_green.png */, - 3418845114C6F66F00EA48C7 /* status_orange.png */, - 3418845214C6F66F00EA48C7 /* status_red.png */, + D3432A5C158A4446001C6B0B /* status_connected.png */, + D3432A70158A45AF001C6B0B /* status_disconnected.png */, + D3432A5D158A4446001C6B0B /* status_error.png */, + D3432A6F158A45AF001C6B0B /* status_inprogress.png */, 22226C13118197EC000CA27B /* stopcall-red.png */, D38327F11580FE3A00FA0D23 /* tchat-actif.png */, D38327FF158100E400FA0D23 /* tchat-over.png */, D38327F21580FE3A00FA0D23 /* tchat-selectionne.png */, - 344ABDE41483E596007420B6 /* unverified.png */, D3F83F00158205A100336684 /* video-OFF-actif.png */, D3F83F01158205A100336684 /* video-OFF-over.png */, D3F83F02158205A100336684 /* video-ON-actif.png */, @@ -1758,64 +1698,32 @@ 2245671D107699F700F10948 /* Settings.bundle in Resources */, 22F51EF6107FA66500F98953 /* untitled.plist in Resources */, 2237D4091084D7A9001383EE /* oldphone-mono.wav in Resources */, - 2242D91610D66BF300E9963F /* in_call.png in Resources */, - 2242D91710D66BF300E9963F /* out_call.png in Resources */, 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */, 22058C71116E305000B08DDD /* icone-linphone-57.png in Resources */, 22226C12118197C0000CA27B /* startcall-green.png in Resources */, 22226C14118197EC000CA27B /* stopcall-red.png in Resources */, - 225CB2EA11ABB51000628906 /* clavier-01-106px.png in Resources */, - 225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */, - 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */, 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */, 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */, 2242E313125235120061DDCE /* oldphone-mono-30s.caf in Resources */, 2218A92612FBE1340088A667 /* FirstLoginViewController.xib in Resources */, 228B19AF130290C500F154D3 /* iTunesArtwork in Resources */, 2214783D1386A2030020F8B8 /* Localizable.strings in Resources */, - 22E19E48138A67A000FBFE87 /* missed_call.png in Resources */, 22E028B813B4CCBD0068A713 /* VideoViewController.xib in Resources */, 226B563F13CAF1CD00921595 /* audio.plist in Resources */, 22E1A9E813CAF4AA00219531 /* video.plist in Resources */, 70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */, - 2211DBD51476BE7300DEE054 /* ajouter.png in Resources */, - 2211DBD71476BE7300DEE054 /* clavier.png in Resources */, - 2211DBD91476BE7300DEE054 /* contact.png in Resources */, - 2211DBDB1476BE7300DEE054 /* effacer.png in Resources */, - 2211DBDD1476BE7300DEE054 /* grouper.png in Resources */, - 2211DBDF1476BE7300DEE054 /* HP_inverse.png in Resources */, - 2211DBE11476BE7300DEE054 /* HP.png in Resources */, - 2211DBE31476BE7300DEE054 /* micro_inverse.png in Resources */, - 2211DBE51476BE7300DEE054 /* micro.png in Resources */, - 2211DBE71476BE7300DEE054 /* pause_inactif.png in Resources */, - 2211DBE91476BE7300DEE054 /* pause.png in Resources */, - 34957F3F147D3FBF00DD7A09 /* secured.png in Resources */, 344ABD72147FC438007420B6 /* ConferenceCallDetailView.xib in Resources */, 344ABD7A147FD32B007420B6 /* ConferenceCallDetailCell.xib in Resources */, - 344ABDE51483E596007420B6 /* unverified.png in Resources */, 34CA852F148F646700503C01 /* MainScreenWithVideoPreview.xib in Resources */, 34CA8535148F669900503C01 /* VideoViewController-ipad.xib in Resources */, 3422AA5014975EC9000D4E8A /* InCallViewController-ipad.xib in Resources */, 3422AA5314978352000D4E8A /* PhoneViewController-ipad.xib in Resources */, 341FCA8E149798210084BC26 /* linphonerc-ipad in Resources */, - 1AE0A49A14AC5C64002C99BD /* stat_sys_signal_0.png in Resources */, - 1AE0A49C14AC5C64002C99BD /* stat_sys_signal_1.png in Resources */, - 1AE0A49E14AC5C64002C99BD /* stat_sys_signal_2.png in Resources */, - 1AE0A4A014AC5C64002C99BD /* stat_sys_signal_3.png in Resources */, - 1AE0A4A214AC5C64002C99BD /* stat_sys_signal_4.png in Resources */, 340A75B014C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */, 3418843714C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */, - 3418844D14C6D1CE00EA48C7 /* startcall-gray.png in Resources */, - 3418845314C6F66F00EA48C7 /* status_green.png in Resources */, - 3418845714C6F66F00EA48C7 /* status_orange.png in Resources */, - 3418845914C6F66F00EA48C7 /* status_red.png in Resources */, - 3418845C14C7077400EA48C7 /* status_gray.png in Resources */, - 34C7646914CD51CD008E9607 /* contact_vide.png in Resources */, 34C7646C14CD5585008E9607 /* dialer-orange.png in Resources */, 34C7646D14CD5585008E9607 /* history-orange.png in Resources */, 34A6ECEB14CF13CB00460C04 /* icone-linphone-72.png in Resources */, - 3485649F152C423F003FE041 /* in_call_video.png in Resources */, - 348564A0152C423F003FE041 /* out_call_video.png in Resources */, D347347A1580DDF1003C7B8C /* PhoneMainView.xib in Resources */, D347347E1580E5F8003C7B8C /* history-actif.png in Resources */, D347347F1580E5F8003C7B8C /* history-selectionne.png in Resources */, @@ -1895,15 +1803,15 @@ D3ED3E7415861ABD006C0DE4 /* appeler-over.png in Resources */, D3ED3E7815861B1B006C0DE4 /* backspace-actif.png in Resources */, D3ED3E7A15861B1B006C0DE4 /* backspace-over.png in Resources */, - D3ED3E891586291E006C0DE4 /* LinphoneMainBar.xib in Resources */, + D3ED3E891586291E006C0DE4 /* UIMainBar.xib in Resources */, D3ED3E9815872EF1006C0DE4 /* all-call-actif.png in Resources */, D3ED3E9A15872EF1006C0DE4 /* all-call-selectionne.png in Resources */, D3ED3E9C15872EF1006C0DE4 /* edit-history-actif.png in Resources */, D3ED3E9E15872EF1006C0DE4 /* edit-history-over.png in Resources */, D3ED3EA015872EF1006C0DE4 /* missed-actif.png in Resources */, D3ED3EA215872EF1006C0DE4 /* missed-selectionne.png in Resources */, - D3ED3EB3158738FB006C0DE4 /* HistoryController.xib in Resources */, - D354980015875372000081D8 /* ContactsController.xib in Resources */, + D3ED3EB3158738FB006C0DE4 /* HistoryViewController.xib in Resources */, + D354980015875372000081D8 /* ContactsViewController.xib in Resources */, D354980615875534000081D8 /* all-contacts-actif.png in Resources */, D354980815875534000081D8 /* all-contacts-selectionne.png in Resources */, D354980A15875534000081D8 /* linphone-actif.png in Resources */, @@ -1912,9 +1820,22 @@ D354981215875608000081D8 /* add-contact-depuis-detail-over.png in Resources */, D354981A15876FE7000081D8 /* bouton-detail-contact-actif.png in Resources */, D354981C15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */, - D35498231587716B000081D8 /* LinphoneStatusBar.xib in Resources */, - D3A55FBF15877E69003FD403 /* ContactCell.xib in Resources */, - D32648401588950F00930C67 /* LinphoneCallBar.xib in Resources */, + D35498231587716B000081D8 /* UIStateBar.xib in Resources */, + D3A55FBF15877E69003FD403 /* UIContactCell.xib in Resources */, + D32648401588950F00930C67 /* UICallBar.xib in Resources */, + D31C9C8A158A179A00756B45 /* fond-detail-numero.png in Resources */, + D31C9C90158A1C1000756B45 /* appel-entrant.png in Resources */, + D31C9C92158A1C1000756B45 /* appel-manque.png in Resources */, + D31C9C94158A1C1000756B45 /* appel-sortant.png in Resources */, + D31AC4B0158A29C600C2638B /* UIHistoryCell.xib in Resources */, + D3432A62158A4446001C6B0B /* status_connected.png in Resources */, + D3432A64158A4446001C6B0B /* status_error.png in Resources */, + D3432A66158A4446001C6B0B /* quality-call-0.png in Resources */, + D3432A68158A4446001C6B0B /* quality-call-1.png in Resources */, + D3432A6A158A4446001C6B0B /* quality-call-2.png in Resources */, + D3432A6C158A4446001C6B0B /* quality-call-3.png in Resources */, + D3432A71158A45AF001C6B0B /* status_inprogress.png in Resources */, + D3432A73158A45AF001C6B0B /* status_disconnected.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1927,58 +1848,30 @@ 22D8F121147548E2008C97DB /* ringback.wav in Resources */, 22D8F124147548E2008C97DB /* untitled.plist in Resources */, 22D8F125147548E2008C97DB /* oldphone-mono.wav in Resources */, - 22D8F127147548E2008C97DB /* in_call.png in Resources */, - 22D8F128147548E2008C97DB /* out_call.png in Resources */, 22D8F12D147548E2008C97DB /* ConsoleViewController.xib in Resources */, 22D8F12E147548E2008C97DB /* icone-linphone-57.png in Resources */, 22D8F12F147548E2008C97DB /* startcall-green.png in Resources */, 22D8F130147548E2008C97DB /* stopcall-red.png in Resources */, - 22D8F134147548E2008C97DB /* clavier-01-106px.png in Resources */, - 22D8F135147548E2008C97DB /* clavier-01-108px.png in Resources */, - 22D8F136147548E2008C97DB /* clavier-01-160px.png in Resources */, 22D8F137147548E2008C97DB /* linphone-banner.png in Resources */, 22D8F138147548E2008C97DB /* MoreViewController.xib in Resources */, 22D8F139147548E2008C97DB /* oldphone-mono-30s.caf in Resources */, 22D8F13B147548E2008C97DB /* FirstLoginViewController.xib in Resources */, 22D8F13C147548E2008C97DB /* iTunesArtwork in Resources */, 22D8F13D147548E2008C97DB /* Localizable.strings in Resources */, - 22D8F13E147548E2008C97DB /* missed_call.png in Resources */, 22D8F13F147548E2008C97DB /* VideoViewController.xib in Resources */, 22D8F140147548E2008C97DB /* audio.plist in Resources */, 22D8F141147548E2008C97DB /* video.plist in Resources */, 22D8F142147548E2008C97DB /* rootca.pem in Resources */, 2211DB95147564B400DEE054 /* Settings.bundle in Resources */, - 2211DBD61476BE7300DEE054 /* ajouter.png in Resources */, - 2211DBD81476BE7300DEE054 /* clavier.png in Resources */, - 2211DBDA1476BE7300DEE054 /* contact.png in Resources */, - 2211DBDC1476BE7300DEE054 /* effacer.png in Resources */, - 2211DBDE1476BE7300DEE054 /* grouper.png in Resources */, - 2211DBE01476BE7300DEE054 /* HP_inverse.png in Resources */, - 2211DBE21476BE7300DEE054 /* HP.png in Resources */, - 2211DBE41476BE7300DEE054 /* micro_inverse.png in Resources */, - 2211DBE61476BE7300DEE054 /* micro.png in Resources */, - 2211DBE81476BE7300DEE054 /* pause_inactif.png in Resources */, - 2211DBEA1476BE7300DEE054 /* pause.png in Resources */, 344ABD73147FC438007420B6 /* ConferenceCallDetailView.xib in Resources */, 344ABD7B147FD32B007420B6 /* ConferenceCallDetailCell.xib in Resources */, - 344ABDE61483E596007420B6 /* unverified.png in Resources */, 34CA8530148F646700503C01 /* MainScreenWithVideoPreview.xib in Resources */, 34CA8536148F669900503C01 /* VideoViewController-ipad.xib in Resources */, 3422AA5114975EC9000D4E8A /* InCallViewController-ipad.xib in Resources */, 3422AA5414978352000D4E8A /* PhoneViewController-ipad.xib in Resources */, 341FCA8F149798210084BC26 /* linphonerc-ipad in Resources */, - 1AE0A49B14AC5C64002C99BD /* stat_sys_signal_0.png in Resources */, - 1AE0A49D14AC5C64002C99BD /* stat_sys_signal_1.png in Resources */, - 1AE0A49F14AC5C64002C99BD /* stat_sys_signal_2.png in Resources */, - 1AE0A4A114AC5C64002C99BD /* stat_sys_signal_3.png in Resources */, - 1AE0A4A314AC5C64002C99BD /* stat_sys_signal_4.png in Resources */, 340A75B114C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */, 3418843814C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */, - 3418844E14C6D1CE00EA48C7 /* startcall-gray.png in Resources */, - 3418845414C6F66F00EA48C7 /* status_green.png in Resources */, - 3418845814C6F66F00EA48C7 /* status_orange.png in Resources */, - 3418845A14C6F66F00EA48C7 /* status_red.png in Resources */, - 3418845D14C7077400EA48C7 /* status_gray.png in Resources */, 57282931154AF1460076F540 /* history-orange.png in Resources */, 57282933154AF14D0076F540 /* dialer-orange.png in Resources */, D3F83EEF1582021700336684 /* InCallViewController.xib in Resources */, @@ -2045,15 +1938,15 @@ D3ED3E7515861ABD006C0DE4 /* appeler-over.png in Resources */, D3ED3E7915861B1B006C0DE4 /* backspace-actif.png in Resources */, D3ED3E7B15861B1B006C0DE4 /* backspace-over.png in Resources */, - D3ED3E8A1586291E006C0DE4 /* LinphoneMainBar.xib in Resources */, + D3ED3E8A1586291E006C0DE4 /* UIMainBar.xib in Resources */, D3ED3E9915872EF1006C0DE4 /* all-call-actif.png in Resources */, D3ED3E9B15872EF1006C0DE4 /* all-call-selectionne.png in Resources */, D3ED3E9D15872EF1006C0DE4 /* edit-history-actif.png in Resources */, D3ED3E9F15872EF1006C0DE4 /* edit-history-over.png in Resources */, D3ED3EA115872EF1006C0DE4 /* missed-actif.png in Resources */, D3ED3EA315872EF1006C0DE4 /* missed-selectionne.png in Resources */, - D3ED3EB4158738FB006C0DE4 /* HistoryController.xib in Resources */, - D354980115875372000081D8 /* ContactsController.xib in Resources */, + D3ED3EB4158738FB006C0DE4 /* HistoryViewController.xib in Resources */, + D354980115875372000081D8 /* ContactsViewController.xib in Resources */, D354980715875534000081D8 /* all-contacts-actif.png in Resources */, D354980915875534000081D8 /* all-contacts-selectionne.png in Resources */, D354980B15875534000081D8 /* linphone-actif.png in Resources */, @@ -2062,9 +1955,22 @@ D354981315875608000081D8 /* add-contact-depuis-detail-over.png in Resources */, D354981B15876FE7000081D8 /* bouton-detail-contact-actif.png in Resources */, D354981D15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */, - D35498241587716B000081D8 /* LinphoneStatusBar.xib in Resources */, - D3A55FC015877E69003FD403 /* ContactCell.xib in Resources */, - D32648411588950F00930C67 /* LinphoneCallBar.xib in Resources */, + D35498241587716B000081D8 /* UIStateBar.xib in Resources */, + D3A55FC015877E69003FD403 /* UIContactCell.xib in Resources */, + D32648411588950F00930C67 /* UICallBar.xib in Resources */, + D31C9C8B158A179A00756B45 /* fond-detail-numero.png in Resources */, + D31C9C91158A1C1000756B45 /* appel-entrant.png in Resources */, + D31C9C93158A1C1000756B45 /* appel-manque.png in Resources */, + D31C9C95158A1C1000756B45 /* appel-sortant.png in Resources */, + D31AC4B1158A29C600C2638B /* UIHistoryCell.xib in Resources */, + D3432A63158A4446001C6B0B /* status_connected.png in Resources */, + D3432A65158A4446001C6B0B /* status_error.png in Resources */, + D3432A67158A4446001C6B0B /* quality-call-0.png in Resources */, + D3432A69158A4446001C6B0B /* quality-call-1.png in Resources */, + D3432A6B158A4446001C6B0B /* quality-call-2.png in Resources */, + D3432A6D158A4446001C6B0B /* quality-call-3.png in Resources */, + D3432A72158A45AF001C6B0B /* status_inprogress.png in Resources */, + D3432A74158A45AF001C6B0B /* status_disconnected.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2096,20 +2002,22 @@ 2211DBBE14769C8300DEE054 /* CallDelegate.m in Sources */, 344ABD77147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */, 34CA8539148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */, - 340751E7150F38FD00B89C47 /* UIToggleVideoButton.m in Sources */, + 340751E7150F38FD00B89C47 /* UIVideoButton.m in Sources */, 34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */, D3F83EEC1582021700336684 /* InCallViewController.m in Sources */, D3F83F8E15822ABE00336684 /* PhoneMainView.m in Sources */, - D3ED3E871586291E006C0DE4 /* LinphoneMainBar.m in Sources */, - D3ED3EA71587334E006C0DE4 /* CallHistoryTableViewController.m in Sources */, - D3ED3EB81587392C006C0DE4 /* HistoryController.m in Sources */, - D35497FE15875372000081D8 /* ContactsController.m in Sources */, + D3ED3E871586291E006C0DE4 /* UIMainBar.m in Sources */, + D3ED3EA71587334E006C0DE4 /* HistoryTableViewController.m in Sources */, + D3ED3EB81587392C006C0DE4 /* HistoryViewController.m in Sources */, + D35497FE15875372000081D8 /* ContactsViewController.m in Sources */, D3549816158761D0000081D8 /* ContactTableViewController.m in Sources */, - D35498211587716B000081D8 /* LinphoneStatusBar.m in Sources */, - D3A55FBC15877E5E003FD403 /* ContactCell.m in Sources */, + D35498211587716B000081D8 /* UIStateBar.m in Sources */, + D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */, D326483815887D5200930C67 /* OrderedDictionary.m in Sources */, - D326483E1588950F00930C67 /* LinphoneCallBar.m in Sources */, + D326483E1588950F00930C67 /* UICallBar.m in Sources */, D32648441588F6FC00930C67 /* UIToggleButton.m in Sources */, + D36FB2D51589EF7C0036F6F2 /* UIPauseButton.m in Sources */, + D31C9C98158A1CDF00756B45 /* UIHistoryCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2138,20 +2046,22 @@ 2211DBBF14769C8300DEE054 /* CallDelegate.m in Sources */, 344ABD78147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */, 34CA853A148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */, - 340751E8150F38FD00B89C47 /* UIToggleVideoButton.m in Sources */, + 340751E8150F38FD00B89C47 /* UIVideoButton.m in Sources */, 34216F411547EBCD00EA9777 /* VideoZoomHandler.m in Sources */, D3F83EED1582021700336684 /* InCallViewController.m in Sources */, D3F83F8F15822ABE00336684 /* PhoneMainView.m in Sources */, - D3ED3E881586291E006C0DE4 /* LinphoneMainBar.m in Sources */, - D3ED3EA81587334E006C0DE4 /* CallHistoryTableViewController.m in Sources */, - D3ED3EB91587392C006C0DE4 /* HistoryController.m in Sources */, - D35497FF15875372000081D8 /* ContactsController.m in Sources */, + D3ED3E881586291E006C0DE4 /* UIMainBar.m in Sources */, + D3ED3EA81587334E006C0DE4 /* HistoryTableViewController.m in Sources */, + D3ED3EB91587392C006C0DE4 /* HistoryViewController.m in Sources */, + D35497FF15875372000081D8 /* ContactsViewController.m in Sources */, D3549817158761D0000081D8 /* ContactTableViewController.m in Sources */, - D35498221587716B000081D8 /* LinphoneStatusBar.m in Sources */, - D3A55FBD15877E5E003FD403 /* ContactCell.m in Sources */, + D35498221587716B000081D8 /* UIStateBar.m in Sources */, + D3A55FBD15877E5E003FD403 /* UIContactCell.m in Sources */, D326483915887D5200930C67 /* OrderedDictionary.m in Sources */, - D326483F1588950F00930C67 /* LinphoneCallBar.m in Sources */, + D326483F1588950F00930C67 /* UICallBar.m in Sources */, D32648451588F6FC00930C67 /* UIToggleButton.m in Sources */, + D36FB2D61589EF7C0036F6F2 /* UIPauseButton.m in Sources */, + D31C9C99158A1CDF00756B45 /* UIHistoryCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };