From 80dc7b52a0e4ec834246c235c69375bd1ffedd09 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Thu, 31 Dec 2020 12:42:44 -0500
Subject: [PATCH] sip: fix sip call hold status behavior
Gitlab: #248
Change-Id: I5339156013787850e19a71a440c0e1b046ee76ed
---
images/icons/ic_pause_white_100px.png | Bin 437 -> 0 bytes
images/icons/ic_pause_white_100px.svg | 42 ++++++++++++++++++
resources.qrc | 2 +-
src/constant/JamiStrings.qml | 2 +
src/mainview/components/CallOverlay.qml | 2 +-
.../components/CallViewContextMenu.qml | 3 +-
6 files changed, 48 insertions(+), 3 deletions(-)
delete mode 100644 images/icons/ic_pause_white_100px.png
create mode 100644 images/icons/ic_pause_white_100px.svg
diff --git a/images/icons/ic_pause_white_100px.png b/images/icons/ic_pause_white_100px.png
deleted file mode 100644
index fcf21884420cb152d4bf9abf0ecfa17f977e2b4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 437
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu_bxCyD<C*!3BGlPX>x`7I;J!
z19e;nVMZs7*%d%R_7YEDSM~=?+(Jy+-zq!jGcYhZdAc};RNQ)drIC}tfP>lb^51g5
z;~F=1^D6Bz2I{~K{%GH3+xqr$v)ab`{>SbO4h{+m0s<TyEG$e+jExNr3_wgshykn;
zMHQwH)I4NW7(#Gc5vnkS9<iV}5Tq2L9PSc?5N@v{%N&RkZ!qO}Ao|d~79{NH>gTe~
HDWM4fmnlwG
diff --git a/images/icons/ic_pause_white_100px.svg b/images/icons/ic_pause_white_100px.svg
new file mode 100644
index 000000000..e269a0ede
--- /dev/null
+++ b/images/icons/ic_pause_white_100px.svg
@@ -0,0 +1,42 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="" xml:space="preserve" width="477.867" height="477.867"><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<g class="currentLayer" style=""><title>Layer 1</title><g id="svg_1" class="selected" fill="#ffffff" fill-opacity="1">
+ <g id="svg_2" fill="#ffffff" fill-opacity="1">
+ <path d="M187.733,0H51.2c-9.426,0-17.067,7.641-17.067,17.067V460.8c0,9.426,7.641,17.067,17.067,17.067h136.533 c9.426,0,17.067-7.641,17.067-17.067V17.067C204.8,7.641,197.159,0,187.733,0z" id="svg_3" fill="#ffffff" fill-opacity="1"/>
+ </g>
+</g><g id="svg_4" class="" fill="#ffffff" fill-opacity="1">
+ <g id="svg_5" fill="#ffffff" fill-opacity="1">
+ <path d="M426.667,0H290.133c-9.426,0-17.067,7.641-17.067,17.067V460.8c0,9.426,7.641,17.067,17.067,17.067h136.533 c9.426,0,17.067-7.641,17.067-17.067V17.067C443.733,7.641,436.092,0,426.667,0z" id="svg_6" fill="#ffffff" fill-opacity="1"/>
+ </g>
+</g><g id="svg_7">
+</g><g id="svg_8">
+</g><g id="svg_9">
+</g><g id="svg_10">
+</g><g id="svg_11">
+</g><g id="svg_12">
+</g><g id="svg_13">
+</g><g id="svg_14">
+</g><g id="svg_15">
+</g><g id="svg_16">
+</g><g id="svg_17">
+</g><g id="svg_18">
+</g><g id="svg_19">
+</g><g id="svg_20">
+</g><g id="svg_21">
+</g></g></svg>
\ No newline at end of file
diff --git a/resources.qrc b/resources.qrc
index 44424faa5..2a29924a0 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -50,7 +50,7 @@
<file>images/icons/ic_mic_off_white_24dp.png</file>
<file>images/icons/pause_circle_outline-24px.svg</file>
<file>images/icons/play_circle_outline-24px.svg</file>
- <file>images/icons/ic_pause_white_100px.png</file>
+ <file>images/icons/ic_pause_white_100px.svg</file>
<file>images/icons/ic_phone_24px.svg</file>
<file>images/icons/groups-24px.svg</file>
<file>images/icons/ic_photo_camera_white_24dp_2x.png</file>
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index 306fee3ae..af29f73b6 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -178,6 +178,8 @@ Item {
property string mute: qsTr("Mute")
property string unmute: qsTr("Unmute")
property string hangup: qsTr("End call")
+ property string pauseCall: qsTr("Pause call")
+ property string resumeCall: qsTr("Resume call")
property string pauseVideo: qsTr("Pause video")
property string resumeVideo: qsTr("Resume video")
property string addParticipants: qsTr("Add participants")
diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml
index 507402070..c2956a4d0 100644
--- a/src/mainview/components/CallOverlay.qml
+++ b/src/mainview/components/CallOverlay.qml
@@ -379,7 +379,7 @@ Rectangle {
visible: false
- source: "qrc:/images/icons/phone_paused-24px.svg"
+ source: "qrc:/images/icons/ic_pause_white_100px.svg"
}
CallOverlayButtonGroup {
diff --git a/src/mainview/components/CallViewContextMenu.qml b/src/mainview/components/CallViewContextMenu.qml
index 33378136d..9667aaf12 100644
--- a/src/mainview/components/CallViewContextMenu.qml
+++ b/src/mainview/components/CallViewContextMenu.qml
@@ -45,7 +45,8 @@ Item {
function openMenu(){
ContextMenuGenerator.initMenu()
if (isSIP){
- ContextMenuGenerator.addMenuItem(isPaused ? JamiStrings.resume : JamiStrings.hold,
+ ContextMenuGenerator.addMenuItem(isPaused ? JamiStrings.resumeCall :
+ JamiStrings.pauseCall,
isPaused ?
"qrc:/images/icons/play_circle_outline-24px.svg" :
"qrc:/images/icons/pause_circle_outline-24px.svg",
--
GitLab