Cleaned up Harmattan AboutPage

diff --git a/application/resources/harmattan/qml/AboutPage.qml b/application/resources/harmattan/qml/AboutPage.qml
index 9ac022d..b4a70f5 100644 (file)
--- a/application/resources/harmattan/qml/AboutPage.qml
+++ b/application/resources/harmattan/qml/AboutPage.qml
@@ -20,6 +20,10 @@ Page {
             qsTr("About Quando Parte")
         ]
     }
+    DroppedShadow {
+        id: shadow
+        anchors.top: header.bottom
+    }
     Flickable {
         anchors {
             top: header.bottom;
@@ -27,31 +31,44 @@ Page {
             right: parent.right;
             margins: UiConstants.DefaultMargin
         }
+        Row {
+            anchors.top: parent.top
+            id: firstSection
+            spacing: UiConstants.DefaultMargin
+            Image {
+                anchors.verticalCenter: parent.verticalCenter
+                source: "/usr/share/icons/hicolor/meegotouch/apps/quandoparte.png"
+            }
+            Label {
+                textFormat: Text.RichText
+                text: "<style>a:link{color:" + UiConstants.AccentColor + ";text-decoration:none}</style>" +
+                      "<div style='font-size:large;font-weight:bold'><a href='http://quandoparte.garage.maemo.org'>" +
+                      qsTr("Quando Parte") + "</a></div>" + "<div style='font-size:small;'>" +
+                      qsTr("version ") + settings.versionString + "</div>"
+                onLinkActivated: Qt.openUrlExternally(link)
+            }
+        }
         Label {
             anchors {
-                top: parent.top;
+                top: firstSection.bottom;
                 left: parent.left;
                 right: parent.right;
-                margins: UiConstants.DefaultMargin
+                topMargin: UiConstants.DefaultMargin
             }
-            wrapMode: Text.WordWrap
             textFormat: Text.RichText
-            text: qsTr("<h2><a href='http://quandoparte.garage.maemo.org'>" +
-                       "Quando Parte" + "</a></h2>" +"<p style='font-size:small;'>version ") +
-                  settings.versionString +
-                  qsTr("</p>" +
-                       "<p>Copyright (c) 2010, 2011, 2012, 2013</p>" +
+            wrapMode: Text.WordWrap
+            text: "<style>a:link{color:" + UiConstants.AccentColor + ";text-decoration:none}</style>" +
+                  "<div style='font-size:small'>" +
+                  qsTr("<p>Copyright (c) 2010, 2011, 2012, 2013</p>" +
                        "<p>Luciano Montanaro " +
                        "(<a href='mailto:mikelima@cirulla.net'>mikelima@cirulla.net</a>)</p>" +
                        "<p>Licensed under the GNU Public License v2 or above</p>" +
-                       "<p/><p>Station geolocation data from " +
+                       "<p>Station geolocation data from " +
                        "<a href='http://www.openstreetmap.org'>OpenStreetMap</a></p>" +
                        "<p>Realtime train data from " +
-                       "<a href='http://mobile.viaggiatreno.it'>Viaggiatreno</a></p>");
+                       "<a href='http://mobile.viaggiatreno.it'>Viaggiatreno</a></p>") +
+                  "</div>"
             onLinkActivated: Qt.openUrlExternally(link)
         }
-        LabelStyle {
-            id: labelStyle
-        }
     }
  }

diff --git a/application/resources/harmattan/qml/DelayIndicator.qml b/application/resources/harmattan/qml/DelayIndicator.qml
index 363cffb..4a668aa 100644 (file)
--- a/application/resources/harmattan/qml/DelayIndicator.qml
+++ b/application/resources/harmattan/qml/DelayIndicator.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
 import "uiconstants.js" as UiConstants
 
 Item {

diff --git a/application/resources/harmattan/qml/DroppedShadow.qml b/application/resources/harmattan/qml/DroppedShadow.qml
index 3e3e513..57d098f 100644 (file)
--- a/application/resources/harmattan/qml/DroppedShadow.qml
+++ b/application/resources/harmattan/qml/DroppedShadow.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Rectangle {
     id: shadow

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