diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index 92db0a82e..a6f93f9d3 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -401,8 +401,9 @@ static UICompositeViewDescription *compositeDescription = nil; [callTableView setAlpha:0.0]; /* MODIFICATION show video in background */ - UIEdgeInsets insets = {23, 0, 0, 0}; + UIEdgeInsets insets = {33, 0, 25, 0}; [callTableView setContentInset:insets]; + [callTableView setScrollIndicatorInsets:insets]; [callTableController minimizeAll]; /* */ @@ -453,8 +454,9 @@ static UICompositeViewDescription *compositeDescription = nil; [videoGroup setAlpha:0.0]; [[PhoneMainView instance] showTabBar: true]; - UIEdgeInsets insets = {0, 0, 0, 0}; + UIEdgeInsets insets = {10, 0, 25, 0}; [callTableView setContentInset:insets]; + [callTableView setScrollIndicatorInsets:insets]; [callTableView setAlpha:1.0]; [videoCameraSwitch setHidden:TRUE]; diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 23e303f35..0b91a0e52 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -177,7 +177,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); } [self setString:val forKey:@"media_encryption_preference"]; } - [self setString: lp_config_get_string(linphone_core_get_config(lc),"app","rotation_preference", "auto") forKey:@"rotation_preference"]; + [self setString: lp_config_get_string(linphone_core_get_config(lc),"app","rotation_preference", "landscape") forKey:@"rotation_preference"]; [self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","enable_first_login_view_preference", 0) forKey:@"enable_first_login_view_preference"]; [self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","debugenable_preference", 0) forKey:@"debugenable_preference"]; [self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","check_config_disable_preference", 0) forKey:@"check_config_disable_preference"]; diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m index 36ebb610e..7c6b65aa9 100644 --- a/Classes/LinphoneUI/UICallBar.m +++ b/Classes/LinphoneUI/UICallBar.m @@ -206,6 +206,18 @@ setImage:[UIImage imageNamed:@"dialer_alt_back_over_landscape.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; + // Set label multilines: IB lack ! + [option1Button.titleLabel setLineBreakMode:UILineBreakModeWordWrap]; + [option1Button.titleLabel setTextAlignment:UITextAlignmentCenter]; + + // Set label multilines: IB lack ! + [option2Button.titleLabel setLineBreakMode:UILineBreakModeWordWrap]; + [option2Button.titleLabel setTextAlignment:UITextAlignmentCenter]; + + // Set label multilines: IB lack ! + [option3Button.titleLabel setLineBreakMode:UILineBreakModeWordWrap]; + [option3Button.titleLabel setTextAlignment:UITextAlignmentCenter]; + [super viewDidLoad]; } diff --git a/Classes/LinphoneUI/UIMainBar.m b/Classes/LinphoneUI/UIMainBar.m index 78fd80272..170a5d787 100644 --- a/Classes/LinphoneUI/UIMainBar.m +++ b/Classes/LinphoneUI/UIMainBar.m @@ -305,13 +305,12 @@ } */ - /* - if([view equal:[ChatViewController compositeViewDescription]]) { + + if([view equal:[MoreViewController compositeViewDescription]]) { moreButton.selected = TRUE; } else { moreButton.selected = FALSE; } - */ } @@ -343,7 +342,7 @@ */ - (IBAction)onMoreClick: (id) event { - //[[PhoneMainView instance] changeView:PhoneView_Chat]; + [[PhoneMainView instance] changeCurrentView:[MoreViewController compositeViewDescription]]; } diff --git a/Classes/MoreViewController.h b/Classes/MoreViewController.h index 896a3a003..60c06de41 100644 --- a/Classes/MoreViewController.h +++ b/Classes/MoreViewController.h @@ -19,26 +19,20 @@ #import +#import "UICompositeViewController.h" + @class ConsoleViewController; -@interface MoreViewController : UITableViewController { - - bool isLogViewEnabled; - - UITableViewCell *credit; - UITextView *creditText; - - UITableViewCell *web; - UILabel *weburi; - UITableViewCell *console; - - ConsoleViewController *consoleViewController; - bool isDebug; +@interface MoreViewController : UIViewController { + @private + UIButton *linkButton; + UILabel *nameLabel; + UILabel *versionLabel; } -@property (nonatomic, retain) IBOutlet UITableViewCell* web; -@property (nonatomic, retain) IBOutlet UITableViewCell* credit; -@property (nonatomic, retain) IBOutlet UITableViewCell* console; -@property (nonatomic, retain) IBOutlet UITextView *creditText; -@property (nonatomic, retain) IBOutlet UILabel *weburi; +@property (nonatomic, retain) IBOutlet UIButton *linkButton; +@property (nonatomic, retain) IBOutlet UILabel *nameLabel; +@property (nonatomic, retain) IBOutlet UILabel *versionLabel; + +- (IBAction)onLinkClick:(id) event; @end diff --git a/Classes/MoreViewController.m b/Classes/MoreViewController.m index 4e5d97e2f..dfd5f197a 100644 --- a/Classes/MoreViewController.m +++ b/Classes/MoreViewController.m @@ -24,107 +24,54 @@ @implementation MoreViewController -@synthesize web; -@synthesize credit; -@synthesize console; -@synthesize creditText; -@synthesize weburi; +@synthesize linkButton; +@synthesize nameLabel; +@synthesize versionLabel; #pragma mark - Lifecycle Functions -- (void)viewDidLoad { - [super viewDidLoad]; - [creditText setText: [NSString stringWithFormat:creditText.text,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; - consoleViewController = [[ConsoleViewController alloc] initWithNibName:@"ConsoleViewController" bundle:[NSBundle mainBundle]]; - //[[LinphoneManager instance] registerLogView:consoleViewController]; - isDebug = lp_config_get_int(linphone_core_get_config([LinphoneManager getLc]),"app","debugenable_preference",0); - -} - - (void)dealloc { - [credit release]; - [creditText release]; - - [web release]; - [weburi release]; - [console release]; - - [consoleViewController release]; + [linkButton release]; + [nameLabel release]; + [versionLabel release]; [super dealloc]; } -#pragma mark - +#pragma mark - ViewController Functions --(void) enableLogView { - isLogViewEnabled = true; +- (void)viewDidLoad { + [versionLabel setText:[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey]]; + [nameLabel setText:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]]; } -#pragma mark - UITableViewDelegate Functions +#pragma mark - UICompositeViewDelegate Functions -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 2; -} +static UICompositeViewDescription *compositeDescription = nil; - -#pragma mark - UITableViewDataSource Functions - -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - return 230; - } else { - return 44; - } -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 0) { - return 1; - } else { - if (isDebug) { - return 2; - } else { - return 1; - } - } -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.section == 0) { - return credit; - } else { - switch (indexPath.row) { - case 0: return web; - case 1: return console; - } - } - return nil; -} - -- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { - - [self tableView:tableView didSelectRowAtIndexPath:indexPath]; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - - - [tableView deselectRowAtIndexPath:indexPath animated:NO]; - - switch (indexPath.row) { - case 0: { - NSURL *url = [NSURL URLWithString:weburi.text]; - [[UIApplication sharedApplication] openURL:url]; - break; - }; - case 1: { - [self.navigationController pushViewController:consoleViewController animated:true]; - break; - } ++ (UICompositeViewDescription *)compositeViewDescription { + if(compositeDescription == nil) { + compositeDescription = [[UICompositeViewDescription alloc] init:@"More" + content:@"MoreViewController" + stateBar:nil + stateBarEnabled:false + tabBar: @"UIMainBar" + tabBarEnabled:true + fullscreen:false + landscapeMode:[LinphoneManager runningOnIpad] + portraitMode:true]; } - + return compositeDescription; +} + + +#pragma mark - Action Functions + +- (IBAction)onLinkClick:(id) event { + NSURL *url = [NSURL URLWithString:[linkButton titleForState:UIControlStateNormal]]; + [[UIApplication sharedApplication] openURL:url]; } @end diff --git a/Classes/MoreViewController.xib b/Classes/MoreViewController.xib index f035483ed..aeea14983 100644 --- a/Classes/MoreViewController.xib +++ b/Classes/MoreViewController.xib @@ -13,12 +13,10 @@ YES IBProxyObject + IBUIButton IBUIImageView IBUILabel - IBUITableView - IBUITableViewCell - IBUITextView - IBUIViewController + IBUIView YES @@ -38,335 +36,183 @@ IBFirstResponder IBCocoaTouchFramework - - - - 274 - {320, 247} - - - - 10 - - 549453824 - {512, 1} - - YES - - YES - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - - groupTableViewBackgroundColor - - NO - YES - NO - IBCocoaTouchFramework - NO - 1 - 1 - 0 - YES - 44 - 10 - 10 - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - 292 + + + 274 YES - - - 256 - - YES - - - 292 - {{20, 0}, {300, 44}} - - NO - YES - NO - IBCocoaTouchFramework - http://www.linphone.org - - 1 - MCAwLjUwMTk2MDgxIDEAA - - - 1 - 10 - - 1 - 17 - - - Helvetica - 17 - 16 - - + + + 293 + {{124, 20}, {72, 72}} + + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + castel_icon_72.png - {300, 44} - - + + + + 290 + {{20, 100}, {280, 35}} + + + + _NS:9 NO YES - 4 - YES + 7 + NO IBCocoaTouchFramework - - - {320, 44} - - 1 - MSAxIDEAA - - NO - IBCocoaTouchFramework - 1 - - - - - 292 - - YES - - - 256 - - YES - - - 292 - {{20, 0}, {300, 44}} - - NO - YES - NO - IBCocoaTouchFramework - Console - - 1 - MCAwIDAAA - - - 1 - 10 - - - + Label + + 1 + MCAwIDAAA - {300, 44} - - + + 0 + 10 + 1 + + 2 + 27 + + + Helvetica-Bold + 27 + 16 + + + + + 290 + {{20, 143}, {280, 21}} + + + + _NS:9 NO YES - 4 - YES + 7 + NO IBCocoaTouchFramework - - - {320, 44} - - NO - IBCocoaTouchFramework - 1 - - - - - 292 - - YES - - - 256 - - YES - - - 292 - {{28, -14}, {263, 154}} - - NO - NO - 1 - NO - IBCocoaTouchFramework - - NSImage - linphone-banner.png - - - - - 292 - {{9, 109}, {301, 89}} - - NO - YES - YES - IBCocoaTouchFramework - NO - NO - NO - NO - Linphone %@ SIP (rfc3261) compatible phone under GNU General Public License V2 - 1 - - 2 - IBCocoaTouchFramework - - - - - - - 292 - {{28, 198}, {263, 21}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - © 2010 Belledonne Communications - - - 1 - 10 - 1 - - - + Label + + + 0 + 10 + 1 + + 1 + 17 + + + Helvetica + 17 + 16 + + + + + 290 + {{20, 211}, {280, 37}} + + + + _NS:9 + + 3 + MCAwAA - {322, 230} - - NO - YES - 4 - YES IBCocoaTouchFramework + 0 + 0 + http://www.castel.eu + + 1 + MC43MDE5NjA3ODQzIDAuNzg4MjM1Mjk0MSAwLjA1MDk4MDM5MjE2AA + + + 5 + MSAwLjYwMDAwMDAyMzggMCAwLjA1OTk5OTk5ODY2AA + + 3 + + 1 0.6 0 0.06 1 + + + 3 + MC41AA + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + - {322, 230} - - NO - NO + {320, 460} + + + + _NS:9 + IBCocoaTouchFramework - YES - - - web - - - - 32 - - - - console - - - - 40 - - - - credit - - - - 46 - view - + - 47 + 52 - creditText + nameLabel - + - 48 + 58 - weburi + versionLabel - + - 50 + 59 + + + + linkButton + + + + 62 + + + + onLinkClick: + + + 7 + + 61 @@ -392,75 +238,40 @@ AAgACAAIAAEAAQABAAE - 4 - + 51 + YES - + + + + - 25 - - - YES - - - - web + 54 + + + logoImage - 34 - - + 55 + + + nameLabel - 38 - - - YES - - - - console + 56 + + + versionLabel - 39 - - - - - 42 - - - YES - - - - - - about - - - 43 - - - - - 45 - - - - - 18 - - - - - 49 - - + 60 + + + linkButton @@ -472,16 +283,12 @@ AAgACAAIAAEAAQABAAE -1.IBPluginDependency -2.CustomClassName -2.IBPluginDependency - 18.IBPluginDependency - 25.IBPluginDependency - 34.IBPluginDependency - 38.IBPluginDependency - 39.IBPluginDependency - 4.IBPluginDependency - 42.IBPluginDependency - 43.IBPluginDependency - 45.IBPluginDependency - 49.IBPluginDependency + 51.IBPluginDependency + 54.IBPluginDependency + 55.IBPluginDependency + 56.IBPluginDependency + 60.IBPluginDependency + 60.IBUIButtonInspectorSelectedStateConfigurationMetadataKey YES @@ -494,11 +301,7 @@ AAgACAAIAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -513,30 +316,39 @@ AAgACAAIAAEAAQABAAE - 50 + 62 YES MoreViewController - UITableViewController + UIViewController + + onLinkClick: + id + + + onLinkClick: + + onLinkClick: + id + + YES YES - console - credit - creditText - web - weburi + linkButton + linkLabel + nameLabel + versionLabel YES - UITableViewCell - UITableViewCell - UITextView - UITableViewCell + UIButton + UILabel + UILabel UILabel @@ -544,32 +356,27 @@ AAgACAAIAAEAAQABAAE YES YES - console - credit - creditText - web - weburi + linkButton + linkLabel + nameLabel + versionLabel YES - console - UITableViewCell + linkButton + UIButton - credit - UITableViewCell + linkLabel + UILabel - creditText - UITextView + nameLabel + UILabel - web - UITableViewCell - - - weburi + versionLabel UILabel @@ -598,8 +405,8 @@ AAgACAAIAAEAAQABAAE YES 3 - linphone-banner.png - {300, 100} + castel_icon_72.png + {72, 72} 1498 diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index a67106e4e..bd91b10bc 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -28,6 +28,9 @@ #import "ChatRoomViewController.h" #import "ChatViewController.h" */ +/* MODIFICATION: Add more*/ +#import "MoreViewController.h" +/**/ #import "DialerViewController.h" #import "ContactsViewController.h" #import "ContactDetailsViewController.h" diff --git a/Resources/castel_icon_57.png b/Resources/castel_icon_57.png index a8534e59c..e12cab0c4 100644 Binary files a/Resources/castel_icon_57.png and b/Resources/castel_icon_57.png differ diff --git a/Resources/castel_icon_72.png b/Resources/castel_icon_72.png index 9a9385a21..d927f6f4f 100644 Binary files a/Resources/castel_icon_72.png and b/Resources/castel_icon_72.png differ diff --git a/linphone-Info.plist b/castel-Info.plist similarity index 100% rename from linphone-Info.plist rename to castel-Info.plist diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 8b94f3e2e..a736df5f1 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1193,7 +1193,7 @@ 7066FC0B13E830E400EFC6DC /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "liblinphone-sdk/apple-darwin/lib/libvpx.a"; sourceTree = ""; }; 70E542F213E147E3002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 70E542F413E147EB002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; + 8D1107310486CEB800E47090 /* castel-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "castel-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; C90FAA7615AF54E6002091CB /* HistoryDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryDetailsViewController.h; sourceTree = ""; }; C90FAA7715AF54E6002091CB /* HistoryDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryDetailsViewController.m; sourceTree = ""; }; C90FAA7815AF54E6002091CB /* HistoryDetailsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryDetailsViewController.xib; sourceTree = ""; }; @@ -2568,7 +2568,7 @@ D3432A70158A45AF001C6B0B /* led_disconnected.png */, D3432A5D158A4446001C6B0B /* led_error.png */, D3432A6F158A45AF001C6B0B /* led_inprogress.png */, - 8D1107310486CEB800E47090 /* linphone-Info.plist */, + 8D1107310486CEB800E47090 /* castel-Info.plist */, 2274550710700509006EC466 /* linphonerc */, 341FCA8D149798210084BC26 /* linphonerc-ipad */, D3EA5416159858A80037DC6B /* list_delete_default.png */, @@ -3914,7 +3914,7 @@ classes/Utils/XMLRPC/, /usr/include/libxml2, ); - INFOPLIST_FILE = "linphone-Info.plist"; + INFOPLIST_FILE = "castel-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -3990,7 +3990,7 @@ classes/Utils/XMLRPC/, /usr/include/libxml2, ); - INFOPLIST_FILE = "linphone-Info.plist"; + INFOPLIST_FILE = "castel-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -4040,7 +4040,7 @@ classes/Utils/XMLRPC/, /usr/include/libxml2, ); - INFOPLIST_FILE = "linphone-Info.plist"; + INFOPLIST_FILE = "castel-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -4090,7 +4090,7 @@ classes/Utils/XMLRPC/, /usr/include/libxml2, ); - INFOPLIST_FILE = "linphone-Info.plist"; + INFOPLIST_FILE = "castel-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -4141,7 +4141,7 @@ classes/Utils/XMLRPC/, /usr/include/libxml2, ); - INFOPLIST_FILE = "linphone-Info.plist"; + INFOPLIST_FILE = "castel-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -4192,7 +4192,7 @@ classes/Utils/XMLRPC/, /usr/include/libxml2, ); - INFOPLIST_FILE = "linphone-Info.plist"; + INFOPLIST_FILE = "castel-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -4266,7 +4266,7 @@ classes/Utils/XMLRPC/, /usr/include/libxml2, ); - INFOPLIST_FILE = "linphone-Info.plist"; + INFOPLIST_FILE = "castel-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", @@ -4341,7 +4341,7 @@ classes/Utils/XMLRPC/, /usr/include/libxml2, ); - INFOPLIST_FILE = "linphone-Info.plist"; + INFOPLIST_FILE = "castel-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"",