Implemented dialog/information box queue for normal messages and errors

Reviewed by: Marko Niemelä

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index a5e37f8..655a04f 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -218,6 +218,7 @@ void SituareEngine::initializeGpsAndAutocentering()
 
         m_ui->buildInformationBox(tr("GPS enabled"));
         m_ui->buildInformationBox(tr("Auto centering enabled"));
+
     } else { // Normal start
         changeAutoCenteringSetting(autoCenteringEnabled.toBool());
         enableGPS(gpsEnabled.toBool());
@@ -227,7 +228,7 @@ void SituareEngine::initializeGpsAndAutocentering()
 
         if (gpsEnabled.toBool() && autoCenteringEnabled.toBool())
             m_ui->buildInformationBox(tr("Auto centering enabled"));
-    } 
+    }
 }
 
 bool SituareEngine::isUserMoved()

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 021eaea..b436eee 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -53,6 +53,7 @@ const int N900_APP_HEIGHT = 449;
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent),
     m_drawOwnLocationCrosshair(false),
+    m_errorShown(false),
     m_loggedIn(false),
     m_refresh(false),
     m_ownLocationCrosshair(0),
@@ -113,6 +114,9 @@ MainWindow::~MainWindow()
 
     qDeleteAll(m_queue.begin(), m_queue.end());
     m_queue.clear();
+
+    qDeleteAll(m_error_queue.begin(), m_error_queue.end());
+    m_error_queue.clear();
 }
 
 void MainWindow::buildFullScreenButton()
@@ -378,12 +382,13 @@ void MainWindow::createMenus()
 void MainWindow::dialogFinished(int status)
 {
     qDebug() << __PRETTY_FUNCTION__;
-    qDebug() << status;
+
     QDialog *dialog = m_queue.takeFirst();
-    if(!dialog->objectName().isEmpty()) {
+    LoginDialog *loginDialog = qobject_cast<LoginDialog *>(dialog);
+    if(loginDialog) {
         if(status != 0) {
             buildWebView();
-            static_cast<LoginDialog *>(dialog)->userInput(m_email, m_password);
+            loginDialog->userInput(m_email, m_password);
 
             QStringList urlParts;
             urlParts.append(FACEBOOK_LOGINBASE);
@@ -405,8 +410,13 @@ void MainWindow::dialogFinished(int status)
 
     dialog->deleteLater();
 
-    if(!m_queue.isEmpty())
-        showInformationBox();
+    if(!m_error_queue.isEmpty() && m_errorShown == false) {
+        showErrorInformationBox();
+    } else {
+        if(!m_queue.isEmpty()) {
+            showInformationBox();
+        }
+    }
 }
 
 void MainWindow::drawFullScreenButton(const QSize &size)
@@ -439,6 +449,21 @@ void MainWindow::drawOwnLocationCrosshair(int width, int height)
     }
 }
 
+void MainWindow::errorDialogFinished(int status)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    qDebug() << status;
+    QDialog *dialog = m_error_queue.takeFirst();
+
+    dialog->deleteLater();
+    m_errorShown = false;
+
+    if(!m_error_queue.isEmpty()) {
+        showErrorInformationBox();
+    }
+}
+
 void MainWindow::gpsTimeout()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -619,9 +644,17 @@ void MainWindow::queueDialog(QDialog *dialog)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_queue.append(dialog);
+    // check is dialog is modal, for now all modal dialogs have hihger priority i.e. errors
+    if(dialog->isModal()) {
+        m_error_queue.append(dialog);
+    } else {
+        m_queue.append(dialog);
+    }
 
-    if(m_queue.count() == 1)
+    // show error dialog if there is only one error dialog in the queue and no error dialog is shown
+    if(m_error_queue.count() == 1 && m_errorShown == false)
+        showErrorInformationBox();
+    else if(m_queue.count() == 1 && m_errorShown == false)
         showInformationBox();
 }
 
@@ -711,15 +744,29 @@ void MainWindow::toggleFullScreen()
         showNormal();
 }
 
+void MainWindow::showErrorInformationBox()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    if(m_error_queue.count()) {
+        m_errorShown = true;
+        QDialog *dialog = m_error_queue.first();
+        connect(dialog, SIGNAL(finished(int)),
+                this, SLOT(errorDialogFinished(int)));
+        dialog->show();
+    }
+}
+
 void MainWindow::showInformationBox()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QDialog *dialog = m_queue.takeFirst();
-    connect(dialog, SIGNAL(finished(int)),
-            this, SLOT(dialogFinished(int)));
-    dialog->show();
-    m_queue.insert(0, dialog);
+    if(m_queue.count()) {
+        QDialog *dialog = m_queue.first();
+        connect(dialog, SIGNAL(finished(int)),
+                this, SLOT(dialogFinished(int)));
+        dialog->show();
+    }
 }
 
 void MainWindow::startLoginProcess()
@@ -727,7 +774,6 @@ void MainWindow::startLoginProcess()
     qDebug() << __PRETTY_FUNCTION__;
 
     LoginDialog *loginDialog = new LoginDialog();
-    loginDialog->setObjectName(QString("loginDialog"));
 
     emit fetchUsernameFromSettings();
 

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 5cd97b4..25fc31f 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -246,6 +246,12 @@ private:
     void setOwnLocationCrosshairVisibility(bool visible);
 
     /**
+    * @brief Shows queued error information box
+    *
+    */
+    void showErrorInformationBox();
+
+    /**
     * @brief Shows queued information box
     *
     * @fn showInformationBox
@@ -283,6 +289,13 @@ private slots:
     void drawOwnLocationCrosshair(int width, int height);
 
     /**
+    * @brief Slot to intercept signal when error dialog/information note is processed
+    *
+    * @param status Status of the dialog
+    */
+    void errorDialogFinished(int status);
+
+    /**
     * @brief Slot for gps timeout.
     *
     * Called when request timeout occurs.
@@ -321,6 +334,11 @@ private slots:
     */
     void toggleFullScreen();
 
+    /**
+    * @brief Slot to intercept signal from webview's networkaccessmanager
+    *
+    * @param reply Network reply (contains errors)
+    */
     void webViewRequestFinished(QNetworkReply* reply);
 
 /*******************************************************************************
@@ -499,6 +517,7 @@ signals:
  ******************************************************************************/
 private:
     bool m_drawOwnLocationCrosshair;        ///< Flag for making ownLocationCrosshair visible or not
+    bool m_errorShown;                      ///< Indicates if error dialog/note is shown
     bool m_loggedIn;                        ///< Indicates login state
     bool m_refresh;                         ///< Indicates when webpage is refreshed
 
@@ -513,6 +532,9 @@ private:
     QLabel *m_osmLicense;                   ///< Label for Open Street Map license
     QLabel *m_ownLocationCrosshair;         ///< Label that show ownLocationCrosshair
 
+    QList<QDialog *> m_error_queue;         ///< QList type error dialog queue
+    QList<QDialog *> m_queue;               ///< QList type dialog queue
+
     QMenu *m_viewMenu;                      ///< Object that hold the view menu items
 
     QString m_email;                        ///< Placeholder for email
@@ -532,7 +554,6 @@ private:
 
     SettingsDialog *m_settingsDialog;       ///< Settings dialog
 
-    QList<QDialog *> m_queue;
 };
 
 #endif // MAINWINDOW_H