Merge branch 'list_panel'

[situare] / src / engine / engine.cpp

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 5a5fe38..4f69067 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -21,9 +21,16 @@
     USA.
  */
 
+#include "situarecommon.h"
 #include "engine.h"
 #include "ui/mainwindow.h"
+#include "gps/gpspositioninterface.h"
+
+#ifdef Q_WS_MAEMO_5
 #include "gps/gpsposition.h"
+#else
+#include "gps/gpspositionmockup.h"
+#endif
 
 SituareEngine::SituareEngine(QMainWindow *parent)
     : QObject(parent)
@@ -33,16 +40,21 @@ SituareEngine::SituareEngine(QMainWindow *parent)
 
     m_situareService = new SituareService(this);
 
-    m_facebookAuthenticator = new FacebookAuthentication();
+    m_facebookAuthenticator = new FacebookAuthentication(this);
 
+#ifdef Q_WS_MAEMO_5
     m_gps = new GPSPosition(this);
+#else
+    m_gps = new GPSPositionMockup(this);
+#endif
+    m_gps->setMode(GPSPositionInterface::Default);
 
     connect(m_facebookAuthenticator, SIGNAL(credentialsReady(FacebookCredentials)),
             m_situareService, SLOT(credentialsReady(FacebookCredentials)));
     connect(m_facebookAuthenticator, SIGNAL(credentialsReady(FacebookCredentials)),
             this, SLOT(loginOk()));
-    connect(m_facebookAuthenticator, SIGNAL(quitSituare()),
-            this, SLOT(quitApplication()));
+    connect(m_ui, SIGNAL(cancelLoginProcess()),
+            this, SLOT(loginProcessCancelled()));
 
     connect(m_ui, SIGNAL(requestReverseGeo()),
             this, SLOT(requestAddress()));
@@ -64,11 +76,30 @@ SituareEngine::SituareEngine(QMainWindow *parent)
     connect(m_ui, SIGNAL(refreshUserData()),
             this, SLOT(refreshUserData()));
 
-    connect(m_gps, SIGNAL(timeout()), m_ui, SLOT(gpsTimeout()));
-    connect(m_gps, SIGNAL(error(QString)), m_ui, SLOT(gpsError(QString)));
-    connect(m_ui, SIGNAL(enableGPS(bool)), this, SLOT(enableGPS(bool)));
-    connect(m_gps, SIGNAL(position(QPointF)),
-            m_ui, SIGNAL(positionReceived(QPointF)));
+    connect(m_gps, SIGNAL(timeout()),
+            m_ui, SLOT(gpsTimeout()));
+    connect(m_gps, SIGNAL(error(QString)),
+            m_ui, SLOT(gpsError(QString)));
+    connect(m_ui, SIGNAL(enableGPS(bool)),
+            this, SLOT(enableGPS(bool)));
+    connect(m_gps, SIGNAL(position(QPointF, qreal)),
+            m_ui, SIGNAL(positionReceived(QPointF, qreal)));
+    connect(m_ui, SIGNAL(enableAutoCentering(bool)),
+            this, SLOT(enableAutoCentering(bool)));
+
+    connect(m_facebookAuthenticator, SIGNAL(newLoginRequest(QUrl)),
+            m_ui, SLOT(startLoginProcess(QUrl)));
+    connect(m_ui, SIGNAL(updateCredentials(QUrl)),
+            m_facebookAuthenticator, SLOT(updateCredentials(QUrl)));
+    connect(m_facebookAuthenticator, SIGNAL(loginFailure()),
+            m_ui, SLOT(loginFailed()));
+
+    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QVariant gpsEnabled = settings.value(GPS_ENABLED);
+    QVariant autoCenteringEnabled = settings.value(AUTO_CENTERING_ENABLED);
+
+    enableGPS(gpsEnabled.toBool());
+    enableAutoCentering(autoCenteringEnabled.toBool());
 
      m_facebookAuthenticator->start();
 }
@@ -76,15 +107,16 @@ SituareEngine::SituareEngine(QMainWindow *parent)
 SituareEngine::~SituareEngine()
 {
     qDebug() << __PRETTY_FUNCTION__;
+
     delete m_ui;
 }
 
-void SituareEngine::quitApplication()
+void SituareEngine::loginProcessCancelled()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_facebookAuthenticator->setAttribute(Qt::WA_DeleteOnClose);
-    m_facebookAuthenticator->close();
+    m_ui->toggleProgressIndicator(false);
+    //ToDo: do something
 }
 
 void SituareEngine::error(const QString &error)
@@ -98,14 +130,8 @@ void SituareEngine::loginOk()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_facebookAuthenticator->setAttribute(Qt::WA_DeleteOnClose);
-    m_facebookAuthenticator->close();
     m_ui->show();
     m_situareService->fetchLocations(); // request user locations
-
-    //Debug, use settings instead
-    enableGPS(true);
-    m_ui->autoCenteringToggled(true);
 }
 
 void SituareEngine::requestAddress()
@@ -156,8 +182,28 @@ void SituareEngine::enableGPS(bool enabled)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if (enabled)
+    if (enabled) {
+        m_gps->lastPosition();
         m_gps->start();
-    else
+        m_ui->setGPSButton(true);
+    }
+    else {
         m_gps->stop();
+        m_ui->setGPSButton(false);
+    }
+}
+
+void SituareEngine::enableAutoCentering(bool enabled)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    if (enabled) {
+        m_ui->setAutoCenteringButton(true);
+        m_ui->autoCenteringEnabled(true);
+        m_gps->lastPosition();
+    }
+    else {
+        m_ui->setAutoCenteringButton(false);
+        m_ui->autoCenteringEnabled(false);
+    }
 }