changed get_departure, return list of Departure objects with line,

[pywienerlinien] / qml / MainPage.qml

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index 9b80ee4..a0f5cdf 100644 (file)
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -12,17 +12,6 @@ Page {
         realtimeResult.refresh()
     }
 
-    /*Image {
-        id: logo
-        source: 'logo.png'
-
-        anchors {
-            topMargin: 25
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-        }
-    }*/
-
     SelectionDialog {
         id: lineSelector
         titleText: 'Select line'
@@ -86,6 +75,11 @@ Page {
          }
     }
 
+    /*
+    LineSheet {
+        id: lineSheet
+    }*/
+
     Button {
         id: lineSearchButton
 
@@ -116,145 +110,8 @@ Page {
         }
     }
 
-    Sheet {
+    StationSheet {
         id: stationSheet
-        property string currentLine: ''
-        property string currentDirection: ''
-        property string currentStation: ''
-
-        acceptButtonText: 'Select'
-        rejectButtonText: 'Cancel'
-
-        function loadData(lineName) {
-            stationSheet.currentLine = lineName
-
-            directionChooser.direction1 = ''
-            directionChooser.direction2 = ''
-
-            directionChooserBusyIndicator.running = true
-            itip.load_directions(stationSheet.currentLine)
-
-            firstDirection.clicked()
-            directionChooser.checkedButton = firstDirection
-        }
-
-        Connections {
-            target: itip
-
-            onDirectionsLoaded: {
-                directionChooserBusyIndicator.running = false
-
-                directionChooser.direction1 = itip.get_direction(0)
-                directionChooser.direction2 = itip.get_direction(1)
-
-                firstDirection.clicked()
-                directionChooser.checkedButton = firstDirection
-            }
-        }
-
-        content: Item {
-            anchors.fill: parent
-
-            ButtonColumn {
-                id: directionChooser
-                property string direction1
-                property string direction2
-
-                visible: !directionChooserBusyIndicator.running
-
-                function chosen(idx) {
-                    console.log('direction chosen: '+ idx)
-
-                    stationSelectorListView.selectedIndex = -1
-
-                    if (idx == 1) {
-                        stationSheet.currentDirection = directionChooser.direction1
-                    } else {
-                        stationSheet.currentDirection = directionChooser.direction2
-                    }
-
-                    directionChooserModel.clear()
-                    var stations = itip.get_stations(stationSheet.currentLine, stationSheet.currentDirection)
-
-                    for (var s in stations) {
-                        directionChooserModel.append({'station': stations[s]})
-                    }
-                }
-
-                anchors {
-                    margins: 10
-                    top: parent.top
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Button {
-                    id: firstDirection
-                    text: 'Richtung ' + directionChooser.direction1
-                    onClicked: directionChooser.chosen(1)
-                }
-
-                Button {
-                    id: secondDirection
-                    text: 'Richtung ' + directionChooser.direction2
-                    onClicked: directionChooser.chosen(2)
-                }
-            }
-
-            ListView {
-                id: stationSelectorListView
-                visible: !directionChooserBusyIndicator.running
-
-                property int selectedIndex: -1
-                onSelectedIndexChanged: {
-                    console.log('current index: ' + selectedIndex)
-                    if (selectedIndex != -1) {
-                        stationSheet.currentStation = directionChooserModel.get(selectedIndex).station
-                    } else {
-                        stationSheet.currentStation = ''
-                    }
-                }
-
-                anchors {
-                    margins: 10
-                    top: directionChooser.bottom
-                    left: parent.left
-                    right: parent.right
-                    bottom: parent.bottom
-                }
-
-                clip: true
-
-                model: ListModel {
-                    id: directionChooserModel
-                }
-
-                delegate: StationListItem { selector: stationSelectorListView }
-            }
-
-            ScrollDecorator {
-                flickableItem: stationSelectorListView
-            }
-
-            BusyIndicator {
-                id: directionChooserBusyIndicator
-                anchors.centerIn: parent
-                visible: running
-                platformStyle: BusyIndicatorStyle { size: 'large' }
-            }
-        }
-
-        onAccepted: {
-            gstation.text = stationSheet.currentStation
-
-            realtimeResult.gline = stationSheet.currentLine
-            realtimeResult.gstation = stationSheet.currentStation
-            realtimeResult.gdirection = stationSheet.currentDirection
-
-            realtimeResult.sourceUrl = itip.get_directions_url(stationSheet.currentLine, stationSheet.currentDirection, stationSheet.currentStation)
-            console.log('url to get: ' + realtimeResult.sourceUrl)
-
-        }
     }
 
     Button {