remove old monolithic incall view

This commit is contained in:
Jehan Monnier 2011-11-22 17:25:27 +01:00
parent 8d8907268f
commit ece70fec20
13 changed files with 255 additions and 494 deletions

View file

@ -1,28 +0,0 @@
/* AdvancedPhoneViewController.h
*
* Copyright (C) 2009 Belledonne Comunications, Grenoble, France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#import <UIKit/UIKit.h>
#import "PhoneViewController.h"
@interface AdvancedPhoneViewController : PhoneViewController {
IncallViewController* mIncallViewController;
}
@end

View file

@ -1,92 +0,0 @@
/* AdvancedPhoneViewController.m
*
* Copyright (C) 2009 Belledonne Comunications, Grenoble, France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#import "AdvancedPhoneViewController.h"
#import "IncallViewController.h"
@implementation AdvancedPhoneViewController
- (void)viewDidLoad {
[super viewDidLoad];
mIncallViewController = [[IncallViewController alloc] initWithNibName:@"IncallViewController"
bundle:[NSBundle mainBundle]];
}
-(void) displayDialerFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
[super displayDialerFromUI:viewCtrl
forUser:username
withDisplayName:displayName];
[mIncallViewController displayDialerFromUI:viewCtrl
forUser:username
withDisplayName:displayName];
}
-(void) displayCall: (LinphoneCall*) call InProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
/*[super displayCallInProgressFromUI:viewCtrl
forUser:username
withDisplayName:displayName];*/
[self presentModalViewController:mIncallViewController animated:true];
[mIncallViewController displayCall:call InProgressFromUI:viewCtrl
forUser:username
withDisplayName:displayName];
}
-(void) displayInCall: (LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
if (self.presentedViewController != mIncallViewController && (call == 0x0 ||
linphone_call_get_dir(call)==LinphoneCallIncoming)){
[self presentModalViewController:mIncallViewController animated:true];
}
[super displayInCall:call FromUI:viewCtrl
forUser:username
withDisplayName:displayName];
[mIncallViewController displayInCall:call FromUI:viewCtrl
forUser:username
withDisplayName:displayName];
}
-(void) displayStatus:(NSString*) message {
[super displayStatus:message];
[mIncallViewController displayStatus:message];
}
-(void) updateUIFromLinphoneState:(UIViewController*) viewCtrl {
[super updateUIFromLinphoneState:viewCtrl];
[mIncallViewController updateUIFromLinphoneState:viewCtrl];
}
-(void) displayVideoCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
[mIncallViewController displayVideoCall:call FromUI:viewCtrl
forUser:username
withDisplayName:displayName];
}
- (void)dealloc {
[mIncallViewController release];
[super dealloc];
}
@end

View file

@ -66,7 +66,7 @@
ABPeoplePickerNavigationController* myPeoplePickerController;
LinphoneCall* selectedCall;
VideoViewController* mVideoViewController;
BOOL mVideoShown;
BOOL mVideoIsPending;

View file

