Merge branch 'master' into friendlist

Conflicts:
	src/images.qrc
	src/src.pro

diff --cc res/images/arrow_left.png
index 0000000,454fbdb..2232aef
mode 000000,100755..100755
Binary files differ

diff --cc res/images/arrow_right.png
index 0000000,4a43016..42fbde4
mode 000000,100755..100755
Binary files differ

diff --cc src/src.pro
index 3d92a8f,97140ac..75a4677
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -21,10 -23,7 +23,11 @@@ SOURCES += main.cpp 
      ui/infotab.cpp \
      ui/updatelocation/updatelocationdialog.cpp \
      ui/updatelocation/texteditautoresizer.cpp \
 +    ui/friendlistview.cpp \
 +    ui/friendlistitemdelegate.cpp \
 +    ui/friendlistitem.cpp \
-     ui/friendlistmodel.cpp
++    ui/friendlistmodel.cpp \
+     user/user.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -44,10 -43,7 +47,12 @@@
      facebookservice/facebookcredentials.h \
      facebookservice/facebookauthentication.h \
      facebookservice/facebookcommon.h \
 +    ui/friendlistview.h \
 +    ui/friendlistitemdelegate.h \
 +    ui/friendlistitem.h \
-     ui/friendlistmodel.h
++    ui/friendlistmodel.h \
+     user/user.h
++
  QT += network \
      webkit
  

diff --cc src/ui/infotab.cpp
Simple merge

diff --cc src/ui/listviewscreen.cpp
index cdfa418,3cb9347..07a5d4f
--- 1/src/ui/listviewscreen.cpp
--- 2/src/ui/listviewscreen.cpp
+++ b/src/ui/listviewscreen.cpp
@@@ -39,86 -32,11 +39,86 @@@
  ListViewScreen::ListViewScreen(QWidget *parent)
      : QWidget(parent)
  {
 +    //DEBUG
 +//    FriendListView *friendListView = new FriendListView(this);
 +//    friendListView->setItemDelegate(new FriendListItemDelegate());
 +
 +//    FriendListItem *item1 = new FriendListItem();
 +//    item1->setData(FriendListItem::Name, "Name 1");
 +//    item1->setData(FriendListItem::Updated, "2 days ago");
 +//    QString test = QString("Hello Maemo Situare! Hello Maemo Situare! ");
 +//    test.append("Hello Maemo Situare! ");
 +//    test.append("Hello Maemo Situare! ");
 +//    test.append("Hello Maemo Situare! ");
 +//    test.append("Hello Maemo Situare! ");
 +//    item1->setData(FriendListItem::StatusText, test);
 +//    item1->setData(FriendListItem::Location, "Kiviharjunlenkki 1E, 91910 Oulu");
 +//    item1->setData(FriendListItem::Image, ":/resources/dummy_Avatar.png");
 +//    FriendListItem *item2 = new FriendListItem();
 +//    item2->setData(FriendListItem::Name, "Name 2");
 +//    item2->setData(FriendListItem::Updated, "2 days ago");
 +//    item2->setData(FriendListItem::StatusText, "Hello Maemo Situare!");
 +//    item2->setData(FriendListItem::Location, "Kiviharjunlenkki 1E, 91910 Oulu");
 +//    item2->setData(FriendListItem::Image, ":/resources/dummy_Avatar.png");
 +//    FriendListItem *item3 = new FriendListItem();
 +//    item3->setData(FriendListItem::Name, "Name 3");
 +//    item3->setData(FriendListItem::Updated, "2 days ago");
 +//    item3->setData(FriendListItem::StatusText, "Hello Maemo Situare!");
 +//    item3->setData(FriendListItem::Location, "Kiviharjunlenkki 1E, 91910 Oulu");
 +//    item3->setData(FriendListItem::Image, ":/resources/dummy_Avatar.png");
 +//    FriendListItem *item4 = new FriendListItem();
 +//    item4->setData(FriendListItem::Name, "Name 4");
 +//    item4->setData(FriendListItem::Updated, "2 days ago");
 +//    item4->setData(FriendListItem::StatusText, "Hello Maemo Situare!");
 +//    item4->setData(FriendListItem::Location, "Kiviharjunlenkki 1E, 91910 Oulu");
 +//    item4->setData(FriendListItem::Image, ":/resources/dummy_Avatar.png");
 +//    FriendListItem *item5 = new FriendListItem();
 +//    item5->setData(FriendListItem::Name, "Name 5");
 +//    item5->setData(FriendListItem::Updated, "2 days ago");
 +//    item5->setData(FriendListItem::StatusText, "Hello Maemo Situare!");
 +//    item5->setData(FriendListItem::Location, "Kiviharjunlenkki 1E, 91910 Oulu");
 +//    item5->setData(FriendListItem::Image, ":/resources/dummy_Avatar.png");
 +//    FriendListItem *item6 = new FriendListItem();
 +//    item6->setData(FriendListItem::Name, "Name 6");
 +//    item6->setData(FriendListItem::Updated, "2 days ago");
 +//    item6->setData(FriendListItem::StatusText, "Hello Maemo Situare!");
 +//    item6->setData(FriendListItem::Location, "Kiviharjunlenkki 1E, 91910 Oulu");
 +//    item6->setData(FriendListItem::Image, ":/resources/dummy_Avatar.png");
 +//    friendListView->addItem(item1);
 +//    friendListView->addItem(item2);
 +//    friendListView->addItem(item3);
 +//    friendListView->addItem(item4);
 +//    friendListView->addItem(item5);
 +//    friendListView->addItem(item6);
 +
 +    QWidget *friendListView = new QWidget(this);
 +    QVBoxLayout *friendListLayout = new QVBoxLayout(this);
 +    friendListLayout->setMargin(0);
 +    friendListLayout->setSpacing(0);
 +    friendListView->setLayout(friendListLayout);
 +    FriendListItem *item1 = new FriendListItem();
 +    FriendListItem *item2 = new FriendListItem();
 +    FriendListItem *item3 = new FriendListItem();
 +    FriendListItem *item4 = new FriendListItem();
 +    FriendListItem *item5 = new FriendListItem();
 +    FriendListItem *item6 = new FriendListItem();
 +
 +    friendListLayout->addWidget(item1);
 +    friendListLayout->addWidget(item2);
 +    friendListLayout->addWidget(item3);
 +    friendListLayout->addWidget(item4);
 +    friendListLayout->addWidget(item5);
 +    friendListLayout->addWidget(item6);
 +
 +    QScrollArea *friendListScroll = new QScrollArea();
 +    friendListScroll->setWidget(friendListView);
 +    //DEBUG
 +
  
-     m_arrowbutton = new Pixmap(QPixmap(":/resources/arrow_right.png"));
+     m_arrowbutton = new Pixmap(QPixmap(":/res/images/arrow_right.png"));
  
      m_personalInfo = new InfoTab;
-     m_personalInfo->setAvatar(QPixmap(":/resources/facebook_user_64.png"));
+     m_personalInfo->setAvatar(QPixmap(":/res/images/facebook_user_64.png"));
      m_personalInfo->setUserName("Fred Facebook");
      m_personalInfo->setMessageText("Hello Maemo Situare !");
      m_personalInfo->setTime("1 hour ago");