Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui

Conflicts:
	Classes/AboutViewController.h
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.m
	Classes/ConsoleViewController.m
	Classes/ConsoleViewController.xib
	Classes/ContactDetailsLabelViewController.m
	Classes/ContactDetailsTableViewController.m
	Classes/ContactDetailsViewController.m
	Classes/ContactsViewController.m
	Classes/DialerViewController.m
	Classes/HistoryViewController.m
	Classes/ImagePickerViewController.h
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallTableViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICallCell.h
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.h
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UIHistoryCell.xib
	Classes/LinphoneUI/UIMainBar.m
	Classes/LinphoneUI/UIStateBar.xib
	Classes/LinphoneUI/en.lproj/UICallBar.xib
	Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/en.lproj/UICallCell.xib
	Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
	Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/en.lproj/UIMainBar.xib
	Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib
	Classes/LinphoneUI/fr.lproj/UICallBar.xib
	Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/fr.lproj/UICallCell.xib
	Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/fr.lproj/UIMainBar.xib
	Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/PhoneMainView.xib
	Classes/SettingsViewController.m
	Classes/SettingsViewController.xib
	Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj
	Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/ChatRoomViewController.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/ContactDetailsLabelViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/ContactsViewController.xib
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/DialerViewController~ipad.xib
	Classes/en.lproj/FirstLoginViewController.xib
	Classes/en.lproj/HistoryDetailsViewController.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Classes/en.lproj/IncomingCallViewController.xib
	Classes/en.lproj/WizardViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/ContactDetailsLabelViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/ContactsViewController.xib
	Classes/fr.lproj/DialerViewController.xib
	Classes/fr.lproj/DialerViewController~ipad.xib
	Classes/fr.lproj/FirstLoginViewController.xib
	Classes/fr.lproj/HistoryDetailsViewController.xib
	Classes/fr.lproj/HistoryViewController.xib
	Classes/fr.lproj/InCallViewController.xib
	Classes/fr.lproj/IncomingCallViewController.xib
	Classes/fr.lproj/WizardViewController.xib
	README
	Resources/accept_default.png
	Resources/accept_over.png
	Resources/cancel_default.png
	Resources/cancel_over.png
	Resources/chat_add_default.png
	Resources/chat_add_over.png
	Resources/chat_back_default.png
	Resources/chat_back_over.png
	Resources/chat_default.png
	Resources/chat_default_landscape~ipad.png
	Resources/chat_default~ipad.png
	Resources/chat_edit_default.png
	Resources/chat_edit_over.png
	Resources/chat_message_delivered.png
	Resources/chat_message_inprogress.png
	Resources/chat_message_not_delivered.png
	Resources/chat_ok_default.png
	Resources/chat_ok_over.png
	Resources/chat_over.png
	Resources/chat_over_landscape~ipad.png
	Resources/chat_over~ipad.png
	Resources/chat_selected.png
	Resources/chat_selected_landscape~ipad.png
	Resources/chat_selected~ipad.png
	Resources/chat_send_default.png
	Resources/chat_send_disabled.png
	Resources/chat_send_over.png
	Resources/contact_back_default.png
	Resources/contact_back_over.png
	Resources/contact_cancel_default.png
	Resources/contact_cancel_over.png
	Resources/contact_edit_default.png
	Resources/contact_edit_over.png
	Resources/contact_ok_default.png
	Resources/contact_ok_disabled.png
	Resources/contact_ok_over.png
	Resources/contacts_add_default.png
	Resources/contacts_add_over.png
	Resources/contacts_all_default.png
	Resources/contacts_all_selected.png
	Resources/contacts_back_default.png
	Resources/contacts_back_over.png
	Resources/contacts_default.png
	Resources/contacts_default_landscape~ipad.png
	Resources/contacts_default~ipad.png
	Resources/contacts_linphone_default.png
	Resources/contacts_linphone_selected.png
	Resources/contacts_over.png
	Resources/contacts_over_landscape~ipad.png
	Resources/contacts_over~ipad.png
	Resources/contacts_selected.png
	Resources/contacts_selected_landscape~ipad.png
	Resources/contacts_selected~ipad.png
	Resources/decline_default.png
	Resources/decline_over.png
	Resources/dialer_address_background_landscape~ipad.png
	Resources/dialer_address_background~ipad.png
	Resources/dialer_default.png
	Resources/dialer_over.png
	Resources/dialer_selected.png
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/header_conference.png
	Resources/header_incoming.png
	Resources/history_all_default.png
	Resources/history_all_selected.png
	Resources/history_default.png
	Resources/history_default_landscape~ipad.png
	Resources/history_default~ipad.png
	Resources/history_details_add_default.png
	Resources/history_details_add_over.png
	Resources/history_details_back_default.png
	Resources/history_details_back_over.png
	Resources/history_edit_default.png
	Resources/history_edit_over.png
	Resources/history_missed_default.png
	Resources/history_missed_selected.png
	Resources/history_ok_default.png
	Resources/history_ok_over.png
	Resources/history_over.png
	Resources/history_over_landscape~ipad.png
	Resources/history_over~ipad.png
	Resources/history_selected.png
	Resources/history_selected_landscape~ipad.png
	Resources/history_selected~ipad.png
	Resources/linphonerc-factory
	Resources/linphonerc-factory~ipad
	Resources/micro_off_default.png
	Resources/micro_off_default_landscape.png
	Resources/micro_off_default_landscape~ipad.png
	Resources/micro_off_default~ipad.png
	Resources/micro_off_disabled.png
	Resources/micro_off_disabled_landscape.png
	Resources/micro_off_disabled_landscape~ipad.png
	Resources/micro_off_disabled~ipad.png
	Resources/micro_off_over.png
	Resources/micro_off_over_landscape.png
	Resources/micro_off_over_landscape~ipad.png
	Resources/micro_off_over~ipad.png
	Resources/micro_on_default.png
	Resources/micro_on_default_landscape.png
	Resources/micro_on_default_landscape~ipad.png
	Resources/micro_on_default~ipad.png
	Resources/micro_on_disabled.png
	Resources/micro_on_disabled_landscape.png
	Resources/micro_on_disabled_landscape~ipad.png
	Resources/micro_on_disabled~ipad.png
	Resources/micro_on_over.png
	Resources/micro_on_over_landscape.png
	Resources/micro_on_over_landscape~ipad.png
	Resources/micro_on_over~ipad.png
	Resources/options_add_default.png
	Resources/options_add_default_landscape.png
	Resources/options_add_default_landscape~ipad.png
	Resources/options_add_default~ipad.png
	Resources/options_add_disabled.png
	Resources/options_add_disabled_landscape.png
	Resources/options_add_disabled_landscape~ipad.png
	Resources/options_add_disabled~ipad.png
	Resources/options_add_over.png
	Resources/options_add_over_landscape.png
	Resources/options_add_over_landscape~ipad.png
	Resources/options_add_over~ipad.png
	Resources/options_default.png
	Resources/options_default_landscape.png
	Resources/options_default_landscape~ipad.png
	Resources/options_default~ipad.png
	Resources/options_disabled.png
	Resources/options_disabled_landscape.png
	Resources/options_disabled_landscape~ipad.png
	Resources/options_disabled~ipad.png
	Resources/options_over.png
	Resources/options_over_landscape.png
	Resources/options_over_landscape~ipad.png
	Resources/options_over~ipad.png
	Resources/options_selected.png
	Resources/options_selected_landscape.png
	Resources/options_selected_landscape~ipad.png
	Resources/options_selected~ipad.png
	Resources/options_transfer_default.png
	Resources/options_transfer_default_landscape.png
	Resources/options_transfer_default_landscape~ipad.png
	Resources/options_transfer_default~ipad.png
	Resources/options_transfer_disabled.png
	Resources/options_transfer_disabled_landscape.png
	Resources/options_transfer_disabled_landscape~ipad.png
	Resources/options_transfer_disabled~ipad.png
	Resources/options_transfer_over.png
	Resources/options_transfer_over_landscape.png
	Resources/options_transfer_over_landscape~ipad.png
	Resources/options_transfer_over~ipad.png
	Resources/settings_default.png
	Resources/settings_default_landscape~ipad.png
	Resources/settings_default~ipad.png
	Resources/settings_over.png
	Resources/settings_over_landscape~ipad.png
	Resources/settings_over~ipad.png
	Resources/settings_selected.png
	Resources/settings_selected_landscape~ipad.png
	Resources/settings_selected~ipad.png
	Resources/setup_back_default.png
	Resources/setup_back_disabled.png
	Resources/setup_back_over.png
	Resources/setup_cancel_default.png
	Resources/setup_cancel_disabled.png
	Resources/setup_cancel_over.png
	Resources/setup_start_default.png
	Resources/setup_start_disabled.png
	Resources/setup_start_over.png
	Resources/setup_welcome_logo.png
	Resources/speaker_off_default.png
	Resources/speaker_off_default_landscape.png
	Resources/speaker_off_default_landscape~ipad.png
	Resources/speaker_off_default~ipad.png
	Resources/speaker_off_disabled.png
	Resources/speaker_off_disabled_landscape.png
	Resources/speaker_off_disabled_landscape~ipad.png
	Resources/speaker_off_disabled~ipad.png
	Resources/speaker_off_over.png
	Resources/speaker_off_over_landscape.png
	Resources/speaker_off_over_landscape~ipad.png
	Resources/speaker_off_over~ipad.png
	Resources/speaker_on_default.png
	Resources/speaker_on_default_landscape.png
	Resources/speaker_on_default_landscape~ipad.png
	Resources/speaker_on_default~ipad.png
	Resources/speaker_on_disabled.png
	Resources/speaker_on_disabled_landscape.png
	Resources/speaker_on_disabled_landscape~ipad.png
	Resources/speaker_on_disabled~ipad.png
	Resources/speaker_on_over.png
	Resources/speaker_on_over_landscape.png
	Resources/speaker_on_over_landscape~ipad.png
	Resources/speaker_on_over~ipad.png
	Resources/switch_camera_default.png
	Resources/switch_camera_over.png
	Resources/toolsbar_background.png
	Resources/video_off_default.png
	Resources/video_off_default_landscape.png
	Resources/video_off_default_landscape~ipad.png
	Resources/video_off_default~ipad.png
	Resources/video_off_disabled.png
	Resources/video_off_disabled_landscape.png
	Resources/video_off_disabled_landscape~ipad.png
	Resources/video_off_disabled~ipad.png
	Resources/video_off_over.png
	Resources/video_off_over_landscape.png
	Resources/video_off_over_landscape~ipad.png
	Resources/video_off_over~ipad.png
	Resources/video_on_default.png
	Resources/video_on_default_landscape.png
	Resources/video_on_default_landscape~ipad.png
	Resources/video_on_default~ipad.png
	Resources/video_on_disabled.png
	Resources/video_on_disabled_landscape.png
	Resources/video_on_disabled_landscape~ipad.png
	Resources/video_on_disabled~ipad.png
	Resources/video_on_over.png
	Resources/video_on_over_landscape.png
	Resources/video_on_over_landscape~ipad.png
	Resources/video_on_over~ipad.png
	linphone-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController/4/DialerViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib
	linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib
	linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib
	linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib
	linphone.ldb/Resources/Classes/IncomingCallViewController/6/IncomingCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib
	linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib
	linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib
	linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
