Skip to content
Snippets Groups Projects
Commit 6689bce7 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

Revert "callactionbar: add forward call for jami accounts"

This reverts commit ef716d65.

Reason for revert: Missing a lot of design

Change-Id: I9f289d107dab25251e3de98a64c90446f9bf7c12
parent 860ddf22
No related branches found
No related tags found
No related merge requests found
daemon @ c9bb7b12
Subproject commit 7a45b5b197f57bab2c6b999c5b101c2af242c9cd
Subproject commit c9bb7b123194967dda603f0ef3ba00d2b5b4c520
......@@ -350,6 +350,15 @@ 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: {
......@@ -411,18 +420,9 @@ Control {
icon.source: JamiResources.plugins_24dp_svg
icon.color: "white"
text: JamiStrings.viewPlugin
enabled: PluginAdapter.isEnabled && PluginAdapter.callMediaHandlersListCount
enabled: 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();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment