From 649e245a3a8782e31ef3b58e5fe93b65ec0bc6f7 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Mon, 7 Nov 2011 15:09:59 +0100
Subject: [PATCH] Add back-to-in-call-view button on dialer during call

---
 Classes/PhoneViewController.h   |   2 +
 Classes/PhoneViewController.m   |  14 +-
 Classes/PhoneViewController.xib | 399 +++++++++++---------------------
 PhoneMainView.xib               |   2 -
 4 files changed, 151 insertions(+), 266 deletions(-)

diff --git a/Classes/PhoneViewController.h b/Classes/PhoneViewController.h
index 07df3c9b5..8d209d6ee 100644
--- a/Classes/PhoneViewController.h
+++ b/Classes/PhoneViewController.h
@@ -36,6 +36,7 @@
 	UIEraseButton* erase;
 	
 	UIView* incallView;
+    UIButton* backToCallView;
 	UIDuration* callDuration;
 	UIMuteButton* mute;
 	UISpeakerButton* speaker;	
@@ -82,6 +83,7 @@
 @property (nonatomic, retain) IBOutlet UIButton* speaker;	
 @property (nonatomic, retain) IBOutlet UILabel* peerLabel;
 
+@property (nonatomic, retain) IBOutlet UIButton* backToCallView;
 
 @property (nonatomic, retain) IBOutlet UIButton* one;
 @property (nonatomic, retain) IBOutlet UIButton* two;
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index 4073cc1a1..8ca16ba45 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -33,7 +33,7 @@
 @synthesize  hangup;
 @synthesize status;
 @synthesize erase;
-
+@synthesize backToCallView;
 
 @synthesize incallView;
 @synthesize callDuration;
@@ -107,7 +107,15 @@
 	[mute initWithOnImage:[UIImage imageNamed:@"mic_muted.png"]  offImage:[UIImage imageNamed:@"mic_active.png"] ];
 	[speaker initWithOnImage:[UIImage imageNamed:@"Speaker-32-on.png"]  offImage:[UIImage imageNamed:@"Speaker-32-off.png"] ];
 	[erase initWithAddressField:address];
-	
+    
+    [backToCallView addTarget:self action:@selector(backToCallViewPressed) forControlEvents:UIControlEventTouchUpInside];
+}
+
+-(void) backToCallViewPressed {
+    [self	displayInCall: nil 
+                         FromUI:nil
+                        forUser:nil 
+                withDisplayName:nil];
 }
 
 
@@ -193,9 +201,7 @@
 	} else {
 		[peerLabel setText:username?username:@""];
 	}
-	[address setHidden:true];
 	[incallView setHidden:false];
