diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m index c19019980..ae1414ad1 100644 --- a/Classes/IncallViewController.m +++ b/Classes/IncallViewController.m @@ -91,8 +91,8 @@ int callCount(LinphoneCore* lc) { - (void)viewDidLoad { [super viewDidLoad]; //Controls - [mute initWithOnImage:[UIImage imageNamed:@"mic_muted.png"] offImage:[UIImage imageNamed:@"mic_active.png"] ]; - [speaker initWithOnImage:[UIImage imageNamed:@"Speaker-32-on.png"] offImage:[UIImage imageNamed:@"Speaker-32-off.png"] ]; + [mute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"] offImage:[UIImage imageNamed:@"micro.png"] ]; + [speaker initWithOnImage:[UIImage imageNamed:@"HP_inverse.png"] offImage:[UIImage imageNamed:@"HP.png"] ]; //Dialer init @@ -142,10 +142,13 @@ int callCount(LinphoneCore* lc) { -(void) pauseCallPressed { if (!selectedCall) return; - if (linphone_call_get_state(selectedCall) == LinphoneCallPaused) + if (linphone_call_get_state(selectedCall) == LinphoneCallPaused) { + [pause setSelected:NO]; linphone_core_resume_call([LinphoneManager getLc], selectedCall); - else + }else{ linphone_core_pause_call([LinphoneManager getLc], selectedCall); + [pause setSelected:YES]; + } } @@ -299,12 +302,12 @@ int callCount(LinphoneCore* lc) { else if (linphone_call_get_state(selectedCall)==LinphoneCallPaused) { [pause setHidden:NO]; //[pause setTitle:@"Resume" forState:UIControlStateNormal]; - pause.selected = YES; + // pause.selected = YES; pause.highlighted = NO; } else if (callCount(lc) == callsCount && callsCount == 1) { [pause setHidden:NO]; //[pause setTitle:@"Pause" forState:UIControlStateNormal]; - pause.selected = NO; + // pause.selected = NO; pause.highlighted = NO; } else { [pause setHidden:YES]; @@ -531,7 +534,7 @@ int callCount(LinphoneCore* lc) { [self updateCell:cell at:indexPath withCall: [self retrieveCallAtIndex:indexPath.row inConference:NO] conferenceActive:linphone_core_is_in_conference(lc)]; - cell.userInteractionEnabled = YES; + cell.userInteractionEnabled = YES; cell.selectionStyle = UITableViewCellSelectionStyleNone; //cell.selectionStyle = UITableViewCellSelectionStyleBlue; @@ -541,7 +544,7 @@ int callCount(LinphoneCore* lc) { UIImage *theImage = [UIImage imageWithContentsOfFile:path]; cell.imageView.image = theImage;*/ return cell; -} +} // UITableViewDataSource (required) diff --git a/Classes/IncallViewController.xib b/Classes/IncallViewController.xib index a77415f09..678052028 100644 --- a/Classes/IncallViewController.xib +++ b/Classes/IncallViewController.xib @@ -13,9 +13,9 @@ YES IBUIViewController - IBUITableView - IBUIView IBUIButton + IBUIView + IBUITableView IBProxyObject @@ -45,14 +45,14 @@ 274 - {320, 276} + {320, 251} - + _NS:418 - + 3 - MC42NjY2NjY2NjY3AA + MCAwAA YES IBCocoaTouchFramework @@ -72,10 +72,10 @@ 292 - {{36, 8}, {248, 52}} + {{0, 1}, {320, 66}} - + 1 MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA @@ -101,6 +101,10 @@ NSImage stopcall-red.png + + NSImage + clavier-01-106px.png + Helvetica-Bold Helvetica @@ -114,15 +118,12 @@ - {{0, 392}, {320, 68}} + {{0, 393.5}, {320, 77}} _NS:196 - - 3 - MC4zMzMzMzMzMzMzAA - + IBCocoaTouchFramework @@ -133,11 +134,11 @@ 292 - {{119, 58}, {82, 52}} + {{107, 70}, {106, 66}} - - + + NO NO IBCocoaTouchFramework @@ -149,11 +150,14 @@ MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - + NSImage conf_merge.png - + + NSImage + grouper.png + 2 17 @@ -167,11 +171,11 @@ 292 - {{36, 5}, {82, 52}} + {{0, 4}, {107, 66}} - + NO NO IBCocoaTouchFramework @@ -187,6 +191,14 @@ NSImage mic_active.png + + NSImage + micro_inverse.png + + + NSImage + micro.png + 2 2 @@ -200,11 +212,11 @@ 292 - {{36, 58}, {82, 52}} + {{0, 70}, {107, 66}} - - + + NO NO IBCocoaTouchFramework @@ -218,7 +230,7 @@ NSImage - addcall-green.png + ajouter.png @@ -226,17 +238,16 @@ 292 - {{202, 58}, {82, 52}} + {{213, 70}, {107, 66}} - + NO NO IBCocoaTouchFramework 0 0 - Cont 1 @@ -248,7 +259,7 @@ NSImage - contact-orange.png + contact.png @@ -256,11 +267,11 @@ 292 - {{119, 5}, {82, 52}} + {{107, 4}, {106, 66}} - + NO NO IBCocoaTouchFramework @@ -274,7 +285,7 @@ NSImage - numpad.png + clavier.png @@ -282,34 +293,41 @@ 292 - {{202, 5}, {82, 52}} + {{213, 4}, {107, 66}} - + NO NO IBCocoaTouchFramework 0 0 - Spk 1 MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + NSImage + HP_inverse.png + + + NSImage + HP.png + 292 - {{119, 58}, {82, 52}} + {{107, 70}, {106, 66}} - - + + NO NO IBCocoaTouchFramework @@ -325,21 +343,21 @@ NSImage - resumecall.png + pause_inactif.png NSImage - pausecall.png + pause.png - {{0, 276}, {320, 115}} + {{0, 258.5}, {320, 135}} - + NO NO IBCocoaTouchFramework @@ -352,17 +370,17 @@ 292 - {{95, 219}, {82, 52}} + {{119, 251}, {82, 52}} - - + + NO NO IBCocoaTouchFramework 0 0 - Close + close 1 @@ -375,11 +393,14 @@ 292 - {{95, 166}, {82, 52}} + {{119, 193}, {82, 52}} - + + 3 + MC42NjY2NjY2NjY3AA + NO NO IBCocoaTouchFramework @@ -398,11 +419,11 @@ 292 - {{12, 7}, {82, 52}} + {{31, 19}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -421,11 +442,11 @@ 292 - {{95, 7}, {82, 52}} + {{119, 19}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -441,11 +462,11 @@ 292 - {{178, 7}, {82, 52}} + {{207, 19}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -464,11 +485,11 @@ 292 - {{12, 60}, {82, 52}} + {{31, 77}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -487,11 +508,11 @@ 292 - {{95, 60}, {82, 52}} + {{119, 77}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -510,11 +531,11 @@ 292 - {{178, 60}, {82, 52}} + {{207, 77}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -533,11 +554,11 @@ 292 - {{12, 113}, {82, 52}} + {{31, 135}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -556,11 +577,11 @@ 292 - {{95, 113}, {82, 52}} + {{119, 135}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -579,11 +600,11 @@ 292 - {{178, 113}, {82, 52}} + {{207, 135}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -602,11 +623,11 @@ 292 - {{12, 166}, {82, 52}} + {{31, 193}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -625,11 +646,11 @@ 292 - {{178, 166}, {82, 52}} + {{207, 193}, {82, 52}} - + NO NO IBCocoaTouchFramework @@ -646,11 +667,14 @@ - {{24, 115}, {272, 279}} + {{0, 71}, {320, 310}} - + + 3 + MC4yNAA + NO NO IBCocoaTouchFramework @@ -660,10 +684,7 @@ - - 1 - MC44MDAwMDAwMTE5IDAuODAwMDAwMDExOSAwLjgwMDAwMDAxMTkAA - + NO IBCocoaTouchFramework @@ -687,14 +708,6 @@ 23 - - - callTableView - - - - 109 - endCtrl @@ -703,70 +716,6 @@ 99 - - - addCall - - - - 112 - - - - controlSubView - - - - 44 - - - - mergeCalls - - - - 114 - - - - speaker - - - - 82 - - - - dialer - - - - 49 - - - - pause - - - - 115 - - - - mute - - - - 80 - - - - contacts - - - - 84 - star @@ -887,6 +836,78 @@ 122 + + + callTableView + + + + 109 + + + + controlSubView + + + + 44 + + + + mute + + + + 80 + + + + addCall + + + + 112 + + + + dialer + + + + 49 + + + + pause + + + + 115 + + + + speaker + + + + 82 + + + + contacts + + + + 84 + + + + mergeCalls + + + + 114 + doAction: @@ -967,18 +988,13 @@ YES - - + + - - 106 - - - 120 @@ -994,64 +1010,6 @@ end - - 26 - - - YES - - - - - - - - - - controls - - - 113 - - - pauseresume - - - 13 - - - speaker - - - 17 - - - dialer - - - 15 - - - contacts - - - 111 - - - addcall - - - 16 - - - mute - - - 104 - - - merge - 27 @@ -1061,7 +1019,6 @@ - @@ -1070,6 +1027,7 @@ + pad @@ -1152,6 +1110,69 @@ 9 + + 106 + + + + + 26 + + + YES + + + + + + + + + + controls + + + 113 + + + pauseresume + + + 13 + + + speaker + + + 17 + + + dialer + + + 15 + + + contacts + + + 111 + + + addcall + + + 16 + + + mute + + + 104 + + + merge + @@ -1172,6 +1193,7 @@ 120.IBPluginDependency 13.CustomClassName 13.IBPluginDependency + 13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 15.IBPluginDependency 16.CustomClassName 16.IBPluginDependency @@ -1204,6 +1226,7 @@ 39.IBPluginDependency 40.CustomClassName 40.IBPluginDependency + 40.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 41.CustomClassName 41.IBPluginDependency 9.IBPluginDependency @@ -1220,14 +1243,15 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIMuteButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1256,6 +1280,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1554,24 +1579,36 @@ YES YES - addcall-green.png + HP.png + HP_inverse.png + ajouter.png + clavier-01-106px.png + clavier.png conf_merge.png - contact-orange.png + contact.png + grouper.png mic_active.png - numpad.png - pausecall.png - resumecall.png + micro.png + micro_inverse.png + pause.png + pause_inactif.png stopcall-red.png YES - {82, 71} + {164, 104} + {164, 104} + {164, 104} + {106, 60} + {164, 104} {82, 75} - {25, 23} + {164, 104} + {164, 104} {82, 82} - {82, 82} - {82, 75} - {82, 75} + {164, 104} + {164, 104} + {164, 104} + {164, 104} {62, 54} diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib index 385db8b02..be02b22e2 100644 --- a/Classes/PhoneViewController.xib +++ b/Classes/PhoneViewController.xib @@ -59,7 +59,6 @@ IBCocoaTouchFramework 0 0 - <- 3 MQA @@ -72,9 +71,9 @@ 3 MC41AA - + NSImage - clavier-01-106px.png + effacer.png Helvetica-Bold @@ -216,7 +215,10 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - + + NSImage + clavier-01-106px.png + @@ -239,7 +241,7 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - + @@ -288,7 +290,7 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - + @@ -311,7 +313,7 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - + @@ -334,7 +336,7 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - + @@ -384,7 +386,7 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - + @@ -407,7 +409,7 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - + @@ -453,7 +455,7 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - + @@ -1346,6 +1348,7 @@ clavier-01-106px.png clavier-01-108px.png clavier-01-160px.png + effacer.png startcall-green.png stopcall-red.png @@ -1354,6 +1357,7 @@ {106, 60} {108, 60} {160, 60} + {164, 104} {60, 52} {62, 54} diff --git a/PhoneMainView.xib b/PhoneMainView.xib index 1eb8dfbfc..8f1c9a54f 100644 --- a/PhoneMainView.xib +++ b/PhoneMainView.xib @@ -65,12 +65,18 @@ IBCocoaTouchFramework NO - - + + History + + History + + NSImage + history-orange.png + IBCocoaTouchFramework - 5 + 1 1 @@ -80,25 +86,7 @@ YES - - History - - History - - NSImage - history-orange.png - - IBCocoaTouchFramework - - - - - 1 - 1 - - IBCocoaTouchFramework - NO - + Dialer @@ -118,7 +106,19 @@ IBCocoaTouchFramework NO - + + + IBCocoaTouchFramework + 5 + + + + 1 + 1 + + IBCocoaTouchFramework + NO + @@ -357,7 +357,7 @@ - 47 + 48 0 diff --git a/Resources/HP.png b/Resources/HP.png new file mode 100755 index 000000000..95d132189 Binary files /dev/null and b/Resources/HP.png differ diff --git a/Resources/HP_inverse.png b/Resources/HP_inverse.png new file mode 100755 index 000000000..e343dba73 Binary files /dev/null and b/Resources/HP_inverse.png differ diff --git a/Resources/ajouter.png b/Resources/ajouter.png new file mode 100755 index 000000000..c1526d8ba Binary files /dev/null and b/Resources/ajouter.png differ diff --git a/Resources/clavier.png b/Resources/clavier.png new file mode 100755 index 000000000..3d2d9495b Binary files /dev/null and b/Resources/clavier.png differ diff --git a/Resources/contact.png b/Resources/contact.png new file mode 100755 index 000000000..ecf2b1603 Binary files /dev/null and b/Resources/contact.png differ diff --git a/Resources/effacer.png b/Resources/effacer.png new file mode 100755 index 000000000..685c72cbb Binary files /dev/null and b/Resources/effacer.png differ diff --git a/Resources/grouper.png b/Resources/grouper.png new file mode 100755 index 000000000..70ed3cbc7 Binary files /dev/null and b/Resources/grouper.png differ diff --git a/Resources/micro.png b/Resources/micro.png new file mode 100755 index 000000000..7c694fbff Binary files /dev/null and b/Resources/micro.png differ diff --git a/Resources/micro_inverse.png b/Resources/micro_inverse.png new file mode 100755 index 000000000..dc38d85a6 Binary files /dev/null and b/Resources/micro_inverse.png differ diff --git a/Resources/pause.png b/Resources/pause.png new file mode 100755 index 000000000..37d96580b Binary files /dev/null and b/Resources/pause.png differ diff --git a/Resources/pause_inactif.png b/Resources/pause_inactif.png new file mode 100755 index 000000000..0b46f283c Binary files /dev/null and b/Resources/pause_inactif.png differ