Merge branch 'master' of https://vcs.maemo.org/git/situare into list_panel

[situare] / src / ui / friendlistpanel.cpp

diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp
index 33edabe..8719b2e 100644 (file)
--- a/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@ -38,7 +38,6 @@ FriendListPanel::FriendListPanel(QWidget *parent)
     m_friendListView = new FriendListView(this);
     QScrollArea *friendListScroll = new QScrollArea(this);
     friendListScroll->setWidget(m_friendListView);
-    friendListScroll->setWidgetResizable(true);
     friendListScroll->viewport()->setAutoFillBackground(false);
     friendListScroll->widget()->setAutoFillBackground(false);
 
@@ -70,8 +69,8 @@ FriendListPanel::FriendListPanel(QWidget *parent)
         User *user = new User(QString("Address"), QPointF(12.22, 23.33), QString("Name Name Name Naem"),
                               QString("Hello world! Hello world! Hello world! Hello world! "),
                               QUrl(), QString("2 days ago"), false, QString("id"), QString("km"),
-                              10000);
-        user->setProfileImage(QPixmap("res/images/face.gif"));
+                              600);
+        user->setProfileImage(QPixmap(":/res/images/face.gif"));
         friendList.append(user);
     }
     friendInfoReceived(friendList);
@@ -89,7 +88,7 @@ void FriendListPanel::friendInfoReceived(QList<User *> &friendList)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_friendListView->clear();
+    //m_friendListView->clear();
 
     foreach (User *user, friendList) {
         FriendListItem *item = new FriendListItem(m_friendListView);