mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add call transfert

Browse source 
Add missing backgrounds
This commit is contained in:
Yann Diorcet 2012-07-03 17:32:41 +02:00
parent c5790060b3
commit c4fd64c36e
36 changed files with 1141 additions and 326 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Classes/ContactsViewController.xib
View file

@ -156,11 +156,10 @@
<string key="NSFrame">{{0, 58}, {320, 402}}</string>
<reference key="NSSuperview" ref="812520855"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:10</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>

8
Classes/DialerViewController.h
View file

@ -21,10 +21,10 @@
#import "UIEraseButton.h"
#import "UICallButton.h"
#import "UITransferButton.h"
#import "UIDigitButton.h"
@interface DialerViewController : UIViewController <UITextFieldDelegate>{
@private
//Buttons
UITextField* addressField;
@ -33,6 +33,7 @@
UIEraseButton* eraseButton;
UICallButton* callButton;
UICallButton* addCallButton;
UITransferButton* transferButton;
//Key pad
UIDigitButton* oneButton;
@ -47,14 +48,18 @@
UIDigitButton* starButton;
UIDigitButton* zeroButton;
UIDigitButton* sharpButton;
BOOL transferMode;
}
- (void)setAddress:(NSString*) address;
- (void)setTransferMode:(NSNumber*) enable;
@property (nonatomic, retain) IBOutlet UITextField* addressField;
@property (nonatomic, retain) IBOutlet UIButton* addContactButton;
@property (nonatomic, retain) IBOutlet UICallButton* callButton;
@property (nonatomic, retain) IBOutlet UICallButton* addCallButton;
@property (nonatomic, retain) IBOutlet UITransferButton* transferButton;
@property (nonatomic, retain) IBOutlet UIButton* cancelButton;
@property (nonatomic, retain) IBOutlet UIEraseButton* eraseButton;
@ -73,7 +78,6 @@
- (IBAction)onAddContactClick: (id) event;
- (IBAction)onBackClick: (id) event;
- (IBAction)onAddCallClick: (id) event;
- (IBAction)onAddressChange: (id)sender;
@end

56
Classes/DialerViewController.m
View file

@ -34,6 +34,7 @@
@synthesize addContactButton;
@synthesize cancelButton;
@synthesize addCallButton;
@synthesize transferButton;
@synthesize callButton;
@synthesize eraseButton;
@ -53,7 +54,11 @@
#pragma mark - Lifecycle Functions
- (id)init {
return [super initWithNibName:@"DialerViewController" bundle:[NSBundle mainBundle]];
self = [super initWithNibName:@"DialerViewController" bundle:[NSBundle mainBundle]];
if(self) {
self->transferMode = FALSE;
}
return self;
}
- (void)dealloc {
@ -63,6 +68,7 @@
[eraseButton release];
[callButton release];
[addCallButton release];
[transferButton release];
[oneButton release];
[twoButton release];
@ -93,21 +99,18 @@
- (void)viewDidLoad {
[super viewDidLoad];
[zeroButton initWithNumber:'0' addressField:addressField dtmf:false];
[oneButton initWithNumber:'1' addressField:addressField dtmf:false];
[twoButton initWithNumber:'2' addressField:addressField dtmf:false];
[threeButton initWithNumber:'3' addressField:addressField dtmf:false];
[fourButton initWithNumber:'4' addressField:addressField dtmf:false];
[fiveButton initWithNumber:'5' addressField:addressField dtmf:false];
[sixButton initWithNumber:'6' addressField:addressField dtmf:false];
[sevenButton initWithNumber:'7' addressField:addressField dtmf:false];
[eightButton initWithNumber:'8' addressField:addressField dtmf:false];
[nineButton initWithNumber:'9' addressField:addressField dtmf:false];
[starButton initWithNumber:'*' addressField:addressField dtmf:false];
[sharpButton initWithNumber:'#' addressField:addressField dtmf:false];
[callButton initWithAddress:addressField];
[addCallButton initWithAddress:addressField];
[eraseButton initWithAddressField:addressField];
[zeroButton setDigit:'0'];
[oneButton setDigit:'1'];
[twoButton setDigit:'2'];
[threeButton setDigit:'3'];
[fourButton setDigit:'4'];
[fiveButton setDigit:'5'];
[sixButton setDigit:'6'];
[sevenButton setDigit:'7'];
[eightButton setDigit:'8'];
[nineButton setDigit:'9'];
[starButton setDigit:'*'];
[sharpButton setDigit:'#'];
// Set observer
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(callUpdate:) name:@"LinphoneCallUpdate" object:nil];
@ -131,7 +134,13 @@
if([LinphoneManager isLcReady]) {
LinphoneCore *lc = [LinphoneManager getLc];
if(linphone_core_get_calls_nb(lc) > 0) {
[addCallButton setHidden:false];
if(transferMode) {
[addCallButton setHidden:true];
[transferButton setHidden:false];
} else {
[addCallButton setHidden:false];
[transferButton setHidden:true];
}
[callButton setHidden:true];
[cancelButton setHidden:false];
[addContactButton setHidden:true];
@ -140,15 +149,20 @@
[callButton setHidden:false];
[cancelButton setHidden:true];
[addContactButton setHidden:false];
[transferButton setHidden:true];
}
}
}
- (void)setAddress:(NSString*) address {
[addressField setText:address];
}
- (void)setTransferMode:(NSNumber*) n {
transferMode = [n boolValue];
[self update];
}
#pragma mark - UITextFieldDelegate Functions
@ -170,21 +184,19 @@
[[LinphoneManager instance] changeView:PhoneView_InCall];
}
- (IBAction)onAddCallClick: (id) event {
}
- (IBAction)onAddressChange: (id)sender {
if([[addressField text] length] > 0) {
[addContactButton setEnabled:TRUE];
[eraseButton setEnabled:TRUE];
[callButton setEnabled:TRUE];
[addCallButton setEnabled:TRUE];
[transferButton setEnabled:TRUE];
} else {
[addContactButton setEnabled:FALSE];
[eraseButton setEnabled:FALSE];
[callButton setEnabled:FALSE];
[addCallButton setEnabled:FALSE];
[transferButton setEnabled:FALSE];
}
}

264
Classes/DialerViewController.xib
View file

@ -558,6 +558,37 @@
<reference key="IBUIFont" ref="177658264"/>
</object>
<object class="IBUIButton" id="375677999">
<reference key="NSNextResponder" ref="32193173"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{106, 0}, {108, 69}}</string>
<reference key="NSSuperview" ref="32193173"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="275435271"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIEnabled">NO</bool>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
<object class="NSCustomResource" key="IBUIHighlightedImage" id="313309514">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">add_call_over.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledImage" id="913224257">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">add_call_disabled.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage" id="110803600">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">add_call_default.png</string>
</object>
<reference key="IBUIFontDescription" ref="769584456"/>
<reference key="IBUIFont" ref="177658264"/>
</object>
<object class="IBUIButton" id="275435271">
<reference key="NSNextResponder" ref="32193173"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{106, 0}, {108, 69}}</string>
@ -573,18 +604,9 @@
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">add_call_over.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">add_call_disabled.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">add_call_default.png</string>
</object>
<reference key="IBUIHighlightedImage" ref="313309514"/>
<reference key="IBUIDisabledImage" ref="913224257"/>
<reference key="IBUINormalImage" ref="110803600"/>
<reference key="IBUIFontDescription" ref="769584456"/>
<reference key="IBUIFont" ref="177658264"/>
</object>
@ -800,6 +822,14 @@
</object>
<int key="connectionID">232</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">transferButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="275435271"/>
</object>
<int key="connectionID">253</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
@ -817,6 +847,102 @@
</object>
<int key="connectionID">208</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="1070392235"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">242</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="539158319"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">243</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="539781036"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">244</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="573280603"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">245</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="150499342"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">246</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="616388880"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">247</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="624378925"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">248</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="607229252"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">241</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="201618948"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">240</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="465571136"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">249</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="602859574"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">250</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="310945439"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">251</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onBackClick:</string>
@ -827,13 +953,20 @@
<int key="connectionID">233</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onAddCallClick:</string>
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="375677999"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">228</int>
<int key="connectionID">234</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="992434254"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">252</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
@ -844,6 +977,22 @@
</object>
<int key="connectionID">230</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="749717331"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">235</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">addressField</string>
<reference key="source" ref="275435271"/>
<reference key="destination" ref="751637181"/>
</object>
<int key="connectionID">237</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -1012,6 +1161,7 @@
<reference ref="375677999"/>
<reference ref="617539638"/>
<reference ref="749717331"/>
<reference ref="275435271"/>
</object>
<reference key="parent" ref="542426306"/>
<string key="objectName">toolBar</string>
@ -1046,6 +1196,12 @@
<reference key="parent" ref="32193173"/>
<string key="objectName">callButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">236</int>
<reference key="object" ref="275435271"/>
<reference key="parent" ref="32193173"/>
<string key="objectName">transferButton</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -1075,6 +1231,9 @@
<string>224.CustomClassName</string>
<string>224.IBPluginDependency</string>
<string>224.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
<string>236.CustomClassName</string>
<string>236.IBPluginDependency</string>
<string>236.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
<string>29.CustomClassName</string>
<string>29.IBPluginDependency</string>
<string>29.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
@ -1139,6 +1298,9 @@
<string>UICallButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3"/>
<string>UITransferButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3"/>
<string>UIDigitButton</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0"/>
@ -1191,7 +1353,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">233</int>
<int key="maxID">253</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1203,7 +1365,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>onAddCallClick:</string>
<string>onAddContactClick:</string>
<string>onAddressChange:</string>
<string>onBackClick:</string>
@ -1213,24 +1374,18 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>onAddCallClick:</string>
<string>onAddContactClick:</string>
<string>onAddressChange:</string>
<string>onBackClick:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">onAddCallClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">onAddContactClick:</string>
<string key="candidateClassName">id</string>
@ -1265,6 +1420,7 @@
<string>sixButton</string>
<string>starButton</string>
<string>threeButton</string>
<string>transferButton</string>
<string>twoButton</string>
<string>zeroButton</string>
</object>
@ -1286,6 +1442,7 @@
<string>UIButton</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UITransferButton</string>
<string>UIButton</string>
<string>UIButton</string>
</object>
@ -1310,6 +1467,7 @@
<string>sixButton</string>
<string>starButton</string>
<string>threeButton</string>
<string>transferButton</string>
<string>twoButton</string>
<string>zeroButton</string>
</object>
@ -1379,6 +1537,10 @@
<string key="name">threeButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">transferButton</string>
<string key="candidateClassName">UITransferButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">twoButton</string>
<string key="candidateClassName">UIButton</string>
@ -1405,6 +1567,17 @@
<object class="IBPartialClassDescription">
<string key="className">UICallButton</string>
<string key="superclassName">UIButton</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">addressField</string>
<string key="NS.object.0">UITextField</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">addressField</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">addressField</string>
<string key="candidateClassName">UITextField</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UICallButton.h</string>
@ -1413,6 +1586,17 @@
<object class="IBPartialClassDescription">
<string key="className">UIDigitButton</string>
<string key="superclassName">UILongTouchButton</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">addressField</string>
<string key="NS.object.0">UITextField</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">addressField</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">addressField</string>
<string key="candidateClassName">UITextField</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIDigitButton.h</string>
@ -1421,6 +1605,17 @@
<object class="IBPartialClassDescription">
<string key="className">UIEraseButton</string>
<string key="superclassName">UILongTouchButton</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">addressField</string>
<string key="NS.object.0">UITextField</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">addressField</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">addressField</string>
<string key="candidateClassName">UITextField</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIEraseButton.h</string>
@ -1434,6 +1629,25 @@
<string key="minorKey">./Classes/UILongTouchButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UITransferButton</string>
<string key="superclassName">UIButton</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">addressField</string>
<string key="NS.object.0">UITextField</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">addressField</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">addressField</string>
<string key="candidateClassName">UITextField</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UITransferButton.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>

5
Classes/HistoryViewController.xib
View file

@ -160,11 +160,10 @@
<string key="NSFrame">{{0, 58}, {320, 402}}</string>
<reference key="NSSuperview" ref="812520855"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC45NDExNzY0NzA2IDAuOTY0NzA1ODgyNCAwLjk2NDcwNTg4MjQAA</bytes>
</object>
<bool key="IBUIClipsSubviews">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>

45
Classes/InCallViewController.xib
View file

@ -12,12 +12,13 @@
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>IBUITableViewController</string>
<string>IBUITableView</string>
<string>IBUIActivityIndicatorView</string>
<string>IBUIView</string>
<string>IBUIButton</string>
<string>IBProxyObject</string>
<string>IBUIImageView</string>
<string>IBUIActivityIndicatorView</string>
<string>IBUITableViewController</string>
<string>IBUITableView</string>
<string>IBUIView</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -42,6 +43,24 @@
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIImageView" id="474099173">
<reference key="NSNextResponder" ref="858247959"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="858247959"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel"/>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">numpad_background.png</string>
</object>
</object>
<object class="IBUIView" id="1009068048">
<reference key="NSNextResponder" ref="858247959"/>
<int key="NSvFlags">292</int>
@ -103,7 +122,7 @@
<string key="NSFrame">{{0, -10}, {320, 480}}</string>
<reference key="NSSuperview" ref="858247959"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1009068048"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:418</string>
<reference key="IBUIBackgroundColor" ref="95762599"/>
<bool key="IBUIClipsSubviews">YES</bool>
@ -134,6 +153,7 @@
<string key="NSFrameSize">{85, 33}</string>
<reference key="NSSuperview" ref="858247959"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -307,6 +327,7 @@
<reference ref="1009068048"/>
<reference ref="662692377"/>
<reference ref="972197710"/>
<reference ref="474099173"/>
</object>
<reference key="parent" ref="0"/>
</object>
@ -353,7 +374,7 @@
<int key="objectID">160</int>
<reference key="object" ref="972197710"/>
<reference key="parent" ref="858247959"/>
<string key="objectName">camSwitch</string>
<string key="objectName">videoCameraSwitch</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">162</int>
@ -364,6 +385,12 @@
<reference key="parent" ref="0"/>
<string key="objectName">callTableController</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">171</int>
<reference key="object" ref="474099173"/>
<reference key="parent" ref="858247959"/>
<string key="objectName">background</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -384,6 +411,7 @@
<string>160.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
<string>162.CustomClassName</string>
<string>162.IBPluginDependency</string>
<string>171.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
@ -403,6 +431,7 @@
<string>InCallTableViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@ -417,7 +446,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">169</int>
<int key="maxID">171</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -553,11 +582,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>numpad_background.png</string>
<string>switch_camera_default.png</string>
<string>switch_camera_over.png</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{640, 523}</string>
<string>{170, 65}</string>
<string>{170, 65}</string>
</object>

122
Classes/IncomingCallViewController.xib
View file

@ -37,54 +37,56 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="915319957">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="735497316"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel"/>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">numpad_background.png</string>
</object>
</object>
<object class="IBUIView" id="735497316">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">288</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="131610915">
<reference key="NSNextResponder" ref="735497316"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 49}, {320, 63}}</string>
<reference key="NSSuperview" ref="735497316"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="651495339"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">cell_call_first.png</string>
</object>
</object>
<object class="IBUIImageView" id="1023112121">
<reference key="NSNextResponder" ref="735497316"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{320, 68}</string>
<reference key="NSSuperview" ref="735497316"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="151647739"/>
<reference key="NSNextKeyView" ref="131610915"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">champ-titre-incoming.png</string>
</object>
</object>
<object class="IBUIButton" id="151647739">
<reference key="NSNextResponder" ref="735497316"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 47}, {320, 63}}</string>
<reference key="NSSuperview" ref="735497316"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="651495339"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="365714543">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">champ-courbe-autres-numeros.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="301682065">
<int key="type">2</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont" id="179340956">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
<string key="NSResourceName">header_incoming.png</string>
</object>
</object>
<object class="IBUILabel" id="402572557">
@ -4585,7 +4587,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUINormalTitleShadowColor" ref="365714543"/>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="365714543">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">accept_over.png</string>
@ -4594,8 +4599,15 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">accept_default.png</string>
</object>
<reference key="IBUIFontDescription" ref="301682065"/>
<reference key="IBUIFont" ref="179340956"/>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="301682065">
<int key="type">2</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont" id="246253541">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUIButton" id="348909292">
<reference key="NSNextResponder" ref="442322210"/>
@ -4622,7 +4634,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="NSResourceName">decline_default.png</string>
</object>
<reference key="IBUIFontDescription" ref="301682065"/>
<reference key="IBUIFont" ref="179340956"/>
<reference key="IBUIFont" ref="246253541"/>
</object>
</array>
<string key="NSFrame">{{0, 383}, {320, 77}}</string>
@ -4641,7 +4653,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="735497316"/>
<reference key="NSNextKeyView" ref="915319957"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC45Njg2Mjc0NTEgMC45Njg2Mjc0NTEgMC45Njg2Mjc0NTEAA</bytes>
@ -4710,6 +4722,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<array class="NSMutableArray" key="children">
<reference ref="442322210"/>
<reference ref="735497316"/>
<reference ref="915319957"/>
</array>
<reference key="parent" ref="0"/>
</object>
@ -4752,10 +4765,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="object" ref="735497316"/>
<array class="NSMutableArray" key="children">
<reference ref="1023112121"/>
<reference ref="151647739"/>
<reference ref="402572557"/>
<reference ref="651495339"/>
<reference ref="632401698"/>
<reference ref="131610915"/>
</array>
<reference key="parent" ref="191373211"/>
</object>
@ -4771,12 +4784,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="parent" ref="735497316"/>
<string key="objectName">headerBackground</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
<reference key="object" ref="151647739"/>
<reference key="parent" ref="735497316"/>
<string key="objectName">otherBackground</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
<reference key="object" ref="651495339"/>
@ -4795,6 +4802,18 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="parent" ref="442322210"/>
<string key="objectName">mask</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">21</int>
<reference key="object" ref="131610915"/>
<reference key="parent" ref="735497316"/>
<string key="objectName">addressBackgroundImage</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">22</int>
<reference key="object" ref="915319957"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">background</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -4803,11 +4822,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0" key="10.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -4821,7 +4840,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">20</int>
<int key="maxID">22</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -4882,12 +4901,13 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="accept_default.png">{320, 154}</string>
<string key="accept_over.png">{320, 154}</string>
<string key="avatar_shadow.png">{16, 16}</string>
<string key="avatar_shadow.png">{640, 523}</string>
<string key="avatar_unknown.png">{320, 339}</string>
<string key="champ-courbe-autres-numeros.png">{640, 125}</string>
<string key="champ-titre-incoming.png">{640, 135}</string>
<string key="cell_call_first.png">{640, 125}</string>
<string key="decline_default.png">{320, 154}</string>
<string key="decline_over.png">{320, 154}</string>
<string key="header_incoming.png">{640, 135}</string>
<string key="numpad_background.png">{640, 523}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>

9
Classes/LinphoneUI/UICallBar.h
View file

@ -35,6 +35,9 @@
UIButton* optionsButton;
UIHangUpButton* hangupButton;
UIView* padView;
UIView* optionsView;
UIButton* optionsAddButton;
UIButton* optionsTransferButton;
//Key pad
UIDigitButton* oneButton;
@ -59,6 +62,10 @@
@property (nonatomic, retain) IBOutlet UIButton* optionsButton;
@property (nonatomic, retain) IBOutlet UIHangUpButton* hangupButton;
@property (nonatomic, retain) IBOutlet UIView* padView;
@property (nonatomic, retain) IBOutlet UIView* optionsView;
@property (nonatomic, retain) IBOutlet UIButton* optionsAddButton;
@property (nonatomic, retain) IBOutlet UIButton* optionsTransferButton;
@property (nonatomic, retain) IBOutlet UIButton* oneButton;
@property (nonatomic, retain) IBOutlet UIButton* twoButton;
@ -74,6 +81,8 @@
@property (nonatomic, retain) IBOutlet UIButton* sharpButton;
- (IBAction)onOptionsClick:(id)sender;
- (IBAction)onOptionsTransferClick:(id)sender;
- (IBAction)onOptionsAddClick:(id)sender;
- (IBAction)onConferenceClick:(id)sender;
- (IBAction)onPadClick:(id)sender;

159
Classes/LinphoneUI/UICallBar.m
View file

@ -35,7 +35,12 @@
@synthesize speakerButton;
@synthesize optionsButton;
@synthesize hangupButton;
@synthesize optionsAddButton;
@synthesize optionsTransferButton;
@synthesize padView;
@synthesize optionsView;
@synthesize oneButton;
@synthesize twoButton;
@ -65,6 +70,9 @@
[speakerButton release];
[optionsButton release];
[optionsAddButton release];
[optionsTransferButton release];
[oneButton release];
[twoButton release];
[threeButton release];
@ -78,6 +86,9 @@
[zeroButton release];
[sharpButton release];
[padView release];
[optionsView release];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[super dealloc];
@ -89,18 +100,30 @@
- (void)viewDidLoad {
[pauseButton setType:UIPauseButtonType_CurrentCall call:nil];
[zeroButton initWithNumber:'0' addressField:nil dtmf:true];
[oneButton initWithNumber:'1' addressField:nil dtmf:true];
[twoButton initWithNumber:'2' addressField:nil dtmf:true];
[threeButton initWithNumber:'3' addressField:nil dtmf:true];
[fourButton initWithNumber:'4' addressField:nil dtmf:true];
[fiveButton initWithNumber:'5' addressField:nil dtmf:true];
[sixButton initWithNumber:'6' addressField:nil dtmf:true];
[sevenButton initWithNumber:'7' addressField:nil dtmf:true];
[eightButton initWithNumber:'8' addressField:nil dtmf:true];
[nineButton initWithNumber:'9' addressField:nil dtmf:true];
[starButton initWithNumber:'*' addressField:nil dtmf:true];
[sharpButton initWithNumber:'#' addressField:nil dtmf:true];
[zeroButton setDigit:'0'];
[zeroButton setDtmf:true];
[oneButton setDigit:'1'];
[oneButton setDtmf:true];
[twoButton setDigit:'2'];
[twoButton setDtmf:true];
[threeButton setDigit:'3'];
[threeButton setDtmf:true];
[fourButton setDigit:'4'];
[fourButton setDtmf:true];
[fiveButton setDigit:'5'];
[fiveButton setDtmf:true];
[sixButton setDigit:'6'];
[sixButton setDtmf:true];
[sevenButton setDigit:'7'];
[sevenButton setDtmf:true];
[eightButton setDigit:'8'];
[eightButton setDtmf:true];
[nineButton setDigit:'9'];
[nineButton setDtmf:true];
[starButton setDigit:'*'];
[starButton setDtmf:true];
[sharpButton setDigit:'#'];
[sharpButton setDtmf:true];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(callUpdate:) name:@"LinphoneCallUpdate" object:nil];
@ -141,13 +164,7 @@
//LinphoneCall *call = [[notif.userInfo objectForKey: @"call"] pointerValue];
LinphoneCallState state = [[notif.userInfo objectForKey: @"state"] intValue];
// check LinphoneCore is initialized
LinphoneCore* lc = nil;
if([LinphoneManager isLcReady])
lc = [LinphoneManager getLc];
//TODO
//[LinphoneManager set:mergeCalls hidden:!pause.hidden withName:"MERGE button" andReason:"call count"];
LinphoneCore* lc = [LinphoneManager getLc];
[speakerButton update];
[microButton update];
@ -155,6 +172,8 @@
[videoButton update];
[hangupButton update];
// Show Pause/Conference button following call count
if(linphone_core_get_calls_nb(lc) > 1) {
if(![pauseButton isHidden]) {
[pauseButton setHidden:true];
@ -167,16 +186,29 @@
}
}
if(linphone_core_get_current_call(lc) == NULL) {
// Disable menu when no call & no conference
if(linphone_core_get_current_call(lc) == NULL && linphone_core_is_in_conference(lc) == FALSE) {
[self hidePad];
[self hideOptions];
[optionsButton setEnabled:FALSE];
} else {
[optionsButton setEnabled:TRUE];
}
// Disable transfert in conference
if(linphone_core_is_in_conference(lc)) {
[optionsTransferButton setEnabled:FALSE];
} else {
[optionsTransferButton setEnabled:TRUE];
}
switch(state) {
LinphoneCallEnd:
LinphoneCallError:
LinphoneCallIncoming:
LinphoneCallOutgoing:
[self hidePad];
[self hideOptions];
default:
break;
}
@ -193,7 +225,10 @@
[padView setFrame:frame];
[padView setHidden:FALSE];
CPAnimationSequence* move = [[CPAnimationSequence sequenceWithSteps:
[[CPAnimationStep for:0.5 animate:^{
[[CPAnimationStep after:0.0
for:0.5
options:UIViewAnimationOptionCurveEaseOut
animate:^{
CGRect frame = [padView frame];
frame.origin.y = original_y;
[padView setFrame:frame];
@ -210,12 +245,16 @@
int original_y = frame.origin.y;
CPAnimationSequence* move = [[CPAnimationSequence sequenceWithSteps:
[[CPAnimationStep for:0.5 animate:^{
[[CPAnimationStep after:0.0
for:0.5
options:UIViewAnimationOptionCurveEaseIn
animate:^{
CGRect frame = [padView frame];
frame.origin.y = [[self view] frame].size.height;
[padView setFrame:frame];
}] autorelease],
[[CPAnimationStep after:0.0 animate:^{
[[CPAnimationStep after:0.0
animate:^{
CGRect frame = [padView frame];
frame.origin.y = original_y;
[padView setHidden:TRUE];
@ -227,6 +266,55 @@
}
}
- (void)showOptions{
if([optionsView isHidden]) {
CGRect frame = [optionsView frame];
int original_y = frame.origin.y;
frame.origin.y = [[self view] frame].size.height;
[optionsView setFrame:frame];
[optionsView setHidden:FALSE];
CPAnimationSequence* move = [[CPAnimationSequence sequenceWithSteps:
[[CPAnimationStep after:0.0
for:0.5
options:UIViewAnimationOptionCurveEaseOut
animate:^{
CGRect frame = [optionsView frame];
frame.origin.y = original_y;
[optionsView setFrame:frame];
}] autorelease],
nil
] autorelease];
[move run];
}
}
- (void)hideOptions{
if(![optionsView isHidden]) {
CGRect frame = [optionsView frame];
int original_y = frame.origin.y;
CPAnimationSequence* move = [[CPAnimationSequence sequenceWithSteps:
[[CPAnimationStep after:0.0
for:0.5
options:UIViewAnimationOptionCurveEaseIn
animate:^{
CGRect frame = [optionsView frame];
frame.origin.y = [[self view] frame].size.height;
[optionsView setFrame:frame];
}] autorelease],
[[CPAnimationStep after:0.0
animate:^{
CGRect frame = [optionsView frame];
frame.origin.y = original_y;
[optionsView setHidden:TRUE];
[optionsView setFrame:frame];
}] autorelease],
nil
] autorelease];
[move run];
}
}
#pragma mark - Action Functions
@ -238,15 +326,38 @@
}
}
- (IBAction)onOptionsClick:(id)sender {
- (IBAction)onOptionsTransferClick:(id)sender {
[self hideOptions];
// Go to dialer view
NSDictionary *dict = [[[NSDictionary alloc] initWithObjectsAndKeys:
[[[NSArray alloc] initWithObjects: @"", nil] autorelease]
, @"setAddress:",
[[[NSArray alloc] initWithObjects: [NSNumber numberWithInt: TRUE], nil] autorelease]
, @"setTransferMode:",
nil] autorelease];
[[LinphoneManager instance] changeView:PhoneView_Dialer dict:dict];
}
- (IBAction)onOptionsAddClick:(id)sender {
[self hideOptions];
// Go to dialer view
NSDictionary *dict = [[[NSDictionary alloc] initWithObjectsAndKeys:
[[[NSArray alloc] initWithObjects: @"", nil] autorelease]
, @"setAddress:",
[[[NSArray alloc] initWithObjects: [NSNumber numberWithInt: FALSE], nil] autorelease]
, @"setTransferMode:",
nil] autorelease];
[[LinphoneManager instance] changeView:PhoneView_Dialer dict:dict];
}
- (IBAction)onOptionsClick:(id)sender {
if([optionsView isHidden]) {
[self showOptions];
} else {
[self hideOptions];
}
}
- (IBAction)onConferenceClick:(id)sender {
linphone_core_add_all_to_conference([LinphoneManager getLc]);
}

225
Classes/LinphoneUI/UICallBar.xib
View file

@ -42,6 +42,7 @@
<string key="NSFrame">{{0, 335}, {320, 125}}</string>
<reference key="NSSuperview" ref="931774220"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@ -377,6 +378,81 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="1070539677">
<reference key="NSNextResponder" ref="931774220"/>
<int key="NSvFlags">-2147483356</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="322088049">
<reference key="NSNextResponder" ref="1070539677"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{80, 67}</string>
<reference key="NSSuperview" ref="1070539677"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="471717543"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Add call</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<reference key="IBUINormalTitleShadowColor" ref="838911807"/>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_transfer_over.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_transfer_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="794091713">
<int key="type">2</int>
<double key="pointSize">15</double>
</object>
<reference key="IBUIFont" ref="315645433"/>
</object>
<object class="IBUIButton" id="471717543">
<reference key="NSNextResponder" ref="1070539677"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 58}, {80, 75}}</string>
<reference key="NSSuperview" ref="1070539677"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="464536687"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Add call</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<reference key="IBUINormalTitleShadowColor" ref="838911807"/>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_add_over.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_add_default.png</string>
</object>
<reference key="IBUIFontDescription" ref="794091713"/>
<reference key="IBUIFont" ref="315645433"/>
</object>
</array>
<string key="NSFrame">{{240, 201}, {80, 134}}</string>
<reference key="NSSuperview" ref="931774220"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="322088049"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="67221425">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="143533231">
<reference key="NSNextResponder" ref="931774220"/>
<int key="NSvFlags">292</int>
@ -415,10 +491,7 @@
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">video_off_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="794091713">
<int key="type">2</int>
<double key="pointSize">15</double>
</object>
<reference key="IBUIFontDescription" ref="794091713"/>
<reference key="IBUIFont" ref="315645433"/>
</object>
<object class="IBUIActivityIndicatorView" id="1016105438">
@ -526,6 +599,10 @@
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_over.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_disabled.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_default.png</string>
@ -628,7 +705,7 @@
<string key="NSFrame">{{215, 67}, {105, 68}}</string>
<reference key="NSSuperview" ref="143533231"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="464536687"/>
<reference key="NSNextKeyView" ref="1070539677"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -656,10 +733,7 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="262544423"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="67221425">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<reference key="IBUIBackgroundColor" ref="67221425"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
@ -843,6 +917,30 @@
</object>
<int key="connectionID">86</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">optionsView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="1070539677"/>
</object>
<int key="connectionID">92</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">optionsAddButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="471717543"/>
</object>
<int key="connectionID">96</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">optionsTransferButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="322088049"/>
</object>
<int key="connectionID">97</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onPadClick:</string>
@ -878,6 +976,42 @@
</object>
<int key="connectionID">28</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsClick:</string>
<reference key="source" ref="471717543"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">89</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsAddClick:</string>
<reference key="source" ref="471717543"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">93</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsClick:</string>
<reference key="source" ref="322088049"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">91</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsTransferClick:</string>
<reference key="source" ref="322088049"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">98</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@ -905,6 +1039,7 @@
<reference ref="464536687"/>
<reference ref="143533231"/>
<reference ref="556199520"/>
<reference ref="1070539677"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">callTabBar</string>
@ -1079,6 +1214,28 @@
<reference key="parent" ref="556199520"/>
<string key="objectName">#</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">87</int>
<reference key="object" ref="1070539677"/>
<array class="NSMutableArray" key="children">
<reference ref="471717543"/>
<reference ref="322088049"/>
</array>
<reference key="parent" ref="931774220"/>
<string key="objectName">optionsView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">88</int>
<reference key="object" ref="471717543"/>
<reference key="parent" ref="1070539677"/>
<string key="objectName">optionsAddButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">90</int>
<reference key="object" ref="322088049"/>
<reference key="parent" ref="1070539677"/>
<string key="objectName">optionsTansferButton</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -1087,7 +1244,7 @@
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="10.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<real value="3" key="10.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="11.CustomClassName">UIMicroButton</string>
<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3" key="11.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@ -1146,15 +1303,20 @@
<string key="8.CustomClassName">UIPauseButton</string>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="88.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0" key="88.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="9.CustomClassName">UISpeakerButton</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="90.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="90.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">86</int>
<int key="maxID">98</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1163,7 +1325,9 @@
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="onConferenceClick:">id</string>
<string key="onOptionsAddClick:">id</string>
<string key="onOptionsClick:">id</string>
<string key="onOptionsTransferClick:">id</string>
<string key="onPadClick:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
@ -1171,10 +1335,18 @@
<string key="name">onConferenceClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="onOptionsAddClick:">
<string key="name">onOptionsAddClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="onOptionsClick:">
<string key="name">onOptionsClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="onOptionsTransferClick:">
<string key="name">onOptionsTransferClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="onPadClick:">
<string key="name">onPadClick:</string>
<string key="candidateClassName">id</string>
@ -1189,7 +1361,10 @@
<string key="microButton">UIMicroButton</string>
<string key="nineButton">UIButton</string>
<string key="oneButton">UIButton</string>
<string key="optionsAddButton">UIButton</string>
<string key="optionsButton">UIButton</string>
<string key="optionsTransferButton">UIButton</string>
<string key="optionsView">UIView</string>
<string key="padView">UIView</string>
<string key="pauseButton">UIPauseButton</string>
<string key="sevenButton">UIButton</string>
@ -1235,10 +1410,22 @@
<string key="name">oneButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="optionsAddButton">
<string key="name">optionsAddButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="optionsButton">
<string key="name">optionsButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="optionsTransferButton">
<string key="name">optionsTransferButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="optionsView">
<string key="name">optionsView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="padView">
<string key="name">padView</string>
<string key="candidateClassName">UIView</string>
@ -1292,6 +1479,17 @@
<object class="IBPartialClassDescription">
<string key="className">UIDigitButton</string>
<string key="superclassName">UILongTouchButton</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">addressField</string>
<string key="NS.object.0">UITextField</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">addressField</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">addressField</string>
<string key="candidateClassName">UITextField</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIDigitButton.h</string>
@ -1417,8 +1615,13 @@
<string key="numpad_two_over.png">{220, 113}</string>
<string key="numpad_zero_default.png">{220, 113}</string>
<string key="numpad_zero_over.png">{220, 113}</string>
<string key="options_add_default.png">{160, 134}</string>
<string key="options_add_over.png">{160, 134}</string>
<string key="options_default.png">{160, 134}</string>
<string key="options_disabled.png">{160, 134}</string>
<string key="options_over.png">{160, 134}</string>
<string key="options_transfer_default.png">{16, 16}</string>
<string key="options_transfer_over.png">{16, 16}</string>
<string key="pause_off_default.png">{209, 136}</string>
<string key="pause_off_over.png">{209, 136}</string>
<string key="pause_on_default.png">{209, 136}</string>

6
Classes/LinphoneUI/UICallButton.h
View file

@ -22,11 +22,9 @@
@interface UICallButton : UIButton {
@private
UITextField* mAddress;
UITextField* addressField;
}
-(void) initWithAddress:(UITextField*) address;
+(void) enableTransforMode:(BOOL) enable;
+(BOOL) transforModeEnabled;
@property (nonatomic, retain) IBOutlet UITextField* addressField;
@end

72
Classes/LinphoneUI/UICallButton.m
View file

@ -19,38 +19,49 @@
#import "UICallButton.h"
#import "LinphoneManager.h"
#import "CoreTelephony/CTCallCenter.h"
#import <CoreTelephony/CTCallCenter.h>
@implementation UICallButton
static BOOL transferMode = NO;
@synthesize addressField;
#pragma mark - Lifecycle Functions
-(void) initWithAddress:(UITextField*) address{
mAddress=[address retain];
transferMode = NO;
[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside];
- (void)initUICallButton {
[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside];
}
- (id)init {
self = [super init];
if (self) {
[self initUICallButton];
}
return self;
}
- (id)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self initUICallButton];
}
return self;
}
- (id)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self initUICallButton];
}
return self;
}
- (void)dealloc {
[addressField release];
[super dealloc];
[mAddress release];
}
#pragma mark - Statics Functions
+(void) enableTransforMode:(BOOL) enable {
transferMode = enable;
}
+(BOOL) transforModeEnabled {
return transferMode;
}
#pragma mark -
-(void) touchUp:(id) sender {
@ -86,14 +97,9 @@ static BOOL transferMode = NO;
linphone_core_get_default_proxy([LinphoneManager getLc],&proxyCfg);
LinphoneCallParams* lcallParams = linphone_core_create_default_call_parameters([LinphoneManager getLc]);
if ([mAddress.text length] == 0) return; //just return
if ([mAddress.text hasPrefix:@"sip:"]) {
if (transferMode) {
linphone_core_transfer_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), [mAddress.text cStringUsingEncoding:[NSString defaultCStringEncoding]]);
} else {
linphone_core_invite_with_params([LinphoneManager getLc],[mAddress.text cStringUsingEncoding:[NSString defaultCStringEncoding]],lcallParams);
}
[UICallButton enableTransforMode:NO];
if ([addressField.text length] == 0) return; //just return
if ([addressField.text hasPrefix:@"sip:"]) {
linphone_core_invite_with_params([LinphoneManager getLc],[addressField.text cStringUsingEncoding:[NSString defaultCStringEncoding]],lcallParams);
} else if ( proxyCfg==nil){
UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid sip address",nil)
message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to place a call or use a valid sip address (I.E sip:john@example.net)",nil)
@ -104,7 +110,7 @@ static BOOL transferMode = NO;
[error release];
} else {
char normalizedUserName[256];
NSString* toUserName = [NSString stringWithString:[mAddress text]];
NSString* toUserName = [NSString stringWithString:[addressField text]];
NSString* lDisplayName = [[LinphoneManager instance] getDisplayNameFromAddressBook:toUserName andUpdateCallLog:nil];
linphone_proxy_config_normalize_number(proxyCfg,[toUserName cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName));
@ -113,20 +119,14 @@ static BOOL transferMode = NO;
linphone_address_set_display_name(tmpAddress,(lDisplayName)?[lDisplayName cStringUsingEncoding:[NSString defaultCStringEncoding]]:nil);
if (transferMode) {
linphone_core_transfer_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), normalizedUserName);
} else {
linphone_core_invite_address_with_params([LinphoneManager getLc],tmpAddress,lcallParams) ;
}
linphone_core_invite_address_with_params([LinphoneManager getLc],tmpAddress,lcallParams) ;
linphone_address_destroy(tmpAddress);
}
linphone_call_params_destroy(lcallParams);
[UICallButton enableTransforMode:NO];
} else if (linphone_core_inc_invite_pending([LinphoneManager getLc])) {
linphone_core_accept_call([LinphoneManager getLc],linphone_core_get_current_call([LinphoneManager getLc]));
}
}
@end

14
Classes/LinphoneUI/UICallCell.m
View file

@ -117,21 +117,17 @@
return 54;
}
- (void)startBlinkAnimation:(NSString *)animationID target:(UIView *)target
{
- (void)startBlinkAnimation:(NSString *)animationID target:(UIView *)target {
[UIView animateWithDuration:1.0
delay: 0.0
options: ([target alpha] == 1.0f)? UIViewAnimationOptionCurveEaseIn: UIViewAnimationOptionCurveEaseOut
options: UIViewAnimationOptionRepeat |
UIViewAnimationOptionAutoreverse |
UIViewAnimationOptionAllowUserInteraction |
UIViewAnimationOptionCurveEaseIn
animations:^{
if([target alpha] == 1.0f)
[target setAlpha:0.0f];
else
[target setAlpha:1.0f];
}
completion:^(BOOL finished){
if(finished) {
[self startBlinkAnimation: animationID target:target];
}
}];
}

12
Classes/LinphoneUI/UIContactCell.xib
View file

@ -78,7 +78,6 @@
<string key="NSFrame">{{75, 0}, {200, 44}}</string>
<reference key="NSSuperview" ref="675878782"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:328</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@ -109,14 +108,10 @@
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<object class="NSColor" key="IBUIBackgroundColor" id="318755954">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
@ -126,7 +121,6 @@
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -141,8 +135,8 @@
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="318755954"/>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>

15
Classes/LinphoneUI/UIDigitButton.h
View file

@ -24,16 +24,13 @@
@interface UIDigitButton : UILongTouchButton<UILongTouchButtonDelegate> {
@private
char mDigit;
UITextField* mAddress;
bool sendDtmfDuringCall;
char digit;
bool dtmf;
UITextField* addressField;
}
-(void) initWithNumber:(char)digit ;
-(void) initWithNumber:(char)digit addressField:(UITextField*) address dtmf:(bool)send;
@property bool sendDtmfDuringCall;
@property (nonatomic, retain) IBOutlet UITextField* addressField;
@property char digit;
@property bool dtmf;
@end

60
Classes/LinphoneUI/UIDigitButton.m
View file

@ -23,39 +23,59 @@
@implementation UIDigitButton
@synthesize sendDtmfDuringCall;
@synthesize dtmf;
@synthesize digit;
@synthesize addressField;
#pragma mark - Lifecycle Functions
- (void)initWithNumber:(char)digit {
[self initWithNumber:digit addressField:nil dtmf:true];
}
- (void)initWithNumber:(char)digit addressField:(UITextField*) address dtmf:(bool)sendDtmf{
sendDtmfDuringCall = sendDtmf;
mDigit=digit;
mAddress=address?[address retain]:nil;
- (void)initUIDigitButton {
self->dtmf = FALSE;
[self addTarget:self action:@selector(touchDown:) forControlEvents:UIControlEventTouchDown];
[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside|UIControlEventTouchUpOutside];
}
- (id)init {
self = [super init];
if (self) {
[self initUIDigitButton];
}
return self;
}
- (id)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self initUIDigitButton];
}
return self;
}
- (id)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self initUIDigitButton];
}
return self;
}
- (void)dealloc {
[super dealloc];
[mAddress release];
[addressField release];
}
#pragma mark - Actions Functions
- (void)touchDown:(id) sender {
if (mAddress && (!sendDtmfDuringCall || !linphone_core_in_call([LinphoneManager getLc]))) {
NSString* newAddress = [NSString stringWithFormat:@"%@%c",mAddress.text,mDigit];
[mAddress setText:newAddress];
linphone_core_play_dtmf([LinphoneManager getLc], mDigit, -1);
if (addressField && (!dtmf || !linphone_core_in_call([LinphoneManager getLc]))) {
NSString* newAddress = [NSString stringWithFormat:@"%@%c",addressField.text, digit];
[addressField setText:newAddress];
linphone_core_play_dtmf([LinphoneManager getLc], digit, -1);
} else {
linphone_core_send_dtmf([LinphoneManager getLc], mDigit);
linphone_core_play_dtmf([LinphoneManager getLc], mDigit, 100);
linphone_core_send_dtmf([LinphoneManager getLc], digit);
linphone_core_play_dtmf([LinphoneManager getLc], digit, 100);
}
}
@ -70,10 +90,10 @@
}
- (void)onLongTouch {
if (mDigit == '0') {
NSString* newAddress = [[mAddress.text substringToIndex: [mAddress.text length]-1] stringByAppendingString:@"+"];
[mAddress setText:newAddress];
[mAddress sendActionsForControlEvents:UIControlEventEditingChanged];
if (digit == '0') {
NSString* newAddress = [[addressField.text substringToIndex: [addressField.text length]-1] stringByAppendingString:@"+"];
[addressField setText:newAddress];
[addressField sendActionsForControlEvents:UIControlEventEditingChanged];
}
}

7
Classes/LinphoneUI/UIEraseButton.h
View file

@ -23,8 +23,9 @@
@interface UIEraseButton : UILongTouchButton<UILongTouchButtonDelegate> {
@private
UITextField* mAddress;
UITextField* addressField;
}
-(void) initWithAddressField:(UITextField*) address;
@property (nonatomic, retain) IBOutlet UITextField* addressField;
@end

40
Classes/LinphoneUI/UIEraseButton.m
View file

@ -22,23 +22,49 @@
@implementation UIEraseButton
@synthesize addressField;
#pragma mark - Lifecycle Functions
-(void) initWithAddressField:(UITextField*) address {
mAddress = address;
- (void)initUIEraseButton {
[self addTarget:self action:@selector(touchDown:) forControlEvents:UIControlEventTouchDown];
}
- (void)dealloc {
[super dealloc];
- (id)init {
self = [super init];
if (self) {
[self initUIEraseButton];
}
return self;
}
- (id)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self initUIEraseButton];
}
return self;
}
- (id)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self initUIEraseButton];
}
return self;
}
- (void)dealloc {
[super dealloc];
[addressField release];
}
#pragma mark - Action Functions
-(void) touchDown:(id) sender {
if ([mAddress.text length] > 0) {
[mAddress setText:[mAddress.text substringToIndex:[mAddress.text length]-1]];
if ([addressField.text length] > 0) {
[addressField setText:[addressField.text substringToIndex:[addressField.text length]-1]];
}
}
@ -49,7 +75,7 @@
}
- (void)onLongTouch {
[mAddress setText:@""];
[addressField setText:@""];
}
@end

10
Classes/LinphoneUI/UIHistoryCell.xib
View file

@ -129,7 +129,6 @@
<string key="NSFrame">{{276, 0}, {44, 44}}</string>
<reference key="NSSuperview" ref="702431052"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -158,12 +157,9 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="811339934"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<object class="NSColor" key="IBUIBackgroundColor" id="682184802">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
@ -173,7 +169,6 @@
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -189,6 +184,7 @@
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="682184802"/>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>

29
Classes/LinphoneUI/UITransferButton.h Normal file
View file

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

131
Classes/LinphoneUI/UITransferButton.m Normal file
View file

@ -0,0 +1,131 @@
/* UITransferButton.m
*
* Copyright (C) 2012 Belledonne Comunications, Grenoble, France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#import "UITransferButton.h"
#import "LinphoneManager.h"
#import <CoreTelephony/CTCallCenter.h>
@implementation UITransferButton
@synthesize addressField;
#pragma mark - Lifecycle Functions
- (void)initUICallButton {
[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside];
}
- (id)init {
self = [super init];
if (self) {
[self initUICallButton];
}
return self;
}
- (id)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[self initUICallButton];
}
return self;
}
- (id)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
[self initUICallButton];
}
return self;
}
- (void)dealloc {
[addressField release];
[super dealloc];
}
#pragma mark -
-(void) touchUp:(id) sender {
if (!linphone_core_is_network_reachabled([LinphoneManager getLc])) {
UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Network Error",nil)
message:NSLocalizedString(@"There is no network connection available, enable WIFI or WWAN prior to place a call",nil)
delegate:nil
cancelButtonTitle:NSLocalizedString(@"Continue",nil)
otherButtonTitles:nil];
[error show];
[error release];
return;
}
CTCallCenter* ct = [[CTCallCenter alloc] init];
if ([ct.currentCalls count] > 0) {
ms_error("GSM call in progress, cancelling outgoing SIP call request");
UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Cannot make call",nil)
message:NSLocalizedString(@"Please terminate GSM call",nil)
delegate:nil
cancelButtonTitle:NSLocalizedString(@"Continue",nil)
otherButtonTitles:nil];
[error show];
[error release];
[ct release];
return;
}
[ct release];
if (TRUE /*!linphone_core_in_call([LinphoneManager getLc])*/) {
LinphoneProxyConfig* proxyCfg;
//get default proxy
linphone_core_get_default_proxy([LinphoneManager getLc],&proxyCfg);
LinphoneCallParams* lcallParams = linphone_core_create_default_call_parameters([LinphoneManager getLc]);
if ([addressField.text length] == 0) return; //just return
if ([addressField.text hasPrefix:@"sip:"]) {
linphone_core_transfer_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), [addressField.text cStringUsingEncoding:[NSString defaultCStringEncoding]]);
} else if ( proxyCfg==nil){
UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid sip address",nil)
message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to place a call or use a valid sip address (I.E sip:john@example.net)",nil)
delegate:nil
cancelButtonTitle:NSLocalizedString(@"Continue",nil)
otherButtonTitles:nil];
[error show];
[error release];
} else {
char normalizedUserName[256];
NSString* toUserName = [NSString stringWithString:[addressField text]];
NSString* lDisplayName = [[LinphoneManager instance] getDisplayNameFromAddressBook:toUserName andUpdateCallLog:nil];
linphone_proxy_config_normalize_number(proxyCfg,[toUserName cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName));
LinphoneAddress* tmpAddress = linphone_address_new(linphone_core_get_identity([LinphoneManager getLc]));
linphone_address_set_username(tmpAddress,normalizedUserName);
linphone_address_set_display_name(tmpAddress,(lDisplayName)?[lDisplayName cStringUsingEncoding:[NSString defaultCStringEncoding]]:nil);
linphone_core_transfer_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), normalizedUserName);
linphone_address_destroy(tmpAddress);
}
linphone_call_params_destroy(lcallParams);
} else if (linphone_core_inc_invite_pending([LinphoneManager getLc])) {
linphone_core_accept_call([LinphoneManager getLc],linphone_core_get_current_call([LinphoneManager getLc]));
}
}
@end

33
Classes/PhoneMainView.m
View file

@ -259,9 +259,7 @@
case LinphoneCallConnected:
case LinphoneCallUpdated:
{
if ([[LinphoneManager instance] currentView] != PhoneView_InCall) {
[[LinphoneManager instance] changeView:PhoneView_InCall];
}
[[LinphoneManager instance] changeView:PhoneView_InCall];
break;
}
case LinphoneCallUpdatedByRemote:
@ -270,9 +268,7 @@
const LinphoneCallParams* remote = linphone_call_get_remote_params(call);
if (linphone_call_params_video_enabled(current) && !linphone_call_params_video_enabled(remote)) {
if ([[LinphoneManager instance] currentView] != PhoneView_InCall) {
[[LinphoneManager instance] changeView:PhoneView_InCall];
}
[[LinphoneManager instance] changeView:PhoneView_InCall];
}
break;
}
@ -284,32 +280,27 @@
{
[self dismissIncomingCall:call];
if (canHideInCallView) {
if ([[LinphoneManager instance] currentView] != PhoneView_Dialer) {
// Go to dialer view
NSDictionary *dict = [[[NSDictionary alloc] initWithObjectsAndKeys:
[[[NSArray alloc] initWithObjects: @"", nil] autorelease]
, @"setAddress:",
nil] autorelease];
[[LinphoneManager instance] changeView:PhoneView_Dialer dict:dict];
}
// Go to dialer view
NSDictionary *dict = [[[NSDictionary alloc] initWithObjectsAndKeys:
[[[NSArray alloc] initWithObjects: @"", nil] autorelease]
, @"setAddress:",
[[[NSArray alloc] initWithObjects: [NSNumber numberWithInt: FALSE], nil] autorelease]
, @"setTransferMode:",
nil] autorelease];
[[LinphoneManager instance] changeView:PhoneView_Dialer dict:dict];
} else {
if ([[LinphoneManager instance] currentView] != PhoneView_InCall) {
[[LinphoneManager instance] changeView:PhoneView_InCall];
}
[[LinphoneManager instance] changeView:PhoneView_InCall];
}
break;
}
case LinphoneCallStreamsRunning:
{
if ([[LinphoneManager instance] currentView] != PhoneView_InCall) {
[[LinphoneManager instance] changeView:PhoneView_InCall];
}
[[LinphoneManager instance] changeView:PhoneView_InCall];
break;
}
default:
break;
}
}

10
Classes/Utils/CPAnimationStep.m
View file

