mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-08-21 15:24:01 +02:00
smartlist: switch to conversations tab on invitation accept
- switch tab to conversations smartlist - go to welcomeview TODO: define UI behavior while waiting for the smartlist update Gitlab: #284 Change-Id: I251c49e5b0b418f41d5872ef09d32db5bc940df2
This commit is contained in:
parent
5f6eb2151b
commit
f27f4374a2
3 changed files with 9 additions and 0 deletions
|
@ -463,6 +463,11 @@ Rectangle {
|
||||||
function onNavigateToWelcomePageRequested() {
|
function onNavigateToWelcomePageRequested() {
|
||||||
backToMainView()
|
backToMainView()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function onInvitationAccepted() {
|
||||||
|
mainViewSidePanel.selectTab(SidePanelTabBar.Conversations)
|
||||||
|
showWelcomeView()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
|
|
@ -664,6 +664,9 @@ MessagesAdapter::acceptInvitation(const QString& convUid)
|
||||||
{
|
{
|
||||||
const auto currentConvUid = convUid.isEmpty() ? lrcInstance_->getCurrentConvUid() : convUid;
|
const auto currentConvUid = convUid.isEmpty() ? lrcInstance_->getCurrentConvUid() : convUid;
|
||||||
lrcInstance_->getCurrentConversationModel()->makePermanent(currentConvUid);
|
lrcInstance_->getCurrentConversationModel()->makePermanent(currentConvUid);
|
||||||
|
if (convUid == currentConvUid_)
|
||||||
|
currentConvUid_.clear();
|
||||||
|
emit invitationAccepted();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -91,6 +91,7 @@ signals:
|
||||||
void needToUpdateSmartList();
|
void needToUpdateSmartList();
|
||||||
void contactBanned();
|
void contactBanned();
|
||||||
void navigateToWelcomePageRequested();
|
void navigateToWelcomePageRequested();
|
||||||
|
void invitationAccepted();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void slotSendMessageContentSaved(const QString& content);
|
void slotSendMessageContentSaved(const QString& content);
|
||||||
|
|
Loading…
Add table
Reference in a new issue