This commit is contained in:
Yann Diorcet 2012-09-26 11:28:35 +02:00
commit 31accecfde
86 changed files with 5486 additions and 986 deletions

View file

@ -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

View file

@ -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 <Foundation/Foundation.h>
@class ImageSharing;
@protocol ImageSharingDelegate <NSObject>
- (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<NSURLConnectionDataDelegate> {
@private
NSInteger totalBytesExpectedToRead;
id<ImageSharingDelegate> delegate;
int statusCode;
}
+ (id)imageSharingUpload:(NSURL*)url image:(UIImage*)image delegate:(id<ImageSharingDelegate>)delegate userInfo:(id)userInfo;
+ (id)imageSharingDownload:(NSURL*)url delegate:(id<ImageSharingDelegate>)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

View file

@ -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<ImageSharingDelegate>)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<ImageSharingDelegate>)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

View file

@ -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];

View file

@ -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) {

View file

@ -34,4 +34,9 @@
@end
void removeTableBackground(UIView* view);
@interface UIImage (NormalizedImage)
- (void)forceDecompression;
@end

View file

@ -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

View file

@ -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 <UIKit/UIKit.h>
#import <NinePatch.h>
@interface UILinphoneButton : UIButton {
}
@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundNinePatch;
@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundOverNinePatch;
@end

View file

@ -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

View file

@ -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 <UIKit/UIKit.h>
#import <NinePatch.h>
@interface UILinphoneTextField : UITextField {
}
@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundNinePatch;
@end

View file

@ -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

View file

@ -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 <UIKit/UIKit.h>
@interface UILoadingImageView : UIImageView
- (void)startLoading;
- (BOOL)isLoading;
- (void)stopLoading;
@property (nonatomic, readonly) IBOutlet UIActivityIndicatorView *waitIndicatorView;
@end

View file

@ -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

View file

@ -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;
}

View file

@ -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)
{

View file

@ -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

View file

@ -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

View file

@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1296</int>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1498</string>
<string key="NS.object.0">1926</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUIImageView</string>
<string>IBUIScrollView</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
@ -36,22 +37,6 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="170933358">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="350805517">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
@ -77,7 +62,7 @@
<string key="NSFrameSize">{160, 44}</string>
<reference key="NSSuperview" ref="350805517"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="170933358"/>
<reference key="NSNextKeyView" ref="814051133"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -88,13 +73,18 @@
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">0.0</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Back</string>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
@ -109,12 +99,12 @@
<string key="NSResourceName">image_back_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">2</int>
<double key="pointSize">15</double>
<int key="type">1</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<string key="NSName">Helvetica</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
</object>
@ -124,9 +114,44 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="714444944"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="986758619"/>
<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIScrollView" id="814051133">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="170933358">
<reference key="NSNextResponder" ref="814051133"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 416}</string>
<reference key="NSSuperview" ref="814051133"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="986758619"/>
<int key="IBUIContentMode">4</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="170933358"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIMinimumZoomScale">0.0</float>
<float key="IBUIMaximumZoomScale">10</float>
</object>
</array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
@ -147,6 +172,14 @@
</object>
<int key="connectionID">3</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">backButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="771824371"/>
</object>
<int key="connectionID">8</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">imageView</string>
@ -157,11 +190,11 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">backButton</string>
<string key="label">scrollView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="771824371"/>
<reference key="destination" ref="814051133"/>
</object>
<int key="connectionID">8</int>
<int key="connectionID">13</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
@ -185,8 +218,8 @@
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<array class="NSMutableArray" key="children">
<reference ref="170933358"/>
<reference ref="350805517"/>
<reference ref="814051133"/>
</array>
<reference key="parent" ref="0"/>
</object>
@ -201,12 +234,6 @@
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
<reference key="object" ref="170933358"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">imageView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="350805517"/>
@ -229,6 +256,21 @@
<reference key="parent" ref="350805517"/>
<string key="objectName">background</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="814051133"/>
<array class="NSMutableArray" key="children">
<reference ref="170933358"/>
</array>
<reference key="parent" ref="191373211"/>
<string key="objectName">scrollView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
<reference key="object" ref="170933358"/>
<reference key="parent" ref="814051133"/>
<string key="objectName">imageView</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -238,16 +280,18 @@
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<real value="1" key="7.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="0.0" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">11</int>
<int key="maxID">13</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -268,6 +312,7 @@
<dictionary class="NSMutableDictionary" key="outlets">
<string key="backButton">UIButton</string>
<string key="imageView">UIImageView</string>
<string key="scrollView">UIScrollView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="backButton">
@ -278,6 +323,10 @@
<string key="name">imageView</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="scrollView">
<string key="name">scrollView</string>
<string key="candidateClassName">UIScrollView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@ -288,17 +337,13 @@
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="image_back_default.png">{320, 88}</string>
<string key="image_back_over.png">{320, 88}</string>
<string key="toolsbar_background.png">{5, 117}</string>
<string key="toolsbar_background.png">{5, 88}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1498</string>
<string key="IBCocoaTouchPluginVersion">1926</string>
</data>
</archive>

View file

@ -0,0 +1,795 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1926</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIActivityIndicatorView</string>
<string>IBUIButton</string>
<string>IBUIScrollView</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="975951072">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="770392660">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIScrollView" id="1004767347">
<reference key="NSNextResponder" ref="770392660"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{768, 966}</string>
<reference key="NSSuperview" ref="770392660"/>
<reference key="NSNextKeyView" ref="62439358"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<int key="IBUITag">1</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIBounces">NO</bool>
<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
</object>
<object class="IBUIView" id="1057285194">
<reference key="NSNextResponder" ref="770392660"/>
<int key="NSvFlags">266</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIView" id="938095663">
<reference key="NSNextResponder" ref="1057285194"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
<reference key="NSSuperview" ref="1057285194"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
</object>
<int key="IBUITag">28</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIButton" id="954353386">
<reference key="NSNextResponder" ref="1057285194"/>
<int key="NSvFlags">294</int>
<string key="NSFrameSize">{384, 77}</string>
<reference key="NSSuperview" ref="1057285194"/>
<reference key="NSNextKeyView" ref="237722854"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">3</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Cancel</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">0.0</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Cancel</string>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="514969770">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor" id="1013845973">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="929224261">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_over~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_disabled~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_default~ipad.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="119426708">
<int key="type">1</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="722606932">
<string key="NSName">Helvetica</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUIButton" id="237722854">
<reference key="NSNextResponder" ref="1057285194"/>
<int key="NSvFlags">291</int>
<string key="NSFrame">{{384, 0}, {384, 77}}</string>
<reference key="NSSuperview" ref="1057285194"/>
<reference key="NSNextKeyView" ref="483101671"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">4</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Start</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">54</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Start</string>
<reference key="IBUIHighlightedTitleColor" ref="514969770"/>
<reference key="IBUINormalTitleColor" ref="1013845973"/>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_start_over~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_start_default~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
<object class="IBUIButton" id="483101671">
<reference key="NSNextResponder" ref="1057285194"/>
<int key="NSvFlags">-2147483357</int>
<string key="NSFrame">{{384, 0}, {384, 77}}</string>
<reference key="NSSuperview" ref="1057285194"/>
<reference key="NSNextKeyView" ref="938095663"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">5</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Back</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">54</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Back</string>
<reference key="IBUIHighlightedTitleColor" ref="514969770"/>
<reference key="IBUINormalTitleColor" ref="1013845973"/>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_over~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_disabled~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_default~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
</array>
<string key="NSFrame">{{0, 947}, {768, 77}}</string>
<reference key="NSSuperview" ref="770392660"/>
<reference key="NSNextKeyView" ref="954353386"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<int key="IBUITag">2</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="62439358">
<reference key="NSNextResponder" ref="770392660"/>
<int key="NSvFlags">-2147483374</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIActivityIndicatorView" id="41091084">
<reference key="NSNextResponder" ref="62439358"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{366, 492}, {37, 37}}</string>
<reference key="NSSuperview" ref="62439358"/>
<reference key="NSNextKeyView" ref="1057285194"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">7</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHidesWhenStopped">NO</bool>
<bool key="IBUIAnimating">YES</bool>
<int key="IBUIStyle">0</int>
</object>
</array>
<string key="NSFrameSize">{768, 1024}</string>
<reference key="NSSuperview" ref="770392660"/>
<reference key="NSNextKeyView" ref="41091084"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MSAwLjUAA</bytes>
</object>
<int key="IBUITag">6</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<string key="NSFrameSize">{768, 1024}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="1004767347"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="981989056"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="298371011">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIScrollView" id="630762107">
<reference key="NSNextResponder" ref="298371011"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{1024, 711}</string>
<reference key="NSSuperview" ref="298371011"/>
<reference key="NSNextKeyView" ref="1066982838"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<int key="IBUITag">1</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIBounces">NO</bool>
<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
</object>
<object class="IBUIView" id="880278922">
<reference key="NSNextResponder" ref="298371011"/>
<int key="NSvFlags">266</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIView" id="91020530">
<reference key="NSNextResponder" ref="880278922"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{0, 77}, {1024, 2000}}</string>
<reference key="NSSuperview" ref="880278922"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
</object>
<int key="IBUITag">28</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIButton" id="378153891">
<reference key="NSNextResponder" ref="880278922"/>
<int key="NSvFlags">294</int>
<string key="NSFrameSize">{512, 77}</string>
<reference key="NSSuperview" ref="880278922"/>
<reference key="NSNextKeyView" ref="1028981026"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">3</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Cancel</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">0.0</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Cancel</string>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="800077834">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor" id="760183144">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_over_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_disabled_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_default_landscape~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
<object class="IBUIButton" id="1028981026">
<reference key="NSNextResponder" ref="880278922"/>
<int key="NSvFlags">291</int>
<string key="NSFrame">{{512, 0}, {512, 77}}</string>
<reference key="NSSuperview" ref="880278922"/>
<reference key="NSNextKeyView" ref="351442668"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">4</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Start</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">16</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Start</string>
<reference key="IBUIHighlightedTitleColor" ref="800077834"/>
<reference key="IBUINormalTitleColor" ref="760183144"/>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_start_over_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_start_default_landscape~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
<object class="IBUIButton" id="351442668">
<reference key="NSNextResponder" ref="880278922"/>
<int key="NSvFlags">-2147483357</int>
<string key="NSFrame">{{512, 0}, {512, 77}}</string>
<reference key="NSSuperview" ref="880278922"/>
<reference key="NSNextKeyView" ref="91020530"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">5</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Back</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">16</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Back</string>
<reference key="IBUIHighlightedTitleColor" ref="800077834"/>
<reference key="IBUINormalTitleColor" ref="760183144"/>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_over_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_disabled_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_default_landscape~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
</array>
<string key="NSFrame">{{0, 691}, {1024, 77}}</string>
<reference key="NSSuperview" ref="298371011"/>
<reference key="NSNextKeyView" ref="378153891"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="981989056"/>
<int key="IBUITag">2</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="1066982838">
<reference key="NSNextResponder" ref="298371011"/>
<int key="NSvFlags">-2147483374</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIActivityIndicatorView" id="102198390">
<reference key="NSNextResponder" ref="1066982838"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{494, 364}, {37, 37}}</string>
<reference key="NSSuperview" ref="1066982838"/>
<reference key="NSNextKeyView" ref="880278922"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">7</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHidesWhenStopped">NO</bool>
<bool key="IBUIAnimating">YES</bool>
<int key="IBUIStyle">0</int>
</object>
</array>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview" ref="298371011"/>
<reference key="NSNextKeyView" ref="102198390"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MSAwLjUAA</bytes>
</object>
<int key="IBUITag">6</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="630762107"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="981989056"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="770392660"/>
</object>
<int key="connectionID">20</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">startButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="237722854"/>
</object>
<int key="connectionID">26</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">backButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="483101671"/>
</object>
<int key="connectionID">27</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">contentView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="1004767347"/>
</object>
<int key="connectionID">99</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">portraitView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="770392660"/>
</object>
<int key="connectionID">117</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">waitView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="62439358"/>
</object>
<int key="connectionID">131</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">landscapeView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="298371011"/>
</object>
<int key="connectionID">134</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onStartClick:</string>
<reference key="source" ref="237722854"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">25</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onBackClick:</string>
<reference key="source" ref="483101671"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">23</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onCancelClick:</string>
<reference key="source" ref="954353386"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">24</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onCancelClick:</string>
<reference key="source" ref="378153891"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">128</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onStartClick:</string>
<reference key="source" ref="1028981026"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">126</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onBackClick:</string>
<reference key="source" ref="351442668"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">127</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="372490531"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="770392660"/>
<array class="NSMutableArray" key="children">
<reference ref="1057285194"/>
<reference ref="1004767347"/>
<reference ref="62439358"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">Portrait View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">98</int>
<reference key="object" ref="1004767347"/>
<reference key="parent" ref="770392660"/>
<string key="objectName">contentView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="1057285194"/>
<array class="NSMutableArray" key="children">
<reference ref="483101671"/>
<reference ref="237722854"/>
<reference ref="954353386"/>
<reference ref="938095663"/>
</array>
<reference key="parent" ref="770392660"/>
<string key="objectName">tabBar</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
<reference key="object" ref="954353386"/>
<reference key="parent" ref="1057285194"/>
<string key="objectName">cancelButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">16</int>
<reference key="object" ref="237722854"/>
<reference key="parent" ref="1057285194"/>
<string key="objectName">startButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="483101671"/>
<reference key="parent" ref="1057285194"/>
<string key="objectName">backButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">118</int>
<reference key="object" ref="298371011"/>
<array class="NSMutableArray" key="children">
<reference ref="630762107"/>
<reference ref="880278922"/>
<reference ref="1066982838"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">Landscape View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">119</int>
<reference key="object" ref="630762107"/>
<reference key="parent" ref="298371011"/>
<string key="objectName">contentView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">120</int>
<reference key="object" ref="880278922"/>
<array class="NSMutableArray" key="children">
<reference ref="378153891"/>
<reference ref="1028981026"/>
<reference ref="351442668"/>
<reference ref="91020530"/>
</array>
<reference key="parent" ref="298371011"/>
<string key="objectName">tabBar</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">122</int>
<reference key="object" ref="378153891"/>
<reference key="parent" ref="880278922"/>
<string key="objectName">cancelButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">123</int>
<reference key="object" ref="1028981026"/>
<reference key="parent" ref="880278922"/>
<string key="objectName">startButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">124</int>
<reference key="object" ref="351442668"/>
<reference key="parent" ref="880278922"/>
<string key="objectName">backButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">129</int>
<reference key="object" ref="62439358"/>
<array class="NSMutableArray" key="children">
<reference ref="41091084"/>
</array>
<reference key="parent" ref="770392660"/>
<string key="objectName">waitView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">130</int>
<reference key="object" ref="41091084"/>
<reference key="parent" ref="62439358"/>
<string key="objectName">activityIndicatorView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">132</int>
<reference key="object" ref="1066982838"/>
<array class="NSMutableArray" key="children">
<reference ref="102198390"/>
</array>
<reference key="parent" ref="298371011"/>
<string key="objectName">waitView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">133</int>
<reference key="object" ref="102198390"/>
<reference key="parent" ref="1066982838"/>
<string key="objectName">activityIndicatorView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">137</int>
<reference key="object" ref="91020530"/>
<reference key="parent" ref="880278922"/>
<string key="objectName">background</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">136</int>
<reference key="object" ref="938095663"/>
<reference key="parent" ref="1057285194"/>
<string key="objectName">background</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">WizardViewController</string>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="118.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="119.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="120.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="122.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="122.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="123.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="123.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="123.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="124.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="124.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="132.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="133.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="137.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="16.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="16.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="17.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="17.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="18.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="18.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="98.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">137</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="setup_back_default_landscape~ipad.png">{1024, 171}</string>
<string key="setup_back_default~ipad.png">{768, 153}</string>
<string key="setup_back_disabled_landscape~ipad.png">{1024, 171}</string>
<string key="setup_back_disabled~ipad.png">{768, 153}</string>
<string key="setup_back_over_landscape~ipad.png">{1024, 171}</string>
<string key="setup_back_over~ipad.png">{768, 153}</string>
<string key="setup_cancel_default_landscape~ipad.png">{1024, 171}</string>
<string key="setup_cancel_default~ipad.png">{768, 153}</string>
<string key="setup_cancel_disabled_landscape~ipad.png">{1024, 171}</string>
<string key="setup_cancel_disabled~ipad.png">{768, 153}</string>
<string key="setup_cancel_over_landscape~ipad.png">{1024, 171}</string>
<string key="setup_cancel_over~ipad.png">{768, 153}</string>
<string key="setup_start_default_landscape~ipad.png">{1024, 171}</string>
<string key="setup_start_default~ipad.png">{768, 153}</string>
<string key="setup_start_over_landscape~ipad.png">{1024, 171}</string>
<string key="setup_start_over~ipad.png">{768, 153}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1926</string>
</data>
</archive>

File diff suppressed because it is too large Load diff

View file

@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1296</int>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">933</string>
<string key="NS.object.0">1926</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUIImageView</string>
<string>IBUIScrollView</string>
<string>IBUIView</string>
<string>IBProxyObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -33,23 +34,9 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="191373211">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="170933358">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
<reference key="NSSuperview" ref="191373211"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="350805517">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
@ -73,7 +60,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{160, 44}</string>
<reference key="NSSuperview" ref="350805517"/>
<reference key="NSNextKeyView" ref="170933358"/>
<reference key="NSNextKeyView" ref="814051133"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -84,13 +71,18 @@
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">0.0</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Retour</string>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
@ -105,12 +97,12 @@
<string key="NSResourceName">image_back_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">2</int>
<double key="pointSize">15</double>
<int key="type">1</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<string key="NSName">Helvetica</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
</object>
@ -119,11 +111,45 @@
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="714444944"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="986758619"/>
<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIScrollView" id="814051133">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="170933358">
<reference key="NSNextResponder" ref="814051133"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 416}</string>
<reference key="NSSuperview" ref="814051133"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="986758619"/>
<int key="IBUIContentMode">4</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="170933358"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIMinimumZoomScale">0.0</float>
<float key="IBUIMaximumZoomScale">10</float>
</object>
</array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="350805517"/>
<reference key="IBUIBackgroundColor" ref="986758619"/>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
@ -140,6 +166,14 @@
</object>
<int key="connectionID">3</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">backButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="771824371"/>
</object>
<int key="connectionID">8</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">imageView</string>
@ -150,11 +184,11 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">backButton</string>
<string key="label">scrollView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="771824371"/>
<reference key="destination" ref="814051133"/>
</object>
<int key="connectionID">8</int>
<int key="connectionID">13</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
@ -178,8 +212,8 @@
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<array class="NSMutableArray" key="children">
<reference ref="170933358"/>
<reference ref="350805517"/>
<reference ref="814051133"/>
</array>
<reference key="parent" ref="0"/>
</object>
@ -194,12 +228,6 @@
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
<reference key="object" ref="170933358"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">imageView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="350805517"/>
@ -222,6 +250,21 @@
<reference key="parent" ref="350805517"/>
<string key="objectName">background</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="814051133"/>
<array class="NSMutableArray" key="children">
<reference ref="170933358"/>
</array>
<reference key="parent" ref="191373211"/>
<string key="objectName">scrollView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
<reference key="object" ref="170933358"/>
<reference key="parent" ref="814051133"/>
<string key="objectName">imageView</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -231,67 +274,29 @@
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<real value="1" key="7.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="0.0" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">11</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">ImageViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">onBackClick:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">onBackClick:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">onBackClick:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="backButton">UIButton</string>
<string key="imageView">UIImageView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="backButton">
<string key="name">backButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="imageView">
<string key="name">imageView</string>
<string key="candidateClassName">UIImageView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ImageViewController.h</string>
</object>
</object>
</array>
<int key="maxID">13</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="image_back_default.png">{320, 88}</string>
<string key="image_back_over.png">{320, 88}</string>
<string key="toolsbar_background.png">{5, 117}</string>
<string key="toolsbar_background.png">{5, 88}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">933</string>
<string key="IBCocoaTouchPluginVersion">1926</string>
</data>
</archive>

View file

@ -0,0 +1,793 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1280</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">933</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBUIButton</string>
<string>IBUIActivityIndicatorView</string>
<string>IBUIView</string>
<string>IBUIScrollView</string>
<string>IBProxyObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="975951072">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="770392660">
<nil key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIScrollView" id="1004767347">
<reference key="NSNextResponder" ref="770392660"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{768, 966}</string>
<reference key="NSSuperview" ref="770392660"/>
<reference key="NSNextKeyView" ref="62439358"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<int key="IBUITag">1</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIBounces">NO</bool>
<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
</object>
<object class="IBUIView" id="1057285194">
<reference key="NSNextResponder" ref="770392660"/>
<int key="NSvFlags">266</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIView" id="938095663">
<reference key="NSNextResponder" ref="1057285194"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
<reference key="NSSuperview" ref="1057285194"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
</object>
<int key="IBUITag">28</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIButton" id="954353386">
<reference key="NSNextResponder" ref="1057285194"/>
<int key="NSvFlags">294</int>
<string key="NSFrameSize">{384, 77}</string>
<reference key="NSSuperview" ref="1057285194"/>
<reference key="NSNextKeyView" ref="237722854"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">3</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Annuler</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">0.0</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Annuler</string>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="514969770">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor" id="1013845973">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="929224261">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_over~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_disabled~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_default~ipad.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="119426708">
<int key="type">1</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="722606932">
<string key="NSName">Helvetica</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUIButton" id="237722854">
<reference key="NSNextResponder" ref="1057285194"/>
<int key="NSvFlags">291</int>
<string key="NSFrame">{{384, 0}, {384, 77}}</string>
<reference key="NSSuperview" ref="1057285194"/>
<reference key="NSNextKeyView" ref="483101671"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">4</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Démarrer</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">54</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Démarrer</string>
<reference key="IBUIHighlightedTitleColor" ref="514969770"/>
<reference key="IBUINormalTitleColor" ref="1013845973"/>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_start_over~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_start_default~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
<object class="IBUIButton" id="483101671">
<reference key="NSNextResponder" ref="1057285194"/>
<int key="NSvFlags">-2147483357</int>
<string key="NSFrame">{{384, 0}, {384, 77}}</string>
<reference key="NSSuperview" ref="1057285194"/>
<reference key="NSNextKeyView" ref="938095663"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">5</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Retour</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">54</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Retour</string>
<reference key="IBUIHighlightedTitleColor" ref="514969770"/>
<reference key="IBUINormalTitleColor" ref="1013845973"/>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_over~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_disabled~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_default~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
</array>
<string key="NSFrame">{{0, 947}, {768, 77}}</string>
<reference key="NSSuperview" ref="770392660"/>
<reference key="NSNextKeyView" ref="954353386"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<int key="IBUITag">2</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="62439358">
<reference key="NSNextResponder" ref="770392660"/>
<int key="NSvFlags">-2147483374</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIActivityIndicatorView" id="41091084">
<reference key="NSNextResponder" ref="62439358"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{366, 492}, {37, 37}}</string>
<reference key="NSSuperview" ref="62439358"/>
<reference key="NSNextKeyView" ref="1057285194"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">7</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHidesWhenStopped">NO</bool>
<bool key="IBUIAnimating">YES</bool>
<int key="IBUIStyle">0</int>
</object>
</array>
<string key="NSFrameSize">{768, 1024}</string>
<reference key="NSSuperview" ref="770392660"/>
<reference key="NSNextKeyView" ref="41091084"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MSAwLjUAA</bytes>
</object>
<int key="IBUITag">6</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<string key="NSFrameSize">{768, 1024}</string>
<reference key="NSNextKeyView" ref="1004767347"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="981989056"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="298371011">
<nil key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIScrollView" id="630762107">
<reference key="NSNextResponder" ref="298371011"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{1024, 711}</string>
<reference key="NSSuperview" ref="298371011"/>
<reference key="NSNextKeyView" ref="1066982838"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<int key="IBUITag">1</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIBounces">NO</bool>
<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
</object>
<object class="IBUIView" id="880278922">
<reference key="NSNextResponder" ref="298371011"/>
<int key="NSvFlags">266</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIView" id="91020530">
<reference key="NSNextResponder" ref="880278922"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{0, 77}, {1024, 2000}}</string>
<reference key="NSSuperview" ref="880278922"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
</object>
<int key="IBUITag">28</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIButton" id="378153891">
<reference key="NSNextResponder" ref="880278922"/>
<int key="NSvFlags">294</int>
<string key="NSFrameSize">{512, 77}</string>
<reference key="NSSuperview" ref="880278922"/>
<reference key="NSNextKeyView" ref="1028981026"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">3</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Annuler</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">0.0</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Annuler</string>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="800077834">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor" id="760183144">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_over_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_disabled_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_cancel_default_landscape~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
<object class="IBUIButton" id="1028981026">
<reference key="NSNextResponder" ref="880278922"/>
<int key="NSvFlags">291</int>
<string key="NSFrame">{{512, 0}, {512, 77}}</string>
<reference key="NSSuperview" ref="880278922"/>
<reference key="NSNextKeyView" ref="351442668"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">4</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Démarrer</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">16</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Démarrer</string>
<reference key="IBUIHighlightedTitleColor" ref="800077834"/>
<reference key="IBUINormalTitleColor" ref="760183144"/>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_start_over_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_start_default_landscape~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
<object class="IBUIButton" id="351442668">
<reference key="NSNextResponder" ref="880278922"/>
<int key="NSvFlags">-2147483357</int>
<string key="NSFrame">{{512, 0}, {512, 77}}</string>
<reference key="NSSuperview" ref="880278922"/>
<reference key="NSNextKeyView" ref="91020530"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">5</int>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Retour</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<double key="IBUITitleEdgeInsets.top">18</double>
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">16</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Retour</string>
<reference key="IBUIHighlightedTitleColor" ref="800077834"/>
<reference key="IBUINormalTitleColor" ref="760183144"/>
<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_over_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_disabled_landscape~ipad.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">setup_back_default_landscape~ipad.png</string>
</object>
<reference key="IBUIFontDescription" ref="119426708"/>
<reference key="IBUIFont" ref="722606932"/>
</object>
</array>
<string key="NSFrame">{{0, 691}, {1024, 77}}</string>
<reference key="NSSuperview" ref="298371011"/>
<reference key="NSNextKeyView" ref="378153891"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="981989056"/>
<int key="IBUITag">2</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="1066982838">
<reference key="NSNextResponder" ref="298371011"/>
<int key="NSvFlags">-2147483374</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIActivityIndicatorView" id="102198390">
<reference key="NSNextResponder" ref="1066982838"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{494, 364}, {37, 37}}</string>
<reference key="NSSuperview" ref="1066982838"/>
<reference key="NSNextKeyView" ref="880278922"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUITag">7</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHidesWhenStopped">NO</bool>
<bool key="IBUIAnimating">YES</bool>
<int key="IBUIStyle">0</int>
</object>
</array>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSSuperview" ref="298371011"/>
<reference key="NSNextKeyView" ref="102198390"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MSAwLjUAA</bytes>
</object>
<int key="IBUITag">6</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<string key="NSFrameSize">{1024, 768}</string>
<reference key="NSNextKeyView" ref="630762107"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="981989056"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="770392660"/>
</object>
<int key="connectionID">20</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">startButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="237722854"/>
</object>
<int key="connectionID">26</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">backButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="483101671"/>
</object>
<int key="connectionID">27</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">contentView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="1004767347"/>
</object>
<int key="connectionID">99</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">portraitView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="770392660"/>
</object>
<int key="connectionID">117</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">waitView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="62439358"/>
</object>
<int key="connectionID">131</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">landscapeView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="298371011"/>
</object>
<int key="connectionID">134</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onStartClick:</string>
<reference key="source" ref="237722854"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">25</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onBackClick:</string>
<reference key="source" ref="483101671"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">23</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onCancelClick:</string>
<reference key="source" ref="954353386"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">24</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onCancelClick:</string>
<reference key="source" ref="378153891"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">128</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onStartClick:</string>
<reference key="source" ref="1028981026"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">126</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onBackClick:</string>
<reference key="source" ref="351442668"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">127</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="372490531"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="770392660"/>
<array class="NSMutableArray" key="children">
<reference ref="1057285194"/>
<reference ref="1004767347"/>
<reference ref="62439358"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">Portrait View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">98</int>
<reference key="object" ref="1004767347"/>
<reference key="parent" ref="770392660"/>
<string key="objectName">contentView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="1057285194"/>
<array class="NSMutableArray" key="children">
<reference ref="483101671"/>
<reference ref="237722854"/>
<reference ref="954353386"/>
<reference ref="938095663"/>
</array>
<reference key="parent" ref="770392660"/>
<string key="objectName">tabBar</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
<reference key="object" ref="954353386"/>
<reference key="parent" ref="1057285194"/>
<string key="objectName">cancelButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">16</int>
<reference key="object" ref="237722854"/>
<reference key="parent" ref="1057285194"/>
<string key="objectName">startButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="483101671"/>
<reference key="parent" ref="1057285194"/>
<string key="objectName">backButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">118</int>
<reference key="object" ref="298371011"/>
<array class="NSMutableArray" key="children">
<reference ref="630762107"/>
<reference ref="880278922"/>
<reference ref="1066982838"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">Landscape View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">119</int>
<reference key="object" ref="630762107"/>
<reference key="parent" ref="298371011"/>
<string key="objectName">contentView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">120</int>
<reference key="object" ref="880278922"/>
<array class="NSMutableArray" key="children">
<reference ref="378153891"/>
<reference ref="1028981026"/>
<reference ref="351442668"/>
<reference ref="91020530"/>
</array>
<reference key="parent" ref="298371011"/>
<string key="objectName">tabBar</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">122</int>
<reference key="object" ref="378153891"/>
<reference key="parent" ref="880278922"/>
<string key="objectName">cancelButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">123</int>
<reference key="object" ref="1028981026"/>
<reference key="parent" ref="880278922"/>
<string key="objectName">startButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">124</int>
<reference key="object" ref="351442668"/>
<reference key="parent" ref="880278922"/>
<string key="objectName">backButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">129</int>
<reference key="object" ref="62439358"/>
<array class="NSMutableArray" key="children">
<reference ref="41091084"/>
</array>
<reference key="parent" ref="770392660"/>
<string key="objectName">waitView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">130</int>
<reference key="object" ref="41091084"/>
<reference key="parent" ref="62439358"/>
<string key="objectName">activityIndicatorView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">132</int>
<reference key="object" ref="1066982838"/>
<array class="NSMutableArray" key="children">
<reference ref="102198390"/>
</array>
<reference key="parent" ref="298371011"/>
<string key="objectName">waitView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">133</int>
<reference key="object" ref="102198390"/>
<reference key="parent" ref="1066982838"/>
<string key="objectName">activityIndicatorView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">137</int>
<reference key="object" ref="91020530"/>
<reference key="parent" ref="880278922"/>
<string key="objectName">background</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">136</int>
<reference key="object" ref="938095663"/>
<reference key="parent" ref="1057285194"/>
<string key="objectName">background</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">WizardViewController</string>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="118.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="119.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="120.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="122.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="122.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="123.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="123.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="123.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="124.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="124.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="132.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="133.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="137.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="16.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="16.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="17.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="17.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="18.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="18.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="98.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">137</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="setup_back_default_landscape~ipad.png">{1024, 171}</string>
<string key="setup_back_default~ipad.png">{768, 153}</string>
<string key="setup_back_disabled_landscape~ipad.png">{1024, 171}</string>
<string key="setup_back_disabled~ipad.png">{768, 153}</string>
<string key="setup_back_over_landscape~ipad.png">{1024, 171}</string>
<string key="setup_back_over~ipad.png">{768, 153}</string>
<string key="setup_cancel_default_landscape~ipad.png">{1024, 171}</string>
<string key="setup_cancel_default~ipad.png">{768, 153}</string>
<string key="setup_cancel_disabled_landscape~ipad.png">{1024, 171}</string>
<string key="setup_cancel_disabled~ipad.png">{768, 153}</string>
<string key="setup_cancel_over_landscape~ipad.png">{1024, 171}</string>
<string key="setup_cancel_over~ipad.png">{768, 153}</string>
<string key="setup_start_default_landscape~ipad.png">{1024, 171}</string>
<string key="setup_start_default~ipad.png">{768, 153}</string>
<string key="setup_start_over_landscape~ipad.png">{1024, 171}</string>
<string key="setup_start_over~ipad.png">{768, 153}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">933</string>
</data>
</archive>

File diff suppressed because it is too large Load diff

10
README
View file

@ -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:

BIN
Resources/bubble.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

View file

Before

Width:  |  Height:  |  Size: 969 B

After

Width:  |  Height:  |  Size: 969 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Resources/form_invalid.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Resources/form_valid.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
Resources/linphone_logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

View file

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View file

@ -1,304 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1296</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1498</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUIImageView</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="975951072">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="191373211">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="170933358">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="350805517">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="714444944">
<reference key="NSNextResponder" ref="350805517"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview" ref="350805517"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="771824371"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">toolsbar_background.png</string>
</object>
</object>
<object class="IBUIButton" id="771824371">
<reference key="NSNextResponder" ref="350805517"/>
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{160, 44}</string>
<reference key="NSSuperview" ref="350805517"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="170933358"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Back</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">image_back_over.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">image_back_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<int key="type">2</int>
<double key="pointSize">15</double>
</object>
<object class="NSFont" key="IBUIFont">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
</object>
</array>
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="714444944"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="986758619"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="350805517"/>
<reference key="IBUIBackgroundColor" ref="986758619"/>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="191373211"/>
</object>
<int key="connectionID">3</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">imageView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="170933358"/>
</object>
<int key="connectionID">9</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">backButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="771824371"/>
</object>
<int key="connectionID">8</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onBackClick:</string>
<reference key="source" ref="771824371"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">10</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<array class="NSMutableArray" key="children">
<reference ref="170933358"/>
<reference ref="350805517"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="372490531"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
<reference key="object" ref="170933358"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">imageView</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="350805517"/>
<array class="NSMutableArray" key="children">
<reference ref="714444944"/>
<reference ref="771824371"/>
</array>
<reference key="parent" ref="191373211"/>
<string key="objectName">toolbar</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">7</int>
<reference key="object" ref="771824371"/>
<reference key="parent" ref="350805517"/>
<string key="objectName">backButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="714444944"/>
<reference key="parent" ref="350805517"/>
<string key="objectName">background</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">ImageViewController</string>
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">11</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">ImageViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">onBackClick:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">onBackClick:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">onBackClick:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="backButton">UIButton</string>
<string key="imageView">UIImageView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="backButton">
<string key="name">backButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="imageView">
<string key="name">imageView</string>
<string key="candidateClassName">UIImageView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ImageViewController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="image_back_default.png">{320, 88}</string>
<string key="image_back_over.png">{320, 88}</string>
<string key="toolsbar_background.png">{5, 117}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1498</string>
</data>
</archive>

View file

@ -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";

View file

@ -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\"",

View file

@ -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 \

View file

@ -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

View file

@ -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

View file

@ -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:

@ -1 +1 @@
Subproject commit 972e9d009e1fe9dc3e2e1d672e39c98de0affa37
Subproject commit 3403f378bab82b67d569b029f466a2f1dee499bb

@ -1 +1 @@
Subproject commit 296b5671ae42dbfbb28e1c30e8c79ecdbe60ebc5
Subproject commit d2bf8846e3c40ce5b4dec886f2d0fc6d9698fc87