Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-client-qt
Commits
80dc7b52
Commit
80dc7b52
authored
Dec 31, 2020
by
Ming Rui Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sip: fix sip call hold status behavior
Gitlab:
#248
Change-Id: I5339156013787850e19a71a440c0e1b046ee76ed
parent
b4f3e1fa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
3 deletions
+48
-3
images/icons/ic_pause_white_100px.png
images/icons/ic_pause_white_100px.png
+0
-0
images/icons/ic_pause_white_100px.svg
images/icons/ic_pause_white_100px.svg
+42
-0
resources.qrc
resources.qrc
+1
-1
src/constant/JamiStrings.qml
src/constant/JamiStrings.qml
+2
-0
src/mainview/components/CallOverlay.qml
src/mainview/components/CallOverlay.qml
+1
-1
src/mainview/components/CallViewContextMenu.qml
src/mainview/components/CallViewContextMenu.qml
+2
-1
No files found.
images/icons/ic_pause_white_100px.png
deleted
100644 → 0
View file @
b4f3e1fa
437 Bytes
images/icons/ic_pause_white_100px.svg
0 → 100644
View file @
80dc7b52
<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
resources.qrc
View file @
80dc7b52
...
...
@@ -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.
pn
g</file>
<file>images/icons/ic_pause_white_100px.
sv
g</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>
...
...
src/constant/JamiStrings.qml
View file @
80dc7b52
...
...
@@ -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
"
)
...
...
src/mainview/components/CallOverlay.qml
View file @
80dc7b52
...
...
@@ -379,7 +379,7 @@ Rectangle {
visible
:
false
source
:
"
qrc:/images/icons/
phone
_pause
d-24
px.svg
"
source
:
"
qrc:/images/icons/
ic
_pause
_white_100
px.svg
"
}
CallOverlayButtonGroup
{
...
...
src/mainview/components/CallViewContextMenu.qml
View file @
80dc7b52
...
...
@@ -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
"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment