Removed old pictures.

diff --git a/images.qrc b/images.qrc
index 9186ac0..660d37d 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -2,13 +2,19 @@
     <qresource prefix="/">
         <file>res/images/arrow_left.png</file>
         <file>res/images/arrow_right.png</file>
-        <file>res/images/clock_small.png</file>
-        <file>res/images/compas_small.png</file>
-        <file>res/images/facebook_user_64.png</file>
-        <file>res/images/list_small.png</file>
-        <file>res/images/reload_icon.png</file>
-        <file>res/images/sendPosition_icon.png</file>
         <file>res/images/zoom_in.png</file>
         <file>res/images/zoom_out.png</file>
+        <file>res/images/compass.png</file>
+        <file>res/images/envelope.png</file>
+        <file>res/images/personal_info_bckgrnd.png</file>
+        <file>res/images/profile_pic_border.png</file>
+        <file>res/images/refresh.png</file>
+        <file>res/images/send_position.png</file>
+        <file>res/images/side_bar_left.png</file>
+        <file>res/images/side_bar_right.png</file>
+        <file>res/images/situare_user.jpg</file>
+        <file>res/images/sliding_bar_left.png</file>
+        <file>res/images/sliding_bar_right.png</file>
+        <file>res/images/clock.png</file>
     </qresource>
 </RCC>

diff --git a/res/images/clock_small.png b/res/images/clock_small.png
deleted file mode 100644 (file)
index 50efd6e..0000000
Binary files a/res/images/clock_small.png and /dev/null differ

diff --git a/res/images/compas_small.png b/res/images/compas_small.png
deleted file mode 100644 (file)
index a85e802..0000000
Binary files a/res/images/compas_small.png and /dev/null differ

diff --git a/res/images/facebook_user_64.png b/res/images/facebook_user_64.png
deleted file mode 100644 (file)
index b828219..0000000
Binary files a/res/images/facebook_user_64.png and /dev/null differ

diff --git a/res/images/list_small.png b/res/images/list_small.png
deleted file mode 100644 (file)
index d250a1f..0000000
Binary files a/res/images/list_small.png and /dev/null differ

diff --git a/res/images/personal_infotab_background.png b/res/images/personal_infotab_background.png
deleted file mode 100644 (file)
index a9b30ec..0000000
Binary files a/res/images/personal_infotab_background.png and /dev/null differ

diff --git a/res/images/reload_icon.png b/res/images/reload_icon.png
deleted file mode 100644 (file)
index 7ffa4ec..0000000
Binary files a/res/images/reload_icon.png and /dev/null differ

diff --git a/res/images/sendPosition_icon.png b/res/images/sendPosition_icon.png
deleted file mode 100644 (file)
index 5c44ea3..0000000
Binary files a/res/images/sendPosition_icon.png and /dev/null differ

diff --git a/res/images/separe_line.png b/res/images/separe_line.png
deleted file mode 100644 (file)
index 8d9bb0e..0000000
Binary files a/res/images/separe_line.png and /dev/null differ

diff --git a/res/images/top_separtor.png b/res/images/top_separtor.png
deleted file mode 100644 (file)
index d21c24a..0000000
Binary files a/res/images/top_separtor.png and /dev/null differ

diff --git a/src/src.pro b/src/src.pro
index e1ee3d7..a1e817b 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -25,12 +25,9 @@ SOURCES += main.cpp \
     ui/infotab.cpp \
     ui/updatelocation/updatelocationdialog.cpp \
     ui/updatelocation/texteditautoresizer.cpp \
-<<<<<<< HEAD
-    user/user.cpp
-=======
+    user/user.cpp \
     ui/buttonitem.cpp \
     ui/situareuser.cpp
->>>>>>> personalInfo
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \

diff --git a/src/ui/infotab.cpp b/src/ui/infotab.cpp
index a76b181..c020a09 100644 (file)
--- a/src/ui/infotab.cpp
+++ b/src/ui/infotab.cpp
@@ -62,12 +62,12 @@ InfoTab::InfoTab(QWidget *parent)
     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")));
+    updateFriendsButton->setIcon(QIcon(QPixmap(":/res/images/refresh.png")));
+    updateStatusMessageButton->setIcon(QIcon(QPixmap(":/res/images/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_clockLabel->setPixmap(QPixmap(":/res/images/clock.png"));
+    m_envelopeLabel->setPixmap(QPixmap(":/res/images/envelope.png"));
+    m_compassLabel->setPixmap(QPixmap(":/res/images/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);

diff --git a/src/ui/listviewscreen.cpp b/src/ui/listviewscreen.cpp
index d594393..9ae3618 100644 (file)
--- a/src/ui/listviewscreen.cpp
+++ b/src/ui/listviewscreen.cpp
@@ -35,13 +35,13 @@ ListViewScreen::ListViewScreen(QWidget *parent)
     : QWidget(parent)
 {
 
-    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_leftSideBar = new Pixmap(QPixmap(":/res/images/side_bar_left.png"));
+    m_slidingLeftSideBar = new Pixmap(QPixmap(":/res/images/sliding_bar_left.png"));
+    m_personalInfoBackGround = new Pixmap(QPixmap(":/res/images/personal_info_bckgrnd.png"));
+    m_arrowLeft = new Pixmap(QPixmap(":/res/images/arrow_left.png"));
+    m_arrowRight = new Pixmap(QPixmap(":/res/images/arrow_right.png"));
     m_personalInfo = new InfoTab;
-    m_personalInfo->setAvatar(QPixmap(":/resources/situare_user.jpg"));
+    m_personalInfo->setAvatar(QPixmap(":/res/images/situare_user.jpg"));
     m_personalInfo->setUserName("Fred Facebook");
     m_personalInfo->setMessageText("Hello Maemo Situare !");
     m_personalInfo->setTime("1 hour ago");

diff --git a/src/ui/situareuser.cpp b/src/ui/situareuser.cpp
index 8f2c1f4..94e5e9d 100644 (file)
--- a/src/ui/situareuser.cpp
+++ b/src/ui/situareuser.cpp
@@ -48,7 +48,7 @@ void SituareUser::paintEvent(QPaintEvent *aPaintEvent)
     setMask(maskRegion);
 
     painter.drawPixmap(QPointF(0,0),(*(this->pixmap())));
-    painter.drawPixmap(QPointF(-6,-6),(QPixmap(":/resources/profile_pic_border.png")));
+    painter.drawPixmap(QPointF(-6,-6),(QPixmap(":/res/images/profile_pic_border.png")));
     painter.restore();
 }