diff --git a/Classes/LinphoneApp.xib b/Classes/LinphoneApp.xib new file mode 100644 index 000000000..745729525 --- /dev/null +++ b/Classes/LinphoneApp.xib @@ -0,0 +1,404 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBUIWindow + IBUICustomObject + IBUIViewController + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + IBCocoaTouchFramework + + + + 1316 + + {320, 480} + + + + + 1 + MSAxIDEAA + + NO + NO + + IBCocoaTouchFramework + YES + + + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + + + + + delegate + + + + 6 + + + + rootViewController + + + + 10 + + + + + + 0 + + + + + + 2 + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + linphoneAppDelegate + + + 9 + + + PhoneMainView + + + + + UIApplication + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + linphoneAppDelegate + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + PhoneMainView + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 11 + + + + + ABPeoplePickerNavigationController + UINavigationController + + IBProjectSource + ./Classes/ABPeoplePickerNavigationController.h + + + + MainScreenWithVideoPreview + UIViewController + + PhoneViewController + UIWindow + + + + phoneMainView + PhoneViewController + + + window + UIWindow + + + + IBProjectSource + ./Classes/MainScreenWithVideoPreview.h + + + + PhoneMainView + UIViewController + + UIView + UIView + UIView + UIView + UIView + UIView + UIView + + + + addCallTabBar + UIView + + + callTabBar + UIView + + + contentView + UIView + + + incomingTabBar + UIView + + + mainTabBar + UIView + + + statusBarView + UIView + + + tabBarView + UIView + + + + IBProjectSource + ./Classes/PhoneMainView.h + + + + PhoneViewController + UIViewController + + UITextField + UIButton + UIButton + UIButton + UIView + UIButton + UIEraseButton + UIButton + UIButton + UIButton + 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 + + + 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 + + + + linphoneAppDelegate + NSObject + + UIView + ABPeoplePickerNavigationController + PhoneViewController + UITabBarController + UIWindow + + + + myContentView + UIView + + + myPeoplePickerController + ABPeoplePickerNavigationController + + + myPhoneViewController + PhoneViewController + + + myTabBarController + UITabBarController + + + window + UIWindow + + + + IBProjectSource + ./Classes/linphoneAppDelegate.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + 1181 + + diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 5aae06fae..bd89a845c 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#import "PhoneMainView.h" #import "PhoneViewController.h" #import "linphoneAppDelegate.h" #import "ContactPickerDelegate.h" @@ -168,7 +169,8 @@ int __aeabi_idiv(int a, int b) { } -(void) setupUI { - //as defined in PhoneMainView.xib + + /*//as defined in PhoneMainView.xib //dialer myPhoneViewController = (PhoneViewController*) [myTabBarController.viewControllers objectAtIndex: DIALER_TAB_INDEX]; myPhoneViewController.myTabBarController = myTabBarController; @@ -206,7 +208,7 @@ int __aeabi_idiv(int a, int b) { [myTabBarController setViewControllers:newArray animated:NO]; //[window addSubview: myTabBarController.view]; [myCallHistoryTableViewController loadView]; - [myContentView addSubview:myCallHistoryTableViewController.view]; + // [myContentView addSubview:myCallHistoryTableViewController.view]; //[window addSubview: myContentView]; // [myContentViewController addChildViewController:myCallHistoryTableViewController]; @@ -214,7 +216,11 @@ int __aeabi_idiv(int a, int b) { [[LinphoneManager instance] setCallDelegate:myPhoneViewController]; - [UIDevice currentDevice].batteryMonitoringEnabled = YES; + [UIDevice currentDevice].batteryMonitoringEnabled = YES;*/ +/* + PhoneMainView *mainView = [[PhoneMainView alloc] initWithNibName:@"PhoneMainView" bundle:[NSBundle mainBundle]]; + [self.window addSubview:mainView.view]; + [self.window makeKeyAndVisible];*/ } -(void) setupGSMInteraction { @@ -271,7 +277,7 @@ int __aeabi_idiv(int a, int b) { } - (void)dealloc { - [window release]; + //[window release]; [myPeoplePickerController release]; [super dealloc]; } diff --git a/Classes/LinphoneUI/LinphoneMainBar.h b/Classes/LinphoneUI/LinphoneMainBar.h new file mode 100644 index 000000000..c0edcf6f9 --- /dev/null +++ b/Classes/LinphoneUI/LinphoneMainBar.h @@ -0,0 +1,30 @@ +/* LinphoneMainBar.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 + +@interface LinphoneMainBar : UIViewController { + UIButton *historyButton; + UIButton *dialerButton; +} + +@property (nonatomic, retain) IBOutlet UIButton* historyButton; +@property (nonatomic, retain) IBOutlet UIButton* dialerButton; +-(IBAction) onHistoryClick: (id) event; +@end diff --git a/Classes/LinphoneUI/LinphoneMainBar.m b/Classes/LinphoneUI/LinphoneMainBar.m new file mode 100644 index 000000000..51d0bdf68 --- /dev/null +++ b/Classes/LinphoneUI/LinphoneMainBar.m @@ -0,0 +1,59 @@ +/* LinphoneMainBar.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 "LinphoneMainBar.h" +#import "PhoneMainView.h" + +@implementation LinphoneMainBar + +@synthesize historyButton; +@synthesize dialerButton; + + +- (void) viewDidLoad { + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLinphoneMainViewChangeEvent:) name:@"LinphoneMainViewChange" object:nil]; +} + +- (void) receiveLinphoneMainViewChangeEvent: (NSNotification*) notif { + PhoneView view = [[notif.userInfo objectForKey: @"PhoneView"] intValue]; + if(view == PhoneView_Main) { + dialerButton.selected = TRUE; + } else { + dialerButton.selected = FALSE; + } + if(view == PhoneView_CallHistory) { + historyButton.selected = TRUE; + } else { + historyButton.selected = FALSE; + } +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [super dealloc]; +} + +- (IBAction) onHistoryClick: (id) sender { + // Change to default view + NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_CallHistory] forKey:@"PhoneView"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict]; +} + + +@end diff --git a/Classes/LinphoneUI/LinphoneMainBar.xib b/Classes/LinphoneUI/LinphoneMainBar.xib new file mode 100644 index 000000000..ae4a512fa --- /dev/null +++ b/Classes/LinphoneUI/LinphoneMainBar.xib @@ -0,0 +1,454 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBProxyObject + IBUIView + IBUIButton + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + -2147483356 + {{0, 7}, {320, 65}} + + + + _NS:9 + + 3 + MQA + + 2 + + + -1 + NO + IBCocoaTouchFramework + + + + 292 + {64, 72} + + + + _NS:9 + NO + + History + + IBCocoaTouchFramework + 0 + 0 + NO + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + NSImage + history-over.png + + + NSImage + history-selectionne.png + + + NSImage + history-actif.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 292 + {{64, 0}, {64, 72}} + + + + _NS:9 + NO + + Contacts + + IBCocoaTouchFramework + 0 + 0 + NO + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + contacts-over.png + + + NSImage + contacts-selectionne.png + + + NSImage + contacts-actif.png + + + + + + + 292 + {{128, 0}, {64, 72}} + + + + _NS:9 + NO + + Dialer + + IBCocoaTouchFramework + 0 + 0 + NO + + + NSImage + dialer-actif.png + + + NSImage + dialer-over.png + + + + + + + 292 + {{192, 0}, {64, 72}} + + + + _NS:9 + NO + + Settings + + IBCocoaTouchFramework + 0 + 0 + NO + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + settings-over.png + + + NSImage + settings-selectionne.png + + + NSImage + settings-actif.png + + + + + + + 292 + {{256, 0}, {64, 72}} + + + _NS:9 + NO + + Tchat + + IBCocoaTouchFramework + 0 + 0 + NO + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + tchat-over.png + + + NSImage + tchat-selectionne.png + + + NSImage + tchat-actif.png + + + + + + {320, 72} + + + + _NS:9 + + 1 + MCAxIDAuMTkxOTQ1NDc1NSAwAA + + NO + IBCocoaTouchFramework + + + + + + + dialerButton + + + + 12 + + + + historyButton + + + + 13 + + + + view + + + + 14 + + + + onHistoryClick: + + + 1 + + 15 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 3 + + + + + + + + + + + mainTabBar + + + 9 + + + settings + + + 8 + + + contacts + + + 7 + + + dialer + + + 6 + + + history + + + 5 + + + tchat + + + 4 + + + mask + + + + + LinphoneMainBar + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + + 16 + + + + + LinphoneMainBar + UIViewController + + onHistoryClick: + id + + + onHistoryClick: + + onHistoryClick: + id + + + + UIButton + UIButton + + + + dialerButton + UIButton + + + historyButton + UIButton + + + + IBProjectSource + ./Classes/LinphoneMainBar.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {127, 144} + {127, 144} + {127, 144} + {132, 144} + {132, 144} + {127, 144} + {127, 144} + {127, 144} + {127, 144} + {127, 144} + {127, 144} + {127, 144} + {127, 144} + {127, 144} + + 1181 + + diff --git a/Classes/LinphoneUI/LinphoneStatusBar.h b/Classes/LinphoneUI/LinphoneStatusBar.h new file mode 100644 index 000000000..a041cb37e --- /dev/null +++ b/Classes/LinphoneUI/LinphoneStatusBar.h @@ -0,0 +1,27 @@ +/* LinphoneStatusBar.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 LinphoneStatusBar : UIView { + UIView *test; +} + +@property (nonatomic, retain) IBOutlet UIView* test; +@end diff --git a/Classes/LinphoneUI/LinphoneStatusBar.m b/Classes/LinphoneUI/LinphoneStatusBar.m new file mode 100644 index 000000000..21057ad58 --- /dev/null +++ b/Classes/LinphoneUI/LinphoneStatusBar.m @@ -0,0 +1,34 @@ +/* LinphoneStatusBar.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 "LinphoneStatusBar.h" + +@implementation LinphoneStatusBar +@synthesize test; +- (id) awakeAfterUsingCoder:(NSCoder*)aDecoder { + NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"LinphoneStatusBar" + owner:nil + options:nil]; + + if ([arrayOfViews count] >= 1){ + [self addSubview:[[arrayOfViews objectAtIndex:0] retain]]; + } + return self; +} +@end diff --git a/Classes/LinphoneUI/LinphoneStatusBar.xib b/Classes/LinphoneUI/LinphoneStatusBar.xib new file mode 100644 index 000000000..7cd51fd02 --- /dev/null +++ b/Classes/LinphoneUI/LinphoneStatusBar.xib @@ -0,0 +1,156 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBProxyObject + IBUIView + IBUIImageView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + {320, 23} + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + barre-noire-top.png + + + + {320, 23} + + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 3 + + + + + + + + 4 + + + background + + + + + LinphoneStatusBar + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 4 + + + + + LinphoneStatusBar + UIView + + test + UIView + + + test + + test + UIView + + + + IBProjectSource + ./Classes/LinphoneStatusBar.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + barre-noire-top.png + {640, 46} + + 1181 + + diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h new file mode 100644 index 000000000..d4ad66c97 --- /dev/null +++ b/Classes/PhoneMainView.h @@ -0,0 +1,53 @@ +/* PhoneMainView.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 + +typedef enum _PhoneView { + PhoneView_Main, + PhoneView_CallHistory, + PhoneView_END +} PhoneView; + +@interface PhoneMainView : UIViewController { + UIView *statusBarView; + UIView *contentView; + UIView *tabBarView; + PhoneView currentView; + + @private + NSMutableDictionary *viewDescriptions; + NSArray *views; + UIView *callTabBar; + UIViewController *mainTabBar; + UIView *incomingTabBar; + UIView *addCallTabBar; + +} +@property (nonatomic, retain) IBOutlet UIView* statusBarView; +@property (nonatomic, retain) IBOutlet UIView* contentView; +@property (nonatomic, retain) IBOutlet UIView* tabBarView; + +@property (nonatomic, retain) IBOutlet UIView* callTabBar; +@property (nonatomic, retain) IBOutlet UIViewController* mainTabBar; +@property (nonatomic, retain) IBOutlet UIView* incomingTabBar; +@property (nonatomic, retain) IBOutlet UIView* addCallTabBar; + +-(void) changeView: (NSNotification*) notif; +@end diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m new file mode 100644 index 000000000..a442a3209 --- /dev/null +++ b/Classes/PhoneMainView.m @@ -0,0 +1,135 @@ +/* PhoneMainView.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 "PhoneMainView.h" +#import "CallHistoryTableViewController.h" +typedef enum _TabBar { + TabBar_Main, + TabBar_END +} TabBar; + + +@interface ViewsDescription: NSObject{ + @public + UIViewController *content; + UIViewController *tabBar; + bool statusEnabled; +} +@end +@implementation ViewsDescription +@end + +@implementation PhoneMainView + +@synthesize statusBarView; +@synthesize contentView; +@synthesize tabBarView; + +@synthesize callTabBar; +@synthesize mainTabBar; +@synthesize incomingTabBar; +@synthesize addCallTabBar; + +- (void) changeView: (NSNotification*) notif { + PhoneView view = [[notif.userInfo objectForKey: @"PhoneView"] intValue]; + ViewsDescription *description = [viewDescriptions objectForKey:[NSNumber numberWithInt: view]]; + for (UIView *view in contentView.subviews) { + [view removeFromSuperview]; + } + for (UIView *view in tabBarView.subviews) { + [view removeFromSuperview]; + } + + [contentView addSubview: description->content.view]; + + CGRect contentFrame = contentView.frame; + if(description->statusEnabled) { + statusBarView.hidden = false; + contentFrame.origin.y = statusBarView.frame.size.height + statusBarView.frame.origin.y; + } else { + statusBarView.hidden = true; + contentFrame.origin.y = 0; + } + + + // Resize tabbar + CGRect tabFrame = tabBarView.frame; + tabFrame.origin.y += tabFrame.size.height; + tabFrame.origin.x += tabFrame.size.width; + tabFrame.size.height = description->tabBar.view.frame.size.height; + tabFrame.size.width = description->tabBar.view.frame.size.width; + tabFrame.origin.y -= tabFrame.size.height; + tabFrame.origin.x -= tabFrame.size.width; + tabBarView.frame = tabFrame; + for (UIView *view in description->tabBar.view.subviews) { + if(view.tag == -1) { + contentFrame.size.height = tabFrame.origin.y - contentFrame.origin.y + view.frame.origin.y; + } + } + + + // contentView.frame = contentFrame; + [tabBarView addSubview: description->tabBar.view]; +} + +-(void)viewDidLoad { + [super viewDidLoad]; + UIView *dumb; + + // Init view descriptions + viewDescriptions = [[NSMutableDictionary alloc] init]; + + // Load Bars + dumb = mainTabBar.view; + + // Main View + PhoneViewController* myPhoneViewController = [[PhoneViewController alloc] + initWithNibName:@"PhoneViewController" + bundle:[NSBundle mainBundle]]; + [myPhoneViewController loadView]; + ViewsDescription *mainViewDescription = [ViewsDescription alloc]; + mainViewDescription->content = myPhoneViewController; + mainViewDescription->tabBar = mainTabBar; + mainViewDescription->statusEnabled = true; + [viewDescriptions setObject:mainViewDescription forKey:[NSNumber numberWithInt: PhoneView_Main]]; + + // Call History View + CallHistoryTableViewController* myCallHistoryTableViewController = [[CallHistoryTableViewController alloc] + initWithNibName:@"CallHistoryTableViewController" + bundle:[NSBundle mainBundle]]; + [myCallHistoryTableViewController loadView]; + ViewsDescription *callHistoryDescription = [ViewsDescription alloc]; + callHistoryDescription->content = myCallHistoryTableViewController; + callHistoryDescription->tabBar = mainTabBar; + callHistoryDescription->statusEnabled = true; + [viewDescriptions setObject:callHistoryDescription forKey:[NSNumber numberWithInt: PhoneView_CallHistory]]; + + // Set observer + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeView:) name:@"LinphoneMainViewChange" object:nil]; + + // Change to default view + NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Main] forKey:@"PhoneView"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict]; +} + +- (void)dealloc { + [super dealloc]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} +@end \ No newline at end of file diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index 794697522..7ee290cec 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -12,15 +12,10 @@ YES - IBProxyObject - IBUITabBarItem - IBUIViewController - IBUICustomObject - IBUITabBarController - IBUIWindow - IBUITabBar IBUIButton + IBUIViewController IBUIView + IBProxyObject YES @@ -40,20 +35,101 @@ IBFirstResponder IBCocoaTouchFramework - - IBCocoaTouchFramework - - + 292 YES - - + + + 274 + {320, 23} + + + + _NS:9 + + 3 + MQA + + 2 + + + YES + IBCocoaTouchFramework + + + + 314 + {{0, 23}, {320, 380}} + + + + _NS:9 + + 1 + MCAxIDAuMDkwOTI0NTczOTEgMAA + + YES + IBCocoaTouchFramework + + + + 280 + {{0, 400}, {320, 60}} + + + + _NS:9 + + 1 + MSAwLjI4MzE1ODM3MjYgMC4wNTY3ODY4OTE2MSAwAA + + YES + IBCocoaTouchFramework + + + {320, 460} + + + + _NS:9 + + 3 + MQA + + + IBCocoaTouchFramework + + + + 292 + + YES + + + -2147483356 + {320, 135} + + + + _NS:9 + + 3 + MQA + + + -1 + NO + IBCocoaTouchFramework + + + 292 {80, 67} - - + + + _NS:9 NO @@ -90,18 +166,19 @@ 2 15 - + Helvetica-Bold 15 16 - - + + 292 {{80, 0}, {80, 67}} - - + + + _NS:9 NO @@ -129,14 +206,15 @@ micro-OFF-actif.png - + - - + + 292 {{160, 0}, {80, 67}} - - + + + _NS:9 NO @@ -155,20 +233,21 @@ NSImage speacker-ON-over.png - + NSImage speacker-OFF-actif.png - + - + - - + + 292 {{240, 0}, {80, 67}} - - + + + _NS:9 NO @@ -183,24 +262,25 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + NSImage add-call-over.png - + NSImage add-call-actif.png - + - - + + 264 {{0, 67}, {105, 68}} - - + + + _NS:9 NO @@ -215,7 +295,7 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + NSImage pause-over.png @@ -223,16 +303,17 @@ NSImage pause-actif.png - + - + - - + + 264 {{105, 67}, {111, 68}} - - + + + _NS:9 NO @@ -247,7 +328,7 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + NSImage raccrocher-over.png @@ -255,15 +336,16 @@ NSImage raccrocher-actif.png - + - + - - + + 264 {{215, 67}, {105, 68}} - + + _NS:9 NO @@ -279,7 +361,7 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + NSImage dialer-meteo-sortir-over.png @@ -287,14 +369,15 @@ NSImage dialer-meteo-sortir-actif.png - + - + {320, 135} - + + _NS:9 1 @@ -303,335 +386,35 @@ NO IBCocoaTouchFramework - + 292 YES - - - 292 - {64, 72} - - - _NS:9 - NO - - History - - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - history-over.png - - - NSImage - history-selectionne.png - - - NSImage - history-actif.png - - - - - - - 292 - {{64, 0}, {64, 72}} - - - _NS:9 - NO - - Contacts - - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - contacts-over.png - - - NSImage - contacts-selectionne.png - - - NSImage - contacts-actif.png - - - - - - - 292 - {{128, 0}, {64, 72}} - - - _NS:9 - NO - - Dialer - - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - dialer-over.png - - - NSImage - dialer-actif.png - - - - - - - - 292 - {{192, 0}, {64, 72}} - - - _NS:9 - NO - - Settings - - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - settings-over.png - - - NSImage - settings-selectionne.png - - - NSImage - settings-actif.png - - - - - - - 292 - {{256, 0}, {64, 72}} - - - _NS:9 - NO - - Tchat - - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - NSImage - tchat-over.png - - - NSImage - tchat-selectionne.png - - - NSImage - tchat-actif.png - - - - - - {320, 72} - - - _NS:9 - - 1 - MCAxIDAuMTkxOTQ1NDc1NSAwAA - - NO - IBCocoaTouchFramework - - - - 1316 - - YES - - - 1316 - {{0, 20}, {320, 400}} - - + + + -2147483356 + {{0, 9}, {320, 67}} + + + _NS:9 3 MQA - - 2 - + - YES + -1 + NO IBCocoaTouchFramework - - - {320, 480} - - - - 1 - MSAxIDEAA - - NO - NO - - IBCocoaTouchFramework - - - - - - 1 - 1 - - IBCocoaTouchFramework - NO - - History - - History - - NSImage - history-orange.png - - IBCocoaTouchFramework - - - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - YES - - - - Dialer - - NSImage - dialer-orange.png - - IBCocoaTouchFramework - - - PhoneViewController - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - IBCocoaTouchFramework - 5 - - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - - IBCocoaTouchFramework - 0 - - - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - - -2147483382 - {{0, 431}, {320, 49}} - - - - 3 - MCAwAA - - NO - IBCocoaTouchFramework - - - - - 292 - - YES - - + + 292 {160, 77} - - + + + _NS:9 NO @@ -655,13 +438,14 @@ decrocher-actif.png - + - - + + 292 {{160, 0}, {160, 77}} - + + _NS:9 NO @@ -686,12 +470,13 @@ refuser-actif.png - + {320, 77} - + + _NS:9 1 @@ -700,17 +485,35 @@ NO IBCocoaTouchFramework - + 292 YES - - + + + -2147483356 + {{0, 7}, {320, 65}} + + + + _NS:9 + + 3 + MQA + + + -1 + NO + IBCocoaTouchFramework + + + 292 {128, 72} - - + + + _NS:9 NO @@ -734,13 +537,14 @@ contact-actif-add-call.png - + - - + + 292 {{192, 0}, {128, 72}} - + + _NS:9 NO @@ -765,14 +569,15 @@ cancel-actif.png - + - - + + 292 {{128, 0}, {64, 72}} - - + + + _NS:9 NO @@ -787,16 +592,23 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - + + NSImage + dialer-over.png + + + NSImage + dialer-actif.png + + - + {320, 72} - + + _NS:9 1 @@ -805,41 +617,83 @@ NO IBCocoaTouchFramework + + NO + + + 1 + 1 + + IBCocoaTouchFramework + NO + YES - delegate + view - + - 6 + 158 - window - - + tabBarView + + - 7 + 160 - myTabBarController - - - - 14 - - - - myContentView - + contentView + - 55 + 159 + + + + addCallTabBar + + + + 164 + + + + callTabBar + + + + 165 + + + + incomingTabBar + + + + 166 + + + + statusBarView + + + + 176 + + + + mainTabBar + + + + 180 @@ -853,110 +707,139 @@ - - 2 - - - YES - - - - window - -1 File's Owner - - 4 - - - linphoneAppDelegate - -2 - 8 - + 111 + YES - - - - - + + + + + + + + + callTabBar - 9 - - + 118 + + + video - 11 - + 120 + + + micro + + + 122 + + + addCall + + + 121 + + + speaker + + + 117 + + + pause + + + 116 + + + hangup + + + 114 + + + back + + + 123 + YES - + + + - + + incomingTabBar + + + 129 + + + YES + + + + + + + addCallTabBar + + + 130 + + + cancel + + + 131 + + contacts - 12 - - - - - 38 - - - YES - - - + 133 + + dialer - 39 - - - - - 41 - + 152 + YES - + + + - - history + + root - 42 - - - - - 43 - + 135 + YES - - - more - - - 44 - - + + tabBar 53 @@ -964,163 +847,53 @@ YES - + content - 50 - - - YES - - - - - - - - mainTabBar - - - 58 - - - settings - - - 59 - - - tchat - - - 60 - - - contacts - - - 57 - - - dialer - - - 56 - - - history - - - 111 - - - YES - - - - - - - - - - callTabBar - - - 118 - - - video - - - 120 - - - micro - - - 122 - - - addCall - - - 121 - - - speaker - - - 117 - - - pause - - - 116 - - - hangup - - - 114 - - - back - - - 123 - - - YES - - - - - incomingTabBar - - - 124 - - - accept + 169 + + + mask 127 - - + + decline - 129 - + 170 + YES - - - + + mask + + + 172 + + + mask + + + 124 + + + accept + + + 175 + + + statusBar + + + 178 + - addCallTabBar - - - 130 - - - cancel - - - 131 - - - contacts - - - 133 - - - dialer + LinphoneMainBar @@ -1132,7 +905,6 @@ -1.IBPluginDependency -2.CustomClassName -2.IBPluginDependency - 11.IBPluginDependency 111.IBPluginDependency 114.IBPluginDependency 114.IBUIButtonInspectorSelectedStateConfigurationMetadataKey @@ -1142,7 +914,6 @@ 117.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 118.IBPluginDependency 118.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 12.IBPluginDependency 120.IBPluginDependency 120.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 121.IBPluginDependency @@ -1161,43 +932,25 @@ 131.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 133.IBPluginDependency 133.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 2.IBAttributePlaceholdersKey - 2.IBPluginDependency - 38.CustomClassName - 38.IBPluginDependency - 39.IBPluginDependency - 4.CustomClassName - 4.IBPluginDependency - 41.CustomClassName - 41.IBPluginDependency - 42.IBPluginDependency - 43.CustomClassName - 43.IBPluginDependency - 44.IBPluginDependency - 50.IBPluginDependency + 135.IBPluginDependency + 152.IBPluginDependency + 169.IBPluginDependency + 170.IBPluginDependency + 172.IBPluginDependency + 175.CustomClassName + 175.IBPluginDependency + 178.CustomClassName + 178.IBPluginDependency 53.IBPluginDependency - 56.IBPluginDependency - 56.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 57.IBPluginDependency - 57.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 58.IBPluginDependency - 58.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 59.IBPluginDependency - 59.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 60.IBPluginDependency - 60.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 8.IBPluginDependency - 9.IBPluginDependency YES - UIApplication + PhoneMainView 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 @@ -1206,7 +959,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1224,35 +976,14 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - YES - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - PhoneViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - linphoneAppDelegate - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - CallHistoryTableViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - MoreViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + LinphoneStatusBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + LinphoneMainBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1269,9 +1000,147 @@ - 133 + 181 + + + + YES + + LinphoneMainBar + UIViewController + + YES + + YES + dialerButton + historyButton + + + YES + UIButton + UIButton + + + + YES + + YES + dialerButton + historyButton + + + YES + + dialerButton + UIButton + + + historyButton + UIButton + + + + + IBProjectSource + ./Classes/LinphoneMainBar.h + + + + LinphoneStatusBar + UIView + + test + UIView + + + test + + test + UIView + + + + IBProjectSource + ./Classes/LinphoneStatusBar.h + + + + PhoneMainView + UIViewController + + YES + + YES + addCallTabBar + callTabBar + contentView + incomingTabBar + mainTabBar + statusBarView + tabBarView + + + YES + UIView + UIView + UIView + UIView + UIViewController + UIView + UIView + + + + YES + + YES + addCallTabBar + callTabBar + contentView + incomingTabBar + mainTabBar + statusBarView + tabBarView + + + YES + + addCallTabBar + UIView + + + callTabBar + UIView + + + contentView + UIView + + + incomingTabBar + UIView + + + mainTabBar + UIViewController + + + statusBarView + UIView + + + tabBarView + UIView + + + + + IBProjectSource + ./Classes/PhoneMainView.h + + + - 0 IBCocoaTouchFramework @@ -1298,20 +1167,12 @@ cancel-over.png contact-actif-add-call.png contact-over-add-call.png - contacts-actif.png - contacts-over.png - contacts-selectionne.png decrocher-actif.png decrocher-over.png dialer-actif.png dialer-meteo-sortir-actif.png dialer-meteo-sortir-over.png - dialer-orange.png dialer-over.png - history-actif.png - history-orange.png - history-over.png - history-selectionne.png micro-OFF-actif.png micro-ON-actif.png micro-ON-over.png @@ -1321,14 +1182,8 @@ raccrocher-over.png refuser-actif.png refuser-over.png - settings-actif.png - settings-over.png - settings-selectionne.png speacker-OFF-actif.png speacker-ON-over.png - tchat-actif.png - tchat-over.png - tchat-selectionne.png video-OFF-actif.png video-ON-actif.png video-ON-over.png @@ -1341,20 +1196,12 @@ {254, 144} {254, 144} {254, 144} - {127, 144} - {127, 144} - {127, 144} {320, 154} {320, 154} {132, 144} {209, 136} {209, 136} - {25, 24} {132, 144} - {127, 144} - {25, 23} - {127, 144} - {127, 144} {160, 134} {160, 134} {160, 134} @@ -1364,14 +1211,8 @@ {222, 136} {320, 154} {320, 154} - {127, 144} - {127, 144} - {127, 144} {160, 134} {160, 134} - {127, 144} - {127, 144} - {127, 144} {160, 134} {160, 134} {160, 134} diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib index f73195a6e..0cc9a7acc 100644 --- a/Classes/PhoneViewController.xib +++ b/Classes/PhoneViewController.xib @@ -12,8 +12,8 @@ YES - IBUIViewController IBUIButton + IBUIImageView IBUIView IBUITextField IBProxyObject @@ -36,492 +36,598 @@ IBFirstResponder IBCocoaTouchFramework - - - - 292 - - YES - - - 292 - - YES - - - 292 - {{254, 0}, {66, 81}} - - - NO - IBCocoaTouchFramework - 0 - 0 - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - NSImage - effacer.png - - - Helvetica-Bold - Helvetica - 2 - 15 - - - Helvetica-Bold - 15 - 16 - + + + 292 + + YES + + + 292 + + YES + + + 292 + {105, 72} + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + + 3 + MQA - - - 292 - {{0, 1}, {255, 80}} - - - - NO - NO - IBCocoaTouchFramework - 0 - - sip: - - 3 - MAA - - YES - 15 - - 1 - 3 - IBCocoaTouchFramework - - 1 - - Helvetica - Helvetica - 0 - 36 - - - Helvetica - 36 - 16 - + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + NSImage + add-contact-over.png + + + NSImage + add-contact-inactif.png + + + NSImage + add-contact-actif.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 - {320, 81} - - - - IBCocoaTouchFramework + + + 292 + {{105, 0}, {110, 72}} + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + appeler-over.png + + + NSImage + appeler-actif.png + + + + + + + 292 + {{215, 0}, {105, 72}} + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + NSImage + backspace-over.png + + + NSImage + backspace-actif.png + + + + - - - 292 - {255, 20} - - - _NS:196 - - 3 - MCAwAA + {{0, 293}, {320, 72}} + + + _NS:9 + + 3 + MQA + + 2 - IBCocoaTouchFramework - - - - 292 - {{0, 81}, {107, 66}} - - - - 1 - MC40MDAwMDAwMSAxIDEgMAA - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - clavier-01-106px.png - - - - - - - 292 - {{107, 81}, {106, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 2 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - clavier-01-108px.png - - - - - - - 292 - {{213, 81}, {107, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 3 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{0, 147}, {107, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 4 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{107, 147}, {106, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 5 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{213, 147}, {107, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 6 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{0, 213}, {107, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 7 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{107, 213}, {106, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 8 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{213, 213}, {107, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 9 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{0, 279}, {107, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - * - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{107, 279}, {106, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 0+ - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - - 292 - {{213, 279}, {107, 66}} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - # - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - + IBCocoaTouchFramework + + + + 292 + + YES + + + 292 + {320, 259} + + + _NS:9 + NO + + + + IBCocoaTouchFramework + + NSImage + fond-clavier.png + + + + + 292 + {{0, 11}, {107, 54}} + + + + 1 + MC40MDAwMDAwMSAxIDEgMAA + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 1-over.png + + + NSImage + 1-actif.png + + + Helvetica-Bold + Helvetica + 2 + 15 + + + + + + 292 + {{107, 11}, {106, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 2-over.png + + + NSImage + 2-actif.png + + + + + + + 292 + {{213, 11}, {107, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 3-actif.png + + + + + + + 292 + {{0, 73}, {107, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 4-over.png + + + NSImage + 4-actif.png + + + + + + + 292 + {{107, 73}, {106, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 5-over.png + + + NSImage + 5-actif.png + + + + + + + 292 + {{0, 135}, {107, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 7-over.png + + + NSImage + 7-actif.png + + + + + + + 292 + {{213, 73}, {107, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 6-over.png + + + NSImage + 6-actif.png + + + + + + + 292 + {{107, 135}, {106, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 8-over.png + + + NSImage + 8-actif.png + + + + + + + 292 + {{213, 135}, {107, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 9-over.png + + + NSImage + 9-actif.png + + + + + + + 292 + {{0, 197}, {107, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + etoile-over.png + + + NSImage + etoile-actif.png + + + + + + + 292 + {{107, 197}, {106, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + 0-over.png + + + NSImage + 0-actif.png + + + + + + + 292 + {{213, 197}, {107, 54}} + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + NSImage + diese-over.png + + + NSImage + diese-actif.png + + + + + + {{0, 58}, {320, 260}} + + + _NS:9 + + 3 + MQA + + + IBCocoaTouchFramework + + + + 292 + + YES + + + 292 + {320, 80} + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + champ-saisie-numero.png + + + + + 292 + {320, 60} + + + + 3 + MSAwAA + + NO + NO + IBCocoaTouchFramework + 0 + + sip: + + YES + 15 + + 1 + 3 + IBCocoaTouchFramework + + 1 + + Helvetica + Helvetica + 0 + 36 + + + Helvetica + 36 + 16 + + + + {320, 80} + + + _NS:9 + + 3 + MSAwAA + + + YES + IBCocoaTouchFramework - {{0, 20}, {320, 460}} - - - - 5 - IBCocoaTouchFramework - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - 292 - {320, 66} + {320, 460} - - NO - NO + + _NS:9 + + 2 + MC4wMjc0NTA5ODI0OCAwLjYwNzg0MzE2MDYgMSAwAA + IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - NSImage - startcall-gray.png - - - NSImage - startcall-green.png - - - NSImage - clavier-01-160px.png - - - - - - - - 292 - {160, 66} - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Back - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - - 2 - 2 - - - Helvetica-Bold - 18 - 16 - - - - - 292 - {160, 66} - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - YES + + + view + + + + 176 + address @@ -532,11 +638,35 @@ - view + hash - + - 25 + 46 + + + + zero + + + + 54 + + + + star + + + + 51 + + + + nine + + + + 47 @@ -546,6 +676,22 @@ 43 + + + six + + + + 50 + + + + seven + + + + 49 + five @@ -562,54 +708,6 @@ 45 - - - hash - - - - 46 - - - - nine - - - - 47 - - - - one - - - - 48 - - - - seven - - - - 49 - - - - six - - - - 50 - - - - star - - - - 51 - three @@ -628,59 +726,27 @@ - zero + one - + - 54 + 48 dialerView - + - 158 - - - - statusViewHolder - - - - 169 + 181 erase - + - 151 - - - - callLarge - - - - 164 - - - - backToCallView - - - - 161 - - - - callShort - - - - 163 + 186 @@ -714,142 +780,169 @@ - 80 - + 171 + YES - + + + + view - 1 - + 178 + YES - - - - - - - - - - - - - - - - - - - 38 - - - - - 37 - - - - - 29 - - - - - 39 - - - - - 35 - - - - - 41 - - - - - 40 - - - - - 36 - - - - - 34 - - - - - 33 - - - - - 31 - - - - - 30 - - - - - 157 - - - YES - + - - Dialer + + dialer 4 - - Address + + address - 165 - - - status_view + 179 + + + background - 150 - - - Erase + 180 + + + YES + + + + + + + + + + + + + + + + pad - 162 - - - Call-large + 41 + + + # - 160 - - - back + 40 + + + 0 - 5 - - - Call-short + 39 + + + * + + + 36 + + + 9 + + + 35 + + + 8 + + + 33 + + + 6 + + + 34 + + + 7 + + + 31 + + + 5 + + + 30 + + + 4 + + + 29 + + + 3 + + + 37 + + + 2 + + + 38 + + + 1 + + + 177 + + + background + + + 182 + + + YES + + + + + + toolBar + + + 183 + + + addContact + + + 184 + + + call + + + 185 + + + backspace @@ -861,45 +954,55 @@ -1.IBPluginDependency -2.CustomClassName -2.IBPluginDependency - 1.IBPluginDependency - 1.IBUserGuides - 150.CustomClassName - 150.IBPluginDependency - 157.IBPluginDependency - 160.IBPluginDependency - 162.CustomClassName - 162.IBPluginDependency - 162.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 165.IBPluginDependency + 171.IBPluginDependency + 177.IBPluginDependency + 178.IBPluginDependency + 179.IBPluginDependency + 180.IBPluginDependency + 182.IBPluginDependency + 183.IBPluginDependency + 183.IBUIButtonInspectorSelectedStateConfigurationMetadataKey + 184.IBPluginDependency + 184.IBUIButtonInspectorSelectedStateConfigurationMetadataKey + 185.CustomClassName + 185.IBPluginDependency + 185.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 29.CustomClassName 29.IBPluginDependency 30.CustomClassName 30.IBPluginDependency + 30.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 31.CustomClassName 31.IBPluginDependency + 31.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 33.CustomClassName 33.IBPluginDependency + 33.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 34.CustomClassName 34.IBPluginDependency + 34.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 35.CustomClassName 35.IBPluginDependency + 35.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 36.CustomClassName 36.IBPluginDependency + 36.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 37.CustomClassName 37.IBPluginDependency + 37.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 38.CustomClassName 38.IBPluginDependency + 38.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 39.CustomClassName 39.IBPluginDependency + 39.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 4.IBPluginDependency 40.CustomClassName 40.IBPluginDependency + 40.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 41.CustomClassName 41.IBPluginDependency - 5.CustomClassName - 5.IBPluginDependency - 5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - 80.IBPluginDependency + 41.IBUIButtonInspectorSelectedStateConfigurationMetadataKey YES @@ -908,56 +1011,54 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - YES - - - 412 - 1 - - - - 65 - 1 - - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIEraseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UICallButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIDigitButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UICallButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -972,7 +1073,7 @@ - 169 + 186 0 @@ -995,21 +1096,73 @@ YES YES - clavier-01-106px.png - clavier-01-108px.png - clavier-01-160px.png - effacer.png - startcall-gray.png - startcall-green.png + 0-actif.png + 0-over.png + 1-actif.png + 1-over.png + 2-actif.png + 2-over.png + 3-actif.png + 4-actif.png + 4-over.png + 5-actif.png + 5-over.png + 6-actif.png + 6-over.png + 7-actif.png + 7-over.png + 8-actif.png + 8-over.png + 9-actif.png + 9-over.png + add-contact-actif.png + add-contact-inactif.png + add-contact-over.png + appeler-actif.png + appeler-over.png + backspace-actif.png + backspace-over.png + champ-saisie-numero.png + diese-actif.png + diese-over.png + etoile-actif.png + etoile-over.png + fond-clavier.png YES - {106, 60} - {108, 60} - {160, 60} - {66, 65} - {60, 52} - {60, 52} + {220, 113} + {220, 113} + {210, 113} + {210, 113} + {220, 113} + {220, 113} + {210, 113} + {210, 113} + {210, 113} + {220, 113} + {220, 113} + {210, 113} + {210, 113} + {210, 113} + {210, 113} + {220, 113} + {220, 113} + {210, 113} + {210, 113} + {210, 143} + {210, 143} + {210, 143} + {220, 143} + {220, 143} + {210, 143} + {210, 143} + {640, 135} + {210, 113} + {210, 113} + {210, 113} + {210, 113} + {640, 523} 1181 diff --git a/Resources/add-contact-actif.png b/Resources/add-contact-actif.png new file mode 100644 index 000000000..2a3f3f6c0 Binary files /dev/null and b/Resources/add-contact-actif.png differ diff --git a/Resources/add-contact-inactif.png b/Resources/add-contact-inactif.png new file mode 100644 index 000000000..812fd0aef Binary files /dev/null and b/Resources/add-contact-inactif.png differ diff --git a/Resources/add-contact-over.png b/Resources/add-contact-over.png new file mode 100644 index 000000000..8bc6a0fac Binary files /dev/null and b/Resources/add-contact-over.png differ diff --git a/Resources/appeler-actif.png b/Resources/appeler-actif.png new file mode 100644 index 000000000..08f8cc948 Binary files /dev/null and b/Resources/appeler-actif.png differ diff --git a/Resources/appeler-over.png b/Resources/appeler-over.png new file mode 100644 index 000000000..e141b9a67 Binary files /dev/null and b/Resources/appeler-over.png differ diff --git a/Resources/backspace-actif.png b/Resources/backspace-actif.png new file mode 100644 index 000000000..387b1ef83 Binary files /dev/null and b/Resources/backspace-actif.png differ diff --git a/Resources/backspace-over.png b/Resources/backspace-over.png new file mode 100644 index 000000000..8408dae75 Binary files /dev/null and b/Resources/backspace-over.png differ diff --git a/Resources/barre-noire-top.png b/Resources/barre-noire-top.png new file mode 100644 index 000000000..001991fb0 Binary files /dev/null and b/Resources/barre-noire-top.png differ diff --git a/Resources/champ-saisie-numero.png b/Resources/champ-saisie-numero.png new file mode 100644 index 000000000..78be45dbf Binary files /dev/null and b/Resources/champ-saisie-numero.png differ diff --git a/Resources/fond-clavier.png b/Resources/fond-clavier.png new file mode 100644 index 000000000..062a1eca5 Binary files /dev/null and b/Resources/fond-clavier.png differ diff --git a/linphone-Info.plist b/linphone-Info.plist index 45828b413..e0ae92cdc 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -30,7 +30,7 @@ CFBundleVersion 1.3 NSMainNibFile - PhoneMainView + LinphoneApp NSMainNibFile~ipad MainScreenWithVideoPreview UIApplicationExitsOnSuspend diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index d74ac0cf7..772028bb3 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -283,6 +283,34 @@ 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 */; }; + 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 */; }; + D3ED3E461585FB8C006C0DE4 /* champ-saisie-numero.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E441585FB8C006C0DE4 /* champ-saisie-numero.png */; }; + D3ED3E521585FFFD006C0DE4 /* barre-noire-top.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E511585FFFD006C0DE4 /* barre-noire-top.png */; }; + D3ED3E531585FFFD006C0DE4 /* barre-noire-top.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E511585FFFD006C0DE4 /* barre-noire-top.png */; }; + D3ED3E61158603F5006C0DE4 /* LinphoneStatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E60158603F5006C0DE4 /* LinphoneStatusBar.xib */; }; + D3ED3E62158603F5006C0DE4 /* LinphoneStatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E60158603F5006C0DE4 /* LinphoneStatusBar.xib */; }; + D3ED3E6515860404006C0DE4 /* LinphoneStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E6415860404006C0DE4 /* LinphoneStatusBar.m */; }; + D3ED3E6615860404006C0DE4 /* LinphoneStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E6415860404006C0DE4 /* LinphoneStatusBar.m */; }; + D3ED3E6A15861A53006C0DE4 /* add-contact-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6715861A53006C0DE4 /* add-contact-actif.png */; }; + D3ED3E6B15861A53006C0DE4 /* add-contact-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6715861A53006C0DE4 /* add-contact-actif.png */; }; + D3ED3E6C15861A53006C0DE4 /* add-contact-inactif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6815861A53006C0DE4 /* add-contact-inactif.png */; }; + D3ED3E6D15861A53006C0DE4 /* add-contact-inactif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6815861A53006C0DE4 /* add-contact-inactif.png */; }; + D3ED3E6E15861A53006C0DE4 /* add-contact-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6915861A53006C0DE4 /* add-contact-over.png */; }; + D3ED3E6F15861A53006C0DE4 /* add-contact-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6915861A53006C0DE4 /* add-contact-over.png */; }; + D3ED3E7215861ABD006C0DE4 /* appeler-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E7015861ABD006C0DE4 /* appeler-actif.png */; }; + D3ED3E7315861ABD006C0DE4 /* appeler-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E7015861ABD006C0DE4 /* appeler-actif.png */; }; + D3ED3E7415861ABD006C0DE4 /* appeler-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E7115861ABD006C0DE4 /* appeler-over.png */; }; + D3ED3E7515861ABD006C0DE4 /* appeler-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E7115861ABD006C0DE4 /* appeler-over.png */; }; + D3ED3E7815861B1B006C0DE4 /* backspace-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E7615861B1B006C0DE4 /* backspace-actif.png */; }; + 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 */; }; 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 */; }; @@ -391,6 +419,10 @@ D3F83F891582278D00336684 /* contact-actif-add-call.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F821582278D00336684 /* contact-actif-add-call.png */; }; D3F83F8A1582278D00336684 /* contact-over-add-call.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F831582278D00336684 /* contact-over-add-call.png */; }; D3F83F8B1582278D00336684 /* contact-over-add-call.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F831582278D00336684 /* contact-over-add-call.png */; }; + D3F83F8E15822ABE00336684 /* PhoneMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83F8D15822ABD00336684 /* PhoneMainView.m */; }; + D3F83F8F15822ABE00336684 /* PhoneMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83F8D15822ABD00336684 /* PhoneMainView.m */; }; + D3F83F9215824D3600336684 /* LinphoneApp.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F9115824D3500336684 /* LinphoneApp.xib */; }; + D3F83F9315824D3600336684 /* LinphoneApp.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F9115824D3500336684 /* LinphoneApp.xib */; }; F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; }; F476004C147AAF4600FFF19B /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB8F147555C800DEE054 /* libmediastreamer.a */; }; /* End PBXBuildFile section */ @@ -788,6 +820,22 @@ 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 = ""; }; + 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 = ""; }; + D3ED3E60158603F5006C0DE4 /* LinphoneStatusBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneStatusBar.xib; sourceTree = ""; }; + D3ED3E6315860404006C0DE4 /* LinphoneStatusBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneStatusBar.h; sourceTree = ""; }; + D3ED3E6415860404006C0DE4 /* LinphoneStatusBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneStatusBar.m; sourceTree = ""; }; + D3ED3E6715861A53006C0DE4 /* add-contact-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "add-contact-actif.png"; path = "Resources/add-contact-actif.png"; sourceTree = ""; }; + D3ED3E6815861A53006C0DE4 /* add-contact-inactif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "add-contact-inactif.png"; path = "Resources/add-contact-inactif.png"; sourceTree = ""; }; + D3ED3E6915861A53006C0DE4 /* add-contact-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "add-contact-over.png"; path = "Resources/add-contact-over.png"; sourceTree = ""; }; + D3ED3E7015861ABD006C0DE4 /* appeler-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "appeler-actif.png"; path = "Resources/appeler-actif.png"; sourceTree = ""; }; + 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 = ""; }; 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 = ""; }; @@ -843,6 +891,9 @@ D3F83F811582278D00336684 /* cancel-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cancel-over.png"; path = "Resources/cancel-over.png"; sourceTree = ""; }; D3F83F821582278D00336684 /* contact-actif-add-call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contact-actif-add-call.png"; path = "Resources/contact-actif-add-call.png"; sourceTree = ""; }; D3F83F831582278D00336684 /* contact-over-add-call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contact-over-add-call.png"; path = "Resources/contact-over-add-call.png"; sourceTree = ""; }; + D3F83F8C158229C500336684 /* PhoneMainView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhoneMainView.h; sourceTree = ""; }; + D3F83F8D15822ABD00336684 /* PhoneMainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhoneMainView.m; sourceTree = ""; }; + D3F83F9115824D3500336684 /* LinphoneApp.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneApp.xib; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -970,6 +1021,7 @@ D3F83EE91582021700336684 /* InCallViewController.h */, D3F83EEA1582021700336684 /* InCallViewController.m */, D3F83EEB1582021700336684 /* InCallViewController.xib */, + D3F83F9115824D3500336684 /* LinphoneApp.xib */, 1D3623240D0F684500981E51 /* LinphoneAppDelegate.h */, 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */, 2214EB7012F84668002A5394 /* LinphoneUI */, @@ -979,6 +1031,8 @@ 22E0A81D111C44E100B04932 /* MoreViewController.h */, 22E0A81C111C44E100B04932 /* MoreViewController.m */, 22E0A81B111C44E100B04932 /* MoreViewController.xib */, + D3F83F8C158229C500336684 /* PhoneMainView.h */, + D3F83F8D15822ABD00336684 /* PhoneMainView.m */, D34734791580DDF1003C7B8C /* PhoneMainView.xib */, 3422AA5214978352000D4E8A /* PhoneViewController-ipad.xib */, 22F2508B107141E100AC9B3F /* PhoneViewController.h */, @@ -1205,35 +1259,41 @@ 2214EB7012F84668002A5394 /* LinphoneUI */ = { isa = PBXGroup; children = ( - 340751E5150F38FC00B89C47 /* UIToggleVideoButton.h */, - 340751E6150F38FD00B89C47 /* UIToggleVideoButton.m */, - 2248E90C12F7E4CF00220D9C /* UIDigitButton.h */, - 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */, + 223963151393CFAE001DE689 /* FastAddressBook.h */, + 223963161393CFAF001DE689 /* FastAddressBook.m */, + D3ED3E841586291B006C0DE4 /* LinphoneMainBar.h */, + D3ED3E851586291B006C0DE4 /* LinphoneMainBar.m */, + D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */, 2248E99D12F801C200220D9C /* LinphoneManager.h */, 2248E99E12F801C200220D9C /* LinphoneManager.m */, - 2214EB7812F846B1002A5394 /* UICallButton.h */, - 2214EB7912F846B1002A5394 /* UICallButton.m */, - 2214EB8712F84EBB002A5394 /* UIHangUpButton.h */, - 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */, - 2214EB8A12F84FE9002A5394 /* UILinphone.h */, - 2214EBD812F8558F002A5394 /* UIToggleButton.h */, - 2214EBD912F8558F002A5394 /* UIToggleButton.m */, - 2214EBF112F86360002A5394 /* UIMuteButton.h */, - 2214EBF212F86360002A5394 /* UIMuteButton.m */, - 22968A5D12F875C600588287 /* UISpeakerButton.h */, - 22968A5E12F875C600588287 /* UISpeakerButton.m */, - 22968A8612F87C2000588287 /* UIDuration.h */, - 22968A8712F87C2000588287 /* UIDuration.m */, + D3ED3E6315860404006C0DE4 /* LinphoneStatusBar.h */, + D3ED3E6415860404006C0DE4 /* LinphoneStatusBar.m */, + D3ED3E60158603F5006C0DE4 /* LinphoneStatusBar.xib */, 2218A5C412F9597B0088A667 /* LinphoneUIDelegates.h */, 2218A5CE12F973450088A667 /* LogView.h */, 22C7555E1317E59C007BC101 /* UIBluetoothButton.h */, 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */, - 22BB1A67132FF16A005CD7AA /* UIEraseButton.h */, - 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */, - 223963151393CFAE001DE689 /* FastAddressBook.h */, - 223963161393CFAF001DE689 /* FastAddressBook.m */, + 2214EB7812F846B1002A5394 /* UICallButton.h */, + 2214EB7912F846B1002A5394 /* UICallButton.m */, 22AA8AFF13D83F6300B30535 /* UICamSwitch.h */, 22AA8B0013D83F6300B30535 /* UICamSwitch.m */, + 2248E90C12F7E4CF00220D9C /* UIDigitButton.h */, + 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */, + 22968A8612F87C2000588287 /* UIDuration.h */, + 22968A8712F87C2000588287 /* UIDuration.m */, + 22BB1A67132FF16A005CD7AA /* UIEraseButton.h */, + 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */, + 2214EB8712F84EBB002A5394 /* UIHangUpButton.h */, + 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */, + 2214EB8A12F84FE9002A5394 /* UILinphone.h */, + 2214EBF112F86360002A5394 /* UIMuteButton.h */, + 2214EBF212F86360002A5394 /* UIMuteButton.m */, + 22968A5D12F875C600588287 /* UISpeakerButton.h */, + 22968A5E12F875C600588287 /* UISpeakerButton.m */, + 2214EBD812F8558F002A5394 /* UIToggleButton.h */, + 2214EBD912F8558F002A5394 /* UIToggleButton.m */, + 340751E5150F38FC00B89C47 /* UIToggleVideoButton.h */, + 340751E6150F38FD00B89C47 /* UIToggleVideoButton.m */, ); path = LinphoneUI; sourceTree = ""; @@ -1393,14 +1453,6 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - D3F83F801582278D00336684 /* cancel-actif.png */, - D3F83F811582278D00336684 /* cancel-over.png */, - D3F83F821582278D00336684 /* contact-actif-add-call.png */, - D3F83F831582278D00336684 /* contact-over-add-call.png */, - D3F83F741582253100336684 /* decrocher-actif.png */, - D3F83F751582253100336684 /* decrocher-over.png */, - D3F83F761582253100336684 /* refuser-actif.png */, - D3F83F771582253100336684 /* refuser-over.png */, D3F83F2C1582223B00336684 /* 0-actif.png */, D3F83F2D1582223B00336684 /* 0-over.png */, D3F83F2E1582223B00336684 /* 1-actif.png */, @@ -1421,55 +1473,49 @@ D3F83F3D1582223B00336684 /* 8-over.png */, D3F83F3E1582223B00336684 /* 9-actif.png */, D3F83F3F1582223B00336684 /* 9-over.png */, - D3F83F401582223B00336684 /* diese-actif.png */, - D3F83F411582223B00336684 /* diese-over.png */, - D3F83F421582223B00336684 /* etoile-actif.png */, - D3F83F431582223B00336684 /* etoile-over.png */, D3F83EF0158205A100336684 /* add-call-actif.png */, D3F83EF1158205A100336684 /* add-call-over.png */, - D3F83EF2158205A100336684 /* dialer-meteo-sortir-actif.png */, - D3F83EF3158205A100336684 /* dialer-meteo-sortir-over.png */, - D3F83EF4158205A100336684 /* micro-OFF-actif.png */, - D3F83EF5158205A100336684 /* micro-OFF-over.png */, - D3F83EF6158205A100336684 /* micro-ON-actif.png */, - D3F83EF7158205A100336684 /* micro-ON-over.png */, - D3F83EF8158205A100336684 /* pause-actif.png */, - D3F83EF9158205A100336684 /* pause-over.png */, - D3F83EFA158205A100336684 /* raccrocher-actif.png */, - D3F83EFB158205A100336684 /* raccrocher-over.png */, - D3F83EFC158205A100336684 /* speacker-OFF-actif.png */, - D3F83EFD158205A100336684 /* speacker-OFF-over.png */, - D3F83EFE158205A100336684 /* speacker-ON-actif.png */, - D3F83EFF158205A100336684 /* speacker-ON-over.png */, - D3F83F00158205A100336684 /* video-OFF-actif.png */, - D3F83F01158205A100336684 /* video-OFF-over.png */, - D3F83F02158205A100336684 /* video-ON-actif.png */, - D3F83F03158205A100336684 /* video-ON-over.png */, - D38327FC158100E400FA0D23 /* contacts-over.png */, - D38327FD158100E400FA0D23 /* history-over.png */, - D38327FE158100E400FA0D23 /* settings-over.png */, - D38327FF158100E400FA0D23 /* tchat-over.png */, - D38327EB1580FE3A00FA0D23 /* contacts-actif.png */, - D38327EC1580FE3A00FA0D23 /* contacts-selectionne.png */, - D38327ED1580FE3A00FA0D23 /* dialer-actif.png */, - D38327EE1580FE3A00FA0D23 /* dialer-over.png */, - D38327EF1580FE3A00FA0D23 /* settings-actif.png */, - D38327F01580FE3A00FA0D23 /* settings-selectionne.png */, - D38327F11580FE3A00FA0D23 /* tchat-actif.png */, - D38327F21580FE3A00FA0D23 /* tchat-selectionne.png */, - D347347C1580E5F8003C7B8C /* history-actif.png */, - D347347D1580E5F8003C7B8C /* history-selectionne.png */, + D3ED3E6715861A53006C0DE4 /* add-contact-actif.png */, + D3ED3E6815861A53006C0DE4 /* add-contact-inactif.png */, + D3ED3E6915861A53006C0DE4 /* add-contact-over.png */, 2211DBCA1476BE7300DEE054 /* ajouter.png */, + D3ED3E7015861ABD006C0DE4 /* appeler-actif.png */, + D3ED3E7115861ABD006C0DE4 /* appeler-over.png */, + D3ED3E7615861B1B006C0DE4 /* backspace-actif.png */, + D3ED3E7715861B1B006C0DE4 /* backspace-over.png */, + D3ED3E511585FFFD006C0DE4 /* barre-noire-top.png */, + 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 */, + D3F83F741582253100336684 /* decrocher-actif.png */, + D3F83F751582253100336684 /* decrocher-over.png */, + D38327ED1580FE3A00FA0D23 /* dialer-actif.png */, + D3F83EF2158205A100336684 /* dialer-meteo-sortir-actif.png */, + D3F83EF3158205A100336684 /* dialer-meteo-sortir-over.png */, 34C7646A14CD5585008E9607 /* dialer-orange.png */, + D38327EE1580FE3A00FA0D23 /* dialer-over.png */, + D3F83F401582223B00336684 /* diese-actif.png */, + D3F83F411582223B00336684 /* diese-over.png */, 2211DBCD1476BE7300DEE054 /* effacer.png */, + D3F83F421582223B00336684 /* etoile-actif.png */, + D3F83F431582223B00336684 /* etoile-over.png */, + D3ED3E401585FB4A006C0DE4 /* fond-clavier.png */, 2211DBCE1476BE7300DEE054 /* grouper.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 */, @@ -1481,6 +1527,10 @@ 8D1107310486CEB800E47090 /* linphone-Info.plist */, 2274550710700509006EC466 /* linphonerc */, 341FCA8D149798210084BC26 /* linphonerc-ipad */, + D3F83EF4158205A100336684 /* micro-OFF-actif.png */, + D3F83EF5158205A100336684 /* micro-OFF-over.png */, + D3F83EF6158205A100336684 /* micro-ON-actif.png */, + D3F83EF7158205A100336684 /* micro-ON-over.png */, 2211DBD21476BE7300DEE054 /* micro.png */, 2211DBD11476BE7300DEE054 /* micro_inverse.png */, 22E19E47138A67A000FBFE87 /* missed_call.png */, @@ -1489,11 +1539,24 @@ 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 */, + 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 */, + D3F83EFC158205A100336684 /* speacker-OFF-actif.png */, + 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 */, @@ -1506,7 +1569,14 @@ 3418845114C6F66F00EA48C7 /* status_orange.png */, 3418845214C6F66F00EA48C7 /* status_red.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 */, + D3F83F03158205A100336684 /* video-ON-over.png */, ); name = Resources; sourceTree = ""; @@ -1728,6 +1798,19 @@ D3F83F861582278D00336684 /* cancel-over.png in Resources */, D3F83F881582278D00336684 /* contact-actif-add-call.png in Resources */, D3F83F8A1582278D00336684 /* contact-over-add-call.png in Resources */, + D3F83F9215824D3600336684 /* LinphoneApp.xib in Resources */, + D3ED3E411585FB4A006C0DE4 /* fond-clavier.png in Resources */, + D3ED3E451585FB8C006C0DE4 /* champ-saisie-numero.png in Resources */, + D3ED3E521585FFFD006C0DE4 /* barre-noire-top.png in Resources */, + D3ED3E61158603F5006C0DE4 /* LinphoneStatusBar.xib in Resources */, + D3ED3E6A15861A53006C0DE4 /* add-contact-actif.png in Resources */, + D3ED3E6C15861A53006C0DE4 /* add-contact-inactif.png in Resources */, + D3ED3E6E15861A53006C0DE4 /* add-contact-over.png in Resources */, + D3ED3E7215861ABD006C0DE4 /* appeler-actif.png in Resources */, + D3ED3E7415861ABD006C0DE4 /* appeler-over.png in Resources */, + D3ED3E7815861B1B006C0DE4 /* backspace-actif.png in Resources */, + D3ED3E7A15861B1B006C0DE4 /* backspace-over.png in Resources */, + D3ED3E891586291E006C0DE4 /* LinphoneMainBar.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1849,6 +1932,19 @@ D3F83F871582278D00336684 /* cancel-over.png in Resources */, D3F83F891582278D00336684 /* contact-actif-add-call.png in Resources */, D3F83F8B1582278D00336684 /* contact-over-add-call.png in Resources */, + D3F83F9315824D3600336684 /* LinphoneApp.xib in Resources */, + D3ED3E421585FB4A006C0DE4 /* fond-clavier.png in Resources */, + D3ED3E461585FB8C006C0DE4 /* champ-saisie-numero.png in Resources */, + D3ED3E531585FFFD006C0DE4 /* barre-noire-top.png in Resources */, + D3ED3E62158603F5006C0DE4 /* LinphoneStatusBar.xib in Resources */, + D3ED3E6B15861A53006C0DE4 /* add-contact-actif.png in Resources */, + D3ED3E6D15861A53006C0DE4 /* add-contact-inactif.png in Resources */, + D3ED3E6F15861A53006C0DE4 /* add-contact-over.png in Resources */, + D3ED3E7315861ABD006C0DE4 /* appeler-actif.png in Resources */, + D3ED3E7515861ABD006C0DE4 /* appeler-over.png in Resources */, + D3ED3E7915861B1B006C0DE4 /* backspace-actif.png in Resources */, + D3ED3E7B15861B1B006C0DE4 /* backspace-over.png in Resources */, + D3ED3E8A1586291E006C0DE4 /* LinphoneMainBar.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1888,6 +1984,9 @@ 340751E7150F38FD00B89C47 /* UIToggleVideoButton.m in Sources */, 34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */, D3F83EEC1582021700336684 /* InCallViewController.m in Sources */, + D3F83F8E15822ABE00336684 /* PhoneMainView.m in Sources */, + D3ED3E6515860404006C0DE4 /* LinphoneStatusBar.m in Sources */, + D3ED3E871586291E006C0DE4 /* LinphoneMainBar.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1924,6 +2023,9 @@ 340751E8150F38FD00B89C47 /* UIToggleVideoButton.m in Sources */, 34216F411547EBCD00EA9777 /* VideoZoomHandler.m in Sources */, D3F83EED1582021700336684 /* InCallViewController.m in Sources */, + D3F83F8F15822ABE00336684 /* PhoneMainView.m in Sources */, + D3ED3E6615860404006C0DE4 /* LinphoneStatusBar.m in Sources */, + D3ED3E881586291E006C0DE4 /* LinphoneMainBar.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/main.m b/main.m index 48d5527bf..9452dda25 100644 --- a/main.m +++ b/main.m @@ -18,6 +18,7 @@ */ #import +#import "LinphoneAppDelegate.h" int main(int argc, char *argv[]) {