Update design in mapviewer example

Update marker and change colors.

Change-Id: Ia12ed0145367c5a086ec6b6828db602b4666403e
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

17 files changed, 36 insertions, 47 deletions

diff --git a/examples/location/mapviewer/forms/GeocodeForm.ui.qml b/examples/location/mapviewer/forms/GeocodeForm.ui.qml
index 726a54d9..76befee5 100644
--- a/examples/location/mapviewer/forms/GeocodeForm.ui.qml
+++ b/examples/location/mapviewer/forms/GeocodeForm.ui.qml
@@ -55,7 +55,7 @@ Item {
         id: tabRectangle
         y: 20
         height: tabTitle.height * 2
-        color: "#f36910"
+        color: "#46a2da"
         anchors.rightMargin: 0
         anchors.leftMargin: 0
         anchors.left: parent.left
diff --git a/examples/location/mapviewer/forms/LocaleForm.ui.qml b/examples/location/mapviewer/forms/LocaleForm.ui.qml
index 7a88dd55..b2444791 100644
--- a/examples/location/mapviewer/forms/LocaleForm.ui.qml
+++ b/examples/location/mapviewer/forms/LocaleForm.ui.qml
@@ -57,7 +57,7 @@ Item {
         id: tabRectangle
         y: 20
         height: tabTitle.height * 2
-        color: "#f36910"
+        color: "#46a2da"
         anchors.rightMargin: 0
         anchors.leftMargin: 0
         anchors.left: parent.left
diff --git a/examples/location/mapviewer/forms/MessageForm.ui.qml b/examples/location/mapviewer/forms/MessageForm.ui.qml
index 7b0f92ef..398ea273 100644
--- a/examples/location/mapviewer/forms/MessageForm.ui.qml
+++ b/examples/location/mapviewer/forms/MessageForm.ui.qml
@@ -52,7 +52,7 @@ Item {
         id: tabRectangle
         y: 20
         height: messageTitle.height * 2
-        color: "#f36910"
+        color: "#46a2da"
         anchors.rightMargin: 0
         anchors.leftMargin: 0
         anchors.left: parent.left
diff --git a/examples/location/mapviewer/forms/ReverseGeocodeForm.ui.qml b/examples/location/mapviewer/forms/ReverseGeocodeForm.ui.qml
index c0696a0b..35a2d33d 100644
--- a/examples/location/mapviewer/forms/ReverseGeocodeForm.ui.qml
+++ b/examples/location/mapviewer/forms/ReverseGeocodeForm.ui.qml
@@ -53,7 +53,7 @@ Item {
         id: tabRectangle
         y: 20
         height: tabTitle.height * 2
-        color: "#f36910"
+        color: "#46a2da"
         anchors.rightMargin: 0
         anchors.leftMargin: 0
         anchors.left: parent.left
diff --git a/examples/location/mapviewer/forms/RouteAddressForm.ui.qml b/examples/location/mapviewer/forms/RouteAddressForm.ui.qml
index 9f5d16fb..1c2e6bd7 100644
--- a/examples/location/mapviewer/forms/RouteAddressForm.ui.qml
+++ b/examples/location/mapviewer/forms/RouteAddressForm.ui.qml
@@ -58,7 +58,7 @@ Item {
         id: tabRectangle
         y: 20
         height: tabTitle.height * 2
-        color: "#f36910"
+        color: "#46a2da"
         anchors.rightMargin: 0
         anchors.leftMargin: 0
         anchors.left: parent.left
diff --git a/examples/location/mapviewer/forms/RouteCoordinateForm.ui.qml b/examples/location/mapviewer/forms/RouteCoordinateForm.ui.qml
index 07133fa0..db473b06 100644
--- a/examples/location/mapviewer/forms/RouteCoordinateForm.ui.qml
+++ b/examples/location/mapviewer/forms/RouteCoordinateForm.ui.qml
@@ -56,7 +56,7 @@ Item {
         id: tabRectangle
         y: 20
         height: tabTitle.height * 2
-        color: "#f36910"
+        color: "#46a2da"
         anchors.rightMargin: 0
         anchors.leftMargin: 0
         anchors.left: parent.left
diff --git a/examples/location/mapviewer/forms/RouteListDelegate.qml b/examples/location/mapviewer/forms/RouteListDelegate.qml
index 16dca34a..789bc78c 100644
--- a/examples/location/mapviewer/forms/RouteListDelegate.qml
+++ b/examples/location/mapviewer/forms/RouteListDelegate.qml
@@ -74,7 +74,7 @@ Item {
         anchors.right: parent.right
         anchors.margins: 15
         height: 1
-        color: "#f36910"
+        color: "#46a2da"
     }
 }
 
diff --git a/examples/location/mapviewer/forms/RouteListHeader.qml b/examples/location/mapviewer/forms/RouteListHeader.qml
index a907214f..5c702810 100644
--- a/examples/location/mapviewer/forms/RouteListHeader.qml
+++ b/examples/location/mapviewer/forms/RouteListHeader.qml
@@ -51,7 +51,7 @@ Item {
         id: tabRectangle
         y:  tabTitle.height
         height: tabTitle.height * 2 - 1
-        color: "#f36910"
+        color: "#46a2da"
         anchors.left: parent.left
         anchors.right: parent.right
 
diff --git a/examples/location/mapviewer/map/CircleItem.qml b/examples/location/mapviewer/map/CircleItem.qml
index cc5e6faa..16eb1313 100644
--- a/examples/location/mapviewer/map/CircleItem.qml
+++ b/examples/location/mapviewer/map/CircleItem.qml
@@ -44,11 +44,11 @@ import QtLocation 5.3
 
 MapCircle {
 
-    color: "yellow"
-    border.color: "red"
-    border.width: 5
+    color: "#46a2da"
+    border.color: "#190a33"
+    border.width: 2
     smooth: true
-    opacity: 0.5
+    opacity: 0.25
 
     function setGeometry(markers, index){
         center.latitude = markers[index].coordinate.latitude
diff --git a/examples/location/mapviewer/map/MapComponent.qml b/examples/location/mapviewer/map/MapComponent.qml
index 3f64b21b..4c0e961b 100644
--- a/examples/location/mapviewer/map/MapComponent.qml
+++ b/examples/location/mapviewer/map/MapComponent.qml
@@ -327,12 +327,12 @@ Map {
 
     MapQuickItem {
         id: poiTheQtComapny
-        sourceItem: Rectangle { width: 14; height: 14; color: "#1c94fc"; border.width: 2; border.color: "#242424"; smooth: true; radius: 7 }
+        sourceItem: Rectangle { width: 14; height: 14; color: "#e41e25"; border.width: 2; border.color: "white"; smooth: true; radius: 7 }
         coordinate {
             latitude: 59.9485
             longitude: 10.7686
         }
-        opacity:0.7
+        opacity: 1.0
         anchorPoint: Qt.point(sourceItem.width/2, sourceItem.height/2)
     }
 
@@ -436,7 +436,7 @@ Map {
         MapRoute {
             id: route
             route: routeData
-            line.color: routeMouseArea.pressed ? "lime" : "red"
+            line.color: "#46a2da"
             line.width: 5
             smooth: true
             opacity: 0.8
@@ -500,8 +500,11 @@ Map {
         MapCircle {
             id: point
             radius: 1000
-            color: circleMouseArea.pressed ? "lime" : "red"
-            opacity: 0.6
+            color: "#46a2da"
+            border.color: "#190a33"
+            border.width: 2
+            smooth: true
+            opacity: 0.25
             center: locationData.coordinate
             //! [pointdel0]
             MouseArea {
diff --git a/examples/location/mapviewer/map/Marker.qml b/examples/location/mapviewer/map/Marker.qml
index 33213b82..afa985ff 100644
--- a/examples/location/mapviewer/map/Marker.qml
+++ b/examples/location/mapviewer/map/Marker.qml
@@ -55,7 +55,8 @@ MapQuickItem {
     sourceItem: Image {
         id: image
 //! [mqi-anchor]
-        source: markerMouseArea.pressed ? "../resources/marker_selected.png" : "../resources/marker.png"
+        source: "../resources/marker.png"
+        opacity: markerMouseArea.pressed ? 0.6 : 1.0
         MouseArea  {
             id: markerMouseArea
             property int pressX : -1
@@ -93,11 +94,11 @@ MapQuickItem {
 
         Text{
             id: number
-            y: image.height/4
+            y: image.height/10
+            width: image.width
             color: "white"
             font.bold: true
             font.pixelSize: 14
-            width:27
             horizontalAlignment: Text.AlignHCenter
             Component.onCompleted: {
                 text = map.markerCounter
diff --git a/examples/location/mapviewer/map/PolygonItem.qml b/examples/location/mapviewer/map/PolygonItem.qml
index 0d72f9d7..b6f5fd2f 100644
--- a/examples/location/mapviewer/map/PolygonItem.qml
+++ b/examples/location/mapviewer/map/PolygonItem.qml
@@ -44,11 +44,11 @@ import QtLocation 5.3
 
 MapPolygon {
 
-    color: "green"
-    border.color: "darkgreen"
-    border.width: 4
+    color: "#46a2da"
+    border.color: "#190a33"
+    border.width: 2
     smooth: true
-    opacity: 0.5
+    opacity: 0.25
 
     function setGeometry(markers, index){
         for (var i = index; i<markers.length; i++){
diff --git a/examples/location/mapviewer/map/PolylineItem.qml b/examples/location/mapviewer/map/PolylineItem.qml
index efb05d39..f94ec950 100644
--- a/examples/location/mapviewer/map/PolylineItem.qml
+++ b/examples/location/mapviewer/map/PolylineItem.qml
@@ -43,9 +43,10 @@ import QtLocation 5.3
 //TODO: remove/refactor me when items are integrated
 
 MapPolyline {
-    line.color: "blue"
+
+    line.color: "#46a2da"
     line.width: 4
-    opacity: 0.7
+    opacity: 0.25
     smooth: true
 
     function setGeometry(markers, index){
diff --git a/examples/location/mapviewer/map/RectangleItem.qml b/examples/location/mapviewer/map/RectangleItem.qml
index 21a60e98..36ec3c0f 100644
--- a/examples/location/mapviewer/map/RectangleItem.qml
+++ b/examples/location/mapviewer/map/RectangleItem.qml
@@ -43,9 +43,11 @@ import QtLocation 5.3
 MapRectangle {
     id: mapRectangle
 
-    color: mousearea.containsMouse ? "lime" : "red"
-    opacity: 0.5
-    border.width: 2.0
+    color: "#46a2da"
+    border.color: "#190a33"
+    border.width: 2
+    smooth: true
+    opacity: 0.25
 
     function setGeometry(markers, index){
         topLeft.latitude = Math.max(markers[index].coordinate.latitude, markers[index + 1].coordinate.latitude)
@@ -54,21 +56,4 @@ MapRectangle {
         bottomRight.longitude = Math.max(markers[index].coordinate.longitude, markers[index + 1].coordinate.longitude)
     }
 
-    Binding {
-        target: mapRectangle
-        property: 'border.width'
-        value: 60
-
-        when: ((topLeft.latitude == -27.1144) &&
-               (topLeft.longitude == 152.6594) &&
-               (bottomRight.latitude == -27.7434) &&
-               (bottomRight.longitude == 153.3021))
-    }
-
-    MouseArea {
-        anchors.fill:parent
-        id: mousearea
-        hoverEnabled: false
-        drag.target: parent
-    }
 }
diff --git a/examples/location/mapviewer/mapviewer.qrc b/examples/location/mapviewer/mapviewer.qrc
index 7e8646d7..a84c67da 100644
--- a/examples/location/mapviewer/mapviewer.qrc
+++ b/examples/location/mapviewer/mapviewer.qrc
@@ -32,7 +32,6 @@
         <file>resources/scale_end.png</file>
         <file>resources/scale.png</file>
         <file>resources/marker.png</file>
-        <file>resources/marker_selected.png</file>
         <file>resources/icon.png</file>
     </qresource>
 </RCC>
diff --git a/examples/location/mapviewer/resources/marker.png b/examples/location/mapviewer/resources/marker.png
index 86ec960e..d5c698d1 100644
--- a/examples/location/mapviewer/resources/marker.png
+++ b/examples/location/mapviewer/resources/marker.png
diff --git a/examples/location/mapviewer/resources/marker_selected.png b/examples/location/mapviewer/resources/marker_selected.png
deleted file mode 100644
index f4bf8921..00000000
--- a/examples/location/mapviewer/resources/marker_selected.png
+++ /dev/null