Various improvements to LinePad + UI flow

[pywienerlinien] / qml / MainPage.qml

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index 3f23ba2..a14e48d 100644 (file)
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -44,32 +44,6 @@ Page {
     }
 
     SelectionDialog {
-        id: lineSelector
-        titleText: 'Select line'
-
-        model: ListModel {
-            id: lineSelectorModel
-
-            Component.onCompleted: {
-                var lines = itip.get_lines()
-
-                for (var idx in lines) {
-                    lineSelectorModel.append({'name': lines[idx]})
-                }
-            }
-        }
-
-        // 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
-
-        onAccepted: {
-            console.log('accepted: ' + selectedIndex)
-            gline.text = lineSelectorModel.get(selectedIndex).name
-        }
-    }
-
-    SelectionDialog {
         id: stationSelector
         titleText: 'Select nearby station'
 
@@ -102,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 {
@@ -125,10 +88,15 @@ Page {
          }
     }
 
-    /*
     LineSheet {
         id: lineSheet
-    }*/
+        onAccepted: {
+            gline.text = currentLine
+
+            /* We usually want to select a station after selecting a line */
+            stationPickerButton.clicked()
+        }
+    }
 
     Button {
         id: lineSearchButton
@@ -143,7 +111,10 @@ Page {
         width: 60
         iconSource: 'image://theme/icon-m-common-search'
 
-        onClicked: lineSelector.open()
+        onClicked: {
+            lineSheet.currentLine = ''
+            lineSheet.open()
+        }
     }
 
     TextField {