From 0171280687d7767d5596df9ba6df57de9ecf0dd8 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 6 Aug 2012 16:45:29 +0200 Subject: [PATCH] Fix castel application --- Classes/InCallViewController.m | 6 +- Classes/LinphoneCoreSettingsStore.m | 2 +- Classes/LinphoneUI/UICallBar.m | 12 + Classes/LinphoneUI/UIMainBar.m | 7 +- Classes/MoreViewController.h | 30 +- Classes/MoreViewController.m | 117 ++--- Classes/MoreViewController.xib | 603 ++++++++--------------- Classes/PhoneMainView.h | 3 + Resources/castel_icon_57.png | Bin 5149 -> 3318 bytes Resources/castel_icon_72.png | Bin 6429 -> 4022 bytes linphone-Info.plist => castel-Info.plist | 0 linphone.xcodeproj/project.pbxproj | 20 +- 12 files changed, 282 insertions(+), 518 deletions(-) rename linphone-Info.plist => castel-Info.plist (100%) 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 a8534e59c5c5a8e814537f69ae6f453241dc25fd..e12cab0c4654d31f3a1136ba3a4fb0625b2f6549 100644 GIT binary patch literal 3318 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 AL;wH) literal 5149 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 literal 6429 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 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\"",