Merge branch 'engine' into dev

Conflicts:
	src/src.pro
	src/ui/listviewscreen.cpp
	src/ui/listviewscreen.h

diff --cc src/src.pro
index a1e817b,8f6aad6..2d54734
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -25,9 -24,8 +26,10 @@@ SOURCES += main.cpp 
      ui/infotab.cpp \
      ui/updatelocation/updatelocationdialog.cpp \
      ui/updatelocation/texteditautoresizer.cpp \
 -    engine/engine.cpp \
 -    user/user.cpp
 +    user/user.cpp \
 +    ui/buttonitem.cpp \
-     ui/situareuser.cpp
++    ui/situareuser.cpp \
++    engine/engine.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -49,9 -46,8 +52,10 @@@
      facebookservice/facebookcredentials.h \
      facebookservice/facebookauthentication.h \
      facebookservice/facebookcommon.h \
-     user/user.h \
 +    ui/buttonitem.h \
-     ui/situareuser.h
++    ui/situareuser.h \
+     engine/engine.h \
+     user/user.h
  QT += network \
      webkit
  

diff --cc src/ui/listviewscreen.cpp
index 9ae3618,74456cc..1d47711
--- 1/src/ui/listviewscreen.cpp
--- 2/src/ui/listviewscreen.cpp
+++ b/src/ui/listviewscreen.cpp
@@@ -47,10 -42,7 +47,10 @@@ ListViewScreen::ListViewScreen(QWidget 
      m_personalInfo->setTime("1 hour ago");
      m_personalInfo->setAddress("Kiviharjunlenkki 1E, 91910 Oulu");
  
 +    qDebug() << "InfoTab width: " << m_personalInfo->width();
 +    qDebug() << "InfoTab heigth: " << m_personalInfo->height();
  
-     m_locationDialog = new UpdateLocationDialog(this);
++//    m_locationDialog = new UpdateLocationDialog(this);
      m_widgetProxy = new QGraphicsProxyWidget();
      m_widgetProxy->setWidget(m_personalInfo);
  

diff --cc src/ui/listviewscreen.h
index 93c07fa,b2cfc3d..d6422b7
--- 1/src/ui/listviewscreen.h
--- 2/src/ui/listviewscreen.h
+++ b/src/ui/listviewscreen.h
@@@ -62,14 -62,12 +62,17 @@@ public slots
  /*******************************************************************************
   * DATA MEMBERS
   ******************************************************************************/
+ public:
+     InfoTab *m_personalInfo;    ///< Personal info tab
+ 
  private:
      QVBoxLayout *m_vbox;    ///< Holds the graphics view
-     InfoTab *m_personalInfo;    ///< Personal info tab
 -    Pixmap *m_arrowbutton;    ///< Button which reveals/hides the info tab when pressed
++//    InfoTab *m_personalInfo;    ///< Personal info tab
 +    Pixmap *m_leftSideBar;
 +    Pixmap *m_slidingLeftSideBar;
 +    Pixmap *m_personalInfoBackGround;
 +    Pixmap *m_arrowLeft;
 +    Pixmap *m_arrowRight;
      QGraphicsProxyWidget *m_widgetProxy; ///< Embeds InfoTab to graphics view
      QAbstractTransition *m_trans1;    ///< Animation transition from hidden state to visible
      QAbstractTransition *m_trans2;    ///< Animation transition from visible to hidden
@@@ -77,12 -75,6 +80,12 @@@
      QPropertyAnimation *m_anim2;    ///< Animation for arrowbutton from hidden to visible
      QPropertyAnimation *m_anim3;    ///< Animation for infotab from visible to hidden
      QPropertyAnimation *m_anim4;    ///< Animation for arrowbutton from visible to hidden
 +    QPropertyAnimation *m_anim5;    ///< Animation
 +    QPropertyAnimation *m_anim6;    ///< Animation for arrowbutton from visible to hidden
 +    QPropertyAnimation *m_anim7;
 +    QPropertyAnimation *m_anim8;
 +    QPropertyAnimation *m_anim9;
-     UpdateLocationDialog *m_locationDialog; ///< Message dialog
++//    UpdateLocationDialog *m_locationDialog; ///< Message dialog
  };
  
  #endif // LISTVIEWTAB_H

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