Updated some changes to userinfo

[situare] / src / ui / mapviewscreen.cpp

diff --git a/src/ui/mapviewscreen.cpp b/src/ui/mapviewscreen.cpp
index 06c7d80..6e32f92 100644 (file)
--- a/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@ -20,8 +20,7 @@
 */
 
 #include "mapviewscreen.h"
-#include "../map/mapview.h"
-#include "../map/mapengine.h"
+#include "map/mapview.h"
 #include "panelcommon.h"
 #include "panelsidebar.h"
 
@@ -55,18 +54,18 @@ MapViewScreen::MapViewScreen(QWidget *parent)
             m_mapEngine, SLOT(viewZoomFinished()));
 
     connect(this, SIGNAL(zoomInKeyPressed()),
-            mapEngine, SLOT(zoomIn()));
+            m_mapEngine, SLOT(zoomIn()));
     connect(this, SIGNAL(zoomOutKeyPressed()),
-            mapEngine, SLOT(zoomOut()));
+            m_mapEngine, SLOT(zoomOut()));
 
-    connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
+    connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
             this, SLOT(drawOsmLicense(int, int)));
-    connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
-            m_friendsListPanel, SLOT(reDrawFriendsPanel(int,int)));
-    connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
-            m_userPanel, SLOT(reDrawUserPanel(int,int)));
-    connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
-            friendsListPanelSidebar, SLOT(reDrawSidebar(int,int)));
+    connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
+            m_friendsListPanel, SLOT(reDrawFriendsPanel(int, int)));
+    connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
+            m_userPanel, SLOT(reDrawUserPanel(int, int)));
+    connect(mapView, SIGNAL(viewResizedNewSize(int, int)),
+            friendsListPanelSidebar, SLOT(reDrawSidebar(int, int)));
 
     connect(m_zoomButtonPanel->m_zoomInBtn, SIGNAL(clicked()),
             m_mapEngine, SLOT(zoomIn()));
@@ -80,18 +79,35 @@ MapViewScreen::MapViewScreen(QWidget *parent)
 
     connect(this, SIGNAL(userLocationReady(User*)),
             m_mapEngine, SLOT(receiveOwnLocation(User*)));
+    connect(this, SIGNAL(userLocationReady(User*)),
+            m_mapEngine, SLOT(receiveOwnLocation(User*)));
     connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
             m_mapEngine, SIGNAL(friendsLocationsReady(QList<User*>&)));
 
     connect(m_mapEngine, SIGNAL(mapScrolled()),
             this, SLOT(locationChanged()));
 
+    connect(this, SIGNAL(userLocationReady(User*)),
+            m_userPanel, SLOT(userDataReceived(User*)));
+
+    connect(m_userPanel, SIGNAL(requestReverseGeo()),
+            this, SIGNAL(requestReverseGeo()));
+
+    connect(this, SIGNAL(reverseGeoReady(QString)),
+            m_userPanel, SIGNAL(reverseGeoReady(QString)));
+
+    connect(m_userPanel, SIGNAL(statusUpdate(QString,bool)),
+            this, SIGNAL(statusUpdate(QString,bool)));
+
+    connect(m_userPanel, SIGNAL(refreshUserData()),
+            this, SIGNAL(refreshUserData()));
+
     QHBoxLayout *mapViewLayout = new QHBoxLayout;
 
     m_osmLicense = new QLabel(this);
     m_osmLicense->setAttribute(Qt::WA_TranslucentBackground, true);
     m_osmLicense->setAttribute(Qt::WA_TransparentForMouseEvents, true);
-    m_osmLicense->setText("<font color='black'>"+OSM_LICENSE+"</font>");
+    m_osmLicense->setText("<font color='black'>" + OSM_LICENSE + "</font>");
     m_osmLicense->setFont(QFont("Nokia Sans", 9));
     m_osmLicense->resize(m_osmLicense->fontMetrics().width(OSM_LICENSE),
                          m_osmLicense->fontMetrics().height());