Updated personal infotab, added icons

diff --git a/src/images.qrc b/src/images.qrc
index 9b0d139..073d2ae 100644 (file)
--- a/src/images.qrc
+++ b/src/images.qrc
@@ -1,8 +1,11 @@
 <RCC>
     <qresource prefix="/">
-        <file>resources/dummy_personal_infotab_background.png</file>
         <file>resources/facebook_user_64.png</file>
-        <file>resources/facebook_user_64_orig.png</file>
-        <file>resources/dummy_personal_infotab_background_orig.png</file>
+        <file>resources/compas_small.png</file>
+        <file>resources/personal_infotab_background.png</file>
+        <file>resources/reload_icon.png</file>
+        <file>resources/sendPosition_icon.png</file>
+        <file>resources/list_small.png</file>
+        <file>resources/clock_small.png</file>
     </qresource>
 </RCC>

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

diff --git a/src/resources/compas_small.png b/src/resources/compas_small.png
new file mode 100644 (file)
index 0000000..a85e802
Binary files /dev/null and b/src/resources/compas_small.png differ

diff --git a/src/resources/dummy_personal_infotab_background.png b/src/resources/dummy_personal_infotab_background.png
deleted file mode 100644 (file)
index 08dca9d..0000000
Binary files a/src/resources/dummy_personal_infotab_background.png and /dev/null differ

diff --git a/src/resources/dummy_personal_infotab_background_orig.png b/src/resources/dummy_personal_infotab_background_orig.png
deleted file mode 100644 (file)
index f6867e0..0000000
Binary files a/src/resources/dummy_personal_infotab_background_orig.png and /dev/null differ

diff --git a/src/resources/facebook_user_64.png b/src/resources/facebook_user_64.png
index 1c1dd53..b828219 100644 (file)
Binary files a/src/resources/facebook_user_64.png and b/src/resources/facebook_user_64.png differ

diff --git a/src/resources/facebook_user_64_orig.png b/src/resources/facebook_user_64_orig.png
deleted file mode 100644 (file)
index b828219..0000000
Binary files a/src/resources/facebook_user_64_orig.png and /dev/null differ

diff --git a/src/resources/list_small.png b/src/resources/list_small.png
new file mode 100644 (file)
index 0000000..d250a1f
Binary files /dev/null and b/src/resources/list_small.png differ

diff --git a/src/resources/personal_infotab_background.png b/src/resources/personal_infotab_background.png
new file mode 100644 (file)
index 0000000..a9b30ec
Binary files /dev/null and b/src/resources/personal_infotab_background.png differ

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

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

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

diff --git a/src/resources/top_separtor.png b/src/resources/top_separtor.png
new file mode 100644 (file)
index 0000000..d21c24a
Binary files /dev/null and b/src/resources/top_separtor.png differ

diff --git a/src/ui/listviewscreen.cpp b/src/ui/listviewscreen.cpp
index b93c4ef..259228f 100644 (file)
--- a/src/ui/listviewscreen.cpp
+++ b/src/ui/listviewscreen.cpp
@@ -31,12 +31,23 @@
 ListViewScreen::ListViewScreen(QWidget *parent)
    : QWidget(parent)
 {
-    Pixmap *infoTab = new Pixmap(QPixmap(":/resources/dummy_personal_infotab_background.png")); //350x300 pix
+    Pixmap *infoTab = new Pixmap(QPixmap(":/resources/personal_infotab_background.png")); //350x140 pix
     Pixmap *userPic = new Pixmap(QPixmap(":/resources/facebook_user_64.png")); //64x64 pix
+    Pixmap *envelope = new Pixmap(QPixmap(":/resources/list_small.png"));
+    Pixmap *compass = new Pixmap(QPixmap(":/resources/compas_small.png"));
+    Pixmap *clock = new Pixmap(QPixmap(":/resources/clock_small.png"));
+    Pixmap *reload = new Pixmap(QPixmap(":/resources/reload_icon.png"));
+    Pixmap *reloca = new Pixmap(QPixmap(":/resources/sendPosition_icon.png"));
+
     QGraphicsScene *scene= new QGraphicsScene(0,0,700,360);
     scene->setBackgroundBrush(Qt::white);
     scene->addItem(infoTab);
     scene->addItem(userPic);
+    scene->addItem(envelope);
+    scene->addItem(compass);
+    scene->addItem(clock);
+    scene->addItem(reload);
+    scene->addItem(reloca);
 
     QGraphicsView *view = new QGraphicsView(scene);
     view->setFrameStyle(0);
@@ -44,7 +55,6 @@ ListViewScreen::ListViewScreen(QWidget *parent)
     view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-
     QStateMachine *machine = new QStateMachine;
     machine->setGlobalRestorePolicy(QStateMachine::RestoreProperties);
 
@@ -53,20 +63,40 @@ ListViewScreen::ListViewScreen(QWidget *parent)
     machine->setInitialState(state1);
 
     // State 1
-    state1->assignProperty(infoTab,"pos",QPointF(-330,30));
-    state1->assignProperty(userPic,"pos",QPointF(-310,50));
-    // State 2
-    state2->assignProperty(infoTab,"pos",QPointF(0,30));
-    state2->assignProperty(userPic,"pos",QPointF(20,50));
+    state1->assignProperty(infoTab,"pos",QPointF(-330,110));
+    state1->assignProperty(userPic,"pos",QPointF(-320,120));
+    state1->assignProperty(envelope,"pos",QPointF(-246,165));
+    state1->assignProperty(compass,"pos",QPointF(-246,190));
+    state1->assignProperty(clock,"pos",QPointF(-246,220));
+    state1->assignProperty(reload,"pos",QPointF(-60,120));
+    state1->assignProperty(reloca,"pos",QPointF(-60,180));
 
+    // State 2
+    state2->assignProperty(infoTab,"pos",QPointF(0,110));
+    state2->assignProperty(userPic,"pos",QPointF(10,120));
+    state2->assignProperty(envelope,"pos",QPointF(84,165));
+    state2->assignProperty(compass,"pos",QPointF(84,190));
+    state2->assignProperty(clock,"pos",QPointF(84,220));
+    state2->assignProperty(reload,"pos",QPointF(290,120));
+    state2->assignProperty(reloca,"pos",QPointF(290,180));
 
     QAbstractTransition *trans1 = state1->addTransition(infoTab,SIGNAL(clicked()),state2);
     trans1->addAnimation(new QPropertyAnimation(infoTab,"pos"));
     trans1->addAnimation(new QPropertyAnimation(userPic,"pos"));
+    trans1->addAnimation(new QPropertyAnimation(envelope,"pos"));
+    trans1->addAnimation(new QPropertyAnimation(compass,"pos"));
+    trans1->addAnimation(new QPropertyAnimation(clock,"pos"));
+    trans1->addAnimation(new QPropertyAnimation(reload,"pos"));
+    trans1->addAnimation(new QPropertyAnimation(reloca,"pos"));
 
     QAbstractTransition *trans2 = state2->addTransition(infoTab,SIGNAL(clicked()),state1);
     trans2->addAnimation(new QPropertyAnimation(infoTab,"pos"));
     trans2->addAnimation(new QPropertyAnimation(userPic,"pos"));
+    trans2->addAnimation(new QPropertyAnimation(envelope,"pos"));
+    trans2->addAnimation(new QPropertyAnimation(compass,"pos"));
+    trans2->addAnimation(new QPropertyAnimation(clock,"pos"));
+    trans2->addAnimation(new QPropertyAnimation(reload,"pos"));
+    trans2->addAnimation(new QPropertyAnimation(reloca,"pos"));
 
     machine->start();