From c8bfb02211f93ec41f6d39edab5cf3298ed069ab Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sun, 18 Feb 2018 22:22:26 +0200 Subject: Show loading indicator while waiting for /login & /logout fixes #208 --- include/ChatPage.h | 1 + include/LoginPage.h | 2 ++ include/MainWindow.h | 7 ++++++- 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/ChatPage.h b/include/ChatPage.h index 3a11f091..5d7d2806 100644 --- a/include/ChatPage.h +++ b/include/ChatPage.h @@ -77,6 +77,7 @@ signals: void showNotification(const QString &msg); void showLoginPage(const QString &msg); void showUserSettingsPage(); + void showOverlayProgressBar(); private slots: void showUnreadMessageNotification(int count); diff --git a/include/LoginPage.h b/include/LoginPage.h index f3ea16a1..003f0ee2 100644 --- a/include/LoginPage.h +++ b/include/LoginPage.h @@ -40,6 +40,8 @@ public: signals: void backButtonClicked(); + void loggingIn(); + void errorOccured(); protected: void paintEvent(QPaintEvent *event) override; diff --git a/include/MainWindow.h b/include/MainWindow.h index e4ffe2f4..54a4766d 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -59,7 +59,11 @@ private slots: void iconActivated(QSystemTrayIcon::ActivationReason reason); //! Show the welcome page in the main window. - void showWelcomePage() { pageStack_->setCurrentWidget(welcome_page_); } + void showWelcomePage() + { + removeOverlayProgressBar(); + pageStack_->setCurrentWidget(welcome_page_); + } //! Show the login page in the main window. void showLoginPage() { pageStack_->setCurrentWidget(login_page_); } @@ -73,6 +77,7 @@ private slots: //! Show the chat page and start communicating with the given access token. void showChatPage(QString user_id, QString home_server, QString token); + void showOverlayProgressBar(); void removeOverlayProgressBar(); private: -- cgit 1.5.1