X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fui%2Froutewaypointlistitem.cpp;h=80608f498f1882fbec301ee0de5e8edfad377fc3;hb=0593bfb5110b82042e1a524a4339410b3fd42a1d;hp=b16f5dd2ad2c7344d5b5c7d546df0bf007e73f7e;hpb=943b661d9145d4d604fdc088ba171340eea2aa68;p=situare

diff --git a/src/ui/routewaypointlistitem.cpp b/src/ui/routewaypointlistitem.cpp
index b16f5dd..80608f4 100644
--- 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()