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
e8edb153
Commit
e8edb153
authored
3 years ago
by
Sébastien Blin
Committed by
Andreas Traczyk
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ongoingcall: show chatview when receiving new interaction
Change-Id: I97c5f42ab622bb87666203a251915dbbb5b5d84d GitLab:
#429
parent
43639171
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/mainview/components/OngoingCallPage.qml
+16
-0
16 additions, 0 deletions
src/mainview/components/OngoingCallPage.qml
src/messagesadapter.cpp
+1
-0
1 addition, 0 deletions
src/messagesadapter.cpp
src/messagesadapter.h
+1
-0
1 addition, 0 deletions
src/messagesadapter.h
with
18 additions
and
0 deletions
src/mainview/components/OngoingCallPage.qml
+
16
−
0
View file @
e8edb153
...
...
@@ -300,6 +300,12 @@ Rectangle {
anchors.fill
:
parent
function
toggleConversation
()
{
inCallMessageWebViewStack
.
visible
?
closeInCallConversation
()
:
openInCallConversation
()
}
Connections
{
target
:
CallAdapter
...
...
@@ -330,6 +336,16 @@ Rectangle {
}
}
Connections
{
target
:
MessagesAdapter
function
onNewInteraction
(
interactionType
)
{
// Ignore call notifications, as we are in the call.
if
(
interactionType
!==
Interaction
.
Type
.
CALL
&&
!
inCallMessageWebViewStack
.
visible
)
openInCallConversation
()
}
}
onChatButtonClicked
:
{
inCallMessageWebViewStack
.
visible
?
closeInCallConversation
()
:
...
...
This diff is collapsed.
Click to expand it.
src/messagesadapter.cpp
+
1
−
0
View file @
e8edb153
...
...
@@ -487,6 +487,7 @@ MessagesAdapter::newInteraction(const QString& accountId,
auto
&
convModel
=
accountInfo
.
conversationModel
;
convModel
->
clearUnreadInteractions
(
convUid
);
printNewInteraction
(
*
convModel
,
interactionId
,
interaction
);
Q_EMIT
newInteraction
(
static_cast
<
int
>
(
interaction
.
type
));
}
catch
(...)
{
}
}
...
...
This diff is collapsed.
Click to expand it.
src/messagesadapter.h
+
1
−
0
View file @
e8edb153
...
...
@@ -95,6 +95,7 @@ Q_SIGNALS:
void
contactBanned
();
void
navigateToWelcomePageRequested
();
void
invitationAccepted
();
void
newInteraction
(
int
type
);
public
Q_SLOTS
:
void
slotSendMessageContentSaved
(
const
QString
&
content
);
...
...
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