thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #743 from LorenDB/qmlLogout

Browse source 
QML the logout dialog
This commit is contained in:
DeepBlueV7.X 2021-10-09 20:57:38 +00:00 • committed by GitHub
commit 7eb9071b50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/MainWindow.cpp
View file

@ -35,7 +35,6 @@
#include "dialogs/CreateRoom.h"
#include "dialogs/JoinRoom.h"
#include "dialogs/LeaveRoom.h"
#include "dialogs/Logout.h"
MainWindow *MainWindow::instance_ = nullptr;
@ -372,24 +371,6 @@ MainWindow::showSolidOverlayModal(QWidget *content, QFlags<Qt::AlignmentFlag> fl
modal_->show();
}
void
MainWindow::openLogoutDialog()
{
auto dialog = new dialogs::Logout(this);
connect(dialog, &dialogs::Logout::loggingOut, this, [this]() {
if (WebRTCSession::instance().state() != webrtc::State::DISCONNECTED) {
if (QMessageBox::question(this, "nheko", "A call is in progress. Log out?") !=
QMessageBox::Yes) {
return;
}
WebRTCSession::instance().end();
}
chat_page_->initiateLogout();
});
showDialog(dialog);
}
bool
MainWindow::hasActiveDialogs() const
{

1
src/MainWindow.h
View file

@ -64,7 +64,6 @@ public:
void openCreateRoomDialog(
std::function<void(const mtx::requests::CreateRoom &request)> callback);
void openJoinRoomDialog(std::function<void(const QString &room_id)> callback);
void openLogoutDialog();
void hideOverlay();
void showSolidOverlayModal(QWidget *content, QFlags<Qt::AlignmentFlag> flags = Qt::AlignCenter);

5
src/ui/NhekoGlobalObject.cpp
View file

@ -14,6 +14,7 @@
#include "MainWindow.h"
#include "UserSettingsPage.h"
#include "Utils.h"
#include "WebRTCSession.h"
Nheko::Nheko()
{
@ -83,9 +84,9 @@ Nheko::showUserSettingsPage() const
}
void
Nheko::openLogoutDialog() const
Nheko::logout() const
{
MainWindow::instance()->openLogoutDialog();
ChatPage::instance()->initiateLogout();
}
void

4
src/ui/NhekoGlobalObject.h
View file

@ -48,7 +48,7 @@ public:
Q_INVOKABLE void openLink(QString link) const;
Q_INVOKABLE void setStatusMessage(QString msg) const;
Q_INVOKABLE void showUserSettingsPage() const;
Q_INVOKABLE void openLogoutDialog() const;
Q_INVOKABLE void logout() const;
Q_INVOKABLE void openCreateRoomDialog() const;
Q_INVOKABLE void openJoinRoomDialog() const;
Q_INVOKABLE void reparent(QWindow *win) const;
@ -60,6 +60,8 @@ signals:
void colorsChanged();
void profileChanged();
void openLogoutDialog();
private:
QScopedPointer<UserProfile> currentUser_;
};