Continue workoing on new ui

Use event for registration update
2026-05-07 05:53:06 +00:00 · 2012-06-13 13:49:20 +02:00 · 2012-06-13 13:49:20 +02:00 · 075c6f6a0a
commit 075c6f6a0a
parent 85eadac3ce
26 changed files with 2344 additions and 2715 deletions
--- a/Classes/ConferenceCallDetailView.m
+++ b/Classes/ConferenceCallDetailView.m
@ -136,8 +136,8 @@ NSTimer *callQualityRefresher;
    UILabel* label = (UILabel*) [cell viewWithTag:2];
    
    /* update cell content */
-	LinphoneCall* call = [IncallViewController retrieveCallAtIndex:indexPath.row inConference:YES];
-    [IncallViewController updateCellImageView:image Label:label DetailLabel:nil AndAccessoryView:nil withCall:call];
+	LinphoneCall* call = [InCallViewController retrieveCallAtIndex:indexPath.row inConference:YES];
+    [InCallViewController updateCellImageView:image Label:label DetailLabel:nil AndAccessoryView:nil withCall:call];
    
 	cell.accessoryType = UITableViewCellAccessoryNone;
 	if (cell.accessoryView == nil) {
@ -150,7 +150,7 @@ NSTimer *callQualityRefresher;
 		}
 	}
 	UIImageView* callquality = (UIImageView*) [cell viewWithTag:3];
-    [IncallViewController updateIndicator:callquality withCallQuality:linphone_call_get_average_quality(call)];
+    [InCallViewController updateIndicator:callquality withCallQuality:linphone_call_get_average_quality(call)];
    tableView.rowHeight = 80;
    
    return cell;
--- a/Classes/ContactTableViewController.h
+++ b/Classes/ContactTableViewController.h
@ -20,9 +20,10 @@
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
 #import <AddressBook/AddressBook.h>
+#import "OrderedDictionary.h"

@interface ContactTableViewController : UITableViewController {
-    NSMutableDictionary* addressBookMap;  
+    OrderedDictionary* addressBookMap;
    
    ABAddressBookRef addressBook;
 }
--- a/Classes/ContactTableViewController.m
+++ b/Classes/ContactTableViewController.m
@ -18,26 +18,21 @@
 */     

 #include "ContactTableViewController.h"
-#import "LinphoneManager.h"
 #import "FastAddressBook.h"
 #import "ContactCell.h"

@implementation ContactTableViewController

 #pragma mark Table view methods
-NSString *contactTOC = @"ABCDEFGHIJKLMNOPQRSTUVWXYZ";

 void sync_toc_address_book (ABAddressBookRef addressBook, CFDictionaryRef info, void *context) {
    ContactTableViewController* controller = (ContactTableViewController*)context;
-    NSMutableDictionary* lAddressBookMap = controller->addressBookMap;
+    OrderedDictionary* lAddressBookMap = controller->addressBookMap;
    @synchronized (lAddressBookMap) {
        
        // Reset Address book
+        
        [lAddressBookMap removeAllObjects];
-
-        for(int i = 0; i < [contactTOC length]; i++) {
-            [lAddressBookMap setObject: [[NSMutableDictionary alloc] init] forKey:[contactTOC substringWithRange:NSMakeRange(i, 1)]];
-        }
         
        NSArray *lContacts = (NSArray *)ABAddressBookCopyArrayOfAllPeople(addressBook);
        for (id lPerson in lContacts) {
@ -46,34 +41,34 @@ void sync_toc_address_book (ABAddressBookRef addressBook, CFDictionaryRef info,
                
            // Put in correct subDic
            NSString *firstChar = [[(NSString *)lLocalizedLabel substringToIndex:1] uppercaseString];
-            NSMutableDictionary *subDic =[lAddressBookMap objectForKey: firstChar];
+            OrderedDictionary *subDic =[lAddressBookMap objectForKey: firstChar];
            if(subDic == nil) {
-                subDic = [[NSMutableDictionary alloc] init];
-                [lAddressBookMap setObject: subDic forKey:firstChar];
+                subDic = [[OrderedDictionary alloc] init];
+                [lAddressBookMap insertObject:subDic forKey:firstChar selector:@selector(caseInsensitiveCompare:)];
            }
-            [subDic setObject:lPerson forKey:[(NSString *)lLocalizedLabel retain]];
+            [subDic insertObject:lPerson forKey:[(NSString *)lLocalizedLabel retain] selector:@selector(caseInsensitiveCompare:)];
                
            if (lLocalizedLabel) CFRelease(lLocalizedLabel);
            CFRelease(lValue);
        }
        CFRelease(lContacts);
    }
-    [controller.view reloadData];
+    [(UITableView *)controller.view reloadData];
 }

 - (void) viewDidLoad {
-    addressBookMap  = [[NSMutableDictionary alloc] init];
+    addressBookMap  = [[OrderedDictionary alloc] init];
    addressBook = ABAddressBookCreate();
    ABAddressBookRegisterExternalChangeCallback (addressBook, sync_toc_address_book, self);
    sync_toc_address_book(addressBook, nil, self);
 }

 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return [contactTOC length];
+    return [addressBookMap count];
 }

 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return [(NSMutableDictionary *)[addressBookMap objectForKey: [contactTOC substringWithRange:NSMakeRange(section, 1)]] count];
+    return [(OrderedDictionary *)[addressBookMap objectForKey: [addressBookMap keyAtIndex: section]] count];
 }

 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@ -82,17 +77,19 @@ void sync_toc_address_book (ABAddressBookRef addressBook, CFDictionaryRef info,
        cell = [[ContactCell alloc] init];
    }
    
-    NSMutableDictionary *subDic = [addressBookMap objectForKey: [contactTOC substringWithRange:NSMakeRange([indexPath section], 1)]]; 
+    OrderedDictionary *subDic = [addressBookMap objectForKey: [addressBookMap keyAtIndex: [indexPath section]]]; 
    
    [cell.label setText: (NSString *)[[subDic allKeys] objectAtIndex:[indexPath row]]];
    return cell;
 }

 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-    return [contactTOC substringWithRange:NSMakeRange(section, 1)];
+    return [addressBookMap keyAtIndex: section];
 }

 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    OrderedDictionary *subDic = [addressBookMap objectForKey: [addressBookMap keyAtIndex: [indexPath section]]]; 
+    ABRecordRef lPerson = [subDic objectForKey: [subDic keyAtIndex:[indexPath row]]];
 }

 - (void)dealloc {
--- a/Classes/FirstLoginViewController.h
+++ b/Classes/FirstLoginViewController.h
@ -22,7 +22,7 @@
 #import "LinphoneUIDelegates.h"


-@interface FirstLoginViewController : UIViewController <UITextFieldDelegate,LinphoneUIRegistrationDelegate>{
+@interface FirstLoginViewController : UIViewController <UITextFieldDelegate>{
 	UIButton* ok;
 	UIButton* site;
 	UITextField* username;
--- a/Classes/FirstLoginViewController.m
+++ b/Classes/FirstLoginViewController.m
@ -29,8 +29,6 @@
@synthesize activityIndicator;
@synthesize site;

-
-
 - (void)viewDidAppear:(BOOL)animated { 
    [super viewDidAppear:animated];
 	//[username setText:[[NSUserDefaults standardUserDefaults] stringForKey:@"username_preference"]];
@ -43,18 +41,65 @@
 		siteUrl=@"http://www.linphone.org";
 	}
 	[site setTitle:siteUrl forState:UIControlStateNormal];
+    
+    // Set observer
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationUpdate:) name:@"LinphoneRegistrationUpdate" object:nil];
 	
 }

+- (void)registrationUpdate: (NSNotification*) notif {  
+    LinphoneRegistrationState state = [[notif.userInfo objectForKey: @"state"] intValue];
+    switch (state) {
+        case LinphoneRegistrationOk: 
+        {
+            [[NSUserDefaults standardUserDefaults] setBool:false forKey:@"enable_first_login_view_preference"]; 
+            [self.activityIndicator setHidden:true];
+            [self dismissModalViewControllerAnimated:YES];
+            break;
+        }
+        case LinphoneRegistrationNone: 
+        case LinphoneRegistrationCleared:
+        {
+            [self.activityIndicator setHidden:true];	
+            break;
+        }
+        case LinphoneRegistrationFailed: 
+        {
+            [self.activityIndicator setHidden:true];
+            //default behavior if no registration delegates
+            
+            //UIAlertView* error = [[UIAlertView alloc]	initWithTitle:[NSString stringWithFormat:@"Registration failure for user %@",user]
+            //												message:reason
+            //											   delegate:nil 
+            //									  cancelButtonTitle:@"Continue" 
+            //									  otherButtonTitles:nil ,nil];
+            //[error show];
+            //[error release];
+            //erase uername passwd
+            [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"username_preference"];
+            [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"password_preference"];
+            break;
+        }
+        case LinphoneRegistrationProgress: {
+            [self.activityIndicator setHidden:false];
+            break;
+        }
+        default: break;
+    }
+}
+
 - (void)dealloc {
    [super dealloc];
 	[ok dealloc];
 	[site dealloc];
 	[username dealloc];
 	[activityIndicator dealloc];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }

-
+- (void) viewDidUnload {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}

 -(void) doOk:(id)sender {
 	if (sender == site) {
@ -87,33 +132,6 @@
 	
 	
 }
-(void) displayRegisteredFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {
-	[[NSUserDefaults standardUserDefaults] setBool:false forKey:@"enable_first_login_view_preference"]; 
-	[self.activityIndicator setHidden:true];
-	[self dismissModalViewControllerAnimated:YES];
-}
-(void) displayRegisteringFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {
-	[self.activityIndicator setHidden:false];
-}
-(void) displayRegistrationFailedFromUI:(UIViewController*) viewCtrl forUser:(NSString*) user withDisplayName:(NSString*) displayName onDomain:(NSString*)domain forReason:(NSString*) reason {
-	[self.activityIndicator setHidden:true];
-	//default behavior if no registration delegates
-	
-	//UIAlertView* error = [[UIAlertView alloc]	initWithTitle:[NSString stringWithFormat:@"Registration failure for user %@",user]
-	//												message:reason
-	//											   delegate:nil 
-	//									  cancelButtonTitle:@"Continue" 
-	//									  otherButtonTitles:nil ,nil];
-	//[error show];
-    //[error release];
-	//erase uername passwd
-	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"username_preference"];
-	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"password_preference"];
-}
-(void) displayNotRegisteredFromUI:(UIViewController*) viewCtrl { 
-	[self.activityIndicator setHidden:true];	
-}
-

 - (BOOL)textFieldShouldReturn:(UITextField *)theTextField {
    // When the user presses return, take focus away from the text field so that the keyboard is dismissed.
--- a/Classes/InCallViewController.h
+++ b/Classes/InCallViewController.h
@ -26,7 +26,7 @@
 #import "VideoZoomHandler.h"
@class VideoViewController;

-@interface IncallViewController : UIViewController <ABPeoplePickerNavigationControllerDelegate,LinphoneUICallDelegate, UITableViewDelegate, UITableViewDataSource, UIActionSheetCustomDelegate> {
+@interface InCallViewController : UIViewController <ABPeoplePickerNavigationControllerDelegate,LinphoneUICallDelegate, UITableViewDelegate, UITableViewDataSource, UIActionSheetCustomDelegate> {
 	
 	
 	UIView* controlSubView, *hangUpView;
--- a/Classes/InCallViewController.m
+++ b/Classes/InCallViewController.m
@ -35,7 +35,7 @@

 const NSInteger SECURE_BUTTON_TAG=5;

-@implementation IncallViewController
+@implementation InCallViewController

@synthesize controlSubView;
@synthesize padSubView;
@ -360,7 +360,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
            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)];
+                    [InCallViewController updateIndicator: videoCallQuality withCallQuality:linphone_call_get_average_quality(currentCall)];
                } else {
                    [addVideo setTitle:NSLocalizedString(@"+video", nil) forState:UIControlStateNormal];
                }
@ -720,7 +720,7 @@ static void hideSpinner(LinphoneCall* lc, void* user_data);
 }

 static void hideSpinner(LinphoneCall* call, void* user_data) {
-    IncallViewController* thiz = (IncallViewController*) user_data;
+    InCallViewController* thiz = (InCallViewController*) user_data;
    [thiz hideSpinnerIndicator:call];
 }

@ -1027,7 +1027,7 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
        else
            cell.accessoryType = UITableViewCellAccessoryNone;
    } else {
-        LinphoneCall* call = [IncallViewController retrieveCallAtIndex:indexPath.row inConference:NO];
+        LinphoneCall* call = [InCallViewController retrieveCallAtIndex:indexPath.row inConference:NO];
 		if (call == nil)
            return cell; // return dummy cell
 		LinphoneMediaEncryption enc = linphone_call_params_get_media_encryption(linphone_call_get_current_params(call));
@ -1040,7 +1040,7 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
 				[view removeFromSuperview];
 			}
 		}
-        [IncallViewController updateCellImageView:cell.imageView Label:cell.textLabel DetailLabel:cell.detailTextLabel AndAccessoryView:(UIView*)cell.accessoryView withCall:call];
+        [InCallViewController updateCellImageView:cell.imageView Label:cell.textLabel DetailLabel:cell.detailTextLabel AndAccessoryView:(UIView*)cell.accessoryView withCall:call];
        if (linphone_core_get_current_call(lc) == call)
            activeCallCell = cell;
        cell.accessoryType = UITableViewCellAccessoryNone;
