Merge branch 'master' into listview

Conflicts:
	src/src.pro

diff --cc src/src.pro
index f2e74d7,1469bca..152268a
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -37,7 -38,7 +38,6 @@@ SOURCES += main.cpp 
      ui/avatarimage.cpp \
      ui/friendlistitem.cpp \
      ui/friendlistpanel.cpp \
- #    ui/friendlistview.cpp \
 -    ui/friendlistview.cpp \
      ui/imagebutton.cpp \
      ui/logindialog.cpp \
      ui/mainwindow.cpp \
@@@ -53,12 -54,9 +53,13 @@@
      ui/zoombuttonpanel.cpp \
      user/user.cpp \
      ui/fullscreenbutton.cpp \
 -    engine/mce.cpp
 +    engine/mce.cpp \
 +    ui/listview.cpp \
 +    ui/listitem.cpp \
 +    ui/listitemdelegate.cpp \
 +    ui/friendlistitemdelegate.cpp
- HEADERS += common.h \
+ HEADERS += application.h \
+     common.h \
      engine/engine.h \
      facebookservice/facebookauthentication.h \
      facebookservice/facebookcommon.h \
@@@ -91,7 -89,7 +92,6 @@@
      ui/avatarimage.h \
      ui/friendlistitem.h \
      ui/friendlistpanel.h \
- #    ui/friendlistview.h \
 -    ui/friendlistview.h \
      ui/imagebutton.h \
      ui/logindialog.h \
      ui/mainwindow.h \

diff --cc src/ui/friendlistitem.cpp
index b81899f,6a999db..098caaa
--- 1/src/ui/friendlistitem.cpp
--- 2/src/ui/friendlistitem.cpp
+++ b/src/ui/friendlistitem.cpp
@@@ -102,8 -170,8 +102,7 @@@ void FriendListItem::setUserData(User *
      if(user) {
          m_user = user;
  
--        if (!m_user->profileImage().isNull())
-             setData(AVATAR_IMAGE_INDEX, m_user->profileImage());
 -            m_findButton->setButtonIcon(m_user->profileImage());
++        setData(AVATAR_IMAGE_INDEX, m_user->profileImage());
  
          QString unit;
          double value;
@@@ -118,10 -184,16 +117,18 @@@
      }
  }
  
+ void FriendListItem::setAvatarImage(const QPixmap &image)
+ {
+     qDebug() << __PRETTY_FUNCTION__;
+ 
+     if(!image.isNull())
 -        m_findButton->setButtonIcon(image);
++        setData(AVATAR_IMAGE_INDEX, m_user->profileImage());
+ }
+ 
  void FriendListItem::setDistanceIcon(double value, const QString &unit)
  {
 +    qDebug() << __PRETTY_FUNCTION__;
 +
      QPixmap distanceImage;
  
      if ((unit == "m") || (value < WALK_DISTANCE))

diff --cc src/ui/friendlistitem.h
index 0b4e030,53c402f..144c471
--- 1/src/ui/friendlistitem.h
--- 2/src/ui/friendlistitem.h
+++ b/src/ui/friendlistitem.h
@@@ -86,18 -85,17 +86,25 @@@ public
      *
      * @param user User pointer
      */
 -    void setData(User *user);
 +    void setUserData(User *user);
  
+     /**
+     * @brief Sets avatar image for this item.
+     *
+     * @param image image
+     */
+     void setAvatarImage(const QPixmap &image);
+ 
  private:
      /**
 +    * @brief Calculates text rects.
 +    *
 +    * Caclulates distance, status, updated and location texts rects. Sets item's
 +    * expanded height from rects.
 +    */
 +    void calculateTextRects();
 +
 +    /**
      * @brief Set distance icon.
      *
      * Icon is selected by distance.

diff --cc src/ui/friendlistpanel.cpp
index a99a588,6ce3037..5a23d1c
--- 1/src/ui/friendlistpanel.cpp
--- 2/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@@ -70,6 -66,14 +71,16 @@@ FriendListPanel::FriendListPanel(QWidge
              this, SLOT(clearFriendListFilter()));
  }
  
+ void FriendListPanel::friendImageReady(User *user)
+ {
+     qDebug() << __PRETTY_FUNCTION__;
+ 
 -    FriendListItem *item = m_friendListView->widget(user->userId());
 -    item->setAvatarImage(user->profileImage());
++    FriendListItem *item = static_cast<FriendListItem*>(m_friendListView->listItem(user->userId()));
++
++    if (item)
++        item->setAvatarImage(user->profileImage());
+ }
+ 
  void FriendListPanel::friendInfoReceived(QList<User *> &friendList)
  {
      qDebug() << __PRETTY_FUNCTION__;

diff --cc src/ui/friendlistpanel.h
Simple merge