Merge branch 'master' into locationlistview

[situare] / src / ui / friendlistpanel.cpp

diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp
index 70aca8d..fcb7d79 100644 (file)
--- a/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@ -26,6 +26,10 @@
 #include "friendlistitemdelegate.h"
 #include "panelcommon.h"
 #include "sidepanel.h"
+#include "../routing/location.h"
+#include "locationlistitem.h"
+#include "locationlistview.h"
+#include "extendedlistitemdelegate.h"
 
 #include "friendlistpanel.h"
 
@@ -60,8 +64,16 @@ FriendListPanel::FriendListPanel(QWidget *parent)
     m_friendListView->viewport()->setAutoFillBackground(false);
     m_friendListItemDelegate = new FriendListItemDelegate();
     m_friendListView->setItemDelegate(m_friendListItemDelegate);
+    //REMOVE
+    m_friendListView->hide();
 
-    friendListLayout->addWidget(m_friendListView);
+    m_locationListView = new LocationListView(this);
+    m_locationListView->setAutoFillBackground(false);
+    m_locationListView->viewport()->setAutoFillBackground(false);
+    m_locationListView->setItemDelegate(new ExtendedListItemDelegate());
+
+    //friendListLayout->addWidget(m_friendListView);
+    friendListLayout->addWidget(m_locationListView);
     m_panelVBox->addLayout(friendListLayout);
 
     connect(m_friendListView, SIGNAL(listItemClicked(GeoCoordinate)),
@@ -71,6 +83,9 @@ FriendListPanel::FriendListPanel(QWidget *parent)
             this, SLOT(clearFriendListFilter()));
     connect(this, SIGNAL(panelOpened()),
             this, SLOT(clearFriendListFilter()));
+
+    connect(m_locationListView, SIGNAL(locationItemClicked(GeoCoordinate&,GeoCoordinate&)),
+            this, SIGNAL(locationItemClicked(GeoCoordinate&,GeoCoordinate&)));
 }
 
 void FriendListPanel::friendImageReady(User *user)
@@ -120,6 +135,21 @@ void FriendListPanel::clearFriendListFilter()
     m_friendListView->clearFilter();
 }
 
+void FriendListPanel::locationDataReady(QList<Location> &result)
+{
+    qWarning() << __PRETTY_FUNCTION__;
+
+    m_locationListView->clearList();
+
+    for (int i = 0; i < result.size(); ++i) {
+        LocationListItem *item = new LocationListItem();
+        item->setLocationData(result.at(i));
+        m_locationListView->addListItem(QString::number(i), item);
+    }
+
+
+}
+
 void FriendListPanel::showFriendsInList(const QList<QString> &userIDs)
 {
     qDebug() << __PRETTY_FUNCTION__;