From a7ea607c4465c8c7d4e1329b193b6193c2aba040 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 13 Mar 2017 10:57:42 +0100 Subject: [PATCH] feat(ui/views/App/Calls/Incall): reworking of camera/micro buttons --- .../assets/images/camera_off_hovered.svg | 11 ++++++----- .../assets/images/camera_off_normal.svg | 4 ++-- .../assets/images/camera_off_pressed.svg | 11 ++++++----- .../assets/images/camera_off_updating.svg | 4 ++-- .../assets/images/camera_on_hovered.svg | 13 ++++++------- .../assets/images/camera_on_pressed.svg | 11 +++++------ .../assets/images/micro_off_hovered.svg | 10 +++++----- linphone-desktop/assets/images/micro_off_normal.svg | 4 ++-- .../assets/images/micro_off_pressed.svg | 6 +++--- linphone-desktop/assets/images/micro_on_hovered.svg | 10 +++++----- linphone-desktop/assets/images/micro_on_pressed.svg | 6 +++--- linphone-desktop/ui/views/App/Calls/Incall.qml | 4 ++-- 12 files changed, 47 insertions(+), 47 deletions(-) diff --git a/linphone-desktop/assets/images/camera_off_hovered.svg b/linphone-desktop/assets/images/camera_off_hovered.svg index 6b2835676..61dcaf619 100644 --- a/linphone-desktop/assets/images/camera_off_hovered.svg +++ b/linphone-desktop/assets/images/camera_off_hovered.svg @@ -1,13 +1,14 @@ - + - camera_on + camera_off Created with Sketch. - - - + + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/camera_off_normal.svg b/linphone-desktop/assets/images/camera_off_normal.svg index 61dcaf619..7ee60debb 100644 --- a/linphone-desktop/assets/images/camera_off_normal.svg +++ b/linphone-desktop/assets/images/camera_off_normal.svg @@ -6,9 +6,9 @@ - + - \ No newline at end of file + diff --git a/linphone-desktop/assets/images/camera_off_pressed.svg b/linphone-desktop/assets/images/camera_off_pressed.svg index 75129b4d8..cca0afc25 100644 --- a/linphone-desktop/assets/images/camera_off_pressed.svg +++ b/linphone-desktop/assets/images/camera_off_pressed.svg @@ -1,13 +1,14 @@ - + - camera_on_clic + camera_off_clic Created with Sketch. - - - + + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/camera_off_updating.svg b/linphone-desktop/assets/images/camera_off_updating.svg index 61dcaf619..7ee60debb 100644 --- a/linphone-desktop/assets/images/camera_off_updating.svg +++ b/linphone-desktop/assets/images/camera_off_updating.svg @@ -6,9 +6,9 @@ - + - \ No newline at end of file + diff --git a/linphone-desktop/assets/images/camera_on_hovered.svg b/linphone-desktop/assets/images/camera_on_hovered.svg index 61dcaf619..44bc37a0b 100644 --- a/linphone-desktop/assets/images/camera_on_hovered.svg +++ b/linphone-desktop/assets/images/camera_on_hovered.svg @@ -1,14 +1,13 @@ - + - camera_off + camera_on Created with Sketch. - - - - + + + - \ No newline at end of file + diff --git a/linphone-desktop/assets/images/camera_on_pressed.svg b/linphone-desktop/assets/images/camera_on_pressed.svg index cca0afc25..75129b4d8 100644 --- a/linphone-desktop/assets/images/camera_on_pressed.svg +++ b/linphone-desktop/assets/images/camera_on_pressed.svg @@ -1,14 +1,13 @@ - + - camera_off_clic + camera_on_clic Created with Sketch. - - - - + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/micro_off_hovered.svg b/linphone-desktop/assets/images/micro_off_hovered.svg index da770932a..502450050 100644 --- a/linphone-desktop/assets/images/micro_off_hovered.svg +++ b/linphone-desktop/assets/images/micro_off_hovered.svg @@ -1,13 +1,13 @@ - micro_on + micro_off Created with Sketch. - - - + + + - \ No newline at end of file + diff --git a/linphone-desktop/assets/images/micro_off_normal.svg b/linphone-desktop/assets/images/micro_off_normal.svg index 0b6144c27..4c19f8966 100644 --- a/linphone-desktop/assets/images/micro_off_normal.svg +++ b/linphone-desktop/assets/images/micro_off_normal.svg @@ -6,8 +6,8 @@ - + - \ No newline at end of file + diff --git a/linphone-desktop/assets/images/micro_off_pressed.svg b/linphone-desktop/assets/images/micro_off_pressed.svg index bdf99ea2d..c37e9795a 100644 --- a/linphone-desktop/assets/images/micro_off_pressed.svg +++ b/linphone-desktop/assets/images/micro_off_pressed.svg @@ -1,13 +1,13 @@ - micro_on_clic + micro_off_clic Created with Sketch. - + - + \ No newline at end of file diff --git a/linphone-desktop/assets/images/micro_on_hovered.svg b/linphone-desktop/assets/images/micro_on_hovered.svg index 0b6144c27..6375f2dc0 100644 --- a/linphone-desktop/assets/images/micro_on_hovered.svg +++ b/linphone-desktop/assets/images/micro_on_hovered.svg @@ -1,13 +1,13 @@ - micro_off + micro_on Created with Sketch. - - - + + + - \ No newline at end of file + diff --git a/linphone-desktop/assets/images/micro_on_pressed.svg b/linphone-desktop/assets/images/micro_on_pressed.svg index c37e9795a..bdf99ea2d 100644 --- a/linphone-desktop/assets/images/micro_on_pressed.svg +++ b/linphone-desktop/assets/images/micro_on_pressed.svg @@ -1,13 +1,13 @@ - micro_off_clic + micro_on_clic Created with Sketch. - + - + \ No newline at end of file diff --git a/linphone-desktop/ui/views/App/Calls/Incall.qml b/linphone-desktop/ui/views/App/Calls/Incall.qml index daa3680cf..b770007fe 100644 --- a/linphone-desktop/ui/views/App/Calls/Incall.qml +++ b/linphone-desktop/ui/views/App/Calls/Incall.qml @@ -298,12 +298,12 @@ Rectangle { } ActionSwitch { - enabled: call.videoEnabled + enabled: !call.videoEnabled icon: 'camera' iconSize: CallStyle.actionArea.iconSize updating: call.updating - onClicked: call.videoEnabled = !enabled + onClicked: call.videoEnabled = enabled } ActionButton {