Add:gui/qml:point type is now exposed to qml engine as a property

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3111 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/gui/qml/ngqpoint.h b/navit/navit/gui/qml/ngqpoint.h
index f4e83fe..909844e 100644 (file)
--- a/navit/navit/gui/qml/ngqpoint.h
+++ b/navit/navit/gui/qml/ngqpoint.h
@@ -8,7 +8,7 @@ class NGQPoint : public QObject {
 
     Q_PROPERTY(QString coordString READ coordString CONSTANT);
     Q_PROPERTY(QString pointName READ pointName CONSTANT);
-    Q_PROPERTY(QString py READ py CONSTANT);
+    Q_PROPERTY(QString pointType READ pointType CONSTANT);
 public:
     NGQPoint(struct gui_priv* this_,struct point* p,NGQPointTypes type=MapPoint,QObject *parent=NULL) : QObject(parent) {
         this->object=this_;
@@ -60,12 +60,15 @@ public slots:
     QString coordString() {
             return this->coord;
     }
-    QString px() { 
-            char buffer[1024];
-            coord_format(this->g.lat,this->g.lng,DEGREES_MINUTES_SECONDS,buffer,sizeof(buffer));
-            return QString(buffer);
+    QString pointType() {
+            switch(this->type) {
+            case MapPoint:
+                    return QString("MapPoint");
+            case Bookmark:
+                    return QString("Bookmark");
+            }
+            return QString("");
     }
-    QString py() { return QString().setNum(p.y);    }
 protected:
         QString _coordString() {
                 char latc='N',lngc='E';

diff --git a/navit/navit/gui/qml/skins/navit/point.qml b/navit/navit/gui/qml/skins/navit/point.qml
index f2c23d8..d183942 100644 (file)
--- a/navit/navit/gui/qml/skins/navit/point.qml
+++ b/navit/navit/gui/qml/skins/navit/point.qml
@@ -8,6 +8,9 @@ Rectangle {
     opacity: 0
 
     function pageOpen() {
+       if (point.pointType!="Bookmark") {
+           btnBookmark.opacity=1;
+       }
         page.opacity = 1;
     }
     
@@ -54,6 +57,7 @@ Rectangle {
         }
         ButtonIcon {
             id: btnBookmark; text: "Add as\na Bookmark"; icon: "gui_bookmark.svg"; onClicked: gui.setPage("PageBookmarksAdd.qml")
+           opacity: 0;
         }
         ButtonIcon {
             id: btnInfo; text: "Point\ninformation"; icon: "gui_menu.svg"; onClicked: console.log("Implement me!");