X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=qml%2Fmain.qml;h=5c97c5054be5d26db1b6eaf0aa45c25ffb92d3ca;hb=5a7604ed608be9e3e5466583f5a30ce7965d5540;hp=9e22346afb6f8d94dce34e71d736ea069d7fd345;hpb=edc1e0e1745845b2b951778b900a2a4361106e6e;p=pywienerlinien

diff --git a/qml/main.qml b/qml/main.qml
index 9e22346..5c97c50 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -27,7 +27,7 @@ PageStackWindow {
         id: positionSource
         updateInterval: 15000
 
-        active: !(position.longitudeValid && position.latitudeValid)
+        active: config.getGpsEnabled() && !(position.longitudeValid && position.latitudeValid)
     }
 
     ToolBarLayout {
@@ -57,16 +57,17 @@ PageStackWindow {
             text: ''
 
             anchors {
-                bottomMargin: 10
-                bottom: parent.bottom
                 left: logo.right
                 leftMargin: 10
-                top: logo.top
+                top: parent.top
+                topMargin: 10
             }
             font.pixelSize: 16
         }
     }
 
+    Settings{id: settings}
+
     Menu {
         id: menu
 
@@ -76,6 +77,10 @@ PageStackWindow {
                 onClicked: mainPage.showNearby()
             }
             MenuItem {
+                text: 'Settings'
+                onClicked: pageStack.push(settings)
+            }
+            MenuItem {
                 text: 'About gotoVienna'
                 onClicked: aboutBox.show()
             }