Added new turn type images.

diff --git a/images.qrc b/images.qrc
index 28d33f3..64b2a4d 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -35,13 +35,16 @@
         <file>res/images/walk_icon_gray.png</file>
         <file>res/images/zoom_in.png</file>
         <file>res/images/zoom_out.png</file>
+        <file>res/images/distance_icon.png</file>
         <file>res/images/arrow_turn_continue.png</file>
         <file>res/images/arrow_turn_left.png</file>
         <file>res/images/arrow_turn_right.png</file>
+        <file>res/images/arrow_turn_roundabout.png</file>
         <file>res/images/arrow_turn_sharp_left.png</file>
         <file>res/images/arrow_turn_sharp_right.png</file>
         <file>res/images/arrow_turn_slight_left.png</file>
         <file>res/images/arrow_turn_slight_right.png</file>
         <file>res/images/arrow_turn_start.png</file>
+        <file>res/images/arrow_turn_u_turn.png</file>
     </qresource>
 </RCC>

diff --git a/res/images/arrow_turn_continue.png b/res/images/arrow_turn_continue.png
new file mode 100644 (file)
index 0000000..b9189a6
Binary files /dev/null and b/res/images/arrow_turn_continue.png differ

diff --git a/res/images/arrow_turn_left.png b/res/images/arrow_turn_left.png
new file mode 100644 (file)
index 0000000..1784260
Binary files /dev/null and b/res/images/arrow_turn_left.png differ

diff --git a/res/images/arrow_turn_right.png b/res/images/arrow_turn_right.png
new file mode 100644 (file)
index 0000000..56ebc0c
Binary files /dev/null and b/res/images/arrow_turn_right.png differ

diff --git a/res/images/arrow_turn_roundabout.png b/res/images/arrow_turn_roundabout.png
new file mode 100644 (file)
index 0000000..45e2f6b
Binary files /dev/null and b/res/images/arrow_turn_roundabout.png differ

diff --git a/res/images/arrow_turn_sharp_left.png b/res/images/arrow_turn_sharp_left.png
new file mode 100644 (file)
index 0000000..21036a1
Binary files /dev/null and b/res/images/arrow_turn_sharp_left.png differ

diff --git a/res/images/arrow_turn_sharp_right.png b/res/images/arrow_turn_sharp_right.png
new file mode 100644 (file)
index 0000000..19171bf
Binary files /dev/null and b/res/images/arrow_turn_sharp_right.png differ

diff --git a/res/images/arrow_turn_slight_left.png b/res/images/arrow_turn_slight_left.png
new file mode 100644 (file)
index 0000000..48265bd
Binary files /dev/null and b/res/images/arrow_turn_slight_left.png differ

diff --git a/res/images/arrow_turn_slight_right.png b/res/images/arrow_turn_slight_right.png
new file mode 100644 (file)
index 0000000..4650868
Binary files /dev/null and b/res/images/arrow_turn_slight_right.png differ

diff --git a/res/images/arrow_turn_start.png b/res/images/arrow_turn_start.png
new file mode 100644 (file)
index 0000000..16ec3b8
Binary files /dev/null and b/res/images/arrow_turn_start.png differ

diff --git a/res/images/arrow_turn_u_turn.png b/res/images/arrow_turn_u_turn.png
new file mode 100644 (file)
index 0000000..b2ad7a2
Binary files /dev/null and b/res/images/arrow_turn_u_turn.png differ

diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp
index 73f1296..b9b4911 100644 (file)
--- a/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@ -42,8 +42,6 @@ FriendListPanel::FriendListPanel(QWidget *parent)
     QVBoxLayout *friendListPanelLayout = new QVBoxLayout();
     friendListPanelLayout->setMargin(0);
     friendListPanelLayout->setSpacing(0);
-///< @todo magic
-    friendListPanelLayout->setContentsMargins(PANEL_MARGIN_LEFT, 0, PANEL_MARGIN_RIGHT, 0);
     setLayout(friendListPanelLayout);
 
     QHBoxLayout *filterLayout = new QHBoxLayout();

diff --git a/src/ui/listview.cpp b/src/ui/listview.cpp
index e2dfbee..1538f0c 100644 (file)
--- a/src/ui/listview.cpp
+++ b/src/ui/listview.cpp
@@ -60,6 +60,7 @@ void ListView::clearList()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+    qDeleteAll(m_listItems.begin(), m_listItems.end());
     m_listItems.clear();
     clear();
 

diff --git a/src/ui/routewaypointlistitem.cpp b/src/ui/routewaypointlistitem.cpp
index b16f5dd..80608f4 100644 (file)
--- a/src/ui/routewaypointlistitem.cpp
+++ b/src/ui/routewaypointlistitem.cpp
@@ -29,40 +29,53 @@ void RouteWaypointListItem::setRouteWaypointData(const RouteSegment &routeSegmen
 
     m_coordinates = coordinate;
 
-    if (routeSegment.turnType() == "C")
+    setTurnTypeImage(routeSegment.turnType());
+
+    setTitle(shortenText(routeSegment.street(), NAME_TEXT_MAX_WIDTH + MARGIN,
+                        ListItem::TEXT_SIZE_NORMAL));
+
+    clearSubItems();
+
+    QTime zeroTime(0, 0);
+    QTime segmentTravelTime = zeroTime.addSecs(routeSegment.time());
+    addSubItem(segmentTravelTime.toString("hh:mm:ss"), QPixmap(":/res/images/clock.png"));
+
+    addSubItem(routeSegment.lengthCaption(), QPixmap(":/res/images/distance_icon.png"));
+}
+
+void RouteWaypointListItem::setTurnTypeImage(const QString &turnType)
+{
+    if (turnType == "C") {
         setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_continue.png"),
                                      AvatarImage::Small));
-    else if (routeSegment.turnType() == "TL")
+    } else if (turnType == "TL") {
         setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_left.png"),
                                      AvatarImage::Small));
-    else if (routeSegment.turnType() == "TSLL")
+    } else if (turnType == "TSLL") {
         setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_slight_left.png"),
                                      AvatarImage::Small));
-    else if (routeSegment.turnType() == "TSHL")
+    } else if (turnType == "TSHL") {
         setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_sharp_left.png"),
                                      AvatarImage::Small));
-    else if (routeSegment.turnType() == "TR")
+    } else if (turnType == "TR") {
         setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_right.png"),
                                      AvatarImage::Small));
-    else if (routeSegment.turnType() == "TSLR")
+    } else if (turnType == "TSLR") {
         setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_slight_right.png"),
                                      AvatarImage::Small));
-    else if (routeSegment.turnType() == "TSHR")
+    } else if (turnType == "TSHR") {
         setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_sharp_right.png"),
                                      AvatarImage::Small));
-    else
+    } else if (turnType == "TU") {
+        setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_u_turn.png"),
+                                     AvatarImage::Small));
+    } else if (turnType == "EXIT") {
+        setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_roundabout.png"),
+                                     AvatarImage::Small));
+    } else
         setImage(AvatarImage::create(QPixmap(":/res/images/arrow_turn_start.png"),
                                      AvatarImage::Small));
 
-    setTitle(shortenText(routeSegment.street(), NAME_TEXT_MAX_WIDTH + MARGIN,
-                        ListItem::TEXT_SIZE_NORMAL));
-
-    clearSubItems();
-
-    QTime zeroTime(0, 0);
-    QTime segmentTravelTime = zeroTime.addSecs(routeSegment.time());
-
-    addSubItem(segmentTravelTime.toString("hh:mm:ss"), QPixmap(":/res/images/clock.png"));
 }
 
 RouteWaypointListItem::~RouteWaypointListItem()

diff --git a/src/ui/routewaypointlistitem.h b/src/ui/routewaypointlistitem.h
index 66e78e1..6c5fb72 100644 (file)
--- a/src/ui/routewaypointlistitem.h
+++ b/src/ui/routewaypointlistitem.h
@@ -66,6 +66,9 @@ public:
     void setRouteWaypointData(const RouteSegment &routeSegment,
                               const GeoCoordinate &coordinate);
 
+private:
+    void setTurnTypeImage(const QString &turnType);
+
 /******************************************************************************
 * DATA MEMBERS
 ******************************************************************************/

diff --git a/src/ui/routingpanel.cpp b/src/ui/routingpanel.cpp
index fa8bbf0..29257b3 100644 (file)
--- a/src/ui/routingpanel.cpp
+++ b/src/ui/routingpanel.cpp
@@ -85,8 +85,6 @@ void RoutingPanel::populateLocationListView(const QList<Location> &locations)
         m_locationListView->addListItem(QString::number(i), item);
     }
 
-    //openPanel();
-
     const int FIRST_LOCATION_ITEM_INDEX = 0;
     const int ONE_LOCATION_ITEM = 1;
 
@@ -113,9 +111,10 @@ void RoutingPanel::setRoute(Route &route)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
+    m_locationListHeaderWidget->hide();
     m_locationListView->hide();
     m_routeWaypointListView->show();
-    m_routeWaypointListView->clear();
+    m_routeWaypointListView->clearList();
 
     QList<RouteSegment> segments = route.segments();
     QList<GeoCoordinate> geometryPoints = route.geometryPoints();