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 @@
@@ -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