@ -111,7 +111,7 @@ int callCount(LinphoneCore* lc) {
[addCall addTarget:self action:@selector(addCallPressed) forControlEvents:UIControlEventTouchDown];
[mergeCalls addTarget:self action:@selector(mergeCallsPressed) forControlEvents:UIControlEventTouchDown];
[endCtrl addTarget:self action:@selector(endCallPressed) forControlEvents:UIControlEventTouchUpInside];
//[endCtrl addTarget:self action:@selector(endCallPressed) forControlEvents:UIControlEventTouchUpInside];
[addToConf addTarget:self action:@selector(addToConfCallPressed) forControlEvents:UIControlEventTouchUpInside];
[pause addTarget:self action:@selector(pauseCallPressed) forControlEvents:UIControlEventTouchUpInside];
[mergeCalls setHidden:YES];
@ -134,13 +134,15 @@ int callCount(LinphoneCore* lc) {
}
-(void) addToConfCallPressed {
if (!selectedCall)
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
if (!selectedCall)
return;
linphone_core_add_to_conference([LinphoneManager getLc], selectedCall);
}
-(void) pauseCallPressed {
if (!selectedCall)
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
if (!selectedCall)
return;
if (linphone_call_get_state(selectedCall) == LinphoneCallPaused) {
[pause setSelected:NO];
@ -223,7 +225,7 @@ int callCount(LinphoneCore* lc) {
-(void) displayStatus:(NSString*) message; {
[self updateUIFromLinphoneState: nil];
}
-(void) displayPad:(bool) enable {
@ -236,9 +238,10 @@ int callCount(LinphoneCore* lc) {
//restaure view
[self displayPad:false];
dismissed = false;
if (call)
selectedCall = call;
UIDevice *device = [UIDevice currentDevice];
device.proximityMonitoringEnabled = YES;
if ([speaker isOn])
[speaker toggle];
[self updateUIFromLinphoneState: nil];
}
@ -246,15 +249,27 @@ int callCount(LinphoneCore* lc) {
}
-(void) dismissVideoView {
[[UIApplication sharedApplication] setStatusBarHidden:NO animated:NO];
[self dismissModalViewControllerAnimated:FALSE];//just in case
mVideoShown=FALSE;
}
-(void) displayInCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
dismissed = false;
if (call)
selectedCall = call;
[self updateUIFromLinphoneState: nil];
UIDevice *device = [UIDevice currentDevice];
device.proximityMonitoringEnabled = YES;
if (call !=nil && linphone_call_get_dir(call)==LinphoneCallIncoming) {
if ([speaker isOn]) [speaker toggle];
}
[self updateUIFromLinphoneState: nil];
if (self.presentedViewController == (UIViewController*)mVideoViewController) {
[self dismissVideoView];
}
}
-(void) displayDialerFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
UIViewController* modalVC = self.modalViewController;
UIDevice *device = [UIDevice currentDevice];
device.proximityMonitoringEnabled = NO;
if (modalVC != nil) {
// clear previous native window ids
if (modalVC == mVideoViewController) {
@ -282,7 +297,6 @@ int callCount(LinphoneCore* lc) {
}
-(void) updateUIFromLinphoneState:(UIViewController *)viewCtrl {
[mute reset];
// if (
// [pause reset];
@ -304,7 +318,7 @@ int callCount(LinphoneCore* lc) {
} @catch (NSException* exc) {
return;
}
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
// hide call control subview if no call selected
[callControlSubView setHidden:(selectedCall == NULL)];
// hide add to conf if no conf exist
@ -320,13 +334,11 @@ int callCount(LinphoneCore* lc) {
else if (linphone_call_get_state(selectedCall)==LinphoneCallPaused) {
[pause setHidden:NO];
//[pause setTitle:@"Resume" forState:UIControlStateNormal];
// pause.selected = YES;
pause.highlighted = NO;
pause.selected = YES;
} else if (callCount(lc) == callsCount && callsCount == 1) {
[pause setHidden:NO];
//[pause setTitle:@"Pause" forState:UIControlStateNormal];
// pause.selected = NO;
pause.highlighted = NO;
pause.selected = NO;
} else {
[pause setHidden:YES];
}
@ -480,8 +492,7 @@ int callCount(LinphoneCore* lc) {
}*/
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
if (call == selectedCall) {
[cell setSelected:YES animated:NO];
[callTableView selectRowAtIndexPath:path animated:NO scrollPosition:UITableViewScrollPositionNone];
@ -519,6 +530,7 @@ int callCount(LinphoneCore* lc) {
//if (call == selectedCall)
// [self updateActive:YES cell:cell];
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
if (call == selectedCall) {
[callTableView selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
cell.selected = YES;
@ -625,7 +637,7 @@ int callCount(LinphoneCore* lc) {
bool inConf = (indexPath.row == 0 && linphone_core_get_conference_size(lc) > 0);
selectedCall = [self retrieveCallAtIndex:indexPath.row inConference:inConf];
LinphoneCall* selectedCall = [self retrieveCallAtIndex:indexPath.row inConference:inConf];
if (inConf) {
if (linphone_core_is_in_conference(lc))
@ -644,24 +656,5 @@ int callCount(LinphoneCore* lc) {
[self updateUIFromLinphoneState: nil];
}
-(void) endCallPressed {
if (selectedCall == NULL) {
ms_error("No selected call");
return;
}
LinphoneCore* lc = [LinphoneManager getLc];
if (isInConference(selectedCall)) {
linphone_core_terminate_conference(lc);
/*
linphone_core_remove_from_conference(lc, selectedCall);
if ((linphone_core_get_conference_size(lc) - (int)linphone_core_is_in_conference(lc)) == 0)
linphone_core_terminate_conference(lc);
*/
} else {
linphone_core_terminate_call(lc, selectedCall);
}
selectedCall = NULL;
}
@end

View file

@ -241,7 +241,7 @@
<string key="NSFrame">{{213, 70}, {107, 66}}</string>
<reference key="NSSuperview" ref="585669622"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="481206195"/>
<reference key="NSNextKeyView" ref="484501311"/>
<reference key="IBUIBackgroundColor" ref="95762599"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -264,7 +264,7 @@
<reference key="IBUIFontDescription" ref="974614377"/>
<reference key="IBUIFont" ref="773313654"/>
</object>
<object class="IBUIButton" id="481206195">
<object class="IBUIButton" id="484501311">
<reference key="NSNextResponder" ref="585669622"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{213, 70}, {107, 66}}</string>
@ -277,13 +277,18 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">video</string>
<reference key="IBUIHighlightedTitleColor" ref="816037173"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="920781842"/>
<reference key="IBUINormalTitleShadowColor" ref="785445938"/>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">clavier-01-160px.png</string>
</object>
<reference key="IBUIFontDescription" ref="974614377"/>
<reference key="IBUIFont" ref="773313654"/>
</object>
@ -935,7 +940,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addVideo</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="481206195"/>
<reference key="destination" ref="484501311"/>
</object>
<int key="connectionID">125</int>
</object>
@ -1158,7 +1163,7 @@
<reference ref="297000325"/>
<reference ref="861550739"/>
<reference ref="1031005817"/>
<reference ref="481206195"/>
<reference ref="484501311"/>
</object>
<reference key="parent" ref="858247959"/>
<string key="objectName">controls</string>
@ -1207,7 +1212,7 @@
</object>
<object class="IBObjectRecord">
<int key="objectID">123</int>
<reference key="object" ref="481206195"/>
<reference key="object" ref="484501311"/>
<reference key="parent" ref="585669622"/>
<string key="objectName">video</string>
</object>
@ -1239,6 +1244,7 @@
<string>16.IBPluginDependency</string>
<string>16.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
<string>17.IBPluginDependency</string>
<string>18.CustomClassName</string>
<string>18.IBPluginDependency</string>
<string>2.IBPluginDependency</string>
<string>26.IBPluginDependency</string>
@ -1283,18 +1289,19 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0"/>
<real value="1"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIAddVideoButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UISpeakerButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2"/>
<real value="1"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIMuteButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIHangUpButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -1784,6 +1791,7 @@
<string>HP_inverse.png</string>
<string>ajouter.png</string>
<string>clavier-01-106px.png</string>
<string>clavier-01-160px.png</string>
<string>clavier.png</string>
<string>conf_merge.png</string>
<string>contact.png</string>
@ -1801,6 +1809,7 @@
<string>{164, 104}</string>
<string>{164, 104}</string>
<string>{106, 60}</string>
<string>{160, 60}</string>
<string>{164, 104}</string>
<string>{82, 75}</string>
<string>{164, 104}</string>

View file

@ -206,7 +206,12 @@ extern void libmssilk_init();
[callDelegate displayDialerFromUI:mCurrentViewController
forUser:@""
withDisplayName:@""];
}
} else {
[callDelegate displayInCall:call
FromUI:mCurrentViewController
forUser:lUserName
withDisplayName:lDisplayName];
}
break;
default:
break;
@ -816,7 +821,6 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
linphone_core_resume_call(theLinphoneCore, (LinphoneCall*) c->data);
}
[callDelegate updateUIFromLinphoneState:mCurrentViewController];
}

View file

@ -26,7 +26,6 @@
-(void) displayIncomingCall: (LinphoneCall*) call NotificationFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName;
-(void) displayInCall: (LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName;
-(void) displayVideoCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName;
-(void) updateUIFromLinphoneState:(UIViewController*) viewCtrl;
//status reporting
-(void) displayStatus:(NSString*) message;
@end

View file

@ -30,6 +30,18 @@
if (call)
linphone_core_terminate_call(lc,call);
else if (linphone_core_is_in_conference(lc)) {
linphone_core_terminate_conference(lc);
} else {
const MSList* calls = linphone_core_get_calls(lc);
if (ms_list_size(calls) == 1
&& !linphone_call_params_local_conference_mode(linphone_call_get_current_params((LinphoneCall*)(calls->data)))) {
//Only one call in the list, hangin up!
linphone_core_terminate_call(lc,(LinphoneCall*)(calls->data));
} else {
ms_message("Cannot make a decision on which call to terminate");
}
}
}
- (id)initWithFrame:(CGRect)frame {

View file

@ -35,18 +35,9 @@
UITextField* address;
UILabel* mDisplayName;
UIEraseButton* erase;
UICallButton* callShort;
UICallButton* callLarge;
UIView* incallView;
UIButton* backToCallView;
UIDuration* callDuration;
UIMuteButton* mute;
UISpeakerButton* speaker;
UILabel* peerLabel;
UICallButton* __call;
UIHangUpButton* hangup;
UILabel* status;
//key pad
@ -64,30 +55,24 @@
UIDigitButton* hash;
UIButton* back;
UIButton* backToCallView;
UITabBarController* myTabBarController;
UIActionSheet *mIncomingCallActionSheet;
FirstLoginViewController* myFirstLoginViewController;
IncallViewController* mIncallViewController;
}
@property (nonatomic, retain) IBOutlet UIView* dialerView;
@property (nonatomic, retain) IBOutlet UITextField* address;
@property (nonatomic, retain) IBOutlet UIButton* __call;
@property (nonatomic, retain) IBOutlet UIButton* callShort;
@property (nonatomic, retain) IBOutlet UIButton* callLarge;
@property (nonatomic, retain) IBOutlet UIButton* hangup;
@property (nonatomic, retain) IBOutlet UILabel* status;
@property (nonatomic, retain) IBOutlet UIEraseButton* erase;
@property (nonatomic, retain) IBOutlet UIView* incallView;
@property (nonatomic, retain) IBOutlet UILabel* callDuration;
@property (nonatomic, retain) IBOutlet UIButton* mute;
@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;
@property (nonatomic, retain) IBOutlet UIButton* three;
@ -102,7 +87,7 @@
@property (nonatomic, retain) IBOutlet UIButton* hash;
@property (nonatomic, retain) IBOutlet UIButton* back;
@property (nonatomic, retain) IBOutlet UIButton* backToCallView;
// method to handle keypad event

View file

@ -28,17 +28,11 @@
@implementation PhoneViewController
@synthesize dialerView ;
@synthesize address ;
@synthesize __call;
@synthesize callShort;
@synthesize callLarge;
@synthesize hangup;
@synthesize status;
@synthesize erase;
@synthesize backToCallView;
@synthesize incallView;
@synthesize callDuration;
@synthesize mute;
@synthesize speaker;
@synthesize peerLabel;
@synthesize one;
@synthesize two;
@ -55,7 +49,7 @@
@synthesize back;
@synthesize myTabBarController;
@synthesize backToCallView;
//implements keypad behavior
@ -72,7 +66,6 @@
- (void)viewDidAppear:(BOOL)animated {
[[UIApplication sharedApplication] setIdleTimerDisabled:true];
[mute reset];
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"enable_first_login_view_preference"] == true) {
myFirstLoginViewController = [[FirstLoginViewController alloc] initWithNibName:@"FirstLoginViewController"
bundle:[NSBundle mainBundle]];
@ -81,10 +74,6 @@
};
}
- (void)viewDidDisappear:(BOOL)animated {
}
// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
- (void)viewDidLoad {
@ -103,21 +92,16 @@
[nine initWithNumber:'9' addressField:address dtmf:false];
[star initWithNumber:'*' addressField:address dtmf:false];
[hash initWithNumber:'#' addressField:address dtmf:false];
[__call initWithAddress:address withDisplayName:mDisplayName];
[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"] ];
[callShort initWithAddress:address withDisplayName:mDisplayName];
[callLarge initWithAddress:address withDisplayName:mDisplayName];
[erase initWithAddressField:address];
[backToCallView addTarget:self action:@selector(backToCallViewPressed) forControlEvents:UIControlEventTouchUpInside];
mIncallViewController = [[IncallViewController alloc] initWithNibName:@"IncallViewController"
bundle:[NSBundle mainBundle]];
}
-(void) backToCallViewPressed {
[self displayInCall: nil
FromUI:nil
forUser:nil
withDisplayName:nil];
}
/*
@ -139,9 +123,6 @@
// Release any retained subviews of the main view.
// e.g. self.myOutlet = nil;
}
- (void) viewWillAppear:(BOOL)animated {
}
- (BOOL)textFieldShouldReturn:(UITextField *)theTextField {
if (theTextField == address) {
@ -167,79 +148,32 @@
}
}
[address setHidden:false];
if (username) {
[address setText:username];
} //else keep previous
[mDisplayName setText:displayName];
[incallView setHidden:true];
[dialerView setHidden:false];
[__call setEnabled:true];
[hangup setEnabled:false];
[callDuration stop];
UIDevice *device = [UIDevice currentDevice];
device.proximityMonitoringEnabled = NO;
[callLarge setHidden:FALSE];
[callShort setHidden:TRUE];
[backToCallView setHidden:TRUE];
[peerLabel setText:@""];
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"firstlogindone_preference" ] == true) {
//first login case, dismmis first login view
[self dismissModalViewControllerAnimated:true];
};
[mIncallViewController displayDialerFromUI:viewCtrl
forUser:username
withDisplayName:displayName];
[myTabBarController setSelectedIndex:DIALER_TAB_INDEX];
}
-(void) displayInCall: (LinphoneCall*) call ViewforUser:(NSString*) username withDisplayName:(NSString*) displayName {
UIDevice *device = [UIDevice currentDevice];
device.proximityMonitoringEnabled = YES;
if (device.proximityMonitoringEnabled == YES) {
ms_message("Ok this device support proximity, and I just enabled it");
}
[hangup setEnabled:true];
if (displayName && [displayName length]>0) {
[peerLabel setText:displayName];
} else {
[peerLabel setText:username?username:@""];
}
[incallView setHidden:NO];
}
-(void) displayCall:(LinphoneCall*) call InProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
[self displayInCall: call ViewforUser:username
withDisplayName:displayName];
//[__call setEnabled:false];
[callDuration setText:NSLocalizedString(@"Calling...",nil)];
if ([speaker isOn]) [speaker toggle] ; //preset to off
[incallView setHidden:NO];
}
-(void) displayInCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
[callDuration start];
[callDuration setHidden:false];
if (linphone_call_get_dir(linphone_core_get_current_call([LinphoneManager getLc])) == LinphoneCallIncoming) {
[self displayInCall: call ViewforUser:username
withDisplayName:displayName];
if ([speaker isOn]) [speaker toggle] ; //preset to off;
}
[incallView setHidden:NO];
}
-(void) displayVideoCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
ms_message("basic phone view does not support video");
}
//status reporting
-(void) displayStatus:(NSString*) message {
[status setText:message];
}
-(void) updateUIFromLinphoneState:(UIViewController*) viewCtrl {
[mute reset];
[mIncallViewController displayStatus:message];
}
@ -277,6 +211,51 @@
}
}
-(void) backToCallViewPressed {
[self displayInCall: nil
FromUI:nil
forUser:nil
withDisplayName:nil];
}
-(void) displayCall: (LinphoneCall*) call InProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
if (self.presentedViewController != (UIViewController*)mIncallViewController) {
[self presentModalViewController:(UIViewController*)mIncallViewController animated:true];
}
[mIncallViewController displayCall:call InProgressFromUI:viewCtrl
forUser:username
withDisplayName:displayName];
}
-(void) displayInCall: (LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
if (self.presentedViewController != (UIViewController*)mIncallViewController && (call == 0x0 ||
linphone_call_get_dir(call)==LinphoneCallIncoming)){
[self presentModalViewController:(UIViewController*)mIncallViewController animated:true];
}
[mIncallViewController displayInCall:call FromUI:viewCtrl
forUser:username
withDisplayName:displayName];
[callLarge setHidden:TRUE];
[callShort setHidden:FALSE];
[backToCallView setHidden:FALSE];
}
-(void) displayVideoCall:(LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
[mIncallViewController displayVideoCall:call FromUI:viewCtrl
forUser:username
withDisplayName:displayName];
}
- (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex withUserDatas:(void *)datas{
LinphoneCall* call = (LinphoneCall*)datas;
if (buttonIndex == 0 ) {
@ -290,13 +269,9 @@
- (void)dealloc {
[address dealloc];
[ mDisplayName dealloc];
[incallView dealloc];
[dialerView dealloc];
[callDuration dealloc];
[mute dealloc];
[speaker dealloc];
[peerLabel dealloc];
[__call dealloc];
[callShort dealloc];
[callLarge dealloc];
[hangup dealloc];
[status dealloc];
[one dealloc];
@ -313,6 +288,7 @@
[hash dealloc];
[back dealloc];
[myTabBarController release];
[mIncallViewController release];
[super dealloc];
}

View file

@ -138,42 +138,13 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIButton" id="661303162">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<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>
<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">startcall-green.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="442061765">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">clavier-01-160px.png</string>
</object>
<reference key="IBUIFontDescription" ref="857420967"/>
<reference key="IBUIFont" ref="657314226"/>
</object>
<object class="IBUILabel" id="729745965">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{9, 390}, {304, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="319430047"/>
<reference key="NSNextKeyView" ref="58090836"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -300,7 +271,7 @@
<string key="NSFrame">{{0, 196}, {107, 66}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="616388880"/>
<reference key="NSNextKeyView" ref="963225980"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -482,17 +453,49 @@
<reference key="IBUIFontDescription" ref="857420967"/>
<reference key="IBUIFont" ref="657314226"/>
</object>
<object class="IBUIButton" id="319430047">
<object class="IBUIButton" id="58090836">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<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>
<bool key="IBUIEnabled">NO</bool>
<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"/>
<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="398389003">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">clavier-01-160px.png</string>
</object>
<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 class="IBUIButton" id="661303162">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
<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>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
@ -501,61 +504,36 @@
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
<object class="NSCustomResource" key="IBUINormalImage">
<object class="NSCustomResource" key="IBUINormalImage" id="428573416">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">stopcall-red.png</string>
<string key="NSResourceName">startcall-green.png</string>
</object>
<reference key="IBUINormalBackgroundImage" ref="442061765"/>
<reference key="IBUINormalBackgroundImage" ref="398389003"/>
<reference key="IBUIFontDescription" ref="857420967"/>
<reference key="IBUIFont" ref="657314226"/>
</object>
<object class="IBUIView" id="232448859">
<object class="IBUIButton" id="963225980">
<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>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 328}, {320, 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>
<reference key="NSNextKeyView" ref="616388880"/>
<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"/>
<reference key="IBUINormalImage" ref="428573416"/>
<reference key="IBUINormalBackgroundImage" ref="398389003"/>
<reference key="IBUIFontDescription" ref="857420967"/>
<reference key="IBUIFont" ref="657314226"/>
</object>
</object>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
@ -701,22 +679,6 @@
</object>
<int key="connectionID">54</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">hangup</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="319430047"/>
</object>
<int key="connectionID">109</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">incallView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="232448859"/>
</object>
<int key="connectionID">119</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">erase</string>
@ -733,14 +695,6 @@
</object>
<int key="connectionID">158</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">__call</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="661303162"/>
</object>
<int key="connectionID">159</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">backToCallView</string>
@ -749,6 +703,22 @@
</object>
<int key="connectionID">161</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">callShort</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="661303162"/>
</object>
<int key="connectionID">163</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">callLarge</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="963225980"/>
</object>
<int key="connectionID">164</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
@ -807,10 +777,7 @@
<reference ref="607229252"/>
<reference ref="1070392235"/>
<reference ref="465571136"/>
<reference ref="319430047"/>
<reference ref="661303162"/>
<reference ref="729745965"/>
<reference ref="616388880"/>
<reference ref="310945439"/>
<reference ref="602859574"/>
<reference ref="624378925"/>
@ -818,8 +785,11 @@
<reference ref="573280603"/>
<reference ref="539781036"/>
<reference ref="539158319"/>
<reference ref="232448859"/>
<reference ref="235890962"/>
<reference ref="58090836"/>
<reference ref="616388880"/>
<reference ref="661303162"/>
<reference ref="963225980"/>
</object>
<reference key="parent" ref="627403670"/>
</object>
@ -838,32 +808,16 @@
<reference key="object" ref="1070392235"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">114</int>
<reference key="object" ref="232448859"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="58090836"/>
</object>
<reference key="parent" ref="191373211"/>
<string key="objectName">inCall</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">39</int>
<reference key="object" ref="465571136"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">107</int>
<reference key="object" ref="319430047"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">hangup</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="661303162"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">Call</string>
<string key="objectName">Call-short</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">7</int>
@ -936,9 +890,15 @@
<object class="IBObjectRecord">
<int key="objectID">160</int>
<reference key="object" ref="58090836"/>
<reference key="parent" ref="232448859"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">back</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">162</int>
<reference key="object" ref="963225980"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">Call-large</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -951,14 +911,12 @@
<string>-2.IBPluginDependency</string>
<string>1.IBPluginDependency</string>
<string>1.IBUserGuides</string>
<string>107.CustomClassName</string>
<string>107.IBPluginDependency</string>
<string>114.IBPluginDependency</string>
<string>114.IBUserGuides</string>
<string>150.CustomClassName</string>
<string>150.IBPluginDependency</string>
<string>157.IBPluginDependency</string>
<string>160.IBPluginDependency</string>
<string>162.CustomClassName</string>
<string>162.IBPluginDependency</string>
<string>29.CustomClassName</string>
<string>29.IBPluginDependency</string>
<string>30.CustomClassName</string>
@ -1009,21 +967,12 @@
<int key="affinity">1</int>
</object>
</object>
<string>UIHangUpButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view" ref="232448859"/>
<double key="location">90</double>
<int key="affinity">1</int>
</object>
</object>
<string>UIEraseButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UICallButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIDigitButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIDigitButton</string>
@ -1067,7 +1016,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">161</int>
<int key="maxID">164</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1090,11 +1039,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>__call</string>
<string>address</string>
<string>back</string>
<string>backToCallView</string>
<string>callDuration</string>
<string>callLarge</string>
<string>callShort</string>
<string>dialerView</string>
<string>eight</string>
<string>erase</string>
@ -1102,15 +1051,11 @@
<string>four</string>
<string>hangup</string>
<string>hash</string>
<string>incallView</string>
<string>mute</string>
<string>myTabBarController</string>
<string>nine</string>
<string>one</string>
<string>peerLabel</string>
<string>seven</string>
<string>six</string>
<string>speaker</string>
<string>star</string>
<string>status</string>
<string>three</string>
@ -1119,11 +1064,11 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIButton</string>
<string>UITextField</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UILabel</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UIView</string>
<string>UIButton</string>
<string>UIEraseButton</string>
@ -1131,13 +1076,9 @@
<string>UIButton</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UIView</string>
<string>UIButton</string>
<string>UITabBarController</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UILabel</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UIButton</string>
@ -1151,11 +1092,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>__call</string>
<string>address</string>
<string>back</string>
<string>backToCallView</string>
<string>callDuration</string>
<string>callLarge</string>
<string>callShort</string>
<string>dialerView</string>
<string>eight</string>
<string>erase</string>
@ -1163,15 +1104,11 @@
<string>four</string>
<string>hangup</string>
<string>hash</string>
<string>incallView</string>
<string>mute</string>
<string>myTabBarController</string>
<string>nine</string>
<string>one</string>
<string>peerLabel</string>
<string>seven</string>
<string>six</string>
<string>speaker</string>
<string>star</string>
<string>status</string>
<string>three</string>
@ -1180,10 +1117,6 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">__call</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">address</string>
<string key="candidateClassName">UITextField</string>
@ -1197,8 +1130,12 @@
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">callDuration</string>
<string key="candidateClassName">UILabel</string>
<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>
@ -1228,14 +1165,6 @@
<string key="name">hash</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">incallView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">mute</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">myTabBarController</string>
<string key="candidateClassName">UITabBarController</string>
@ -1248,10 +1177,6 @@
<string key="name">one</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">peerLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">seven</string>
<string key="candidateClassName">UIButton</string>
@ -1260,10 +1185,6 @@
<string key="name">six</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">speaker</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">star</string>
<string key="candidateClassName">UIButton</string>
@ -1315,14 +1236,6 @@
<string key="minorKey">./Classes/UIEraseButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIHangUpButton</string>
<string key="superclassName">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIHangUpButton.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
@ -1331,10 +1244,6 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="784" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1280" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
@ -1350,7 +1259,6 @@
<string>clavier-01-160px.png</string>
<string>effacer.png</string>
<string>startcall-green.png</string>
<string>stopcall-red.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1359,7 +1267,6 @@
<string>{160, 60}</string>
<string>{164, 104}</string>
<string>{60, 52}</string>
<string>{62, 54}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">933</string>

View file

@ -47,6 +47,7 @@
<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>
@ -65,17 +66,17 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUIViewController" key="IBUISelectedViewController" id="156830991">
<string key="IBUITitle">History</string>
<object class="IBUITabBarItem" key="IBUITabBarItem" id="1041279701">
<string key="IBUITitle">History</string>
<object class="IBUIViewController" key="IBUISelectedViewController" id="258574391">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="64474689">
<string key="IBUITitle">Dialer</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">history-orange.png</string>
<string key="NSResourceName">dialer-orange.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="952473143"/>
<string key="IBUINibName">PhoneViewController</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
@ -86,18 +87,17 @@
</object>
<object class="NSMutableArray" key="IBUIViewControllers">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="156830991"/>
<object class="IBUIViewController" id="258574391">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="64474689">
<string key="IBUITitle">Dialer</string>
<object class="IBUIViewController" id="156830991">
<string key="IBUITitle">History</string>
<object class="IBUITabBarItem" key="IBUITabBarItem" id="1041279701">
<string key="IBUITitle">History</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">dialer-orange.png</string>
<string key="NSResourceName">history-orange.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="952473143"/>
<string key="IBUINibName">PhoneViewController</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
@ -106,6 +106,7 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<reference ref="258574391"/>
<object class="IBUIViewController" id="383050823">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="672878446">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -140,6 +141,7 @@
<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>
@ -330,7 +332,7 @@
<reference key="dict.values" ref="0"/>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>AdvancedPhoneViewController</string>
<string>PhoneViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>linphoneAppDelegate</string>

View file

@ -20,8 +20,6 @@
220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; };
220FAE4B10767A6A0068D98F /* PhoneMainView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 220FAE4A10767A6A0068D98F /* PhoneMainView.xib */; };
2211DB95147564B400DEE054 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2211DB94147564B400DEE054 /* Settings.bundle */; };
2211DBBC14769C8300DEE054 /* AdvancedPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2211DBBA14769C8200DEE054 /* AdvancedPhoneViewController.m */; };
2211DBBD14769C8300DEE054 /* AdvancedPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2211DBBA14769C8200DEE054 /* AdvancedPhoneViewController.m */; };
2211DBBE14769C8300DEE054 /* CallDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2211DBBB14769C8200DEE054 /* CallDelegate.m */; };
2211DBBF14769C8300DEE054 /* CallDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2211DBBB14769C8200DEE054 /* CallDelegate.m */; };
2211DBC014769CB200DEE054 /* IncallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 222A483212F7176F0075F07F /* IncallViewController.m */; };
@ -379,7 +377,6 @@
2211DB8F147555C800DEE054 /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = "<group>"; };
2211DB911475562600DEE054 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = "<group>"; };
2211DB94147564B400DEE054 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = nogpl/Settings.bundle; sourceTree = "<group>"; };
2211DBBA14769C8200DEE054 /* AdvancedPhoneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdvancedPhoneViewController.m; sourceTree = "<group>"; };
2211DBBB14769C8200DEE054 /* CallDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallDelegate.m; sourceTree = "<group>"; };
2211DBCA1476BE7300DEE054 /* ajouter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ajouter.png; path = Resources/ajouter.png; sourceTree = "<group>"; };
2211DBCB1476BE7300DEE054 /* clavier.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = clavier.png; path = Resources/clavier.png; sourceTree = "<group>"; };
@ -682,7 +679,6 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
2211DBBA14769C8200DEE054 /* AdvancedPhoneViewController.m */,
2211DBBB14769C8200DEE054 /* CallDelegate.m */,
2214EB7012F84668002A5394 /* LinphoneUI */,
2218A92212FBE1340088A667 /* FirstLoginViewController.h */,
@ -1360,7 +1356,6 @@
223963171393CFAF001DE689 /* FastAddressBook.m in Sources */,
22E028B713B4CCBD0068A713 /* VideoViewController.m in Sources */,
22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */,
2211DBBC14769C8300DEE054 /* AdvancedPhoneViewController.m in Sources */,
2211DBBE14769C8300DEE054 /* CallDelegate.m in Sources */,
2211DBC014769CB200DEE054 /* IncallViewController.m in Sources */,
22D817AD147A9F33001CFB9C /* UIAddVideoButton.m in Sources */,
@ -1393,7 +1388,6 @@
22D8F157147548E2008C97DB /* FastAddressBook.m in Sources */,
22D8F158147548E2008C97DB /* VideoViewController.m in Sources */,
22D8F159147548E2008C97DB /* UICamSwitch.m in Sources */,
2211DBBD14769C8300DEE054 /* AdvancedPhoneViewController.m in Sources */,
2211DBBF14769C8300DEE054 /* CallDelegate.m in Sources */,
2211DBC114769CB300DEE054 /* IncallViewController.m in Sources */,
22D817AE147A9F33001CFB9C /* UIAddVideoButton.m in Sources */,