Moved header title update to PageHeader Component

diff --git a/application/resources/harmattan/qml/PageHeader.qml b/application/resources/harmattan/qml/PageHeader.qml
index 763e7c7..4aba89f 100644 (file)
--- a/application/resources/harmattan/qml/PageHeader.qml
+++ b/application/resources/harmattan/qml/PageHeader.qml
@@ -59,4 +59,13 @@ Rectangle {
         id: dialog
         titleText: qsTr("Show")
     }
+    onSelectedIndexChanged: {
+        console.log("Selection changed to: " + selectedIndex)
+        if (options === undefined || options.count === 0) {
+            header.text = " "
+        } else {
+            header.text = options.get(selectedIndex).name
+            console.log("Selection text is: " + header.text)
+        }
+    }
 }

diff --git a/application/resources/harmattan/qml/StationListPage.qml b/application/resources/harmattan/qml/StationListPage.qml
index e45f3f1..a7a3ed4 100644 (file)
--- a/application/resources/harmattan/qml/StationListPage.qml
+++ b/application/resources/harmattan/qml/StationListPage.qml
@@ -46,7 +46,6 @@ Page {
     PageHeader {
         id: header
         anchors.top: parent.top
-        text: qsTr("Stations")
         selectedIndex: stationListProxyModel.sortingMode
         options: ListModel {
             id: dialogOptions
@@ -60,11 +59,6 @@ Page {
                 name: QT_TR_NOOP("Stations Recently Seen")
             }
         }
-        onSelectedIndexChanged: {
-            header.text = dialogOptions.get(selectedIndex).name
-            console.log("Selection changed to: " + selectedIndex)
-            console.log("Selection text is: " + header.text)
-        }
     }
     SearchBar {
         id: searchField