X-Git-Url: http://git.maemo.org/git/?p=googlelatitude;a=blobdiff_plain;f=qml%2FMainPage.qml;h=8decc23ea4727d24a01d30ef55c1081075854783;hp=17f91545759d9fd0deae2f6ea8e1d81b33dd28fb;hb=d61a299b8bfaa74e8c2680923a3efbbcf2ab8347;hpb=05be3d4e9145560968c3afc78c1fcca644cc7a9e

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index 17f9154..8decc23 100644
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -24,7 +24,9 @@ Page {
                 onClicked: {
                     do_start.enabled = false;
                     do_stop.enabled = true;
-                    gps.startUpdates()
+                    if (!demonio.demonio_start()) {
+                        gps.startUpdates()
+                    }
                 }
             }
             Button {
@@ -35,44 +37,9 @@ Page {
                 onClicked: {
                     do_start.enabled = true;
                     do_stop.enabled = false;
-                    gps.stopUpdates(true)
-                }
-            }
-        }
-        Row {
-            width: rootWindow.width
-            Label {
-                id: pos_label
-                text: "Position"
-                width: rootWindow.width / 4
-                anchors.verticalCenter: position.verticalCenter
-            }
-            Row {
-                id: position
-                width: rootWindow.width * 3 / 4
-                TextField  {
-                    id: pos_lat
-                    width: parent / 4
-                    placeholderText: "pos_lat"
-                    readOnly: true
-                }
-                TextField {
-                    id: pos_lon
-                    width: parent / 4
-                    placeholderText: "pos_lon"
-                    readOnly: true
-                }
-                TextField {
-                    id: pos_acc
-                    width: parent / 4
-                    placeholderText: "pos_acc"
-                    readOnly: true
-                }
-                TextField {
-                    id: pos_tis
-                    width: parent / 4
-                    placeholderText: "pos_tis"
-                    readOnly: true
+                    if (!demonio.demonio_stop()) {
+                        gps.stopUpdates(true)
+                    }
                 }
             }
         }
@@ -194,8 +161,13 @@ Page {
             target: latitude
             onGotToken: {
                 do_auth.enabled = false;
-                do_start.enabled = true;
-                do_stop.enabled = false;
+                if (demonio.demonio_status()) {
+                    do_start.enabled = false;
+                    do_stop.enabled = true;
+                } else {
+                    do_start.enabled = true;
+                    do_stop.enabled = false;
+                }
             }
         }
         Connections {
@@ -204,7 +176,9 @@ Page {
                 do_auth.enabled = true;
                 do_start.enabled = false;
                 do_stop.enabled = false;
-                gps.stopUpdates(true)
+                if (!demonio.demonio_stop()) {
+                    gps.stopUpdates(true)
+                }
             }
         }
         Connections {
@@ -216,21 +190,10 @@ Page {
 
         Connections {
             target: gps
-            onGotUpdate: {
-                pos_lat.text = gps.getCurrentLatitude()
-                pos_lon.text = gps.getCurrentLongitude()
-                pos_acc.text = gps.getCurrentAccuracy()
-                pos_tis.text = gps.getCurrentTimestamp()
-            }
-        }
-        Connections {
-            target: gps
             onGotFix: {
-                pos_lat.text = gps.getCurrentLatitude()
-                pos_lon.text = gps.getCurrentLongitude()
-                pos_acc.text = gps.getCurrentAccuracy()
-                pos_tis.text = gps.getCurrentTimestamp()
-                latitude.setCurrentLocation(pos_lat.text, pos_lon.text, pos_acc.text)
+                latitude.setCurrentLocation(gps.getCurrentLatitude(),
+                                            gps.getCurrentLongitude(),
+                                            gps.getCurrentAccuracy())
                 latitude.sendCurrentLocation()
             }
         }