Small updates to qml files

diff --git a/application/resources/harmattan/qml/InfoBar.qml b/application/resources/harmattan/qml/InfoBar.qml
index d1922f0..f75ef88 100644 (file)
--- a/application/resources/harmattan/qml/InfoBar.qml
+++ b/application/resources/harmattan/qml/InfoBar.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import com.nokia.meego 1.0
+import com.nokia.meego 1.1
 import "uiconstants.js" as UiConstants
 
 BorderImage {

diff --git a/application/resources/harmattan/qml/StationListPage.qml b/application/resources/harmattan/qml/StationListPage.qml
index 7a90001..7429c04 100644 (file)
--- a/application/resources/harmattan/qml/StationListPage.qml
+++ b/application/resources/harmattan/qml/StationListPage.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.0
 import QtMobility.location 1.1
-import com.nokia.meego 1.0
+import com.nokia.meego 1.1
 import net.cirulla.quandoparte 1.0
 import "uiconstants.js" as UiConstants
 import "StationListPage.js" as Private
@@ -146,7 +146,6 @@ Page {
                     }
                 }
             }
-
             delegate: Item {
                 id: listItem
                 height: UiConstants.ListItemHeightSmall

diff --git a/application/resources/harmattan/qml/StationPage.qml b/application/resources/harmattan/qml/StationPage.qml
index 40105f6..d7a3407 100644 (file)
--- a/application/resources/harmattan/qml/StationPage.qml
+++ b/application/resources/harmattan/qml/StationPage.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.1
-import com.nokia.meego 1.0
+import com.nokia.meego 1.1
 import net.cirulla.quandoparte 1.0
 import "uiconstants.js" as UiConstants
 
@@ -93,25 +93,23 @@ Page {
         }
         Item {
             id: errorDisplay
-            anchors.centerIn: parent
-            Column {
+            anchors {
+                top: shadow.top
+                bottom: parent.bottom
+            }
+            width: parent.width
+            opacity: 0.6
+            Label {
+                textFormat: Text.RichText
+                visible: parent.visible
+                wrapMode: Text.WordWrap
+                text: "<h2>" + qsTr("Error!") + "</h2><p>" + schedule.error + "</p>"
+                width: parent.width
+                // font.pixelSize: UiConstants.HeaderFontPixelSize
+                horizontalAlignment: Text.AlignHCenter
                 anchors.centerIn: parent
-                spacing: UiConstants.DefaultMargin
-                Text {
-                    text: qsTr("Error!")
-                    width: parent.width
-                    font.pixelSize: UiConstants.HeaderFontPixelSize
-                    font.bold: UiConstants.HeaderFontBoldness
-                    horizontalAlignment: Text.AlignHCenter
-                }
-                Text {
-                    text: schedule.error
-                    width: parent.width
-                    font.pixelSize: UiConstants.HeaderFontPixelSize
-                    font.bold: UiConstants.DefaultFontBoldness
-                    horizontalAlignment: Text.AlignHCenter
-                }
             }
+            onVisibleChanged: if (visible) console.log("showing error: " + schedule.error)
         }
         states: [
             State {
@@ -132,6 +130,7 @@ Page {
             },
             State {
                 name: "ready"
+                when: completed && schedule.error === ""
                 PropertyChanges {
                     target: stationScheduleView
                     visible: true
@@ -147,7 +146,7 @@ Page {
             },
             State {
                 name: "error"
-                when: schedule.error
+                when: schedule.error !== ""
                 PropertyChanges {
                     target: stationScheduleView
                     visible: false

diff --git a/application/resources/harmattan/qml/StationScheduleDelegate.qml b/application/resources/harmattan/qml/StationScheduleDelegate.qml
index 1fdf75d..c3adc0e 100644 (file)
--- a/application/resources/harmattan/qml/StationScheduleDelegate.qml
+++ b/application/resources/harmattan/qml/StationScheduleDelegate.qml
@@ -1,6 +1,6 @@
 import QtQuick 1.1
 import QtWebKit 1.0
-import com.nokia.meego 1.0
+import com.nokia.meego 1.1
 import net.cirulla.quandoparte 1.0
 import "uiconstants.js" as UiConstants