forked from mirrors/linphone-iphone
Merge remote branch 'bc/master' into tunnel
+add tunnel port config Conflicts: linphone.xcodeproj/project.pbxproj
This commit is contained in:
Jehan Monnier
commit
5273ace75c
10 changed files with 420 additions and 210 deletions
|
|
@ -409,10 +409,14 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
|
|||
//tunnel
|
||||
BOOL lTunnelPrefEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"tunnel_enabled_preference"];
|
||||
NSString* lTunnelPrefAddress = [[NSUserDefaults standardUserDefaults] stringForKey:@"tunnel_address_preference"];
|
||||
|
||||
NSString* lTunnelPrefPort = [[NSUserDefaults standardUserDefaults] stringForKey:@"tunnel_port_preference"];
|
||||
int lTunnelPort = 443;
|
||||
if (lTunnelPrefPort && [lTunnelPrefPort length] > 0 && [lTunnelPrefPort intValue]) {
|
||||
lTunnelPort = [lTunnelPrefPort intValue];
|
||||
}
|
||||
if (lTunnelPrefAddress && [lTunnelPrefAddress length]) {
|
||||
sTunnelMgr->cleanServers();
|
||||
sTunnelMgr->addServer([lTunnelPrefAddress cStringUsingEncoding:[NSString defaultCStringEncoding]],443);
|
||||
sTunnelMgr->addServer([lTunnelPrefAddress cStringUsingEncoding:[NSString defaultCStringEncoding]],lTunnelPort);
|
||||
}
|
||||
sTunnelMgr->enable(lTunnelPrefEnabled);
|
||||
|
||||
|
|
|
|||
29
Classes/LinphoneUI/UIEraseButton.h
Normal file
29
Classes/LinphoneUI/UIEraseButton.h
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/* UIEraseButton.h
|
||||
*
|
||||
* Copyright (C) 2011 Belledonne Comunications, Grenoble, France
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
|
||||
@interface UIEraseButton : UIButton {
|
||||
@private
|
||||
UITextField* mAddress;
|
||||
|
||||
}
|
||||
-(void) initWithAddressField:(UITextField*) address;
|
||||
@end
|
||||
40
Classes/LinphoneUI/UIEraseButton.m
Normal file
40
Classes/LinphoneUI/UIEraseButton.m
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
/* UIEraseButton.m
|
||||
*
|
||||
* Copyright (C) 2011 Belledonne Comunications, Grenoble, France
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import "UIEraseButton.h"
|
||||
|
||||
|
||||
@implementation UIEraseButton
|
||||
-(void) touchUp:(id) sender {
|
||||
if ([mAddress.text length] > 0) {
|
||||
[mAddress setText:[mAddress.text substringToIndex:[mAddress.text length]-1]];
|
||||
}
|
||||
}
|
||||
|
||||
-(void) initWithAddressField:(UITextField*) address {
|
||||
mAddress = address;
|
||||
[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside];
|
||||
}
|
||||
|
||||
- (void)dealloc {
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
|
@ -24,4 +24,5 @@
|
|||
#import "UIMuteButton.h"
|
||||
#import "UISpeakerButton.h"
|
||||
#import "UIDuration.h"
|
||||
#import "UIEraseButton.h"
|
||||
#import "LinphoneUIDelegates.h"
|
||||
|
|
|
|||
|
|
@ -29,8 +29,10 @@
|
|||
|
||||
@private
|
||||
//UI definition
|
||||
UIView* dialerView;
|
||||
UITextField* address;
|
||||
UILabel* mDisplayName;
|
||||
UIEraseButton* erase;
|
||||
|
||||
UIView* incallView;
|
||||
UIDuration* callDuration;
|
||||
|
|
@ -66,10 +68,12 @@
|
|||
FirstLoginViewController* myFirstLoginViewController;
|
||||
|
||||
}
|
||||
@property (nonatomic, retain) IBOutlet UIView* dialerView;
|
||||
@property (nonatomic, retain) IBOutlet UITextField* address;
|
||||
@property (nonatomic, retain) IBOutlet UIButton* call;
|
||||
@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;
|
||||
|
|
|
|||
|
|
@ -26,10 +26,13 @@
|
|||
|
||||
|
||||
@implementation PhoneViewController
|
||||
@synthesize dialerView ;
|
||||
@synthesize address ;
|
||||
@synthesize call;
|
||||
@synthesize hangup;
|
||||
@synthesize status;
|
||||
@synthesize erase;
|
||||
|
||||
|
||||
@synthesize incallView;
|
||||
@synthesize callDuration;
|
||||
|
|
@ -117,7 +120,7 @@
|
|||
[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"] ];
|
||||
|
||||
[erase initWithAddressField:address];
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -173,9 +176,11 @@
|
|||
|
||||
[mDisplayName setText:displayName];
|
||||
[incallView setHidden:true];
|
||||
[dialerView setHidden:false];
|
||||
|
||||
[call setEnabled:true];
|
||||
[hangup setEnabled:false];
|
||||
|
||||
|
||||
[callDuration stop];
|
||||
|
||||
[peerLabel setText:@""];
|
||||
|
|
@ -195,6 +200,7 @@
|
|||
}
|
||||
[address setHidden:true];
|
||||
[incallView setHidden:false];
|
||||
[dialerView setHidden:true];
|
||||
}
|
||||
-(void) displayCallInProgressFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
|
||||
[self displayIncalViewforUser:username
|
||||
|
|
@ -260,6 +266,7 @@
|
|||
[address dealloc];
|
||||
[ mDisplayName dealloc];
|
||||
[incallView dealloc];
|
||||
[dialerView dealloc];
|
||||
[callDuration dealloc];
|
||||
[mute dealloc];
|
||||
[speaker dealloc];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</object>
|
||||
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<integer value="114"/>
|
||||
<integer value="4"/>
|
||||
</object>
|
||||
<object class="NSArray" key="IBDocument.PluginDependencies">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
<object class="IBUILabel" id="323870097">
|
||||
<reference key="NSNextResponder" ref="232448859"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{98, 46}, {124, 21}}</string>
|
||||
<string key="NSFrame">{{98, 38}, {124, 21}}</string>
|
||||
<reference key="NSSuperview" ref="232448859"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClipsSubviews">YES</bool>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
<object class="IBUIButton" id="963349321">
|
||||
<reference key="NSNextResponder" ref="232448859"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{241, 38}, {72, 37}}</string>
|
||||
<string key="NSFrame">{{239, 14}, {72, 37}}</string>
|
||||
<reference key="NSSuperview" ref="232448859"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
<object class="IBUIButton" id="743511023">
|
||||
<reference key="NSNextResponder" ref="232448859"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{0, 38}, {72, 37}}</string>
|
||||
<string key="NSFrame">{{0, 14}, {72, 37}}</string>
|
||||
<reference key="NSSuperview" ref="232448859"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<string key="NSFrameSize">{320, 90}</string>
|
||||
<string key="NSFrameSize">{320, 65}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">1</int>
|
||||
|
|
@ -147,10 +147,78 @@
|
|||
<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>
|
||||
<object class="NSMutableArray" key="NSSubviews">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBUIButton" id="366108332">
|
||||
<reference key="NSNextResponder" ref="235890962"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{254, 0}, {66, 65}}</string>
|
||||
<reference key="NSSuperview" ref="235890962"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIContentHorizontalAlignment">0</int>
|
||||
<int key="IBUIContentVerticalAlignment">0</int>
|
||||
<reference key="IBUIFont" ref="551268947"/>
|
||||
<string key="IBUINormalTitle"><-</string>
|
||||
<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
|
||||
<object class="NSColor" key="IBUINormalTitleColor">
|
||||
<int key="NSColorSpace">1</int>
|
||||
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="553476442">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">clavier-01-106px.png</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBUITextField" id="751637181">
|
||||
<reference key="NSNextResponder" ref="235890962"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{5, 0}, {255, 66}}</string>
|
||||
<reference key="NSSuperview" ref="235890962"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIContentVerticalAlignment">0</int>
|
||||
<string key="IBUIText"/>
|
||||
<string key="IBUIPlaceholder">sip:</string>
|
||||
<object class="NSColor" key="IBUITextColor">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MAA</bytes>
|
||||
<object class="NSColorSpace" key="NSCustomColorSpace">
|
||||
<int key="NSID">2</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSFont" key="IBUIFont">
|
||||
<string key="NSName">Helvetica</string>
|
||||
<double key="NSSize">36</double>
|
||||
<int key="NSfFlags">16</int>
|
||||
</object>
|
||||
<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
|
||||
<float key="IBUIMinimumFontSize">15</float>
|
||||
<object class="IBUITextInputTraits" key="IBUITextInputTraits">
|
||||
<int key="IBUIAutocorrectionType">1</int>
|
||||
<int key="IBUIKeyboardType">3</int>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
</object>
|
||||
<int key="IBUIClearButtonMode">1</int>
|
||||
</object>
|
||||
</object>
|
||||
<string key="NSFrameSize">{320, 65}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">1</int>
|
||||
<bytes key="NSRGB">MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA</bytes>
|
||||
</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, 331}, {160, 60}}</string>
|
||||
<string key="NSFrame">{{0, 328}, {160, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -176,7 +244,7 @@
|
|||
<object class="IBUILabel" id="729745965">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{9, 389}, {304, 21}}</string>
|
||||
<string key="NSFrame">{{9, 390}, {304, 21}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClipsSubviews">YES</bool>
|
||||
|
|
@ -191,7 +259,7 @@
|
|||
<object class="IBUIButton" id="1070392235">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{213, 91}, {107, 60}}</string>
|
||||
<string key="NSFrame">{{213, 64}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -206,15 +274,12 @@
|
|||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="735296417">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">clavier-01-106px.png</string>
|
||||
</object>
|
||||
<reference key="IBUINormalBackgroundImage" ref="553476442"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="539158319">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{0, 151}, {107, 60}}</string>
|
||||
<string key="NSFrame">{{0, 130}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -229,12 +294,12 @@
|
|||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="735296417"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="553476442"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="539781036">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{107, 151}, {106, 60}}</string>
|
||||
<string key="NSFrame">{{107, 130}, {106, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -257,7 +322,7 @@
|
|||
<object class="IBUIButton" id="573280603">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{213, 151}, {107, 60}}</string>
|
||||
<string key="NSFrame">{{213, 130}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -272,12 +337,12 @@
|
|||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="735296417"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="553476442"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="150499342">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{0, 211}, {107, 60}}</string>
|
||||
<string key="NSFrame">{{0, 196}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -292,12 +357,12 @@
|
|||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="735296417"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="553476442"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="624378925">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{213, 211}, {107, 60}}</string>
|
||||
<string key="NSFrame">{{213, 196}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -312,12 +377,12 @@
|
|||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="735296417"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="553476442"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="607229252">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{107, 91}, {106, 60}}</string>
|
||||
<string key="NSFrame">{{107, 64}, {106, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -337,7 +402,7 @@
|
|||
<object class="IBUIButton" id="201618948">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{0, 91}, {107, 60}}</string>
|
||||
<string key="NSFrame">{{0, 64}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">1</int>
|
||||
|
|
@ -356,12 +421,12 @@
|
|||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="735296417"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="553476442"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="465571136">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{0, 271}, {107, 60}}</string>
|
||||
<string key="NSFrame">{{0, 262}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -376,12 +441,12 @@
|
|||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="735296417"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="553476442"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="602859574">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{107, 271}, {106, 60}}</string>
|
||||
<string key="NSFrame">{{107, 262}, {106, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -401,7 +466,7 @@
|
|||
<object class="IBUIButton" id="310945439">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{213, 271}, {107, 60}}</string>
|
||||
<string key="NSFrame">{{213, 262}, {107, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -416,12 +481,12 @@
|
|||
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
|
||||
</object>
|
||||
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="735296417"/>
|
||||
<reference key="IBUINormalBackgroundImage" ref="553476442"/>
|
||||
</object>
|
||||
<object class="IBUIButton" id="616388880">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{107, 211}, {106, 60}}</string>
|
||||
<string key="NSFrame">{{107, 196}, {106, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -441,7 +506,7 @@
|
|||
<object class="IBUIButton" id="319430047">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{160, 331}, {160, 60}}</string>
|
||||
<string key="NSFrame">{{160, 328}, {160, 66}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
|
|
@ -462,39 +527,6 @@
|
|||
</object>
|
||||
<reference key="IBUINormalBackgroundImage" ref="442061765"/>
|
||||
</object>
|
||||
<object class="IBUITextField" id="751637181">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{20, 30}, {282, 31}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIContentVerticalAlignment">0</int>
|
||||
<string key="IBUIText"/>
|
||||
<int key="IBUIBorderStyle">3</int>
|
||||
<string key="IBUIPlaceholder">sip:</string>
|
||||
<object class="NSColor" key="IBUITextColor">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MAA</bytes>
|
||||
<object class="NSColorSpace" key="NSCustomColorSpace">
|
||||
<int key="NSID">2</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSFont" key="IBUIFont">
|
||||
<string key="NSName">Helvetica</string>
|
||||
<double key="NSSize">24</double>
|
||||
<int key="NSfFlags">16</int>
|
||||
</object>
|
||||
<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
|
||||
<float key="IBUIMinimumFontSize">17</float>
|
||||
<object class="IBUITextInputTraits" key="IBUITextInputTraits">
|
||||
<int key="IBUIAutocorrectionType">1</int>
|
||||
<int key="IBUIKeyboardType">3</int>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
</object>
|
||||
<int key="IBUIClearButtonMode">3</int>
|
||||
</object>
|
||||
</object>
|
||||
<string key="NSFrameSize">{320, 460}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
|
|
@ -709,6 +741,22 @@
|
|||
</object>
|
||||
<int key="connectionID">125</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">erase</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="366108332"/>
|
||||
</object>
|
||||
<int key="connectionID">151</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">dialerView</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="235890962"/>
|
||||
</object>
|
||||
<int key="connectionID">158</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||
<object class="NSArray" key="orderedObjects">
|
||||
|
|
@ -744,41 +792,26 @@
|
|||
<reference key="object" ref="191373211"/>
|
||||
<object class="NSMutableArray" key="children">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference ref="1070392235"/>
|
||||
<reference ref="539158319"/>
|
||||
<reference ref="539781036"/>
|
||||
<reference ref="573280603"/>
|
||||
<reference ref="150499342"/>
|
||||
<reference ref="624378925"/>
|
||||
<reference ref="607229252"/>
|
||||
<reference ref="602859574"/>
|
||||
<reference ref="310945439"/>
|
||||
<reference ref="616388880"/>
|
||||
<reference ref="729745965"/>
|
||||
<reference ref="661303162"/>
|
||||
<reference ref="319430047"/>
|
||||
<reference ref="465571136"/>
|
||||
<reference ref="751637181"/>
|
||||
<reference ref="232448859"/>
|
||||
<reference ref="201618948"/>
|
||||
<reference ref="607229252"/>
|
||||
<reference ref="1070392235"/>
|
||||
<reference ref="232448859"/>
|
||||
<reference ref="465571136"/>
|
||||
<reference ref="319430047"/>
|
||||
<reference ref="661303162"/>
|
||||
<reference ref="729745965"/>
|
||||
<reference ref="616388880"/>
|
||||
<reference ref="310945439"/>
|
||||
<reference ref="602859574"/>
|
||||
<reference ref="624378925"/>
|
||||
<reference ref="150499342"/>
|
||||
<reference ref="573280603"/>
|
||||
<reference ref="539781036"/>
|
||||
<reference ref="539158319"/>
|
||||
<reference ref="235890962"/>
|
||||
</object>
|
||||
<reference key="parent" ref="627403670"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">41</int>
|
||||
<reference key="object" ref="310945439"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">40</int>
|
||||
<reference key="object" ref="602859574"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</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">38</int>
|
||||
<reference key="object" ref="201618948"/>
|
||||
|
|
@ -789,6 +822,85 @@
|
|||
<reference key="object" ref="607229252"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">29</int>
|
||||
<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="963349321"/>
|
||||
<reference ref="323870097"/>
|
||||
<reference ref="743511023"/>
|
||||
<reference ref="397196327"/>
|
||||
</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"/>
|
||||
<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>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">7</int>
|
||||
<reference key="object" ref="729745965"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">35</int>
|
||||
<reference key="object" ref="616388880"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">41</int>
|
||||
<reference key="object" ref="310945439"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">40</int>
|
||||
<reference key="object" ref="602859574"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">36</int>
|
||||
<reference key="object" ref="624378925"/>
|
||||
|
|
@ -815,75 +927,28 @@
|
|||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">29</int>
|
||||
<reference key="object" ref="1070392235"/>
|
||||
<int key="objectID">157</int>
|
||||
<reference key="object" ref="235890962"/>
|
||||
<object class="NSMutableArray" key="children">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference ref="751637181"/>
|
||||
<reference ref="366108332"/>
|
||||
</object>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
<string key="objectName">Dialer</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">7</int>
|
||||
<reference key="object" ref="729745965"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">5</int>
|
||||
<reference key="object" ref="661303162"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
<string key="objectName">Call</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">35</int>
|
||||
<reference key="object" ref="616388880"/>
|
||||
<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>
|
||||
<int key="objectID">150</int>
|
||||
<reference key="object" ref="366108332"/>
|
||||
<reference key="parent" ref="235890962"/>
|
||||
<string key="objectName">Erase</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">4</int>
|
||||
<reference key="object" ref="751637181"/>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
<reference key="parent" ref="235890962"/>
|
||||
<string key="objectName">Address</string>
|
||||
</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="963349321"/>
|
||||
<reference ref="743511023"/>
|
||||
<reference ref="323870097"/>
|
||||
<reference ref="397196327"/>
|
||||
</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">118</int>
|
||||
<reference key="object" ref="743511023"/>
|
||||
<reference key="parent" ref="232448859"/>
|
||||
<string key="objectName">mute</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">115</int>
|
||||
<reference key="object" ref="397196327"/>
|
||||
<reference key="parent" ref="232448859"/>
|
||||
<string key="objectName">display</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="flattenedProperties">
|
||||
|
|
@ -900,15 +965,24 @@
|
|||
<string>114.IBEditorWindowLastContentRect</string>
|
||||
<string>114.IBPluginDependency</string>
|
||||
<string>114.IBUserGuides</string>
|
||||
<string>114.IBViewBoundsToFrameTransform</string>
|
||||
<string>115.IBPluginDependency</string>
|
||||
<string>116.CustomClassName</string>
|
||||
<string>116.IBPluginDependency</string>
|
||||
<string>116.IBViewBoundsToFrameTransform</string>
|
||||
<string>117.CustomClassName</string>
|
||||
<string>117.IBPluginDependency</string>
|
||||
<string>117.IBViewBoundsToFrameTransform</string>
|
||||
<string>118.CustomClassName</string>
|
||||
<string>118.IBPluginDependency</string>
|
||||
<string>118.IBViewBoundsToFrameTransform</string>
|
||||
<string>150.CustomClassName</string>
|
||||
<string>150.IBPluginDependency</string>
|
||||
<string>150.IBViewBoundsToFrameTransform</string>
|
||||
<string>157.IBPluginDependency</string>
|
||||
<string>29.CustomClassName</string>
|
||||
<string>29.IBPluginDependency</string>
|
||||
<string>29.IBViewBoundsToFrameTransform</string>
|
||||
<string>30.CustomClassName</string>
|
||||
<string>30.IBPluginDependency</string>
|
||||
<string>31.CustomClassName</string>
|
||||
|
|
@ -923,11 +997,14 @@
|
|||
<string>36.IBPluginDependency</string>
|
||||
<string>37.CustomClassName</string>
|
||||
<string>37.IBPluginDependency</string>
|
||||
<string>37.IBViewBoundsToFrameTransform</string>
|
||||
<string>38.CustomClassName</string>
|
||||
<string>38.IBPluginDependency</string>
|
||||
<string>38.IBViewBoundsToFrameTransform</string>
|
||||
<string>39.CustomClassName</string>
|
||||
<string>39.IBPluginDependency</string>
|
||||
<string>4.IBPluginDependency</string>
|
||||
<string>4.IBViewBoundsToFrameTransform</string>
|
||||
<string>40.CustomClassName</string>
|
||||
<string>40.IBPluginDependency</string>
|
||||
<string>41.CustomClassName</string>
|
||||
|
|
@ -953,7 +1030,7 @@
|
|||
</object>
|
||||
<object class="IBUserGuide">
|
||||
<reference key="view" ref="191373211"/>
|
||||
<double key="location">90</double>
|
||||
<double key="location">65</double>
|
||||
<int key="affinity">1</int>
|
||||
</object>
|
||||
</object>
|
||||
|
|
@ -969,13 +1046,34 @@
|
|||
<int key="affinity">1</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSAffineTransform"/>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UIDuration</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<object class="NSAffineTransform">
|
||||
<bytes key="NSTransformStruct">P4AAAL+AAABCxAAAwoIAAA</bytes>
|
||||
</object>
|
||||
<string>UISpeakerButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<object class="NSAffineTransform">
|
||||
<bytes key="NSTransformStruct">P4AAAL+AAABDcQAAwpIAAA</bytes>
|
||||
</object>
|
||||
<string>UIMuteButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<object class="NSAffineTransform">
|
||||
<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAwpIAAA</bytes>
|
||||
</object>
|
||||
<string>UIEraseButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<object class="NSAffineTransform">
|
||||
<bytes key="NSTransformStruct">AUNxAAAAAAAAA</bytes>
|
||||
</object>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UIDigitButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<object class="NSAffineTransform">
|
||||
<bytes key="NSTransformStruct">P4AAAL+AAABDVQAAwxsAAA</bytes>
|
||||
</object>
|
||||
<string>UIDigitButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UIDigitButton</string>
|
||||
|
|
@ -990,13 +1088,18 @@
|
|||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UIDigitButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<object class="NSAffineTransform">
|
||||
<bytes key="NSTransformStruct">P4AAAL+AAABC1gAAwxsAAA</bytes>
|
||||
</object>
|
||||
<string>UIDigitButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UIDigitButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<object class="NSAffineTransform">
|
||||
<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAwxsAAA</bytes>
|
||||
</object>
|
||||
<string>UIDigitButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<object class="NSAffineTransform"/>
|
||||
<string>UIDigitButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>UIDigitButton</string>
|
||||
|
|
@ -1004,7 +1107,7 @@
|
|||
<string>UICallButton</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>{{53, 318}, {320, 480}}</string>
|
||||
<string>{{60, 553}, {320, 480}}</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
</object>
|
||||
</object>
|
||||
|
|
@ -1024,7 +1127,7 @@
|
|||
</object>
|
||||
</object>
|
||||
<nil key="sourceID"/>
|
||||
<int key="maxID">149</int>
|
||||
<int key="maxID">158</int>
|
||||
</object>
|
||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||
|
|
@ -1033,42 +1136,14 @@
|
|||
<string key="className">PhoneViewController</string>
|
||||
<string key="superclassName">UIViewController</string>
|
||||
<object class="NSMutableDictionary" key="actions">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>doAction:</string>
|
||||
<string>doKeyPad:</string>
|
||||
<string>doKeyPadUp:</string>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
</object>
|
||||
<string key="NS.key.0">doKeyPad:</string>
|
||||
<string key="NS.object.0">id</string>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>doAction:</string>
|
||||
<string>doKeyPad:</string>
|
||||
<string>doKeyPadUp:</string>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">doAction:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">doKeyPad:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">doKeyPadUp:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<string key="NS.key.0">doKeyPad:</string>
|
||||
<object class="IBActionInfo" key="NS.object.0">
|
||||
<string key="name">doKeyPad:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="outlets">
|
||||
|
|
@ -1079,13 +1154,16 @@
|
|||
<string>back</string>
|
||||
<string>call</string>
|
||||
<string>callDuration</string>
|
||||
<string>dialerView</string>
|
||||
<string>eight</string>
|
||||
<string>erase</string>
|
||||
<string>five</string>
|
||||
<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>
|
||||
|
|
@ -1104,13 +1182,16 @@
|
|||
<string>UIButton</string>
|
||||
<string>UIButton</string>
|
||||
<string>UILabel</string>
|
||||
<string>UIView</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIEraseButton</string>
|
||||
<string>UIButton</string>
|
||||
<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>
|
||||
|
|
@ -1132,13 +1213,16 @@
|
|||
<string>back</string>
|
||||
<string>call</string>
|
||||
<string>callDuration</string>
|
||||
<string>dialerView</string>
|
||||
<string>eight</string>
|
||||
<string>erase</string>
|
||||
<string>five</string>
|
||||
<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>
|
||||
|
|
@ -1169,10 +1253,18 @@
|
|||
<string key="name">callDuration</string>
|
||||
<string key="candidateClassName">UILabel</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">dialerView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">eight</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">erase</string>
|
||||
<string key="candidateClassName">UIEraseButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">five</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
|
|
@ -1197,6 +1289,10 @@
|
|||
<string key="name">mute</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">myTabBarController</string>
|
||||
<string key="candidateClassName">UITabBarController</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">nine</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
|
|
@ -1280,6 +1376,14 @@
|
|||
<string key="minorKey">Classes/LinphoneUI/UIDuration.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">UIEraseButton</string>
|
||||
<string key="superclassName">UIButton</string>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
<string key="minorKey">Classes/LinphoneUI/UIEraseButton.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">UIHangUpButton</string>
|
||||
<string key="superclassName">UIButton</string>
|
||||
|
|
@ -1462,6 +1566,14 @@
|
|||
<string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">UITabBarController</string>
|
||||
<string key="superclassName">UIViewController</string>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="312374127">
|
||||
<string key="majorKey">IBFrameworkSource</string>
|
||||
<string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">UITextField</string>
|
||||
<string key="superclassName">UIControl</string>
|
||||
|
|
@ -1512,10 +1624,7 @@
|
|||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">UIViewController</string>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBFrameworkSource</string>
|
||||
<string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
|
||||
</object>
|
||||
<reference key="sourceIdentifier" ref="312374127"/>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">UIViewController</string>
|
||||
|
|
|
|||
|
|
@ -174,6 +174,14 @@
|
|||
<key>Key</key>
|
||||
<string>tunnel_address_preference</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Type</key>
|
||||
<string>PSTextFieldSpecifier</string>
|
||||
<key>Title</key>
|
||||
<string>port</string>
|
||||
<key>Key</key>
|
||||
<string>tunnel_port_preference</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Type</key>
|
||||
<string>PSToggleSwitchSpecifier</string>
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@
|
|||
22B5EFE510CE5E5800777D97 /* ContactPickerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22B5EFE410CE5E5800777D97 /* ContactPickerDelegate.m */; };
|
||||
22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5F03410CE6B2F00777D97 /* AddressBook.framework */; };
|
||||
22BB1B9313311915005CD7AA /* libtunnel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BB1B9213311915005CD7AA /* libtunnel.a */; };
|
||||
22BB1D3613322A58005CD7AA /* UIEraseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22BB1D3413322A58005CD7AA /* UIEraseButton.m */; };
|
||||
22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */; };
|
||||
22C7564D13265CF8007BC101 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22C7564C13265CF8007BC101 /* libcrypto.a */; };
|
||||
22C7564F13265CF8007BC101 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22C7564E13265CF8007BC101 /* libssl.a */; };
|
||||
|
|
@ -296,6 +297,8 @@
|
|||
22B5EFE410CE5E5800777D97 /* ContactPickerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactPickerDelegate.m; sourceTree = "<group>"; };
|
||||
22B5F03410CE6B2F00777D97 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
|
||||
22BB1B9213311915005CD7AA /* libtunnel.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtunnel.a; path = "/Users/jehanmonnier/workspaces/workspace-iphone-port/linphone-iphone/liblinphone-sdk/apple-darwin/lib/libtunnel.a"; sourceTree = "<absolute>"; };
|
||||
22BB1D3413322A58005CD7AA /* UIEraseButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIEraseButton.m; sourceTree = "<group>"; };
|
||||
22BB1D3513322A58005CD7AA /* UIEraseButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEraseButton.h; sourceTree = "<group>"; };
|
||||
22C7555E1317E59C007BC101 /* UIBluetoothButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIBluetoothButton.h; sourceTree = "<group>"; };
|
||||
22C7555F1317E59C007BC101 /* UIBluetoothButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIBluetoothButton.m; sourceTree = "<group>"; };
|
||||
22C7560513265C6A007BC101 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
|
||||
|
|
@ -659,6 +662,8 @@
|
|||
2214EB7012F84668002A5394 /* LinphoneUI */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
22BB1D3413322A58005CD7AA /* UIEraseButton.m */,
|
||||
22BB1D3513322A58005CD7AA /* UIEraseButton.h */,
|
||||
2248E90C12F7E4CF00220D9C /* UIDigitButton.h */,
|
||||
2248E90D12F7E4CF00220D9C /* UIDigitButton.m */,
|
||||
2248E99D12F801C200220D9C /* LinphoneManager.h */,
|
||||
|
|
@ -1004,6 +1009,7 @@
|
|||
2218A92512FBE1340088A667 /* FirstLoginViewController.m in Sources */,
|
||||
22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */,
|
||||
22323037132A28AE00F10886 /* TunnelManager.cc in Sources */,
|
||||
22BB1D3613322A58005CD7AA /* UIEraseButton.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -79,16 +79,16 @@ veryclean:
|
|||
rm -rf $(BUILDER_BUILD_DIR)
|
||||
|
||||
build-linphone: build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile
|
||||
cd $(LINPHONE_BUILD_DIR) && make newdate && make && make install
|
||||
cd $(LINPHONE_BUILD_DIR) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install
|
||||
|
||||
clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-msilbc clean-libilbc
|
||||
cd $(LINPHONE_BUILD_DIR) && make clean
|
||||
|
||||
veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msiounit veryclean-msilbc veryclean-libilbc
|
||||
veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc
|
||||
cd $(LINPHONE_BUILD_DIR) && make distclean
|
||||
cd $(LINPHONE_SRC_DIR) && rm -f configure
|
||||
|
||||
clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-libilbc clean-makefile-msilbc
|
||||
clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-libilbc clean-makefile-msilbc
|
||||
cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile
|
||||
|
||||
|
||||
|
|
@ -104,10 +104,10 @@ $(LINPHONE_BUILD_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure
|
|||
|
||||
|
||||
#libphone only (asume dependencies are met)
|
||||
build-liblinphone: $(LINPHONE_BUILD_DIR)/Makefile
|
||||
cd $(LINPHONE_BUILD_DIR) && make newdate && make && make install
|
||||
build-liblinphone: $(LINPHONE_BUILD_DIR)/Makefile
|
||||
cd $(LINPHONE_BUILD_DIR) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install
|
||||
|
||||
clean-makefile-liblinphone:
|
||||
clean-makefile-liblinphone:
|
||||
cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile
|
||||
|
||||
clean-liblinphone:
|
||||
|
|
@ -124,7 +124,7 @@ $(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(osip_dir)/config
|
|||
$(BUILDER_SRC_DIR)/$(osip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
|
||||
|
||||
build-osip2: $(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make && make install
|
||||
cd $(BUILDER_BUILD_DIR)/$(osip_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
clean-osip2:
|
||||
cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make clean
|
||||
|
|
@ -147,7 +147,9 @@ $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/co
|
|||
$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto" --enable-openssl --disable-tools
|
||||
|
||||
build-eXosip2: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make DEFS="-DHAVE_CONFIG_H -include $(BUILDER_SRC_DIR)/$(eXosip_dir)/include/eXosip2/eXosip_transport_hook.h" && make install
|
||||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) \
|
||||
&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
make DEFS="-DHAVE_CONFIG_H -include $(BUILDER_SRC_DIR)/$(eXosip_dir)/include/eXosip2/eXosip_transport_hook.h" && make install
|
||||
|
||||
clean-eXosip2:
|
||||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make clean
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue