diff --git a/Classes/IncomingCallViewController.xib b/Classes/IncomingCallViewController.xib index 1c3f4556d..3f02b95b7 100644 --- a/Classes/IncomingCallViewController.xib +++ b/Classes/IncomingCallViewController.xib @@ -4587,6 +4587,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE IBCocoaTouchFramework 0 0 + NO + NO 3 MC41AA @@ -4595,6 +4597,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE NSImage accept_over.png + + NSImage + accept_disabled.png + NSImage accept_default.png @@ -4624,6 +4630,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE IBCocoaTouchFramework 0 0 + NO + NO NSImage @@ -4832,7 +4840,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -4900,10 +4908,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 3 {320, 154} + {320, 154} {320, 154} {640, 523} {320, 339} - {16, 16} + {640, 523} {640, 125} {320, 154} {320, 154} diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 6f9234573..0123e94d8 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -146,12 +146,13 @@ int __aeabi_idiv(int a, int b) { [[PhoneMainView instance] changeView: PhoneView_FirstLogin]; } else { // Change to default view + /* MODIFICATION: Disable Wizard const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]); - if(list != NULL) { + if(list != NULL) {*/ [[PhoneMainView instance] changeView: PhoneView_Dialer]; - } else { + /*} else { [[PhoneMainView instance] changeView: PhoneView_Wizard]; - } + }*/ } [UIDevice currentDevice].batteryMonitoringEnabled = YES; diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m index 99c970dca..8f9dbd992 100644 --- a/Classes/LinphoneUI/UICallBar.m +++ b/Classes/LinphoneUI/UICallBar.m @@ -357,6 +357,7 @@ - (IBAction)onOptionsTransferClick:(id)sender { [self hideOptions]; + /* MODIFICATION: Disable tansfer // Go to dialer view NSDictionary *dict = [[[NSDictionary alloc] initWithObjectsAndKeys: [[[NSArray alloc] initWithObjects: @"", nil] autorelease] @@ -365,6 +366,7 @@ , @"setTransferMode:", nil] autorelease]; [[PhoneMainView instance] changeView:PhoneView_Dialer dict:dict]; + */ } - (IBAction)onOptionsAddClick:(id)sender { diff --git a/Classes/LinphoneUI/UICallBar.xib b/Classes/LinphoneUI/UICallBar.xib index ed272ddb2..4bdb7a8e4 100644 --- a/Classes/LinphoneUI/UICallBar.xib +++ b/Classes/LinphoneUI/UICallBar.xib @@ -2,10 +2,10 @@ 1296 - 11D50 + 11E53 2182 - 1138.32 - 568.00 + 1138.47 + 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin 1181 @@ -14,6 +14,7 @@ IBUIButton IBUIActivityIndicatorView IBUIView + IBUIImageView IBProxyObject @@ -42,7 +43,6 @@ {{0, 335}, {320, 125}} - _NS:9 1 @@ -59,10 +59,27 @@ -2147483360 + + + 274 + {320, 460} + + + _NS:9 + NO + + + + IBCocoaTouchFramework + + NSImage + background.png + + 292 - {{-20, 10}, {107, 54}} + {{0, 67}, {107, 54}} @@ -102,7 +119,7 @@ 292 - {{87, 10}, {106, 54}} + {{107, 67}, {106, 54}} @@ -126,7 +143,7 @@ 292 - {{193, 10}, {107, 54}} + {{213, 67}, {107, 54}} @@ -150,7 +167,7 @@ 292 - {{-20, 72}, {107, 54}} + {{0, 129}, {107, 54}} @@ -174,7 +191,7 @@ 292 - {{87, 72}, {106, 54}} + {{107, 129}, {106, 54}} @@ -198,7 +215,7 @@ 292 - {{193, 72}, {107, 54}} + {{213, 129}, {107, 54}} @@ -222,7 +239,7 @@ 292 - {{-20, 134}, {107, 54}} + {{0, 191}, {107, 54}} @@ -246,7 +263,7 @@ 292 - {{87, 134}, {106, 54}} + {{107, 191}, {106, 54}} @@ -270,7 +287,7 @@ 292 - {{193, 134}, {107, 54}} + {{213, 191}, {107, 54}} @@ -294,7 +311,7 @@ 292 - {{-20, 196}, {107, 54}} + {{0, 253}, {107, 54}} @@ -318,7 +335,7 @@ 292 - {{87, 196}, {106, 54}} + {{107, 253}, {106, 54}} @@ -342,7 +359,7 @@ 292 - {{193, 196}, {107, 54}} + {{213, 253}, {107, 54}} @@ -364,7 +381,7 @@ - {{20, 57}, {281, 260}} + {320, 460} @@ -384,7 +401,7 @@ - 292 + -2147483356 {80, 67} @@ -1150,6 +1167,7 @@ + pad @@ -1254,6 +1272,12 @@ optionsTansferButton + + 99 + + + background + @@ -1329,12 +1353,13 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 98 + 99 @@ -1599,6 +1624,7 @@ YES 3 + {640, 523} {209, 136} {209, 136} {209, 136} @@ -1633,9 +1659,9 @@ {220, 113} {220, 113} {220, 113} - {155, 137} - {155, 137} - {155, 137} + {160, 134} + {160, 134} + {160, 134} {160, 134} {160, 134} {160, 134} diff --git a/Classes/LinphoneUI/UIMainBar.h b/Classes/LinphoneUI/UIMainBar.h index efb58843e..ebd208cc5 100644 --- a/Classes/LinphoneUI/UIMainBar.h +++ b/Classes/LinphoneUI/UIMainBar.h @@ -24,17 +24,17 @@ UIButton *contactsButton; UIButton *dialerButton; UIButton *settingsButton; - UIButton *chatButton; + UIButton *moreButton; } @property (nonatomic, retain) IBOutlet UIButton* historyButton; @property (nonatomic, retain) IBOutlet UIButton* contactsButton; @property (nonatomic, retain) IBOutlet UIButton* dialerButton; @property (nonatomic, retain) IBOutlet UIButton* settingsButton; -@property (nonatomic, retain) IBOutlet UIButton* chatButton; +@property (nonatomic, retain) IBOutlet UIButton* moreButton; -(IBAction) onHistoryClick: (id) event; -(IBAction) onContactsClick: (id) event; -(IBAction) onDialerClick: (id) event; -(IBAction) onSettingsClick: (id) event; --(IBAction) onChatClick: (id) event; +-(IBAction) onMoreClick: (id) event; @end diff --git a/Classes/LinphoneUI/UIMainBar.m b/Classes/LinphoneUI/UIMainBar.m index 8c498efd1..0b3a3b5a4 100644 --- a/Classes/LinphoneUI/UIMainBar.m +++ b/Classes/LinphoneUI/UIMainBar.m @@ -26,7 +26,7 @@ @synthesize contactsButton; @synthesize dialerButton; @synthesize settingsButton; -@synthesize chatButton; +@synthesize moreButton; #pragma mark - Lifecycle Functions @@ -42,7 +42,7 @@ [contactsButton release]; [dialerButton release]; [settingsButton release]; - [chatButton release]; + [moreButton release]; [super dealloc]; } @@ -102,9 +102,9 @@ settingsButton.selected = FALSE; } if(view == PhoneView_Chat || view == PhoneView_ChatRoom) { - chatButton.selected = TRUE; + moreButton.selected = TRUE; } else { - chatButton.selected = FALSE; + moreButton.selected = FALSE; } } @@ -127,7 +127,7 @@ [[PhoneMainView instance] changeView:PhoneView_Settings]; } -- (IBAction)onChatClick: (id) event { +- (IBAction)onMoreClick: (id) event { [[PhoneMainView instance] changeView:PhoneView_Chat]; } diff --git a/Classes/LinphoneUI/UIMainBar.xib b/Classes/LinphoneUI/UIMainBar.xib index fa4fa09b3..0133c226e 100644 --- a/Classes/LinphoneUI/UIMainBar.xib +++ b/Classes/LinphoneUI/UIMainBar.xib @@ -198,7 +198,6 @@ {{256, 0}, {64, 77}} - _NS:9 NO @@ -211,15 +210,15 @@ NSImage - chat_over.png + more_over.png NSImage - chat_selected.png + more_selected.png NSImage - chat_default.png + more_default.png @@ -264,14 +263,6 @@ 27 - - - chatButton - - - - 28 - settingsButton @@ -288,14 +279,22 @@ 12 + + + moreButton + + + + 31 + - onChatClick: + onMoreClick: 7 - 26 + 30 @@ -374,12 +373,6 @@ mask - - 5 - - - chat - 6 @@ -404,6 +397,12 @@ dialer + + 5 + + + more + @@ -415,7 +414,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -429,7 +428,7 @@ - 29 + 31 @@ -437,17 +436,13 @@ UIMainBar UIViewController - id id id id + id id - - onChatClick: - id - onContactsClick: id @@ -460,23 +455,23 @@ onHistoryClick: id + + onMoreClick: + id + onSettingsClick: id - UIButton UIButton UIButton UIButton + UIButton UIButton - - chatButton - UIButton - contactsButton UIButton @@ -489,6 +484,10 @@ historyButton UIButton + + moreButton + UIButton + settingsButton UIButton @@ -510,9 +509,6 @@ YES 3 - {128, 154} - {128, 154} - {128, 154} {128, 154} {128, 154} {128, 154} @@ -522,6 +518,9 @@ {128, 154} {128, 154} {128, 154} + {128, 154} + {128, 154} + {128, 154} {128, 154} {128, 154} {128, 154} diff --git a/Resources/accept_default.png b/Resources/accept_default.png index c0beb94b7..c862fedbf 100644 Binary files a/Resources/accept_default.png and b/Resources/accept_default.png differ diff --git a/Resources/accept_disabled.png b/Resources/accept_disabled.png new file mode 100644 index 000000000..8a28eade2 Binary files /dev/null and b/Resources/accept_disabled.png differ diff --git a/Resources/accept_over.png b/Resources/accept_over.png index a867303e8..6864ec1e7 100644 Binary files a/Resources/accept_over.png and b/Resources/accept_over.png differ diff --git a/Resources/add_call_default.png b/Resources/add_call_default.png index 0932c749d..fb8b4523e 100644 Binary files a/Resources/add_call_default.png and b/Resources/add_call_default.png differ diff --git a/Resources/add_call_disabled.png b/Resources/add_call_disabled.png index caee628d0..a3aca2a65 100644 Binary files a/Resources/add_call_disabled.png and b/Resources/add_call_disabled.png differ diff --git a/Resources/add_call_over.png b/Resources/add_call_over.png index 09e5b9197..357edef6f 100644 Binary files a/Resources/add_call_over.png and b/Resources/add_call_over.png differ diff --git a/Resources/add_contact_default.png b/Resources/add_contact_default.png index 5da115460..5e1e91f77 100644 Binary files a/Resources/add_contact_default.png and b/Resources/add_contact_default.png differ diff --git a/Resources/add_contact_disabled.png b/Resources/add_contact_disabled.png index f140e980b..1ad2cb96a 100644 Binary files a/Resources/add_contact_disabled.png and b/Resources/add_contact_disabled.png differ diff --git a/Resources/add_contact_over.png b/Resources/add_contact_over.png index 0230d7e76..469981c70 100644 Binary files a/Resources/add_contact_over.png and b/Resources/add_contact_over.png differ diff --git a/Resources/avatar_shadow.png b/Resources/avatar_shadow.png index 7a8aac483..2a58904e0 100644 Binary files a/Resources/avatar_shadow.png and b/Resources/avatar_shadow.png differ diff --git a/Resources/avatar_shadow_small.png b/Resources/avatar_shadow_small.png index 3ed9782c6..b39125522 100644 Binary files a/Resources/avatar_shadow_small.png and b/Resources/avatar_shadow_small.png differ diff --git a/Resources/avatar_unknown.png b/Resources/avatar_unknown.png index 1d1a7f705..41597a554 100644 Binary files a/Resources/avatar_unknown.png and b/Resources/avatar_unknown.png differ diff --git a/Resources/avatar_unknown_small.png b/Resources/avatar_unknown_small.png index 143da1512..b379a40a5 100644 Binary files a/Resources/avatar_unknown_small.png and b/Resources/avatar_unknown_small.png differ diff --git a/Resources/back_default.png b/Resources/back_default.png index d7088080a..ac02bf5e1 100644 Binary files a/Resources/back_default.png and b/Resources/back_default.png differ diff --git a/Resources/back_disabled.png b/Resources/back_disabled.png index d6e641fa5..09216433b 100644 Binary files a/Resources/back_disabled.png and b/Resources/back_disabled.png differ diff --git a/Resources/back_over.png b/Resources/back_over.png index d06321994..9d07951c1 100644 Binary files a/Resources/back_over.png and b/Resources/back_over.png differ diff --git a/Resources/background.png b/Resources/background.png index 062a1eca5..212425545 100644 Binary files a/Resources/background.png and b/Resources/background.png differ diff --git a/Resources/backspace_default.png b/Resources/backspace_default.png index b19ba4fa1..25e4766c5 100644 Binary files a/Resources/backspace_default.png and b/Resources/backspace_default.png differ diff --git a/Resources/backspace_disabled.png b/Resources/backspace_disabled.png index 4953afb51..f498fa870 100644 Binary files a/Resources/backspace_disabled.png and b/Resources/backspace_disabled.png differ diff --git a/Resources/backspace_over.png b/Resources/backspace_over.png index abd0e13a6..8a68bf84e 100644 Binary files a/Resources/backspace_over.png and b/Resources/backspace_over.png differ diff --git a/Resources/button_alert_background_default.png b/Resources/button_alert_background_default.png index 6c3578ed2..8b273beb5 100644 Binary files a/Resources/button_alert_background_default.png and b/Resources/button_alert_background_default.png differ diff --git a/Resources/button_alert_background_over.png b/Resources/button_alert_background_over.png index 4c5247427..c25ddb72a 100644 Binary files a/Resources/button_alert_background_over.png and b/Resources/button_alert_background_over.png differ diff --git a/Resources/button_background_default.png b/Resources/button_background_default.png index 31efad8aa..8534c1df6 100644 Binary files a/Resources/button_background_default.png and b/Resources/button_background_default.png differ diff --git a/Resources/button_background_over.png b/Resources/button_background_over.png index 44813921c..bd25966dd 100644 Binary files a/Resources/button_background_over.png and b/Resources/button_background_over.png differ diff --git a/Resources/call_default.png b/Resources/call_default.png index fc2792247..3f6db3616 100644 Binary files a/Resources/call_default.png and b/Resources/call_default.png differ diff --git a/Resources/call_disabled.png b/Resources/call_disabled.png index 5600f1945..0ba073f3c 100644 Binary files a/Resources/call_disabled.png and b/Resources/call_disabled.png differ diff --git a/Resources/call_over.png b/Resources/call_over.png index 9cbf18c60..43a8a5a1b 100644 Binary files a/Resources/call_over.png and b/Resources/call_over.png differ diff --git a/Resources/call_quality_indicator_0.png b/Resources/call_quality_indicator_0.png index 7bdaf40ab..23ca23407 100644 Binary files a/Resources/call_quality_indicator_0.png and b/Resources/call_quality_indicator_0.png differ diff --git a/Resources/call_quality_indicator_1.png b/Resources/call_quality_indicator_1.png index 2cca9b39c..9ad6552b8 100644 Binary files a/Resources/call_quality_indicator_1.png and b/Resources/call_quality_indicator_1.png differ diff --git a/Resources/call_quality_indicator_2.png b/Resources/call_quality_indicator_2.png index adab949fc..1464fa150 100644 Binary files a/Resources/call_quality_indicator_2.png and b/Resources/call_quality_indicator_2.png differ diff --git a/Resources/call_quality_indicator_3.png b/Resources/call_quality_indicator_3.png index 91118ff60..a0052e628 100644 Binary files a/Resources/call_quality_indicator_3.png and b/Resources/call_quality_indicator_3.png differ diff --git a/Resources/call_state_delete_default.png b/Resources/call_state_delete_default.png index 8c1843de8..5924865cd 100644 Binary files a/Resources/call_state_delete_default.png and b/Resources/call_state_delete_default.png differ diff --git a/Resources/call_state_delete_over.png b/Resources/call_state_delete_over.png index bc01f8f5d..8a6b32ad2 100644 Binary files a/Resources/call_state_delete_over.png and b/Resources/call_state_delete_over.png differ diff --git a/Resources/call_state_outgoing_default.png b/Resources/call_state_outgoing_default.png index ca1f8f99b..2e1c01c73 100644 Binary files a/Resources/call_state_outgoing_default.png and b/Resources/call_state_outgoing_default.png differ diff --git a/Resources/call_state_pause_default.png b/Resources/call_state_pause_default.png index 0ca4db8c1..6d19e9bbb 100644 Binary files a/Resources/call_state_pause_default.png and b/Resources/call_state_pause_default.png differ diff --git a/Resources/call_state_pause_over.png b/Resources/call_state_pause_over.png index a2a15e52b..68e95ab4c 100644 Binary files a/Resources/call_state_pause_over.png and b/Resources/call_state_pause_over.png differ diff --git a/Resources/call_state_play_default.png b/Resources/call_state_play_default.png index cf455e337..cd341aadb 100644 Binary files a/Resources/call_state_play_default.png and b/Resources/call_state_play_default.png differ diff --git a/Resources/call_state_play_over.png b/Resources/call_state_play_over.png index 42d81a845..dda84a833 100644 Binary files a/Resources/call_state_play_over.png and b/Resources/call_state_play_over.png differ diff --git a/Resources/call_state_ringing_default.png b/Resources/call_state_ringing_default.png index 1231ba873..141333a59 100644 Binary files a/Resources/call_state_ringing_default.png and b/Resources/call_state_ringing_default.png differ diff --git a/Resources/call_status_incoming.png b/Resources/call_status_incoming.png index 2ce5c676e..4457d58fe 100644 Binary files a/Resources/call_status_incoming.png and b/Resources/call_status_incoming.png differ diff --git a/Resources/call_status_missed.png b/Resources/call_status_missed.png index 426dee899..4459e2ccd 100644 Binary files a/Resources/call_status_missed.png and b/Resources/call_status_missed.png differ diff --git a/Resources/call_status_outgoing.png b/Resources/call_status_outgoing.png index 645875ce1..6959fac73 100644 Binary files a/Resources/call_status_outgoing.png and b/Resources/call_status_outgoing.png differ diff --git a/Resources/castel_icon_57.png b/Resources/castel_icon_57.png new file mode 100644 index 000000000..a8534e59c Binary files /dev/null and b/Resources/castel_icon_57.png differ diff --git a/Resources/castel_icon_72.png b/Resources/castel_icon_72.png new file mode 100644 index 000000000..9a9385a21 Binary files /dev/null and b/Resources/castel_icon_72.png differ diff --git a/Resources/cell_call.png b/Resources/cell_call.png index f4fd83b8f..fb579f8a3 100644 Binary files a/Resources/cell_call.png and b/Resources/cell_call.png differ diff --git a/Resources/cell_call_first.png b/Resources/cell_call_first.png index 17b55ffef..c9f8ceb77 100644 Binary files a/Resources/cell_call_first.png and b/Resources/cell_call_first.png differ diff --git a/Resources/cell_call_first_highlight.png b/Resources/cell_call_first_highlight.png index 99ea085a6..4bad137b4 100644 Binary files a/Resources/cell_call_first_highlight.png and b/Resources/cell_call_first_highlight.png differ diff --git a/Resources/cell_call_highlight.png b/Resources/cell_call_highlight.png index 4aaf77e56..c9bc52f22 100644 Binary files a/Resources/cell_call_highlight.png and b/Resources/cell_call_highlight.png differ diff --git a/Resources/cell_conference.png b/Resources/cell_conference.png index ca5088ff3..7580591ff 100644 Binary files a/Resources/cell_conference.png and b/Resources/cell_conference.png differ diff --git a/Resources/conference_default.png b/Resources/conference_default.png index ca03a9940..e0fea8a9b 100644 Binary files a/Resources/conference_default.png and b/Resources/conference_default.png differ diff --git a/Resources/conference_over.png b/Resources/conference_over.png index 6446f9dea..ad34322f8 100644 Binary files a/Resources/conference_over.png and b/Resources/conference_over.png differ diff --git a/Resources/contact_back_default.png b/Resources/contact_back_default.png index 3c90a7bb6..67dbf6e49 100644 Binary files a/Resources/contact_back_default.png and b/Resources/contact_back_default.png differ diff --git a/Resources/contact_back_over.png b/Resources/contact_back_over.png index ce56ede38..2d3ebe52c 100644 Binary files a/Resources/contact_back_over.png and b/Resources/contact_back_over.png differ diff --git a/Resources/contact_edit_background.png b/Resources/contact_edit_background.png new file mode 100644 index 000000000..9f98bc469 Binary files /dev/null and b/Resources/contact_edit_background.png differ diff --git a/Resources/contact_edit_default.png b/Resources/contact_edit_default.png index 428ce5df8..a822d24e2 100644 Binary files a/Resources/contact_edit_default.png and b/Resources/contact_edit_default.png differ diff --git a/Resources/contact_edit_over.png b/Resources/contact_edit_over.png index 62c0a4c34..c169ba807 100644 Binary files a/Resources/contact_edit_over.png and b/Resources/contact_edit_over.png differ diff --git a/Resources/contact_ok_default.png b/Resources/contact_ok_default.png index 0c49ac3d5..f0509b333 100644 Binary files a/Resources/contact_ok_default.png and b/Resources/contact_ok_default.png differ diff --git a/Resources/contact_ok_over.png b/Resources/contact_ok_over.png index 4fe6248f8..95ef58896 100644 Binary files a/Resources/contact_ok_over.png and b/Resources/contact_ok_over.png differ diff --git a/Resources/contacts_add_default.png b/Resources/contacts_add_default.png index 786389930..0e37bd11e 100644 Binary files a/Resources/contacts_add_default.png and b/Resources/contacts_add_default.png differ diff --git a/Resources/contacts_add_over.png b/Resources/contacts_add_over.png index 247777430..9e33c3886 100644 Binary files a/Resources/contacts_add_over.png and b/Resources/contacts_add_over.png differ diff --git a/Resources/contacts_all_default.png b/Resources/contacts_all_default.png index d062ce11c..60e8411a4 100644 Binary files a/Resources/contacts_all_default.png and b/Resources/contacts_all_default.png differ diff --git a/Resources/contacts_all_selected.png b/Resources/contacts_all_selected.png index 18e7eebd4..4fdac7964 100644 Binary files a/Resources/contacts_all_selected.png and b/Resources/contacts_all_selected.png differ diff --git a/Resources/contacts_default.png b/Resources/contacts_default.png index 88039d6c5..e9327ece9 100644 Binary files a/Resources/contacts_default.png and b/Resources/contacts_default.png differ diff --git a/Resources/contacts_linphone_default.png b/Resources/contacts_linphone_default.png index 0a75d15f0..feb11828a 100644 Binary files a/Resources/contacts_linphone_default.png and b/Resources/contacts_linphone_default.png differ diff --git a/Resources/contacts_linphone_selected.png b/Resources/contacts_linphone_selected.png index 9d240afeb..d36e891e4 100644 Binary files a/Resources/contacts_linphone_selected.png and b/Resources/contacts_linphone_selected.png differ diff --git a/Resources/contacts_over.png b/Resources/contacts_over.png index 1cf7fd7ab..ea8bbb116 100644 Binary files a/Resources/contacts_over.png and b/Resources/contacts_over.png differ diff --git a/Resources/contacts_selected.png b/Resources/contacts_selected.png index 002335b08..4fa9079b1 100644 Binary files a/Resources/contacts_selected.png and b/Resources/contacts_selected.png differ diff --git a/Resources/decline_default.png b/Resources/decline_default.png index 9b06bc3e7..410a0a5fe 100644 Binary files a/Resources/decline_default.png and b/Resources/decline_default.png differ diff --git a/Resources/decline_over.png b/Resources/decline_over.png index aa21a54e7..d5d69e454 100644 Binary files a/Resources/decline_over.png and b/Resources/decline_over.png differ diff --git a/Resources/dialer_address_background.png b/Resources/dialer_address_background.png index 78be45dbf..5af42efc7 100644 Binary files a/Resources/dialer_address_background.png and b/Resources/dialer_address_background.png differ diff --git a/Resources/dialer_alt_default.png b/Resources/dialer_alt_default.png index 43d512c04..0ea84f383 100644 Binary files a/Resources/dialer_alt_default.png and b/Resources/dialer_alt_default.png differ diff --git a/Resources/dialer_alt_over.png b/Resources/dialer_alt_over.png index 28567955d..22e7e8366 100644 Binary files a/Resources/dialer_alt_over.png and b/Resources/dialer_alt_over.png differ diff --git a/Resources/dialer_default.png b/Resources/dialer_default.png index b23fcbb41..5df50f362 100644 Binary files a/Resources/dialer_default.png and b/Resources/dialer_default.png differ diff --git a/Resources/dialer_over.png b/Resources/dialer_over.png index 3727c5fba..ca353c4e4 100644 Binary files a/Resources/dialer_over.png and b/Resources/dialer_over.png differ diff --git a/Resources/dialer_selected.png b/Resources/dialer_selected.png index 5883398d2..1d8684204 100644 Binary files a/Resources/dialer_selected.png and b/Resources/dialer_selected.png differ diff --git a/Resources/hangup_default.png b/Resources/hangup_default.png index c84ea15b2..330fd4738 100644 Binary files a/Resources/hangup_default.png and b/Resources/hangup_default.png differ diff --git a/Resources/hangup_over.png b/Resources/hangup_over.png index 2c95c5c1a..a5fe6b2c4 100644 Binary files a/Resources/hangup_over.png and b/Resources/hangup_over.png differ diff --git a/Resources/header_conference.png b/Resources/header_conference.png index 4e37e2512..8b19a5b00 100644 Binary files a/Resources/header_conference.png and b/Resources/header_conference.png differ diff --git a/Resources/header_incoming.png b/Resources/header_incoming.png index caacf5d18..b1c8deca7 100644 Binary files a/Resources/header_incoming.png and b/Resources/header_incoming.png differ diff --git a/Resources/history_all_default.png b/Resources/history_all_default.png index 9790cc945..3ad1b4f94 100644 Binary files a/Resources/history_all_default.png and b/Resources/history_all_default.png differ diff --git a/Resources/history_all_selected.png b/Resources/history_all_selected.png index fe9f61f2f..ee9f63c51 100644 Binary files a/Resources/history_all_selected.png and b/Resources/history_all_selected.png differ diff --git a/Resources/history_default.png b/Resources/history_default.png index 866a25a77..e31cd9193 100644 Binary files a/Resources/history_default.png and b/Resources/history_default.png differ diff --git a/Resources/history_edit_default.png b/Resources/history_edit_default.png index da43affc2..96bca05ff 100644 Binary files a/Resources/history_edit_default.png and b/Resources/history_edit_default.png differ diff --git a/Resources/history_edit_over.png b/Resources/history_edit_over.png index 032bc901d..05b248b38 100644 Binary files a/Resources/history_edit_over.png and b/Resources/history_edit_over.png differ diff --git a/Resources/history_missed_default.png b/Resources/history_missed_default.png index cb413d997..a3a9b8af9 100644 Binary files a/Resources/history_missed_default.png and b/Resources/history_missed_default.png differ diff --git a/Resources/history_missed_selected.png b/Resources/history_missed_selected.png index 0f2f99b4e..d963e677e 100644 Binary files a/Resources/history_missed_selected.png and b/Resources/history_missed_selected.png differ diff --git a/Resources/history_ok_default.png b/Resources/history_ok_default.png index 7fb188033..377e10ee8 100644 Binary files a/Resources/history_ok_default.png and b/Resources/history_ok_default.png differ diff --git a/Resources/history_ok_over.png b/Resources/history_ok_over.png index 51411d7db..880c826cd 100644 Binary files a/Resources/history_ok_over.png and b/Resources/history_ok_over.png differ diff --git a/Resources/history_over.png b/Resources/history_over.png index fbcaec907..4b7e2bc43 100644 Binary files a/Resources/history_over.png and b/Resources/history_over.png differ diff --git a/Resources/history_selected.png b/Resources/history_selected.png index b672b21f3..734c3d449 100644 Binary files a/Resources/history_selected.png and b/Resources/history_selected.png differ diff --git a/Resources/linphone_icon_57.png b/Resources/linphone_icon_57.png deleted file mode 100644 index 14e274350..000000000 Binary files a/Resources/linphone_icon_57.png and /dev/null differ diff --git a/Resources/linphone_icon_72.png b/Resources/linphone_icon_72.png deleted file mode 100644 index b01eef8c4..000000000 Binary files a/Resources/linphone_icon_72.png and /dev/null differ diff --git a/Resources/list_details_default.png b/Resources/list_details_default.png index a4856294d..7cc895046 100644 Binary files a/Resources/list_details_default.png and b/Resources/list_details_default.png differ diff --git a/Resources/list_details_over.png b/Resources/list_details_over.png index 9cecd5e59..f38132d91 100644 Binary files a/Resources/list_details_over.png and b/Resources/list_details_over.png differ diff --git a/Resources/list_highlight.png b/Resources/list_highlight.png index 929bfbdbf..5bddd1cad 100644 Binary files a/Resources/list_highlight.png and b/Resources/list_highlight.png differ diff --git a/Resources/micro_off_default.png b/Resources/micro_off_default.png index 2ec3be550..60e130e02 100644 Binary files a/Resources/micro_off_default.png and b/Resources/micro_off_default.png differ diff --git a/Resources/micro_off_disabled.png b/Resources/micro_off_disabled.png index 39f55197e..434ed642e 100644 Binary files a/Resources/micro_off_disabled.png and b/Resources/micro_off_disabled.png differ diff --git a/Resources/micro_off_over.png b/Resources/micro_off_over.png index 7c898d75d..a658d0047 100644 Binary files a/Resources/micro_off_over.png and b/Resources/micro_off_over.png differ diff --git a/Resources/micro_on_default.png b/Resources/micro_on_default.png index ca63b44ff..30c407d19 100644 Binary files a/Resources/micro_on_default.png and b/Resources/micro_on_default.png differ diff --git a/Resources/micro_on_disabled.png b/Resources/micro_on_disabled.png index 87fee6aa1..cb44afd97 100644 Binary files a/Resources/micro_on_disabled.png and b/Resources/micro_on_disabled.png differ diff --git a/Resources/micro_on_over.png b/Resources/micro_on_over.png index fd9d00a84..cb9aed7cc 100644 Binary files a/Resources/micro_on_over.png and b/Resources/micro_on_over.png differ diff --git a/Resources/more_default.png b/Resources/more_default.png new file mode 100644 index 000000000..f45fcf4ce Binary files /dev/null and b/Resources/more_default.png differ diff --git a/Resources/more_over.png b/Resources/more_over.png new file mode 100644 index 000000000..72f5e2cff Binary files /dev/null and b/Resources/more_over.png differ diff --git a/Resources/more_selected.png b/Resources/more_selected.png new file mode 100644 index 000000000..70767d47b Binary files /dev/null and b/Resources/more_selected.png differ diff --git a/Resources/numpad_eight_default.png b/Resources/numpad_eight_default.png index a3c0d8033..f4043c7ac 100644 Binary files a/Resources/numpad_eight_default.png and b/Resources/numpad_eight_default.png differ diff --git a/Resources/numpad_eight_over.png b/Resources/numpad_eight_over.png index 2ccb7f97c..0fbd47dbf 100644 Binary files a/Resources/numpad_eight_over.png and b/Resources/numpad_eight_over.png differ diff --git a/Resources/numpad_five_default.png b/Resources/numpad_five_default.png index 023eee43b..b5c6bd879 100644 Binary files a/Resources/numpad_five_default.png and b/Resources/numpad_five_default.png differ diff --git a/Resources/numpad_five_over.png b/Resources/numpad_five_over.png index 3b4a62e63..99eea6f3f 100644 Binary files a/Resources/numpad_five_over.png and b/Resources/numpad_five_over.png differ diff --git a/Resources/numpad_four_default.png b/Resources/numpad_four_default.png index fa788a745..efd71470b 100644 Binary files a/Resources/numpad_four_default.png and b/Resources/numpad_four_default.png differ diff --git a/Resources/numpad_four_over.png b/Resources/numpad_four_over.png index 2bffe94d5..3ca611be6 100644 Binary files a/Resources/numpad_four_over.png and b/Resources/numpad_four_over.png differ diff --git a/Resources/numpad_nine_default.png b/Resources/numpad_nine_default.png index 594a49d5f..e0115bf93 100644 Binary files a/Resources/numpad_nine_default.png and b/Resources/numpad_nine_default.png differ diff --git a/Resources/numpad_nine_over.png b/Resources/numpad_nine_over.png index c457e8400..f8427bffe 100644 Binary files a/Resources/numpad_nine_over.png and b/Resources/numpad_nine_over.png differ diff --git a/Resources/numpad_one_default.png b/Resources/numpad_one_default.png index 07f8d0ecf..00ffaeadf 100644 Binary files a/Resources/numpad_one_default.png and b/Resources/numpad_one_default.png differ diff --git a/Resources/numpad_one_over.png b/Resources/numpad_one_over.png index abe10c6e7..8736d2d93 100644 Binary files a/Resources/numpad_one_over.png and b/Resources/numpad_one_over.png differ diff --git a/Resources/numpad_seven_default.png b/Resources/numpad_seven_default.png index 85ea3ddcf..c8443e804 100644 Binary files a/Resources/numpad_seven_default.png and b/Resources/numpad_seven_default.png differ diff --git a/Resources/numpad_seven_over.png b/Resources/numpad_seven_over.png index 9ec319835..78e51ae0b 100644 Binary files a/Resources/numpad_seven_over.png and b/Resources/numpad_seven_over.png differ diff --git a/Resources/numpad_sharp_default.png b/Resources/numpad_sharp_default.png index c551d9121..af6e6b671 100644 Binary files a/Resources/numpad_sharp_default.png and b/Resources/numpad_sharp_default.png differ diff --git a/Resources/numpad_sharp_over.png b/Resources/numpad_sharp_over.png index dffb1b062..f5c603624 100644 Binary files a/Resources/numpad_sharp_over.png and b/Resources/numpad_sharp_over.png differ diff --git a/Resources/numpad_six_default.png b/Resources/numpad_six_default.png index 5404d14ec..2d98b6c8f 100644 Binary files a/Resources/numpad_six_default.png and b/Resources/numpad_six_default.png differ diff --git a/Resources/numpad_six_over.png b/Resources/numpad_six_over.png index aee8556d7..2bee536ce 100644 Binary files a/Resources/numpad_six_over.png and b/Resources/numpad_six_over.png differ diff --git a/Resources/numpad_star_default.png b/Resources/numpad_star_default.png index 6034e1a99..4697a46cd 100644 Binary files a/Resources/numpad_star_default.png and b/Resources/numpad_star_default.png differ diff --git a/Resources/numpad_star_over.png b/Resources/numpad_star_over.png index ac9639ff7..08e93b24e 100644 Binary files a/Resources/numpad_star_over.png and b/Resources/numpad_star_over.png differ diff --git a/Resources/numpad_three_default.png b/Resources/numpad_three_default.png index 5a489c493..0ad32787d 100644 Binary files a/Resources/numpad_three_default.png and b/Resources/numpad_three_default.png differ diff --git a/Resources/numpad_three_over.png b/Resources/numpad_three_over.png index 8fb1e1dc8..4ebcfa339 100644 Binary files a/Resources/numpad_three_over.png and b/Resources/numpad_three_over.png differ diff --git a/Resources/numpad_two_default.png b/Resources/numpad_two_default.png index 0de47b0bb..5381f36e1 100644 Binary files a/Resources/numpad_two_default.png and b/Resources/numpad_two_default.png differ diff --git a/Resources/numpad_two_over.png b/Resources/numpad_two_over.png index da5f95e90..4e5fdd44c 100644 Binary files a/Resources/numpad_two_over.png and b/Resources/numpad_two_over.png differ diff --git a/Resources/numpad_zero_default.png b/Resources/numpad_zero_default.png index 465a3c9f6..749f50140 100644 Binary files a/Resources/numpad_zero_default.png and b/Resources/numpad_zero_default.png differ diff --git a/Resources/numpad_zero_over.png b/Resources/numpad_zero_over.png index 86c14f38c..c5790ccf0 100644 Binary files a/Resources/numpad_zero_over.png and b/Resources/numpad_zero_over.png differ diff --git a/Resources/options_add_default.png b/Resources/options_add_default.png index e8ca669f5..71197c5d6 100644 Binary files a/Resources/options_add_default.png and b/Resources/options_add_default.png differ diff --git a/Resources/options_add_disabled.png b/Resources/options_add_disabled.png index aa7b03b4f..edf4e0ed6 100644 Binary files a/Resources/options_add_disabled.png and b/Resources/options_add_disabled.png differ diff --git a/Resources/options_add_over.png b/Resources/options_add_over.png index cea0c0d00..6a143091c 100644 Binary files a/Resources/options_add_over.png and b/Resources/options_add_over.png differ diff --git a/Resources/pause_off_default.png b/Resources/pause_off_default.png index c6bf04de7..546623e50 100644 Binary files a/Resources/pause_off_default.png and b/Resources/pause_off_default.png differ diff --git a/Resources/pause_off_over.png b/Resources/pause_off_over.png index 7289286c2..0a7cff185 100644 Binary files a/Resources/pause_off_over.png and b/Resources/pause_off_over.png differ diff --git a/Resources/pause_on_default.png b/Resources/pause_on_default.png index f6c266768..cfcba7be9 100644 Binary files a/Resources/pause_on_default.png and b/Resources/pause_on_default.png differ diff --git a/Resources/pause_on_over.png b/Resources/pause_on_over.png index 8268d1f8a..5fca7764c 100644 Binary files a/Resources/pause_on_over.png and b/Resources/pause_on_over.png differ diff --git a/Resources/security_ko.png b/Resources/security_ko.png index bf75d1b27..1fda5307f 100644 Binary files a/Resources/security_ko.png and b/Resources/security_ko.png differ diff --git a/Resources/security_ok.png b/Resources/security_ok.png index 0a48c7d14..89bd7ab89 100644 Binary files a/Resources/security_ok.png and b/Resources/security_ok.png differ diff --git a/Resources/security_pending.png b/Resources/security_pending.png index 1f68accf2..7a217ada0 100644 Binary files a/Resources/security_pending.png and b/Resources/security_pending.png differ diff --git a/Resources/settings_default.png b/Resources/settings_default.png index ecf4ab11b..5681b785e 100644 Binary files a/Resources/settings_default.png and b/Resources/settings_default.png differ diff --git a/Resources/settings_over.png b/Resources/settings_over.png index 37339b4af..b2fa1464e 100644 Binary files a/Resources/settings_over.png and b/Resources/settings_over.png differ diff --git a/Resources/settings_selected.png b/Resources/settings_selected.png index 1befba3bf..1c6b65e78 100644 Binary files a/Resources/settings_selected.png and b/Resources/settings_selected.png differ diff --git a/Resources/speaker_off_default.png b/Resources/speaker_off_default.png index 5094dd200..6ec14f0c3 100644 Binary files a/Resources/speaker_off_default.png and b/Resources/speaker_off_default.png differ diff --git a/Resources/speaker_off_disabled.png b/Resources/speaker_off_disabled.png index cb5a1dcf7..e541b819b 100644 Binary files a/Resources/speaker_off_disabled.png and b/Resources/speaker_off_disabled.png differ diff --git a/Resources/speaker_off_over.png b/Resources/speaker_off_over.png index bd1779182..f26666ce1 100644 Binary files a/Resources/speaker_off_over.png and b/Resources/speaker_off_over.png differ diff --git a/Resources/speaker_on_default.png b/Resources/speaker_on_default.png index 2f4f58440..97687e829 100644 Binary files a/Resources/speaker_on_default.png and b/Resources/speaker_on_default.png differ diff --git a/Resources/speaker_on_disabled.png b/Resources/speaker_on_disabled.png index a07dc1f5c..f3f82a22e 100644 Binary files a/Resources/speaker_on_disabled.png and b/Resources/speaker_on_disabled.png differ diff --git a/Resources/speaker_on_over.png b/Resources/speaker_on_over.png index e9b54f839..a638c7967 100644 Binary files a/Resources/speaker_on_over.png and b/Resources/speaker_on_over.png differ diff --git a/Resources/statebar_background.png b/Resources/statebar_background.png index 001991fb0..0ea152eec 100644 Binary files a/Resources/statebar_background.png and b/Resources/statebar_background.png differ diff --git a/Resources/switch_camera_default.png b/Resources/switch_camera_default.png index 2145e1db3..c7e82bf87 100644 Binary files a/Resources/switch_camera_default.png and b/Resources/switch_camera_default.png differ diff --git a/Resources/switch_camera_over.png b/Resources/switch_camera_over.png index 649861e9f..ed1c6f405 100644 Binary files a/Resources/switch_camera_over.png and b/Resources/switch_camera_over.png differ diff --git a/Resources/video_off_default.png b/Resources/video_off_default.png index 8e80dd7a6..8aadeb484 100644 Binary files a/Resources/video_off_default.png and b/Resources/video_off_default.png differ diff --git a/Resources/video_off_disabled.png b/Resources/video_off_disabled.png index d9806305d..22ef251db 100644 Binary files a/Resources/video_off_disabled.png and b/Resources/video_off_disabled.png differ diff --git a/Resources/video_off_over.png b/Resources/video_off_over.png index 26a00c41e..f9e2ae911 100644 Binary files a/Resources/video_off_over.png and b/Resources/video_off_over.png differ diff --git a/Resources/video_on_default.png b/Resources/video_on_default.png index dde8964d9..ecf67ce7c 100644 Binary files a/Resources/video_on_default.png and b/Resources/video_on_default.png differ diff --git a/Resources/video_on_disabled.png b/Resources/video_on_disabled.png index 02a1cc236..657efd93c 100644 Binary files a/Resources/video_on_disabled.png and b/Resources/video_on_disabled.png differ diff --git a/Resources/video_on_over.png b/Resources/video_on_over.png index 20fa87e9b..5bea298b7 100644 Binary files a/Resources/video_on_over.png and b/Resources/video_on_over.png differ diff --git a/linphone-Info.plist b/linphone-Info.plist index 6fcc7adf1..01a6528d1 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -5,18 +5,33 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - Linphone + Castel CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile - + castel_icon_57.png CFBundleIconFiles linphone_icon_57.png linphone_icon_72.png + castel_icon_57.png + castel_icon_72.png + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + linphone_icon_57.png + linphone_icon_72.png + castel_icon_57.png + castel_icon_72.png + + + CFBundleIdentifier - org.linphone.phone + com.castel.phone CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 24123f5f1..880cd4c08 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; }; 220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; }; 220FAD3210765B400068D98F /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; }; 220FAD3610765B400068D98F /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2D10765B400068D98F /* libosip2.a */; }; @@ -39,7 +38,6 @@ 224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; 2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; }; - 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; 226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; }; 226183AE1472527D0037138E /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AB1472527D0037138E /* libsrtp.a */; }; 226183B0147259670037138E /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AF147259670037138E /* libmssilk.a */; }; @@ -69,8 +67,6 @@ 22D8F124147548E2008C97DB /* untitled.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22F51EF5107FA66500F98953 /* untitled.plist */; }; 22D8F125147548E2008C97DB /* oldphone-mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* oldphone-mono.wav */; }; 22D8F12D147548E2008C97DB /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; - 22D8F12E147548E2008C97DB /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; }; - 22D8F137147548E2008C97DB /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; 22D8F138147548E2008C97DB /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; 22D8F139147548E2008C97DB /* oldphone-mono-30s.caf in Resources */ = {isa = PBXBuildFile; fileRef = 2242E312125235120061DDCE /* oldphone-mono-30s.caf */; }; 22D8F13B147548E2008C97DB /* FirstLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2218A92412FBE1340088A667 /* FirstLoginViewController.xib */; }; @@ -148,7 +144,6 @@ 344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDE71484E723007420B6 /* libzrtpcpp.a */; }; 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34A6ECEB14CF13CB00460C04 /* linphone_icon_72.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */; }; 70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; }; 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; }; 70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; }; @@ -727,6 +722,20 @@ D3F83F8F15822ABE00336684 /* PhoneMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83F8D15822ABD00336684 /* PhoneMainView.m */; }; D3F83F9215824D3600336684 /* LinphoneApp.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F9115824D3500336684 /* LinphoneApp.xib */; }; D3F83F9315824D3600336684 /* LinphoneApp.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F9115824D3500336684 /* LinphoneApp.xib */; }; + D3F9A9A515AEBA460045320F /* castel_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9A315AEBA460045320F /* castel_icon_57.png */; }; + D3F9A9A615AEBA460045320F /* castel_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9A315AEBA460045320F /* castel_icon_57.png */; }; + D3F9A9A715AEBA460045320F /* castel_icon_72.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9A415AEBA460045320F /* castel_icon_72.png */; }; + D3F9A9A815AEBA460045320F /* castel_icon_72.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9A415AEBA460045320F /* castel_icon_72.png */; }; + D3F9A9AA15AEBAB00045320F /* accept_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9A915AEBAB00045320F /* accept_disabled.png */; }; + D3F9A9AB15AEBAB00045320F /* accept_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9A915AEBAB00045320F /* accept_disabled.png */; }; + D3F9A9AF15AEBC060045320F /* more_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9AC15AEBC060045320F /* more_default.png */; }; + D3F9A9B015AEBC060045320F /* more_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9AC15AEBC060045320F /* more_default.png */; }; + D3F9A9B115AEBC060045320F /* more_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9AD15AEBC060045320F /* more_over.png */; }; + D3F9A9B215AEBC060045320F /* more_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9AD15AEBC060045320F /* more_over.png */; }; + D3F9A9B315AEBC060045320F /* more_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9AE15AEBC060045320F /* more_selected.png */; }; + D3F9A9B415AEBC060045320F /* more_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9AE15AEBC060045320F /* more_selected.png */; }; + D3F9A9B615AEBD2D0045320F /* contact_edit_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9B515AEBD2D0045320F /* contact_edit_background.png */; }; + D3F9A9B715AEBD2D0045320F /* contact_edit_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9B515AEBD2D0045320F /* contact_edit_background.png */; }; F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; }; F476004C147AAF4600FFF19B /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB8F147555C800DEE054 /* libmediastreamer.a */; }; /* End PBXBuildFile section */ @@ -775,7 +784,6 @@ 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneAppDelegate.m; sourceTree = ""; }; 1D6058910D05DD3D006BFB54 /* linphone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = linphone.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 22058C70116E305000B08DDD /* linphone_icon_57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_57.png; path = Resources/linphone_icon_57.png; sourceTree = ""; }; 220FAC79107654FC0068D98F /* eX_call.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eX_call.h; sourceTree = ""; }; 220FAC7A107654FC0068D98F /* eX_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eX_message.h; sourceTree = ""; }; 220FAC7B107654FC0068D98F /* eX_options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eX_options.h; sourceTree = ""; }; @@ -918,7 +926,6 @@ 2248E90C12F7E4CF00220D9C /* UIDigitButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDigitButton.h; sourceTree = ""; }; 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIDigitButton.m; sourceTree = ""; }; 2258633C11410BAC00C5A737 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; - 225CB2F911ABB76400628906 /* linphone-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-banner.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-banner.png"; sourceTree = ""; }; 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = ""; }; 226183AB1472527D0037138E /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = ""; }; 226183AF147259670037138E /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; @@ -1047,7 +1054,6 @@ 344ABDE71484E723007420B6 /* libzrtpcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzrtpcpp.a; path = "liblinphone-sdk/apple-darwin/lib/libzrtpcpp.a"; sourceTree = ""; }; 344ABDEF14850AE9007420B6 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; }; 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; }; - 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_72.png; path = Resources/linphone_icon_72.png; sourceTree = ""; }; 70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = ""; }; 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; }; @@ -1412,6 +1418,13 @@ D3F83F8C158229C500336684 /* PhoneMainView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhoneMainView.h; sourceTree = ""; }; D3F83F8D15822ABD00336684 /* PhoneMainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhoneMainView.m; sourceTree = ""; }; D3F83F9115824D3500336684 /* LinphoneApp.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneApp.xib; sourceTree = ""; }; + D3F9A9A315AEBA460045320F /* castel_icon_57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = castel_icon_57.png; path = Resources/castel_icon_57.png; sourceTree = ""; }; + D3F9A9A415AEBA460045320F /* castel_icon_72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = castel_icon_72.png; path = Resources/castel_icon_72.png; sourceTree = ""; }; + D3F9A9A915AEBAB00045320F /* accept_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = accept_disabled.png; path = Resources/accept_disabled.png; sourceTree = ""; }; + D3F9A9AC15AEBC060045320F /* more_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = more_default.png; path = Resources/more_default.png; sourceTree = ""; }; + D3F9A9AD15AEBC060045320F /* more_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = more_over.png; path = Resources/more_over.png; sourceTree = ""; }; + D3F9A9AE15AEBC060045320F /* more_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = more_selected.png; path = Resources/more_selected.png; sourceTree = ""; }; + D3F9A9B515AEBD2D0045320F /* contact_edit_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_edit_background.png; path = Resources/contact_edit_background.png; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2042,6 +2055,7 @@ isa = PBXGroup; children = ( D3F83F741582253100336684 /* accept_default.png */, + D3F9A9A915AEBAB00045320F /* accept_disabled.png */, D3F83F751582253100336684 /* accept_over.png */, D3D6A39B159B0EEF005F692C /* add_call_default.png */, D3D6A39C159B0EEF005F692C /* add_call_disabled.png */, @@ -2082,6 +2096,8 @@ D31C9C8D158A1C1000756B45 /* call_status_incoming.png */, D31C9C8E158A1C1000756B45 /* call_status_missed.png */, D31C9C8F158A1C1000756B45 /* call_status_outgoing.png */, + D3F9A9A315AEBA460045320F /* castel_icon_57.png */, + D3F9A9A415AEBA460045320F /* castel_icon_72.png */, D36C43CC158F2F370048BA40 /* cell_call.png */, D3211BB8159C8A820098460B /* cell_call_first.png */, D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */, @@ -2111,6 +2127,7 @@ D3128FE715AABE4E00A2147A /* contact_back_default.png */, D3128FE815AABE4E00A2147A /* contact_back_over.png */, D378906915AC37C800BD776C /* contact_bar_background.png */, + D3F9A9B515AEBD2D0045320F /* contact_edit_background.png */, D3128FE915AABE4E00A2147A /* contact_edit_default.png */, D3128FEA15AABE4E00A2147A /* contact_edit_over.png */, D37C638D15AAD251009D0BAC /* contact_number.png */, @@ -2154,10 +2171,7 @@ D3432A70158A45AF001C6B0B /* led_disconnected.png */, D3432A5D158A4446001C6B0B /* led_error.png */, D3432A6F158A45AF001C6B0B /* led_inprogress.png */, - 225CB2F911ABB76400628906 /* linphone-banner.png */, 8D1107310486CEB800E47090 /* linphone-Info.plist */, - 22058C70116E305000B08DDD /* linphone_icon_57.png */, - 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */, 2274550710700509006EC466 /* linphonerc */, 341FCA8D149798210084BC26 /* linphonerc-ipad */, D3EA5416159858A80037DC6B /* list_delete_default.png */, @@ -2171,6 +2185,9 @@ D3F83EF6158205A100336684 /* micro_on_default.png */, D35EA76215A2DF8D003E025D /* micro_on_disabled.png */, D3F83EF7158205A100336684 /* micro_on_over.png */, + D3F9A9AC15AEBC060045320F /* more_default.png */, + D3F9A9AD15AEBC060045320F /* more_over.png */, + D3F9A9AE15AEBC060045320F /* more_selected.png */, D3F83F3C1582223B00336684 /* numpad_eight_default.png */, D3F83F3D1582223B00336684 /* numpad_eight_over.png */, D3F83F361582223B00336684 /* numpad_five_default.png */, @@ -2490,8 +2507,6 @@ 22F51EF6107FA66500F98953 /* untitled.plist in Resources */, 2237D4091084D7A9001383EE /* oldphone-mono.wav in Resources */, 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */, - 22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */, - 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */, 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */, 2242E313125235120061DDCE /* oldphone-mono-30s.caf in Resources */, 2218A92612FBE1340088A667 /* FirstLoginViewController.xib in Resources */, @@ -2500,7 +2515,6 @@ 3422AA5014975EC9000D4E8A /* InCallViewController-ipad.xib in Resources */, 3422AA5314978352000D4E8A /* PhoneViewController-ipad.xib in Resources */, 341FCA8E149798210084BC26 /* linphonerc-ipad in Resources */, - 34A6ECEB14CF13CB00460C04 /* linphone_icon_72.png in Resources */, D347347A1580DDF1003C7B8C /* PhoneMainView.xib in Resources */, D347347E1580E5F8003C7B8C /* history_default.png in Resources */, D347347F1580E5F8003C7B8C /* history_selected.png in Resources */, @@ -2732,6 +2746,13 @@ C9C8254915AE204D00D493FA /* transfer_call_over.png in Resources */, C9C8254C15AE207B00D493FA /* options_selected.png in Resources */, C9C8254F15AE256100D493FA /* transfer_call_disabled.png in Resources */, + D3F9A9A515AEBA460045320F /* castel_icon_57.png in Resources */, + D3F9A9A715AEBA460045320F /* castel_icon_72.png in Resources */, + D3F9A9AA15AEBAB00045320F /* accept_disabled.png in Resources */, + D3F9A9AF15AEBC060045320F /* more_default.png in Resources */, + D3F9A9B115AEBC060045320F /* more_over.png in Resources */, + D3F9A9B315AEBC060045320F /* more_selected.png in Resources */, + D3F9A9B615AEBD2D0045320F /* contact_edit_background.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2745,8 +2766,6 @@ 22D8F124147548E2008C97DB /* untitled.plist in Resources */, 22D8F125147548E2008C97DB /* oldphone-mono.wav in Resources */, 22D8F12D147548E2008C97DB /* ConsoleViewController.xib in Resources */, - 22D8F12E147548E2008C97DB /* linphone_icon_57.png in Resources */, - 22D8F137147548E2008C97DB /* linphone-banner.png in Resources */, 22D8F138147548E2008C97DB /* MoreViewController.xib in Resources */, 22D8F139147548E2008C97DB /* oldphone-mono-30s.caf in Resources */, 22D8F13B147548E2008C97DB /* FirstLoginViewController.xib in Resources */, @@ -2971,6 +2990,13 @@ C9C8254A15AE204D00D493FA /* transfer_call_over.png in Resources */, C9C8254D15AE207B00D493FA /* options_selected.png in Resources */, C9C8255015AE256100D493FA /* transfer_call_disabled.png in Resources */, + D3F9A9A615AEBA460045320F /* castel_icon_57.png in Resources */, + D3F9A9A815AEBA460045320F /* castel_icon_72.png in Resources */, + D3F9A9AB15AEBAB00045320F /* accept_disabled.png in Resources */, + D3F9A9B015AEBC060045320F /* more_default.png in Resources */, + D3F9A9B215AEBC060045320F /* more_over.png in Resources */, + D3F9A9B415AEBC060045320F /* more_selected.png in Resources */, + D3F9A9B715AEBD2D0045320F /* contact_edit_background.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };