diff --git a/Classes/ContactDetailsViewController.xib b/Classes/ContactDetailsViewController.xib index aa51f1437..2c1e44189 100644 --- a/Classes/ContactDetailsViewController.xib +++ b/Classes/ContactDetailsViewController.xib @@ -160,7 +160,6 @@ {{0, 59}, {320, 401}} - _NS:9 10 diff --git a/Classes/LinphoneUI/UICallBar.h b/Classes/LinphoneUI/UICallBar.h index e00398c5f..d0ba31428 100644 --- a/Classes/LinphoneUI/UICallBar.h +++ b/Classes/LinphoneUI/UICallBar.h @@ -53,6 +53,10 @@ UIDigitButton* starButton; UIDigitButton* zeroButton; UIDigitButton* sharpButton; + + UIButton* option1Button; + UIButton* option2Button; + UIButton* option3Button; } @property (nonatomic, retain) IBOutlet UIPauseButton* pauseButton; @@ -82,10 +86,18 @@ @property (nonatomic, retain) IBOutlet UIButton* zeroButton; @property (nonatomic, retain) IBOutlet UIButton* sharpButton; +@property (nonatomic, retain) IBOutlet UIButton* option1Button; +@property (nonatomic, retain) IBOutlet UIButton* option2Button; +@property (nonatomic, retain) IBOutlet UIButton* option3Button; + - (IBAction)onOptionsClick:(id)sender; - (IBAction)onOptionsTransferClick:(id)sender; - (IBAction)onOptionsAddClick:(id)sender; - (IBAction)onConferenceClick:(id)sender; - (IBAction)onPadClick:(id)sender; +- (IBAction)onOption1Click:(id)sender; +- (IBAction)onOption2Click:(id)sender; +- (IBAction)onOption3Click:(id)sender; + @end diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m index 94a0b4597..5df13b285 100644 --- a/Classes/LinphoneUI/UICallBar.m +++ b/Classes/LinphoneUI/UICallBar.m @@ -57,6 +57,9 @@ @synthesize zeroButton; @synthesize sharpButton; +@synthesize option1Button; +@synthesize option2Button; +@synthesize option3Button; #pragma mark - Lifecycle Functions @@ -89,6 +92,10 @@ [zeroButton release]; [sharpButton release]; + [option1Button release]; + [option2Button release]; + [option3Button release]; + [padView release]; [optionsView release]; @@ -110,7 +117,7 @@ [oneButton setDigit:'1']; [oneButton setDtmf:true]; [twoButton setDigit:'2']; - [twoButton setDtmf:true]; + [twoButton setDtmf:true]; [threeButton setDigit:'3']; [threeButton setDtmf:true]; [fourButton setDigit:'4']; @@ -162,6 +169,18 @@ // Set selected+over background: IB lack ! [dialerButton setImage:[UIImage imageNamed:@"dialer_alt_back_over.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]; } - (void)viewWillAppear:(BOOL)animated { @@ -397,6 +416,18 @@ } } +- (IBAction)onOption1Click:(id)sender { + +} + +- (IBAction)onOption2Click:(id)sender { + +} + +- (IBAction)onOption3Click:(id)sender { + +} + - (IBAction)onConferenceClick:(id)sender { linphone_core_add_all_to_conference([LinphoneManager getLc]); } diff --git a/Classes/LinphoneUI/UICallBar.xib b/Classes/LinphoneUI/UICallBar.xib index c8b4c6a30..ef5d7e924 100644 --- a/Classes/LinphoneUI/UICallBar.xib +++ b/Classes/LinphoneUI/UICallBar.xib @@ -43,7 +43,6 @@ {{0, 335}, {320, 125}} - _NS:9 1 @@ -81,7 +80,7 @@ 292 - {{0, 67}, {107, 54}} + {{0, 20}, {107, 54}} @@ -121,7 +120,7 @@ 292 - {{107, 67}, {106, 54}} + {{107, 20}, {106, 54}} @@ -145,7 +144,7 @@ 292 - {{213, 67}, {107, 54}} + {{213, 20}, {107, 54}} @@ -169,7 +168,7 @@ 292 - {{0, 129}, {107, 54}} + {{0, 82}, {107, 54}} @@ -193,7 +192,7 @@ 292 - {{107, 129}, {106, 54}} + {{107, 82}, {106, 54}} @@ -217,7 +216,7 @@ 292 - {{213, 129}, {107, 54}} + {{213, 82}, {107, 54}} @@ -241,7 +240,7 @@ 292 - {{0, 191}, {107, 54}} + {{0, 144}, {107, 54}} @@ -265,7 +264,7 @@ 292 - {{107, 191}, {106, 54}} + {{107, 144}, {106, 54}} @@ -289,7 +288,7 @@ 292 - {{213, 191}, {107, 54}} + {{213, 144}, {107, 54}} @@ -313,7 +312,7 @@ 292 - {{0, 253}, {107, 54}} + {{0, 206}, {107, 54}} @@ -337,7 +336,7 @@ 292 - {{107, 253}, {106, 54}} + {{107, 206}, {106, 54}} @@ -361,10 +360,10 @@ 292 - {{213, 253}, {107, 54}} + {{213, 206}, {107, 54}} - + NO NO IBCocoaTouchFramework @@ -382,6 +381,75 @@ + + + 292 + {{39, 268}, {68, 48}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + Option n°1 + + 3 + MQA + + + + NSImage + dialer_alt_button_options_over.png + + + NSImage + dialer_alt_button_options_default.png + + + + + + + 292 + {{126, 268}, {68, 48}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + Option n°2 + + + + + + + + + + 292 + {{213, 268}, {68, 48}} + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + Option n°3 + + + + + + + {320, 460} @@ -656,7 +724,7 @@ {{215, 67}, {105, 68}} - + _NS:9 NO @@ -876,6 +944,30 @@ 96 + + + option1Button + + + + 103 + + + + option2Button + + + + 104 + + + + option3Button + + + + 105 + onPadClick: @@ -920,6 +1012,33 @@ 89 + + + onOption1Click: + + + 7 + + 106 + + + + onOption3Click: + + + 7 + + 108 + + + + onOption2Click: + + + 7 + + 107 + @@ -1021,19 +1140,22 @@ 31 - - - - - - - - - - - - + + + + + + + + + + + + + + + pad @@ -1128,6 +1250,24 @@ optionsAddButton + + 100 + + + option1Button + + + 101 + + + option3Button + + + 102 + + + option2Button + @@ -1138,6 +1278,15 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1208,7 +1357,7 @@ - 99 + 108 @@ -1217,6 +1366,9 @@ UIViewController id + id + id + id id id id @@ -1227,6 +1379,18 @@ onConferenceClick: id + + onOption1Click: + id + + + onOption2Click: + id + + + onOption3Click: + id + onOptionsAddClick: id @@ -1246,7 +1410,7 @@ UIButton - UIButton + UIToggleButton UIButton UIButton UIButton @@ -1254,8 +1418,11 @@ UIMicroButton UIButton UIButton + UIButton + UIButton + UIButton UIButton - UIButton + UIToggleButton UIButton UIView UIView @@ -1277,7 +1444,7 @@ dialerButton - UIButton + UIToggleButton eightButton @@ -1307,13 +1474,25 @@ oneButton UIButton + + option1Button + UIButton + + + option2Button + UIButton + + + option3Button + UIButton + optionsAddButton UIButton optionsButton - UIButton + UIToggleButton optionsTransferButton @@ -1482,6 +1661,8 @@ {209, 136} {209, 136} {209, 136} + {136, 95} + {136, 95} {209, 136} {209, 136} {222, 136} diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h index 42fc6c2ba..4b947218c 100644 --- a/Classes/LinphoneUI/UILinphone.h +++ b/Classes/LinphoneUI/UILinphone.h @@ -20,6 +20,6 @@ #ifndef UILINPHONE_H #define UILINPHONE_H -#define LINPHONE_TABLE_CELL_BACKGROUND_COLOR [UIColor colorWithRed:207.0f/255.0f green:76.0f/255.0f blue:41.0f/255.0f alpha:1.0f] +#define LINPHONE_TABLE_CELL_BACKGROUND_COLOR [UIColor colorWithRed:177.0f/255.0f green:200.0f/255.0f blue:0.0f/255.0f alpha:1.0f] #endif diff --git a/Resources/cell_call.png b/Resources/cell_call.png index fb579f8a3..866352cde 100644 Binary files a/Resources/cell_call.png and b/Resources/cell_call.png differ diff --git a/Resources/cell_call_highlight.png b/Resources/cell_call_highlight.png index c9bc52f22..51a9e3f20 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 7580591ff..5043b0896 100644 Binary files a/Resources/cell_conference.png and b/Resources/cell_conference.png differ diff --git a/Resources/contact_back_default.png b/Resources/contact_back_default.png index 67dbf6e49..c156aa633 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 2d3ebe52c..7d85878f1 100644 Binary files a/Resources/contact_back_over.png and b/Resources/contact_back_over.png differ diff --git a/Resources/contact_cancel_default.png b/Resources/contact_cancel_default.png index 80809dc95..fe402b66c 100644 Binary files a/Resources/contact_cancel_default.png and b/Resources/contact_cancel_default.png differ diff --git a/Resources/contact_cancel_over.png b/Resources/contact_cancel_over.png index d5bd87d17..3909c7bc0 100644 Binary files a/Resources/contact_cancel_over.png and b/Resources/contact_cancel_over.png differ diff --git a/Resources/contact_edit_default.png b/Resources/contact_edit_default.png index a822d24e2..38e245962 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 c169ba807..e322bdb93 100644 Binary files a/Resources/contact_edit_over.png and b/Resources/contact_edit_over.png differ diff --git a/Resources/dialer_alt_back_default.png b/Resources/dialer_alt_back_default.png index bacd50f44..a71835c41 100644 Binary files a/Resources/dialer_alt_back_default.png and b/Resources/dialer_alt_back_default.png differ diff --git a/Resources/dialer_alt_back_over.png b/Resources/dialer_alt_back_over.png index 3e3a6dfd2..6c0e460fe 100644 Binary files a/Resources/dialer_alt_back_over.png and b/Resources/dialer_alt_back_over.png differ diff --git a/Resources/dialer_alt_button_options_default.png b/Resources/dialer_alt_button_options_default.png new file mode 100644 index 000000000..4c568aba9 Binary files /dev/null and b/Resources/dialer_alt_button_options_default.png differ diff --git a/Resources/dialer_alt_button_options_over.png b/Resources/dialer_alt_button_options_over.png new file mode 100644 index 000000000..a02c2f1cf Binary files /dev/null and b/Resources/dialer_alt_button_options_over.png differ diff --git a/Resources/dialer_over.png b/Resources/dialer_over.png index 1d8684204..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 ca353c4e4..1d8684204 100644 Binary files a/Resources/dialer_selected.png and b/Resources/dialer_selected.png differ diff --git a/Resources/field_background.png b/Resources/field_background.png index 7b8cb1ed5..896321085 100644 Binary files a/Resources/field_background.png and b/Resources/field_background.png differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 357348c7d..00efe218c 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -540,6 +540,10 @@ D3E84F3915B011AF00420DAC /* contact_cancel_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F3615B011AF00420DAC /* contact_cancel_default.png */; }; D3E84F3A15B011AF00420DAC /* contact_cancel_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F3715B011AF00420DAC /* contact_cancel_over.png */; }; D3E84F3B15B011AF00420DAC /* contact_cancel_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F3715B011AF00420DAC /* contact_cancel_over.png */; }; + D3E84F5315B0265600420DAC /* dialer_alt_button_options_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F5115B0265600420DAC /* dialer_alt_button_options_default.png */; }; + D3E84F5415B0265600420DAC /* dialer_alt_button_options_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F5115B0265600420DAC /* dialer_alt_button_options_default.png */; }; + D3E84F5515B0265600420DAC /* dialer_alt_button_options_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F5215B0265600420DAC /* dialer_alt_button_options_over.png */; }; + D3E84F5615B0265600420DAC /* dialer_alt_button_options_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3E84F5215B0265600420DAC /* dialer_alt_button_options_over.png */; }; D3E8F68615ADE05B0065A226 /* UIContactDetailsFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = D3E8F68415ADE0580065A226 /* UIContactDetailsFooter.m */; }; D3E8F68715ADE05B0065A226 /* UIContactDetailsFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = D3E8F68415ADE0580065A226 /* UIContactDetailsFooter.m */; }; D3E8F68815ADE05B0065A226 /* UIContactDetailsFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3E8F68515ADE05A0065A226 /* UIContactDetailsFooter.xib */; }; @@ -1323,6 +1327,8 @@ D3E84F3615B011AF00420DAC /* contact_cancel_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_cancel_default.png; path = Resources/contact_cancel_default.png; sourceTree = ""; }; D3E84F3715B011AF00420DAC /* contact_cancel_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_cancel_over.png; path = Resources/contact_cancel_over.png; sourceTree = ""; }; D3E84F3C15B018A600420DAC /* UILinphone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILinphone.h; sourceTree = ""; }; + D3E84F5115B0265600420DAC /* dialer_alt_button_options_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dialer_alt_button_options_default.png; path = Resources/dialer_alt_button_options_default.png; sourceTree = ""; }; + D3E84F5215B0265600420DAC /* dialer_alt_button_options_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dialer_alt_button_options_over.png; path = Resources/dialer_alt_button_options_over.png; sourceTree = ""; }; D3E8F68315ADE0570065A226 /* UIContactDetailsFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIContactDetailsFooter.h; sourceTree = ""; }; D3E8F68415ADE0580065A226 /* UIContactDetailsFooter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIContactDetailsFooter.m; sourceTree = ""; }; D3E8F68515ADE05A0065A226 /* UIContactDetailsFooter.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIContactDetailsFooter.xib; sourceTree = ""; }; @@ -2117,10 +2123,10 @@ 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 */, D3E84F1715B00F4100420DAC /* cancel_default.png */, D3E84F1815B00F4100420DAC /* cancel_over.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 */, @@ -2150,9 +2156,9 @@ D3128FE715AABE4E00A2147A /* contact_back_default.png */, D3128FE815AABE4E00A2147A /* contact_back_over.png */, D378906915AC37C800BD776C /* contact_bar_background.png */, - D3F9A9B515AEBD2D0045320F /* contact_edit_background.png */, D3E84F3615B011AF00420DAC /* contact_cancel_default.png */, D3E84F3715B011AF00420DAC /* contact_cancel_over.png */, + D3F9A9B515AEBD2D0045320F /* contact_edit_background.png */, D3128FE915AABE4E00A2147A /* contact_edit_default.png */, D3128FEA15AABE4E00A2147A /* contact_edit_over.png */, D37C638D15AAD251009D0BAC /* contact_number.png */, @@ -2175,6 +2181,8 @@ D3E84F1B15B00F4100420DAC /* dialer_alt_back_default.png */, D3E84F1C15B00F4100420DAC /* dialer_alt_back_over.png */, D3E84F1D15B00F4100420DAC /* dialer_alt_background.png */, + D3E84F5115B0265600420DAC /* dialer_alt_button_options_default.png */, + D3E84F5215B0265600420DAC /* dialer_alt_button_options_over.png */, D36C43CF158F2F370048BA40 /* dialer_alt_default.png */, D36C43D0158F2F370048BA40 /* dialer_alt_over.png */, D38327ED1580FE3A00FA0D23 /* dialer_default.png */, @@ -2806,6 +2814,8 @@ D3E84F2A15B00F4100420DAC /* dialer_alt_background.png in Resources */, D3E84F3815B011AF00420DAC /* contact_cancel_default.png in Resources */, D3E84F3A15B011AF00420DAC /* contact_cancel_over.png in Resources */, + D3E84F5315B0265600420DAC /* dialer_alt_button_options_default.png in Resources */, + D3E84F5515B0265600420DAC /* dialer_alt_button_options_over.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3053,6 +3063,8 @@ D3E84F2B15B00F4100420DAC /* dialer_alt_background.png in Resources */, D3E84F3915B011AF00420DAC /* contact_cancel_default.png in Resources */, D3E84F3B15B011AF00420DAC /* contact_cancel_over.png in Resources */, + D3E84F5415B0265600420DAC /* dialer_alt_button_options_default.png in Resources */, + D3E84F5615B0265600420DAC /* dialer_alt_button_options_over.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };