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
9d6fe53f
Commit
9d6fe53f
authored
3 years ago
by
Andreas Traczyk
Committed by
Sébastien Blin
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
callpages: consume currentconversation observables
Change-Id: Ib8a1cf6fe3ba90c973c89e4806cfd3d6da1aa390
parent
2ee3ec07
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/CallStackView.qml
+0
-1
0 additions, 1 deletion
src/mainview/components/CallStackView.qml
src/mainview/components/InitialCallPage.qml
+12
-17
12 additions, 17 deletions
src/mainview/components/InitialCallPage.qml
with
12 additions
and
18 deletions
src/mainview/components/CallStackView.qml
+
0
−
1
View file @
9d6fe53f
...
...
@@ -93,7 +93,6 @@ Rectangle {
}
else
{
callStackMainView
.
pop
(
itemToFind
,
StackView
.
Immediate
)
}
initialCallPage
.
accountConvPair
=
[
responsibleAccountId
,
responsibleConvUid
]
initialCallPage
.
callStatus
=
callState
initialCallPage
.
isAudioOnly
=
isAudioOnly
if
(
initialCallPage
.
callStatus
===
Call
.
Status
.
INCOMING_RINGING
)
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/InitialCallPage.qml
+
12
−
17
View file @
9d6fe53f
...
...
@@ -34,9 +34,7 @@ Rectangle {
property
bool
isIncoming
:
false
property
bool
isAudioOnly
:
false
property
var
accountConvPair
:
[
""
,
""
]
property
int
callStatus
:
0
property
string
bestName
:
""
signal
callCanceled
signal
callAccepted
...
...
@@ -58,13 +56,6 @@ Rectangle {
}
}
onAccountConvPairChanged
:
{
if
(
accountConvPair
[
1
])
{
contactImg
.
imageId
=
accountConvPair
[
1
]
root
.
bestName
=
UtilsAdapter
.
getBestName
(
accountConvPair
[
0
],
accountConvPair
[
1
])
}
}
// Prevent right click propagate to VideoCallPage.
MouseArea
{
anchors.fill
:
parent
...
...
@@ -78,14 +69,13 @@ Rectangle {
anchors.verticalCenter
:
root
.
verticalCenter
ConversationAvatar
{
id
:
contactImg
Layout.alignment
:
Qt
.
AlignHCenter
Layout.preferredWidth
:
JamiTheme
.
avatarSizeInCall
Layout.preferredHeight
:
JamiTheme
.
avatarSizeInCall
showPresenceIndicator
:
false
animationMode
:
SpinningAnimation
.
Mode
.
Radial
imageId
:
CurrentConversation
.
id
}
Text
{
...
...
@@ -98,11 +88,15 @@ Rectangle {
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
property
string
title
:
CurrentConversation
.
title
text
:
{
if
(
root
.
isIncoming
)
return
root
.
isAudioOnly
?
JamiStrings
.
incomingAudioCallFrom
.
replace
(
"
{}
"
,
root
.
bestName
)
:
JamiStrings
.
incomingVideoCallFrom
.
replace
(
"
{}
"
,
root
.
bestName
)
return
root
.
isAudioOnly
?
JamiStrings
.
incomingAudioCallFrom
.
replace
(
"
{}
"
,
title
)
:
JamiStrings
.
incomingVideoCallFrom
.
replace
(
"
{}
"
,
title
)
else
return
root
.
bestNam
e
return
titl
e
}
wrapMode
:
Text
.
WordWrap
elide
:
Text
.
ElideRight
...
...
@@ -188,6 +182,7 @@ Rectangle {
font.kerning
:
true
color
:
actionButton
.
hovered
?
JamiTheme
.
whiteColor
:
JamiTheme
.
whiteColorTransparent
text
:
{
if
(
type
===
"
refuse
"
)
return
JamiStrings
.
refuse
...
...
@@ -212,16 +207,16 @@ Rectangle {
Shortcut
{
sequence
:
"
Ctrl+Y
"
context
:
Qt
.
ApplicationShortcut
onActivated
:
CallAdapter
.
acceptACall
(
root
.
accountConvPair
[
0
]
,
root
.
accountConvPair
[
1
]
)
onActivated
:
CallAdapter
.
acceptACall
(
CurrentAccount
.
id
,
CurrentConversation
.
id
)
}
Shortcut
{
sequence
:
"
Ctrl+Shift+D
"
context
:
Qt
.
ApplicationShortcut
onActivated
:
{
CallAdapter
.
hangUpACall
(
root
.
accountConvPair
[
0
]
,
root
.
accountConvPair
[
1
]
)
CallAdapter
.
hangUpACall
(
CurrentAccount
.
id
,
CurrentConversation
.
id
)
}
}
}
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