Merge branch 'master' into gps

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index b7be031..7bcdac3 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -49,24 +49,25 @@ MainWindow::MainWindow(QWidget *parent)
     connect(m_listViewScreen,SIGNAL(launchUpdateDialog()),
             this,SLOT(openLocationUpdateDialog()));
 
-    connect(this, SIGNAL(reverseGeoReady(QString)), m_locationDialog, SLOT(setAddress(QString)));
+    connect(this, SIGNAL(reverseGeoReady(QString)),
+            m_locationDialog, SLOT(setAddress(QString)));
     connect(m_locationDialog, SIGNAL(statusUpdate(QString,bool)), this,
             SIGNAL(statusUpdate(QString,bool)));
 
     connect(this, SIGNAL(userLocationReady(User*)),
-            m_mapViewScreen, SLOT(userLocationReady(User*)));
+            m_mapViewScreen, SIGNAL(userLocationReady(User*)));
     connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
-            m_mapViewScreen, SLOT(friendsLocationsReady(QList<User*>&)));
+            m_mapViewScreen, SIGNAL(friendsLocationsReady(QList<User*>&)));
 
-    connect(this, SIGNAL(userLocationReady(User*)), m_listViewScreen,
-            SLOT(userDataReceived(User*)));
-    connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)), m_listViewScreen,
-            SLOT(friendInfoReceived(QList<User*>&)));
+    connect(this, SIGNAL(userLocationReady(User*)),
+            m_listViewScreen, SLOT(userDataReceived(User*)));
+    connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
+            m_listViewScreen, SLOT(friendInfoReceived(QList<User*>&)));
     connect(m_listViewScreen, SIGNAL(updateFriendsData()),
             this, SIGNAL(refreshUserData()));
 
-    connect(this, SIGNAL(autoCenteringEnabled(bool)),
-            m_mapViewScreen, SLOT(autoCenteringEnabled(bool)));
+    connect(this, SIGNAL(enableAutoCentering(bool)),
+            m_mapViewScreen, SLOT(enableAutoCentering(bool)));
     connect(this, SIGNAL(positionReceived(QPointF)),
             m_mapViewScreen, SLOT(positionReceived(QPointF)));
 
@@ -191,11 +192,13 @@ void MainWindow::gpsActionToggled(bool checked)
         emit enableGPS(true);
         m_gpsToggleAct->setText(tr("GPS enabled"));
         showMaemoInformationBox(tr("GPS enabled"));
+        m_autoCenteringAct->setEnabled(true);
     }
     else {
         emit enableGPS(false);
         m_gpsToggleAct->setText(tr("GPS disabled"));
         showMaemoInformationBox(tr("GPS disabled"));
+        m_autoCenteringAct->setEnabled(false);
     }
 }