Merge branch 'personalInfo' into dev

Conflicts:
	res/images/clock_small.png
	res/images/compas_small.png
	res/images/facebook_user_64.png
	res/images/list_small.png
	res/images/personal_infotab_background.png
	res/images/reload_icon.png
	res/images/sendPosition_icon.png
	res/images/separe_line.png
	res/images/top_separtor.png
	src/images.qrc
	src/src.pro
	src/ui/infotab.cpp
	src/ui/listviewscreen.cpp

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

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

diff --cc res/images/clock.png
index 0000000,0000000..4c9298e
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/compass.png
index 0000000,0000000..be58c14
new file mode 100644 (file)
Binary files differ

diff --cc res/images/envelope.png
index 0000000,0000000..64f9c74
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/personal_info_bckgrnd.png
index 0000000,0000000..c479198
new file mode 100644 (file)
Binary files differ

diff --cc res/images/profile_pic_border.png
index 0000000,0000000..ff257cf
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/refresh.png
index 0000000,0000000..f19d846
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/send_position.png
index 0000000,0000000..ed185a0
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/side_bar_left.png
index 0000000,0000000..bdd3c22
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/side_bar_right.png
index 0000000,0000000..a4fdbed
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/situare_user.jpg
index 0000000,0000000..7629a66
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/sliding_bar_left.png
index 0000000,0000000..359b8ad
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/sliding_bar_right.png
index 0000000,0000000..35f249e
new file mode 100755 (executable)
Binary files differ

diff --cc src/src.pro
index 0392109,52e73ea..e1ee3d7
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -25,7 -23,8 +25,12 @@@ SOURCES += main.cpp 
      ui/infotab.cpp \
      ui/updatelocation/updatelocationdialog.cpp \
      ui/updatelocation/texteditautoresizer.cpp \
++<<<<<<< HEAD
 +    user/user.cpp
++=======
+     ui/buttonitem.cpp \
+     ui/situareuser.cpp
++>>>>>>> personalInfo
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -47,7 -46,8 +52,9 @@@
      facebookservice/facebookcredentials.h \
      facebookservice/facebookauthentication.h \
      facebookservice/facebookcommon.h \
-     user/user.h
++    user/user.h \
+     ui/buttonitem.h \
+     ui/situareuser.h
  QT += network \
      webkit
  

diff --cc src/ui/infotab.cpp
index 4162f34,985ab26..a76b181
--- 1/src/ui/infotab.cpp
--- 2/src/ui/infotab.cpp
+++ b/src/ui/infotab.cpp
@@@ -3,35 -25,66 +25,67 @@@
  InfoTab::InfoTab(QWidget *parent)
      : QWidget(parent, Qt::FramelessWindowHint)
  {
-     m_layout = new QGridLayout(this);
-     m_userPicture = new QLabel;
-     m_userNameLabel = new QLabel;
-     m_messageLabel = new QLabel;
-     m_addressLabel = new QLabel;
-     m_timeLabel = new QLabel;
-     QLabel *m_clockLabel = new QLabel;
-     QLabel *m_envelopeLabel = new QLabel;
-     QLabel *m_compassLabel = new QLabel;
-     QToolButton *updateFriendsButton = new QToolButton;
-     QToolButton *updateStatusMessageButton = new QToolButton;
- 
-     updateFriendsButton->setIcon(QIcon(QPixmap(":/res/images/reload_icon.png")));
-     updateStatusMessageButton->setIcon(QIcon(QPixmap(":/res/images/sendPosition_icon.png")));
- 
-     m_clockLabel->setPixmap(QPixmap(":/res/images/clock_small.png"));
-     m_envelopeLabel->setPixmap(QPixmap(":/res/images/list_small.png"));
-     m_compassLabel->setPixmap(QPixmap(":/res/images/compas_small.png"));
-     m_layout->addWidget(m_userPicture,0,0,4,1);
-     m_layout->addWidget(m_userNameLabel,0,2,1,2);
-     m_layout->addWidget(m_clockLabel,1,1,1,1);
-     m_layout->addWidget(m_envelopeLabel,2,1,1,1);
-     m_layout->addWidget(m_compassLabel,3,1,1,1);
-     m_layout->addWidget(m_timeLabel,1,2,1,1);
-     m_layout->addWidget(m_messageLabel,2,2,1,1);
-     m_layout->addWidget(m_addressLabel,3,2,1,1);
-     m_layout->addWidget(updateFriendsButton,0,3,2,1);
-     m_layout->addWidget(updateStatusMessageButton,1,3,2,1);
+     widget = new QWidget(this);
+     QVBoxLayout *verticalLayout = new QVBoxLayout(widget);
+     QVBoxLayout *verticalLayout2 = new QVBoxLayout(widget);
+     QHBoxLayout *horizontalLayout = new QHBoxLayout(widget);
+     QGridLayout *m_layout = new QGridLayout(widget);
+     situUser = new SituareUser(widget);
+     situUser->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+     situUser->setMargin(1);
+ 
+     //Tex color settings
+     QPalette textPalette;
+     QColor textColor(152,152,152);
+     textPalette.setColor(QPalette::WindowText,textColor);
+     m_userNameLabel = new QLabel(widget);
+     m_userNameLabel->setFont(QFont( "Nokia Sans", 18, QFont::Normal));
+ 
+     m_messageLabel = new QLabel(widget);
+     m_messageLabel->setFont(QFont( "Nokia Sans", 13, QFont::Normal));
+     m_messageLabel->setPalette(textPalette);
+ 
+     m_addressLabel = new QLabel(widget);
+     m_addressLabel->setFont(QFont( "Nokia Sans", 13, QFont::Normal));
+     m_addressLabel->setPalette(textPalette);
+ 
+     m_timeLabel = new QLabel(widget);
+     m_timeLabel->setFont(QFont( "Nokia Sans", 13, QFont::Normal));
+     m_timeLabel->setPalette(textPalette);
+ 
+     QLabel *m_clockLabel = new QLabel(widget);
+     m_clockLabel->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+     QLabel *m_envelopeLabel = new QLabel(widget);
+     m_envelopeLabel->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+     QLabel *m_compassLabel = new QLabel(widget);
+     m_compassLabel->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+     ButtonItem *updateFriendsButton = new ButtonItem(widget);
+     ButtonItem *updateStatusMessageButton = new ButtonItem(widget);
+ 
+     updateFriendsButton->setIcon(QIcon(QPixmap(":/resources/refresh.png")));
+     updateStatusMessageButton->setIcon(QIcon(QPixmap(":/resources/send_position.png")));
+ 
+     m_clockLabel->setPixmap(QPixmap(":/resources/clock.png"));
+     m_envelopeLabel->setPixmap(QPixmap(":/resources/envelope.png"));
+     m_compassLabel->setPixmap(QPixmap(":/resources/compass.png"));
+     m_layout->addWidget(situUser,0,0,1,2,Qt::AlignHCenter);
+     m_layout->addWidget(m_userNameLabel,1,1,1,2);
+     m_layout->addWidget(m_clockLabel,3,0,1,1);
+     m_layout->addWidget(m_envelopeLabel,2,0,1,1);
+     m_layout->addWidget(m_compassLabel,4,0,1,1);
+     m_layout->addWidget(m_timeLabel,3,1,1,1);
+     m_layout->addWidget(m_messageLabel,2,1,1,1);
+     m_layout->addWidget(m_addressLabel,4,1,1,1);
+ 
+     verticalLayout->addLayout(m_layout);
+     horizontalLayout->setSpacing(0);
+     horizontalLayout->addWidget(updateFriendsButton);
+     horizontalLayout->addWidget(updateStatusMessageButton);
+ 
+     verticalLayout->addLayout(horizontalLayout);
+ 
+     verticalLayout2->addLayout(verticalLayout);
 +
      connect(updateStatusMessageButton,SIGNAL(clicked()),this,SLOT(messageUpdate()));
      connect(updateFriendsButton,SIGNAL(clicked()),this,SLOT(updateFriendsStatus()));
  }

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

diff --cc src/ui/listviewscreen.cpp
index 3cb9347,7594c07..d594393
--- 1/src/ui/listviewscreen.cpp
--- 2/src/ui/listviewscreen.cpp
+++ b/src/ui/listviewscreen.cpp
@@@ -32,11 -34,13 +34,14 @@@
  ListViewScreen::ListViewScreen(QWidget *parent)
      : QWidget(parent)
  {
 +
-     m_arrowbutton = new Pixmap(QPixmap(":/res/images/arrow_right.png"));
- 
+     m_leftSideBar = new Pixmap(QPixmap(":/resources/side_bar_left.png"));
+     m_slidingLeftSideBar = new Pixmap(QPixmap(":/resources/sliding_bar_left.png"));
+     m_personalInfoBackGround = new Pixmap(QPixmap(":/resources/personal_info_bckgrnd.png"));
+     m_arrowLeft = new Pixmap(QPixmap(":/resources/arrow_left.png"));
+     m_arrowRight = new Pixmap(QPixmap(":/resources/arrow_right.png"));
      m_personalInfo = new InfoTab;
-     m_personalInfo->setAvatar(QPixmap(":/res/images/facebook_user_64.png"));
+     m_personalInfo->setAvatar(QPixmap(":/resources/situare_user.jpg"));
      m_personalInfo->setUserName("Fred Facebook");
      m_personalInfo->setMessageText("Hello Maemo Situare !");
      m_personalInfo->setTime("1 hour ago");