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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
c8c82083
Commit
c8c82083
authored
Feb 3, 2023
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
chatview: do not show "A call is in progress" in a call
Change-Id: I6e04c8e01e87f66a9e6da4fb32524f085066a5d0 GitLab:
#940
parent
5db4d29b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/mainview/MainView.qml
+3
-0
3 additions, 0 deletions
src/app/mainview/MainView.qml
src/app/mainview/components/ChatView.qml
+8
-3
8 additions, 3 deletions
src/app/mainview/components/ChatView.qml
with
11 additions
and
3 deletions
src/app/mainview/MainView.qml
+
3
−
0
View file @
c8c82083
...
@@ -91,6 +91,7 @@ Rectangle {
...
@@ -91,6 +91,7 @@ Rectangle {
}
}
function
pushCallStackView
()
{
function
pushCallStackView
()
{
chatView
.
inCallView
=
true
if
(
sidePanelOnly
)
{
if
(
sidePanelOnly
)
{
sidePanelViewStack
.
pop
(
StackView
.
Immediate
)
sidePanelViewStack
.
pop
(
StackView
.
Immediate
)
sidePanelViewStack
.
push
(
callStackView
,
StackView
.
Immediate
)
sidePanelViewStack
.
push
(
callStackView
,
StackView
.
Immediate
)
...
@@ -102,6 +103,7 @@ Rectangle {
...
@@ -102,6 +103,7 @@ Rectangle {
}
}
function
pushCommunicationMessageWebView
()
{
function
pushCommunicationMessageWebView
()
{
chatView
.
inCallView
=
false
if
(
sidePanelOnly
)
{
if
(
sidePanelOnly
)
{
sidePanelViewStack
.
pop
(
StackView
.
Immediate
)
sidePanelViewStack
.
pop
(
StackView
.
Immediate
)
sidePanelViewStack
.
push
(
chatView
,
StackView
.
Immediate
)
sidePanelViewStack
.
push
(
chatView
,
StackView
.
Immediate
)
...
@@ -412,6 +414,7 @@ Rectangle {
...
@@ -412,6 +414,7 @@ Rectangle {
objectName
:
"
chatView
"
objectName
:
"
chatView
"
visible
:
false
visible
:
false
inCallView
:
false
Component.onCompleted
:
{
Component.onCompleted
:
{
MessagesAdapter
.
setQmlObject
(
this
)
MessagesAdapter
.
setQmlObject
(
this
)
PositionManager
.
setQmlObject
(
this
)
PositionManager
.
setQmlObject
(
this
)
...
...
This diff is collapsed.
Click to expand it.
src/app/mainview/components/ChatView.qml
+
8
−
3
View file @
c8c82083
...
@@ -35,6 +35,7 @@ Rectangle {
...
@@ -35,6 +35,7 @@ Rectangle {
property
bool
allMessagesLoaded
property
bool
allMessagesLoaded
property
var
mapPositions
:
PositionManager
.
mapStatus
property
var
mapPositions
:
PositionManager
.
mapStatus
property
var
inCallView
:
false
property
int
lastContentsSplitSize
:
JamiTheme
.
detailsPageMinWidth
property
int
lastContentsSplitSize
:
JamiTheme
.
detailsPageMinWidth
property
int
lastDetailsSplitSize
:
JamiTheme
.
detailsPageMinWidth
property
int
lastDetailsSplitSize
:
JamiTheme
.
detailsPageMinWidth
...
@@ -44,6 +45,10 @@ Rectangle {
...
@@ -44,6 +45,10 @@ Rectangle {
signal
messagesCleared
signal
messagesCleared
signal
messagesLoaded
signal
messagesLoaded
onInCallViewChanged
:
{
notificationArea
.
visible
=
CurrentConversation
.
activeCalls
.
length
>
0
&&
!
root
.
inCallView
}
onVisibleChanged
:
{
onVisibleChanged
:
{
if
(
visible
)
if
(
visible
)
return
return
...
@@ -185,7 +190,7 @@ Rectangle {
...
@@ -185,7 +190,7 @@ Rectangle {
notificationArea
.
uri
=
CurrentConversation
.
activeCalls
[
0
][
"
uri
"
]
notificationArea
.
uri
=
CurrentConversation
.
activeCalls
[
0
][
"
uri
"
]
notificationArea
.
device
=
CurrentConversation
.
activeCalls
[
0
][
"
device
"
]
notificationArea
.
device
=
CurrentConversation
.
activeCalls
[
0
][
"
device
"
]
}
}
notificationArea
.
visible
=
CurrentConversation
.
activeCalls
.
length
>
0
notificationArea
.
visible
=
CurrentConversation
.
activeCalls
.
length
>
0
&&
!
root
.
inCallView
}
}
function
onErrorsChanged
()
{
function
onErrorsChanged
()
{
...
@@ -227,7 +232,7 @@ Rectangle {
...
@@ -227,7 +232,7 @@ Rectangle {
id
:
notificationArea
id
:
notificationArea
Layout.fillWidth
:
true
Layout.fillWidth
:
true
Layout.preferredHeight
:
JamiTheme
.
chatViewHeaderPreferredHeight
Layout.preferredHeight
:
JamiTheme
.
chatViewHeaderPreferredHeight
visible
:
false
visible
:
CurrentConversation
.
activeCalls
.
length
>
0
&&
!
root
.
inCallView
}
}
SplitView
{
SplitView
{
...
...
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