Merge branch 'note_queue'

[situare] / src / engine / engine.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 655a04f..f569991 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -183,6 +183,7 @@ void SituareEngine::enableAutomaticLocationUpdate(bool enabled, int updateInterv
 void SituareEngine::error(const QString &error)
 {
     qDebug() << __PRETTY_FUNCTION__;
+    qDebug() << "ERROR MESSAGE: " << error;
 
     m_ui->buildInformationBox(error, true);
 
@@ -432,12 +433,15 @@ void SituareEngine::signalsFromMainWindow()
             this, SLOT(requestUpdateLocation(QString,bool)));
 
     connect(m_ui, SIGNAL(enableAutomaticLocationUpdate(bool, int)),
-            this, SLOT(enableAutomaticLocationUpdate(bool, int)));
+            this, SLOT(enableAutomaticLocationUpdate(bool, int)));    
 
     // signals from user info tab
     connect(m_ui, SIGNAL(refreshUserData()),
             this, SLOT(refreshUserData()));
 
+    connect (m_ui, SIGNAL(notificateUpdateFailing(QString)),
+             this, SLOT(error(QString)));
+
     connect(m_ui, SIGNAL(findUser(QPointF)),
             m_mapEngine, SLOT(setViewLocation(QPointF)));
 
@@ -487,6 +491,12 @@ void SituareEngine::signalsFromSituareService()
 
     connect(m_situareService, SIGNAL(updateWasSuccessful()),
             this, SLOT(updateWasSuccessful()));
+
+    connect(m_situareService, SIGNAL(updateWasSuccessful()),
+            m_ui, SIGNAL(updateWasSuccessful()));
+
+    connect(m_situareService, SIGNAL(error(QString)),
+            m_ui, SIGNAL(messageSendingFailed(QString)));
 }
 
 void SituareEngine::updateWasSuccessful()