From 66a479f7b6198ce5ff5880c4ed3b52e4863ef313 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Tue, 1 Jun 2021 11:24:06 -0400
Subject: [PATCH] callActionBar: add sip only actions
Change-Id: I1d2af36e958bfc2e8783fb8657387f9d6c00276b
---
src/mainview/components/CallActionBar.qml | 31 ++++++++++++++++++++++-
src/mainview/components/CallOverlay.qml | 2 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/src/mainview/components/CallActionBar.qml b/src/mainview/components/CallActionBar.qml
index e5e18e712..ca6778e68 100644
--- a/src/mainview/components/CallActionBar.qml
+++ b/src/mainview/components/CallActionBar.qml
@@ -37,7 +37,9 @@ Control {
signal chatClicked
signal addToConferenceClicked
- signal transferClicked // TODO: bind this
+ signal transferClicked
+ signal resumePauseCallClicked
+ signal showInputPanelClicked
signal shareScreenClicked
signal stopSharingClicked
signal shareScreenAreaClicked // TODO: bind this
@@ -186,6 +188,28 @@ Control {
icon.color: "white"
text: JamiStrings.chat
},
+ Action {
+ id: resumePauseCallAction
+ onTriggered: root.resumePauseCallClicked()
+ icon.source: isPaused ? "qrc:/images/icons/play_circle_outline-24px.svg" :
+ "qrc:/images/icons/pause_circle_outline-24px.svg"
+ icon.color: "white"
+ text: isPaused ? JamiStrings.resumeCall : JamiStrings.pauseCall
+ },
+ Action {
+ id: inputPanelSIPAction
+ onTriggered: root.showInputPanelClicked()
+ icon.source: "qrc:/images/icons/ic_keypad.svg"
+ icon.color: "white"
+ text: JamiStrings.sipInputPanel
+ },
+ Action {
+ id: callTransferAction
+ onTriggered: root.transferClicked()
+ icon.source: "qrc:/images/icons/phone_forwarded-24px.svg"
+ icon.color: "white"
+ text: JamiStrings.transferCall
+ },
Action {
id: shareAction
onTriggered: AvAdapter.currentRenderingDeviceType === Video.DeviceType.DISPLAY ?
@@ -247,6 +271,11 @@ Control {
CallOverlayModel.addSecondaryControl(audioOutputAction)
if (isModerator && !isSIP)
CallOverlayModel.addSecondaryControl(addPersonAction)
+ if (isSIP) {
+ CallOverlayModel.addSecondaryControl(resumePauseCallAction)
+ CallOverlayModel.addSecondaryControl(inputPanelSIPAction)
+ CallOverlayModel.addSecondaryControl(callTransferAction)
+ }
CallOverlayModel.addSecondaryControl(chatAction)
if (!isAudioOnly && !isSIP)
CallOverlayModel.addSecondaryControl(shareAction)
diff --git a/src/mainview/components/CallOverlay.qml b/src/mainview/components/CallOverlay.qml
index 3718d8546..8bc4866d7 100644
--- a/src/mainview/components/CallOverlay.qml
+++ b/src/mainview/components/CallOverlay.qml
@@ -189,6 +189,8 @@ Item {
function onChatClicked() { root.chatButtonClicked() }
function onAddToConferenceClicked() { openContactPicker(ContactList.CONFERENCE) }
function onTransferClicked() { openContactPicker(ContactList.TRANSFER) }
+ function onResumePauseCallClicked() { CallAdapter.holdThisCallToggle() }
+ function onShowInputPanelClicked() { sipInputPanel.open() }
function onShareScreenClicked() { openShareScreen() }
function onStopSharingClicked() { AvAdapter.stopSharing() }
function onShareScreenAreaClicked() { openShareScreenArea() }
--
GitLab