lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-07 08:15:50 +02:00
Code Activity

callactionbar: add forward call for jami accounts

Browse source 
Change-Id: I3559ef5398c73cd7c76196fe3b61cf005bc2408d
This commit is contained in:
Sébastien Blin 2023-08-08 10:50:56 -04:00
parent b0fe0251d1
commit ef716d657d
No known key found for this signature in database
GPG key ID: C894BB01EEB2A9A9
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon

@ -1 +1 @@
Subproject commit c9bb7b123194967dda603f0ef3ba00d2b5b4c520 Subproject commit 7a45b5b197f57bab2c6b999c5b101c2af242c9cd

22
src/app/mainview/components/CallActionBar.qml
View file

@ -350,15 +350,6 @@ Control {
enabled: CurrentCall.isSIP enabled: CurrentCall.isSIP
onEnabledChanged: CallOverlayModel.setEnabled(this, inputPanelSIPAction.enabled) 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 { Action {
id: shareAction id: shareAction
onTriggered: { onTriggered: {
@ -420,9 +411,18 @@ Control {
icon.source: JamiResources.plugins_24dp_svg icon.source: JamiResources.plugins_24dp_svg
icon.color: "white" icon.color: "white"
text: JamiStrings.viewPlugin text: JamiStrings.viewPlugin
enabled: PluginAdapter.callMediaHandlersListCount enabled: PluginAdapter.isEnabled && PluginAdapter.callMediaHandlersListCount
onEnabledChanged: CallOverlayModel.setEnabled(this, pluginsAction.enabled) 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 { Action {
id: swarmDetailsAction id: swarmDetailsAction
onTriggered: root.swarmDetailsClicked() onTriggered: root.swarmDetailsClicked()
@ -458,12 +458,12 @@ Control {
CallOverlayModel.addSecondaryControl(addPersonAction, addPersonAction.enabled); CallOverlayModel.addSecondaryControl(addPersonAction, addPersonAction.enabled);
CallOverlayModel.addSecondaryControl(resumePauseCallAction, resumePauseCallAction.enabled); CallOverlayModel.addSecondaryControl(resumePauseCallAction, resumePauseCallAction.enabled);
CallOverlayModel.addSecondaryControl(inputPanelSIPAction, inputPanelSIPAction.enabled); CallOverlayModel.addSecondaryControl(inputPanelSIPAction, inputPanelSIPAction.enabled);
CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled);
CallOverlayModel.addSecondaryControl(chatAction, chatAction.enabled); CallOverlayModel.addSecondaryControl(chatAction, chatAction.enabled);
CallOverlayModel.addSecondaryControl(shareAction, shareAction.enabled); CallOverlayModel.addSecondaryControl(shareAction, shareAction.enabled);
CallOverlayModel.addSecondaryControl(layoutAction, layoutAction.enabled); CallOverlayModel.addSecondaryControl(layoutAction, layoutAction.enabled);
CallOverlayModel.addSecondaryControl(recordAction, recordAction.enabled); CallOverlayModel.addSecondaryControl(recordAction, recordAction.enabled);
CallOverlayModel.addSecondaryControl(pluginsAction, pluginsAction.enabled); CallOverlayModel.addSecondaryControl(pluginsAction, pluginsAction.enabled);
CallOverlayModel.addSecondaryControl(callTransferAction, callTransferAction.enabled);
CallOverlayModel.addSecondaryControl(swarmDetailsAction, swarmDetailsAction.enabled); CallOverlayModel.addSecondaryControl(swarmDetailsAction, swarmDetailsAction.enabled);
overflowItemCount = CallOverlayModel.secondaryModel().rowCount(); overflowItemCount = CallOverlayModel.secondaryModel().rowCount();
} }