From 9a1ae41194413295082ba3de8a42fa0cfdf9dca7 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 4 Aug 2015 11:36:07 +0200 Subject: [PATCH] callbar --- Classes/Base.lproj/ChatViewController.xib | 8 +- Classes/Base.lproj/InCallViewController.xib | 377 +++++++- .../LinphoneUI/Base.lproj/UICallBar.strings | Bin 9650 -> 0 bytes Classes/LinphoneUI/Base.lproj/UICallBar.xib | 437 ---------- .../Base.lproj/UICallBar~ipad.strings | Bin 7510 -> 0 bytes .../LinphoneUI/Base.lproj/UICallBar~ipad.xib | 813 ------------------ Classes/LinphoneUI/UICallBar.h | 78 -- Classes/LinphoneUI/UICallBar.m | 588 ------------- Classes/LinphoneUI/ar.lproj/UICallBar.strings | Bin 9736 -> 0 bytes .../LinphoneUI/ar.lproj/UICallBar.strings2 | Bin 9920 -> 0 bytes .../ar.lproj/UICallBar~ipad.strings | Bin 7598 -> 0 bytes Classes/LinphoneUI/de.lproj/UICallBar.strings | Bin 9864 -> 0 bytes .../de.lproj/UICallBar~ipad.strings | Bin 7658 -> 0 bytes Classes/LinphoneUI/fr.lproj/UICallBar.strings | Bin 9796 -> 0 bytes .../fr.lproj/UICallBar~ipad.strings | Bin 7640 -> 0 bytes Classes/LinphoneUI/ja.lproj/UICallBar.strings | Bin 9450 -> 0 bytes .../ja.lproj/UICallBar~ipad.strings | Bin 7352 -> 0 bytes Classes/LinphoneUI/nl.lproj/UICallBar.strings | Bin 9804 -> 0 bytes .../nl.lproj/UICallBar~ipad.strings | Bin 7646 -> 0 bytes Classes/LinphoneUI/ru.lproj/UICallBar.strings | Bin 9738 -> 0 bytes .../ru.lproj/UICallBar~ipad.strings | Bin 7632 -> 0 bytes .../LinphoneUI/zh_TW.lproj/UICallBar.strings | Bin 9646 -> 0 bytes .../zh_TW.lproj/UICallBar~ipad.strings | Bin 7506 -> 0 bytes linphone.xcodeproj/project.pbxproj | 42 - 24 files changed, 378 insertions(+), 1965 deletions(-) delete mode 100644 Classes/LinphoneUI/Base.lproj/UICallBar.strings delete mode 100644 Classes/LinphoneUI/Base.lproj/UICallBar.xib delete mode 100644 Classes/LinphoneUI/Base.lproj/UICallBar~ipad.strings delete mode 100644 Classes/LinphoneUI/Base.lproj/UICallBar~ipad.xib delete mode 100644 Classes/LinphoneUI/UICallBar.h delete mode 100644 Classes/LinphoneUI/UICallBar.m delete mode 100644 Classes/LinphoneUI/ar.lproj/UICallBar.strings delete mode 100644 Classes/LinphoneUI/ar.lproj/UICallBar.strings2 delete mode 100644 Classes/LinphoneUI/ar.lproj/UICallBar~ipad.strings delete mode 100644 Classes/LinphoneUI/de.lproj/UICallBar.strings delete mode 100644 Classes/LinphoneUI/de.lproj/UICallBar~ipad.strings delete mode 100644 Classes/LinphoneUI/fr.lproj/UICallBar.strings delete mode 100644 Classes/LinphoneUI/fr.lproj/UICallBar~ipad.strings delete mode 100644 Classes/LinphoneUI/ja.lproj/UICallBar.strings delete mode 100644 Classes/LinphoneUI/ja.lproj/UICallBar~ipad.strings delete mode 100644 Classes/LinphoneUI/nl.lproj/UICallBar.strings delete mode 100644 Classes/LinphoneUI/nl.lproj/UICallBar~ipad.strings delete mode 100644 Classes/LinphoneUI/ru.lproj/UICallBar.strings delete mode 100644 Classes/LinphoneUI/ru.lproj/UICallBar~ipad.strings delete mode 100644 Classes/LinphoneUI/zh_TW.lproj/UICallBar.strings delete mode 100644 Classes/LinphoneUI/zh_TW.lproj/UICallBar~ipad.strings diff --git a/Classes/Base.lproj/ChatViewController.xib b/Classes/Base.lproj/ChatViewController.xib index 7e96402e3..9a4a3be0c 100644 --- a/Classes/Base.lproj/ChatViewController.xib +++ b/Classes/Base.lproj/ChatViewController.xib @@ -28,7 +28,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -95,7 +425,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar.strings b/Classes/LinphoneUI/Base.lproj/UICallBar.strings deleted file mode 100644 index dd9323ebd4d9b5ebe590d880a8dd13a17832f15e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9650 zcmchdO>Yx15QgWRUs3hgLm{EvBtjf09H;~;>Ie5W4Ky^gC?81td0=MUiEGc;&O~bz z5mnx;Uq62B@r=vgKRtK>2e1e4U=G)?#LphQ!GHU31*dQVYgpmu5gxGRHMU>F1V7XE z%^BRl41aHiZ~TUj`0NIs%r`xpv~S-({pJ}y{f^Hk`1UEh-@Mg4JwL#a^zi2f4!2U- z-}LZYr-yyiBl>_Ndw_2^D?bZV!-#5Vri!)dl6^+9HM%-2aE&6ak(n!0s!Mf&K24GA z9={g_vT;N9fcFguUmy(OLA~y*FY1_R(8>`GUUOVtgq3G7!ED%)W$bb~1hD*q5;PoG&_y z-n;iD?B70mi!T=#)vj^BtT1v<+UWMRJ%Oee=O}w}xl}504G>QZsOnsTp!SJ7Uh7AucasY}A=X`19nkQ|vwoJw7i3%G0dTPZ7V;8+kH zn~6fTx@4Tir9I;H=<6qY1?5!gl5pjaCW&jN2JBUnQ>jbB<4lt+{PV#%lSxAw{Tbcn>v| zu1VzmOnNQ$F?w?*&e6lQ9is2rZJ=k7I$e{<8^JsYN6P0URJ)c)q)yi);k`_rB0iVM z52{H^6ro1f1mO)vo*+Jth=5L{5<#fZHGvjCa~uP#09+LC>xtUR9GX(sG+HFd)5NDK zttvWCORi{2b{fmMbB>XR{`Ob8tLo$5>$r;W9#Nb1tO*tEbow0f*%J1ib1BWEEBI&} zYS;-Z{>XTlXOb(g*&&mYs&-0!7TG7Mup5`I;=PhOb`pzU=eU#T=643a@Ox3nyJ=U& zmA7lN?<%QlC)H<@J?oB5*YU1tN_HBHZzotIt;JcZ1WMqA}bQm1PYZNKJO fST97=0TQ|g*VU%xq?v9iLbt(@`cT0Qs&_EMbh diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar.xib b/Classes/LinphoneUI/Base.lproj/UICallBar.xib deleted file mode 100644 index 3a77686e8..000000000 --- a/Classes/LinphoneUI/Base.lproj/UICallBar.xib +++ /dev/null @@ -1,437 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.strings deleted file mode 100644 index 934dcf894bbd5bbee9185715c4c36d55e1b266f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7510 zcmchbPj3@35XI-5PZ9OlLm`_qZG|{cI8X^xq!jM?2ZV+cCGCMP4?M3kalJEMXQVY+ zC5pToKmYv3<5~ax)1w!3N_~1uYnsvySD#+vb3&i#hOX&}9&tU;1}(49KBYOXW&Pxe zX0*cpR(Rq!eZajL?yL_zT-Q(E@Bev=yFYM$j;C+v-QlSLz1%->im~+Y+qIk>rF3%W z<+)Z5y_BPRkCAQY8)oKLmTVx%24=FRURk;c+?moA-+egceE$m1w)kvn-+dIMy{rUr zWhOpm3}t8G6XxIvF}}@eyX zd|J{%@k*++d8KouRf1nq$4;Zi1V^1zu#@Nt-BMVh?j!u0Bi>iuu~z9`r7Q_oWN8w1jo&vaym44byh>RTu2j+_ z>{=kPSKD5tED7)9X%coVkl5>JuTqwT_lh(LyB0|7HM3VKOTyVTO~S4P5_?tYRmzfF zW~!Bn*tI}nuU5QDSrXnY(w?wufyBPQdzG>z{0`rKUQiKx7kDnsx%jzOSt>rMO8dhO z1|Iu+VYXlE9m99zTd01O4HnZZ8Tvp6+NR6&3;&;U~!AN95*ODiQ`|o=6 z@d-rR=$koiROh(d{Kx&r-crVMRzCJB>bDU6SYu|C2(? h{^__Hi&f!T@~c8q>Dmu12ey$kSIGFN6{4y1=pP2yT+jdj diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.xib b/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.xib deleted file mode 100644 index ceb7256d2..000000000 --- a/Classes/LinphoneUI/Base.lproj/UICallBar~ipad.xib +++ /dev/null @@ -1,813 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Classes/LinphoneUI/UICallBar.h b/Classes/LinphoneUI/UICallBar.h deleted file mode 100644 index 862286c74..000000000 --- a/Classes/LinphoneUI/UICallBar.h +++ /dev/null @@ -1,78 +0,0 @@ -/* UICallBar.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 Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import - -#import "UIMicroButton.h" -#import "UIPauseButton.h" -#import "UISpeakerButton.h" -#import "UIVideoButton.h" -#import "UIHangUpButton.h" -#import "UIDigitButton.h" -#import "TPMultiLayoutViewController.h" - -@interface UICallBar: TPMultiLayoutViewController { -} - -@property (nonatomic, strong) IBOutlet UIPauseButton* pauseButton; -@property (nonatomic, strong) IBOutlet UIButton* conferenceButton; -@property (nonatomic, strong) IBOutlet UIVideoButton* videoButton; -@property (nonatomic, strong) IBOutlet UIMicroButton* microButton; -@property (nonatomic, strong) IBOutlet UISpeakerButton* speakerButton; -@property (nonatomic, strong) IBOutlet UIToggleButton* routesButton; -@property(nonatomic, strong) IBOutlet UIToggleButton *optionsButton; -@property (nonatomic, strong) IBOutlet UIHangUpButton* hangupButton; -@property (nonatomic, strong) IBOutlet UIView* padView; -@property (nonatomic, strong) IBOutlet UIView* routesView; -@property (nonatomic, strong) IBOutlet UIView* optionsView; -@property (nonatomic, strong) IBOutlet UIButton* routesReceiverButton; -@property (nonatomic, strong) IBOutlet UIButton* routesSpeakerButton; -@property (nonatomic, strong) IBOutlet UIButton* routesBluetoothButton; -@property (nonatomic, strong) IBOutlet UIButton* optionsAddButton; -@property (nonatomic, strong) IBOutlet UIButton* optionsTransferButton; -@property (nonatomic, strong) IBOutlet UIToggleButton* dialerButton; - -@property (nonatomic, strong) IBOutlet UIImageView* leftPadding; -@property (nonatomic, strong) IBOutlet UIImageView* rightPadding; - - -@property (nonatomic, strong) IBOutlet UIDigitButton* oneButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* twoButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* threeButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* fourButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* fiveButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* sixButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* sevenButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* eightButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* nineButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* starButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* zeroButton; -@property (nonatomic, strong) IBOutlet UIDigitButton* sharpButton; - -- (IBAction)onRoutesClick:(id)sender; -- (IBAction)onRoutesBluetoothClick:(id)sender; -- (IBAction)onRoutesReceiverClick:(id)sender; -- (IBAction)onRoutesSpeakerClick:(id)sender; -- (IBAction)onOptionsClick:(id)sender; -- (IBAction)onOptionsTransferClick:(id)sender; -- (IBAction)onOptionsAddClick:(id)sender; -- (IBAction)onConferenceClick:(id)sender; -- (IBAction)onPadClick:(id)sender; - -@end diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m deleted file mode 100644 index 7a341c403..000000000 --- a/Classes/LinphoneUI/UICallBar.m +++ /dev/null @@ -1,588 +0,0 @@ -/* UICallBar.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 Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import "UICallBar.h" -#import "LinphoneManager.h" -#import "PhoneMainView.h" -#import "Utils.h" -#import "CAAnimation+Blocks.h" - -#include "linphone/linphonecore.h" - -@implementation UICallBar - -@synthesize pauseButton; -@synthesize conferenceButton; -@synthesize videoButton; -@synthesize microButton; -@synthesize speakerButton; -@synthesize routesButton; -@synthesize optionsButton; -@synthesize hangupButton; -@synthesize routesBluetoothButton; -@synthesize routesReceiverButton; -@synthesize routesSpeakerButton; -@synthesize optionsAddButton; -@synthesize optionsTransferButton; -@synthesize dialerButton; - -@synthesize padView; -@synthesize routesView; -@synthesize optionsView; - -@synthesize oneButton; -@synthesize twoButton; -@synthesize threeButton; -@synthesize fourButton; -@synthesize fiveButton; -@synthesize sixButton; -@synthesize sevenButton; -@synthesize eightButton; -@synthesize nineButton; -@synthesize starButton; -@synthesize zeroButton; -@synthesize sharpButton; - -#pragma mark - Lifecycle Functions - -- (id)init { - return [super initWithNibName:@"UICallBar" bundle:[NSBundle mainBundle]]; -} - -- (void)dealloc { - - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -#pragma mark - ViewController Functions - -- (void)viewDidLoad { - [pauseButton setType:UIPauseButtonType_CurrentCall call:nil]; - - [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]; - - { - UIButton *videoButtonLandscape = (UIButton *)[landscapeView viewWithTag:[videoButton tag]]; - // Set selected+disabled background: IB lack ! - [videoButton setBackgroundImage:[UIImage imageNamed:@"video_on_disabled.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - [videoButtonLandscape setBackgroundImage:[UIImage imageNamed:@"video_on_disabled_landscape.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - - // Set selected+over background: IB lack ! - [videoButton setBackgroundImage:[UIImage imageNamed:@"video_on_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [videoButtonLandscape setBackgroundImage:[UIImage imageNamed:@"video_on_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - [LinphoneUtils buttonFixStates:videoButton]; - [LinphoneUtils buttonFixStates:videoButtonLandscape]; - } - - { - UIImageView *leftPaddingLandscape = (UIImageView *)[landscapeView viewWithTag:self.leftPadding.tag]; - leftPaddingLandscape.image = [UIImage imageNamed:@"incall_padding_left_landscape.png"]; - } - { - UIImageView *rightPaddingLandscape = (UIImageView *)[landscapeView viewWithTag:self.rightPadding.tag]; - rightPaddingLandscape.image = [UIImage imageNamed:@"incall_padding_right_landscape.png"]; - } - - { - UIButton *speakerButtonLandscape = (UIButton *)[landscapeView viewWithTag:[speakerButton tag]]; - // Set selected+disabled background: IB lack ! - [speakerButton setBackgroundImage:[UIImage imageNamed:@"speaker_on_disabled.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - [speakerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"speaker_on_disabled_landscape.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - - // Set selected+over background: IB lack ! - [speakerButton setBackgroundImage:[UIImage imageNamed:@"speaker_on_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [speakerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"speaker_on_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - [LinphoneUtils buttonFixStates:speakerButton]; - [LinphoneUtils buttonFixStates:speakerButtonLandscape]; - } - - if (![LinphoneManager runningOnIpad]) { - UIButton *routesButtonLandscape = (UIButton *)[landscapeView viewWithTag:[routesButton tag]]; - // Set selected+over background: IB lack ! - [routesButton setBackgroundImage:[UIImage imageNamed:@"routes_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [routesButtonLandscape setBackgroundImage:[UIImage imageNamed:@"routes_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - [LinphoneUtils buttonFixStates:routesButton]; - [LinphoneUtils buttonFixStates:routesButtonLandscape]; - } - - { - UIButton *microButtonLandscape = (UIButton *)[landscapeView viewWithTag:[microButton tag]]; - // Set selected+disabled background: IB lack ! - [microButton setBackgroundImage:[UIImage imageNamed:@"micro_on_disabled.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - [microButtonLandscape setBackgroundImage:[UIImage imageNamed:@"micro_on_disabled_landscape.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - - // Set selected+over background: IB lack ! - [microButton setBackgroundImage:[UIImage imageNamed:@"micro_on_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [microButtonLandscape setBackgroundImage:[UIImage imageNamed:@"micro_on_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - [LinphoneUtils buttonFixStates:microButton]; - [LinphoneUtils buttonFixStates:microButtonLandscape]; - } - - { - UIButton *optionsButtonLandscape = (UIButton *)[landscapeView viewWithTag:[optionsButton tag]]; - // Set selected+disabled background: IB lack ! - [optionsButton setBackgroundImage:[UIImage imageNamed:@"options_disabled.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - [optionsButtonLandscape setBackgroundImage:[UIImage imageNamed:@"options_disabled_landscape.png"] - forState:(UIControlStateDisabled | UIControlStateSelected)]; - - // Set selected+over background: IB lack ! - [optionsButton setBackgroundImage:[UIImage imageNamed:@"options_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [optionsButtonLandscape setBackgroundImage:[UIImage imageNamed:@"options_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [LinphoneUtils buttonFixStates:optionsButton]; - [LinphoneUtils buttonFixStates:optionsButtonLandscape]; - } - - { - UIButton *pauseButtonLandscape = (UIButton *)[landscapeView viewWithTag:[pauseButton tag]]; - // Set selected+over background: IB lack ! - [pauseButton setBackgroundImage:[UIImage imageNamed:@"pause_on_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [pauseButtonLandscape setBackgroundImage:[UIImage imageNamed:@"pause_on_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - [LinphoneUtils buttonFixStates:pauseButton]; - [LinphoneUtils buttonFixStates:pauseButtonLandscape]; - } - - { - UIButton *dialerButtonLandscape = (UIButton *)[landscapeView viewWithTag:[dialerButton tag]]; - // Set selected+over background: IB lack ! - [dialerButton setBackgroundImage:[UIImage imageNamed:@"dialer_alt_back_over.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [dialerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"dialer_alt_back_over_landscape.png"] - forState:(UIControlStateHighlighted | UIControlStateSelected)]; - - [LinphoneUtils buttonFixStates:dialerButton]; - [LinphoneUtils buttonFixStates:dialerButtonLandscape]; - } - - [super viewDidLoad]; -} - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(callUpdateEvent:) - name:kLinphoneCallUpdate - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(bluetoothAvailabilityUpdateEvent:) - name:kLinphoneBluetoothAvailabilityUpdate - object:nil]; - // Update on show - LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]); - LinphoneCallState state = (call != NULL) ? linphone_call_get_state(call) : 0; - [self callUpdate:call state:state]; - [self hideRoutes:FALSE]; - [self hideOptions:FALSE]; - [self hidePad:FALSE]; - [self showSpeaker]; -} - -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - - [[NSNotificationCenter defaultCenter] removeObserver:self name:kLinphoneCallUpdate object:nil]; - if (linphone_core_get_calls_nb([LinphoneManager getLc]) == 0) { - // reseting speaker button because no more call - speakerButton.selected = FALSE; - } -} - -#pragma mark - Event Functions - -- (void)callUpdateEvent:(NSNotification *)notif { - LinphoneCall *call = [[notif.userInfo objectForKey:@"call"] pointerValue]; - LinphoneCallState state = [[notif.userInfo objectForKey:@"state"] intValue]; - [self callUpdate:call state:state]; -} - -- (void)bluetoothAvailabilityUpdateEvent:(NSNotification *)notif { - bool available = [[notif.userInfo objectForKey:@"available"] intValue]; - [self bluetoothAvailabilityUpdate:available]; -} - -#pragma mark - - -- (void)callUpdate:(LinphoneCall *)call state:(LinphoneCallState)state { - LinphoneCore *lc = [LinphoneManager getLc]; - - [speakerButton update]; - [microButton update]; - [pauseButton update]; - [videoButton update]; - [hangupButton update]; - - optionsButton.enabled = - (state == LinphoneCallPaused || state == LinphoneCallPausing || state == LinphoneCallStreamsRunning); - - // Show Pause/Conference button following call count - if (linphone_core_get_calls_nb(lc) > 1) { - if (![pauseButton isHidden]) { - [pauseButton setHidden:true]; - [conferenceButton setHidden:false]; - } - bool enabled = true; - const MSList *list = linphone_core_get_calls(lc); - while (list != NULL) { - LinphoneCall *call = (LinphoneCall *)list->data; - LinphoneCallState state = linphone_call_get_state(call); - if (state == LinphoneCallIncomingReceived || state == LinphoneCallOutgoingInit || - state == LinphoneCallOutgoingProgress || state == LinphoneCallOutgoingRinging || - state == LinphoneCallOutgoingEarlyMedia || state == LinphoneCallConnected) { - enabled = false; - } - list = list->next; - } - [conferenceButton setEnabled:enabled]; - } else { - if ([pauseButton isHidden]) { - [pauseButton setHidden:false]; - [conferenceButton setHidden:true]; - } - } - - // Disable transfert in conference - if (linphone_core_get_current_call(lc) == NULL) { - [optionsTransferButton setEnabled:FALSE]; - } else { - [optionsTransferButton setEnabled:TRUE]; - } - - switch (state) { - case LinphoneCallEnd: - case LinphoneCallError: - case LinphoneCallIncoming: - case LinphoneCallOutgoing: - [self hidePad:TRUE]; - [self hideOptions:TRUE]; - [self hideRoutes:TRUE]; - default: - break; - } -} - -- (void)bluetoothAvailabilityUpdate:(bool)available { - if (available) { - [self hideSpeaker]; - } else { - [self showSpeaker]; - } -} - -#pragma mark - - -- (void)showAnimation:(NSString *)animationID target:(UIView *)target completion:(void (^)(BOOL finished))completion { - CGRect frame = [target frame]; - int original_y = frame.origin.y; - frame.origin.y = [[self view] frame].size.height; - [target setFrame:frame]; - [target setHidden:FALSE]; - [UIView animateWithDuration:0.5 - delay:0.0 - options:UIViewAnimationOptionCurveEaseOut - animations:^{ - CGRect frame = [target frame]; - frame.origin.y = original_y; - [target setFrame:frame]; - } - completion:^(BOOL finished) { - CGRect frame = [target frame]; - frame.origin.y = original_y; - [target setFrame:frame]; - completion(finished); - }]; -} - -- (void)hideAnimation:(NSString *)animationID target:(UIView *)target completion:(void (^)(BOOL finished))completion { - CGRect frame = [target frame]; - int original_y = frame.origin.y; - [UIView animateWithDuration:0.5 - delay:0.0 - options:UIViewAnimationOptionCurveEaseIn - animations:^{ - CGRect frame = [target frame]; - frame.origin.y = [[self view] frame].size.height; - [target setFrame:frame]; - } - completion:^(BOOL finished) { - CGRect frame = [target frame]; - frame.origin.y = original_y; - [target setHidden:TRUE]; - [target setFrame:frame]; - completion(finished); - }]; -} - -- (void)showPad:(BOOL)animated { - [dialerButton setOn]; - if ([padView isHidden]) { - if (animated) { - [self showAnimation:@"show" - target:padView - completion:^(BOOL finished){ - }]; - } else { - [padView setHidden:FALSE]; - } - } -} - -- (void)hidePad:(BOOL)animated { - [dialerButton setOff]; - if (![padView isHidden]) { - if (animated) { - [self hideAnimation:@"hide" - target:padView - completion:^(BOOL finished){ - }]; - } else { - [padView setHidden:TRUE]; - } - } -} - -- (void)showRoutes:(BOOL)animated { - if (![LinphoneManager runningOnIpad]) { - [routesButton setOn]; - [routesBluetoothButton setSelected:[[LinphoneManager instance] bluetoothEnabled]]; - [routesSpeakerButton setSelected:[[LinphoneManager instance] speakerEnabled]]; - [routesReceiverButton setSelected:!([[LinphoneManager instance] bluetoothEnabled] || - [[LinphoneManager instance] speakerEnabled])]; - if ([routesView isHidden]) { - if (animated) { - [self showAnimation:@"show" - target:routesView - completion:^(BOOL finished){ - }]; - } else { - [routesView setHidden:FALSE]; - } - } - } -} - -- (void)hideRoutes:(BOOL)animated { - if (![LinphoneManager runningOnIpad]) { - [routesButton setOff]; - if (![routesView isHidden]) { - if (animated) { - [self hideAnimation:@"hide" - target:routesView - completion:^(BOOL finished){ - }]; - } else { - [routesView setHidden:TRUE]; - } - } - } -} - -- (void)showOptions:(BOOL)animated { - [optionsButton setOn]; - if ([optionsView isHidden]) { - if (animated) { - [self showAnimation:@"show" - target:optionsView - completion:^(BOOL finished){ - }]; - } else { - [optionsView setHidden:FALSE]; - } - } -} - -- (void)hideOptions:(BOOL)animated { - [optionsButton setOff]; - if (![optionsView isHidden]) { - if (animated) { - [self hideAnimation:@"hide" - target:optionsView - completion:^(BOOL finished){ - }]; - } else { - [optionsView setHidden:TRUE]; - } - } -} - -- (void)showSpeaker { - if (![LinphoneManager runningOnIpad]) { - [speakerButton setHidden:FALSE]; - [routesButton setHidden:TRUE]; - } -} - -- (void)hideSpeaker { - if (![LinphoneManager runningOnIpad]) { - [speakerButton setHidden:TRUE]; - [routesButton setHidden:FALSE]; - } -} - -#pragma mark - Action Functions - -- (IBAction)onPadClick:(id)sender { - if ([padView isHidden]) { - [self showPad:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; - } else { - [self hidePad:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; - } -} - -- (IBAction)onRoutesBluetoothClick:(id)sender { - [self hideRoutes:TRUE]; - [[LinphoneManager instance] setBluetoothEnabled:TRUE]; -} - -- (IBAction)onRoutesReceiverClick:(id)sender { - [self hideRoutes:TRUE]; - [[LinphoneManager instance] setSpeakerEnabled:FALSE]; - [[LinphoneManager instance] setBluetoothEnabled:FALSE]; -} - -- (IBAction)onRoutesSpeakerClick:(id)sender { - [self hideRoutes:TRUE]; - [[LinphoneManager instance] setSpeakerEnabled:TRUE]; -} - -- (IBAction)onRoutesClick:(id)sender { - if ([routesView isHidden]) { - [self showRoutes:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; - } else { - [self hideRoutes:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; - } -} - -- (IBAction)onOptionsTransferClick:(id)sender { - [self hideOptions:TRUE]; - // Go to dialer view - DialerViewController *controller = - DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]], - DialerViewController); - if (controller != nil) { - [controller setAddress:@""]; - [controller setTransferMode:TRUE]; - } -} - -- (IBAction)onOptionsAddClick:(id)sender { - [self hideOptions:TRUE]; - // Go to dialer view - DialerViewController *controller = - DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]], - DialerViewController); - if (controller != nil) { - [controller setAddress:@""]; - [controller setTransferMode:FALSE]; - } -} - -- (IBAction)onOptionsClick:(id)sender { - if ([optionsView isHidden]) { - [self showOptions:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; - } else { - [self hideOptions:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; - } -} - -- (IBAction)onConferenceClick:(id)sender { - linphone_core_add_all_to_conference([LinphoneManager getLc]); -} - -#pragma mark - TPMultiLayoutViewController Functions - -- (NSDictionary *)attributesForView:(UIView *)view { - NSMutableDictionary *attributes = [NSMutableDictionary dictionary]; - - [attributes setObject:[NSValue valueWithCGRect:view.frame] forKey:@"frame"]; - [attributes setObject:[NSValue valueWithCGRect:view.bounds] forKey:@"bounds"]; - if ([view isKindOfClass:[UIButton class]]) { - UIButton *button = (UIButton *)view; - [LinphoneUtils buttonMultiViewAddAttributes:attributes button:button]; - } else if (view.tag == self.leftPadding.tag || view.tag == self.rightPadding.tag) { - UIImage *image = [(UIImageView *)view image]; - if (image) { - [attributes setObject:image forKey:@"image"]; - } - } - [attributes setObject:[NSNumber numberWithInteger:view.autoresizingMask] forKey:@"autoresizingMask"]; - - return attributes; -} - -- (void)applyAttributes:(NSDictionary *)attributes toView:(UIView *)view { - view.frame = [[attributes objectForKey:@"frame"] CGRectValue]; - view.bounds = [[attributes objectForKey:@"bounds"] CGRectValue]; - if ([view isKindOfClass:[UIButton class]]) { - UIButton *button = (UIButton *)view; - [LinphoneUtils buttonMultiViewApplyAttributes:attributes button:button]; - } else if (view.tag == self.leftPadding.tag || view.tag == self.rightPadding.tag) { - - [(UIImageView *)view setImage:[attributes objectForKey:@"image"]]; - } - view.autoresizingMask = [[attributes objectForKey:@"autoresizingMask"] integerValue]; -} - -@end diff --git a/Classes/LinphoneUI/ar.lproj/UICallBar.strings b/Classes/LinphoneUI/ar.lproj/UICallBar.strings deleted file mode 100644 index 9c1db682e9598466e52bc2c6eb331a4e18e1a36a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9736 zcmchdT~pIQ6o${$Uhpdrb&65J@R7FTctK0GFgiGZ-b1NUso?P8jDKEzPqs^j&4%qs zb~_z9WfOAp^xg9r{{3B|bxLTN`ZT2zy1{Fi-r;A3zR(`^=#Fmjx}r<0yv6znjqn=h zXHMvpCiuGv&iF$gaqJXFruSFq6%M>WLVUD9`aGrv4!ZHufeCd)vyOw6~b2C9YMUMzs{GYIdX z@YuuGvG_V-z66@})V|sQLP<^$E{i$`_260`+ zOZee6{luM5={WbgDF}?eHl=c3z3{Sd9FiDv0IhDp$`RVCfO>HY>7#G zEom!pNsK>Nk+e&F1g}V=v9=PI#AJSDBrn3vf=eAMwcVUSnJ;X8k2cA{lknSD0lbA=zZYlopid4x&y+*IM5B>DyE4G?8 z?c=>e6{Anhf~sB@Y{LDKIKBNNHpuAueyU;{67{~ct7{5)^@~4UX!Y} z3cdJQ^iaKwqFG2XpK7sL=8yCpN4>;r{%jmSU&*3h$5Acunx7OW~zC{HL- eZ6%0@l|GfI1ogOyq&N4mi zOw-Vm*=5f@edl~G|NgGfCe>+`x-_O!y2Wdi-r;AB_NhZ(viAwy;dM<{Sbd9Qr!>H8 zn4LYMGaBJyjTeZ;Xd92wtVrIVd~IsMB+9Q}dg1Dw52d-rFh)8lpA%?duJv@w&F zwfig7%$`ZiE7LbE!*{uYS6s3_?(mAf(}aF`=o$sOhMFz~)haRLw&|G~etWSb%Fm#j zKBt+44>;uVmyX|LvUW={l>%DDsZ;coITSu>)5MS&s|V2 z!g&S1yrG}C`!StlUN{DY`0%1+?yKis7nVg6R}P`s9e6n^-Fh@j=uJU2UYRGtY+!%Z zpj|DZW+BLYx^W~4!=lmb6Z9Hjw_bboN=kYqbLrKCUR~(bM^x#X_Y1@m_ctnjwkVnV z>bak>Ug20Yntg?4=ZGkN&9+LKZOx@w8=7t6ryotNMVV$%D+Gl`r(;CJQ~1^$V*enE zir=zqHbi{nTFq8&RrS{v6+Mnuv=MS0x;>fZwHj)%`m|PAPCX{yz~iJT756ExXi4kY z_Zh#&l)AV|x0JREUdJn18fzs!jb!0!nw=8Oj+(|=iBEG(7n#TTs{fRBOH{jRs;5iZ zaZ=w_Yb1Lz@746(nza&NBk4-2X^OpBO8V~1T8U31_gYOOyty{|KFnH)Pb0owO(T0T zr_py?)=GRD@$o8}MyUtk6>X%pR^ro0R;i{b)(ed}>IG{hK8qXB^iVnVw85&QTy7DagkTFiq_3*^os}3(N5Kt zp=y!%@xG&q)2C`qHh&l8wjsMyH*a#y((E+NZ6)8I;bu;5OTwd>c_zqO5>F*s+O-Yr zW!Gdi=LtLebXyZ9&3vht%b15dT(^asC+v*LZB2M)pTH!g4wrd2pSdkO9h?8?X6!!pHZ=$#n6J$%?tzuKCGA#5hf^I)Z2OGfm%AEWvX~=~8mFcukw1 z*thuk)+^+w57FkDA-LRo;-OcCAkpZhi|DCiAM%=3vt`EjP=r49!ZK+zJc76J9C}2* z@qXi}^V#!?-M?Mas>q%f;+eVoo0TjOj?Qi8q5p;8(P-B}Up9ei{68Sqc)#$f*Kov5 zUel_#4)yr?c;CE?7BxfC`P5qm&+J*C>8P!E&7ZNClh1TfvFWI+c+F1}HY&RJz`T*7 gJn=}7%Q&04?SzjMZac!G_nwwx*YTR4sO&xe0saV>8vpqqlhN(kD8j6MCcv9QQQA$Qz7b(G8AK ze&#J*(=EPti!*-Fdwh0{PsWQYoaATU&A)kpPru{y8=QScr;D>1^m=|qf_vG)dp)vW zYNp-ARqEIX?=^MEQ!)9TI#5sM>~;7}=KS#;e+2s@;(Qb|oH?AC zm@`4-o~U!x0c%e^!~0|lhA$Am4|smH+gXsa>2Nm1oH~a0!CA-CT3?%Sf;*nl4;UKL zWuAY=@Wh#`3aa86{>?X=b4ar30Io(LzQf;X&{fNE)e^hvsjk|CCzE+vh|qOoatKE= z-1{|rjc8cltO`2+EY@3fOvMqxF<1pp@eDCoBysowE^iQl_rVx!J2BW6$Dqy^J>-in z;;@hG*jMk?%!|dpCi~iys`%>GRdpN^SD)c(h$k-W>dGhvOTyKRpMSm)kgoLgFc?__jK`I?{n7e>J`_uytk=_uXql-!>N`?Qbk`P8g)N*Ht$dBZe=-> z%k@u2^77cDaWwsUUapIvOSNclkxOOIf80>H~!8ZN0p@C)^wf=J+hBAz}Ka;S?+)A qANqKT?Qfq&w*Iu8=S7c%qpjNYr}($yXp`mPw)6bxkucG69{vk0#Y>I= diff --git a/Classes/LinphoneUI/de.lproj/UICallBar.strings b/Classes/LinphoneUI/de.lproj/UICallBar.strings deleted file mode 100644 index 2f3fddeb7463f2c5bba24c0913a20daccf3c93fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9864 zcmchd-%e9O5XR@aPto8V7wADaZDYIuHIb;nP}IabC({0b0 z(`DLS(%8WEu;2c6cK+fzNdo*d9I4e)mZJn@U(FTC2)bKX zw;y0@m)P27wt1zrR9)Dr53&oqj{;e@Lk;e8|ejyZ>P zSoj*B2l3KX$@JO1Z^dP?M2~&!-VJy;_KX8I%jj9jYCK|%BeROjdz-$aVy{_^WvO%p zZ?jpAPh4YIbE$Ka=x1*Es5-SJ&9P&lh|{;Q%Os* zgS)~>QIT@rVK~WxbzE&KM=~C3uZJhPphalj`tM0=^&CEB>L4XjV=DSDz=o#k(T zx{9z^I+wg|iLJ9NeACrcJWJdTrmiMTmab7br!gVlWOW746Q^^es|d$@|6@^qC9B+C znS*nhuHZT5HDY^;Ew1yt4|2%aq+U%?O~vC2*>Ijn_R^m7 zEY{mab$tuF@&Deq!uxs9ek~=E@|e{Nb!9uPzN?Z0b(KZ6Nywn8jgSWp2fQVI)p`Gt^>q9hff&&s1zz!^Ie-^6yD zNv{ivK&^A@Ngv@cUa4OwXVn6hxgcpTd1aq8y;~(O}ws_*WoL~ z?gD3*&-Og&XVar=s_BY~`@1*Aif8l@;&bxBC!jU4e zSO!yAAs3G(Cf~u+9%ADr8ILV59$V^oWVNwT8=8#8_m4gf!@DVdJ(MUsyYs3X28~A_ zv1@&t+q6d~o<}EYkJi=7c4vL|D#dG$FiXmv_4)Oy*Z3keVVvR2^W#kIhgHc-B6VJj zr0!MsJff}ctx8@Jso&xx;+njt)bXaGC9x`bNu*YblZb1ML|>g-mAoWU$;3&-HAkYa zx~)oH61fB8B;uMQ(O1}3B`=9&*Eor|=1BDQr&Y;Ia+;`I>Lji?5`E=jRq~R^Z4viG zTyrG)``xPKC6T_v_WnYh#5>1xs?No%#qU$Lx0RPmdR%db#6w4U=f4o1aIt_vI6FM)MM#qekwVJ{R{CCW)-jz^!kiQ=H-vE!R1sZf3fARqW>ozulSN z?jO|Q3)i^vep3!-Si`;Limq_2yL{6C=2-Em$8 zcd6{p`{tYQ&WpR7)Y~&ClWj&ZvxYUCyT442pZmhR$J_zuJ~+>$KcitS;VE|6Qk}d8 zZDvm%Nz)WH_V46v=U9KQjK8-wy?n_dX@>Rr%XVSco=DTniae5DeK|dmc;`=|Nz;pK zdS`=2j&MiBx|r^K{IC7R7*jZQ{|%4serkE=g-6m6SIp0kb@S?SbIUtRJd!5cmYe?q DmKcCF diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar.strings b/Classes/LinphoneUI/fr.lproj/UICallBar.strings deleted file mode 100644 index 182689de0dac34f5b65312cf0af47ca72529e470..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9796 zcmchc%}yIJ5Xa}7r--;z;?Q;}Y!X#HKsgkt6&0bqLr6LcCaZ9;R>sclhbTJN(&!FK_}!u!1Fi<}kyNw>W+Q zBm9i3Hz#lj6a2pkzVRDA;g-n><=pYP&II{0@9 zFP~&(XEVbY&Pr=s!J?Y0gY)F0`hcsO!FRNF8zJjCWW5$-X1^CmH-c;Ad=A3TNVr0U z#}U51!`D~y)h*@KZHRh}k?dx(i(Lr$IJGcMXT-obB6ja;3v*B zh4bpX(R_STwb=mWD*;DIctUau)>B;1sV_mjok!QEMY`c1mE<=oJlocpHjH>ANt;$McjB`|7 znOZB9o%X=>JQ~qPx?^~#GRgwiL3KqJ^V1CfvMYM1p4b)X6>YO8&Fm$(o=PKH_Iup< zIi3y5qGT^G8CSR=Jxh4woIV=SG8rp*NjSrXN%lRGeKm=(l9yzN)ij;JSPfsofk$+p zCOSr6`?IO2^OAAx8rF#Y(RN(=p37LtOTzs{n8fX{O3?RM#!6liUT2tuS*<4eZpv86 zOTyB%IsBB>V<@ zSFc6(H*@4A;T;c?uxge>pYx5Cyd;O%L0nZ;A>BSq*V!<{)dx3{(TMic9O6wO-RCVI zRiQ@#X}m=D(hM| zoyQbjWLDR;+uUV@SYztCR+d>j)xX_ozNO%*og+3*64Y(z2{iiXqID_w9*t==dd}FLiZG^HS|*K#^j$gKFi+rD zRa?hTn%mD8_zk_jqrb22xlKi%>wD02Y%%@P&}ei!!mek9iqXCG9DiR&`mh4Cmmec( zOnd%h%lb$o?(8#z#K+dOtxdaEKQ7%tuT%3$xXgC5PXfs;ykjg4*UlRYriu9 diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.strings deleted file mode 100644 index 42c0b2b8714bfe28642f36f28a39afa304a334eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7640 zcmd6r%WhLK5Qb-+r#R{csf$7`O#$XpYZ>#u#~y@ecLy z8JH)B)TJT*Z-^(p(QACy#W$n%3^(TKht+@H;oC3xzK5r8skMHpO3zkLoMJ5%{LLe0 zJ1L#4XL*O2d7TTIn%OFtDIeJ@tZq!7p!S%gt9o?RJ?QMdPeItD&tUxHh`6sckG!TPZ_$#znpI4Vc7Z(~<1e?OC06+7it;-D7He4``qT7v zkG`&^-&D&>c86G=<6Y)=eU|jL;n6kJbiSgVaE$d%O@xf--ejVYi4L2?e1(GI@fv0d zE4a+#Yv?I7S+xzH28hB3{I*$O8`HVx)4AFw&USnb6j0`Tz&pHup6$b>8RqGldHMm@ zjzJh#an2o=D;y_snjV8GtdNUG6O(V?X%CSxN#>2F7mrPKJZ`G#-?s2Ric_1jZ+o}G zEaBOmOPllSSFiEq1AOV@ZB6@f;rVi*_Qk3#S895)@Xm=Zhq8occfK6DdW|nq6UNV? zE6T;~-vd*yAravTIb!ebZa&ASy+VFBEkE96>y|r%lV6#^d-~Wb}33(*F`px#6)nbvGHKBxs_h071XDVTwD0P8{n#2Ty-(md-X*f zsW7fu{Ph-YxOpXF0mXTO=4y)(c=#4 zv5v7ItjA1Aj~THZpVbF-m_(0Qj*uQPGneSGg3)UY_s1Sa=T;HLHi`_>#&||2B7Hvc zopNTt-Zf;AMzpgFI|r{+Pu)|`Pvv~T%!Ao-uvZ{iq-;~g6HI%C~o&AEvVrGk-}{u!HxjeC6F zFOnW$hFOK<9!E88o5nTj>NJ`i6Wa@PkIxj6u8f^wh=A%zw+BNI)0uIP&9fiAhmn;k zNSZz66}Ja7`KtYGMvTw=Mh~({v&Bz*OYt#@HsfG%uVJ%4VrDPVMHX*!$0{S6RGYNXcU(*% zjbbSzIxXYQp}uPep5XUx;8aYz$gYdEO{&x{e5Z7zJ|%kNH$JM6ReklpWBm(gKl5rCK^7X*BmDv zvW4?(Ohk7-CDub0?`n?o4%xy4vGHy&g)|nFEB_2L5#=JcAG4-nV}W~oR>Qqw2knl! NV@;7QOyc%cf&cYAw-f*X diff --git a/Classes/LinphoneUI/ja.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/ja.lproj/UICallBar~ipad.strings deleted file mode 100644 index 95ff4bce634447769375d4012fbe5912676d67fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7352 zcmd6ry>1gh5XXnsk3eOG&P7JAeP=;3^a#4>zC(br|81 zhiiClz*yDgAZ50%D3#%jGMA}`{t%)%<@J3n5h_Vtp%BHRH*J1mc zBWaLQYMO*! zK`JX@Np?I{N(7{uCgE2p%1T%gS}oj~kZPKQzpg7QVM(YjFn|9a0codscG$VNkm?_n zhdNDeWk@?s!e8l?m9QjLc!E2!p|=ke8!NsX;jWWc)}YOGtchD`|4H@%dY)_$<7%&> zl9ZAoT&@?jk@$6Z6r?&{4Uexz&PKqgl4}@kvimt2_XcIBa51H3>zf$(_09KJmtG$& z-50dKMcT*AlFiR{()-!SlRS1CdN(5pVcXH}O`yUotzn`)L$8oPJkgM7=MZ}QvXu=sTUz5iMzfp9h*_KAzR&AbGwi~Hx>kIU>Em@T1eTElBl;59Jwa!9{{ z#Ja_2HiA|u*xj%3x)id;VS(My%n{u=1~5Le&Xyiy2$)&h8@L2 zU&~A1-TPIWOe}HZ3^%s`TaG%p( zQRy;^MCleP?Uz*AH>;FKvoq6gQ1r>~US)AQ7kziHPkw*<=`Fg95Z}h|o&{q01nSJ` zCd*AJK5=zbZGrnGpW+p3%-cM}ONM@nGhJt&rdf^CED|=khibk(Dk{n=R=%IX?ge-K z1fNK8^YPh9WgChlJ$hI0I$p8zawu`_RdQ^Y$w7(9ftiUziOXa}cbVtaRqs7IEHOGX zGaA90?=p{acyYN&?HX1|EYkN{_HN6e#APBqMwm&lyXuj>zj7#XnaDZAOoXe~#NJUk zl(Xl(rQeTNd4$wyR!*I9+i^M~0gABK1hs2It3#p*SesL)c( z*Sh%SPF7|pT~uuRq*>Lb*Z$I3w8K-!*z7N2Ftb$K7pQ%CdilKSHn{iLM%iI09`cG+ z+2ag-tZMs!%Dnk3P``Omx5&D>*9dXdF}%8)>|(N!DbIG3ByBq8=3{ky1gH5lNk zEVE0VxJXo$nCaH`V9nZu)a%mb3{%GvMt;6iZDD-!VlH!Q^=v%G>t;yRO!AYEs!2;y z>R_1(XEPna>ypQ?=P`YM(ZUwdSr4hxy?yc8HaucP^=fvuh{o)Snc1z?vuiJ^S@P65 ze44*^teb-+_^wd860aMtS#wh!v2AP2?_T9kVLrM=cz?=c*cn*#vBmD5Vtu@3)#(34 z^0xTZY1Sqqi+<$2`t1Nc*?0NRy{tQ`R0ZjJ|daQb{J$7~awZ+Gx-4Xh* zCA8yi=mCH4YPzxnS*#o*dCls7IGJY-eINw&Tna z(<+J-c{e`(e8%Ik|NL&y8#<(nKG2wYG{+~S_xK*rSGuALTG9faDNWGw4(&Y};8W^1 zN7Sbg{x`xKKj|9J`gk&4_i&-#eq8S@a%Y>5e3QDu*Md=rdzM&IGfn7TUej4@lBvAF-25cw5so?(sp43Z4m zfk!21AJ;LFQFz@QJ02a2J-SB3kFd_>P@X~6D$Cc}5IxN?`aaw$(WmR!KKQ~a*0p_7 z`6Gm5a34f|g)}shX#5O62Z)MkG+VTtNNkHE(W>1+kt+~+6#8eA{jw^tUCqzr@7;Q3 z`+pgQ#HU-mg3BFzI&pkD5&KkC+qXZ}-nV5xKTFJ?YX9=lOMKy4Fr2~996!#)ei)Us zBwXQzNOGs9S1r<--l(J{;mR#c!mjb@B**zgN@7&fl5m9u(mbgjG@KrYoeCEy&m+DEq*!0)DeB#*;r(eUKd(x0eR$Uiys_tp$WNt6j zUFL4iZq`W!$?K#`t={u`J4ODff5+#ad3JY`dV5AyWSdc}Sp6E--RE>EY52Bnmm9r; zHnXT|iL+edHjFSbWg%gKkTB|iFU|MJm? zZ~u7yB{y;{XFaHvBkT*In@qbV{?9wc5Ru>Ye?cSLkJ`>EQ7!Q}OS2#OXOSaMmW$iY M3Q{d`vT!c`3vUB>9smFU diff --git a/Classes/LinphoneUI/ru.lproj/UICallBar.strings b/Classes/LinphoneUI/ru.lproj/UICallBar.strings deleted file mode 100644 index b045150ba11afc90b3a60262335cf7c39d22828f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9738 zcmchdO;6iE5QgXAQ;roxmKJF55Ym#8Ld8d={`t1=cv;-6 z*IvfiMNtfzI37QKcV=e>{{CsvYg(i>ZPA2I=mxJg4e(x|&$LGw-O(*xS9A%>8tf-D z#A}qFIi^z@<9lPA@tgMX*(pAmJX|5m&%U_-<^ewaj?afUdylps&Pwh-U&NiX@Owf_ zkMgqcaD^AqTC^N>q8^S}v=wdOC*N%guW)p`xXVlWh9~sXL6{nZshDs+S_j`svYh|(uf@CeF{Kz4!SwS%m0koCo6bI@)8 zuDAHP+EBAgMB+95z&%gsIFGvt?p;UhtUUIs7jfo;K$1TWpwBHRIs4o=^oeQNP>3zk zO!5l)Y$C!o5N~~`)C;1M4=$HhzDOi`y@ysqtj{Z_R&hzISgh5{JdRkYZM+9Tl$w>u zrIH^8iAGWLFF*C$(~ z#LrPxeL}U-1?vv-{ZrJ9y56nQGNCs{M#p|B`>{o; zv&tBIlg^$xH!9l_*0F6OT5$N7S=xPQ63L9n+^d*^yH>l0fx() zrs$ez#rQj*?kozG*e2a^rak)3W7Ah}Q&n|W$75d)Mf6YmkP}Gsk>%yYvi8^})hK+H z_QmDW$_I%=uR}x<&xgnK3&(3mEzYaZ?8cQ%s+i5Md}Z37rq1g&AN3Jd#b)>Oe}t8v zqMSyeTZX>r4vO*rR$SqD?o=+d+cmozh!XAm)VDc+~-eu}ka^W<9>`}(b0 QVSURAW1E}D?yE)r04CFj8~^|S diff --git a/Classes/LinphoneUI/ru.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/ru.lproj/UICallBar~ipad.strings deleted file mode 100644 index 1f684f7da130bead328a104fadb753c149cbe2f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7632 zcmd6rK~LL25QXQkCyo_TrK%McM-G%YCJE3WaH0YdEv=xv14&y-8c+g<{`t0Vy_u|( z^=31U9aUDGXzh6R+c%z>oxgw9=q+tgL>(H?HH~pZ)W&C%zR($^^h{4U9%zV>1B_qO zEslP6=N;Y99sYNRJATtSuHE3uVETkKyZe6f&kJ1riR-tx`;5BNyK1yExnm1+S;KEV zvb~U{&FNEKsROm6V%5SqRULJNZ$0BR9Mut?VwOYtj#YXLQq~;GnwWA!9fEOJ9fLDf z=PIHUq#adL`#4w6dkO8XX@qkG9ko|{gQ6pRhM89wAMq<4J8KY&*WeA5J;_wo{QFpu zw(4R{j__%#_gI;aD_Dt7Schl41^uAzb%(hwX5IjAM>SXC(--jNC%n^I-EojEap)2; zomTW1{(J;2_u$E`g8B_H=MnvaG6TBGqS65Ra6Bu6E8l{RLS>OiqUVx?n=TT6v zT}Q87v0m#?s142D;d{TJRz2u5#;k9kRiAn}dX>TDw_-KZFV2g_i}w_th7P)Fi_AE4wd*6ShYdkx3;8e-pjo%x)O6x}TH7t4A1Yse}sOO*d~ zt57)%5{qaOS^tWnd^s43Ry1vE;KjSmaPhWzzob(Uqxf4Ws?+1X2U;hNB2G3_~e z?1}X-R^+ivLc*1uk0f@gd_5wq@{N^hNw{9~ldx*MUx~3}k&+lI)sk>+<|kp*EQ!1x zH&&`8;i|0Yr?8o5_x_%R;nf8PQ(0;LQJfki|II98P!Q%8Es6ulBQ#uLd}S(R&thje*Dx_v;L|%LrS`2#k9<~!(J)r z*wtw^Uh0uBNm(7c`6P?(SraEl>X9(TvU}F~vtP6yk~q;%kA!DmPCvxo>tlbCbl(!^ z&Cny;$OXQ>rHym{Ye&(?l&`+!DWjv9Z-bSQ<)4Q0mgteNpOuq;=99?cZ^Lr5mDvc`uFGG9?!V^`Q3vjunT>71xuL1J%0M|0{`v62RMR5Siu8+Zs7)7o@4tI zX84)6Z!X{h7WjJ$eB(R3#b+1zWV!C)uzmab@i&k0>1TXC!?%y%_4=*m@%b)}q=!E@ zu(y%Q&bo)6KYpFl=z936NAm_pbpxMpM!pt^MiJ4-OcZO?C3}x#D|B>T;2K94H% zRF~=$eVQZLHGba}$R-il#7rjD>~uG{&+gz0j(G`Z?XFtl*m*xng+8SAl*Xg??st*w z-%enO4#()v15#3Kxi9!LfTxi|)MAYjQqfMR&mwyy71AE1m~;j2lhm+NSbTbi9?fuF z-WEL?2#*G4k3uy&nLc~$PuP3T8=Xb(-Fp-EZy&wImvi*x65~VJm!a@wX!a#kvykJEZS?-V&!ovb^YP#or>?UZ_c z&((vbk**<9T)Kv@Av6^`iKUV_!zzOA9PhzZ5L8cW;@m{UJ8H2ymshuw>+{PV#%lSx zAw{Tbcn>v|u1VzmOnNO2FnV()&e6lQ?V<15ZJ=k7I$e{<8^JsYN6LRmsCF%pNS&@p z!h4xKMSL!iA5@c;C_;^{3BntUJVAUO5dob@C4x|+YXU8P<~W8}0k|mO*AumsIW(oN zX|za^r-@HfT2*wOmR!-4>@=2h=L91U{oSv0S2e)D)o~T!J)$=2SraPS>GV0|vnA|3 z=Te$SSMbp|)UXp+{E_i8&m>n~vqdH+Rqd4eEV55hVLL8e#d{@n>?9VyPH-pD&F=!f z;rCr3@1|W9SKhA8zN@6Jom8Jq_N+TLUB|noDcNZ(z8zwXv_i+||3BQ~_f^rkkrEH7 z&FY-4Y^T-dl)ckca(gb#rz?5)bgiz5!YG_08H=0x0mj5lvZPR>YXTXY@)R;h8gG;% nNu91qwEdcAk>`}VaVV`VO{r@def{QmCdvw54Ati5_u1&>Af-&_1CV zu0{3alBTr8|CV^-JH5lbDekQHJzQ2#-|zl;jk{lPe}<>8=*|AA0X^S6ag4F_@Y}VV z9Hex#@8#!@Uw3YVJzV*S-eOd1`h;2emZTa8s)3oRsh5{-3}+^^!FL}nInO`BuMIxy z%5xt9aUTmoT$qUu8AIM#_<%WhLVPch4wr(rH1pQg@{(O6Y9Fy$owM5{-B8dC&2&=H zPPoQ+H}n;*tmvl7H7j_-SxPGODITFZldceQi`1}FSn}o=J}tm|kMB*=r&Hn6so5u~ zXeXS*n=M8?g-;8bD_%*JHm`K9xJvL#>ey-YnBb_B3U(4*p<4<|)V+s)GsN3NGU7%e z;zs6(tE+YGPrdgxZ*-QFH}(GQqqq2S2Vdq`QE6Y!gfC}iU+QXhGJWQF-PC(;^F?RT zdk<@--oJhH7GJo&i|;lU!jB8HA6_Ld3D<2gl0sDIuEkoRdzHK-T#>~|*foCFDDbvn zCGjeGNw`vpldx-n#9nQCmAoXpkH<;awLoI8qrFOA65cD~BrB}&Ia-OJG3S!p+iM?9!DtSqGw}^Yft_2eN{_a)slJGlx`*}e@>|NkFH|OGi zwenK&DOKDbb};bR_j|9Bmt;(z@t(Fxo?(?@-*+w6-LkHhm+TcP<#}~_CGi^&I2UHA3~Qsn|&@HS`Ul(4DAmcPEYR-0?8yn$=H9 z_Ufly-A=C0FMHTjYtN33rx}}$P}c|^YARim$n&taSZrp+l3Z3yaY&7>DeCWvae|@9 zg03Y^Q18F%(brEP+D6~Zal`tC3h0t|h%HG?lLX&~jiKNpppa4q73aN{{{mNT*%) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index eec0e8a2c..834dae78d 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -321,7 +321,6 @@ D3211BB0159C4EF10098460B /* UIConferenceHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = D3211BAE159C4EF00098460B /* UIConferenceHeader.m */; }; D32460E6159D9AAD00BA7F3A /* UITransparentView.m in Sources */ = {isa = PBXBuildFile; fileRef = D32460E5159D9AAD00BA7F3A /* UITransparentView.m */; }; D326483815887D5200930C67 /* OrderedDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483715887D5200930C67 /* OrderedDictionary.m */; }; - D326483E1588950F00930C67 /* UICallBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483C1588950F00930C67 /* UICallBar.m */; }; D32648441588F6FC00930C67 /* UIToggleButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D32648431588F6FB00930C67 /* UIToggleButton.m */; }; D32B6E2915A5BC440033019F /* ChatRoomTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D32B6E2815A5BC430033019F /* ChatRoomTableViewController.m */; }; D32B6E2F15A5C0AC0033019F /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; }; @@ -378,8 +377,6 @@ D38187D115FE346B00C3EDCA /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187D415FE346B00C3EDCA /* HistoryViewController.xib */; }; D38187D915FE347700C3EDCA /* IncomingCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187DC15FE347700C3EDCA /* IncomingCallViewController.xib */; }; D38187DD15FE348A00C3EDCA /* WizardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187E015FE348A00C3EDCA /* WizardViewController.xib */; }; - D38187E115FE349700C3EDCA /* UICallBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187E415FE349700C3EDCA /* UICallBar.xib */; }; - D38187E515FE349D00C3EDCA /* UICallBar~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187E815FE349D00C3EDCA /* UICallBar~ipad.xib */; }; D38187F015FE354000C3EDCA /* UIConferenceHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187F315FE354000C3EDCA /* UIConferenceHeader.xib */; }; D38187F815FE355D00C3EDCA /* UIMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187FB15FE355D00C3EDCA /* UIMainBar.xib */; }; D381881115FE3F0B00C3EDCA /* UICallCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D381881415FE3F0B00C3EDCA /* UICallCell.xib */; }; @@ -948,8 +945,6 @@ D32460E5159D9AAD00BA7F3A /* UITransparentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITransparentView.m; sourceTree = ""; }; D326483615887D5200930C67 /* OrderedDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderedDictionary.h; path = Utils/OrderedDictionary.h; sourceTree = ""; }; D326483715887D5200930C67 /* OrderedDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderedDictionary.m; path = Utils/OrderedDictionary.m; sourceTree = ""; }; - D326483B1588950F00930C67 /* UICallBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICallBar.h; sourceTree = ""; }; - D326483C1588950F00930C67 /* UICallBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICallBar.m; sourceTree = ""; }; D32648421588F6FA00930C67 /* UIToggleButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIToggleButton.h; sourceTree = ""; }; D32648431588F6FB00930C67 /* UIToggleButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIToggleButton.m; sourceTree = ""; }; D32B6E2715A5BC430033019F /* ChatRoomTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatRoomTableViewController.h; sourceTree = ""; }; @@ -1095,8 +1090,6 @@ F09548231883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/InCallViewController.xib; sourceTree = ""; }; F09548241883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/IncomingCallViewController.xib; sourceTree = ""; }; F09548251883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Base.lproj/IncomingCallViewController~ipad.xib"; sourceTree = ""; }; - F09548261883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICallBar.xib; sourceTree = ""; }; - F09548271883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Base.lproj/UICallBar~ipad.xib"; sourceTree = ""; }; F09548281883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICallCell.xib; sourceTree = ""; }; F09548291883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIConferenceHeader.xib; sourceTree = ""; }; F095482C1883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIMainBar.xib; sourceTree = ""; }; @@ -1129,10 +1122,6 @@ F09548481883F55800E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/IncomingCallViewController.strings; sourceTree = ""; }; F09548491883F56A00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/IncomingCallViewController~ipad.strings"; sourceTree = ""; }; F095484A1883F56E00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/IncomingCallViewController~ipad.strings"; sourceTree = ""; }; - F095484B1883F58E00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UICallBar.strings; sourceTree = ""; }; - F095484C1883F59200E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UICallBar.strings; sourceTree = ""; }; - F095484D1883F5AF00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/UICallBar~ipad.strings"; sourceTree = ""; }; - F095484E1883F5B300E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/UICallBar~ipad.strings"; sourceTree = ""; }; F095484F1883F5D500E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UIConferenceHeader.strings; sourceTree = ""; }; F09548501883F5D900E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UIConferenceHeader.strings; sourceTree = ""; }; F09548551883F61300E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UIMainBar.strings; sourceTree = ""; }; @@ -1158,8 +1147,6 @@ F0AF06FC1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InCallViewController.strings; sourceTree = ""; }; F0AF06FD1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/IncomingCallViewController.strings; sourceTree = ""; }; F0AF06FE1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = "ar.lproj/IncomingCallViewController~ipad.strings"; sourceTree = ""; }; - F0AF06FF1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UICallBar.strings; sourceTree = ""; }; - F0AF07001A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = "ar.lproj/UICallBar~ipad.strings"; sourceTree = ""; }; F0AF07011A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UICallCell.strings; sourceTree = ""; }; F0AF07021A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UIChatCell.strings; sourceTree = ""; }; F0AF07031A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UIChatRoomCell.strings; sourceTree = ""; }; @@ -1434,10 +1421,6 @@ children = ( 22C7555E1317E59C007BC101 /* UIBluetoothButton.h */, 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */, - D326483B1588950F00930C67 /* UICallBar.h */, - D326483C1588950F00930C67 /* UICallBar.m */, - D38187E415FE349700C3EDCA /* UICallBar.xib */, - D38187E815FE349D00C3EDCA /* UICallBar~ipad.xib */, 2214EB7812F846B1002A5394 /* UICallButton.h */, 2214EB7912F846B1002A5394 /* UICallButton.m */, D36C43C4158F2E5A0048BA40 /* UICallCell.h */, @@ -2366,7 +2349,6 @@ 63AADBFB1B6A0FF200AA16FD /* ring.caf in Resources */, 634CEDF71B6630DB00D7A921 /* pause_big_over_selected.png in Resources */, 634CEDEA1B6630DB00D7A921 /* numpad_6.png in Resources */, - D38187E115FE349700C3EDCA /* UICallBar.xib in Resources */, 639CEB001A1DF4E4004DE38F /* UIHistoryCell.xib in Resources */, 634CEDCC1B6630DB00D7A921 /* dialer_back.png in Resources */, 634CEDED1B6630DB00D7A921 /* numpad_9.png in Resources */, @@ -2454,7 +2436,6 @@ 634CEDBC1B6630DB00D7A921 /* chat_start_body_over.png in Resources */, 63AADC021B6A0FF200AA16FD /* wizard_remote.rc in Resources */, D38187C515FE345F00C3EDCA /* DialerViewController~ipad.xib in Resources */, - D38187E515FE349D00C3EDCA /* UICallBar~ipad.xib in Resources */, 634CEE121B6630DB00D7A921 /* status_busy_phone.png in Resources */, 634CEDFB1B6630DB00D7A921 /* quit_default.png in Resources */, 63158FAD1B468E0E00969917 /* ImageOptim.sh in Resources */, @@ -2654,7 +2635,6 @@ D35498211587716B000081D8 /* UIStateBar.m in Sources */, D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */, D326483815887D5200930C67 /* OrderedDictionary.m in Sources */, - D326483E1588950F00930C67 /* UICallBar.m in Sources */, D32648441588F6FC00930C67 /* UIToggleButton.m in Sources */, D36FB2D51589EF7C0036F6F2 /* UIPauseButton.m in Sources */, D31C9C98158A1CDF00756B45 /* UIHistoryCell.m in Sources */, @@ -3081,28 +3061,6 @@ name = WizardViewController.xib; sourceTree = ""; }; - D38187E415FE349700C3EDCA /* UICallBar.xib */ = { - isa = PBXVariantGroup; - children = ( - F09548261883F15400E8A69B /* Base */, - F095484B1883F58E00E8A69B /* fr */, - F095484C1883F59200E8A69B /* ru */, - F0AF06FF1A24BA770086C9C1 /* ar */, - ); - name = UICallBar.xib; - sourceTree = ""; - }; - D38187E815FE349D00C3EDCA /* UICallBar~ipad.xib */ = { - isa = PBXVariantGroup; - children = ( - F09548271883F15400E8A69B /* Base */, - F095484D1883F5AF00E8A69B /* fr */, - F095484E1883F5B300E8A69B /* ru */, - F0AF07001A24BA770086C9C1 /* ar */, - ); - name = "UICallBar~ipad.xib"; - sourceTree = ""; - }; D38187F315FE354000C3EDCA /* UIConferenceHeader.xib */ = { isa = PBXVariantGroup; children = (