diff --git a/Classes/ImagePickerViewController.m b/Classes/ImagePickerViewController.m deleted file mode 100644 index c31e48906..000000000 --- a/Classes/ImagePickerViewController.m +++ /dev/null @@ -1,177 +0,0 @@ -/* ImagePickerViewController.m - * - * Copyright (C) 2012 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import "ImagePickerViewController.h" -#import "PhoneMainView.h" -#import "DTActionSheet.h" - -@implementation ImagePickerViewController - -@synthesize imagePickerDelegate; -@synthesize sourceType; -@synthesize mediaTypes; -@synthesize allowsEditing; - - -#pragma mark - Lifecycle Functions - -- (id)init { - self = [super init]; - if (self != nil) { - pickerController = [[UIImagePickerController alloc] init]; - if([LinphoneManager runningOnIpad]) { - popoverController = [[UIPopoverController alloc] initWithContentViewController:pickerController]; - } - } - return self; -} - -- (void)dealloc { - [pickerController release]; - [popoverController release]; - - [super dealloc]; -} - - -#pragma mark - UICompositeViewDelegate Functions - -static UICompositeViewDescription *compositeDescription = nil; - -+ (UICompositeViewDescription *)compositeViewDescription { - if(compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"ImagePicker" - content:@"ImagePickerViewController" - stateBar:nil - stateBarEnabled:false - tabBar:@"UIMainBar" - tabBarEnabled:true - fullscreen:false - landscapeMode:[LinphoneManager runningOnIpad] - portraitMode:true]; - } - return compositeDescription; -} - - -#pragma mark - ViewController Functions - -- (void)viewDidLoad { - [super viewDidLoad]; - - [self.view setAutoresizingMask: UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight]; - if(popoverController == nil) { - [pickerController.view setFrame:[self.view bounds]]; - [self.view addSubview:[pickerController view]]; - } else { - [popoverController setDelegate:self]; - } - [pickerController setDelegate:self]; -} - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - if(popoverController != nil) { - [popoverController presentPopoverFromRect:CGRectZero inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:FALSE]; - } -} - -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - if(popoverController != nil) { - [popoverController dismissPopoverAnimated: NO]; - } -} - -#pragma mark - Property Functions - -- (BOOL)allowsEditing { - return pickerController.allowsEditing; -} - -- (void)setAllowsEditing:(BOOL)aallowsEditing { - pickerController.allowsEditing = aallowsEditing; -} - -- (UIImagePickerControllerSourceType)sourceType { - return pickerController.sourceType; -} - -- (void)setSourceType:(UIImagePickerControllerSourceType)asourceType { - pickerController.sourceType = asourceType; -} - -- (NSArray *)mediaTypes { - return pickerController.mediaTypes; -} - -- (void)setMediaTypes:(NSArray *)amediaTypes { - pickerController.mediaTypes = amediaTypes; -} - - -#pragma mark - - -- (void)dismiss { - if([[[PhoneMainView instance] currentView] equal:[ImagePickerViewController compositeViewDescription]]) { - [[PhoneMainView instance] popCurrentView]; - } -} - -+ (void)promptSelectSource:(void (^)(UIImagePickerControllerSourceType))block { - DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source",nil)] autorelease]; - if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) { - [sheet addButtonWithTitle:NSLocalizedString(@"Camera",nil) block:^(){ - block(UIImagePickerControllerSourceTypeCamera); - }]; - } - if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) { - [sheet addButtonWithTitle:NSLocalizedString(@"Photo library",nil) block:^(){ - block(UIImagePickerControllerSourceTypePhotoLibrary); - }]; - } - [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel",nil)]; - - [sheet showInView:[PhoneMainView instance].view]; -} - - -#pragma mark - UIImagePickerControllerDelegate Functions - -- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { - UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage]; - if(image == nil) { - image = [info objectForKey:UIImagePickerControllerOriginalImage]; - } - if(image != nil && imagePickerDelegate != nil) { - [imagePickerDelegate imagePickerDelegateImage:image info:info]; - } - [self dismiss]; -} - -- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker { - [self dismiss]; -} - -- (BOOL)popoverControllerShouldDismissPopover:(UIPopoverController *)apopoverController { - [self dismiss]; - return TRUE; -} - -@end diff --git a/Classes/ImageSharing.h b/Classes/ImageSharing.h deleted file mode 100644 index 5949cc8a6..000000000 --- a/Classes/ImageSharing.h +++ /dev/null @@ -1,52 +0,0 @@ -/* ImageSharing.h - * - * Copyright (C) 2012 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import - -@class ImageSharing; - -@protocol ImageSharingDelegate - -- (void)imageSharingProgress:(ImageSharing*)imageSharing progress:(float)progress; -- (void)imageSharingAborted:(ImageSharing*)imageSharing; -- (void)imageSharingError:(ImageSharing*)imageSharing error:(NSError *)error; -- (void)imageSharingUploadDone:(ImageSharing*)imageSharing url:(NSURL*)url; -- (void)imageSharingDownloadDone:(ImageSharing*)imageSharing image:(UIImage *)image; - -@end - -@interface ImageSharing : NSObject { -@private - NSInteger totalBytesExpectedToRead; - id delegate; - int statusCode; -} - -+ (id)imageSharingUpload:(NSURL*)url image:(UIImage*)image delegate:(id)delegate userInfo:(id)userInfo; -+ (id)imageSharingDownload:(NSURL*)url delegate:(id)delegate userInfo:(id)userInfo; - -- (void)cancel; - -@property (nonatomic, retain) id userInfo; - -@property (nonatomic, readonly) BOOL upload; -@property (nonatomic, readonly) NSMutableData* data; -@property (nonatomic, readonly) NSURLConnection* connection; - -@end diff --git a/Classes/ImageSharing.m b/Classes/ImageSharing.m deleted file mode 100644 index 403addd20..000000000 --- a/Classes/ImageSharing.m +++ /dev/null @@ -1,186 +0,0 @@ -/* ImageSharing.m - * - * Copyright (C) 2012 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import "ImageSharing.h" -#import "Utils.h" -#import "LinphoneManager.h" - -@implementation ImageSharing - -@synthesize connection; -@synthesize data; -@synthesize upload; -@synthesize userInfo; - -#pragma mark - Lifecycle Functions - -+ (id)imageSharingUpload:(NSURL*)url image:(UIImage*)image delegate:(id)delegate userInfo:(id)auserInfo{ - ImageSharing *imgs = [[ImageSharing alloc] init]; - if(imgs != nil) { - imgs.userInfo = auserInfo; - imgs->upload = TRUE; - imgs->delegate = [delegate retain]; - imgs->data = [[NSMutableData alloc] init]; - if(delegate) { - [delegate imageSharingProgress:imgs progress:0]; - } - [imgs uploadImageTo:url image:image]; - } - return imgs; -} - -+ (id)imageSharingDownload:(NSURL*)url delegate:(id)delegate userInfo:(id)auserInfo{ - ImageSharing *imgs = [[ImageSharing alloc] init]; - if(imgs != nil) { - imgs.userInfo = auserInfo; - imgs->upload = FALSE; - imgs->delegate = [delegate retain]; - imgs->data = [[NSMutableData alloc] init]; - if(delegate) { - [delegate imageSharingProgress:imgs progress:0]; - } - [imgs downloadImageFrom:url]; - } - return imgs; -} - -- (void)dealloc { - [connection release]; - [data release]; - [delegate release]; - [userInfo release]; - [super dealloc]; -} - - -#pragma mark - - -- (void)cancel { - [connection cancel]; - [LinphoneLogger log:LinphoneLoggerLog format:@"File transfer [%@] interrupted by user", [connection.currentRequest.URL absoluteString]]; - if(delegate) { - [delegate imageSharingAborted:self]; - } -} - - -- (void)downloadImageFrom:(NSURL*)url { - [LinphoneLogger log:LinphoneLoggerLog format:@"downloading [%@]", [url absoluteString]]; - - NSURLRequest* request = [NSURLRequest requestWithURL:url - cachePolicy:NSURLRequestUseProtocolCachePolicy - timeoutInterval:60.0]; - - connection = [[NSURLConnection alloc] initWithRequest:request delegate: self]; -} - - -- (void)uploadImageTo:(NSURL*)url image:(UIImage*)image { - [LinphoneLogger log:LinphoneLoggerLog format:@"downloading [%@]", [url absoluteString]]; - - // setting up the request object now - NSMutableURLRequest *request = [[[NSMutableURLRequest alloc] init] autorelease]; - [request setURL:url]; - [request setHTTPMethod:@"POST"]; - - /* - add some header info now - we always need a boundary when we post a file - also we need to set the content type - - You might want to generate a random boundary.. this is just the same - as my output from wireshark on a valid html post - */ - NSString *boundary = @"---------------------------14737809831466499882746641449"; - NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@",boundary]; - [request addValue:contentType forHTTPHeaderField: @"Content-Type"]; - - /* - now lets create the body of the post - */ - NSMutableData *body = [NSMutableData data]; - NSString *imageName = [NSString stringWithFormat:@"%i.jpg", [image hash]]; - [body appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",boundary] dataUsingEncoding:NSUTF8StringEncoding]]; - [body appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"userfile\"; filename=\"%@\"\r\n",imageName] dataUsingEncoding:NSUTF8StringEncoding]]; - [body appendData:[@"Content-Type: application/octet-stream\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]]; - [body appendData:[NSData dataWithData:UIImageJPEGRepresentation(image, 1.0)]]; - [body appendData:[[NSString stringWithFormat:@"\r\n--%@--\r\n",boundary] dataUsingEncoding:NSUTF8StringEncoding]]; - [request setHTTPBody:body]; - - connection = [[NSURLConnection alloc] initWithRequest:(NSURLRequest *)request delegate:self]; -} - - -#pragma mark - NSURLConnectionDelegate - -- (void)connection:(NSURLConnection *)aconnection didFailWithError:(NSError *)error { - if(delegate) { - [delegate imageSharingError:self error:error]; - } - [self release]; -} - -- (void)connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite { - if(upload && delegate) { - [delegate imageSharingProgress:self progress:(float)totalBytesWritten/(float)totalBytesExpectedToWrite]; - } -} - -- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)adata { - [data appendData:adata]; - if(!upload && delegate) { - [delegate imageSharingProgress:self progress:(float)data.length/(float)totalBytesExpectedToRead]; - } -} - -- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { - NSHTTPURLResponse * httpResponse = (NSHTTPURLResponse *) response; - statusCode = httpResponse.statusCode; - [LinphoneLogger log:LinphoneLoggerLog format:@"File transfer status code [%i]",statusCode]; - - if (statusCode == 200 && !upload) { - totalBytesExpectedToRead = [response expectedContentLength]; - } -} - -- (void)connectionDidFinishLoading:(NSURLConnection *)connection { - if(statusCode >= 400) { - NSError *error = [NSError errorWithDomain:@"ImageSharing" code:statusCode userInfo:nil]; - if(delegate) { - [delegate imageSharingError:self error:error]; - } - return; - } - if (upload) { - NSString* imageRemoteUrl = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - [LinphoneLogger log:LinphoneLoggerLog format:@"File can be downloaded from [%@]", imageRemoteUrl]; - if(delegate) { - [delegate imageSharingUploadDone:self url:[NSURL URLWithString:imageRemoteUrl]]; - } - } else { - UIImage* image = [UIImage imageWithData:data]; - [LinphoneLogger log:LinphoneLoggerLog format:@"File downloaded"]; - if(delegate) { - [delegate imageSharingDownloadDone:self image:image]; - } - } - [self release]; -} - -@end diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index e6aa9ed53..f7d4d2719 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -57,19 +57,12 @@ CTCallCenter* ct = (CTCallCenter*) cCenter; int callCount = [ct.currentCalls count]; - if (!callCount) { - [LinphoneLogger logc:LinphoneLoggerLog format:"No GSM call -> enabling SIP calls"]; - linphone_core_set_max_calls([LinphoneManager getLc], 3); - } else { - [LinphoneLogger logc:LinphoneLoggerLog format:"%d GSM call(s) -> disabling SIP calls", callCount]; - /* pause current call, if any */ - LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); - if (call) { - [LinphoneLogger logc:LinphoneLoggerLog format:"Pausing SIP call"]; - linphone_core_pause_call([LinphoneManager getLc], call); - } - linphone_core_set_max_calls([LinphoneManager getLc], 0); - } + /* pause current call, if any */ + LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); + if (callCount>0 && call) { + [LinphoneLogger logc:LinphoneLoggerLog format:"Pausing SIP call"]; + linphone_core_pause_call([LinphoneManager getLc], call); + } } - (void)applicationDidEnterBackground:(UIApplication *)application{ @@ -293,6 +286,7 @@ /* MODIFICATION: Remove chat local notificaiton NSString *remoteContact = (NSString*)[notification.userInfo objectForKey:@"chat"]; // Go to ChatRoom view + [[PhoneMainView instance] changeCurrentView:[ChatViewController compositeViewDescription]]; ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController); if(controller != nil) { [controller setRemoteAddress:remoteContact]; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 6e2a17010..3a918a6cf 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -32,6 +32,7 @@ #include "linphonecore_utils.h" #include "lpconfig.h" +#define LINPHONE_LOGS_MAX_ENTRY 5000 static void audioRouteChangeListenerCallback ( void *inUserData, // 1 @@ -60,6 +61,7 @@ NSString *const kLinphoneLogsUpdate = @"LinphoneLogsUpdate"; NSString *const kLinphoneSettingsUpdate = @"LinphoneSettingsUpdate"; NSString *const kContactSipField = @"SIP"; + extern void libmsilbc_init(); #ifdef HAVE_AMR extern void libmsamr_init(); @@ -327,6 +329,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 @@ -344,6 +349,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 @@ -375,7 +383,18 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char - (void)onCall:(LinphoneCall*)call StateChanged:(LinphoneCallState)state withMessage:(const char *)message { // Handling wrapper - if(state == LinphoneCallReleased) { + + CTCallCenter* ct = [[CTCallCenter alloc] init]; + + int callCount = [ct.currentCalls count]; + if (callCount>0 && state==LinphoneCallIncomingReceived) { + [LinphoneLogger logc:LinphoneLoggerLog format:"Mobile call ongoing... rejecting call from [%s]",linphone_address_get_username(linphone_call_get_call_log(call)->from)]; + linphone_core_terminate_call([LinphoneManager getLc], call); + return; + } + [ct release]; + + if(state == LinphoneCallReleased) { if(linphone_call_get_user_pointer(call) != NULL) { free (linphone_call_get_user_pointer(call)); linphone_call_set_user_pointer(call, NULL); @@ -671,7 +690,7 @@ static LinphoneCoreVTable linphonec_vtable = { linphone_core_set_root_ca(theLinphoneCore, lRootCa); // Set audio assets - const char* lRing = [[LinphoneManager bundleFile:@"ring.wab"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char* lRing = [[LinphoneManager bundleFile:@"ring.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; linphone_core_set_ring(theLinphoneCore, lRing); const char* lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; linphone_core_set_ringback(theLinphoneCore, lRingBack); @@ -685,7 +704,7 @@ static LinphoneCoreVTable linphonec_vtable = { [self reconfigureLinphoneIfNeeded:nil]; // start scheduler - mIterateTimer = [NSTimer scheduledTimerWithTimeInterval:0.1 + mIterateTimer = [NSTimer scheduledTimerWithTimeInterval:0.02 target:self selector:@selector(iterate) userInfo:nil @@ -1046,7 +1065,7 @@ static void audioRouteChangeListenerCallback ( - (void)addPushTokenToProxyConfig:(LinphoneProxyConfig*)proxyCfg{ /* MODIFICATION: Disable pushnotification NSData *tokenData = pushNotificationToken; - if(tokenData != nil && [self lpConfigBoolForKey:@"pusnotification_preference"]) { + if(tokenData != nil && [self lpConfigBoolForKey:@"pushnotification_preference"]) { const unsigned char *tokenBuffer = [tokenData bytes]; NSMutableString *tokenString = [NSMutableString stringWithCapacity:[tokenData length]*2]; for(int i = 0; i < [tokenData length]; ++i) { diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h index 01a93958b..02b6d660c 100644 --- a/Classes/LinphoneUI/UILinphone.h +++ b/Classes/LinphoneUI/UILinphone.h @@ -34,4 +34,9 @@ @end -void removeTableBackground(UIView* view); + +@interface UIImage (NormalizedImage) + +- (void)forceDecompression; + +@end diff --git a/Classes/LinphoneUI/UILinphone.m b/Classes/LinphoneUI/UILinphone.m index b1788b19e..a9fbce149 100644 --- a/Classes/LinphoneUI/UILinphone.m +++ b/Classes/LinphoneUI/UILinphone.m @@ -93,14 +93,16 @@ @end -void removeTableBackground(UIView*view) { - if([view isKindOfClass:[UITableView class]]) { - [view setBackgroundColor:[UIColor clearColor]]; - } - if([view isKindOfClass:[UIImageView class]] && [[view superview] isKindOfClass:[UITableView class]]) { - [(UIImageView*)view setImage:nil]; - } - for(UIView *subview in [view subviews]) { - removeTableBackground(subview); - } +@implementation UIImage (NormalizedImage) + +- (void)forceDecompression { + CGImageRef imageRef = [self CGImage]; + CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); + CGContextRef context = CGBitmapContextCreate(NULL, CGImageGetWidth(imageRef), CGImageGetHeight(imageRef), 8, CGImageGetWidth(imageRef) * 4, colorSpace,kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little); + CGColorSpaceRelease(colorSpace); + if (!context) { NSLog(@"Could not create context for image decompression"); return; } + CGContextDrawImage(context, (CGRect){{0.0f, 0.0f}, {CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)}}, imageRef); + CFRelease(context); } + +@end diff --git a/Classes/LinphoneUI/UILinphoneButton.h b/Classes/LinphoneUI/UILinphoneButton.h new file mode 100644 index 000000000..7b390c40d --- /dev/null +++ b/Classes/LinphoneUI/UILinphoneButton.h @@ -0,0 +1,30 @@ +/* UILinphoneButton.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 + +@interface UILinphoneButton : UIButton { + +} + +@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundNinePatch; +@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundOverNinePatch; + +@end diff --git a/Classes/LinphoneUI/UILinphoneButton.m b/Classes/LinphoneUI/UILinphoneButton.m new file mode 100644 index 000000000..530044db1 --- /dev/null +++ b/Classes/LinphoneUI/UILinphoneButton.m @@ -0,0 +1,78 @@ +/* UILinphoneButton.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 "UILinphoneButton.h" + +@implementation UILinphoneButton + +@synthesize backgroundNinePatch; +@synthesize backgroundOverNinePatch; + + +#pragma mark - Lifecycle Functions + +- (void)initUILinphoneButton { + self.backgroundNinePatch = [TUNinePatch ninePatchNamed:@"button_background_default"]; + self.backgroundOverNinePatch = [TUNinePatch ninePatchNamed:@"button_background_over"]; + [self setBackgroundImage:nil forState:UIControlStateNormal]; + [self setBackgroundImage:nil forState:UIControlStateHighlighted]; + [self setContentMode:UIViewContentModeRedraw]; +} + +- (id)init { + self = [super init]; + if(self != nil) { + [self initUILinphoneButton]; + } + return self; +} + +- (id)initWithCoder:(NSCoder *)aDecoder { + self = [super initWithCoder:aDecoder]; + if(self != nil) { + [self initUILinphoneButton]; + } + return self; +} + +- (id)initWithFrame:(CGRect)frame { + self = [super initWithFrame:frame]; + if(self != nil) { + [self initUILinphoneButton]; + } + return self; +} + +- (void)setHighlighted:(BOOL)highlighted { + [super setHighlighted:highlighted]; + [self setNeedsDisplay]; +} + +- (void)drawRect:(CGRect)rect { + // we ignore the rect and redraw the entire view + CGContextRef context = UIGraphicsGetCurrentContext(); + if (context) { + if(self.highlighted) { + [self.backgroundOverNinePatch inContext:context drawInRect:[self bounds]]; + } else { + [self.backgroundNinePatch inContext:context drawInRect:[self bounds]]; + } + } +} + +@end diff --git a/Classes/LinphoneUI/UILinphoneTextField.h b/Classes/LinphoneUI/UILinphoneTextField.h new file mode 100644 index 000000000..a6445665e --- /dev/null +++ b/Classes/LinphoneUI/UILinphoneTextField.h @@ -0,0 +1,29 @@ +/* UILinphoneTextField.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 + +@interface UILinphoneTextField : UITextField { + +} + +@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundNinePatch; + +@end diff --git a/Classes/LinphoneUI/UILinphoneTextField.m b/Classes/LinphoneUI/UILinphoneTextField.m new file mode 100644 index 000000000..8eaf12fc4 --- /dev/null +++ b/Classes/LinphoneUI/UILinphoneTextField.m @@ -0,0 +1,85 @@ +/* UILinphoneTextField.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 "UILinphoneTextField.h" + +@implementation UILinphoneTextField + +@synthesize backgroundNinePatch; + + +#pragma mark - Lifecycle Functions + +- (void)initUILinphoneTextField { + self.backgroundNinePatch = [TUNinePatch ninePatchNamed:@"field_background"]; + self.background = nil; + [self setContentMode:UIViewContentModeRedraw]; +} + +- (id)init { + self = [super init]; + if(self != nil) { + [self initUILinphoneTextField]; + } + return self; +} + +- (id)initWithCoder:(NSCoder *)aDecoder { + self = [super initWithCoder:aDecoder]; + if(self != nil) { + [self initUILinphoneTextField]; + } + return self; +} + +- (id)initWithFrame:(CGRect)frame { + self = [super initWithFrame:frame]; + if(self != nil) { + [self initUILinphoneTextField]; + } + return self; +} + +- (void)dealloc { + [backgroundNinePatch release]; + + [super dealloc]; +} + +- (CGRect)textRectForBounds:(CGRect)bounds { + return CGRectInset(bounds, 6, 4); +} + +- (CGRect)placeholderRectForBounds:(CGRect)bounds { + return CGRectInset(bounds, 6, 4); +} + +- (CGRect)editingRectForBounds:(CGRect)bounds { + return CGRectInset(bounds, 6, 4); +} + +- (void)drawRect:(CGRect)rect { + // we ignore the rect and redraw the entire view + CGContextRef context = UIGraphicsGetCurrentContext(); + if (context) { + [self.backgroundNinePatch inContext:context drawInRect:[self bounds]]; + } +} + +@end diff --git a/Classes/LinphoneUI/UILoadingImageView.h b/Classes/LinphoneUI/UILoadingImageView.h new file mode 100644 index 000000000..a27c7462d --- /dev/null +++ b/Classes/LinphoneUI/UILoadingImageView.h @@ -0,0 +1,31 @@ +/* UILoadingImageView.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 + +@interface UILoadingImageView : UIImageView + + +- (void)startLoading; +- (BOOL)isLoading; +- (void)stopLoading; + +@property (nonatomic, readonly) IBOutlet UIActivityIndicatorView *waitIndicatorView; + +@end diff --git a/Classes/LinphoneUI/UILoadingImageView.m b/Classes/LinphoneUI/UILoadingImageView.m new file mode 100644 index 000000000..ceaaa06e5 --- /dev/null +++ b/Classes/LinphoneUI/UILoadingImageView.m @@ -0,0 +1,100 @@ +/* UILoadingImageView.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 "UILoadingImageView.h" + +@implementation UILoadingImageView + + +@synthesize waitIndicatorView; + + +#pragma mark - Lifecycle Functions + +- (void)initUIRemoteImageView { + waitIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; + waitIndicatorView.hidesWhenStopped = TRUE; + waitIndicatorView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | + UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin; + waitIndicatorView.center = self.center; + [self addSubview:waitIndicatorView]; +} + +- (id)init { + self = [super init]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (id)initWithCoder:(NSCoder *)aDecoder { + self = [super initWithCoder:aDecoder]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (id)initWithFrame:(CGRect)frame { + self = [super initWithFrame:frame]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (id)initWithImage:(UIImage *)image { + self = [super initWithImage:image]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (id)initWithImage:(UIImage *)image highlightedImage:(UIImage *)highlightedImage { + self = [super initWithImage:image highlightedImage:highlightedImage]; + if(self != nil) { + [self initUIRemoteImageView]; + } + return self; +} + +- (void)dealloc { + [waitIndicatorView release]; + + [super dealloc]; +} + + +#pragma mark - + +- (void)startLoading { + [waitIndicatorView startAnimating]; +} + +- (void)stopLoading { + [waitIndicatorView stopAnimating]; +} + +- (BOOL)isLoading { + return [waitIndicatorView isAnimating]; +} + +@end diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index d8d9f7716..bdb6e1b70 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -41,8 +41,11 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf if (contact && ABPersonHasImageData(contact)) { CFDataRef imgData = ABPersonCopyImageDataWithFormat(contact, thumbnail? kABPersonImageFormatThumbnail: kABPersonImageFormatOriginalSize); + retImage = [UIImage imageWithData:(NSData *)imgData]; - CFRelease(imgData); + if(imgData != NULL) { + CFRelease(imgData); + } } return retImage; } diff --git a/Classes/Utils/GrowingTextView/HPGrowingTextView.m b/Classes/Utils/GrowingTextView/HPGrowingTextView.m index 5094a59a6..625a17f62 100755 --- a/Classes/Utils/GrowingTextView/HPGrowingTextView.m +++ b/Classes/Utils/GrowingTextView/HPGrowingTextView.m @@ -101,9 +101,10 @@ [super layoutSubviews]; CGRect r = self.bounds; - r.origin.y = 0; - r.origin.x = contentInset.left; + r.origin.y = contentInset.top; + r.origin.x = contentInset.left; r.size.width -= contentInset.left + contentInset.right; + r.size.height -= contentInset.top + contentInset.bottom; internalTextView.frame = r; } @@ -113,9 +114,10 @@ contentInset = inset; CGRect r = self.frame; - r.origin.y = inset.top - inset.bottom; - r.origin.x = inset.left; - r.size.width -= inset.left + inset.right; + r.origin.y = contentInset.top; + r.origin.x = contentInset.left; + r.size.width -= contentInset.left + contentInset.right; + r.size.height -= contentInset.top + contentInset.bottom; internalTextView.frame = r; @@ -147,7 +149,7 @@ internalTextView.hidden = NO; internalTextView.delegate = self; - [self sizeToFit]; + //[self sizeToFit]; maxNumberOfLines = n; } @@ -176,7 +178,7 @@ internalTextView.hidden = NO; internalTextView.delegate = self; - [self sizeToFit]; + //[self sizeToFit]; minNumberOfLines = m; } @@ -192,7 +194,7 @@ //size of content, so we can set the frame of self NSInteger newSizeH = internalTextView.contentSize.height; if(newSizeH < minHeight || !internalTextView.hasText) newSizeH = minHeight; //not smalles than minHeight - if (internalTextView.frame.size.height > maxHeight) newSizeH = maxHeight; // not taller than maxHeight + if(newSizeH > maxHeight) newSizeH = maxHeight; // not taller than maxHeight if (internalTextView.frame.size.height != newSizeH) { diff --git a/Classes/Utils/Utils.h b/Classes/Utils/Utils.h index 8568aca78..4f1e9f0a8 100644 --- a/Classes/Utils/Utils.h +++ b/Classes/Utils/Utils.h @@ -43,4 +43,22 @@ typedef enum _LinphoneLoggerSeverity { @end +@interface LinphoneUtils : NSObject { + +} + ++ (void)adjustFontSize:(UIView*)view mult:(float)mult; ++ (void)buttonFixStates:(UIButton*)button; ++ (void)buttonFixStatesForTabs:(UIButton*)button; ++ (void)buttonMultiViewAddAttributes:(NSMutableDictionary*)attributes button:(UIButton*)button; ++ (void)buttonMultiViewApplyAttributes:(NSDictionary*)attributes button:(UIButton*)button; + +@end + +@interface NSNumber (HumanReadableSize) + +- (NSString*)toHumanReadableSize; + +@end + #endif diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index 1ae8a0230..3c93afb03 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -60,3 +60,164 @@ } @end + +@implementation LinphoneUtils + ++ (void)adjustFontSize:(UIView*)view mult:(float)mult{ + if([view isKindOfClass:[UILabel class]]) { + UILabel *label = (UILabel*)view; + UIFont *font = [label font]; + [label setFont:[UIFont fontWithName:font.fontName size:font.pointSize * mult]]; + } else if([view isKindOfClass:[UITextField class]]) { + UITextField *label = (UITextField*)view; + UIFont *font = [label font]; + [label setFont:[UIFont fontWithName:font.fontName size:font.pointSize * mult]]; + } else { + for(UIView *subView in [view subviews]) { + [LinphoneUtils adjustFontSize:subView mult:mult]; + } + } +} + ++ (void)buttonFixStates:(UIButton*)button { + // Set selected+over title: IB lack ! + [button setTitle:[button titleForState:UIControlStateSelected] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over titleColor: IB lack ! + [button setTitleColor:[button titleColorForState:UIControlStateHighlighted] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+disabled title: IB lack ! + [button setTitle:[button titleForState:UIControlStateSelected] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + + // Set selected+disabled titleColor: IB lack ! + [button setTitleColor:[button titleColorForState:UIControlStateDisabled] + forState:(UIControlStateDisabled | UIControlStateSelected)]; +} + ++ (void)buttonFixStatesForTabs:(UIButton*)button { + // Set selected+over title: IB lack ! + [button setTitle:[button titleForState:UIControlStateSelected] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+over titleColor: IB lack ! + [button setTitleColor:[button titleColorForState:UIControlStateSelected] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + // Set selected+disabled title: IB lack ! + [button setTitle:[button titleForState:UIControlStateSelected] + forState:(UIControlStateDisabled | UIControlStateSelected)]; + + // Set selected+disabled titleColor: IB lack ! + [button setTitleColor:[button titleColorForState:UIControlStateDisabled] + forState:(UIControlStateDisabled | UIControlStateSelected)]; +} + ++ (void)buttonMultiViewAddAttributes:(NSMutableDictionary*)attributes button:(UIButton*)button { + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateNormal] key:@"title-normal"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateHighlighted] key:@"title-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateDisabled] key:@"title-disabled"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateSelected] key:@"title-selected"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"title-disabled-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateSelected | UIControlStateHighlighted] key:@"title-selected-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleForState:UIControlStateSelected | UIControlStateDisabled] key:@"title-selected-disabled"]; + + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateNormal] key:@"title-color-normal"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateHighlighted] key:@"title-color-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateDisabled] key:@"title-color-disabled"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateSelected] key:@"title-color-selected"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"title-color-disabled-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateSelected | UIControlStateHighlighted] key:@"title-color-selected-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button titleColorForState:UIControlStateSelected | UIControlStateDisabled] key:@"title-color-selected-disabled"]; + + [LinphoneUtils addDictEntry:attributes item:NSStringFromUIEdgeInsets([button titleEdgeInsets]) key:@"title-edge"]; + + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateNormal] key:@"image-normal"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateHighlighted] key:@"image-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateDisabled] key:@"image-disabled"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateSelected] key:@"image-selected"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"image-disabled-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateSelected | UIControlStateHighlighted] key:@"image-selected-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button imageForState:UIControlStateSelected | UIControlStateDisabled] key:@"image-selected-disabled"]; + + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateNormal] key:@"background-normal"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateHighlighted] key:@"background-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateDisabled] key:@"background-disabled"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected] key:@"background-selected"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateDisabled | UIControlStateHighlighted] key:@"background-disabled-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected | UIControlStateHighlighted] key:@"background-selected-highlighted"]; + [LinphoneUtils addDictEntry:attributes item:[button backgroundImageForState:UIControlStateSelected | UIControlStateDisabled] key:@"background-selected-disabled"]; +} + ++ (void)buttonMultiViewApplyAttributes:(NSDictionary*)attributes button:(UIButton*)button { + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-normal"] forState:UIControlStateNormal]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-highlighted"] forState:UIControlStateHighlighted]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-disabled"] forState:UIControlStateDisabled]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-selected"] forState:UIControlStateSelected]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; + [button setTitle:[LinphoneUtils getDictEntry:attributes key:@"title-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; + + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-normal"] forState:UIControlStateNormal]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-highlighted"] forState:UIControlStateHighlighted]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-disabled"] forState:UIControlStateDisabled]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-selected"] forState:UIControlStateSelected]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; + [button setTitleColor:[LinphoneUtils getDictEntry:attributes key:@"title-color-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; + + [button setTitleEdgeInsets:UIEdgeInsetsFromString([LinphoneUtils getDictEntry:attributes key:@"title-edge"])]; + + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-normal"] forState:UIControlStateNormal]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-highlighted"] forState:UIControlStateHighlighted]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-disabled"] forState:UIControlStateDisabled]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-selected"] forState:UIControlStateSelected]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; + [button setImage:[LinphoneUtils getDictEntry:attributes key:@"image-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; + + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-normal"] forState:UIControlStateNormal]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-highlighted"] forState:UIControlStateHighlighted]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-disabled"] forState:UIControlStateDisabled]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-selected"] forState:UIControlStateSelected]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-disabled-highlighted"] forState:UIControlStateDisabled | UIControlStateHighlighted]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-selected-highlighted"] forState:UIControlStateSelected | UIControlStateHighlighted]; + [button setBackgroundImage:[LinphoneUtils getDictEntry:attributes key:@"background-selected-disabled"] forState:UIControlStateSelected | UIControlStateDisabled]; +} + + ++ (void)addDictEntry:(NSMutableDictionary*)dict item:(id)item key:(id)key { + if(item != nil && key != nil) { + [dict setObject:item forKey:key]; + } +} + ++ (id)getDictEntry:(NSDictionary*)dict key:(id)key { + if(key != nil) { + return [dict objectForKey:key]; + } + return nil; +} + +@end + +@implementation NSNumber (HumanReadableSize) + +- (NSString*)toHumanReadableSize { + float floatSize = [self floatValue]; + if (floatSize < 1023) + return([NSString stringWithFormat:@"%1.0f bytes",floatSize]); + floatSize = floatSize / 1024; + if (floatSize < 1023) + return([NSString stringWithFormat:@"%1.1f KB",floatSize]); + floatSize = floatSize / 1024; + if (floatSize < 1023) + return([NSString stringWithFormat:@"%1.1f MB",floatSize]); + floatSize = floatSize / 1024; + + return([NSString stringWithFormat:@"%1.1f GB",floatSize]); +} + +@end diff --git a/Classes/en.lproj/ImageViewController.xib b/Classes/en.lproj/ImageViewController.xib index 6db298265..cbe23f899 100644 --- a/Classes/en.lproj/ImageViewController.xib +++ b/Classes/en.lproj/ImageViewController.xib @@ -1,19 +1,20 @@ - 1296 + 1536 11E53 - 2549 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1926 IBProxyObject IBUIButton IBUIImageView + IBUIScrollView IBUIView @@ -36,22 +37,6 @@ 274 - - - 274 - {{0, 44}, {320, 416}} - - - - _NS:9 - - 3 - MCAwAA - - 1 - NO - IBCocoaTouchFramework - 290 @@ -77,7 +62,7 @@ {160, 44} - + _NS:9 NO @@ -88,13 +73,18 @@ 0 NO NO + 18 + 0.0 + 0.0 + 0.0 + Back - 3 - MQA + 2 + MCAwIDAAA - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA 3 @@ -109,12 +99,12 @@ image_back_default.png - 2 - 15 + 1 + 14 - Helvetica-Bold - 15 + Helvetica + 14 16 @@ -124,9 +114,44 @@ _NS:9 - + + 3 + MCAwAA + IBCocoaTouchFramework + + + 274 + + + + 274 + {320, 416} + + + _NS:9 + + 4 + NO + IBCocoaTouchFramework + + + {{0, 44}, {320, 416}} + + + + _NS:9 + + 3 + MAA + + YES + YES + IBCocoaTouchFramework + 0.0 + 10 + {{0, 20}, {320, 460}} @@ -147,6 +172,14 @@ 3 + + + backButton + + + + 8 + imageView @@ -157,11 +190,11 @@ - backButton + scrollView - + - 8 + 13 @@ -185,8 +218,8 @@ 1 - + @@ -201,12 +234,6 @@ - - 4 - - - imageView - 11 @@ -229,6 +256,21 @@ background + + 12 + + + + + + scrollView + + + 4 + + + imageView + @@ -238,16 +280,18 @@ 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 - + + - 11 + 13 @@ -268,6 +312,7 @@ UIButton UIImageView + UIScrollView @@ -278,6 +323,10 @@ imageView UIImageView + + scrollView + UIScrollView + IBProjectSource @@ -288,17 +337,13 @@ 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 {320, 88} {320, 88} - {5, 117} + {5, 88} - 1498 + 1926 diff --git a/Classes/en.lproj/WizardViewController~ipad.xib b/Classes/en.lproj/WizardViewController~ipad.xib new file mode 100644 index 000000000..3644e0e0f --- /dev/null +++ b/Classes/en.lproj/WizardViewController~ipad.xib @@ -0,0 +1,795 @@ + + + + 1536 + 11E53 + 2840 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + + IBProxyObject + IBUIActivityIndicatorView + IBUIButton + IBUIScrollView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + {768, 966} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {768, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {384, 77} + + + _NS:9 + NO + 3 + + Cancel + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + setup_cancel_over~ipad.png + + + NSImage + setup_cancel_disabled~ipad.png + + + NSImage + setup_cancel_default~ipad.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 291 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 4 + + Start + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Start + + + + + NSImage + setup_start_over~ipad.png + + + NSImage + setup_start_default~ipad.png + + + + + + + -2147483357 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 5 + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Back + + + + + NSImage + setup_back_over~ipad.png + + + NSImage + setup_back_disabled~ipad.png + + + NSImage + setup_back_default~ipad.png + + + + + + {{0, 947}, {768, 77}} + + + _NS:9 + + 3 + MCAwAA + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{366, 492}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {768, 1024} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {768, 1024} + + + _NS:9 + + IBCocoaTouchFramework + + + + 292 + + + + 274 + {1024, 711} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {1024, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {512, 77} + + + _NS:9 + NO + 3 + + Cancel + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Cancel + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + + NSImage + setup_cancel_over_landscape~ipad.png + + + NSImage + setup_cancel_disabled_landscape~ipad.png + + + NSImage + setup_cancel_default_landscape~ipad.png + + + + + + + 291 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 4 + + Start + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Start + + + + + NSImage + setup_start_over_landscape~ipad.png + + + NSImage + setup_start_default_landscape~ipad.png + + + + + + + -2147483357 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 5 + + Back + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Back + + + + + NSImage + setup_back_over_landscape~ipad.png + + + NSImage + setup_back_disabled_landscape~ipad.png + + + NSImage + setup_back_default_landscape~ipad.png + + + + + + {{0, 691}, {1024, 77}} + + + _NS:9 + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{494, 364}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {1024, 768} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {1024, 768} + + + _NS:9 + + IBCocoaTouchFramework + + + + + + + view + + + + 20 + + + + startButton + + + + 26 + + + + backButton + + + + 27 + + + + contentView + + + + 99 + + + + portraitView + + + + 117 + + + + waitView + + + + 131 + + + + landscapeView + + + + 134 + + + + onStartClick: + + + 7 + + 25 + + + + onBackClick: + + + 7 + + 23 + + + + onCancelClick: + + + 7 + + 24 + + + + onCancelClick: + + + 7 + + 128 + + + + onStartClick: + + + 7 + + 126 + + + + onBackClick: + + + 7 + + 127 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 12 + + + + + + + + Portrait View + + + 98 + + + contentView + + + 14 + + + + + + + + + tabBar + + + 18 + + + cancelButton + + + 16 + + + startButton + + + 17 + + + backButton + + + 118 + + + + + + + + Landscape View + + + 119 + + + contentView + + + 120 + + + + + + + + + tabBar + + + 122 + + + cancelButton + + + 123 + + + startButton + + + 124 + + + backButton + + + 129 + + + + + + waitView + + + 130 + + + activityIndicatorView + + + 132 + + + + + + waitView + + + 133 + + + activityIndicatorView + + + 137 + + + background + + + 136 + + + background + + + + + WizardViewController + 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 + 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 + + + + + + 137 + + + 0 + IBCocoaTouchFramework + YES + 3 + + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + + 1926 + + diff --git a/Classes/en.lproj/WizardViews.xib b/Classes/en.lproj/WizardViews.xib new file mode 100644 index 000000000..d1584ea80 --- /dev/null +++ b/Classes/en.lproj/WizardViews.xib @@ -0,0 +1,1551 @@ + + + + 1536 + 11E53 + 2840 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1926 + + + IBProxyObject + IBUIButton + IBUIImageView + IBUILabel + IBUITextField + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{60, 80}, {201, 129}} + + + _NS:9 + 1 + NO + + Linphone setup assistant icon + + + IBCocoaTouchFramework + + NSImage + setup_welcome_logo.png + + + + + 319 + {{31, 230}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + 1 + MCAwIDAAA + darkTextColor + + + + 3 + MC4zMzMzMzMzMzMzAA + + {-1, -1} + 0 + 10 + 1 + + 3 + 20 + + + Helvetica-Oblique + 20 + 16 + + + + + 282 + {{40, 290}, {240, 44}} + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + This assistant will help you to use a SIP account for your calls. + + + 0 + 10 + 0 + 1 + + 1 + 12 + + + Helvetica + 12 + 16 + + NO + 240 + + + {320, 394} + + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 319 + {{33, 141}, {255, 50}} + + + _NS:9 + NO + + Create linphone.org account + + + IBCocoaTouchFramework + 0 + 0 + NO + Create an account on linphone.org + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + button_background_over.png + + + NSImage + button_background_default.png + + + 2 + 13 + + + Helvetica-Bold + 13 + 16 + + + + + 319 + {{33, 205}, {255, 50}} + + + _NS:9 + NO + + Sign in linphone.org account + + + IBCocoaTouchFramework + 0 + 0 + NO + I have already a linphone.org account + + + + + + + + + + + 319 + {{33, 269}, {255, 50}} + + _NS:9 + NO + + Sign in SIP account + + + IBCocoaTouchFramework + 0 + 0 + NO + I have already a SIP account + + + + + + + + + + {320, 394} + + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 314 + {{39, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Enter your username and password with your email address. + + + 0 + 10 + 0 + 1 + + + NO + 240 + + + + 319 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Username + + IBCocoaTouchFramework + 0 + + Username + + 3 + MAA + + 2 + + + 10 + + 1 + IBCocoaTouchFramework + + + NSImage + field_background.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 319 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Password + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 230}, {255, 31}} + + + _NS:9 + NO + YES + 102 + + Password again + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 275}, {255, 31}} + + + _NS:9 + NO + YES + 103 + + Email + + IBCocoaTouchFramework + 0 + + Email + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{33, 330}, {255, 50}} + + _NS:9 + NO + + Register + + IBCocoaTouchFramework + 0 + 0 + NO + Register + + + + + + + 2 + 20 + + + Helvetica-Bold + 20 + 16 + + + + {320, 394} + + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 314 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Enter your username and password of your linphone.org account. + + + 0 + 10 + 0 + 1 + + + NO + 240 + + + + 319 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Password + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Username + + IBCocoaTouchFramework + 0 + + Username + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{32, 330}, {255, 50}} + + _NS:9 + NO + + Sign in + + IBCocoaTouchFramework + 0 + 0 + NO + Sign in + + + + + + + + + + {320, 394} + + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 314 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Enter your username and password with your SIP domain. + + + 0 + 10 + 0 + 1 + + + NO + 240 + + + + 319 + {{33, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Username + + IBCocoaTouchFramework + 0 + + Username + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 319 + {{33, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Password + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{33, 230}, {255, 31}} + + + _NS:9 + NO + YES + 104 + + Domain + + IBCocoaTouchFramework + 0 + + Domain + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{34, 330}, {255, 50}} + + _NS:9 + NO + + Sign in + + IBCocoaTouchFramework + 0 + 0 + NO + Sign in + + + + + + + + + + {320, 394} + + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Account setup assistant + + IBCocoaTouchFramework + Account setup assistant + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 314 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Your account is created. Please check your mails in order to validate your account. + + + 0 + 10 + 0 + 1 + + + NO + 240 + + + + -2147483329 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + + + IBCocoaTouchFramework + 0 + + Password + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + -2147483329 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + + + IBCocoaTouchFramework + 0 + + Username + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{32, 330}, {255, 50}} + + _NS:9 + NO + + Check validation + + IBCocoaTouchFramework + 0 + 0 + NO + Check validation + + + + + + + + + + {320, 394} + + + _NS:9 + + IBCocoaTouchFramework + + + + + + + welcomeView + + + + 28 + + + + choiceView + + + + 40 + + + + createAccountView + + + + 70 + + + + connectAccountView + + + + 71 + + + + externalAccountView + + + + 72 + + + + validateAccountView + + + + 112 + + + + onCreateAccountClick: + + + 7 + + 42 + + + + onConnectAccountClick: + + + 7 + + 41 + + + + onExternalAccountClick: + + + 7 + + 43 + + + + delegate + + + + 86 + + + + delegate + + + + 87 + + + + delegate + + + + 88 + + + + onSignInExternalClick: + + + 7 + + 115 + + + + onSignInClick: + + + 7 + + 116 + + + + delegate + + + + 85 + + + + delegate + + + + 81 + + + + delegate + + + + 80 + + + + delegate + + + + 82 + + + + delegate + + + + 83 + + + + onRegisterClick: + + + 7 + + 113 + + + + delegate + + + + 84 + + + + onCheckValidationClick: + + + 7 + + 114 + + + + delegate + + + + 109 + + + + delegate + + + + 110 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 21 + + + + + + + + welcomeView + + + 19 + + + iconImage + + + 22 + + + label + + + 33 + + + + + + + + + choiceView + + + 44 + + + + + + + + + + + + createAccountView + + + 52 + + + + + + + + + + connectAccountView + + + 56 + + + + + + + + + + + externalAccountView + + + 58 + + + label + + + 59 + + + usernameField + + + 60 + + + passwordField + + + 61 + + + domainField + + + 62 + + + signInButton + + + 66 + + + passwordField + + + 67 + + + label + + + 68 + + + usernameField + + + 73 + + + label + + + 74 + + + usernameField + + + 75 + + + passwordField + + + 76 + + + password2Field + + + 77 + + + registerButton + + + 79 + + + emailField + + + 39 + + + externalAccountButton + + + 38 + + + connectAccountButton + + + 36 + + + createAccountButton + + + 101 + + + + + + + + + + validateAccountView + + + 103 + + + checkValidationButton + + + 105 + + + label + + + 104 + + + usernameField + + + 106 + + + passwordField + + + 117 + + + title + + + 122 + + + title + + + 123 + + + title + + + 124 + + + title + + + 126 + + + title + + + 64 + + + signInButton + + + 127 + + + title + + + + + WizardViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + 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 + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 127 + + + 0 + IBCocoaTouchFramework + YES + 3 + + {550, 101} + {550, 101} + {542, 88} + {179, 161} + + 1926 + + diff --git a/Classes/fr.lproj/ImageViewController.xib b/Classes/fr.lproj/ImageViewController.xib index ad5e29808..b3439c30a 100644 --- a/Classes/fr.lproj/ImageViewController.xib +++ b/Classes/fr.lproj/ImageViewController.xib @@ -1,20 +1,21 @@ - 1296 + 1536 11E53 - 1938 + 2840 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 + IBProxyObject IBUIButton IBUIImageView + IBUIScrollView IBUIView - IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -33,23 +34,9 @@ IBCocoaTouchFramework - + 274 - - - 274 - {{0, 44}, {320, 416}} - - _NS:9 - - 3 - MCAwAA - - 1 - NO - IBCocoaTouchFramework - 290 @@ -73,7 +60,7 @@ 292 {160, 44} - + _NS:9 NO @@ -84,13 +71,18 @@ 0 NO NO + 18 + 0.0 + 0.0 + 0.0 + Retour - 3 - MQA + 2 + MCAwIDAAA - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA 3 @@ -105,12 +97,12 @@ image_back_default.png - 2 - 15 + 1 + 14 - Helvetica-Bold - 15 + Helvetica + 14 16 @@ -119,11 +111,45 @@ _NS:9 - + + 3 + MCAwAA + IBCocoaTouchFramework + + + 274 + + + + 274 + {320, 416} + + _NS:9 + + 4 + NO + IBCocoaTouchFramework + + + {{0, 44}, {320, 416}} + + + _NS:9 + + 3 + MAA + + YES + YES + IBCocoaTouchFramework + 0.0 + 10 + {{0, 20}, {320, 460}} + @@ -140,6 +166,14 @@ 3 + + + backButton + + + + 8 + imageView @@ -150,11 +184,11 @@ - backButton + scrollView - + - 8 + 13 @@ -178,8 +212,8 @@ 1 - + @@ -194,12 +228,6 @@ - - 4 - - - imageView - 11 @@ -222,6 +250,21 @@ background + + 12 + + + + + + scrollView + + + 4 + + + imageView + @@ -231,67 +274,29 @@ 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 - + + - 11 - - - - - ImageViewController - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - UIButton - UIImageView - - - - backButton - UIButton - - - imageView - UIImageView - - - - IBProjectSource - ./Classes/ImageViewController.h - - - + 13 + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - YES 3 {320, 88} {320, 88} - {5, 117} + {5, 88} - 933 + 1926 diff --git a/Classes/fr.lproj/WizardViewController~ipad.xib b/Classes/fr.lproj/WizardViewController~ipad.xib new file mode 100644 index 000000000..0a1f3c058 --- /dev/null +++ b/Classes/fr.lproj/WizardViewController~ipad.xib @@ -0,0 +1,793 @@ + + + + 1280 + 11E53 + 1938 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 933 + + + IBUIButton + IBUIActivityIndicatorView + IBUIView + IBUIScrollView + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + {768, 966} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {768, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {384, 77} + + + _NS:9 + NO + 3 + + Annuler + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Annuler + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + setup_cancel_over~ipad.png + + + NSImage + setup_cancel_disabled~ipad.png + + + NSImage + setup_cancel_default~ipad.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 291 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 4 + + Démarrer + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Démarrer + + + + + NSImage + setup_start_over~ipad.png + + + NSImage + setup_start_default~ipad.png + + + + + + + -2147483357 + {{384, 0}, {384, 77}} + + + _NS:9 + NO + 5 + + Retour + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 54 + 0.0 + Retour + + + + + NSImage + setup_back_over~ipad.png + + + NSImage + setup_back_disabled~ipad.png + + + NSImage + setup_back_default~ipad.png + + + + + + {{0, 947}, {768, 77}} + + + _NS:9 + + 3 + MCAwAA + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{366, 492}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {768, 1024} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {768, 1024} + + _NS:9 + + IBCocoaTouchFramework + + + + 292 + + + + 274 + {1024, 711} + + + _NS:9 + YES + YES + 1 + IBCocoaTouchFramework + NO + NO + + + + 266 + + + + 290 + {{0, 77}, {1024, 2000}} + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + + + + 294 + {512, 77} + + + _NS:9 + NO + 3 + + Annuler + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 0.0 + 0.0 + Annuler + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + + NSImage + setup_cancel_over_landscape~ipad.png + + + NSImage + setup_cancel_disabled_landscape~ipad.png + + + NSImage + setup_cancel_default_landscape~ipad.png + + + + + + + 291 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 4 + + Démarrer + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Démarrer + + + + + NSImage + setup_start_over_landscape~ipad.png + + + NSImage + setup_start_default_landscape~ipad.png + + + + + + + -2147483357 + {{512, 0}, {512, 77}} + + + _NS:9 + NO + 5 + + Retour + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 18 + 0.0 + 16 + 0.0 + Retour + + + + + NSImage + setup_back_over_landscape~ipad.png + + + NSImage + setup_back_disabled_landscape~ipad.png + + + NSImage + setup_back_default_landscape~ipad.png + + + + + + {{0, 691}, {1024, 77}} + + + _NS:9 + + 2 + IBCocoaTouchFramework + + + + -2147483374 + + + + 301 + {{494, 364}, {37, 37}} + + + _NS:9 + NO + 7 + IBCocoaTouchFramework + NO + YES + 0 + + + {1024, 768} + + + _NS:9 + + 3 + MSAwLjUAA + + 6 + IBCocoaTouchFramework + + + {1024, 768} + + _NS:9 + + IBCocoaTouchFramework + + + + + + + view + + + + 20 + + + + startButton + + + + 26 + + + + backButton + + + + 27 + + + + contentView + + + + 99 + + + + portraitView + + + + 117 + + + + waitView + + + + 131 + + + + landscapeView + + + + 134 + + + + onStartClick: + + + 7 + + 25 + + + + onBackClick: + + + 7 + + 23 + + + + onCancelClick: + + + 7 + + 24 + + + + onCancelClick: + + + 7 + + 128 + + + + onStartClick: + + + 7 + + 126 + + + + onBackClick: + + + 7 + + 127 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 12 + + + + + + + + Portrait View + + + 98 + + + contentView + + + 14 + + + + + + + + + tabBar + + + 18 + + + cancelButton + + + 16 + + + startButton + + + 17 + + + backButton + + + 118 + + + + + + + + Landscape View + + + 119 + + + contentView + + + 120 + + + + + + + + + tabBar + + + 122 + + + cancelButton + + + 123 + + + startButton + + + 124 + + + backButton + + + 129 + + + + + + waitView + + + 130 + + + activityIndicatorView + + + 132 + + + + + + waitView + + + 133 + + + activityIndicatorView + + + 137 + + + background + + + 136 + + + background + + + + + WizardViewController + 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 + 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 + + + + + + 137 + + + 0 + IBCocoaTouchFramework + YES + 3 + + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + {1024, 171} + {768, 153} + + 933 + + diff --git a/Classes/fr.lproj/WizardViews.xib b/Classes/fr.lproj/WizardViews.xib new file mode 100644 index 000000000..073e3646f --- /dev/null +++ b/Classes/fr.lproj/WizardViews.xib @@ -0,0 +1,1539 @@ + + + + 1280 + 11E53 + 1938 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 933 + + + IBUITextField + IBUIButton + IBUIImageView + IBUIView + IBUILabel + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{60, 80}, {201, 129}} + + + _NS:9 + 1 + NO + + Icône de l'assistant de configuration de compte + + + IBCocoaTouchFramework + + NSImage + setup_welcome_logo.png + + + + + 319 + {{31, 230}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + 1 + MCAwIDAAA + + + + 3 + MC4zMzMzMzMzMzMzAA + + {-1, -1} + 0 + 10 + 1 + + 3 + 20 + + + Helvetica-Oblique + 20 + 16 + + + + + 282 + {{40, 290}, {240, 44}} + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Cet assistant va vous aider à utiliser votre compte SIP pour vos appels. + + + 0 + NO + 10 + 0 + 1 + + 1 + 12 + + + Helvetica + 12 + 16 + + + + {320, 394} + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 319 + {{33, 141}, {255, 50}} + + + _NS:9 + NO + + Créer un compte linphone.org + + + IBCocoaTouchFramework + 0 + 0 + NO + Créer un compte sur linphone.org + + 2 + MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA + + + 2 + MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA + + + 3 + MC41AA + + + NSImage + button_background_over.png + + + NSImage + button_background_default.png + + + 2 + 13 + + + Helvetica-Bold + 13 + 16 + + + + + 319 + {{33, 205}, {255, 50}} + + + _NS:9 + NO + + S'enregistrer sur un compte linphone.org + + + IBCocoaTouchFramework + 0 + 0 + NO + J'ai déjà un compte linphone.org + + + + + + + + + + + 319 + {{33, 269}, {255, 50}} + + _NS:9 + NO + + S'enregistrer sur un compte SIP + + + IBCocoaTouchFramework + 0 + 0 + NO + J'ai déjà un compte SIP + + + + + + + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 314 + {{39, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Entrez votre nom d'utilsateur, votre mot de passe ainsi que votre adresse email. + + + 0 + NO + 10 + 0 + 1 + + + + + + 319 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Nom d'utilisateur + + IBCocoaTouchFramework + 0 + + Nom d'utilisateur + + 3 + MAA + + 2 + + + 10 + + 1 + IBCocoaTouchFramework + + + NSImage + field_background.png + + + 1 + 14 + + + Helvetica + 14 + 16 + + + + + 319 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Mot de passe + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 230}, {255, 31}} + + + _NS:9 + NO + YES + 102 + + Mot de passe à nouveau + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 275}, {255, 31}} + + + _NS:9 + NO + YES + 103 + + Email + + IBCocoaTouchFramework + 0 + + Email + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{33, 330}, {255, 50}} + + _NS:9 + NO + + S'enregistrer + + IBCocoaTouchFramework + 0 + 0 + NO + S'enregistrer + + + + + + + 2 + 20 + + + Helvetica-Bold + 20 + 16 + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 314 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Entrez votre nom d'utilisateur et votre mot de passe de votre compte linphone.org. + + + 0 + NO + 10 + 0 + 1 + + + + + + 319 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Mot de passe + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Nom d'utilisateur + + IBCocoaTouchFramework + 0 + + Nom d'utilisateur + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{32, 330}, {255, 50}} + + _NS:9 + NO + + S'enregistrer + + IBCocoaTouchFramework + 0 + 0 + NO + S'enregistrer + + + + + + + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 314 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Entrez votre nom d'utilisateur, votre mot de passe ainsi que votre domaine SIP. + + + 0 + NO + 10 + 0 + 1 + + + + + + 319 + {{33, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + Nom d'utilisateur + + IBCocoaTouchFramework + 0 + + Nom d'utilisateur + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 319 + {{33, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + Mot de passe + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + 319 + {{33, 230}, {255, 31}} + + + _NS:9 + NO + YES + 104 + + Domaine + + IBCocoaTouchFramework + 0 + + Domaine + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{34, 330}, {255, 50}} + + _NS:9 + NO + + S'enregistrer + + IBCocoaTouchFramework + 0 + 0 + NO + S'enregistrer + + + + + + + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + 274 + + + + 311 + {{31, 34}, {258, 40}} + + + _NS:9 + NO + YES + 7 + NO + + Assistant de configuration de compte + + IBCocoaTouchFramework + Assistant de configuration de compte + + + + {-1, -1} + 0 + 10 + 1 + + + + + + 314 + {{40, 80}, {240, 44}} + + + _NS:9 + NO + YES + 7 + 200 + NO + IBCocoaTouchFramework + Votre compte est crée. Vérifier vos emails pour valider votre compte. + + + 0 + NO + 10 + 0 + 1 + + + + + + -2147483329 + {{32, 185}, {255, 31}} + + + _NS:9 + NO + YES + 101 + + + + IBCocoaTouchFramework + 0 + + Mot de passe + + 3 + MAA + + + 10 + + 1 + YES + IBCocoaTouchFramework + + + + + + + + -2147483329 + {{32, 140}, {255, 31}} + + + _NS:9 + NO + YES + 100 + + + + IBCocoaTouchFramework + 0 + + Nom d'utilisateur + + 3 + MAA + + + 10 + + 1 + IBCocoaTouchFramework + + + + + + + + 287 + {{32, 330}, {255, 50}} + + _NS:9 + NO + + Vérifier la validation + + IBCocoaTouchFramework + 0 + 0 + NO + Vérifier la validation + + + + + + + + + + {320, 394} + + _NS:9 + + IBCocoaTouchFramework + + + + + + + welcomeView + + + + 28 + + + + choiceView + + + + 40 + + + + createAccountView + + + + 70 + + + + connectAccountView + + + + 71 + + + + externalAccountView + + + + 72 + + + + validateAccountView + + + + 112 + + + + onCreateAccountClick: + + + 7 + + 42 + + + + onConnectAccountClick: + + + 7 + + 41 + + + + onExternalAccountClick: + + + 7 + + 43 + + + + delegate + + + + 86 + + + + delegate + + + + 87 + + + + delegate + + + + 88 + + + + onSignInExternalClick: + + + 7 + + 115 + + + + onSignInClick: + + + 7 + + 116 + + + + delegate + + + + 85 + + + + delegate + + + + 81 + + + + delegate + + + + 80 + + + + delegate + + + + 82 + + + + delegate + + + + 83 + + + + onRegisterClick: + + + 7 + + 113 + + + + delegate + + + + 84 + + + + onCheckValidationClick: + + + 7 + + 114 + + + + delegate + + + + 109 + + + + delegate + + + + 110 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 21 + + + + + + + + welcomeView + + + 19 + + + iconImage + + + 22 + + + label + + + 33 + + + + + + + + + choiceView + + + 44 + + + + + + + + + + + + createAccountView + + + 52 + + + + + + + + + + connectAccountView + + + 56 + + + + + + + + + + + externalAccountView + + + 58 + + + label + + + 59 + + + usernameField + + + 60 + + + passwordField + + + 61 + + + domainField + + + 62 + + + signInButton + + + 66 + + + passwordField + + + 67 + + + label + + + 68 + + + usernameField + + + 73 + + + label + + + 74 + + + usernameField + + + 75 + + + passwordField + + + 76 + + + password2Field + + + 77 + + + registerButton + + + 79 + + + emailField + + + 39 + + + externalAccountButton + + + 38 + + + connectAccountButton + + + 36 + + + createAccountButton + + + 101 + + + + + + + + + + validateAccountView + + + 103 + + + checkValidationButton + + + 105 + + + label + + + 104 + + + usernameField + + + 106 + + + passwordField + + + 117 + + + title + + + 122 + + + title + + + 123 + + + title + + + 124 + + + title + + + 126 + + + title + + + 64 + + + signInButton + + + 127 + + + title + + + + + WizardViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + 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 + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UILinphoneButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UILinphoneTextField + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 127 + + + 0 + IBCocoaTouchFramework + YES + 3 + + {550, 101} + {550, 101} + {542, 88} + {179, 161} + + 933 + + diff --git a/README b/README index 7b824cf55..d5b8c1617 100644 --- a/README +++ b/README @@ -8,9 +8,9 @@ BUILD PREQUISITES Linphone for iPhone depends on liblinphone sdk. This SDK is generated from makefiles and shell scripts. You must first install both xcode with iPhone OS SDK and MacPorts (www.macports.org) for these scripts to work. -Once xccode and macports are installed, open a terminal and install the required build-time tools with: +Once xcode and macports are installed, open a terminal and install the required build-time tools with: - $ sudo port install nawk coreutils automake autoconf libtool intltool wget pkgconfig cmake yasm doxygen + $ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen ImageMagick optipng Install gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin : @@ -30,8 +30,6 @@ Link host's strings to simulator SDK For newer XCode: $ sudo ln -s /usr/bin/strings /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings -ImageMagick & Optipng - sudo port install ImageMagick optipng BUILDING THE SDK **************** @@ -52,8 +50,8 @@ BUILDING THE SDK $ cd submodules/build $ make all enable_gpl_third_parties=no -xcode 4.5i/ios6 beta do: - $ make -f Makefile.ios6-beta +xcode prior to 4.5: + $ make -f Makefile.xcode4.4 * ZRTP support You can enable ZRTP support in GPL mode only, by adding "enable_zrtp=yes" to the make command, for example: diff --git a/Resources/bubble.png b/Resources/bubble.png new file mode 100644 index 000000000..6644f4f98 Binary files /dev/null and b/Resources/bubble.png differ diff --git a/Resources/button_background_default.9.png b/Resources/button_background_default.9.png new file mode 100644 index 000000000..ff37a4200 Binary files /dev/null and b/Resources/button_background_default.9.png differ diff --git a/Resources/button_background_default.9@2x.png b/Resources/button_background_default.9@2x.png new file mode 100644 index 000000000..c19f88e0b Binary files /dev/null and b/Resources/button_background_default.9@2x.png differ diff --git a/Resources/button_background_over.9.png b/Resources/button_background_over.9.png new file mode 100644 index 000000000..943d82484 Binary files /dev/null and b/Resources/button_background_over.9.png differ diff --git a/Resources/button_background_over.9@2x.png b/Resources/button_background_over.9@2x.png new file mode 100644 index 000000000..c88681acf Binary files /dev/null and b/Resources/button_background_over.9@2x.png differ diff --git a/Resources/chat_background.9.png b/Resources/chat_background.9.png deleted file mode 100644 index 9119454eb..000000000 Binary files a/Resources/chat_background.9.png and /dev/null differ diff --git a/Resources/chat_background.9@2x.png b/Resources/chat_background.9@2x.png deleted file mode 100644 index 2094325bf..000000000 Binary files a/Resources/chat_background.9@2x.png and /dev/null differ diff --git a/Resources/chat_cancel_default.png b/Resources/chat_cancel_default.png new file mode 100644 index 000000000..b5e87a2e1 Binary files /dev/null and b/Resources/chat_cancel_default.png differ diff --git a/Resources/chat_cancel_over.png b/Resources/chat_cancel_over.png new file mode 100644 index 000000000..5d2abd3f8 Binary files /dev/null and b/Resources/chat_cancel_over.png differ diff --git a/Resources/chat_message_background.9.png b/Resources/chat_message_background.9.png new file mode 100644 index 000000000..90fefbc6d Binary files /dev/null and b/Resources/chat_message_background.9.png differ diff --git a/Resources/chat_message_background.9@2x.png b/Resources/chat_message_background.9@2x.png new file mode 100644 index 000000000..5fa3959b7 Binary files /dev/null and b/Resources/chat_message_background.9@2x.png differ diff --git a/Resources/chat_background.png b/Resources/chat_message_background.png similarity index 100% rename from Resources/chat_background.png rename to Resources/chat_message_background.png diff --git a/Resources/chat_photo_default.png b/Resources/chat_photo_default.png new file mode 100644 index 000000000..98b1a452b Binary files /dev/null and b/Resources/chat_photo_default.png differ diff --git a/Resources/chat_photo_disabled.png b/Resources/chat_photo_disabled.png new file mode 100644 index 000000000..950f52623 Binary files /dev/null and b/Resources/chat_photo_disabled.png differ diff --git a/Resources/chat_photo_over.png b/Resources/chat_photo_over.png new file mode 100644 index 000000000..c8b9783f7 Binary files /dev/null and b/Resources/chat_photo_over.png differ diff --git a/Resources/chat_progressbar_background.png b/Resources/chat_progressbar_background.png new file mode 100644 index 000000000..abd966e86 Binary files /dev/null and b/Resources/chat_progressbar_background.png differ diff --git a/Resources/dialer_alt_disabled.png b/Resources/dialer_alt_disabled.png new file mode 100644 index 000000000..d85d7fa76 Binary files /dev/null and b/Resources/dialer_alt_disabled.png differ diff --git a/Resources/dialer_alt_disabled_landscape.png b/Resources/dialer_alt_disabled_landscape.png new file mode 100644 index 000000000..00a72ac47 Binary files /dev/null and b/Resources/dialer_alt_disabled_landscape.png differ diff --git a/Resources/dialer_alt_disabled_landscape~ipad.png b/Resources/dialer_alt_disabled_landscape~ipad.png new file mode 100644 index 000000000..24441f3fe Binary files /dev/null and b/Resources/dialer_alt_disabled_landscape~ipad.png differ diff --git a/Resources/dialer_alt_disabled~ipad.png b/Resources/dialer_alt_disabled~ipad.png new file mode 100644 index 000000000..dc5c084d2 Binary files /dev/null and b/Resources/dialer_alt_disabled~ipad.png differ diff --git a/Resources/field_background.9.png b/Resources/field_background.9.png new file mode 100644 index 000000000..c8b34cdbf Binary files /dev/null and b/Resources/field_background.9.png differ diff --git a/Resources/field_background.9@2x.png b/Resources/field_background.9@2x.png new file mode 100644 index 000000000..f24e08706 Binary files /dev/null and b/Resources/field_background.9@2x.png differ diff --git a/Resources/form_invalid.png b/Resources/form_invalid.png new file mode 100644 index 000000000..c174df390 Binary files /dev/null and b/Resources/form_invalid.png differ diff --git a/Resources/form_valid.png b/Resources/form_valid.png new file mode 100644 index 000000000..f8edc012d Binary files /dev/null and b/Resources/form_valid.png differ diff --git a/Resources/history_delete_default.png b/Resources/history_delete_default.png new file mode 100644 index 000000000..dce0ad0b3 Binary files /dev/null and b/Resources/history_delete_default.png differ diff --git a/Resources/history_delete_over.png b/Resources/history_delete_over.png new file mode 100644 index 000000000..b8d99e352 Binary files /dev/null and b/Resources/history_delete_over.png differ diff --git a/Resources/image_back_default.png b/Resources/image_back_default.png index 60412bd95..18ec0869e 100644 Binary files a/Resources/image_back_default.png and b/Resources/image_back_default.png differ diff --git a/Resources/image_back_over.png b/Resources/image_back_over.png index bbc3f4ee3..8f4563934 100644 Binary files a/Resources/image_back_over.png and b/Resources/image_back_over.png differ diff --git a/Resources/linphone_logo.png b/Resources/linphone_logo.png new file mode 100644 index 000000000..f3695de8b Binary files /dev/null and b/Resources/linphone_logo.png 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/Resources/linphone_splashscreen.png b/Resources/linphone_splashscreen.png new file mode 100644 index 000000000..1ec650be8 Binary files /dev/null and b/Resources/linphone_splashscreen.png differ diff --git a/Resources/linphone_splashscreen@2x.png b/Resources/linphone_splashscreen@2x.png new file mode 100644 index 000000000..ce8263422 Binary files /dev/null and b/Resources/linphone_splashscreen@2x.png differ diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index 5eb3ac8fa..b2a5fde68 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -33,17 +33,3 @@ dtmf_player_amp=0.007 [misc] history_max_size=30 max_calls=1 - -[wizard] -service_url=https://www.linphone.org/wizard.php -domain=sip.linphone.org -proxy=sip.linphone.org:5223 -password_length=6 -username_length=4 -expires=600 -push_notification=1 -transport=tls -sharing_server=https://www.linphone.org:444/upload.php -ice=1 -stun=stun.linphone.org - diff --git a/Resources/logo_linphone_trame_background.png b/Resources/logo_linphone_trame_background.png new file mode 100644 index 000000000..749d70f30 Binary files /dev/null and b/Resources/logo_linphone_trame_background.png differ diff --git a/Resources/setup_back_default_landscape~ipad.png b/Resources/setup_back_default_landscape~ipad.png new file mode 100644 index 000000000..24df95c3b Binary files /dev/null and b/Resources/setup_back_default_landscape~ipad.png differ diff --git a/Resources/setup_back_default~ipad.png b/Resources/setup_back_default~ipad.png new file mode 100644 index 000000000..8da3a3da0 Binary files /dev/null and b/Resources/setup_back_default~ipad.png differ diff --git a/Resources/setup_back_disabled_landscape~ipad.png b/Resources/setup_back_disabled_landscape~ipad.png new file mode 100644 index 000000000..a3bf99b0a Binary files /dev/null and b/Resources/setup_back_disabled_landscape~ipad.png differ diff --git a/Resources/setup_back_disabled~ipad.png b/Resources/setup_back_disabled~ipad.png new file mode 100644 index 000000000..9bd7d70f1 Binary files /dev/null and b/Resources/setup_back_disabled~ipad.png differ diff --git a/Resources/setup_back_over_landscape~ipad.png b/Resources/setup_back_over_landscape~ipad.png new file mode 100644 index 000000000..b4b2cc8b7 Binary files /dev/null and b/Resources/setup_back_over_landscape~ipad.png differ diff --git a/Resources/setup_back_over~ipad.png b/Resources/setup_back_over~ipad.png new file mode 100644 index 000000000..6e0a20d98 Binary files /dev/null and b/Resources/setup_back_over~ipad.png differ diff --git a/Resources/setup_cancel_default_landscape~ipad.png b/Resources/setup_cancel_default_landscape~ipad.png new file mode 100644 index 000000000..a0557c5e9 Binary files /dev/null and b/Resources/setup_cancel_default_landscape~ipad.png differ diff --git a/Resources/setup_cancel_default~ipad.png b/Resources/setup_cancel_default~ipad.png new file mode 100644 index 000000000..766ba949a Binary files /dev/null and b/Resources/setup_cancel_default~ipad.png differ diff --git a/Resources/setup_cancel_disabled_landscape~ipad.png b/Resources/setup_cancel_disabled_landscape~ipad.png new file mode 100644 index 000000000..e72f7b4d5 Binary files /dev/null and b/Resources/setup_cancel_disabled_landscape~ipad.png differ diff --git a/Resources/setup_cancel_disabled~ipad.png b/Resources/setup_cancel_disabled~ipad.png new file mode 100644 index 000000000..6e6a394a3 Binary files /dev/null and b/Resources/setup_cancel_disabled~ipad.png differ diff --git a/Resources/setup_cancel_over_landscape~ipad.png b/Resources/setup_cancel_over_landscape~ipad.png new file mode 100644 index 000000000..edf9a2624 Binary files /dev/null and b/Resources/setup_cancel_over_landscape~ipad.png differ diff --git a/Resources/setup_cancel_over~ipad.png b/Resources/setup_cancel_over~ipad.png new file mode 100644 index 000000000..a8be0feb8 Binary files /dev/null and b/Resources/setup_cancel_over~ipad.png differ diff --git a/Resources/setup_start_default_landscape~ipad.png b/Resources/setup_start_default_landscape~ipad.png new file mode 100644 index 000000000..8d1af16b9 Binary files /dev/null and b/Resources/setup_start_default_landscape~ipad.png differ diff --git a/Resources/setup_start_default~ipad.png b/Resources/setup_start_default~ipad.png new file mode 100644 index 000000000..753f7ddbd Binary files /dev/null and b/Resources/setup_start_default~ipad.png differ diff --git a/Resources/setup_start_disabled_landscape~ipad.png b/Resources/setup_start_disabled_landscape~ipad.png new file mode 100644 index 000000000..20b0b5b73 Binary files /dev/null and b/Resources/setup_start_disabled_landscape~ipad.png differ diff --git a/Resources/setup_start_disabled~ipad.png b/Resources/setup_start_disabled~ipad.png new file mode 100644 index 000000000..da787553b Binary files /dev/null and b/Resources/setup_start_disabled~ipad.png differ diff --git a/Resources/setup_start_over_landscape~ipad.png b/Resources/setup_start_over_landscape~ipad.png new file mode 100644 index 000000000..fc030704e Binary files /dev/null and b/Resources/setup_start_over_landscape~ipad.png differ diff --git a/Resources/setup_start_over~ipad.png b/Resources/setup_start_over~ipad.png new file mode 100644 index 000000000..ab7cb0e06 Binary files /dev/null and b/Resources/setup_start_over~ipad.png differ diff --git a/Resources/setup_welcome_logo~ipad.png b/Resources/setup_welcome_logo~ipad.png new file mode 100644 index 000000000..1d7ab1d73 Binary files /dev/null and b/Resources/setup_welcome_logo~ipad.png differ diff --git a/linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib b/linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib deleted file mode 100644 index 6db298265..000000000 --- a/linphone.ldb/Resources/Classes/ImageViewController/6/ImageViewController.xib +++ /dev/null @@ -1,304 +0,0 @@ - - - - 1296 - 11E53 - 2549 - 1138.47 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 - - - IBProxyObject - IBUIButton - IBUIImageView - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 274 - {{0, 44}, {320, 416}} - - - - _NS:9 - - 3 - MCAwAA - - 1 - NO - IBCocoaTouchFramework - - - - 290 - - - - 290 - {320, 44} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - toolsbar_background.png - - - - - 292 - {160, 44} - - - - _NS:9 - NO - - Back - - IBCocoaTouchFramework - 0 - 0 - NO - NO - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - NSImage - image_back_over.png - - - NSImage - image_back_default.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - {320, 44} - - - - _NS:9 - - IBCocoaTouchFramework - - - {{0, 20}, {320, 460}} - - - - - - IBCocoaTouchFramework - - - - - - - view - - - - 3 - - - - imageView - - - - 9 - - - - backButton - - - - 8 - - - - onBackClick: - - - 7 - - 10 - - - - - - 0 - - - - - - 1 - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - imageView - - - 11 - - - - - - - toolbar - - - 7 - - - backButton - - - 6 - - - background - - - - - ImageViewController - 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 - - - - - - - 11 - - - - - ImageViewController - UIViewController - - onBackClick: - id - - - onBackClick: - - onBackClick: - id - - - - UIButton - UIImageView - - - - backButton - UIButton - - - imageView - UIImageView - - - - IBProjectSource - ./Classes/ImageViewController.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - YES - 3 - - {320, 88} - {320, 88} - {5, 117} - - 1498 - - diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings b/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings deleted file mode 100644 index 299b28fbd..000000000 --- a/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings +++ /dev/null @@ -1,51 +0,0 @@ -/* Wifi only */ -"Wifi only" = "Wifi only"; - -/* Stun Server */ -"Stun Server" = "Stun Server"; - -/* ICE */ -"ICE" = "ICE"; - -/* Random Port */ -"Random Port" = "Random Port"; - -/* Port */ -"Port" = "Port"; - -/* Audio Port */ -"Audio Port" = "Audio Port"; - -/* Video Port */ -"Video Port" = "Video Port"; - -/* Transport */ -"Transport" = "Transport"; - -/* Media Encryption */ -"Media Encryption" = "Media Encryption"; - -/* Push Notifications */ -"Push Notification" = "Push Notification"; - -/* Transport */ -"Transport" = "Transport"; - -/* UDP */ -"UDP" = "UDP"; - -/* TCP */ -"TCP" = "TCP"; - -/* TLS */ -"TLS" = "TLS"; - -/* None */ -"None" = "None"; - -/* SRTP */ -"SRTP" = "SRTP"; - -/* ZRTP */ -"ZRTP" = "ZRTP"; - diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 349c26aa8..8a358aafd 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1520,7 +1520,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0450; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "linphone" */; compatibilityVersion = "Xcode 3.2"; @@ -1847,7 +1847,6 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "buschjaeger-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -1916,7 +1915,6 @@ submodules/externals/speex/include, ); INFOPLIST_FILE = "buschjaeger-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 276688bb4..bb1fd7a6c 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -54,28 +54,28 @@ endif LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ + make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build make -f builder-iphone-simulator.mk ipa \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin ipa + && make -f builder-iphone-os.mk ipa \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \ clean: make -f builder-iphone-simulator.mk clean \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin clean \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin clean + && make -f builder-iphone-os.mk clean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \ clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin clean-makefile \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile + && make -f builder-iphone-os.mk clean-makefile \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \ veryclean: make -f builder-iphone-simulator.mk veryclean \ - && make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean + && make -f builder-iphone-os.mk veryclean \ + && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ diff --git a/submodules/build/Makefile.ios6-beta b/submodules/build/Makefile.xcode4.4 similarity index 76% rename from submodules/build/Makefile.ios6-beta rename to submodules/build/Makefile.xcode4.4 index bb1fd7a6c..276688bb4 100644 --- a/submodules/build/Makefile.ios6-beta +++ b/submodules/build/Makefile.xcode4.4 @@ -54,28 +54,28 @@ endif LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \ + make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build make -f builder-iphone-simulator.mk ipa \ - && make -f builder-iphone-os.mk ipa \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin ipa clean: make -f builder-iphone-simulator.mk clean \ - && make -f builder-iphone-os.mk clean \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin clean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin clean clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ - && make -f builder-iphone-os.mk clean-makefile \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin clean-makefile \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile veryclean: make -f builder-iphone-simulator.mk veryclean \ - && make -f builder-iphone-os.mk veryclean \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ + && make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index a88de3aaa..891a2d820 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -115,7 +115,7 @@ veryclean: veryclean-linphone veryclean-msbcg729 clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 +veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 8b65258a9..8cf0564ec 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -34,6 +34,9 @@ clean-libvpx: veryclean-libvpx: -cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean + cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \ + && git checkout build/make/configure.sh configure\ + && rm -f patched.stamp rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir) clean-makefile-libvpx: diff --git a/submodules/externals/exosip b/submodules/externals/exosip index 972e9d009..3403f378b 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit 972e9d009e1fe9dc3e2e1d672e39c98de0affa37 +Subproject commit 3403f378bab82b67d569b029f466a2f1dee499bb diff --git a/submodules/linphone b/submodules/linphone index 296b5671a..d2bf8846e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 296b5671ae42dbfbb28e1c30e8c79ecdbe60ebc5 +Subproject commit d2bf8846e3c40ce5b4dec886f2d0fc6d9698fc87