diff options
| author | shubina <natalia.shubina@nokia.com> | 2011-08-11 10:25:27 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-11 03:37:57 +0200 |
| commit | 7b31b5cab5698349136d3bf5c9e99fe887eb64eb (patch) | |
| tree | deb083b90580f90bb3878064b37aede7920a2295 | |
| parent | 1a22116098c9b73171a458600a2cfd9f4458a9db (diff) | |
qml_mapviewer: removed Search dialog
Change-Id: I5deb1fc0fa5fc458da0392a681c2784efc0bd2e2
Reviewed-on: http://codereview.qt.nokia.com/2830
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
| -rw-r--r-- | examples/declarative/mapviewer/MapComponent.qml | 3 | ||||
| -rw-r--r-- | examples/declarative/mapviewer/mapviewer.qml | 35 |
2 files changed, 4 insertions, 34 deletions
diff --git a/examples/declarative/mapviewer/MapComponent.qml b/examples/declarative/mapviewer/MapComponent.qml index 85b3bb12..a3706af5 100644 --- a/examples/declarative/mapviewer/MapComponent.qml +++ b/examples/declarative/mapviewer/MapComponent.qml @@ -675,6 +675,9 @@ Map { } routeQuery.travelModes = RouteQuery.CarTravel routeQuery.routeOptimizations = RouteQuery.ShortestRoute + for (i=0; i<9; i++) { + routeQuery.setFeatureWeight(i, 0) + } routeModel.update(); } diff --git a/examples/declarative/mapviewer/mapviewer.qml b/examples/declarative/mapviewer/mapviewer.qml index 8891767a..723bbdd9 100644 --- a/examples/declarative/mapviewer/mapviewer.qml +++ b/examples/declarative/mapviewer/mapviewer.qml @@ -88,8 +88,7 @@ Item { orientation: ListView.Vertical z: mainMenu.z - 1 Component.onCompleted: { - setModel(["Reverse geocode", "Geocode","Search", "Route"]) - disableItem(2) + setModel(["Reverse geocode", "Geocode", "Route"]) } itemHeight: 30; itemWidth: mainMenu.itemWidth @@ -107,10 +106,6 @@ Item { break; } case 2: { - page.state = "Search" - break; - } - case 3: { page.state = "Route" break; } @@ -386,26 +381,6 @@ Item { } } -//Search Dialog - Dialog { - id: searchDialog - title: "Search" - z: mainMenu.z + 1 - - onGoButtonClicked: { - page.state = "" -// searchModel.searchString = dialogModel.get(0).inputText -// searchModel.update(); - } - Component.onCompleted: { - var obj = [["Please enter thing to search:","53 Brandl St, Eight Mile Plains, Australia"]] - setModel(obj) - } - onCancelButtonClicked: { - page.state = "" - } - } - //Geocode Dialog Dialog { id: geocodeDialog @@ -586,10 +561,6 @@ Item { PropertyChanges { target: routeDialog; opacity: 1 } }, State { - name: "Search" - PropertyChanges { target: searchDialog; opacity: 1 } - }, - State { name: "Geocode" PropertyChanges { target: geocodeDialog; opacity: 1 } }, @@ -632,10 +603,6 @@ Item { NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } }, Transition { - to: "Search" - NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } - }, - Transition { to: "Geocode" NumberAnimation { properties: "opacity" ; duration: 500; easing.type: Easing.Linear } }, |