Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
ef716d65
Unverified
Commit
ef716d65
authored
1 year ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
callactionbar: add forward call for jami accounts
Change-Id: I3559ef5398c73cd7c76196fe3b61cf005bc2408d
parent
b0fe0251
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon
+1
-1
1 addition, 1 deletion
daemon
src/app/mainview/components/CallActionBar.qml
+11
-11
11 additions, 11 deletions
src/app/mainview/components/CallActionBar.qml
with
12 additions
and
12 deletions
daemon
@
7a45b5b1
Subproject commit
c9bb7b123194967dda603f0ef3ba00d2b5b4c520
Subproject commit
7a45b5b197f57bab2c6b999c5b101c2af242c9cd
This diff is collapsed.
Click to expand it.
src/app/mainview/components/CallActionBar.qml
+
11
−
11
View file @
ef716d65
...
...
@@ -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
();
}
...
...
This diff is collapsed.
Click to expand it.
Sébastien Blin
@sblin
mentioned in commit
6689bce7
·
1 year ago
mentioned in commit
6689bce7
mentioned in commit 6689bce782bd8d547dc5eb28f9f56cbb1d84cbab
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment