diff options
| author | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-04-03 13:03:49 +0000 |
|---|---|---|
| committer | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-04-03 13:03:49 +0000 |
| commit | ba3e1c975892dadaac80d55ba12e111ea1a3f306 (patch) | |
| tree | cdda6b85bd4ba2d5adfb7af8007c3c5d3543499d | |
| parent | 0ea889698bacb3a6903d61911095c8dab4655e1e (diff) | |
| download | navit-svn-ba3e1c975892dadaac80d55ba12e111ea1a3f306.tar.gz | |
Add:gui/qml:Added conditional point commands
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit/navit@3120 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | gui/qml/navitProxy.h | 4 | ||||
| -rw-r--r-- | gui/qml/skins/navit/point.qml | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/gui/qml/navitProxy.h b/gui/qml/navitProxy.h index 58855a87..30f691e1 100644 --- a/gui/qml/navitProxy.h +++ b/gui/qml/navitProxy.h @@ -81,7 +81,7 @@ public slots: if (getAttrFunc(attr_destination, &attr, NULL) ) { c.x=attr.u.pcoord->x; c.y=attr.u.pcoord->y; - __setNewPoint(this->object,&c,MapPoint); + __setNewPoint(this->object,&c,Destination); return this->object->currentPoint->pointName(); } return QString(); @@ -103,7 +103,7 @@ public slots: if (vehicle_get_attr(this->object->currVehicle, attr_position_coord_geo, &attr, NULL)) { pc.pro=transform_get_projection(trans); transform_from_geo(pc.pro, attr.u.coord_geo, &c); - __setNewPoint(this->object,&c,MapPoint); + __setNewPoint(this->object,&c,Position); return this->object->currentPoint->pointName(); } return QString(); diff --git a/gui/qml/skins/navit/point.qml b/gui/qml/skins/navit/point.qml index 3d8e569c..a1753735 100644 --- a/gui/qml/skins/navit/point.qml +++ b/gui/qml/skins/navit/point.qml @@ -11,6 +11,15 @@ Rectangle { if (point.pointType!="Bookmark") { btnBookmark.opacity=1; } + if (point.pointType!="MapPoint") { + btnView.opacity=1; + } + if (point.pointType!="Position") { + btnPosition.opacity=1; + } + if (point.pointType!="Destination") { + btnDestination.opacity=1; + } page.opacity = 1; } @@ -38,12 +47,15 @@ Rectangle { spacing: gui.width/12 ButtonIcon { id: btnView; text: "View on map"; icon: "gui_maps.svg"; onClicked: console.log("Implement me!"); + opacity: 0 } ButtonIcon { - id: btnRoadbook; text: "Set as\nposition"; icon: "gui_active.svg"; onClicked: { navit.setPosition(); gui.backToMap() } + id: btnPosition; text: "Set as\nposition"; icon: "gui_active.svg"; onClicked: { navit.setPosition(); gui.backToMap() } + opacity: 0 } ButtonIcon { - id: btnSettings; text: "Set as\ndestination"; icon: "gui_active.svg"; onClicked: { navit.setDestination(); gui.backToMap() } + id: btnDestination; text: "Set as\ndestination"; icon: "gui_active.svg"; onClicked: { navit.setDestination(); gui.backToMap() } + opacity: 0 } } |