@ -1050,7 +1050,7 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
 		[callquality setFrame:CGRectMake(0, 0, 28, 28)];
 		if (call->state == LinphoneCallStreamsRunning) 
 		{
-            [IncallViewController   updateIndicator: callquality withCallQuality:linphone_call_get_average_quality(call)];
+            [InCallViewController   updateIndicator: callquality withCallQuality:linphone_call_get_average_quality(call)];
 		}
 		else {
 			[callquality setImage:nil];
@ -1092,7 +1092,7 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
    CGPoint currentTouchPos = [touch locationInView:self.callTableView];
    NSIndexPath *path = [self.callTableView indexPathForRowAtPoint:currentTouchPos];
    if (path) {
-        LinphoneCall* call = [IncallViewController retrieveCallAtIndex:path.row inConference:NO];
+        LinphoneCall* call = [InCallViewController retrieveCallAtIndex:path.row inConference:NO];
        // start action sheet to validate/unvalidate zrtp code
        CallDelegate* cd = [[CallDelegate alloc] init];
        cd.eventType = CD_ZRTP;
@ -1233,7 +1233,7 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {

    bool inConf = (indexPath.row == 0 && linphone_core_get_conference_size(lc) > 0);
    
-    LinphoneCall* selectedCall = [IncallViewController retrieveCallAtIndex:indexPath.row inConference:inConf];
+    LinphoneCall* selectedCall = [InCallViewController retrieveCallAtIndex:indexPath.row inConference:inConf];
    
    if (inConf) {
        if (linphone_core_is_in_conference(lc))
--- a/Classes/InCallViewController.xib
+++ b/Classes/InCallViewController.xib
--- a/Classes/LinphoneApp.xib
+++ b/Classes/LinphoneApp.xib
@ -42,7 +42,6 @@
 				<string key="NSFrameSize">{320, 480}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@ -81,6 +80,14 @@
 					</object>
 					<int key="connectionID">10</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="465836664"/>
+						<reference key="destination" ref="380026005"/>
+					</object>
+					<int key="connectionID">12</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@ -110,7 +117,7 @@
 						<int key="objectID">4</int>
 						<reference key="object" ref="465836664"/>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">linphoneAppDelegate</string>
+						<string key="objectName">LinphoneAppDelegate</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">9</int>
@ -127,7 +134,7 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<dictionary class="NSMutableDictionary" key="2.IBAttributePlaceholdersKey"/>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="4.CustomClassName">linphoneAppDelegate</string>
+				<string key="4.CustomClassName">LinphoneAppDelegate</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.CustomClassName">PhoneMainView</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -136,38 +143,27 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">11</int>
+			<int key="maxID">12</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
-					<string key="className">ABPeoplePickerNavigationController</string>
-					<string key="superclassName">UINavigationController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ABPeoplePickerNavigationController.h</string>
+					<string key="className">LinphoneAppDelegate</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">window</string>
+						<string key="NS.object.0">UIWindow</string>
 					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MainScreenWithVideoPreview</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="phoneMainView">PhoneViewController</string>
-						<string key="window">UIWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="phoneMainView">
-							<string key="name">phoneMainView</string>
-							<string key="candidateClassName">PhoneViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window">
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">window</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
 							<string key="name">window</string>
 							<string key="candidateClassName">UIWindow</string>
 						</object>
-					</dictionary>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MainScreenWithVideoPreview.h</string>
+						<string key="minorKey">./Classes/LinphoneAppDelegate.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@ -175,10 +171,10 @@
 					<string key="superclassName">UIViewController</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="addCallTabBar">UIView</string>
-						<string key="callTabBar">UIView</string>
+						<string key="callTabBarController">UIViewController</string>
 						<string key="contentView">UIView</string>
-						<string key="incomingTabBar">UIView</string>
-						<string key="mainTabBar">UIView</string>
+						<string key="mainTabBarController">UIViewController</string>
+						<string key="statusBarController">UIViewController</string>
 						<string key="statusBarView">UIView</string>
 						<string key="tabBarView">UIView</string>
 					</dictionary>
@ -187,21 +183,21 @@
 							<string key="name">addCallTabBar</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="callTabBar">
-							<string key="name">callTabBar</string>
-							<string key="candidateClassName">UIView</string>
+						<object class="IBToOneOutletInfo" key="callTabBarController">
+							<string key="name">callTabBarController</string>
+							<string key="candidateClassName">UIViewController</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="contentView">
 							<string key="name">contentView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="incomingTabBar">
-							<string key="name">incomingTabBar</string>
-							<string key="candidateClassName">UIView</string>
+						<object class="IBToOneOutletInfo" key="mainTabBarController">
+							<string key="name">mainTabBarController</string>
+							<string key="candidateClassName">UIViewController</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="mainTabBar">
-							<string key="name">mainTabBar</string>
-							<string key="candidateClassName">UIView</string>
+						<object class="IBToOneOutletInfo" key="statusBarController">
+							<string key="name">statusBarController</string>
+							<string key="candidateClassName">UIViewController</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="statusBarView">
 							<string key="name">statusBarView</string>
@ -217,178 +213,6 @@
 						<string key="minorKey">./Classes/PhoneMainView.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">PhoneViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="address">UITextField</string>
-						<string key="backToCallView">UIButton</string>
-						<string key="callLarge">UIButton</string>
-						<string key="callShort">UIButton</string>
-						<string key="dialerView">UIView</string>
-						<string key="eight">UIButton</string>
-						<string key="erase">UIEraseButton</string>
-						<string key="five">UIButton</string>
-						<string key="four">UIButton</string>
-						<string key="hash">UIButton</string>
-						<string key="mMainScreenWithVideoPreview">MainScreenWithVideoPreview</string>
-						<string key="myTabBarController">UITabBarController</string>
-						<string key="nine">UIButton</string>
-						<string key="one">UIButton</string>
-						<string key="seven">UIButton</string>
-						<string key="six">UIButton</string>
-						<string key="star">UIButton</string>
-						<string key="status">UILabel</string>
-						<string key="statusViewHolder">UIView</string>
-						<string key="switchCamera">UIButton</string>
-						<string key="three">UIButton</string>
-						<string key="two">UIButton</string>
-						<string key="zero">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="address">
-							<string key="name">address</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backToCallView">
-							<string key="name">backToCallView</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="callLarge">
-							<string key="name">callLarge</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="callShort">
-							<string key="name">callShort</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dialerView">
-							<string key="name">dialerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="eight">
-							<string key="name">eight</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="erase">
-							<string key="name">erase</string>
-							<string key="candidateClassName">UIEraseButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="five">
-							<string key="name">five</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="four">
-							<string key="name">four</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="hash">
-							<string key="name">hash</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="mMainScreenWithVideoPreview">
-							<string key="name">mMainScreenWithVideoPreview</string>
-							<string key="candidateClassName">MainScreenWithVideoPreview</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="myTabBarController">
-							<string key="name">myTabBarController</string>
-							<string key="candidateClassName">UITabBarController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="nine">
-							<string key="name">nine</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="one">
-							<string key="name">one</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="seven">
-							<string key="name">seven</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="six">
-							<string key="name">six</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="star">
-							<string key="name">star</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="status">
-							<string key="name">status</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="statusViewHolder">
-							<string key="name">statusViewHolder</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="switchCamera">
-							<string key="name">switchCamera</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="three">
-							<string key="name">three</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="two">
-							<string key="name">two</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="zero">
-							<string key="name">zero</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PhoneViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIEraseButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIEraseButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">linphoneAppDelegate</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="myContentView">UIView</string>
-						<string key="myPeoplePickerController">ABPeoplePickerNavigationController</string>
-						<string key="myPhoneViewController">PhoneViewController</string>
-						<string key="myTabBarController">UITabBarController</string>
-						<string key="window">UIWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="myContentView">
-							<string key="name">myContentView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="myPeoplePickerController">
-							<string key="name">myPeoplePickerController</string>
-							<string key="candidateClassName">ABPeoplePickerNavigationController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="myPhoneViewController">
-							<string key="name">myPhoneViewController</string>
-							<string key="candidateClassName">PhoneViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="myTabBarController">
-							<string key="name">myTabBarController</string>
-							<string key="candidateClassName">UITabBarController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window">
-							<string key="name">window</string>
-							<string key="candidateClassName">UIWindow</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/linphoneAppDelegate.h</string>
-					</object>
-				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
--- a/Classes/LinphoneAppDelegate.h
+++ b/Classes/LinphoneAppDelegate.h
@ -1,4 +1,4 @@
-/* linphoneAppDelegate.h
+/* LinphoneAppDelegate.h
 *
 * Copyright (C) 2009  Belledonne Comunications, Grenoble, France
 *
@ -17,44 +17,22 @@
 *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */                                                                           

-
 #import <UIKit/UIKit.h>
 #import <AddressBookUI/ABPeoplePickerNavigationController.h>
 #import "CoreTelephony/CTCallCenter.h"

-#define DIALER_TAB_INDEX 1
-#define CONTACTS_TAB_INDEX 2
-#define HISTORY_TAB_INDEX 0
-#define MORE_TAB_INDEX 3
-
-@class ContactPickerDelegate;
-@class IncallViewController;
-@class PhoneViewController;
-@class CallHistoryTableViewController;
-
-
-@interface linphoneAppDelegate : NSObject <UIApplicationDelegate,UIAlertViewDelegate> {
+@interface LinphoneAppDelegate : NSObject <UIApplicationDelegate,UIAlertViewDelegate> {
    UIWindow *window;
-	IBOutlet UITabBarController*  myTabBarController;
-	IBOutlet ABPeoplePickerNavigationController* myPeoplePickerController;
-	IBOutlet PhoneViewController* myPhoneViewController;
-	CallHistoryTableViewController* myCallHistoryTableViewController;
-	ContactPickerDelegate* myContactPickerDelegate;
-    UIView *myContentView;
    CTCallCenter* callCenter;
 }

- (void) loadDefaultSettings:(NSDictionary *) appDefaults;
-(void) setupUI;
-(void) setupGSMInteraction;
+- (void)loadDefaultSettings:(NSDictionary *) appDefaults;
+- (void)setupUI;
+- (void)setupGSMInteraction;

-(void) startApplication;
+- (void)startApplication;

@property (nonatomic, retain) IBOutlet UIWindow *window;
-@property (nonatomic, retain) IBOutlet UITabBarController*  myTabBarController;
-@property (nonatomic, retain) ABPeoplePickerNavigationController* myPeoplePickerController;
-@property (nonatomic, retain) IBOutlet PhoneViewController* myPhoneViewController;
-@property (nonatomic, retain) IBOutlet UIView* myContentView;

@end

--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@ -1,4 +1,4 @@
-/* linphoneAppDelegate.m
+/* LinphoneAppDelegate.m
 *
 * Copyright (C) 2009  Belledonne Comunications, Grenoble, France
 *
@ -39,15 +39,11 @@ int __aeabi_idiv(int a, int b) {
 }
 #endif

-@implementation linphoneAppDelegate
+@implementation LinphoneAppDelegate

@synthesize window;
-@synthesize myTabBarController;
-@synthesize myPeoplePickerController;
-@synthesize myPhoneViewController;
-@synthesize myContentView;

-(void) handleGSMCallInteration: (id) cCenter {
+- (void)handleGSMCallInteration: (id) cCenter {
    CTCallCenter* ct = (CTCallCenter*) cCenter;
    
    int callCount = [ct.currentCalls count];
@ -66,7 +62,7 @@ int __aeabi_idiv(int a, int b) {
    }
 }

-(void)applicationWillResignActive:(UIApplication *)application {
+- (void)applicationWillResignActive:(UIApplication *)application {
    LinphoneCore* lc = [LinphoneManager getLc];
    LinphoneCall* call = linphone_core_get_current_call(lc);
    if (call == NULL)
@ -135,7 +131,7 @@ int __aeabi_idiv(int a, int b) {
    }
 }

- (void) loadDefaultSettings:(NSDictionary *) appDefaults {
+- (void)loadDefaultSettings:(NSDictionary *) appDefaults {
    
    NSString *settingsBundle = [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"];
    if(!settingsBundle) {
@ -167,62 +163,13 @@ int __aeabi_idiv(int a, int b) {
    [[NSUserDefaults standardUserDefaults] synchronize];
 }

-(void) setupUI {
+- (void)setupUI {
    
-    /*//as defined in PhoneMainView.xib		
-	//dialer
-	myPhoneViewController = (PhoneViewController*) [myTabBarController.viewControllers objectAtIndex: DIALER_TAB_INDEX];
-	myPhoneViewController.myTabBarController =  myTabBarController;
-	//Call history
-	myCallHistoryTableViewController = [[CallHistoryTableViewController alloc]  initWithNibName:@"CallHistoryTableViewController" 
-																						 bundle:[NSBundle mainBundle]];
-	UINavigationController *aCallHistNavigationController = [[UINavigationController alloc] initWithRootViewController:myCallHistoryTableViewController];
-	aCallHistNavigationController.tabBarItem = [(UIViewController*)[myTabBarController.viewControllers objectAtIndex:HISTORY_TAB_INDEX] tabBarItem];
-	
-	//people picker delegates
-	myContactPickerDelegate = [[ContactPickerDelegate alloc] init];
-	//people picker
-	myPeoplePickerController = [[[ABPeoplePickerNavigationController alloc] init] autorelease];
-	[myPeoplePickerController setDisplayedProperties:[NSArray arrayWithObject:[NSNumber numberWithInt:kABPersonPhoneProperty]]];
-	[myPeoplePickerController setPeoplePickerDelegate:myContactPickerDelegate];
-	//copy tab bar item
-	myPeoplePickerController.tabBarItem = [(UIViewController*)[myTabBarController.viewControllers objectAtIndex:CONTACTS_TAB_INDEX] tabBarItem]; 
-	
-	//more tab 
-	MoreViewController *moreViewController = [[MoreViewController alloc] initWithNibName:@"MoreViewController" bundle:[NSBundle mainBundle]];
-	UINavigationController *aNavigationController = [[UINavigationController alloc] initWithRootViewController:moreViewController];
-    [moreViewController release];
-	//copy tab bar item
-	aNavigationController.tabBarItem = [(UIViewController*)[myTabBarController.viewControllers objectAtIndex:MORE_TAB_INDEX] tabBarItem]; 
-	
-	//insert contact controller
-	NSMutableArray* newArray = [NSMutableArray arrayWithArray:self.myTabBarController.viewControllers];
-	[newArray replaceObjectAtIndex:CONTACTS_TAB_INDEX withObject:myPeoplePickerController];
-	[newArray replaceObjectAtIndex:MORE_TAB_INDEX withObject:aNavigationController];
-    [aNavigationController release];
-	[newArray replaceObjectAtIndex:HISTORY_TAB_INDEX withObject:aCallHistNavigationController];
-    [aCallHistNavigationController release];
-	
-	[myTabBarController setSelectedIndex:DIALER_TAB_INDEX];
-	[myTabBarController setViewControllers:newArray animated:NO];
-	//[window addSubview: myTabBarController.view];
-    [myCallHistoryTableViewController loadView];
-  //  [myContentView addSubview:myCallHistoryTableViewController.view];
-	//[window addSubview: myContentView];
-   // [myContentViewController addChildViewController:myCallHistoryTableViewController];
-
-	[window makeKeyAndVisible];
-	
-	[[LinphoneManager instance] setCallDelegate:myPhoneViewController];
-    
-    [UIDevice currentDevice].batteryMonitoringEnabled = YES;*/
-/*
-    PhoneMainView *mainView = [[PhoneMainView alloc] initWithNibName:@"PhoneMainView" bundle:[NSBundle mainBundle]];
-    [self.window addSubview:mainView.view];
-    [self.window makeKeyAndVisible];*/
+    // Change to default view
+    [[LinphoneManager instance] changeView: PhoneView_Dialer];
 }

-(void) setupGSMInteraction {
+- (void)setupGSMInteraction {
 	callCenter = [[CTCallCenter alloc] init];
    callCenter.callEventHandler = ^(CTCall* call) {
        // post on main thread
@ -257,7 +204,7 @@ int __aeabi_idiv(int a, int b) {
    return YES;
 }

-(void) startApplication {
+- (void)startApplication {
    /* explicitely instanciate LinphoneManager */
    LinphoneManager* lm = [[LinphoneManager alloc] init];
    assert(lm == [LinphoneManager instance]);
@ -276,8 +223,7 @@ int __aeabi_idiv(int a, int b) {
 }

 - (void)dealloc {
-	//[window release];
-	[myPeoplePickerController release];
+	[window release];
 	[super dealloc];
 }

@ -291,6 +237,4 @@ int __aeabi_idiv(int a, int b) {
 	linphone_core_accept_call([LinphoneManager getLc], call);	
 }

-
-
@end
--- a/Classes/LinphoneUI/LinphoneCallBar.h
+++ b/Classes/LinphoneUI/LinphoneCallBar.h
@ -0,0 +1,26 @@
+/* LinphoneCallBar.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 <UIKit/UIKit.h>
+
+@interface LinphoneCallBar : UIViewController {
+    
+}
+
+@end
--- a/Classes/LinphoneUI/LinphoneCallBar.m
+++ b/Classes/LinphoneUI/LinphoneCallBar.m
@ -0,0 +1,24 @@
+/* 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"
+
+@implementation LinphoneCallBar
+
+@end
--- a/Classes/LinphoneUI/LinphoneCallBar.xib
+++ b/Classes/LinphoneUI/LinphoneCallBar.xib
@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">1181</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIView</string>
+			<string>IBUIButton</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="590484871">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">292</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="109354525">
+						<reference key="NSNextResponder" ref="590484871"/>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrameSize">{320, 135}</string>
+						<reference key="NSSuperview" ref="590484871"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1013099198"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MQA</bytes>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
+						</object>
+						<int key="IBUITag">-1</int>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIButton" id="1013099198">
+						<reference key="NSNextResponder" ref="590484871"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrameSize">{80, 67}</string>
+						<reference key="NSSuperview" ref="590484871"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1023772893"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Video</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<object class="NSColor" key="IBUIHighlightedTitleColor" id="855460971">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MQA</bytes>
+						</object>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="829474675">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">video-ON-over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">video-ON-actif.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">video-OFF-actif.png</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="950385486">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="839162475">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
+					<object class="IBUIButton" id="1023772893">
+						<reference key="NSNextResponder" ref="590484871"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{80, 0}, {80, 67}}</string>
+						<reference key="NSSuperview" ref="590484871"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="908144004"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Micro</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIHighlightedTitleColor" ref="855460971"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="829474675"/>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">micro-ON-over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">micro-ON-actif.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">micro-OFF-actif.png</string>
+						</object>
+						<reference key="IBUIFontDescription" ref="950385486"/>
+						<reference key="IBUIFont" ref="839162475"/>
+					</object>
+					<object class="IBUIButton" id="908144004">
+						<reference key="NSNextResponder" ref="590484871"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{160, 0}, {80, 67}}</string>
+						<reference key="NSSuperview" ref="590484871"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1057022694"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Speaker</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIHighlightedTitleColor" ref="855460971"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="829474675"/>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">speacker-ON-over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUISelectedBackgroundImage" id="86150103">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">speacker-OFF-actif.png</string>
+						</object>
+						<reference key="IBUINormalBackgroundImage" ref="86150103"/>
+						<reference key="IBUIFontDescription" ref="950385486"/>
+						<reference key="IBUIFont" ref="839162475"/>
+					</object>
+					<object class="IBUIButton" id="1057022694">
+						<reference key="NSNextResponder" ref="590484871"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{240, 0}, {80, 67}}</string>
+						<reference key="NSSuperview" ref="590484871"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="98146943"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Add call</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIHighlightedTitleColor" ref="855460971"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="829474675"/>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="1002842964">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">add-call-over.png</string>
+						</object>
+						<reference key="IBUISelectedBackgroundImage" ref="1002842964"/>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">add-call-actif.png</string>
+						</object>
+						<reference key="IBUIFontDescription" ref="950385486"/>
+						<reference key="IBUIFont" ref="839162475"/>
+					</object>
+					<object class="IBUIButton" id="98146943">
+						<reference key="NSNextResponder" ref="590484871"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{0, 67}, {105, 68}}</string>
+						<reference key="NSSuperview" ref="590484871"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="616216167"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Pause</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIHighlightedTitleColor" ref="855460971"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="829474675"/>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="106950836">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">pause-over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">pause-actif.png</string>
+						</object>
+						<reference key="IBUINormalBackgroundImage" ref="106950836"/>
+						<reference key="IBUIFontDescription" ref="950385486"/>
+						<reference key="IBUIFont" ref="839162475"/>
+					</object>
+					<object class="IBUIButton" id="616216167">
+						<reference key="NSNextResponder" ref="590484871"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{105, 67}, {111, 68}}</string>
+						<reference key="NSSuperview" ref="590484871"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="583527516"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Hangup</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIHighlightedTitleColor" ref="855460971"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="829474675"/>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="107972492">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">raccrocher-over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">raccrocher-actif.png</string>
+						</object>
+						<reference key="IBUINormalBackgroundImage" ref="107972492"/>
+						<reference key="IBUIFontDescription" ref="950385486"/>
+						<reference key="IBUIFont" ref="839162475"/>
+					</object>
+					<object class="IBUIButton" id="583527516">
+						<reference key="NSNextResponder" ref="590484871"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{215, 67}, {105, 68}}</string>
+						<reference key="NSSuperview" ref="590484871"/>
+						<reference key="NSWindow"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Back</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIHighlightedTitleColor" ref="855460971"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="829474675"/>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="401528858">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">dialer-meteo-sortir-over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">dialer-meteo-sortir-actif.png</string>
+						</object>
+						<reference key="IBUINormalBackgroundImage" ref="401528858"/>
+						<reference key="IBUIFontDescription" ref="950385486"/>
+						<reference key="IBUIFont" ref="839162475"/>
+					</object>
+				</array>
+				<string key="NSFrameSize">{320, 135}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="109354525"/>
+				<string key="NSReuseIdentifierKey">_NS:9</string>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MCAxIDAuMTkxOTQ1NDc1NSAwAA</bytes>
+				</object>
+				<bool key="IBUIAutoresizesSubviews">NO</bool>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="590484871"/>
+					</object>
+					<int key="connectionID">13</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="590484871"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="109354525"/>
+							<reference ref="583527516"/>
+							<reference ref="616216167"/>
+							<reference ref="98146943"/>
+							<reference ref="908144004"/>
+							<reference ref="1057022694"/>
+							<reference ref="1023772893"/>
+							<reference ref="1013099198"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">callTabBar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="109354525"/>
+						<reference key="parent" ref="590484871"/>
+						<string key="objectName">mask</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="583527516"/>
+						<reference key="parent" ref="590484871"/>
+						<string key="objectName">back</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="616216167"/>
+						<reference key="parent" ref="590484871"/>
+						<string key="objectName">hangup</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="98146943"/>
+						<reference key="parent" ref="590484871"/>
+						<string key="objectName">pause</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="908144004"/>
+						<reference key="parent" ref="590484871"/>
+						<string key="objectName">speaker</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="1057022694"/>
+						<reference key="parent" ref="590484871"/>
+						<string key="objectName">addCall</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="1023772893"/>
+						<reference key="parent" ref="590484871"/>
+						<string key="objectName">micro</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="1013099198"/>
+						<reference key="parent" ref="590484871"/>
+						<string key="objectName">video</string>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">LinphoneCallBar</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="2" key="10.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="11.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="12.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="1" key="6.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="2" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="2" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">13</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">LinphoneCallBar</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/LinphoneCallBar.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="add-call-actif.png">{160, 134}</string>
+			<string key="add-call-over.png">{160, 134}</string>
+			<string key="dialer-meteo-sortir-actif.png">{209, 136}</string>
+			<string key="dialer-meteo-sortir-over.png">{209, 136}</string>
+			<string key="micro-OFF-actif.png">{160, 134}</string>
+			<string key="micro-ON-actif.png">{160, 134}</string>
+			<string key="micro-ON-over.png">{160, 134}</string>
+			<string key="pause-actif.png">{209, 136}</string>
+			<string key="pause-over.png">{209, 136}</string>
+			<string key="raccrocher-actif.png">{222, 136}</string>
+			<string key="raccrocher-over.png">{222, 136}</string>
+			<string key="speacker-OFF-actif.png">{160, 134}</string>
+			<string key="speacker-ON-over.png">{160, 134}</string>
+			<string key="video-OFF-actif.png">{160, 134}</string>
+			<string key="video-ON-actif.png">{160, 134}</string>
+			<string key="video-ON-over.png">{160, 134}</string>
+		</dictionary>
+		<string key="IBCocoaTouchPluginVersion">1181</string>
+	</data>
+</archive>
--- a/Classes/LinphoneUI/LinphoneMainBar.m
+++ b/Classes/LinphoneUI/LinphoneMainBar.m
@ -33,7 +33,7 @@
 }

 - (void) receiveLinphoneMainViewChangeEvent: (NSNotification*) notif {   
-    PhoneView view = [[notif.userInfo objectForKey: @"PhoneView"] intValue];
+    PhoneView view = [[notif.userInfo objectForKey: @"view"] intValue];
    if(view == PhoneView_History) {
        historyButton.selected = TRUE;
    } else {
@ -71,28 +71,23 @@
 }

 - (IBAction) onHistoryClick: (id) sender {
-    NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_History] forKey:@"PhoneView"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict];
+    [[LinphoneManager instance] changeView:PhoneView_History];
 }

 -(IBAction) onContactsClick: (id) event {
-    NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Contacts] forKey:@"PhoneView"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict];
+    [[LinphoneManager instance] changeView:PhoneView_Contacts];
 }

 -(IBAction) onDialerClick: (id) event {
-    NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Dialer] forKey:@"PhoneView"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict];
+    [[LinphoneManager instance] changeView:PhoneView_Dialer];
 }

 -(IBAction) onSettingsClick: (id) event {
-    NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Settings] forKey:@"PhoneView"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict];
+    [[LinphoneManager instance] changeView:PhoneView_Settings];
 }

 -(IBAction) onChatClick: (id) event {
-    NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Chat] forKey:@"PhoneView"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict];
+    [[LinphoneManager instance] changeView:PhoneView_Chat];
 }


--- a/Classes/LinphoneUI/LinphoneManager.h
+++ b/Classes/LinphoneUI/LinphoneManager.h
@ -24,6 +24,16 @@
 #import "LogView.h"
 #import "LinphoneUIDelegates.h"

+typedef enum _PhoneView {
+    PhoneView_Dialer,
+    PhoneView_History,
+    PhoneView_Settings,
+    PhoneView_Chat,
+    PhoneView_Contacts,
+    PhoneView_InCall,
+    PhoneView_END
+} PhoneView;
+
 typedef enum _Connectivity {
 	wifi,
 	wwan
@ -57,7 +67,6 @@ typedef struct _LinphoneCallAppData {
 	id<LogView> mLogView;	
 	bool isbackgroundModeEnabled;
 	id<LinphoneUICallDelegate> callDelegate;
-	id<LinphoneUIRegistrationDelegate> registrationDelegate;
 	
 	UIViewController* mCurrentViewController;
 	Connectivity connectivity;
@ -65,6 +74,8 @@ typedef struct _LinphoneCallAppData {
 	const char*  frontCamId;
 	const char*  backCamId;
    
+    PhoneView currentView;
+    
    NSDictionary* currentSettings;
    
@public
@ -94,8 +105,10 @@ typedef struct _LinphoneCallAppData {
 -(void) setupNetworkReachabilityCallback;
 -(void) refreshRegisters;

+-(void) changeView:(PhoneView) view;
+-(PhoneView) currentView;
+
@property (nonatomic, retain) id<LinphoneUICallDelegate> callDelegate;
-@property (nonatomic, retain) id<LinphoneUIRegistrationDelegate> registrationDelegate;
@property Connectivity connectivity;
@property (readonly) const char*  frontCamId;
@property (readonly) const char*  backCamId;
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@ -17,7 +17,6 @@
 *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */              

-
 #import "LinphoneManager.h"
 #include "linphonecore_utils.h"
 #include <sys/types.h>
@ -52,7 +51,6 @@ extern  void libmsbcg729_init();
 #endif
@implementation LinphoneManager
@synthesize callDelegate;
-@synthesize registrationDelegate;
@synthesize connectivity;
@synthesize frontCamId;
@synthesize backCamId;
@ -65,10 +63,22 @@ extern  void libmsbcg729_init();
    }
    return self;
 }
+
 +(LinphoneManager*) instance {
 	return theLinphoneManager;
 }

+-(void) changeView:(PhoneView) view {
+    currentView = view;
+    NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:currentView] forKey:@"view"];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict];
+}
+
+-(PhoneView) currentView {
+    return currentView;
+}
+
+
 -(NSString*) getDisplayNameFromAddressBook:(NSString*) number andUpdateCallLog:(LinphoneCallLog*)log {
    //1 normalize
    NSString* lNormalizedNumber = [FastAddressBook normalizePhoneNumber:number];
@ -356,37 +366,21 @@ static void linphone_iphone_transfer_state_changed(LinphoneCore* lc, LinphoneCal
 -(void) onRegister:(LinphoneCore *)lc cfg:(LinphoneProxyConfig*) cfg state:(LinphoneRegistrationState) state message:(const char*) message {
    ms_warning("NEW REGISTRATION STATE: '%s' (message: '%s')", linphone_registration_state_to_string(state), message);
    
-	LinphoneAddress* lAddress = linphone_address_new(linphone_proxy_config_get_identity(cfg));
-	NSString* lUserName = linphone_address_get_username(lAddress)? [[NSString alloc] initWithUTF8String:linphone_address_get_username(lAddress) ]:@"";
-	NSString* lDisplayName = linphone_address_get_display_name(lAddress)? [[NSString alloc] initWithUTF8String:linphone_address_get_display_name(lAddress) ]:@"";
-	NSString* lDomain = [[NSString alloc] initWithUTF8String:linphone_address_get_domain(lAddress)];
-	linphone_address_destroy(lAddress);
-	
-	if (state == LinphoneRegistrationOk) {
-		[[(LinphoneManager*)linphone_core_get_user_data(lc) registrationDelegate] displayRegisteredFromUI:nil
-											  forUser:lUserName
-									  withDisplayName:lDisplayName
-											 onDomain:lDomain ];
-	} else if (state == LinphoneRegistrationProgress) {
-		[registrationDelegate displayRegisteringFromUI:mCurrentViewController
-											  forUser:lUserName
-									  withDisplayName:lDisplayName
-											 onDomain:lDomain ];
-		
-	} else if (state == LinphoneRegistrationCleared || state == LinphoneRegistrationNone) {
-		[registrationDelegate displayNotRegisteredFromUI:mCurrentViewController];
-	} else 	if (state == LinphoneRegistrationFailed ) {
+    // Post event
+    NSDictionary* dict = [[NSDictionary alloc] initWithObjectsAndKeys: 
+                          [NSNumber numberWithInt:state], @"state", 
+                          [[NSString stringWithFormat:@"%c", message] autorelease], @"message", 
+                          nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneRegistrationUpdate" object:self userInfo:dict];
+    
+    // Show error
+    if (state == LinphoneRegistrationFailed) {
 		NSString* lErrorMessage=nil;
 		if (linphone_proxy_config_get_error(cfg) == LinphoneReasonBadCredentials) {
 			lErrorMessage = NSLocalizedString(@"Bad credentials, check your account settings",nil);
 		} else if (linphone_proxy_config_get_error(cfg) == LinphoneReasonNoResponse) {
 			lErrorMessage = NSLocalizedString(@"SIP server unreachable",nil);
 		} 
-		[registrationDelegate displayRegistrationFailedFromUI:mCurrentViewController
-											   forUser:lUserName
-									   withDisplayName:lDisplayName
-											  onDomain:lDomain
-												forReason:lErrorMessage];
 		
 		if (lErrorMessage != nil 
 			&& linphone_proxy_config_get_error(cfg) != LinphoneReasonNoResponse) { //do not report network connection issue on registration
@ -406,11 +400,6 @@ static void linphone_iphone_transfer_state_changed(LinphoneCore* lc, LinphoneCal
 		}
 		
 	}
-    
-    [lUserName release];
-    [lDisplayName release];
-    [lDomain release];
-	
 }
 static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyConfig* cfg, LinphoneRegistrationState state,const char* message) {
 	[(LinphoneManager*)linphone_core_get_user_data(lc) onRegister:lc cfg:cfg state:state message:message];
--- a/Classes/LinphoneUI/LinphoneStatusBar.m
+++ b/Classes/LinphoneUI/LinphoneStatusBar.m
@ -18,6 +18,7 @@
 */     

 #import "LinphoneStatusBar.h"
+#import "LinphoneManager.h"

@implementation LinphoneStatusBar

@ -30,7 +31,7 @@
    [super viewDidLoad];
    
    // Set observer
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationStateChange:) name:@"LinphoneRegistrationStateChange" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationUpdate:) name:@"LinphoneRegistrationUpdate" object:nil];
 }

 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
@ -38,9 +39,34 @@
    return (interfaceOrientation == UIInterfaceOrientationPortrait);
 }

- (void) registrationStateChange: (NSNotification*) notif {  
-    LinphoneRegistrationState state = [[notif.userInfo objectForKey: @"state"] intValue];
-    NSString* message = [notif.userInfo objectForKey: @"message"];
+- (void)registrationUpdate: (NSNotification*) notif {  
+    LinphoneProxyConfig* config;
+    linphone_core_get_default_proxy([LinphoneManager getLc], &config);
+    
+    LinphoneRegistrationState state;
+    NSString* message = nil;
+    
+    if (config == NULL) {
+        state = LinphoneRegistrationNone;
+        message = linphone_core_is_network_reachabled([LinphoneManager getLc]) ? NSLocalizedString(@"No SIP account configured", nil) : NSLocalizedString(@"Network down", nil);
+    } else {
+        state = linphone_proxy_config_get_state(config);
+        
+        switch (state) {
+            case LinphoneRegistrationOk: 
+                message = @"Registered"; break;
+            case LinphoneRegistrationNone: 
+			case LinphoneRegistrationCleared:
+				message = @"Not registered"; break;
+            case LinphoneRegistrationFailed: 
+                message = @"Registration failed"; break;
+            case LinphoneRegistrationProgress: 
+                message = @"Registration in progress"; break;
+                //case LinphoneRegistrationCleared: m= @"No SIP account"; break;
+            default: break;
+        }
+    }
+    
    label.hidden = NO;
    switch(state) {
        case LinphoneRegistrationCleared:
--- a/Classes/LinphoneUI/LinphoneUIDelegates.h
+++ b/Classes/LinphoneUI/LinphoneUIDelegates.h
@ -32,12 +32,3 @@
 -(void) firstVideoFrameDecoded:(LinphoneCall*) call;
@end

-
-@protocol LinphoneUIRegistrationDelegate
-// UI changes for registration
-(void) displayRegisteredFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain ;
-(void) displayRegisteringFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain ;
-(void) displayRegistrationFailedFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain forReason:(NSString*) reason;
-(void) displayNotRegisteredFromUI:(UIViewController*) viewCtrl; 
-@end
-
--- a/Classes/PhoneMainView.h
+++ b/Classes/PhoneMainView.h
@ -18,15 +18,7 @@
 */   

 #import <UIKit/UIKit.h>
-
-typedef enum _PhoneView {
-    PhoneView_Dialer,
-    PhoneView_History,
-    PhoneView_Settings,
-    PhoneView_Chat,
-    PhoneView_Contacts,
-    PhoneView_END
-} PhoneView;
+#import "LinphoneManager.h"

@interface PhoneMainView : UIViewController {
    UIView *statusBarView;
@ -37,10 +29,9 @@ typedef enum _PhoneView {
    @private
    NSMutableDictionary *viewDescriptions;
    NSArray *views;
-    UIView *callTabBar;
+    UIViewController *callTabBarController;
    UIViewController *statusBarController;
    UIViewController *mainTabBarController;
-    UIView *incomingTabBar;
    UIView *addCallTabBar;
    
 }
@ -48,10 +39,9 @@ typedef enum _PhoneView {
@property (nonatomic, retain) IBOutlet UIView* contentView;
@property (nonatomic, retain) IBOutlet UIView* tabBarView;

-@property (nonatomic, retain) IBOutlet UIView* callTabBar;
+@property (nonatomic, retain) IBOutlet UIViewController* callTabBarController;
@property (nonatomic, retain) IBOutlet UIViewController* statusBarController;
@property (nonatomic, retain) IBOutlet UIViewController* mainTabBarController;
-@property (nonatomic, retain) IBOutlet UIView* incomingTabBar;
@property (nonatomic, retain) IBOutlet UIView* addCallTabBar;

 -(void) changeView: (NSNotification*) notif;
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@ -21,6 +21,7 @@
 #import "PhoneViewController.h"
 #import "HistoryController.h"
 #import "ContactsController.h"
+#import "InCallViewController.h"

 typedef enum _TabBar {
    TabBar_Main,
@ -44,10 +45,9 @@ typedef enum _TabBar {
@synthesize contentView;
@synthesize tabBarView;

-@synthesize callTabBar;
+@synthesize callTabBarController;
@synthesize statusBarController;
@synthesize mainTabBarController;
-@synthesize incomingTabBar;
@synthesize addCallTabBar;

 - (void) changeView: (NSNotification*) notif {   
@ -74,25 +74,31 @@ typedef enum _TabBar {
        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;
-            break;
+    if(description->tabBar != nil) {
+        tabBarView.hidden = false;
+        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;
+        contentFrame.size.height = tabFrame.origin.y - contentFrame.origin.y;
+        for (UIView *view in description->tabBar.view.subviews) {
+            if(view.tag == -1) {
+                contentFrame.size.height += view.frame.origin.y;
+                break;
+            }
        }
+        [tabBarView addSubview: description->tabBar.view];
+    } else {
+        tabBarView.hidden = true;
+        contentFrame.size.height = tabFrame.origin.y - tabFrame.size.height;
    }
    
    contentView.frame = contentFrame;
-    [tabBarView addSubview: description->tabBar.view];
 }

 -(void)viewDidLoad {
@ -108,7 +114,9 @@ typedef enum _TabBar {
    // Status Bar
    [statusBarView addSubview: statusBarController.view];
    
+    //
    // Main View
+    //
    PhoneViewController* myPhoneViewController = [[PhoneViewController alloc]  
        initWithNibName:@"PhoneViewController" 
        bundle:[NSBundle mainBundle]];
@ -119,7 +127,10 @@ typedef enum _TabBar {
    mainViewDescription->statusEnabled = true;
    [viewDescriptions setObject:mainViewDescription forKey:[NSNumber numberWithInt: PhoneView_Dialer]];
    
+    
+    //
    // Contacts View
+    //
    ContactsController* myContactsController = [[ContactsController alloc]
                                              initWithNibName:@"ContactsController" 
                                              bundle:[NSBundle mainBundle]];
@ -130,7 +141,10 @@ typedef enum _TabBar {
    contactsDescription->statusEnabled = false;
    [viewDescriptions setObject:contactsDescription forKey:[NSNumber numberWithInt: PhoneView_Contacts]];
    
+    
+    //
    // Call History View
+    //
    HistoryController* myHistoryController = [[HistoryController alloc]
        initWithNibName:@"HistoryController" 
        bundle:[NSBundle mainBundle]];
@ -141,12 +155,23 @@ typedef enum _TabBar {
    historyDescription->statusEnabled = false;
    [viewDescriptions setObject:historyDescription forKey:[NSNumber numberWithInt: PhoneView_History]];
    
+    
+    //
+    // InCall View
+    //
+    InCallViewController* myInCallController = [[InCallViewController alloc]
+                                              initWithNibName:@"InCallViewController" 
+                                              bundle:[NSBundle mainBundle]];
+    //[myHistoryController loadView];
+    ViewsDescription *inCallDescription = [ViewsDescription alloc];
+    inCallDescription->content = myInCallController;
+    inCallDescription->tabBar = callTabBarController;
+    inCallDescription->statusEnabled = false;
+    [viewDescriptions setObject:inCallDescription forKey:[NSNumber numberWithInt: PhoneView_InCall]];
+    
+    
    // Set observer
    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeView:) name:@"LinphoneMainViewChange" object:nil];
-    
-    // Change to default view
-    NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Dialer] forKey:@"PhoneView"];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict];
 }
     
 - (void) viewDidUnload {
--- a/Classes/PhoneMainView.xib
+++ b/Classes/PhoneMainView.xib
@ -100,290 +100,6 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
-			<object class="IBUIView" id="424220416">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIView" id="498690532">
-						<reference key="NSNextResponder" ref="424220416"/>
-						<int key="NSvFlags">-2147483356</int>
-						<string key="NSFrameSize">{320, 135}</string>
-						<reference key="NSSuperview" ref="424220416"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="128375645"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-							<reference key="NSCustomColorSpace" ref="267218165"/>
-						</object>
-						<int key="IBUITag">-1</int>
-						<bool key="IBUIUserInteractionEnabled">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIButton" id="128375645">
-						<reference key="NSNextResponder" ref="424220416"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrameSize">{80, 67}</string>
-						<reference key="NSSuperview" ref="424220416"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="777467127"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Video</string>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<object class="NSColor" key="IBUIHighlightedTitleColor" id="197650205">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-						</object>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-						</object>
-						<object class="NSColor" key="IBUINormalTitleShadowColor" id="308826858">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MC41AA</bytes>
-						</object>
-						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">video-ON-over.png</string>
-						</object>
-						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">video-ON-actif.png</string>
-						</object>
-						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">video-OFF-actif.png</string>
-						</object>
-						<object class="IBUIFontDescription" key="IBUIFontDescription" id="9235248">
-							<int key="type">2</int>
-							<double key="pointSize">15</double>
-						</object>
-						<object class="NSFont" key="IBUIFont" id="112538520">
-							<string key="NSName">Helvetica-Bold</string>
-							<double key="NSSize">15</double>
-							<int key="NSfFlags">16</int>
-						</object>
-					</object>
-					<object class="IBUIButton" id="777467127">
-						<reference key="NSNextResponder" ref="424220416"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{80, 0}, {80, 67}}</string>
-						<reference key="NSSuperview" ref="424220416"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="432865241"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Micro</string>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIHighlightedTitleColor" ref="197650205"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="308826858"/>
-						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">micro-ON-over.png</string>
-						</object>
-						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">micro-ON-actif.png</string>
-						</object>
-						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">micro-OFF-actif.png</string>
-						</object>
-						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
-					</object>
-					<object class="IBUIButton" id="432865241">
-						<reference key="NSNextResponder" ref="424220416"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{160, 0}, {80, 67}}</string>
-						<reference key="NSSuperview" ref="424220416"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="951741924"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Speaker</string>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIHighlightedTitleColor" ref="197650205"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="308826858"/>
-						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">speacker-ON-over.png</string>
-						</object>
-						<object class="NSCustomResource" key="IBUISelectedBackgroundImage" id="587099620">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">speacker-OFF-actif.png</string>
-						</object>
-						<reference key="IBUINormalBackgroundImage" ref="587099620"/>
-						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
-					</object>
-					<object class="IBUIButton" id="951741924">
-						<reference key="NSNextResponder" ref="424220416"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{240, 0}, {80, 67}}</string>
-						<reference key="NSSuperview" ref="424220416"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="227247853"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Add call</string>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIHighlightedTitleColor" ref="197650205"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="308826858"/>
-						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="745701999">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">add-call-over.png</string>
-						</object>
-						<reference key="IBUISelectedBackgroundImage" ref="745701999"/>
-						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">add-call-actif.png</string>
-						</object>
-						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
-					</object>
-					<object class="IBUIButton" id="227247853">
-						<reference key="NSNextResponder" ref="424220416"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{0, 67}, {105, 68}}</string>
-						<reference key="NSSuperview" ref="424220416"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="45903814"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Pause</string>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIHighlightedTitleColor" ref="197650205"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="308826858"/>
-						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="604501799">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">pause-over.png</string>
-						</object>
-						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">pause-actif.png</string>
-						</object>
-						<reference key="IBUINormalBackgroundImage" ref="604501799"/>
-						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
-					</object>
-					<object class="IBUIButton" id="45903814">
-						<reference key="NSNextResponder" ref="424220416"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{105, 67}, {111, 68}}</string>
-						<reference key="NSSuperview" ref="424220416"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="210929936"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Hangup</string>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIHighlightedTitleColor" ref="197650205"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="308826858"/>
-						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="800421263">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">raccrocher-over.png</string>
-						</object>
-						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">raccrocher-actif.png</string>
-						</object>
-						<reference key="IBUINormalBackgroundImage" ref="800421263"/>
-						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
-					</object>
-					<object class="IBUIButton" id="210929936">
-						<reference key="NSNextResponder" ref="424220416"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{215, 67}, {105, 68}}</string>
-						<reference key="NSSuperview" ref="424220416"/>
-						<reference key="NSWindow"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Back</string>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIHighlightedTitleColor" ref="197650205"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="308826858"/>
-						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="203774175">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">dialer-meteo-sortir-over.png</string>
-						</object>
-						<object class="NSCustomResource" key="IBUISelectedBackgroundImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">dialer-meteo-sortir-actif.png</string>
-						</object>
-						<reference key="IBUINormalBackgroundImage" ref="203774175"/>
-						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
-					</object>
-				</object>
-				<string key="NSFrameSize">{320, 135}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="498690532"/>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">1</int>
-					<bytes key="NSRGB">MCAxIDAuMTkxOTQ1NDc1NSAwAA</bytes>
-				</object>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
 			<object class="IBUIView" id="591517680">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
@ -421,12 +137,18 @@
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIHighlightedTitleColor" ref="197650205"/>
+						<object class="NSColor" key="IBUIHighlightedTitleColor" id="197650205">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MQA</bytes>
+						</object>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="308826858"/>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="308826858">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
 						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">decrocher-over.png</string>
@ -435,8 +157,15 @@
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">decrocher-actif.png</string>
 						</object>
-						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="9235248">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="869093493">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
 					</object>
 					<object class="IBUIButton" id="1031661555">
 						<reference key="NSNextResponder" ref="591517680"/>
@ -467,7 +196,7 @@
 							<string key="NSResourceName">refuser-actif.png</string>
 						</object>
 						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
+						<reference key="IBUIFont" ref="869093493"/>
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 77}</string>
@ -534,7 +263,7 @@
 							<string key="NSResourceName">contact-actif-add-call.png</string>
 						</object>
 						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
+						<reference key="IBUIFont" ref="869093493"/>
 					</object>
 					<object class="IBUIButton" id="242616498">
 						<reference key="NSNextResponder" ref="909644813"/>
@ -565,7 +294,7 @@
 							<string key="NSResourceName">cancel-actif.png</string>
 						</object>
 						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
+						<reference key="IBUIFont" ref="869093493"/>
 					</object>
 					<object class="IBUIButton" id="143858935">
 						<reference key="NSNextResponder" ref="909644813"/>
@ -598,7 +327,7 @@
 						</object>
 						<reference key="IBUINormalBackgroundImage" ref="754280770"/>
 						<reference key="IBUIFontDescription" ref="9235248"/>
-						<reference key="IBUIFont" ref="112538520"/>
+						<reference key="IBUIFont" ref="869093493"/>
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 72}</string>
@ -623,6 +352,16 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
+			<object class="IBUIViewController" id="233122513">
+				<bool key="IBUIAutoresizesArchivedViewToFullSize">NO</bool>
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+			</object>
 			<object class="IBUIViewController" id="210198832">
 				<bool key="IBUIAutoresizesArchivedViewToFullSize">NO</bool>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
@ -669,22 +408,6 @@
 					</object>
 					<int key="connectionID">164</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">callTabBar</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="424220416"/>
-					</object>
-					<int key="connectionID">165</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">incomingTabBar</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="591517680"/>
-					</object>
-					<int key="connectionID">166</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">statusBarView</string>
@ -709,6 +432,14 @@
 					</object>
 					<int key="connectionID">193</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">callTabBarController</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="233122513"/>
+					</object>
+					<int key="connectionID">196</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@ -732,65 +463,6 @@
 						<reference key="object" ref="450319686"/>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">111</int>
-						<reference key="object" ref="424220416"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="128375645"/>
-							<reference ref="777467127"/>
-							<reference ref="951741924"/>
-							<reference ref="432865241"/>
-							<reference ref="227247853"/>
-							<reference ref="45903814"/>
-							<reference ref="210929936"/>
-							<reference ref="498690532"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">callTabBar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">118</int>
-						<reference key="object" ref="128375645"/>
-						<reference key="parent" ref="424220416"/>
-						<string key="objectName">video</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">120</int>
-						<reference key="object" ref="777467127"/>
-						<reference key="parent" ref="424220416"/>
-						<string key="objectName">micro</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">122</int>
-						<reference key="object" ref="951741924"/>
-						<reference key="parent" ref="424220416"/>
-						<string key="objectName">addCall</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">121</int>
-						<reference key="object" ref="432865241"/>
-						<reference key="parent" ref="424220416"/>
-						<string key="objectName">speaker</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">117</int>
-						<reference key="object" ref="227247853"/>
-						<reference key="parent" ref="424220416"/>
-						<string key="objectName">pause</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">116</int>
-						<reference key="object" ref="45903814"/>
-						<reference key="parent" ref="424220416"/>
-						<string key="objectName">hangup</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">114</int>
-						<reference key="object" ref="210929936"/>
-						<reference key="parent" ref="424220416"/>
-						<string key="objectName">back</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">123</int>
 						<reference key="object" ref="591517680"/>
@ -885,12 +557,6 @@
 						<reference key="parent" ref="591517680"/>
 						<string key="objectName">mask</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">172</int>
-						<reference key="object" ref="498690532"/>
-						<reference key="parent" ref="424220416"/>
-						<string key="objectName">mask</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">124</int>
 						<reference key="object" ref="16200461"/>
@ -915,6 +581,12 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">statusBarController</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">194</int>
+						<reference key="object" ref="233122513"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">callBarController</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@ -925,21 +597,6 @@
 					<string>-1.IBPluginDependency</string>
 					<string>-2.CustomClassName</string>
 					<string>-2.IBPluginDependency</string>
-					<string>111.IBPluginDependency</string>
-					<string>114.IBPluginDependency</string>
-					<string>114.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
-					<string>116.IBPluginDependency</string>
-					<string>116.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
-					<string>117.IBPluginDependency</string>
-					<string>117.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
-					<string>118.IBPluginDependency</string>
-					<string>118.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
-					<string>120.IBPluginDependency</string>
-					<string>120.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
-					<string>121.IBPluginDependency</string>
-					<string>121.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
-					<string>122.IBPluginDependency</string>
-					<string>122.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
 					<string>123.IBPluginDependency</string>
 					<string>124.IBPluginDependency</string>
 					<string>124.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
@ -956,12 +613,13 @@
 					<string>152.IBPluginDependency</string>
 					<string>169.IBPluginDependency</string>
 					<string>170.IBPluginDependency</string>
-					<string>172.IBPluginDependency</string>
 					<string>175.IBPluginDependency</string>
 					<string>178.CustomClassName</string>
 					<string>178.IBPluginDependency</string>
 					<string>190.CustomClassName</string>
 					<string>190.IBPluginDependency</string>
+					<string>194.CustomClassName</string>
+					<string>194.IBPluginDependency</string>
 					<string>53.IBPluginDependency</string>
 				</object>
 				<object class="NSArray" key="dict.values">
@ -972,21 +630,6 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="1"/>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="2"/>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="2"/>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="0.0"/>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="0.0"/>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="0.0"/>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="2"/>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<real value="2"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<real value="2"/>
@ -1002,11 +645,12 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>LinphoneMainBar</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>LinphoneStatusBar</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>LinphoneCallBar</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
@ -1022,11 +666,19 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">193</int>
+			<int key="maxID">196</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">LinphoneCallBar</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/LinphoneCallBar.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">LinphoneMainBar</string>
 					<string key="superclassName">UIViewController</string>
@ -1196,9 +848,8 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addCallTabBar</string>
-							<string>callTabBar</string>
+							<string>callTabBarController</string>
 							<string>contentView</string>
-							<string>incomingTabBar</string>
 							<string>mainTabBarController</string>
 							<string>statusBarController</string>
 							<string>statusBarView</string>
@ -1207,8 +858,7 @@
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>UIView</string>
-							<string>UIView</string>
-							<string>UIView</string>
+							<string>UIViewController</string>
 							<string>UIView</string>
 							<string>UIViewController</string>
 							<string>UIViewController</string>
@ -1221,9 +871,8 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addCallTabBar</string>
-							<string>callTabBar</string>
+							<string>callTabBarController</string>
 							<string>contentView</string>
-							<string>incomingTabBar</string>
 							<string>mainTabBarController</string>
 							<string>statusBarController</string>
 							<string>statusBarView</string>
@ -1236,17 +885,13 @@
 								<string key="candidateClassName">UIView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">callTabBar</string>
-								<string key="candidateClassName">UIView</string>
+								<string key="name">callTabBarController</string>
+								<string key="candidateClassName">UIViewController</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">contentView</string>
 								<string key="candidateClassName">UIView</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">incomingTabBar</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">mainTabBarController</string>
 								<string key="candidateClassName">UIViewController</string>
@ -1292,8 +937,6 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>add-call-actif.png</string>
-				<string>add-call-over.png</string>
 				<string>cancel-actif.png</string>
 				<string>cancel-over.png</string>
 				<string>contact-actif-add-call.png</string>
@ -1301,28 +944,12 @@
 				<string>decrocher-actif.png</string>
 				<string>decrocher-over.png</string>
 				<string>dialer-actif.png</string>
-				<string>dialer-meteo-sortir-actif.png</string>
-				<string>dialer-meteo-sortir-over.png</string>
 				<string>dialer-over.png</string>
-				<string>micro-OFF-actif.png</string>
-				<string>micro-ON-actif.png</string>
-				<string>micro-ON-over.png</string>
-				<string>pause-actif.png</string>
-				<string>pause-over.png</string>
-				<string>raccrocher-actif.png</string>
-				<string>raccrocher-over.png</string>
 				<string>refuser-actif.png</string>
 				<string>refuser-over.png</string>
-				<string>speacker-OFF-actif.png</string>
-				<string>speacker-ON-over.png</string>
-				<string>video-OFF-actif.png</string>
-				<string>video-ON-actif.png</string>
-				<string>video-ON-over.png</string>
 			</object>
 			<object class="NSArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{160, 134}</string>
-				<string>{160, 134}</string>
 				<string>{254, 144}</string>
 				<string>{254, 144}</string>
 				<string>{254, 144}</string>
@ -1330,23 +957,9 @@
 				<string>{320, 154}</string>
 				<string>{320, 154}</string>
 				<string>{132, 144}</string>
-				<string>{209, 136}</string>
-				<string>{209, 136}</string>
 				<string>{132, 144}</string>
-				<string>{160, 134}</string>
-				<string>{160, 134}</string>
-				<string>{160, 134}</string>
-				<string>{209, 136}</string>
-				<string>{209, 136}</string>
-				<string>{222, 136}</string>
-				<string>{222, 136}</string>
 				<string>{320, 154}</string>
 				<string>{320, 154}</string>
-				<string>{160, 134}</string>
-				<string>{160, 134}</string>
-				<string>{160, 134}</string>
-				<string>{160, 134}</string>
-				<string>{160, 134}</string>
 			</object>
 		</object>
 		<string key="IBCocoaTouchPluginVersion">1181</string>
--- a/Classes/PhoneViewController.h
+++ b/Classes/PhoneViewController.h
@ -15,7 +15,8 @@
 *  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 <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
 #import "linphonecore.h"
@ -23,11 +24,11 @@
 #import "CallDelegate.h"

@class MainScreenWithVideoPreview;
-@class IncallViewController;
+@class InCallViewController;
@class FirstLoginViewController;


-@interface PhoneViewController : UIViewController <UITextFieldDelegate,LinphoneUICallDelegate, UIActionSheetCustomDelegate, LinphoneUIRegistrationDelegate> {
+@interface PhoneViewController : UIViewController <UITextFieldDelegate,LinphoneUICallDelegate, UIActionSheetCustomDelegate> {

@private
 	//UI definition
@ -61,7 +62,7 @@

 	UIActionSheet *mIncomingCallActionSheet;
 	FirstLoginViewController* myFirstLoginViewController;
-	IncallViewController* mIncallViewController;
+	InCallViewController* mIncallViewController;
    MainScreenWithVideoPreview* mMainScreenWithVideoPreview;
    
    UIButton* switchCamera;
@ -96,4 +97,5 @@

@property (nonatomic, retain) IBOutlet UITabBarController*  myTabBarController;
@property (nonatomic, retain) IBOutlet MainScreenWithVideoPreview*  mMainScreenWithVideoPreview;
+-(IBAction) onAddContact: (id) event;
@end
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@ -27,12 +27,13 @@
 #include "MainScreenWithVideoPreview.h"
 #include "linphonecore.h"
 #include "private.h"
+#import "PhoneMainView.h"

@implementation PhoneViewController
-@synthesize  dialerView ;
-@synthesize  address ;
-@synthesize  callShort;
-@synthesize  callLarge;
+@synthesize dialerView;
+@synthesize address;
+@synthesize callShort;
+@synthesize callLarge;
@synthesize status;
@synthesize erase;

@ -57,52 +58,7 @@

@synthesize switchCamera;

-(void) updateStatusSubView {
-    LinphoneCore* lc = 0;
-    @try {
-        lc = [LinphoneManager getLc];
-    } @catch (NSException* exc) {
-        return;
-    }
-    
-    if (!lc)
-        return;
-    
-    BOOL enableCallButtons;
-    LinphoneProxyConfig* config;
-    linphone_core_get_default_proxy([LinphoneManager getLc], &config);
-    
-    LinphoneRegistrationState s;
-    NSString* m = nil;
-    
-    if (config == NULL) {
-        s = LinphoneRegistrationNone;
-        m = linphone_core_is_network_reachabled([LinphoneManager getLc]) ? NSLocalizedString(@"No SIP account configured", nil) : NSLocalizedString(@"Network down", nil);
-    } else {
-        s = linphone_proxy_config_get_state(config);
-    
-        switch (s) {
-            case LinphoneRegistrationOk: m = @"Registered"; break;
-            case LinphoneRegistrationNone: 
-			case LinphoneRegistrationCleared:
-				m=@"Not registered"; break;
-            case LinphoneRegistrationFailed: m = @"Registration failed"; break;
-            case LinphoneRegistrationProgress: m = @"Registration in progress"; break;
-            //case LinphoneRegistrationCleared: m= @"No SIP account"; break;
-            default: break;
-        }
-    }
-    
-    // Change to registration state
-    NSDictionary* dict = [[NSDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt:s], @"state", m, @"message", nil];
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneRegistrationStatusChange" object:self userInfo:dict];
-    
-    [callLarge setEnabled:enableCallButtons];
-    [callShort setEnabled:enableCallButtons];   
-    [backToCallView setEnabled:enableCallButtons];
-}
-
-(void) updateCallAndBackButtons {
+- (void)updateCallAndBackButtons {
    @try {
        bool zeroCall = (linphone_core_get_calls_nb([LinphoneManager getLc]) == 0);
        
@ -121,8 +77,6 @@
                   [exc.name cStringUsingEncoding:[NSString defaultCStringEncoding]], 
                   [exc.reason cStringUsingEncoding:[NSString defaultCStringEncoding]]);
    }
-    
-    [self updateStatusSubView];
 }


@ -133,13 +87,13 @@
 																				 bundle:[NSBundle mainBundle]];
 		[self presentModalViewController:myFirstLoginViewController animated:true];
 	}
-    [[LinphoneManager instance] setRegistrationDelegate:self];
+   // [[LinphoneManager instance] setRegistrationDelegate:self];
    
    [mMainScreenWithVideoPreview showPreview:YES];
    [self updateCallAndBackButtons];
 }

-(void) viewDidDisappear:(BOOL)animated {
+- (void)viewDidDisappear:(BOOL)animated {
    [super viewDidDisappear:animated];
 }

@ -168,7 +122,7 @@
    [backToCallView addTarget:self action:@selector(backToCallViewPressed) forControlEvents:UIControlEventTouchUpInside];
    
    if (mIncallViewController == nil)
-        mIncallViewController = [[IncallViewController alloc]  initWithNibName:[LinphoneManager runningOnIpad]?@"InCallViewController-ipad":@"IncallViewController" 
+        mIncallViewController = [[InCallViewController alloc]  initWithNibName:[LinphoneManager runningOnIpad]?@"InCallViewController-ipad":@"InCallViewController" 
 																	bundle:[NSBundle mainBundle]];
    
    /*if (statusSubViewController == nil) {
@ -201,12 +155,12 @@
    return YES;
 }

-(void)viewWillAppear:(BOOL)animated {
+- (void)viewWillAppear:(BOOL)animated {
    [self updateCallAndBackButtons];
    [super viewWillAppear:animated];
 }

-(void) displayDialerFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
+- (void)displayDialerFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
 	
 	//cancel local notification, just in case
 	if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]  
@ -236,18 +190,16 @@
 									   forUser:username
 							   withDisplayName:displayName];
 	
-	[myTabBarController setSelectedIndex:DIALER_TAB_INDEX];
+	//[myTabBarController setSelectedIndex:DIALER_TAB_INDEX];
    
    [mMainScreenWithVideoPreview showPreview:YES];
 }

-//status reporting
-(void) displayStatus:(NSString*) message {     
+- (void)displayStatus:(NSString*) message {     
 	[mIncallViewController displayStatus:message];
 }

-
-(void) displayIncomingCall:(LinphoneCall*) call NotificationFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
+- (void)displayIncomingCall:(LinphoneCall*) call NotificationFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
 	[mMainScreenWithVideoPreview showPreview:NO]; 
 	if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] 
 		&& [UIApplication sharedApplication].applicationState !=  UIApplicationStateActive) {
@ -291,7 +243,7 @@
    [mMainScreenWithVideoPreview showPreview:NO];
 }

-(void) backToCallViewPressed {
+- (void)backToCallViewPressed {
    [UICallButton enableTransforMode:NO];
    [self presentModalViewController:(UIViewController*)mIncallViewController animated:true];

@ -307,7 +259,7 @@
    }
 }

-(void) displayCall: (LinphoneCall*) call InProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
+- (void)displayCall: (LinphoneCall*) call InProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
    [mMainScreenWithVideoPreview showPreview:NO]; 
 	if (self.presentedViewController != (UIViewController*)mIncallViewController) {
 		[self presentModalViewController:(UIViewController*)mIncallViewController animated:true];
@ -320,7 +272,7 @@
 	
 }

-(void) displayInCall: (LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
+- (void)displayInCall: (LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
    [mMainScreenWithVideoPreview showPreview:NO]; 
    if (self.presentedViewController != (UIViewController*)mIncallViewController && (call == 0x0 ||
 																  linphone_call_get_dir(call)==LinphoneCallIncoming)){
@ -341,7 +293,7 @@
 } 


-(void) displayVideoCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName { 
+- (void)displayVideoCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName { 
    [mMainScreenWithVideoPreview showPreview:NO]; 
 	[mIncallViewController  displayVideoCall:call FromUI:viewCtrl 
 									 forUser:username 
@ -351,7 +303,7 @@
    [self updateCallAndBackButtons];
 }

-(void) displayAskToEnableVideoCall:(LinphoneCall*) call forUser:(NSString*) username withDisplayName:(NSString*) displayName {
+- (void)displayAskToEnableVideoCall:(LinphoneCall*) call forUser:(NSString*) username withDisplayName:(NSString*) displayName {
 	[mIncallViewController  displayAskToEnableVideoCall:call forUser:username withDisplayName:displayName];
 }

@ -394,35 +346,37 @@
 	[super dealloc];
 }

-(void) displayRegisteredFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {    
+- (void)displayRegisteredFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {    
    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
-        [myFirstLoginViewController displayRegisteredFromUI:viewCtrl forUser:username withDisplayName:displayName onDomain:domain];
+        //[myFirstLoginViewController displayRegisteredFromUI:viewCtrl forUser:username withDisplayName:displayName onDomain:domain];
    }
-    [self updateStatusSubView];
-}
-(void) displayRegisteringFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {
-    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
-        [myFirstLoginViewController displayRegisteringFromUI:viewCtrl forUser:username withDisplayName:displayName onDomain:domain];
-    }
-    [self updateStatusSubView];
-}
-(void) displayRegistrationFailedFromUI:(UIViewController*) viewCtrl forUser:(NSString*) user withDisplayName:(NSString*) displayName onDomain:(NSString*)domain forReason:(NSString*) reason {
-    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
-        [myFirstLoginViewController displayRegistrationFailedFromUI:viewCtrl forUser:user withDisplayName:displayName onDomain:domain forReason:reason];
-    }
-    [self updateStatusSubView];
 }

-(void) displayNotRegisteredFromUI:(UIViewController*) viewCtrl { 
+- (void)displayRegisteringFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {
    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
-        [myFirstLoginViewController displayNotRegisteredFromUI:viewCtrl];
+        //[myFirstLoginViewController displayRegisteringFromUI:viewCtrl forUser:username withDisplayName:displayName onDomain:domain];
    }
-    [self updateStatusSubView];
 }

-(void) firstVideoFrameDecoded: (LinphoneCall*) call {
+- (void)displayRegistrationFailedFromUI:(UIViewController*) viewCtrl forUser:(NSString*) user withDisplayName:(NSString*) displayName onDomain:(NSString*)domain forReason:(NSString*) reason {
+    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
+        //[myFirstLoginViewController displayRegistrationFailedFromUI:viewCtrl forUser:user withDisplayName:displayName onDomain:domain forReason:reason];
+    }
+}
+
+- (void)displayNotRegisteredFromUI:(UIViewController*) viewCtrl { 
+    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
+        //[myFirstLoginViewController displayNotRegisteredFromUI:viewCtrl];
+    }
+}
+
+- (void)firstVideoFrameDecoded: (LinphoneCall*) call {
    [mIncallViewController firstVideoFrameDecoded:call];
 }

+- (IBAction)onAddContact: (id) event {
+    
+}
+

@end
--- a/Classes/PhoneViewController.xib
+++ b/Classes/PhoneViewController.xib
@ -51,6 +51,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{105, 72}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="375677999"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -96,6 +97,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{105, 0}, {110, 72}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="992434254"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -124,6 +126,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{215, 0}, {105, 72}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -150,6 +153,7 @@
 						</object>
 						<string key="NSFrame">{{0, 293}, {320, 72}}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="617539638"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -171,6 +175,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{320, 259}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="201618948"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -188,6 +193,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="607229252"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@ -225,6 +231,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 11}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070392235"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -253,6 +260,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="539158319"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -277,6 +285,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="539781036"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -305,6 +314,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 73}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="573280603"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -333,6 +343,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="616388880"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -361,6 +372,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="150499342"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -389,6 +401,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 135}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="624378925"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -417,6 +430,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="465571136"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -445,6 +459,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="602859574"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -473,6 +488,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 197}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="310945439"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -501,6 +517,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="32193173"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -527,6 +544,7 @@
 						</object>
 						<string key="NSFrame">{{0, 58}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="176720389"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -546,6 +564,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{320, 80}</string>
 								<reference key="NSSuperview" ref="312750714"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="751637181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -560,6 +579,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{320, 60}</string>
 								<reference key="NSSuperview" ref="312750714"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="242430033"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">3</int>
@ -595,6 +615,7 @@
 						</object>
 						<string key="NSFrameSize">{320, 80}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="874403835"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -608,6 +629,7 @@
 				</object>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="312750714"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -756,6 +778,15 @@
 					</object>
 					<int key="connectionID">19</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onAddContact:</string>
+						<reference key="source" ref="617539638"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">187</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@ -920,8 +951,8 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="617539638"/>
-							<reference ref="375677999"/>
 							<reference ref="992434254"/>
+							<reference ref="375677999"/>
 						</object>
 						<reference key="parent" ref="542426306"/>
 						<string key="objectName">toolBar</string>
@ -962,6 +993,7 @@
 					<string>182.IBPluginDependency</string>
 					<string>183.IBPluginDependency</string>
 					<string>183.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
+					<string>184.CustomClassName</string>
 					<string>184.IBPluginDependency</string>
 					<string>184.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
 					<string>185.CustomClassName</string>
@ -1018,6 +1050,7 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<real value="3"/>
+					<string>UICallButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<real value="0.0"/>
 					<string>UIEraseButton</string>
@ -1073,9 +1106,275 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">186</int>
+			<int key="maxID">188</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">MainScreenWithVideoPreview</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>phoneMainView</string>
+							<string>window</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>PhoneViewController</string>
+							<string>UIWindow</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>phoneMainView</string>
+							<string>window</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">phoneMainView</string>
+								<string key="candidateClassName">PhoneViewController</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">window</string>
+								<string key="candidateClassName">UIWindow</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MainScreenWithVideoPreview.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">PhoneViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">onAddContact:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">onAddContact:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">onAddContact:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>address</string>
+							<string>backToCallView</string>
+							<string>callLarge</string>
+							<string>callShort</string>
+							<string>dialerView</string>
+							<string>eight</string>
+							<string>erase</string>
+							<string>five</string>
+							<string>four</string>
+							<string>hash</string>
+							<string>mMainScreenWithVideoPreview</string>
+							<string>myTabBarController</string>
+							<string>nine</string>
+							<string>one</string>
+							<string>seven</string>
+							<string>six</string>
+							<string>star</string>
+							<string>status</string>
+							<string>statusViewHolder</string>
+							<string>switchCamera</string>
+							<string>three</string>
+							<string>two</string>
+							<string>zero</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UITextField</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UIView</string>
+							<string>UIButton</string>
+							<string>UIEraseButton</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>MainScreenWithVideoPreview</string>
+							<string>UITabBarController</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UILabel</string>
+							<string>UIView</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>address</string>
+							<string>backToCallView</string>
+							<string>callLarge</string>
+							<string>callShort</string>
+							<string>dialerView</string>
+							<string>eight</string>
+							<string>erase</string>
+							<string>five</string>
+							<string>four</string>
+							<string>hash</string>
+							<string>mMainScreenWithVideoPreview</string>
+							<string>myTabBarController</string>
+							<string>nine</string>
+							<string>one</string>
+							<string>seven</string>
+							<string>six</string>
+							<string>star</string>
+							<string>status</string>
+							<string>statusViewHolder</string>
+							<string>switchCamera</string>
+							<string>three</string>
+							<string>two</string>
+							<string>zero</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">address</string>
+								<string key="candidateClassName">UITextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">backToCallView</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">callLarge</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">callShort</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">dialerView</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">eight</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">erase</string>
+								<string key="candidateClassName">UIEraseButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">five</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">four</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">hash</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mMainScreenWithVideoPreview</string>
+								<string key="candidateClassName">MainScreenWithVideoPreview</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">myTabBarController</string>
+								<string key="candidateClassName">UITabBarController</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">nine</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">one</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">seven</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">six</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">star</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">status</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">statusViewHolder</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">switchCamera</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">three</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">two</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">zero</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PhoneViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIDigitButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIEraseButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIEraseButton.h</string>
+					</object>
+				</object>
+			</object>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@ -258,6 +258,12 @@
 		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 */; };
+		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 */; };
 		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 */; };
@ -831,6 +837,11 @@
 		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 = "<group>"; };
+		D326483615887D5200930C67 /* OrderedDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderedDictionary.h; path = Utils/OrderedDictionary.h; sourceTree = "<group>"; };
+		D326483715887D5200930C67 /* OrderedDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderedDictionary.m; path = Utils/OrderedDictionary.m; sourceTree = "<group>"; };
+		D326483B1588950F00930C67 /* LinphoneCallBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneCallBar.h; sourceTree = "<group>"; };
+		D326483C1588950F00930C67 /* LinphoneCallBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneCallBar.m; sourceTree = "<group>"; };
+		D326483D1588950F00930C67 /* LinphoneCallBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneCallBar.xib; sourceTree = "<group>"; };
 		D34734791580DDF1003C7B8C /* PhoneMainView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PhoneMainView.xib; sourceTree = "<group>"; };
 		D347347C1580E5F8003C7B8C /* history-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-actif.png"; path = "Resources/history-actif.png"; sourceTree = "<group>"; };
 		D347347D1580E5F8003C7B8C /* history-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-selectionne.png"; path = "Resources/history-selectionne.png"; sourceTree = "<group>"; };
@ -1050,6 +1061,7 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				D326483415887D4400930C67 /* Utils */,
 				340751E4150E4D0200B89C47 /* CallDelegate.h */,
 				2211DBBB14769C8200DEE054 /* CallDelegate.m */,
 				D3ED3EA41587334B006C0DE4 /* CallHistoryTableViewController.h */,
@ -1319,6 +1331,9 @@
 				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 */,
@ -1663,6 +1678,15 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		D326483415887D4400930C67 /* Utils */ = {
+			isa = PBXGroup;
+			children = (
+				D326483615887D5200930C67 /* OrderedDictionary.h */,
+				D326483715887D5200930C67 /* OrderedDictionary.m */,
+			);
+			name = Utils;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@ -1898,6 +1922,7 @@
 				D354981C15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */,
 				D35498231587716B000081D8 /* LinphoneStatusBar.xib in Resources */,
 				D3A55FBF15877E69003FD403 /* ContactCell.xib in Resources */,
+				D32648401588950F00930C67 /* LinphoneCallBar.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -2047,6 +2072,7 @@
 				D354981D15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */,
 				D35498241587716B000081D8 /* LinphoneStatusBar.xib in Resources */,
 				D3A55FC015877E69003FD403 /* ContactCell.xib in Resources */,
+				D32648411588950F00930C67 /* LinphoneCallBar.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -2091,6 +2117,8 @@
 				D3549816158761D0000081D8 /* ContactTableViewController.m in Sources */,
 				D35498211587716B000081D8 /* LinphoneStatusBar.m in Sources */,
 				D3A55FBC15877E5E003FD403 /* ContactCell.m in Sources */,
+				D326483815887D5200930C67 /* OrderedDictionary.m in Sources */,
+				D326483E1588950F00930C67 /* LinphoneCallBar.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -2132,6 +2160,8 @@
 				D3549817158761D0000081D8 /* ContactTableViewController.m in Sources */,
 				D35498221587716B000081D8 /* LinphoneStatusBar.m in Sources */,
 				D3A55FBD15877E5E003FD403 /* ContactCell.m in Sources */,
+				D326483915887D5200930C67 /* OrderedDictionary.m in Sources */,
+				D326483F1588950F00930C67 /* LinphoneCallBar.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};