From ef716d657dacc62881f549a2d0ec7db3ddce7588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 8 Aug 2023 10:50:56 -0400
Subject: [PATCH] callactionbar: add forward call for jami accounts
Change-Id: I3559ef5398c73cd7c76196fe3b61cf005bc2408d
---
daemon | 2 +-
src/app/mainview/components/CallActionBar.qml | 22 +++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/daemon b/daemon
index c9bb7b123..7a45b5b19 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit c9bb7b123194967dda603f0ef3ba00d2b5b4c520
+Subproject commit 7a45b5b197f57bab2c6b999c5b101c2af242c9cd
diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 9604e49e7..82617463c 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/src/app/mainview/components/CallActionBar.qml
@@ -350,15 +350,6 @@ Control {
enabled: CurrentCall.isSIP
onEnabledChanged: CallOverlayModel.setEnabled(this, inputPanelSIPAction.enabled)
},
- Action {
- id: callTransferAction
- onTriggered: root.transferClicked()
- icon.source: JamiResources.phone_forwarded_24dp_svg
- icon.color: "white"
- text: JamiStrings.transferCall
- enabled: CurrentCall.isSIP
- onEnabledChanged: CallOverlayModel.setEnabled(this, callTransferAction.enabled)
- },
Action {
id: shareAction
onTriggered: {
@@ -420,9 +411,18 @@ Control {
icon.source: JamiResources.plugins_24dp_svg
icon.color: "white"
text: JamiStrings.viewPlugin
- enabled: PluginAdapter.callMediaHandlersListCount
+ enabled: PluginAdapter.isEnabled && PluginAdapter.callMediaHandlersListCount
onEnabledChanged: CallOverlayModel.setEnabled(this, pluginsAction.enabled)
},
+ Action {
+ id: callTransferAction
+ onTriggered: root.transferClicked()
+ icon.source: JamiResources.phone_forwarded_24dp_svg
+ icon.color: "white"
+ text: JamiStrings.transferCall
+ enabled: !CurrentCall.isConference
+ onEnabledChanged: CallOverlayModel.setEnabled(this, callTransferAction.enabled)
+ },
Action {
id: swarmDetailsAction
onTriggered: root.swarmDetailsClicked()
@@ -458,12 +458,12 @@ Control {
CallOverlayModel.addSecondaryControl(addPersonAction, addPersonAction.enabled);
CallOverlayModel.addSecondaryControl(resumePauseCallAction, resumePauseCallAction.enabled);
CallOverlayModel.addSecondaryControl(inputPanelSIPAction, inputPanelSIPAction.enabled);
- CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled);
CallOverlayModel.addSecondaryControl(chatAction, chatAction.enabled);
CallOverlayModel.addSecondaryControl(shareAction, shareAction.enabled);
CallOverlayModel.addSecondaryControl(layoutAction, layoutAction.enabled);
CallOverlayModel.addSecondaryControl(recordAction, recordAction.enabled);
CallOverlayModel.addSecondaryControl(pluginsAction, pluginsAction.enabled);
+ CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled);
CallOverlayModel.addSecondaryControl(swarmDetailsAction, swarmDetailsAction.enabled);
overflowItemCount = CallOverlayModel.secondaryModel().rowCount();
}
--
GitLab