X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=qml%2Fmain.qml;h=01d0010e429e0f0a04ec641de1471adf7c4f3526;hb=e38a163a47ec9fb27a8d82914ce1670af189e283;hp=52364479e8250c5d86f4b02451b84c7f7916adad;hpb=5c845c3d17397daf245737f2a38a3fa40e36c5f0;p=pywienerlinien

diff --git a/qml/main.qml b/qml/main.qml
index 5236447..01d0010 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -6,57 +6,50 @@ PageStackWindow {
     id: appWindow
 
     initialPage: mainPage
+    showToolBar: aboutBox.opacity == 0
 
     MainPage {
         id: mainPage
+
+        AboutBox {
+            id: aboutBox
+            anchors.fill: parent
+
+            appName: aboutInfo.getAppName()
+            websiteURL: aboutInfo.getWebsiteURL()
+            copyright: aboutInfo.getCopyright()
+            license: aboutInfo.getLicense()
+            iconFilename: 'gotovienna-about-logo.png'
+        }
     }
 
     PositionSource {
         id: positionSource
         updateInterval: 15000
 
-        active: !(position.longitudeValid && position.latitudeValid)
+        active: config.getGpsEnabled() && !(position.longitudeValid && position.latitudeValid)
     }
 
     ToolBarLayout {
         id: commonTools
-        visible: true
-        /*ToolIcon {
-            platformIconId: "toolbar-view-menu"
-            anchors.right: (parent === undefined) ? undefined : parent.right
-            onClicked: (menu.status == DialogStatus.Closed) ? menu.open() : menu.close()
-        }*/
+
         ToolIcon {
-              enabled: mainPage.canRefresh
-              platformIconId: enabled ? 'icon-m-toolbar-refresh' : 'icon-m-toolbar-refresh-dimmed'
-              anchors.right: parent.right
-              onClicked: mainPage.refresh()
+            platformIconId: 'icon-m-toolbar-search'
+            anchors.left: parent.left
+            onClicked: mainPage.search()
         }
 
         ToolIcon {
-              platformIconId: enabled ? 'icon-m-toolbar-refresh' : 'icon-m-toolbar-refresh-dimmed'
-              anchors.right: parent.right
-              onClicked: mainPage.refresh()
+            platformIconId: "toolbar-view-menu"
+            anchors.right: parent.right
+            onClicked: menu.open()
         }
 
-        Image {
-            id: logo
-            source: 'logo.png'
-
-            anchors {
-                bottomMargin: 10
-                bottom: parent.bottom
-                left: parent.left
-                leftMargin: 10
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    console.debug(itip.get_nearby_stations(positionSource.position.coordinate.latitude, positionSource.position.coordinate.longitude))
-                    debugText.text = itip.get_nearby_stations(positionSource.position.coordinate.latitude, positionSource.position.coordinate.longitude)
-                }
-            }
+        ToolIcon {
+              visible: mainPage.canRefresh
+              platformIconId: 'icon-m-toolbar-refresh'
+              anchors.centerIn: parent
+              onClicked: mainPage.refresh()
         }
 
         Text {
@@ -64,21 +57,42 @@ PageStackWindow {
             text: ''
 
             anchors {
-                bottomMargin: 10
-                bottom: parent.bottom
                 left: logo.right
                 leftMargin: 10
-                top: logo.top
+                top: parent.top
+                topMargin: 10
             }
             font.pixelSize: 16
         }
     }
 
-    /*Menu {
+    Settings{id: settings}
+    MapView{id: map}
+
+    Menu {
         id: menu
-        visualParent: pageStack
+
         MenuLayout {
-            MenuItem { text: "Test"; onClicked: pageStack.push(Qt.resolvedUrl("test.qml")) }
+            MenuItem {
+                text: 'Nearby stations'
+                onClicked: mainPage.showNearby()
+            }
+            MenuItem {
+                text: 'Favorites'
+                onClicked: mainPage.showFavorites()
+            }
+            //MenuItem {
+            //    text: 'Map'
+            //    onClicked: pageStack.push(map)
+            //}
+            MenuItem {
+                text: 'Settings'
+                onClicked: pageStack.push(settings)
+            }
+            MenuItem {
+                text: 'About gotoVienna'
+                onClicked: aboutBox.show()
+            }
         }
-    }*/
+    }
 }