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
66a479f7
Commit
66a479f7
authored
3 years ago
by
Ming Rui Zhang
Committed by
Andreas Traczyk
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
callActionBar: add sip only actions
Change-Id: I1d2af36e958bfc2e8783fb8657387f9d6c00276b
parent
e1fbb3a7
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
src/mainview/components/CallActionBar.qml
+30
-1
30 additions, 1 deletion
src/mainview/components/CallActionBar.qml
src/mainview/components/CallOverlay.qml
+2
-0
2 additions, 0 deletions
src/mainview/components/CallOverlay.qml
with
32 additions
and
1 deletion
src/mainview/components/CallActionBar.qml
+
30
−
1
View file @
66a479f7
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/CallOverlay.qml
+
2
−
0
View file @
66a479f7
...
...
@@ -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
()
}
...
...
This diff is collapsed.
Click to expand it.
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