-	[dialerView setHidden:true];
 }
 -(void) displayCall:(LinphoneCall*) call InProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
 	[self displayInCall: call ViewforUser:username
diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib
index 9e854ae94..385db8b02 100644
--- a/Classes/PhoneViewController.xib
+++ b/Classes/PhoneViewController.xib
@@ -43,133 +43,6 @@
 					<int key="NSvFlags">292</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="IBUIView" id="232448859">
-							<reference key="NSNextResponder" ref="191373211"/>
-							<int key="NSvFlags">-2147483356</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="IBUILabel" id="397196327">
-									<reference key="NSNextResponder" ref="232448859"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrameSize">{320, 40}</string>
-									<reference key="NSSuperview" ref="232448859"/>
-									<reference key="NSWindow"/>
-									<bool key="IBUIOpaque">NO</bool>
-									<bool key="IBUIClipsSubviews">YES</bool>
-									<bool key="IBUIUserInteractionEnabled">NO</bool>
-									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-									<string key="IBUIText">who</string>
-									<object class="NSColor" key="IBUITextColor" id="246311853">
-										<int key="NSColorSpace">1</int>
-										<bytes key="NSRGB">MCAwIDAAA</bytes>
-									</object>
-									<nil key="IBUIHighlightedColor"/>
-									<int key="IBUIBaselineAdjustment">1</int>
-									<float key="IBUIMinimumFontSize">10</float>
-									<int key="IBUITextAlignment">1</int>
-									<object class="IBUIFontDescription" key="IBUIFontDescription" id="341627479">
-										<int key="type">1</int>
-										<double key="pointSize">17</double>
-									</object>
-									<object class="NSFont" key="IBUIFont" id="619046313">
-										<string key="NSName">Helvetica</string>
-										<double key="NSSize">17</double>
-										<int key="NSfFlags">16</int>
-									</object>
-								</object>
-								<object class="IBUILabel" id="323870097">
-									<reference key="NSNextResponder" ref="232448859"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{98, 38}, {124, 21}}</string>
-									<reference key="NSSuperview" ref="232448859"/>
-									<reference key="NSWindow"/>
-									<bool key="IBUIOpaque">NO</bool>
-									<bool key="IBUIClipsSubviews">YES</bool>
-									<bool key="IBUIUserInteractionEnabled">NO</bool>
-									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-									<string key="IBUIText">how long</string>
-									<reference key="IBUITextColor" ref="246311853"/>
-									<nil key="IBUIHighlightedColor"/>
-									<int key="IBUIBaselineAdjustment">1</int>
-									<float key="IBUIMinimumFontSize">10</float>
-									<int key="IBUITextAlignment">1</int>
-									<reference key="IBUIFontDescription" ref="341627479"/>
-									<reference key="IBUIFont" ref="619046313"/>
-								</object>
-								<object class="IBUIButton" id="963349321">
-									<reference key="NSNextResponder" ref="232448859"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{239, 14}, {72, 37}}</string>
-									<reference key="NSSuperview" ref="232448859"/>
-									<reference key="NSWindow"/>
-									<bool key="IBUIOpaque">NO</bool>
-									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-									<int key="IBUIContentHorizontalAlignment">0</int>
-									<int key="IBUIContentVerticalAlignment">0</int>
-									<object class="NSColor" key="IBUIHighlightedTitleColor" id="923326808">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MQA</bytes>
-									</object>
-									<object class="NSColor" key="IBUINormalTitleColor">
-										<int key="NSColorSpace">1</int>
-										<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-									</object>
-									<object class="NSColor" key="IBUINormalTitleShadowColor" id="177190558">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC41AA</bytes>
-									</object>
-									<object class="NSCustomResource" key="IBUINormalImage">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">Speaker-32-off.png</string>
-									</object>
-									<object class="IBUIFontDescription" key="IBUIFontDescription" id="857420967">
-										<string key="name">Helvetica-Bold</string>
-										<string key="family">Helvetica</string>
-										<int key="traits">2</int>
-										<double key="pointSize">15</double>
-									</object>
-									<object class="NSFont" key="IBUIFont" id="551268947">
-										<string key="NSName">Helvetica-Bold</string>
-										<double key="NSSize">15</double>
-										<int key="NSfFlags">16</int>
-									</object>
-								</object>
-								<object class="IBUIButton" id="743511023">
-									<reference key="NSNextResponder" ref="232448859"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{0, 14}, {72, 37}}</string>
-									<reference key="NSSuperview" ref="232448859"/>
-									<reference key="NSWindow"/>
-									<bool key="IBUIOpaque">NO</bool>
-									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-									<int key="IBUIContentHorizontalAlignment">0</int>
-									<int key="IBUIContentVerticalAlignment">0</int>
-									<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
-									<object class="NSColor" key="IBUINormalTitleColor">
-										<int key="NSColorSpace">1</int>
-										<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-									</object>
-									<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-									<object class="NSCustomResource" key="IBUINormalImage">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">mic_active.png</string>
-									</object>
-									<reference key="IBUIFontDescription" ref="857420967"/>
-									<reference key="IBUIFont" ref="551268947"/>
-								</object>
-							</object>
-							<string key="NSFrameSize">{320, 65}</string>
-							<reference key="NSSuperview" ref="191373211"/>
-							<reference key="NSWindow"/>
-							<object class="NSColor" key="IBUIBackgroundColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA</bytes>
-							</object>
-							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						</object>
 						<object class="IBUIView" id="235890962">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
@@ -181,23 +54,39 @@
 									<string key="NSFrame">{{254, 0}, {66, 65}}</string>
 									<reference key="NSSuperview" ref="235890962"/>
 									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="201618948"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									<int key="IBUIContentHorizontalAlignment">0</int>
 									<int key="IBUIContentVerticalAlignment">0</int>
 									<string key="IBUINormalTitle">&lt;-</string>
-									<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+									<object class="NSColor" key="IBUIHighlightedTitleColor" id="923326808">
+										<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="177190558"/>
+									<object class="NSColor" key="IBUINormalTitleShadowColor" id="177190558">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC41AA</bytes>
+									</object>
 									<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="553476442">
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">clavier-01-106px.png</string>
 									</object>
-									<reference key="IBUIFontDescription" ref="857420967"/>
-									<reference key="IBUIFont" ref="551268947"/>
+									<object class="IBUIFontDescription" key="IBUIFontDescription" id="857420967">
+										<string key="name">Helvetica-Bold</string>
+										<string key="family">Helvetica</string>
+										<int key="traits">2</int>
+										<double key="pointSize">15</double>
+									</object>
+									<object class="NSFont" key="IBUIFont" id="657314226">
+										<string key="NSName">Helvetica-Bold</string>
+										<double key="NSSize">15</double>
+										<int key="NSfFlags">16</int>
+									</object>
 								</object>
 								<object class="IBUITextField" id="751637181">
 									<reference key="NSNextResponder" ref="235890962"/>
@@ -205,6 +94,7 @@
 									<string key="NSFrame">{{5, 0}, {255, 66}}</string>
 									<reference key="NSSuperview" ref="235890962"/>
 									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="366108332"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -242,6 +132,7 @@
 							<string key="NSFrameSize">{320, 65}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="751637181"/>
 							<object class="NSColor" key="IBUIBackgroundColor">
 								<int key="NSColorSpace">1</int>
 								<bytes key="NSRGB">MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA</bytes>
@@ -254,6 +145,7 @@
 							<string key="NSFrame">{{0, 328}, {160, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="729745965"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -274,7 +166,7 @@
 								<string key="NSResourceName">clavier-01-160px.png</string>
 							</object>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUILabel" id="729745965">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -282,17 +174,28 @@
 							<string key="NSFrame">{{9, 390}, {304, 21}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="319430047"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClipsSubviews">YES</bool>
 							<bool key="IBUIUserInteractionEnabled">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							<string key="IBUIText">status</string>
-							<reference key="IBUITextColor" ref="246311853"/>
+							<object class="NSColor" key="IBUITextColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MCAwIDAAA</bytes>
+							</object>
 							<nil key="IBUIHighlightedColor"/>
 							<int key="IBUIBaselineAdjustment">1</int>
 							<float key="IBUIMinimumFontSize">10</float>
-							<reference key="IBUIFontDescription" ref="341627479"/>
-							<reference key="IBUIFont" ref="619046313"/>
+							<object class="IBUIFontDescription" key="IBUIFontDescription">
+								<int key="type">1</int>
+								<double key="pointSize">17</double>
+							</object>
+							<object class="NSFont" key="IBUIFont">
+								<string key="NSName">Helvetica</string>
+								<double key="NSSize">17</double>
+								<int key="NSfFlags">16</int>
+							</object>
 						</object>
 						<object class="IBUIButton" id="1070392235">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -300,6 +203,7 @@
 							<string key="NSFrame">{{213, 64}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="539158319"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -314,7 +218,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="539158319">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -322,6 +226,7 @@
 							<string key="NSFrame">{{0, 130}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="539781036"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -336,7 +241,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="539781036">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -344,6 +249,7 @@
 							<string key="NSFrame">{{107, 130}, {106, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="573280603"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -361,7 +267,7 @@
 								<string key="NSResourceName">clavier-01-108px.png</string>
 							</object>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="573280603">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -369,6 +275,7 @@
 							<string key="NSFrame">{{213, 130}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="150499342"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -383,7 +290,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="150499342">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -391,6 +298,7 @@
 							<string key="NSFrame">{{0, 196}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="616388880"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -405,7 +313,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="624378925">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -413,6 +321,7 @@
 							<string key="NSFrame">{{213, 196}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="465571136"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -427,7 +336,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="607229252">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -435,6 +344,7 @@
 							<string key="NSFrame">{{107, 64}, {106, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1070392235"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -449,7 +359,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="794309420"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="201618948">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -457,6 +367,7 @@
 							<string key="NSFrame">{{0, 64}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="607229252"/>
 							<object class="NSColor" key="IBUIBackgroundColor">
 								<int key="NSColorSpace">1</int>
 								<bytes key="NSRGB">MC40MDAwMDAwMSAxIDEgMAA</bytes>
@@ -475,7 +386,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="465571136">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -483,6 +394,7 @@
 							<string key="NSFrame">{{0, 262}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="602859574"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -497,7 +409,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="602859574">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -505,6 +417,7 @@
 							<string key="NSFrame">{{107, 262}, {106, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="310945439"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -519,7 +432,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="794309420"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="310945439">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -527,6 +440,7 @@
 							<string key="NSFrame">{{213, 262}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="661303162"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -541,7 +455,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="616388880">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -549,6 +463,7 @@
 							<string key="NSFrame">{{107, 196}, {106, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="624378925"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -563,7 +478,7 @@
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
 							<reference key="IBUINormalBackgroundImage" ref="794309420"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="319430047">
 							<reference key="NSNextResponder" ref="191373211"/>
@@ -571,6 +486,7 @@
 							<string key="NSFrame">{{160, 328}, {160, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="232448859"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -589,12 +505,61 @@
 							</object>
 							<reference key="IBUINormalBackgroundImage" ref="442061765"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="551268947"/>
+							<reference key="IBUIFont" ref="657314226"/>
+						</object>
+						<object class="IBUIView" id="232448859">
+							<reference key="NSNextResponder" ref="191373211"/>
+							<int key="NSvFlags">-2147483356</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="IBUIButton" id="58090836">
+									<reference key="NSNextResponder" ref="232448859"/>
+									<int key="NSvFlags">292</int>
+									<string key="NSFrameSize">{160, 66}</string>
+									<reference key="NSSuperview" ref="232448859"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView"/>
+									<bool key="IBUIOpaque">NO</bool>
+									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+									<int key="IBUIContentHorizontalAlignment">0</int>
+									<int key="IBUIContentVerticalAlignment">0</int>
+									<int key="IBUIButtonType">1</int>
+									<string key="IBUINormalTitle">Back</string>
+									<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+									<object class="NSColor" key="IBUINormalTitleColor">
+										<int key="NSColorSpace">1</int>
+										<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+									</object>
+									<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+									<reference key="IBUINormalBackgroundImage" ref="442061765"/>
+									<object class="IBUIFontDescription" key="IBUIFontDescription">
+										<int key="type">2</int>
+										<int key="size">2</int>
+									</object>
+									<object class="NSFont" key="IBUIFont">
+										<string key="NSName">Helvetica-Bold</string>
+										<double key="NSSize">18</double>
+										<int key="NSfFlags">16</int>
+									</object>
+								</object>
+							</object>
+							<string key="NSFrame">{{160, 328}, {160, 66}}</string>
+							<reference key="NSSuperview" ref="191373211"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="58090836"/>
+							<object class="NSColor" key="IBUIBackgroundColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA</bytes>
+							</object>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 					</object>
 					<string key="NSFrame">{{0, 20}, {320, 460}}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="235890962"/>
 					<object class="NSColor" key="IBUIBackgroundColor">
 						<int key="NSColorSpace">1</int>
 						<bytes key="NSRGB">MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA</bytes>
@@ -750,38 +715,6 @@
 					</object>
 					<int key="connectionID">119</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">peerLabel</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="397196327"/>
-					</object>
-					<int key="connectionID">120</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">callDuration</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="323870097"/>
-					</object>
-					<int key="connectionID">121</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">speaker</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="963349321"/>
-					</object>
-					<int key="connectionID">123</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">mute</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="743511023"/>
-					</object>
-					<int key="connectionID">125</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">erase</string>
@@ -806,6 +739,14 @@
 					</object>
 					<int key="connectionID">159</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backToCallView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="58090836"/>
+					</object>
+					<int key="connectionID">161</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -863,7 +804,6 @@
 							<reference ref="201618948"/>
 							<reference ref="607229252"/>
 							<reference ref="1070392235"/>
-							<reference ref="232448859"/>
 							<reference ref="465571136"/>
 							<reference ref="319430047"/>
 							<reference ref="661303162"/>
@@ -876,6 +816,7 @@
 							<reference ref="573280603"/>
 							<reference ref="539781036"/>
 							<reference ref="539158319"/>
+							<reference ref="232448859"/>
 							<reference ref="235890962"/>
 						</object>
 						<reference key="parent" ref="627403670"/>
@@ -900,38 +841,11 @@
 						<reference key="object" ref="232448859"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="963349321"/>
-							<reference ref="323870097"/>
-							<reference ref="743511023"/>
-							<reference ref="397196327"/>
+							<reference ref="58090836"/>
 						</object>
 						<reference key="parent" ref="191373211"/>
 						<string key="objectName">inCall</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">117</int>
-						<reference key="object" ref="963349321"/>
-						<reference key="parent" ref="232448859"/>
-						<string key="objectName">speaker</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">116</int>
-						<reference key="object" ref="323870097"/>
-						<reference key="parent" ref="232448859"/>
-						<string key="objectName">duration</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">118</int>
-						<reference key="object" ref="743511023"/>
-						<reference key="parent" ref="232448859"/>
-						<string key="objectName">mute</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">115</int>
-						<reference key="object" ref="397196327"/>
-						<reference key="parent" ref="232448859"/>
-						<string key="objectName">display</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">39</int>
 						<reference key="object" ref="465571136"/>
@@ -1017,6 +931,12 @@
 						<reference key="parent" ref="235890962"/>
 						<string key="objectName">Address</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">160</int>
+						<reference key="object" ref="58090836"/>
+						<reference key="parent" ref="232448859"/>
+						<string key="objectName">back</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1033,16 +953,10 @@
 					<string>107.IBPluginDependency</string>
 					<string>114.IBPluginDependency</string>
 					<string>114.IBUserGuides</string>
-					<string>115.IBPluginDependency</string>
-					<string>116.CustomClassName</string>
-					<string>116.IBPluginDependency</string>
-					<string>117.CustomClassName</string>
-					<string>117.IBPluginDependency</string>
-					<string>118.CustomClassName</string>
-					<string>118.IBPluginDependency</string>
 					<string>150.CustomClassName</string>
 					<string>150.IBPluginDependency</string>
 					<string>157.IBPluginDependency</string>
+					<string>160.IBPluginDependency</string>
 					<string>29.CustomClassName</string>
 					<string>29.IBPluginDependency</string>
 					<string>30.CustomClassName</string>
@@ -1104,16 +1018,10 @@
 							<int key="affinity">1</int>
 						</object>
 					</object>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>UIDuration</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>UISpeakerButton</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>UIMuteButton</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIEraseButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIDigitButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIDigitButton</string>
@@ -1157,7 +1065,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">159</int>
+			<int key="maxID">161</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1183,6 +1091,7 @@
 							<string>__call</string>
 							<string>address</string>
 							<string>back</string>
+							<string>backToCallView</string>
 							<string>callDuration</string>
 							<string>dialerView</string>
 							<string>eight</string>
@@ -1211,6 +1120,7 @@
 							<string>UIButton</string>
 							<string>UITextField</string>
 							<string>UIButton</string>
+							<string>UIButton</string>
 							<string>UILabel</string>
 							<string>UIView</string>
 							<string>UIButton</string>
@@ -1242,6 +1152,7 @@
 							<string>__call</string>
 							<string>address</string>
 							<string>back</string>
+							<string>backToCallView</string>
 							<string>callDuration</string>
 							<string>dialerView</string>
 							<string>eight</string>
@@ -1279,6 +1190,10 @@
 								<string key="name">back</string>
 								<string key="candidateClassName">UIButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">backToCallView</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">callDuration</string>
 								<string key="candidateClassName">UILabel</string>
@@ -1390,14 +1305,6 @@
 						<string key="minorKey">./Classes/UIDigitButton.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIDuration</string>
-					<string key="superclassName">UILabel</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIDuration.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIEraseButton</string>
 					<string key="superclassName">UIButton</string>
@@ -1414,30 +1321,6 @@
 						<string key="minorKey">./Classes/UIHangUpButton.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIMuteButton</string>
-					<string key="superclassName">UIToggleButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIMuteButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UISpeakerButton</string>
-					<string key="superclassName">UIToggleButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UISpeakerButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -1460,21 +1343,17 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>Speaker-32-off.png</string>
 				<string>clavier-01-106px.png</string>
 				<string>clavier-01-108px.png</string>
 				<string>clavier-01-160px.png</string>
-				<string>mic_active.png</string>
 				<string>startcall-green.png</string>
 				<string>stopcall-red.png</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{32, 32}</string>
 				<string>{106, 60}</string>
 				<string>{108, 60}</string>
 				<string>{160, 60}</string>
-				<string>{20, 20}</string>
 				<string>{60, 52}</string>
 				<string>{62, 54}</string>
 			</object>
diff --git a/PhoneMainView.xib b/PhoneMainView.xib
index 27580eb6f..26cbcfb90 100644
--- a/PhoneMainView.xib
+++ b/PhoneMainView.xib
@@ -47,7 +47,6 @@
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
 				<string key="NSFrameSize">{320, 480}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -141,7 +140,6 @@
 					<int key="NSvFlags">266</int>
 					<string key="NSFrame">{{0, 431}, {320, 49}}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSNextKeyView"/>
 					<object class="NSColor" key="IBUIBackgroundColor">
 						<int key="NSColorSpace">3</int>
 						<bytes key="NSWhite">MCAwAA</bytes>