diff --git a/Classes/Base.lproj/DialerView.xib b/Classes/Base.lproj/DialerView.xib index 6cceee355..a09ba2413 100644 --- a/Classes/Base.lproj/DialerView.xib +++ b/Classes/Base.lproj/DialerView.xib @@ -7,7 +7,6 @@ - @@ -26,7 +25,6 @@ - @@ -289,34 +287,6 @@ - - @@ -333,14 +303,10 @@ - - - - diff --git a/Classes/Base.lproj/DialerView~ipad.xib b/Classes/Base.lproj/DialerView~ipad.xib index 1b8acb03f..6f5746b62 100644 --- a/Classes/Base.lproj/DialerView~ipad.xib +++ b/Classes/Base.lproj/DialerView~ipad.xib @@ -7,7 +7,6 @@ - @@ -25,7 +24,6 @@ - @@ -302,34 +300,6 @@ - - @@ -628,34 +598,6 @@ - - @@ -691,14 +633,10 @@ - - - - diff --git a/Classes/DialerView.h b/Classes/DialerView.h index 7c745d1dd..073b547e9 100644 --- a/Classes/DialerView.h +++ b/Classes/DialerView.h @@ -23,7 +23,6 @@ #import "UICamSwitch.h" #import "UICallButton.h" -#import "UITransferButton.h" #import "UIDigitButton.h" @interface DialerView @@ -38,7 +37,7 @@ @property(nonatomic, strong) IBOutlet UIButton *addContactButton; @property(nonatomic, strong) IBOutlet UICallButton *callButton; @property(nonatomic, strong) IBOutlet UICallButton *addCallButton; -@property(nonatomic, strong) IBOutlet UITransferButton *transferButton; +@property(nonatomic, strong) IBOutlet UICallButton *transferButton; @property(nonatomic, strong) IBOutlet UIButton *backButton; @property(weak, nonatomic) IBOutlet UIIconButton *backspaceButton; diff --git a/Classes/DialerView.m b/Classes/DialerView.m index c1add498d..381cb5810 100644 --- a/Classes/DialerView.m +++ b/Classes/DialerView.m @@ -333,7 +333,7 @@ static UICompositeViewDescription *compositeDescription = nil; transferButton.hidden = (!callInProgress || !transferMode); addContactButton.hidden = callButton.hidden = callInProgress; backButton.hidden = !callInProgress; - [callButton updateVideoPolicy]; + [callButton updateIcon]; } - (void)setAddress:(NSString *)address { diff --git a/Classes/LinphoneUI/UICallButton.h b/Classes/LinphoneUI/UICallButton.h index 7261c8ee5..9638112ad 100644 --- a/Classes/LinphoneUI/UICallButton.h +++ b/Classes/LinphoneUI/UICallButton.h @@ -26,6 +26,6 @@ @property(nonatomic, strong) IBOutlet UITextField *addressField; -- (void)updateVideoPolicy; +- (void)updateIcon; @end diff --git a/Classes/LinphoneUI/UICallButton.m b/Classes/LinphoneUI/UICallButton.m index 9f080ca7c..c67434d71 100644 --- a/Classes/LinphoneUI/UICallButton.m +++ b/Classes/LinphoneUI/UICallButton.m @@ -93,7 +93,7 @@ } } -- (void)updateVideoPolicy { +- (void)updateIcon { if (linphone_core_video_capture_enabled(LC) && linphone_core_get_video_policy(LC)->automatically_initiate) { [self setImage:[UIImage imageNamed:@"call_video_start_default.png"] forState:UIControlStateNormal]; [self setImage:[UIImage imageNamed:@"call_video_start_disabled.png"] forState:UIControlStateDisabled]; @@ -101,5 +101,7 @@ [self setImage:[UIImage imageNamed:@"call_audio_start_default.png"] forState:UIControlStateNormal]; [self setImage:[UIImage imageNamed:@"call_audio_start_disabled.png"] forState:UIControlStateDisabled]; } + + if (LinphoneManager.instance.) } @end diff --git a/Classes/LinphoneUI/UITransferButton.h b/Classes/LinphoneUI/UITransferButton.h deleted file mode 100644 index c6884ba4e..000000000 --- a/Classes/LinphoneUI/UITransferButton.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - -#import "UIIconButton.h" - -@interface UITransferButton : UIIconButton - -@property(nonatomic, strong) IBOutlet UITextField *addressField; - -@end diff --git a/Classes/LinphoneUI/UITransferButton.m b/Classes/LinphoneUI/UITransferButton.m deleted file mode 100644 index 8ad3a577e..000000000 --- a/Classes/LinphoneUI/UITransferButton.m +++ /dev/null @@ -1,67 +0,0 @@ -/* 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 - -@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; -} - -#pragma mark - - -- (void)touchUp:(id)sender { - LinphoneAddress *addr = linphone_core_interpret_url(LC, addressField.text.UTF8String); - [LinphoneManager.instance call:addr transfer:TRUE]; - if (addr) - linphone_address_destroy(addr); -} - -@end diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 1d85cb2d3..85c364087 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -567,7 +567,6 @@ D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; D306459E1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; }; D3128FE115AABC7E00A2147A /* ContactDetailsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3128FDF15AABC7E00A2147A /* ContactDetailsView.m */; }; - D3196D3E15A32BD8007FEEBA /* UITransferButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D3196D3D15A32BD8007FEEBA /* UITransferButton.m */; }; D31AAF5E159B3919002C6B02 /* CallPausedTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D31AAF5D159B3919002C6B02 /* CallPausedTableView.m */; }; D31B4B21159876C0002E6C72 /* UICompositeView.m in Sources */ = {isa = PBXBuildFile; fileRef = D31B4B1F159876C0002E6C72 /* UICompositeView.m */; }; D31C9C98158A1CDF00756B45 /* UIHistoryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D31C9C97158A1CDE00756B45 /* UIHistoryCell.m */; }; @@ -1392,8 +1391,6 @@ D30BF33216A427BC00AF0026 /* libtunnel.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtunnel.a; path = "liblinphone-sdk/apple-darwin/lib/libtunnel.a"; sourceTree = ""; }; D3128FDE15AABC7E00A2147A /* ContactDetailsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactDetailsView.h; sourceTree = ""; }; D3128FDF15AABC7E00A2147A /* ContactDetailsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactDetailsView.m; sourceTree = ""; }; - D3196D3C15A32BD7007FEEBA /* UITransferButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITransferButton.h; sourceTree = ""; }; - D3196D3D15A32BD8007FEEBA /* UITransferButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITransferButton.m; sourceTree = ""; }; D31AAF5C159B3919002C6B02 /* CallPausedTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallPausedTableView.h; sourceTree = ""; }; D31AAF5D159B3919002C6B02 /* CallPausedTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallPausedTableView.m; sourceTree = ""; }; D31B4B1E159876C0002E6C72 /* UICompositeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICompositeView.h; sourceTree = ""; }; @@ -1928,8 +1925,6 @@ F03CA84218C72F1A0008889D /* UITextViewNoDefine.m */, D32648421588F6FA00930C67 /* UIToggleButton.h */, D32648431588F6FB00930C67 /* UIToggleButton.m */, - D3196D3C15A32BD7007FEEBA /* UITransferButton.h */, - D3196D3D15A32BD8007FEEBA /* UITransferButton.m */, 340751E5150F38FC00B89C47 /* UIVideoButton.h */, 340751E6150F38FD00B89C47 /* UIVideoButton.m */, 6381DA7B1C1AD5EA00DF3BBD /* UIBouncingView.h */, @@ -3474,7 +3469,6 @@ D31B4B21159876C0002E6C72 /* UICompositeView.m in Sources */, D31AAF5E159B3919002C6B02 /* CallPausedTableView.m in Sources */, D32B9DFC15A2F131000B6DEC /* FastAddressBook.m in Sources */, - D3196D3E15A32BD8007FEEBA /* UITransferButton.m in Sources */, D350F20E15A43BB100149E54 /* AssistantView.m in Sources */, D3F795D615A582810077328B /* ChatConversationView.m in Sources */, D32B6E2915A5BC440033019F /* ChatConversationTableView.m in Sources */,