Various improvements to LinePad + UI flow

[pywienerlinien] / qml / MainPage.qml

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index e989fe4..a14e48d 100644 (file)
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -1,40 +1,64 @@
 import QtQuick 1.1
 import com.nokia.meego 1.0
+import QtMobility.location 1.1
+
 import "UIConstants.js" as UIConstants
 import "ExtrasConstants.js" as ExtrasConstants
 
 Page {
     tools: commonTools
 
-    property bool canRefresh: realtimeResult.sourceUrl != ''
+    property bool canRefresh: realtimeResult.sourceUrl != '' || (realtimeResult.isStation && realtimeResult.gstation != '')
+    //property alias stationSelect: stationSelector
+    property variant nearbyStations
 
     function refresh() {
         realtimeResult.refresh()
     }
 
-    SelectionDialog {
-        id: lineSelector
-        titleText: 'Select line'
+    function fillNearbyStations(lat, lon) {
+        nearbyStations = itip.get_nearby_stations(lat, lon)
+    }
 
-        model: ListModel {
-            id: lineSelectorModel
+    function showNearby() {
+        console.log("show nearby")
 
-            Component.onCompleted: {
-                var lines = itip.get_lines()
+        var stations = nearbyStations
+        stationSelectorModel.clear()
+        for (var idx in stations) {
+            stationSelectorModel.append({'name': stations[idx]})
+        }
 
-                for (var idx in lines) {
-                    lineSelectorModel.append({'name': lines[idx]})
-                }
-            }
+        stationSelector.open()
+    }
+
+    PositionSource {
+        id: positionSource
+        updateInterval: 10000
+
+        active: true
+
+        onPositionChanged: {
+            fillNearbyStations(positionSource.position.coordinate.latitude, positionSource.position.coordinate.longitude)
         }
+    }
 
-        // XXX It would be nice if we could make a delegate with
-        // icons (i.e. U1, U2, ... in the right colors), but we
-        // would have to "copy" the default delegate style
+    SelectionDialog {
+        id: stationSelector
+        titleText: 'Select nearby station'
+
+        model: ListModel {
+            id: stationSelectorModel
+        }
 
         onAccepted: {
-            console.log('accepted: ' + selectedIndex)
-            gline.text = lineSelectorModel.get(selectedIndex).name
+            realtimeResult.isStation = true
+            realtimeResult.gstation = stationSelectorModel.get(selectedIndex).name
+            realtimeResult.gline = ''
+            realtimeResult.sourceUrl = ''
+            gline.text = ''
+            gstation.text = stationSelectorModel.get(selectedIndex).name
+            console.log('station to get: ' + realtimeResult.gstation)
         }
     }
 
@@ -52,18 +76,7 @@ Page {
         }
 
         onTextChanged: {
-            // TODO: Check if text matches an item in lineSelectorModel and
-            // set selectedIndex in lineSelector to the right item
             gstation.text = ''
-
-            if (lineSelector.selectedIndex == -1) {
-                return
-            }
-
-            // Disable selection in line selector if user changes the text
-            if (lineSelectorModel.get(lineSelector.selectedIndex).name != text) {
-                lineSelector.selectedIndex = -1
-            }
         }
 
          MouseArea {
@@ -77,6 +90,12 @@ Page {
 
     LineSheet {
         id: lineSheet
+        onAccepted: {
+            gline.text = currentLine
+
+            /* We usually want to select a station after selecting a line */
+            stationPickerButton.clicked()
+        }
     }
 
     Button {
@@ -92,7 +111,10 @@ Page {
         width: 60
         iconSource: 'image://theme/icon-m-common-search'
 
-        onClicked: lineSelector.open()
+        onClicked: {
+            lineSheet.currentLine = ''
+            lineSheet.open()
+        }
     }
 
     TextField {
@@ -125,7 +147,7 @@ Page {
 
         Behavior on opacity { PropertyAnimation { } }
 
-        opacity: gline.text != '' // XXX: Check if the line is valid
+        opacity: gline.text !== '' // XXX: Check if the line is valid
 
         width: lineSearchButton.width * opacity
         //iconSource: 'image://theme/icon-m-common-location-picker'