@ -74,7 +74,7 @@
self.consumableSteps = nil;
return; // we're done
}
AnimationStep completionStep = ^{
void (^completionStep)(BOOL) = ^(BOOL animated){
[self.consumableSteps removeLastObject];
[self runAnimated:animated]; // recurse!
};
@ -87,13 +87,15 @@
animations:currentStep.step
completion:^(BOOL finished) {
if (finished) {
completionStep();
}
completionStep(TRUE);
} else {
completionStep(FALSE);
}
}];
} else {
void (^execution)(void) = ^{
currentStep.step();
completionStep();
completionStep(FALSE);
};
if (animated && currentStep.delay) {

BIN
Resources/contacts_all_default.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
Resources/contacts_all_selected.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
Resources/contacts_linphone_default.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
Resources/contacts_linphone_selected.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
Resources/history_all_default.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
Resources/history_all_selected.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
Resources/history_missed_default.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
Resources/history_missed_selected.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
Resources/options_add_default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

BIN
Resources/options_add_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

BIN
Resources/options_transfer_default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
Resources/options_transfer_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

130
linphone.xcodeproj/project.pbxproj
View file

@ -155,6 +155,16 @@
70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F413E147EB002BA2C0 /* QuartzCore.framework */; };
D3196D2D15A3199D007FEEBA /* list_hightlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D2C15A3199D007FEEBA /* list_hightlight.png */; };
D3196D2E15A3199D007FEEBA /* list_hightlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D2C15A3199D007FEEBA /* list_hightlight.png */; };
D3196D3415A321E3007FEEBA /* options_add_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3015A321E2007FEEBA /* options_add_default.png */; };
D3196D3515A321E3007FEEBA /* options_add_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3015A321E2007FEEBA /* options_add_default.png */; };
D3196D3615A321E3007FEEBA /* options_add_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3115A321E2007FEEBA /* options_add_over.png */; };
D3196D3715A321E3007FEEBA /* options_add_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3115A321E2007FEEBA /* options_add_over.png */; };
D3196D3815A321E3007FEEBA /* options_transfer_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3215A321E3007FEEBA /* options_transfer_default.png */; };
D3196D3915A321E3007FEEBA /* options_transfer_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3215A321E3007FEEBA /* options_transfer_default.png */; };
D3196D3A15A321E3007FEEBA /* options_transfer_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3315A321E3007FEEBA /* options_transfer_over.png */; };
D3196D3B15A321E3007FEEBA /* options_transfer_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3315A321E3007FEEBA /* options_transfer_over.png */; };
D3196D3E15A32BD8007FEEBA /* UITransferButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D3196D3D15A32BD8007FEEBA /* UITransferButton.m */; };
D3196D3F15A32BD8007FEEBA /* UITransferButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D3196D3D15A32BD8007FEEBA /* UITransferButton.m */; };
D31AAF5E159B3919002C6B02 /* InCallTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D31AAF5D159B3919002C6B02 /* InCallTableViewController.m */; };
D31AAF5F159B3919002C6B02 /* InCallTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D31AAF5D159B3919002C6B02 /* InCallTableViewController.m */; };
D31AAF63159B5B6F002C6B02 /* conference_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D31AAF61159B5B6E002C6B02 /* conference_default.png */; };
@ -240,14 +250,14 @@
D35497FF15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; };
D354980015875372000081D8 /* ContactsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35497FD15875372000081D8 /* ContactsViewController.xib */; };
D354980115875372000081D8 /* ContactsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35497FD15875372000081D8 /* ContactsViewController.xib */; };
D354980615875534000081D8 /* contacts_all_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* contacts_all_default.png */; };
D354980715875534000081D8 /* contacts_all_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* contacts_all_default.png */; };
D354980815875534000081D8 /* contacts_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980315875534000081D8 /* contacts_all_selected.png */; };
D354980915875534000081D8 /* contacts_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980315875534000081D8 /* contacts_all_selected.png */; };
D354980A15875534000081D8 /* contacts_linphone_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980415875534000081D8 /* contacts_linphone_default.png */; };
D354980B15875534000081D8 /* contacts_linphone_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980415875534000081D8 /* contacts_linphone_default.png */; };
D354980C15875534000081D8 /* contacts_linphone_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980515875534000081D8 /* contacts_linphone_selected.png */; };
D354980D15875534000081D8 /* contacts_linphone_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980515875534000081D8 /* contacts_linphone_selected.png */; };
D354980615875534000081D8 /* contacts_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* contacts_all_selected.png */; };
D354980715875534000081D8 /* contacts_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* contacts_all_selected.png */; };
D354980815875534000081D8 /* contacts_all_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980315875534000081D8 /* contacts_all_default.png */; };
D354980915875534000081D8 /* contacts_all_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980315875534000081D8 /* contacts_all_default.png */; };
D354980A15875534000081D8 /* contacts_linphone_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980415875534000081D8 /* contacts_linphone_selected.png */; };
D354980B15875534000081D8 /* contacts_linphone_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980415875534000081D8 /* contacts_linphone_selected.png */; };
D354980C15875534000081D8 /* contacts_linphone_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980515875534000081D8 /* contacts_linphone_default.png */; };
D354980D15875534000081D8 /* contacts_linphone_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980515875534000081D8 /* contacts_linphone_default.png */; };
D354981015875608000081D8 /* contacts_add_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980E15875608000081D8 /* contacts_add_default.png */; };
D354981115875608000081D8 /* contacts_add_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980E15875608000081D8 /* contacts_add_default.png */; };
D354981215875608000081D8 /* contacts_add_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980F15875608000081D8 /* contacts_add_over.png */; };
@ -455,18 +465,18 @@
D3ED3E881586291E006C0DE4 /* UIMainBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E851586291B006C0DE4 /* UIMainBar.m */; };
D3ED3E891586291E006C0DE4 /* UIMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E861586291C006C0DE4 /* UIMainBar.xib */; };
D3ED3E8A1586291E006C0DE4 /* UIMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E861586291C006C0DE4 /* UIMainBar.xib */; };
D3ED3E9815872EF1006C0DE4 /* history_all_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9215872EF1006C0DE4 /* history_all_default.png */; };
D3ED3E9915872EF1006C0DE4 /* history_all_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9215872EF1006C0DE4 /* history_all_default.png */; };
D3ED3E9A15872EF1006C0DE4 /* history_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9315872EF1006C0DE4 /* history_all_selected.png */; };
D3ED3E9B15872EF1006C0DE4 /* history_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9315872EF1006C0DE4 /* history_all_selected.png */; };
D3ED3E9815872EF1006C0DE4 /* history_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9215872EF1006C0DE4 /* history_all_selected.png */; };
D3ED3E9915872EF1006C0DE4 /* history_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9215872EF1006C0DE4 /* history_all_selected.png */; };
D3ED3E9A15872EF1006C0DE4 /* history_all_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9315872EF1006C0DE4 /* history_all_default.png */; };
D3ED3E9B15872EF1006C0DE4 /* history_all_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9315872EF1006C0DE4 /* history_all_default.png */; };
D3ED3E9C15872EF1006C0DE4 /* history_edit_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9415872EF1006C0DE4 /* history_edit_default.png */; };
D3ED3E9D15872EF1006C0DE4 /* history_edit_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9415872EF1006C0DE4 /* history_edit_default.png */; };
D3ED3E9E15872EF1006C0DE4 /* history_edit_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9515872EF1006C0DE4 /* history_edit_over.png */; };
D3ED3E9F15872EF1006C0DE4 /* history_edit_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9515872EF1006C0DE4 /* history_edit_over.png */; };
D3ED3EA015872EF1006C0DE4 /* history_missed_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9615872EF1006C0DE4 /* history_missed_default.png */; };
D3ED3EA115872EF1006C0DE4 /* history_missed_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9615872EF1006C0DE4 /* history_missed_default.png */; };
D3ED3EA215872EF1006C0DE4 /* history_missed_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9715872EF1006C0DE4 /* history_missed_selected.png */; };
D3ED3EA315872EF1006C0DE4 /* history_missed_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9715872EF1006C0DE4 /* history_missed_selected.png */; };
D3ED3EA015872EF1006C0DE4 /* history_missed_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9615872EF1006C0DE4 /* history_missed_selected.png */; };
D3ED3EA115872EF1006C0DE4 /* history_missed_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9615872EF1006C0DE4 /* history_missed_selected.png */; };
D3ED3EA215872EF1006C0DE4 /* history_missed_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9715872EF1006C0DE4 /* history_missed_default.png */; };
D3ED3EA315872EF1006C0DE4 /* history_missed_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9715872EF1006C0DE4 /* history_missed_default.png */; };
D3ED3EA71587334E006C0DE4 /* HistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */; };
D3ED3EA81587334E006C0DE4 /* HistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */; };
D3ED3EB3158738FB006C0DE4 /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */; };
@ -897,6 +907,12 @@
70E542F413E147EB002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
D3196D2C15A3199D007FEEBA /* list_hightlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = list_hightlight.png; path = Resources/list_hightlight.png; sourceTree = "<group>"; };
D3196D3015A321E2007FEEBA /* options_add_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_add_default.png; path = Resources/options_add_default.png; sourceTree = "<group>"; };
D3196D3115A321E2007FEEBA /* options_add_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_add_over.png; path = Resources/options_add_over.png; sourceTree = "<group>"; };
D3196D3215A321E3007FEEBA /* options_transfer_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_transfer_default.png; path = Resources/options_transfer_default.png; sourceTree = "<group>"; };
D3196D3315A321E3007FEEBA /* options_transfer_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_transfer_over.png; path = Resources/options_transfer_over.png; sourceTree = "<group>"; };
D3196D3C15A32BD7007FEEBA /* UITransferButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITransferButton.h; sourceTree = "<group>"; };
D3196D3D15A32BD8007FEEBA /* UITransferButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITransferButton.m; sourceTree = "<group>"; };
D31AAF5C159B3919002C6B02 /* InCallTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InCallTableViewController.h; sourceTree = "<group>"; };
D31AAF5D159B3919002C6B02 /* InCallTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InCallTableViewController.m; sourceTree = "<group>"; };
D31AAF61159B5B6E002C6B02 /* conference_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = conference_default.png; path = Resources/conference_default.png; sourceTree = "<group>"; };
@ -954,10 +970,10 @@
D35497FB15875372000081D8 /* ContactsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsViewController.h; sourceTree = "<group>"; };
D35497FC15875372000081D8 /* ContactsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactsViewController.m; sourceTree = "<group>"; };
D35497FD15875372000081D8 /* ContactsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactsViewController.xib; sourceTree = "<group>"; };
D354980215875534000081D8 /* contacts_all_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_all_default.png; path = Resources/contacts_all_default.png; sourceTree = "<group>"; };
D354980315875534000081D8 /* contacts_all_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_all_selected.png; path = Resources/contacts_all_selected.png; sourceTree = "<group>"; };
D354980415875534000081D8 /* contacts_linphone_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_linphone_default.png; path = Resources/contacts_linphone_default.png; sourceTree = "<group>"; };
D354980515875534000081D8 /* contacts_linphone_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_linphone_selected.png; path = Resources/contacts_linphone_selected.png; sourceTree = "<group>"; };
D354980215875534000081D8 /* contacts_all_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_all_selected.png; path = Resources/contacts_all_selected.png; sourceTree = "<group>"; };
D354980315875534000081D8 /* contacts_all_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_all_default.png; path = Resources/contacts_all_default.png; sourceTree = "<group>"; };
D354980415875534000081D8 /* contacts_linphone_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_linphone_selected.png; path = Resources/contacts_linphone_selected.png; sourceTree = "<group>"; };
D354980515875534000081D8 /* contacts_linphone_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_linphone_default.png; path = Resources/contacts_linphone_default.png; sourceTree = "<group>"; };
D354980E15875608000081D8 /* contacts_add_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_add_default.png; path = Resources/contacts_add_default.png; sourceTree = "<group>"; };
D354980F15875608000081D8 /* contacts_add_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_add_over.png; path = Resources/contacts_add_over.png; sourceTree = "<group>"; };
D3549814158761CF000081D8 /* ContactsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsTableViewController.h; sourceTree = "<group>"; };
@ -1097,12 +1113,12 @@
D3ED3E841586291B006C0DE4 /* UIMainBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMainBar.h; sourceTree = "<group>"; };
D3ED3E851586291B006C0DE4 /* UIMainBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMainBar.m; sourceTree = "<group>"; };
D3ED3E861586291C006C0DE4 /* UIMainBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIMainBar.xib; sourceTree = "<group>"; };
D3ED3E9215872EF1006C0DE4 /* history_all_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_all_default.png; path = Resources/history_all_default.png; sourceTree = "<group>"; };
D3ED3E9315872EF1006C0DE4 /* history_all_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_all_selected.png; path = Resources/history_all_selected.png; sourceTree = "<group>"; };
D3ED3E9215872EF1006C0DE4 /* history_all_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_all_selected.png; path = Resources/history_all_selected.png; sourceTree = "<group>"; };
D3ED3E9315872EF1006C0DE4 /* history_all_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_all_default.png; path = Resources/history_all_default.png; sourceTree = "<group>"; };
D3ED3E9415872EF1006C0DE4 /* history_edit_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_edit_default.png; path = Resources/history_edit_default.png; sourceTree = "<group>"; };
D3ED3E9515872EF1006C0DE4 /* history_edit_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_edit_over.png; path = Resources/history_edit_over.png; sourceTree = "<group>"; };
D3ED3E9615872EF1006C0DE4 /* history_missed_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_missed_default.png; path = Resources/history_missed_default.png; sourceTree = "<group>"; };
D3ED3E9715872EF1006C0DE4 /* history_missed_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_missed_selected.png; path = Resources/history_missed_selected.png; sourceTree = "<group>"; };
D3ED3E9615872EF1006C0DE4 /* history_missed_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_missed_selected.png; path = Resources/history_missed_selected.png; sourceTree = "<group>"; };
D3ED3E9715872EF1006C0DE4 /* history_missed_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_missed_default.png; path = Resources/history_missed_default.png; sourceTree = "<group>"; };
D3ED3EA41587334B006C0DE4 /* HistoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryTableViewController.h; sourceTree = "<group>"; };
D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryTableViewController.m; sourceTree = "<group>"; };
D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryViewController.xib; sourceTree = "<group>"; };
@ -1601,6 +1617,8 @@
D32648431588F6FB00930C67 /* UIToggleButton.m */,
340751E5150F38FC00B89C47 /* UIVideoButton.h */,
340751E6150F38FD00B89C47 /* UIVideoButton.m */,
D3196D3C15A32BD7007FEEBA /* UITransferButton.h */,
D3196D3D15A32BD8007FEEBA /* UITransferButton.m */,
);
path = LinphoneUI;
sourceTree = "<group>";
@ -1760,7 +1778,6 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
D3196D2C15A3199D007FEEBA /* list_hightlight.png */,
D3F83F741582253100336684 /* accept_default.png */,
D3F83F751582253100336684 /* accept_over.png */,
D3D6A39B159B0EEF005F692C /* add_call_default.png */,
@ -1814,11 +1831,11 @@
D31AAF62159B5B6E002C6B02 /* conference_over.png */,
D354980E15875608000081D8 /* contacts_add_default.png */,
D354980F15875608000081D8 /* contacts_add_over.png */,
D354980215875534000081D8 /* contacts_all_default.png */,
D354980315875534000081D8 /* contacts_all_selected.png */,
D354980215875534000081D8 /* contacts_all_selected.png */,
D354980315875534000081D8 /* contacts_all_default.png */,
D38327EB1580FE3A00FA0D23 /* contacts_default.png */,
D354980415875534000081D8 /* contacts_linphone_default.png */,
D354980515875534000081D8 /* contacts_linphone_selected.png */,
D354980415875534000081D8 /* contacts_linphone_selected.png */,
D354980515875534000081D8 /* contacts_linphone_default.png */,
D38327FC158100E400FA0D23 /* contacts_over.png */,
D38327EC1580FE3A00FA0D23 /* contacts_selected.png */,
D3F83F761582253100336684 /* decline_default.png */,
@ -1833,13 +1850,13 @@
D3F83EFB158205A100336684 /* hangup_over.png */,
D36C43CE158F2F370048BA40 /* header_conference.png */,
D3F26BFB15987083005F9CAB /* header_incoming.png */,
D3ED3E9215872EF1006C0DE4 /* history_all_default.png */,
D3ED3E9315872EF1006C0DE4 /* history_all_selected.png */,
D3ED3E9215872EF1006C0DE4 /* history_all_selected.png */,
D3ED3E9315872EF1006C0DE4 /* history_all_default.png */,
D347347C1580E5F8003C7B8C /* history_default.png */,
D3ED3E9415872EF1006C0DE4 /* history_edit_default.png */,
D3ED3E9515872EF1006C0DE4 /* history_edit_over.png */,
D3ED3E9615872EF1006C0DE4 /* history_missed_default.png */,
D3ED3E9715872EF1006C0DE4 /* history_missed_selected.png */,
D3ED3E9615872EF1006C0DE4 /* history_missed_selected.png */,
D3ED3E9715872EF1006C0DE4 /* history_missed_default.png */,
D3F26BF515986DAD005F9CAB /* history_ok_default.png */,
D3F26BF615986DAD005F9CAB /* history_ok_over.png */,
D38327FD158100E400FA0D23 /* history_over.png */,
@ -1858,6 +1875,7 @@
D3EA5417159858A80037DC6B /* list_delete_over.png */,
D354981815876FE7000081D8 /* list_details_default.png */,
D354981915876FE7000081D8 /* list_details_over.png */,
D3196D2C15A3199D007FEEBA /* list_hightlight.png */,
D3F83EF4158205A100336684 /* micro_off_default.png */,
D35EA76115A2DF8D003E025D /* micro_off_disabled.png */,
D3F83EF5158205A100336684 /* micro_off_over.png */,
@ -1891,9 +1909,13 @@
D3F83F2D1582223B00336684 /* numpad_zero_over.png */,
2242E312125235120061DDCE /* oldphone-mono-30s.caf */,
2237D4081084D7A9001383EE /* oldphone-mono.wav */,
D3196D3015A321E2007FEEBA /* options_add_default.png */,
D3196D3115A321E2007FEEBA /* options_add_over.png */,
D3D6A3A8159B0EFE005F692C /* options_default.png */,
D3D6A3A9159B0EFE005F692C /* options_disabled.png */,
D3D6A3AA159B0EFE005F692C /* options_over.png */,
D3196D3215A321E3007FEEBA /* options_transfer_default.png */,
D3196D3315A321E3007FEEBA /* options_transfer_over.png */,
D3F83EF8158205A100336684 /* pause_off_default.png */,
D3F83EF9158205A100336684 /* pause_off_over.png */,
D36C43E7158F3F7E0048BA40 /* pause_on_default.png */,
@ -2204,18 +2226,18 @@
D3ED3E7815861B1B006C0DE4 /* backspace_default.png in Resources */,
D3ED3E7A15861B1B006C0DE4 /* backspace_over.png in Resources */,
D3ED3E891586291E006C0DE4 /* UIMainBar.xib in Resources */,
D3ED3E9815872EF1006C0DE4 /* history_all_default.png in Resources */,
D3ED3E9A15872EF1006C0DE4 /* history_all_selected.png in Resources */,
D3ED3E9815872EF1006C0DE4 /* history_all_selected.png in Resources */,
D3ED3E9A15872EF1006C0DE4 /* history_all_default.png in Resources */,
D3ED3E9C15872EF1006C0DE4 /* history_edit_default.png in Resources */,
D3ED3E9E15872EF1006C0DE4 /* history_edit_over.png in Resources */,
D3ED3EA015872EF1006C0DE4 /* history_missed_default.png in Resources */,
D3ED3EA215872EF1006C0DE4 /* history_missed_selected.png in Resources */,
D3ED3EA015872EF1006C0DE4 /* history_missed_selected.png in Resources */,
D3ED3EA215872EF1006C0DE4 /* history_missed_default.png in Resources */,
D3ED3EB3158738FB006C0DE4 /* HistoryViewController.xib in Resources */,
D354980015875372000081D8 /* ContactsViewController.xib in Resources */,
D354980615875534000081D8 /* contacts_all_default.png in Resources */,
D354980815875534000081D8 /* contacts_all_selected.png in Resources */,
D354980A15875534000081D8 /* contacts_linphone_default.png in Resources */,
D354980C15875534000081D8 /* contacts_linphone_selected.png in Resources */,
D354980615875534000081D8 /* contacts_all_selected.png in Resources */,
D354980815875534000081D8 /* contacts_all_default.png in Resources */,
D354980A15875534000081D8 /* contacts_linphone_selected.png in Resources */,
D354980C15875534000081D8 /* contacts_linphone_default.png in Resources */,
D354981015875608000081D8 /* contacts_add_default.png in Resources */,
D354981215875608000081D8 /* contacts_add_over.png in Resources */,
D354981A15876FE7000081D8 /* list_details_default.png in Resources */,
@ -2307,6 +2329,10 @@
D38D14AF15A30B3D008497E8 /* cell_call_first_hightlight.png in Resources */,
D38D14B115A30B3D008497E8 /* cell_call_hightlight.png in Resources */,
D3196D2D15A3199D007FEEBA /* list_hightlight.png in Resources */,
D3196D3415A321E3007FEEBA /* options_add_default.png in Resources */,
D3196D3615A321E3007FEEBA /* options_add_over.png in Resources */,
D3196D3815A321E3007FEEBA /* options_transfer_default.png in Resources */,
D3196D3A15A321E3007FEEBA /* options_transfer_over.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2389,18 +2415,18 @@
D3ED3E7915861B1B006C0DE4 /* backspace_default.png in Resources */,
D3ED3E7B15861B1B006C0DE4 /* backspace_over.png in Resources */,
D3ED3E8A1586291E006C0DE4 /* UIMainBar.xib in Resources */,
D3ED3E9915872EF1006C0DE4 /* history_all_default.png in Resources */,
D3ED3E9B15872EF1006C0DE4 /* history_all_selected.png in Resources */,
D3ED3E9915872EF1006C0DE4 /* history_all_selected.png in Resources */,
D3ED3E9B15872EF1006C0DE4 /* history_all_default.png in Resources */,
D3ED3E9D15872EF1006C0DE4 /* history_edit_default.png in Resources */,
D3ED3E9F15872EF1006C0DE4 /* history_edit_over.png in Resources */,
D3ED3EA115872EF1006C0DE4 /* history_missed_default.png in Resources */,
D3ED3EA315872EF1006C0DE4 /* history_missed_selected.png in Resources */,
D3ED3EA115872EF1006C0DE4 /* history_missed_selected.png in Resources */,
D3ED3EA315872EF1006C0DE4 /* history_missed_default.png in Resources */,
D3ED3EB4158738FB006C0DE4 /* HistoryViewController.xib in Resources */,
D354980115875372000081D8 /* ContactsViewController.xib in Resources */,
D354980715875534000081D8 /* contacts_all_default.png in Resources */,
D354980915875534000081D8 /* contacts_all_selected.png in Resources */,
D354980B15875534000081D8 /* contacts_linphone_default.png in Resources */,
D354980D15875534000081D8 /* contacts_linphone_selected.png in Resources */,
D354980715875534000081D8 /* contacts_all_selected.png in Resources */,
D354980915875534000081D8 /* contacts_all_default.png in Resources */,
D354980B15875534000081D8 /* contacts_linphone_selected.png in Resources */,
D354980D15875534000081D8 /* contacts_linphone_default.png in Resources */,
D354981115875608000081D8 /* contacts_add_default.png in Resources */,
D354981315875608000081D8 /* contacts_add_over.png in Resources */,
D354981B15876FE7000081D8 /* list_details_default.png in Resources */,
@ -2491,6 +2517,10 @@
D38D14B015A30B3D008497E8 /* cell_call_first_hightlight.png in Resources */,
D38D14B215A30B3D008497E8 /* cell_call_hightlight.png in Resources */,
D3196D2E15A3199D007FEEBA /* list_hightlight.png in Resources */,
D3196D3515A321E3007FEEBA /* options_add_default.png in Resources */,
D3196D3715A321E3007FEEBA /* options_add_over.png in Resources */,
D3196D3915A321E3007FEEBA /* options_transfer_default.png in Resources */,
D3196D3B15A321E3007FEEBA /* options_transfer_over.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2566,6 +2596,7 @@
D32460ED159DA47700BA7F3A /* CPAnimationSequence.m in Sources */,
D32460EF159DA47700BA7F3A /* CPAnimationStep.m in Sources */,
D32B9DFC15A2F131000B6DEC /* FastAddressBook.m in Sources */,
D3196D3E15A32BD8007FEEBA /* UITransferButton.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2638,6 +2669,7 @@
D32460EE159DA47700BA7F3A /* CPAnimationSequence.m in Sources */,
D32460F0159DA47700BA7F3A /* CPAnimationStep.m in Sources */,
D32B9DFD15A2F131000B6DEC /* FastAddressBook.m in Sources */,
D3196D3F15A32BD8007FEEBA /* UITransferButton.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};