Merge remote-tracking branch 'remotes/fxrh/master' into save-window-state

Author: KitsuneRal

CMakeLists.txt

@@ -27,11 +27,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 # Find the libraries
-find_package(Qt5Widgets 5.2.1)
-find_package(Qt5Network 5.2.1)
-find_package(Qt5Quick 5.2.1)
-find_package(Qt5Qml 5.2.1)
-find_package(Qt5Gui 5.2.1)
+find_package(Qt5Widgets 5.2.1 REQUIRED)
+find_package(Qt5Network 5.2.1 REQUIRED)
+find_package(Qt5Quick 5.2.1 REQUIRED)
+find_package(Qt5Qml 5.2.1 REQUIRED)
+find_package(Qt5Gui 5.2.1 REQUIRED)
 
 message( STATUS )
 message( STATUS "================================================================================" )

client/logindialog.cpp

@@ -40,7 +40,7 @@ LoginDialog::LoginDialog(QWidget* parent)
     passwordEdit = new QLineEdit();
     passwordEdit->setEchoMode( QLineEdit::Password );
     saveTokenCheck = new QCheckBox("Stay logged in");
-    sessionLabel = new QLabel();
+    statusLabel = new QLabel("Welcome to Quaternion");
     loginButton = new QPushButton("Login");
 
     QFormLayout* formLayout = new QFormLayout();
@@ -52,7 +52,7 @@ LoginDialog::LoginDialog(QWidget* parent)
     QVBoxLayout* mainLayout = new QVBoxLayout();
     mainLayout->addLayout(formLayout);
     mainLayout->addWidget(loginButton);
-    mainLayout->addWidget(sessionLabel);
+    mainLayout->addWidget(statusLabel);
 
     setLayout(mainLayout);
 
@@ -94,6 +94,11 @@ LoginDialog::LoginDialog(QWidget* parent)
     connect( loginButton, &QPushButton::clicked, this, &LoginDialog::login );
 }
 
+void LoginDialog::setStatusMessage(const QString& msg)
+{
+    statusLabel->setText(msg);
+}
+
 QuaternionConnection* LoginDialog::connection() const
 {
     return m_connection;
@@ -106,7 +111,7 @@ bool LoginDialog::keepLoggedIn() const
 
 void LoginDialog::login()
 {
-    sessionLabel->setText("Connecting and logging in, please wait");
+    setStatusMessage("Connecting and logging in, please wait");
     setDisabled(true);
     QUrl url = QUrl::fromUserInput(serverEdit->text());
     QString user = userEdit->text();
@@ -121,7 +126,7 @@ void LoginDialog::login()
 
 void LoginDialog::error(QString error)
 {
-    sessionLabel->setText( error );
+    setStatusMessage( error );
     setConnection(nullptr);
     setDisabled(false);
 }

client/logindialog.h

@@ -34,6 +34,7 @@ class LoginDialog : public QDialog
     public:
         LoginDialog(QWidget* parent = nullptr);
 
+        void setStatusMessage(const QString& msg);
         QuaternionConnection* connection() const;
         bool keepLoggedIn() const;
 
@@ -46,7 +47,7 @@ class LoginDialog : public QDialog
         QLineEdit* userEdit;
         QLineEdit* passwordEdit;
         QPushButton* loginButton;
-        QLabel* sessionLabel;
+        QLabel* statusLabel;
         QCheckBox* saveTokenCheck;
 
         QuaternionConnection* m_connection;

client/main.cpp

@@ -32,6 +32,13 @@ int main( int argc, char* argv[] )
     QApplication::setApplicationDisplayName("Quaternion");
     QApplication::setApplicationVersion("0.0");
 
+    QObject::connect(&app, &QApplication::lastWindowClosed, []{
+        qDebug() << "Last window closed!";
+        // We should not need to do the following, as quitOnLastWindowClosed is set to "true"
+        // might be a bug, see https://forum.qt.io/topic/71112/application-does-not-quit
+        QApplication::postEvent(qApp, new QEvent(QEvent::Quit));
+    });
+
     QCommandLineParser parser;
     parser.setApplicationDescription(QApplication::translate("main", "An IM client for the Matrix protocol"));
     parser.addHelpOption();

client/mainwindow.cpp

@@ -144,14 +144,15 @@ void MainWindow::setConnection(QuaternionConnection* newConnection)
         connect( connection, &Connection::syncDone, this, &MainWindow::gotEvents );
         connect( connection, &Connection::connected, this, &MainWindow::getNewEvents );
         connect( connection, &Connection::reconnected, this, &MainWindow::getNewEvents );
-        connect( connection, &Connection::loginError, this, &MainWindow::loggedOut);
-        connect( connection, &Connection::loggedOut, this, &MainWindow::loggedOut);
+        connect( connection, &Connection::loginError, this, &MainWindow::loggedOut );
+        connect( connection, &Connection::loggedOut, [=]{ loggedOut(); } );
     }
 }
 
-void MainWindow::showLoginWindow()
+void MainWindow::showLoginWindow(const QString& statusMessage)
 {
     LoginDialog dialog(this);
+    dialog.setStatusMessage(statusMessage);
     if( dialog.exec() )
     {
         setConnection(dialog.connection());
@@ -202,12 +203,12 @@ void MainWindow::logout()
     connection->logout();
 }
 
-void MainWindow::loggedOut()
+void MainWindow::loggedOut(const QString& message)
 {
     loginAction->setEnabled(true);
     logoutAction->setEnabled(false);
     setConnection(nullptr);
-    loginAction->trigger();
+    showLoginWindow(message);
 }
 
 void MainWindow::getNewEvents()

client/mainwindow.h

@@ -54,12 +54,12 @@ class MainWindow: public QMainWindow
         void initialize();
         void getNewEvents();
         void gotEvents();
-        void loggedOut();
+        void loggedOut(const QString& message = QString());
 
         void connectionError(QString error);
 
         void showJoinRoomDialog();
-        void showLoginWindow();
+        void showLoginWindow(const QString& statusMessage = QString());
         void logout();
 
     private: