Merge branch 'dev' into friendlist

Conflicts:
	images.qrc
	src/src.pro
	src/ui/listviewscreen.cpp
	src/ui/listviewscreen.h
	src/ui/situareuser.cpp
	src/user/user.cpp

diff --cc images.qrc
Simple merge

diff --cc src/src.pro
index b216110,9afb198..aae03c1
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -25,13 -27,11 +27,14 @@@ SOURCES += main.cpp 
      ui/infotab.cpp \
      ui/updatelocation/updatelocationdialog.cpp \
      ui/updatelocation/texteditautoresizer.cpp \
 +    ui/friendlistview.cpp \
 +    ui/friendlistitemdelegate.cpp \
 +    ui/friendlistitem.cpp \
 +    engine/engine.cpp \
      user/user.cpp \
      ui/buttonitem.cpp \
-     ui/situareuser.cpp
+     ui/situareuser.cpp \
 -    engine/engine.cpp \
+     ui/settingsdialog.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -53,23 -55,21 +58,19 @@@
      facebookservice/facebookcredentials.h \
      facebookservice/facebookauthentication.h \
      facebookservice/facebookcommon.h \
 -    ui/buttonitem.h \
 -    ui/situareuser.h \
 +    ui/friendlistview.h \
 +    ui/friendlistitemdelegate.h \
 +    ui/friendlistitem.h \
      engine/engine.h \
      user/user.h \
 +    ui/buttonitem.h \
-     ui/situareuser.h
++    ui/situareuser.h \
+     ui/settingsdialog.h
  QT += network \
      webkit
  
  # use don't use OpenGL when building in scratchbox
  !maemo5 { 
-     QT += opengl
-     message(OpenGL built in)
-     message(Make sure you have OpenGL development headers installed)
-     message(install headers with: sudo apt-get install libgl-dev libglu-dev)
- 
 -#    QT += opengl
 -    message(OpenGL built in)
 -    message(Make sure you have OpenGL development headers installed)
 -    message(install headers with: sudo apt-get install libgl-dev libglu-dev)
 -
      message(QJson built in)
      message(Make sure you have QJson development headers installed)
      message(install headers with: sudo apt-get install libqjson-dev)

diff --cc src/ui/buttonitem.cpp
index 46451ff,d699875..605d9cb
--- 1/src/ui/buttonitem.cpp
--- 2/src/ui/buttonitem.cpp
+++ b/src/ui/buttonitem.cpp
@@@ -32,7 -31,10 +32,9 @@@ ButtonItem::ButtonItem(QWidget *parent
  
  void ButtonItem::paintEvent(QPaintEvent *aPaintEvent)
  {
+     Q_UNUSED(aPaintEvent);
+ 
      //Look and feel settings
 -    int roundness(4);
  
      QRect widgetRect = this->rect();
      QPainter painter(this);

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

diff --cc src/ui/listviewscreen.cpp
index 687cab4,1d47711..16ec0ef
--- 1/src/ui/listviewscreen.cpp
--- 2/src/ui/listviewscreen.cpp
+++ b/src/ui/listviewscreen.cpp
@@@ -137,17 -61,12 +137,17 @@@ ListViewScreen::ListViewScreen(QWidget 
      scene->addItem(m_leftSideBar);
      scene->addItem(m_slidingLeftSideBar);
      scene->addItem(m_arrowRight);
 +    scene->addItem(m_arrowLeft);
 +    //DEBUG
-     QGraphicsProxyWidget *scrollProxy = new QGraphicsProxyWidget();
-     scrollProxy->setWidget(friendListScroll);
-     scrollProxy->setZValue(m_personalInfoBackGround->zValue() - 3);
-     scrollProxy->setMinimumSize(790, 480);
-     scene->addItem(scrollProxy);
-     scrollProxy->setPos(300, 0);
++//    QGraphicsProxyWidget *scrollProxy = new QGraphicsProxyWidget();
++//    scrollProxy->setWidget(friendListScroll);
++//    scrollProxy->setZValue(m_personalInfoBackGround->zValue() - 3);
++//    scrollProxy->setMinimumSize(790, 480);
++//    scene->addItem(scrollProxy);
++//    scrollProxy->setPos(300, 0);
 +    //DEBUG
      m_leftSideBar->setPos(0,0);
  
 -    QGraphicsRotation rotation(m_arrowRight);
 -    rotation.setAxis(Qt::YAxis);
 -    rotation.setOrigin(QVector3D(size().width()/2, size().height()/2, 0));
 -
      QGraphicsView *view = new QGraphicsView(scene);
      view->setAlignment(Qt::AlignLeft|Qt::AlignTop);
      view->setSceneRect(0,0,7000,3000);
@@@ -228,10 -121,11 +228,11 @@@
  
      m_vbox = new QVBoxLayout(this);
      m_vbox->addWidget(view);
 +    //m_vbox->addWidget(friendListScroll);
      m_vbox->setMargin(0);
  
 +    connect(m_personalInfo,SIGNAL(launchMessageUpdate()),this,SLOT(updateMessage()));
+     setObjectName("List view");
 -
 -    //connect(m_personalInfo,SIGNAL(launchMessageUpdate()),this,SLOT(updateMessage()));
  }
  
  ListViewScreen::~ListViewScreen()

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