diff --git a/Classes/MoreViewController.h b/Classes/AboutViewController.h similarity index 66% rename from Classes/MoreViewController.h rename to Classes/AboutViewController.h index 589c2dbaf..92be76175 100644 --- a/Classes/MoreViewController.h +++ b/Classes/AboutViewController.h @@ -1,4 +1,4 @@ -/* MoreViewController.h +/* AboutViewController.h * * Copyright (C) 2009 Belledonne Comunications, Grenoble, France * @@ -19,18 +19,17 @@ #import -@class ConsoleViewController; -@interface MoreViewController : UITableViewController { - @private - bool isLogViewEnabled; - ConsoleViewController *consoleViewController; - bool isDebug; +#import "UICompositeViewController.h" + +@interface AboutViewController : UIViewController { } -@property (nonatomic, retain) IBOutlet UITableViewCell* web; -@property (nonatomic, retain) IBOutlet UITableViewCell* credit; -@property (nonatomic, retain) IBOutlet UITableViewCell* console; -@property (nonatomic, retain) IBOutlet UITextView *creditText; -@property (nonatomic, retain) IBOutlet UILabel *weburi; +@property (nonatomic, retain) IBOutlet UILabel *linphoneIphoneVersionLabel; +@property (nonatomic, retain) IBOutlet UILabel *linphoneCoreVersionLabel; +@property (nonatomic, retain) IBOutlet UIView *contentView; +@property (nonatomic, retain) IBOutlet UILabel *linkLabel; +@property (nonatomic, retain) IBOutlet UITapGestureRecognizer *linkTapGestureRecognizer; + +- (IBAction)onLinkTap:(id)sender; @end diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m new file mode 100644 index 000000000..048cf0ced --- /dev/null +++ b/Classes/AboutViewController.m @@ -0,0 +1,99 @@ +/* AboutViewController.m + * + * Copyright (C) 2009 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "AboutViewController.h" +#include "ConsoleViewController.h" +#import "LinphoneManager.h" +#include "lpconfig.h" + +@implementation AboutViewController + +@synthesize linphoneCoreVersionLabel; +@synthesize linphoneIphoneVersionLabel; +@synthesize contentView; +@synthesize linkTapGestureRecognizer; +@synthesize linkLabel; + + +#pragma mark - Lifecycle Functions + +- (id)init { + self = [super initWithNibName:@"AboutViewController" bundle:[NSBundle mainBundle]]; + if (self != nil) { + self->linkTapGestureRecognizer = [[UITapGestureRecognizer alloc] init]; + } + return self; +} + +- (void)dealloc { + [linphoneCoreVersionLabel release]; + [linphoneIphoneVersionLabel release]; + [contentView release]; + [linkTapGestureRecognizer release]; + [linkLabel release]; + + [super dealloc]; +} + + +#pragma mark - ViewController Functions + +- (void)viewDidLoad { + [super viewDidLoad]; + + [linkTapGestureRecognizer addTarget:self action:@selector(onLinkTap:)]; + [linkLabel addGestureRecognizer:linkTapGestureRecognizer]; + + UIScrollView *scrollView = (UIScrollView *)self.view; + [scrollView addSubview:contentView]; + [scrollView setContentSize:[contentView bounds].size]; + + [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"Linphone iPhone %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; + + [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"Linphone Core %s", linphone_core_get_version()]]; +} + + +#pragma mark - UICompositeViewDelegate Functions + +static UICompositeViewDescription *compositeDescription = nil; + ++ (UICompositeViewDescription *)compositeViewDescription { + if(compositeDescription == nil) { + compositeDescription = [[UICompositeViewDescription alloc] init:@"About" + content:@"AboutViewController" + stateBar:nil + stateBarEnabled:false + tabBar:@"UIMainBar" + tabBarEnabled:true + fullscreen:false + landscapeMode:[LinphoneManager runningOnIpad] + portraitMode:true]; + } + return compositeDescription; +} + + +#pragma mark - Action Functions + +- (IBAction)onLinkTap:(id)sender { + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:linkLabel.text]]; +} + +@end diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib new file mode 100644 index 000000000..b8a93f174 --- /dev/null +++ b/Classes/AboutViewController.xib @@ -0,0 +1,525 @@ + + + + 784 + 11E53 + 2840 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + + YES + IBProxyObject + IBUIImageView + IBUILabel + IBUIScrollView + IBUIView + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + YES + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 268 + {320, 460} + + + _NS:9 + YES + YES + IBCocoaTouchFramework + YES + NO + + + + 292 + + YES + + + 301 + {{124, 20}, {72, 72}} + + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + linphone_icon_72.png + + + + + 292 + {{20, 100}, {280, 50}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Linphone + + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA + + + 0 + 1 + + 2 + 35 + + + Helvetica-Bold + 35 + 16 + + NO + + + + 292 + {{20, 187}, {280, 44}} + + + + NO + YES + IBCocoaTouchFramework + http://www.linphone.org + + 2 + MC44MTE3NjQ3MTcxIDAuMjk4MDM5MjI3NyAwLjE2MDc4NDMxOQA + + + 1 + 10 + 1 + + 1 + 17 + + + Helvetica + 17 + 16 + + + + + 292 + {{20, 138}, {280, 21}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Linphone iPhone 1.0 + + + 0 + 1 + + 1 + 13 + + + Helvetica + 13 + 16 + + NO + + + + 292 + {{20, 158}, {280, 21}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Linphone Core 1.0 + + + 0 + 1 + + + NO + + + + 292 + {{20, 269}, {280, 21}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + © 2010 Belledonne Communications + + 1 + MCAwIDAAA + darkTextColor + + + 1 + 10 + 1 + + + + + + 292 + {{20, 225}, {280, 36}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + GNU General Public License V2 + + 0 + 0 + 1 + + + NO + 280 + + + {320, 310} + + + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework + + + + + YES + + + linkLabel + + + + 60 + + + + view + + + + 63 + + + + contentView + + + + 64 + + + + linphoneCoreVersionLabel + + + + 67 + + + + linphoneIphoneVersionLabel + + + + 68 + + + + + YES + + 0 + + YES + + + + + + -1 + + + File's Owner + + + -2 + + + + + 62 + + + YES + + + + + 51 + + + YES + + + + + + + + + + + + 61 + + + licenceLabel + + + 58 + + + copyrightLabel + + + 57 + + + linkLabel + + + 56 + + + linphoneLabel + + + 55 + + + iconImageView + + + 65 + + + linphoneIphoneVersionLabel + + + 66 + + + linphoneCoreVersionLabel + + + + + YES + + YES + -1.CustomClassName + -1.IBPluginDependency + -2.CustomClassName + -2.IBPluginDependency + 51.IBPluginDependency + 55.IBPluginDependency + 56.IBPluginDependency + 57.IBPluginDependency + 58.IBPluginDependency + 61.IBPluginDependency + 62.IBPluginDependency + 65.IBPluginDependency + 66.IBPluginDependency + + + YES + AboutViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + + + + YES + + + + + 68 + + + + YES + + AboutViewController + UIViewController + + onLinkTap: + id + + + onLinkTap: + + onLinkTap: + id + + + + YES + + YES + contentView + linkLabel + linkTapGestureRecognizer + linphoneCoreVersionLabel + linphoneIphoneVersionLabel + + + YES + UIView + UILabel + UITapGestureRecognizer + UILabel + UILabel + + + + YES + + YES + contentView + linkLabel + linkTapGestureRecognizer + linphoneCoreVersionLabel + linphoneIphoneVersionLabel + + + YES + + contentView + UIView + + + linkLabel + UILabel + + + linkTapGestureRecognizer + UITapGestureRecognizer + + + linphoneCoreVersionLabel + UILabel + + + linphoneIphoneVersionLabel + UILabel + + + + + IBProjectSource + ./Classes/AboutViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + 3 + + linphone_icon_72.png + {72, 72} + + 1926 + + diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index fcbbaa54b..8cd1420f3 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -127,6 +127,7 @@ static UICompositeViewDescription *compositeDescription = nil; [listTapGestureRecognizer setEnabled:FALSE]; [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 + [tableController.tableView setBackgroundView:nil]; } diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m index 264c7b47f..64bc1a169 100644 --- a/Classes/ChatViewController.m +++ b/Classes/ChatViewController.m @@ -56,6 +56,7 @@ [LinphoneUtils buttonFixStates:editButton]; [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 + [tableController.tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4 } - (void)viewWillAppear:(BOOL)animated { diff --git a/Classes/ConsoleViewController.m b/Classes/ConsoleViewController.m index fe6a09f4c..1de7eec32 100644 --- a/Classes/ConsoleViewController.m +++ b/Classes/ConsoleViewController.m @@ -95,7 +95,7 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - UIWebViewDelegate Functions - (void)webViewDidFinishLoad:(UIWebView *)webView { - NSString *logs = [[LinphoneManager instance].logs componentsJoinedByString:@"\\n"]; + NSString *logs = [[LinphoneManager instance].logs componentsJoinedByString:@"\n"]; [self addLog:logs scroll:TRUE]; // Set observer @@ -137,7 +137,13 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)addLog:(NSString*)log scroll:(BOOL)scroll { - NSMutableString *js = [NSMutableString stringWithFormat:@"document.getElementById('content').innerHTML += \"%@\\n\";", [log stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]]; + log = [log stringByReplacingOccurrencesOfString:@"\r" withString:@""]; + log = [log stringByReplacingOccurrencesOfString:@"\n" withString:@"\\n"]; + log = [log stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]; + log = [log stringByReplacingOccurrencesOfString:@"&" withString:@"&"]; + log = [log stringByReplacingOccurrencesOfString:@"<" withString:@"<"]; + log = [log stringByReplacingOccurrencesOfString:@">" withString:@">"]; + NSMutableString *js = [NSMutableString stringWithFormat:@"document.getElementById('content').innerHTML += \"%@\\n\";", log]; if(scroll) { [js appendString:@"window.scrollTo(0, document.body.scrollHeight);"]; } diff --git a/Classes/ContactDetailsLabelViewController.m b/Classes/ContactDetailsLabelViewController.m index 88b42e134..d7c3374da 100644 --- a/Classes/ContactDetailsLabelViewController.m +++ b/Classes/ContactDetailsLabelViewController.m @@ -48,6 +48,7 @@ - (void)viewDidLoad { [super viewDidLoad]; [tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 + [tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4 } diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m index 8f00b37b4..d32d50450 100644 --- a/Classes/ContactDetailsViewController.m +++ b/Classes/ContactDetailsViewController.m @@ -212,6 +212,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf [LinphoneUtils buttonFixStates:editButton]; [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 + [tableController.tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4 } - (void)viewWillDisappear:(BOOL)animated { diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index f4c6b8157..117b47506 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -166,6 +166,7 @@ static UICompositeViewDescription *compositeDescription = nil; [LinphoneUtils buttonFixStates:allButton]; [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 + [tableController.tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4 } diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m index 0f5410f44..18d3e5706 100644 --- a/Classes/HistoryViewController.m +++ b/Classes/HistoryViewController.m @@ -140,6 +140,7 @@ static UICompositeViewDescription *compositeDescription = nil; [LinphoneUtils buttonFixStatesForTabs:missedButton]; [tableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 + [tableController.tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4 } diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index e7b0d0af4..b34093832 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -34,6 +34,7 @@ #include "linphonecore_utils.h" #include "lpconfig.h" +#define LINPHONE_LOGS_MAX_ENTRY 5000 static void audioRouteChangeListenerCallback ( void *inUserData, // 1 @@ -57,6 +58,7 @@ NSString *const kLinphoneLogsUpdate = @"LinphoneLogsUpdate"; NSString *const kLinphoneSettingsUpdate = @"LinphoneSettingsUpdate"; NSString *const kContactSipField = @"SIP"; + extern void libmsilbc_init(); #ifdef HAVE_AMR extern void libmsamr_init(); @@ -304,6 +306,9 @@ void linphone_iphone_log_handler(int lev, const char *fmt, va_list args){ NSString* formatedString = [[NSString alloc] initWithFormat:format arguments:args]; dispatch_async(dispatch_get_main_queue(), ^{ + if([[LinphoneManager instance].logs count] >= LINPHONE_LOGS_MAX_ENTRY) { + [[LinphoneManager instance].logs removeObjectAtIndex:0]; + } [[LinphoneManager instance].logs addObject:formatedString]; // Post event @@ -321,6 +326,9 @@ static void linphone_iphone_log(struct _LinphoneCore * lc, const char * message) NSLog(log, NULL); dispatch_async(dispatch_get_main_queue(), ^{ + if([[LinphoneManager instance].logs count] >= LINPHONE_LOGS_MAX_ENTRY) { + [[LinphoneManager instance].logs removeObjectAtIndex:0]; + } [[LinphoneManager instance].logs addObject:log]; // Post event diff --git a/Classes/MoreViewController.m b/Classes/MoreViewController.m deleted file mode 100644 index 4e5d97e2f..000000000 --- a/Classes/MoreViewController.m +++ /dev/null @@ -1,130 +0,0 @@ -/* MoreViewController.m - * - * Copyright (C) 2009 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import "MoreViewController.h" -#include "ConsoleViewController.h" -#import "LinphoneManager.h" -#include "lpconfig.h" - -@implementation MoreViewController - -@synthesize web; -@synthesize credit; -@synthesize console; -@synthesize creditText; -@synthesize weburi; - - -#pragma mark - Lifecycle Functions - -- (void)viewDidLoad { - [super viewDidLoad]; - [creditText setText: [NSString stringWithFormat:creditText.text,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; - consoleViewController = [[ConsoleViewController alloc] initWithNibName:@"ConsoleViewController" bundle:[NSBundle mainBundle]]; - //[[LinphoneManager instance] registerLogView:consoleViewController]; - isDebug = lp_config_get_int(linphone_core_get_config([LinphoneManager getLc]),"app","debugenable_preference",0); - -} - -- (void)dealloc { - [credit release]; - [creditText release]; - - [web release]; - [weburi release]; - [console release]; - - [consoleViewController release]; - [super dealloc]; -} - - -#pragma mark - - --(void) enableLogView { - isLogViewEnabled = true; -} - - -#pragma mark - UITableViewDelegate Functions - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} - - -#pragma mark - UITableViewDataSource Functions - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - return 230; - } else { - return 44; - } -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 0) { - return 1; - } else { - if (isDebug) { - return 2; - } else { - return 1; - } - } -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - return credit; - } else { - switch (indexPath.row) { - case 0: return web; - case 1: return console; - } - } - return nil; -} - -- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { - - [self tableView:tableView didSelectRowAtIndexPath:indexPath]; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - - - [tableView deselectRowAtIndexPath:indexPath animated:NO]; - - switch (indexPath.row) { - case 0: { - NSURL *url = [NSURL URLWithString:weburi.text]; - [[UIApplication sharedApplication] openURL:url]; - break; - }; - case 1: { - [self.navigationController pushViewController:consoleViewController animated:true]; - break; - } - } - -} - -@end diff --git a/Classes/MoreViewController.xib b/Classes/MoreViewController.xib deleted file mode 100644 index 1a57b09a7..000000000 --- a/Classes/MoreViewController.xib +++ /dev/null @@ -1,491 +0,0 @@ - - - - 784 - 11E53 - 2840 - 1138.47 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 - - - YES - IBProxyObject - IBUIImageView - IBUILabel - IBUITableView - IBUITableViewCell - IBUITextView - IBUIViewController - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - - 274 - {320, 247} - - - 1 - MCAwIDAgMAA - groupTableViewBackgroundColor - - NO - YES - NO - IBCocoaTouchFramework - NO - 1 - 1 - 0 - YES - 44 - 10 - 10 - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - 292 - - YES - - - 256 - - YES - - - 292 - {{20, 0}, {300, 44}} - - NO - YES - NO - IBCocoaTouchFramework - http://www.linphone.org - - 1 - MCAwLjUwMTk2MDgxIDEAA - - - 1 - 10 - - 1 - 17 - - - Helvetica - 17 - 16 - - - - {300, 43} - - - 3 - MCAwAA - - NO - YES - 4 - YES - IBCocoaTouchFramework - - - {320, 44} - - - 1 - MSAxIDEAA - - NO - IBCocoaTouchFramework - 1 - - - - - 292 - - YES - - - 256 - - YES - - - 292 - {{20, 0}, {300, 44}} - - NO - YES - NO - IBCocoaTouchFramework - Console - - 1 - MCAwIDAAA - darkTextColor - - - 1 - 10 - - - - - {300, 44} - - - NO - YES - 4 - YES - IBCocoaTouchFramework - - - {320, 44} - - - NO - IBCocoaTouchFramework - 1 - - - - - 292 - - YES - - - 256 - - YES - - - 292 - {{28, -14}, {263, 154}} - - NO - NO - 1 - NO - IBCocoaTouchFramework - - NSImage - linphone-banner.png - - - - - 292 - {{9, 109}, {301, 89}} - - NO - YES - YES - IBCocoaTouchFramework - NO - NO - NO - NO - Linphone %@ SIP (rfc3261) compatible phone under GNU General Public License V2 - 1 - - 2 - IBCocoaTouchFramework - - - - - - - 292 - {{28, 198}, {263, 21}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - © 2010 Belledonne Communications - - - 1 - 10 - 1 - - - - - {322, 229} - - - NO - YES - 4 - YES - IBCocoaTouchFramework - - - {322, 230} - - - NO - NO - IBCocoaTouchFramework - - - - - - YES - - - web - - - - 32 - - - - console - - - - 40 - - - - credit - - - - 46 - - - - view - - - - 47 - - - - creditText - - - - 48 - - - - weburi - - - - 50 - - - - - YES - - 0 - - YES - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - YES - - - - - - 25 - - - YES - - - - web - - - 34 - - - - - 38 - - - YES - - - - console - - - 39 - - - - - 42 - - - YES - - - - - - about - - - 43 - - - - - 45 - - - - - 18 - - - - - 49 - - - - - - - YES - - YES - -1.CustomClassName - -1.IBPluginDependency - -2.CustomClassName - -2.IBPluginDependency - 18.IBPluginDependency - 25.IBPluginDependency - 34.IBPluginDependency - 38.IBPluginDependency - 39.IBPluginDependency - 4.IBPluginDependency - 42.IBPluginDependency - 43.IBPluginDependency - 45.IBPluginDependency - 49.IBPluginDependency - - - YES - MoreViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - - - - YES - - - - - 50 - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - 3 - - linphone-banner.png - {300, 100} - - 1926 - - diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index 44a5084df..ad679eaea 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -22,6 +22,7 @@ #import "LinphoneManager.h" #import "UICompositeViewController.h" +#import "AboutViewController.h" #import "FirstLoginViewController.h" #import "IncomingCallViewController.h" #import "ChatRoomViewController.h" diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index fdbb966d1..7bd3c2bc7 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -168,6 +168,10 @@ static PhoneMainView* phoneMainViewInstance=nil; return NO; } +- (NSUInteger)supportedInterfaceOrientations { + return 0; +} + + (UIView*)findFirstResponder:(UIView*)view { if (view.isFirstResponder) { return view; diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index b1146322f..35ad278b6 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -45,6 +45,7 @@ 274 {320, 480} + _NS:9 1 NO @@ -57,6 +58,7 @@ {320, 480} + _NS:9 @@ -180,7 +182,117 @@ 217 - + + + YES + + PhoneMainView + UIViewController + + mainViewController + UICompositeViewController + + + mainViewController + + mainViewController + UICompositeViewController + + + + IBProjectSource + ./Classes/PhoneMainView.h + + + + TPMultiLayoutViewController + UIViewController + + YES + + YES + landscapeView + portraitView + + + YES + UIView + UIView + + + + YES + + YES + landscapeView + portraitView + + + YES + + landscapeView + UIView + + + portraitView + UIView + + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + UICompositeViewController + TPMultiLayoutViewController + + YES + + YES + contentView + stateBarView + tabBarView + + + YES + UIView + UIView + UIView + + + + YES + + YES + contentView + stateBarView + tabBarView + + + YES + + contentView + UIView + + + stateBarView + UIView + + + tabBarView + UIView + + + + + IBProjectSource + ./Classes/UICompositeViewController.h + + + + 0 IBCocoaTouchFramework diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 846b30b98..d3fc142f6 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -196,6 +196,9 @@ UIScrollView *scrollView = self.tableView; [scrollView setContentInset:inset]; [scrollView setScrollIndicatorInsets:inset]; + + [self.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4 + [self.tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4 } - (id)initWithStyle:(UITableViewStyle)style { @@ -206,6 +209,14 @@ return self; } +- (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; + + UIBarButtonItem *buttonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"About", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(onAboutClick:)]; + self.navigationItem.rightBarButtonItem = buttonItem; + [buttonItem release]; +} + - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { UITableViewCell * cell = [super tableView:tableView cellForRowAtIndexPath:indexPath]; @@ -223,6 +234,10 @@ return cell; } +- (IBAction)onAboutClick: (id)sender { + [[PhoneMainView instance] changeCurrentView:[AboutViewController compositeViewDescription] push:TRUE]; +} + @end @@ -309,7 +324,6 @@ labelTitleView.text = viewController.title; [labelTitleView sizeToFit]; viewController.navigationItem.titleView = labelTitleView; - [super pushViewController:viewController animated:animated]; if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) { [self.topViewController viewDidAppear:animated]; @@ -579,4 +593,5 @@ static UICompositeViewDescription *compositeDescription = nil; } } } + @end diff --git a/Classes/SettingsViewController.xib b/Classes/SettingsViewController.xib index 09f4282f4..afd4e8da6 100644 --- a/Classes/SettingsViewController.xib +++ b/Classes/SettingsViewController.xib @@ -1,14 +1,14 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject @@ -162,6 +162,7 @@ 14 + settingsItem @@ -185,7 +186,7 @@ - 17 + 19 @@ -260,10 +261,10 @@ IBCocoaTouchFramework com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + YES 3 - 1498 + 1926 diff --git a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj index 9a134ca1f..2785ba644 100755 --- a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj +++ b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj @@ -317,7 +317,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0440; + LastUpgradeCheck = 0450; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "XMLRPC" */; compatibilityVersion = "Xcode 3.2"; @@ -378,6 +378,7 @@ "$(ARCHS_STANDARD_32_BIT)", armv6, ); + GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; @@ -391,6 +392,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; IPHONEOS_DEPLOYMENT_TARGET = 4.0; PRODUCT_NAME = XMLRPC; @@ -409,6 +411,7 @@ "$(ARCHS_STANDARD_32_BIT)", armv6, ); + GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; @@ -424,6 +427,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; IPHONEOS_DEPLOYMENT_TARGET = 4.0; PRODUCT_NAME = XMLRPC; @@ -441,6 +445,7 @@ "$(ARCHS_STANDARD_32_BIT)", armv6, ); + GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; @@ -454,6 +459,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; IPHONEOS_DEPLOYMENT_TARGET = 4.0; PRODUCT_NAME = XMLRPC; @@ -472,6 +478,7 @@ "$(ARCHS_STANDARD_32_BIT)", armv6, ); + GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; @@ -485,6 +492,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; IPHONEOS_DEPLOYMENT_TARGET = 4.0; PRODUCT_NAME = XMLRPC; diff --git a/Classes/en.lproj/ChatViewController.xib b/Classes/en.lproj/ChatViewController.xib index 2e6558bf6..eabdb3cfa 100644 --- a/Classes/en.lproj/ChatViewController.xib +++ b/Classes/en.lproj/ChatViewController.xib @@ -174,7 +174,6 @@ {{0, 79}, {320, 381}} - _NS:9 3 diff --git a/Classes/en.lproj/ContactsViewController.xib b/Classes/en.lproj/ContactsViewController.xib index 935011ea2..22e4a7aa9 100644 --- a/Classes/en.lproj/ContactsViewController.xib +++ b/Classes/en.lproj/ContactsViewController.xib @@ -47,6 +47,7 @@ 290 {320, 44} + _NS:9 NO @@ -65,6 +66,7 @@ 292 {107, 44} + _NS:9 NO @@ -117,6 +119,7 @@ 289 {{107, 0}, {107, 44}} + _NS:9 NO @@ -151,6 +154,7 @@ {{106, 0}, {214, 44}} + _NS:9 @@ -167,6 +171,7 @@ 292 {107, 44} + _NS:9 NO @@ -214,6 +219,7 @@ -2147483356 {107, 44} + _NS:9 NO @@ -246,6 +252,7 @@ {320, 44} + _NS:9 @@ -260,6 +267,7 @@ 274 {{0, 44}, {320, 416}} + _NS:10 3 @@ -291,6 +299,7 @@ {320, 460} + _NS:9 @@ -553,9 +562,86 @@ - 93 + 94 + + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + - 0 IBCocoaTouchFramework diff --git a/Classes/en.lproj/WizardViewController.xib b/Classes/en.lproj/WizardViewController.xib index 19ddd7f5d..f01b4bf29 100644 --- a/Classes/en.lproj/WizardViewController.xib +++ b/Classes/en.lproj/WizardViewController.xib @@ -152,6 +152,7 @@ -2147483357 {{160, 0}, {160, 77}} + _NS:9 NO 5 diff --git a/Classes/en.lproj/WizardViewController~ipad.xib b/Classes/en.lproj/WizardViewController~ipad.xib index 0b2e69b39..d3414692d 100644 --- a/Classes/en.lproj/WizardViewController~ipad.xib +++ b/Classes/en.lproj/WizardViewController~ipad.xib @@ -42,6 +42,7 @@ 274 {768, 966} + _NS:9 YES @@ -60,6 +61,7 @@ 290 {{0, 77}, {768, 2000}} + _NS:9 1 @@ -73,6 +75,7 @@ 294 {384, 77} + _NS:9 NO @@ -129,6 +132,7 @@ 291 {{384, 0}, {384, 77}} + _NS:9 NO @@ -165,6 +169,7 @@ -2147483357 {{384, 0}, {384, 77}} + _NS:9 NO @@ -203,6 +208,7 @@ {{0, 947}, {768, 77}} + _NS:9 @@ -221,6 +227,7 @@ 301 {{366, 492}, {37, 37}} + _NS:9 NO @@ -233,6 +240,7 @@ {768, 1024} + _NS:9 @@ -245,6 +253,7 @@ {768, 1024} + _NS:9 @@ -259,6 +268,7 @@ 274 {1024, 711} + _NS:9 YES @@ -277,6 +287,7 @@ 290 {{0, 77}, {1024, 2000}} + _NS:9 1 @@ -290,6 +301,7 @@ 294 {512, 77} + _NS:9 NO @@ -336,6 +348,7 @@ 291 {{512, 0}, {512, 77}} + _NS:9 NO @@ -372,6 +385,7 @@ -2147483357 {{512, 0}, {512, 77}} + _NS:9 NO @@ -410,6 +424,7 @@ {{0, 691}, {1024, 77}} + _NS:9 @@ -425,6 +440,7 @@ 301 {{494, 364}, {37, 37}} + _NS:9 NO @@ -437,6 +453,7 @@ {1024, 768} + _NS:9 @@ -449,6 +466,7 @@ {1024, 768} + _NS:9 @@ -767,7 +785,148 @@ 137 - + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + WizardViewController + TPMultiLayoutViewController + + id + id + id + id + id + id + id + id + id + id + + + + onBackClick: + id + + + onCancelClick: + id + + + onCheckValidationClick: + id + + + onConnectAccountClick: + id + + + onCreateAccountClick: + id + + + onExternalAccountClick: + id + + + onRegisterClick: + id + + + onSignInClick: + id + + + onSignInExternalClick: + id + + + onStartClick: + id + + + + UIButton + UIView + UIView + UIScrollView + UIView + UIView + UIButton + UIView + UIView + UIView + + + + backButton + UIButton + + + choiceView + UIView + + + connectAccountView + UIView + + + contentView + UIScrollView + + + createAccountView + UIView + + + externalAccountView + UIView + + + startButton + UIButton + + + validateAccountView + UIView + + + waitView + UIView + + + welcomeView + UIView + + + + IBProjectSource + ./Classes/WizardViewController.h + + + + 0 IBCocoaTouchFramework diff --git a/Classes/en.lproj/WizardViews.xib b/Classes/en.lproj/WizardViews.xib index a215fb722..00a8b25a5 100644 --- a/Classes/en.lproj/WizardViews.xib +++ b/Classes/en.lproj/WizardViews.xib @@ -105,7 +105,6 @@ {{40, 290}, {240, 44}} - _NS:9 NO YES @@ -254,7 +253,6 @@ {{33, 269}, {255, 50}} - _NS:9 NO @@ -488,7 +486,6 @@ {{33, 330}, {255, 50}} - _NS:9 NO @@ -651,7 +648,6 @@ {{32, 330}, {255, 50}} - _NS:9 NO @@ -839,7 +835,6 @@ {{34, 330}, {255, 50}} - _NS:9 NO @@ -995,7 +990,6 @@ {{32, 330}, {255, 50}} - _NS:9 NO diff --git a/Classes/fr.lproj/ContactsViewController.xib b/Classes/fr.lproj/ContactsViewController.xib index d90d9d8f8..26f21d348 100644 --- a/Classes/fr.lproj/ContactsViewController.xib +++ b/Classes/fr.lproj/ContactsViewController.xib @@ -552,9 +552,86 @@ - 93 + 94 + + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + - 0 IBCocoaTouchFramework diff --git a/Classes/fr.lproj/WizardViewController~ipad.xib b/Classes/fr.lproj/WizardViewController~ipad.xib index 97bad9d75..fe71f3244 100644 --- a/Classes/fr.lproj/WizardViewController~ipad.xib +++ b/Classes/fr.lproj/WizardViewController~ipad.xib @@ -765,7 +765,148 @@ 137 - + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + WizardViewController + TPMultiLayoutViewController + + id + id + id + id + id + id + id + id + id + id + + + + onBackClick: + id + + + onCancelClick: + id + + + onCheckValidationClick: + id + + + onConnectAccountClick: + id + + + onCreateAccountClick: + id + + + onExternalAccountClick: + id + + + onRegisterClick: + id + + + onSignInClick: + id + + + onSignInExternalClick: + id + + + onStartClick: + id + + + + UIButton + UIView + UIView + UIScrollView + UIView + UIView + UIButton + UIView + UIView + UIView + + + + backButton + UIButton + + + choiceView + UIView + + + connectAccountView + UIView + + + contentView + UIScrollView + + + createAccountView + UIView + + + externalAccountView + UIView + + + startButton + UIButton + + + validateAccountView + UIView + + + waitView + UIView + + + welcomeView + UIView + + + + IBProjectSource + ./Classes/WizardViewController.h + + + + 0 IBCocoaTouchFramework diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index d1ab447f8..78857cfe4 100644 Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 065a39174..747e0f273 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/Resources/linphone-splashscreen-568h@2x.png b/Resources/linphone-splashscreen-568h@2x.png new file mode 100644 index 000000000..ce8263422 Binary files /dev/null and b/Resources/linphone-splashscreen-568h@2x.png differ diff --git a/linphone-Info.plist b/linphone-Info.plist index 02915007e..f416a7976 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -2,8 +2,6 @@ - UILaunchImageFile~iphone - linphone-splashscreen CFBundleDevelopmentRegion English CFBundleDisplayName @@ -61,7 +59,7 @@ CFBundleVersion - 1.3 + 2.0 NSMainNibFile LinphoneApp NSMainNibFile~ipad @@ -73,6 +71,8 @@ voip audio + UILaunchImageFile~iphone + linphone-splashscreen UIRequiredDeviceCapabilities wifi diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index fc68f31fd..04620eba2 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -803,17 +803,17 @@ backup - 10 + 11 class BLWrapperHandle name - Classes/ChatViewController/10/ChatViewController.xib + Classes/ChatViewController/11/ChatViewController.xib change date - 2012-09-20T16:15:28Z + 2012-09-21T09:50:33Z changed values class @@ -823,7 +823,7 @@ flags 0 hash - e0afb50675144133f9d15d4e1145a053 + 85daf0828bc846574f82f88cdfcf5873 name ChatViewController.xib @@ -1038,9 +1038,9 @@ versions en - 10 + 11 fr - 10 + 11 @@ -1048,17 +1048,17 @@ backup - 11 + 12 class BLWrapperHandle name - Classes/ContactsViewController/11/ContactsViewController.xib + Classes/ContactsViewController/12/ContactsViewController.xib change date - 2012-09-20T15:21:49Z + 2012-09-21T08:19:54Z changed values class @@ -1068,7 +1068,7 @@ flags 0 hash - 1a4d8e84ad8a21cabafe3ef48710b34b + bda616bf70739869c9bbce01c4de1324 name ContactsViewController.xib @@ -1358,9 +1358,9 @@ versions en - 11 + 12 fr - 11 + 12 @@ -3689,17 +3689,17 @@ backup - 12 + 13 class BLWrapperHandle name - Classes/WizardViewController/12/WizardViewController.xib + Classes/WizardViewController/13/WizardViewController.xib change date - 2012-09-20T15:24:01Z + 2012-09-21T07:38:47Z changed values class @@ -3709,7 +3709,7 @@ flags 0 hash - e1fc10096ab7b22c55089d5dccdf2015 + ffb9c46d3e8e64cc27d0fd3aa5063f41 name WizardViewController.xib @@ -4999,9 +4999,9 @@ versions en - 12 + 13 fr - 12 + 13 @@ -5103,17 +5103,17 @@ backup - 10 + 12 class BLWrapperHandle name - Classes/WizardViews/10/WizardViews.xib + Classes/WizardViews/12/WizardViews.xib change date - 2012-09-20T15:29:36Z + 2012-09-21T09:50:14Z changed values class @@ -5123,7 +5123,7 @@ flags 0 hash - 030aa3527c7b0ff2fd4cb7911bd7dcac + 723b14414271e081b00e312017bf06fb name WizardViews.xib @@ -6555,9 +6555,9 @@ versions en - 10 + 12 fr - 10 + 12 @@ -6565,17 +6565,17 @@ backup - 8 + 9 class BLWrapperHandle name - Classes/WizardViewController~ipad/8/WizardViewController~ipad.xib + Classes/WizardViewController~ipad/9/WizardViewController~ipad.xib change date - 2012-09-20T15:24:02Z + 2012-09-21T07:48:15Z changed values class @@ -6585,7 +6585,7 @@ flags 0 hash - 950141adce6aab34f1068654a47edf3c + a61bb43ff4eaf2a60eb5be26760190f5 name WizardViewController~ipad.xib @@ -6899,9 +6899,9 @@ versions en - 8 + 9 fr - 8 + 9 @@ -10870,7 +10870,7 @@ change date - 2012-09-20T12:25:53Z + 2012-09-21T09:33:54Z changed values class @@ -10880,7 +10880,7 @@ flags 0 hash - 9801969515d6fafb3f05d8b036f9e80d + 3b7db2782a575d521f2505fe1d391964 name Localizable.strings @@ -11039,6 +11039,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + About + localizations + + en + About + fr + À propos + + snapshots + + change date 2001-01-01T00:00:00Z diff --git a/linphone.ldb/Resources/Classes/ChatViewController/10/ChatViewController.xib b/linphone.ldb/Resources/Classes/ChatViewController/11/ChatViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/ChatViewController/10/ChatViewController.xib rename to linphone.ldb/Resources/Classes/ChatViewController/11/ChatViewController.xib index 2e6558bf6..eabdb3cfa 100644 --- a/linphone.ldb/Resources/Classes/ChatViewController/10/ChatViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatViewController/11/ChatViewController.xib @@ -174,7 +174,6 @@ {{0, 79}, {320, 381}} - _NS:9 3 diff --git a/linphone.ldb/Resources/Classes/ContactsViewController/11/ContactsViewController.xib b/linphone.ldb/Resources/Classes/ContactsViewController/12/ContactsViewController.xib similarity index 87% rename from linphone.ldb/Resources/Classes/ContactsViewController/11/ContactsViewController.xib rename to linphone.ldb/Resources/Classes/ContactsViewController/12/ContactsViewController.xib index 935011ea2..22e4a7aa9 100644 --- a/linphone.ldb/Resources/Classes/ContactsViewController/11/ContactsViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactsViewController/12/ContactsViewController.xib @@ -47,6 +47,7 @@ 290 {320, 44} + _NS:9 NO @@ -65,6 +66,7 @@ 292 {107, 44} + _NS:9 NO @@ -117,6 +119,7 @@ 289 {{107, 0}, {107, 44}} + _NS:9 NO @@ -151,6 +154,7 @@ {{106, 0}, {214, 44}} + _NS:9 @@ -167,6 +171,7 @@ 292 {107, 44} + _NS:9 NO @@ -214,6 +219,7 @@ -2147483356 {107, 44} + _NS:9 NO @@ -246,6 +252,7 @@ {320, 44} + _NS:9 @@ -260,6 +267,7 @@ 274 {{0, 44}, {320, 416}} + _NS:10 3 @@ -291,6 +299,7 @@ {320, 460} + _NS:9 @@ -553,9 +562,86 @@ - 93 + 94 + + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + - 0 IBCocoaTouchFramework diff --git a/linphone.ldb/Resources/Classes/WizardViewController/12/WizardViewController.xib b/linphone.ldb/Resources/Classes/WizardViewController/13/WizardViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/WizardViewController/12/WizardViewController.xib rename to linphone.ldb/Resources/Classes/WizardViewController/13/WizardViewController.xib index 19ddd7f5d..f01b4bf29 100644 --- a/linphone.ldb/Resources/Classes/WizardViewController/12/WizardViewController.xib +++ b/linphone.ldb/Resources/Classes/WizardViewController/13/WizardViewController.xib @@ -152,6 +152,7 @@ -2147483357 {{160, 0}, {160, 77}} + _NS:9 NO 5 diff --git a/linphone.ldb/Resources/Classes/WizardViewController~ipad/8/WizardViewController~ipad.xib b/linphone.ldb/Resources/Classes/WizardViewController~ipad/9/WizardViewController~ipad.xib similarity index 84% rename from linphone.ldb/Resources/Classes/WizardViewController~ipad/8/WizardViewController~ipad.xib rename to linphone.ldb/Resources/Classes/WizardViewController~ipad/9/WizardViewController~ipad.xib index 0b2e69b39..d3414692d 100644 --- a/linphone.ldb/Resources/Classes/WizardViewController~ipad/8/WizardViewController~ipad.xib +++ b/linphone.ldb/Resources/Classes/WizardViewController~ipad/9/WizardViewController~ipad.xib @@ -42,6 +42,7 @@ 274 {768, 966} + _NS:9 YES @@ -60,6 +61,7 @@ 290 {{0, 77}, {768, 2000}} + _NS:9 1 @@ -73,6 +75,7 @@ 294 {384, 77} + _NS:9 NO @@ -129,6 +132,7 @@ 291 {{384, 0}, {384, 77}} + _NS:9 NO @@ -165,6 +169,7 @@ -2147483357 {{384, 0}, {384, 77}} + _NS:9 NO @@ -203,6 +208,7 @@ {{0, 947}, {768, 77}} + _NS:9 @@ -221,6 +227,7 @@ 301 {{366, 492}, {37, 37}} + _NS:9 NO @@ -233,6 +240,7 @@ {768, 1024} + _NS:9 @@ -245,6 +253,7 @@ {768, 1024} + _NS:9 @@ -259,6 +268,7 @@ 274 {1024, 711} + _NS:9 YES @@ -277,6 +287,7 @@ 290 {{0, 77}, {1024, 2000}} + _NS:9 1 @@ -290,6 +301,7 @@ 294 {512, 77} + _NS:9 NO @@ -336,6 +348,7 @@ 291 {{512, 0}, {512, 77}} + _NS:9 NO @@ -372,6 +385,7 @@ -2147483357 {{512, 0}, {512, 77}} + _NS:9 NO @@ -410,6 +424,7 @@ {{0, 691}, {1024, 77}} + _NS:9 @@ -425,6 +440,7 @@ 301 {{494, 364}, {37, 37}} + _NS:9 NO @@ -437,6 +453,7 @@ {1024, 768} + _NS:9 @@ -449,6 +466,7 @@ {1024, 768} + _NS:9 @@ -767,7 +785,148 @@ 137 - + + + + TPMultiLayoutViewController + UIViewController + + UIView + UIView + + + + landscapeView + UIView + + + portraitView + UIView + + + + IBProjectSource + ./Classes/TPMultiLayoutViewController.h + + + + WizardViewController + TPMultiLayoutViewController + + id + id + id + id + id + id + id + id + id + id + + + + onBackClick: + id + + + onCancelClick: + id + + + onCheckValidationClick: + id + + + onConnectAccountClick: + id + + + onCreateAccountClick: + id + + + onExternalAccountClick: + id + + + onRegisterClick: + id + + + onSignInClick: + id + + + onSignInExternalClick: + id + + + onStartClick: + id + + + + UIButton + UIView + UIView + UIScrollView + UIView + UIView + UIButton + UIView + UIView + UIView + + + + backButton + UIButton + + + choiceView + UIView + + + connectAccountView + UIView + + + contentView + UIScrollView + + + createAccountView + UIView + + + externalAccountView + UIView + + + startButton + UIButton + + + validateAccountView + UIView + + + waitView + UIView + + + welcomeView + UIView + + + + IBProjectSource + ./Classes/WizardViewController.h + + + + 0 IBCocoaTouchFramework diff --git a/linphone.ldb/Resources/Classes/WizardViews/10/WizardViews.xib b/linphone.ldb/Resources/Classes/WizardViews/12/WizardViews.xib similarity index 99% rename from linphone.ldb/Resources/Classes/WizardViews/10/WizardViews.xib rename to linphone.ldb/Resources/Classes/WizardViews/12/WizardViews.xib index a215fb722..00a8b25a5 100644 --- a/linphone.ldb/Resources/Classes/WizardViews/10/WizardViews.xib +++ b/linphone.ldb/Resources/Classes/WizardViews/12/WizardViews.xib @@ -105,7 +105,6 @@ {{40, 290}, {240, 44}} - _NS:9 NO YES @@ -254,7 +253,6 @@ {{33, 269}, {255, 50}} - _NS:9 NO @@ -488,7 +486,6 @@ {{33, 330}, {255, 50}} - _NS:9 NO @@ -651,7 +648,6 @@ {{32, 330}, {255, 50}} - _NS:9 NO @@ -839,7 +835,6 @@ {{34, 330}, {255, 50}} - _NS:9 NO @@ -995,7 +990,6 @@ {{32, 330}, {255, 50}} - _NS:9 NO diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index d1ab447f8..78857cfe4 100644 Binary files a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings and b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 226937abb..dc755cc1d 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -42,7 +42,7 @@ 22405F011601C19200B92522 /* ImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22405EFE1601C19100B92522 /* ImageViewController.m */; }; 2242E313125235120061DDCE /* ring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 2242E312125235120061DDCE /* ring.caf */; }; 224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; + 2245F78A1201D38000C4179D /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* AboutViewController.xib */; }; 2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; }; 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; 226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; }; @@ -71,7 +71,7 @@ 22D8F144147548E2008C97DB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 22D8F145147548E2008C97DB /* LinphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */; }; 22D8F146147548E2008C97DB /* DialerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F2508C107141E100AC9B3F /* DialerViewController.m */; }; - 22D8F14A147548E2008C97DB /* MoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* MoreViewController.m */; }; + 22D8F14A147548E2008C97DB /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* AboutViewController.m */; }; 22D8F14B147548E2008C97DB /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; }; 22D8F14C147548E2008C97DB /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; }; 22D8F14E147548E2008C97DB /* UICallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB7912F846B1002A5394 /* UICallButton.m */; }; @@ -114,7 +114,7 @@ 22D8F17B147548E2008C97DB /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED51344B0EF00F6EF27 /* libmsamr.a */; }; 22D8F17E147548E2008C97DB /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; }; 22D8F17F147548E2008C97DB /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AB1472527D0037138E /* libsrtp.a */; }; - 22E0A822111C44E100B04932 /* MoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* MoreViewController.m */; }; + 22E0A822111C44E100B04932 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* AboutViewController.m */; }; 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; 22E0A824111C44E100B04932 /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; }; 22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; }; @@ -585,7 +585,7 @@ D34BD72215C13DB70070C209 /* video_on_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = D3C31A3115BD8DED008ED271 /* video_on_over_landscape.png */; }; D34BD72515C13DD40070C209 /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; D34BD72F15C13DD40070C209 /* LinphoneApp.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F9115824D3500336684 /* LinphoneApp.xib */; }; - D34BD73015C13DD40070C209 /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; + D34BD73015C13DD40070C209 /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* AboutViewController.xib */; }; D34BD73115C13DD40070C209 /* PhoneMainView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D34734791580DDF1003C7B8C /* PhoneMainView.xib */; }; D34BD73215C13DD40070C209 /* SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D32942A31594C94200556A1C /* SettingsViewController.xib */; }; D34BD73615C13DF40070C209 /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5413159853C90037DC6B /* UIChatCell.xib */; }; @@ -795,6 +795,8 @@ D389363B15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */; }; D38D14AF15A30B3D008497E8 /* cell_call_first_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */; }; D38D14B115A30B3D008497E8 /* cell_call_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */; }; + D38F46F2160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D38F46F1160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png */; }; + D38F46F3160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D38F46F1160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png */; }; D3998D0416031937009DD22C /* background_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = D3998D0316031937009DD22C /* background_alt.png */; }; D3998D0516031937009DD22C /* background_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = D3998D0316031937009DD22C /* background_alt.png */; }; D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; }; @@ -1545,9 +1547,9 @@ 22C7564B13265C6A007BC101 /* x509v3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509v3.h; sourceTree = ""; }; 22D1B68012A3E0BE001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; }; 22D8F187147548E2008C97DB /* linphone-no-gpl-thirdparties.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "linphone-no-gpl-thirdparties.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 22E0A81B111C44E100B04932 /* MoreViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreViewController.xib; sourceTree = ""; }; - 22E0A81C111C44E100B04932 /* MoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoreViewController.m; sourceTree = ""; }; - 22E0A81D111C44E100B04932 /* MoreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoreViewController.h; sourceTree = ""; }; + 22E0A81B111C44E100B04932 /* AboutViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AboutViewController.xib; sourceTree = ""; }; + 22E0A81C111C44E100B04932 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = ""; }; + 22E0A81D111C44E100B04932 /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = ""; }; 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConsoleViewController.xib; sourceTree = ""; }; 22E0A81F111C44E100B04932 /* ConsoleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConsoleViewController.m; sourceTree = ""; }; 22E0A820111C44E100B04932 /* ConsoleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleViewController.h; sourceTree = ""; }; @@ -1897,6 +1899,7 @@ D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_outgoing.9.png; path = Resources/chat_bubble_outgoing.9.png; sourceTree = ""; }; D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_first_highlight.png; path = Resources/cell_call_first_highlight.png; sourceTree = ""; }; D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_highlight.png; path = Resources/cell_call_highlight.png; sourceTree = ""; }; + D38F46F1160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-splashscreen-568h@2x.png"; path = "Resources/linphone-splashscreen-568h@2x.png"; sourceTree = ""; }; D3998D0316031937009DD22C /* background_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background_alt.png; path = Resources/background_alt.png; sourceTree = ""; }; D3A55FBA15877E5E003FD403 /* UIContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIContactCell.h; sourceTree = ""; }; D3A55FBB15877E5E003FD403 /* UIContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIContactCell.m; sourceTree = ""; }; @@ -2324,6 +2327,9 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + 22E0A81D111C44E100B04932 /* AboutViewController.h */, + 22E0A81C111C44E100B04932 /* AboutViewController.m */, + 22E0A81B111C44E100B04932 /* AboutViewController.xib */, D32B6E2715A5BC430033019F /* ChatRoomTableViewController.h */, D32B6E2815A5BC430033019F /* ChatRoomTableViewController.m */, D3F795D315A582800077328B /* ChatRoomViewController.h */, @@ -2390,9 +2396,6 @@ D3EA53FC159850E80037DC6B /* LinphoneManager.m */, 2214EB7012F84668002A5394 /* LinphoneUI */, D32B6E3515A5C2200033019F /* Model */, - 22E0A81D111C44E100B04932 /* MoreViewController.h */, - 22E0A81C111C44E100B04932 /* MoreViewController.m */, - 22E0A81B111C44E100B04932 /* MoreViewController.xib */, D3F83F8C158229C500336684 /* PhoneMainView.h */, D3F83F8D15822ABD00336684 /* PhoneMainView.m */, D34734791580DDF1003C7B8C /* PhoneMainView.xib */, @@ -3056,6 +3059,7 @@ D3432A6F158A45AF001C6B0B /* led_inprogress.png */, 225CB2F911ABB76400628906 /* linphone-banner.png */, 8D1107310486CEB800E47090 /* linphone-Info.plist */, + D38F46F1160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png */, D354944A160B615A0027E44E /* linphone-splashscreen.png */, D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */, 22058C70116E305000B08DDD /* linphone_icon_57.png */, @@ -3587,7 +3591,7 @@ 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */, 22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */, 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */, - 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */, + 2245F78A1201D38000C4179D /* AboutViewController.xib in Resources */, 2242E313125235120061DDCE /* ring.caf in Resources */, D38187C915FE346400C3EDCA /* FirstLoginViewController.xib in Resources */, 2214783D1386A2030020F8B8 /* Localizable.strings in Resources */, @@ -4059,6 +4063,7 @@ D354944C160B615A0027E44E /* linphone-splashscreen.png in Resources */, D354944E160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */, D354946C160B75B70027E44E /* chat_address.png in Resources */, + D38F46F2160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4102,7 +4107,7 @@ D38187D215FE346B00C3EDCA /* HistoryViewController.xib in Resources */, D38187DA15FE347700C3EDCA /* IncomingCallViewController.xib in Resources */, D34BD72F15C13DD40070C209 /* LinphoneApp.xib in Resources */, - D34BD73015C13DD40070C209 /* MoreViewController.xib in Resources */, + D34BD73015C13DD40070C209 /* AboutViewController.xib in Resources */, D34BD73115C13DD40070C209 /* PhoneMainView.xib in Resources */, D34BD73215C13DD40070C209 /* SettingsViewController.xib in Resources */, D38187DE15FE348A00C3EDCA /* WizardViewController.xib in Resources */, @@ -4543,6 +4548,7 @@ D354944D160B615A0027E44E /* linphone-splashscreen.png in Resources */, D354944F160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */, D354946D160B75B70027E44E /* chat_address.png in Resources */, + D38F46F3160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4585,7 +4591,7 @@ 1D60589B0D05DD56006BFB54 /* main.m in Sources */, 1D3623260D0F684500981E51 /* LinphoneAppDelegate.m in Sources */, 22F2508E107141E100AC9B3F /* DialerViewController.m in Sources */, - 22E0A822111C44E100B04932 /* MoreViewController.m in Sources */, + 22E0A822111C44E100B04932 /* AboutViewController.m in Sources */, 22E0A824111C44E100B04932 /* ConsoleViewController.m in Sources */, 2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */, 2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */, @@ -4679,7 +4685,7 @@ 22D8F144147548E2008C97DB /* main.m in Sources */, 22D8F145147548E2008C97DB /* LinphoneAppDelegate.m in Sources */, 22D8F146147548E2008C97DB /* DialerViewController.m in Sources */, - 22D8F14A147548E2008C97DB /* MoreViewController.m in Sources */, + 22D8F14A147548E2008C97DB /* AboutViewController.m in Sources */, 22D8F14B147548E2008C97DB /* ConsoleViewController.m in Sources */, 22D8F14C147548E2008C97DB /* UIDigitButton.m in Sources */, 22D8F14E147548E2008C97DB /* UICallButton.m in Sources */,