weather-qml

Signed-off-by: Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>

272 files changed, 2698 insertions, 892 deletions

diff --git a/weather-qml/.DS_Store b/weather-qml/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
--- a/weather-qml/.DS_Store
+++ /dev/null
diff --git a/weather-qml/.gitignore b/weather-qml/.gitignore
deleted file mode 100644
index 87cab50..0000000
--- a/weather-qml/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-*.o
-moc_*.cpp
-Makefile
-qrc_*.cpp
-*.moc
-*~
-*.inf
-*.sis
-*.mmp
-*.rss
-*.pkg
-*.loc
-*.mk
-*.cache
-*#
-.cproject
-.project
-.make.cache
-ABLD.BAT
diff --git a/weather-qml/Fog.qml b/weather-qml/Fog.qml
deleted file mode 100644
index 3def8af..0000000
--- a/weather-qml/Fog.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-import Qt 4.6
-
-ForecastView {
-    id: root
-    isClear: false
-
-    SmallCloud {
-        id: cloud2
-        x: scaledX(308)
-        y: scaledY(-800)
-        finalY: scaledY(-468);
-        type: "cloud_rain"
-    }
-
-    HungItem {
-        id: sun
-        x: isDay ? scaledX(198) : scaledX(220)
-        y: scaledY(-800)
-        itemX: 0
-        itemY:  isDay ? 176 : 180
-        height:  isDay ? 460 : 440
-        finalY: isDay ? scaledY(-255) : scaledY(-205)
-        itemImage: isDay ? "images/cold_sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/cold_sun_line.png" : "images/moon_line.png"
-    }
-
-    MediumCloud {
-        id: cloud1
-        x: scaledX(3)
-        y: scaledY(-800)
-        finalY: scaledY(-296)
-        type: "cloud_rain"
-    }
-
-    Image {
-        id: fog
-        x: scaledX(-30)
-        source: "images/fog.png"
-    }
-
-    states : State {
-        name: "final"
-        PropertyChanges { target: sun; y: sun.finalY; }
-        PropertyChanges { target: cloud1; y: cloud1.finalY; }
-        PropertyChanges { target: cloud2; y: cloud2.finalY; }
-    }
-
-    transitions: Transition {
-        SequentialAnimation {
-            ParallelAnimation {
-               NumberAnimation { target: cloud1; properties: "y";
-                                 easing.type: "OutBack"; duration: 500 }
-
-               SequentialAnimation {
-                   PauseAnimation { duration: 200 }
-                   NumberAnimation { target: cloud2; properties: "y";
-                                     easing.type: "OutBack"; duration: 500 }
-               }
-            }
-
-            NumberAnimation { target: sun; properties: "y";
-                              easing.type: "OutBack"; duration: 500 }
-        }
-    }
-
-    onPresent: { root.state = "final"; }
-}
diff --git a/weather-qml/ForecastLabel.qml b/weather-qml/ForecastLabel.qml
deleted file mode 100644
index 60a4440..0000000
--- a/weather-qml/ForecastLabel.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: root
-
-    property string lowTemperature
-    property string highTemperature
-    property string currentTemperature
-
-    Row {
-        anchors.bottom: line.bottom
-        anchors.bottomMargin: 58
-        anchors.bottom: parent.bottom
-        anchors.horizontalCenter: line.horizontalCenter
-
-        Text {
-            text: currentTemperature
-            font.family: "Nokia Sans"
-            font.pixelSize: 120
-            font.bold: true
-            color: "white"
-        }
-
-        Image {
-            source: "images/centigrades.png"
-        }
-    }
-
-    Image {
-        id: line
-        source: "images/division_line.png"
-        anchors.top: parent.top
-        anchors.topMargin: 104
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    Row {
-        anchors.left: line.left
-        anchors.top: line.bottom
-
-        Image {
-            source: "images/icon_max.png"
-        }
-
-        Text {
-            text: highTemperature + "°C"
-            font.family: "Nokia Sans"
-            font.pixelSize: 30
-            color: "white"
-            opacity: 0.7
-        }
-    }
-
-    Row {
-        anchors.right: line.right
-        anchors.top: line.bottom
-
-        Image {
-            source: "images/icon_min.png"
-        }
-
-        Text {
-            text: lowTemperature + "°C"
-            font.family: "Nokia Sans"
-            font.pixelSize: 30
-            color: "white"
-            opacity: 0.7
-        }
-    }
-}
diff --git a/weather-qml/ForecastView.qml b/weather-qml/ForecastView.qml
deleted file mode 100644
index 9aace9c..0000000
--- a/weather-qml/ForecastView.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: root
-    anchors.fill: parent
-
-    signal present();
-
-    property bool isDay : true;
-    property bool isClear : true;
-    property string cityName;
-    property int lowTemperature;
-    property int highTemperature;
-    property int currentTemperature;
-
-    function scaledX(x) {
-        return x * window.scaleFactorX;
-    }
-
-    function scaledY(y) {
-        return y * window.scaleFactorY;
-    }
-
-    Image {
-        id: bg
-        x: root.width / 2 - bg.width / 2
-        source: root.isDay ? (root.isClear ? "images/bg_day_clear.png" : "images/bg_day_rain.png")
-                       : (root.isClear ? "images/bg_night_clear.png" : "images/bg_night_rain.png");
-    }
-
-    ForecastLabel {
-        id: display1
-        x: 110
-        z: 99
-        width: 260
-        height: 180
-        anchors.bottomMargin: 115
-        anchors.bottom: parent.bottom
-        currentTemperature: root.currentTemperature
-        lowTemperature: root.lowTemperature
-        highTemperature: root.highTemperature
-    }
-
-    Text {
-        id: cityLabel
-        z: 99
-        text: root.cityName
-        font.family: "Nokia Sans"
-        font.pixelSize: 40
-        color: "#ffffff"
-        horizontalAlignment: "AlignHCenter"
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.leftMargin: 50
-        anchors.bottomMargin: 76
-        anchors.bottom: parent.bottom
-    }
-
-    Connections { target: parent; onPresent: present(); }
-}
diff --git a/weather-qml/Haze.qml b/weather-qml/Haze.qml
deleted file mode 100644
index 7da5e67..0000000
--- a/weather-qml/Haze.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-import Qt 4.6
-
-ForecastView {
-    id: root
-    isClear: false
-
-    SmallCloud {
-        id: cloud2
-        x: scaledX(341)
-        y: scaledY(-800)
-        finalY: scaledY(-469);
-        type: "cloud_rain"
-    }
-
-    HungItem {
-        id: sun
-        x: isDay ? scaledX(198) : scaledX(220)
-        y: scaledY(-800)
-        itemX: 0
-        itemY:  isDay ? 176 : 180
-        height:  isDay ? 460 : 440
-        finalY: isDay ? scaledY(-255) : scaledY(-205)
-        itemImage: isDay ? "images/cold_sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/cold_sun_line.png" : "images/moon_line.png"
-    }
-
-    MediumCloud {
-        id: cloud1
-        x: scaledX(6)
-        y: scaledY(-800)
-        finalY: scaledY(-296)
-        type: "cloud_rain"
-    }
-
-    Image {
-        id: haze
-        x: scaledX(-30)
-        source: "images/haze.png"
-    }
-
-    states : State {
-        name: "final"
-        PropertyChanges { target: sun; y: sun.finalY; }
-        PropertyChanges { target: cloud1; y: cloud1.finalY; }
-        PropertyChanges { target: cloud2; y: cloud2.finalY; }
-    }
-
-    transitions: Transition {
-        SequentialAnimation {
-            ParallelAnimation {
-               NumberAnimation { target: cloud1; properties: "y";
-                                 easing.type: "OutBack"; duration: 500 }
-
-               SequentialAnimation {
-                   PauseAnimation { duration: 200 }
-                   NumberAnimation { target: cloud2; properties: "y";
-                                     easing.type: "OutBack"; duration: 500 }
-               }
-            }
-
-            NumberAnimation { target: sun; properties: "y";
-                              easing.type: "OutBack"; duration: 500 }
-        }
-    }
-
-    onPresent: { root.state = "final"; }
-}
diff --git a/weather-qml/HungItem.qml b/weather-qml/HungItem.qml
deleted file mode 100644
index cf14c09..0000000
--- a/weather-qml/HungItem.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: root
-
-    property real itemX
-    property real itemY
-    property real finalY
-    property string lineImage
-    property string itemImage
-
-    width: item.width
-    height: itemY + item.height
-
-    Image {
-        id: line
-        source: root.lineImage
-        anchors.horizontalCenter: root.horizontalCenter
-    }
-
-    Image {
-        id: item
-        x: root.itemX
-        y: root.itemY
-        source: root.itemImage
-        anchors.bottom: parent.bottom
-    }
-}
diff --git a/weather-qml/LICENSE.BSD b/weather-qml/LICENSE.BSD
new file mode 100644
index 0000000..13f338b
--- /dev/null
+++ b/weather-qml/LICENSE.BSD
@@ -0,0 +1,32 @@
+Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+All rights reserved.
+Contact:  Nokia Corporation (qt-info@nokia.com)
+
+"Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+    the names of its contributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE."
diff --git a/weather-qml/LargeCloud.qml b/weather-qml/LargeCloud.qml
deleted file mode 100644
index c05e234..0000000
--- a/weather-qml/LargeCloud.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-HungItem {
-    id: root
-    itemX: 15;
-    itemY: 420;
-
-    property string type: "cloud";
-    itemImage: "images/" + root.type + "_1.png"
-    lineImage: "images/" + root.type + "_1_line.png"
-}
diff --git a/weather-qml/MediumCloud.qml b/weather-qml/MediumCloud.qml
deleted file mode 100644
index 527ce97..0000000
--- a/weather-qml/MediumCloud.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-HungItem {
-    id: root
-    itemX: 13;
-    itemY: 420;
-
-    property string type: "cloud";
-    itemImage: "images/" + root.type + "_2.png"
-    lineImage: "images/" + root.type + "_2_line.png"
-}
diff --git a/weather-qml/MostlySunny.qml b/weather-qml/MostlySunny.qml
deleted file mode 100644
index 4970238..0000000
--- a/weather-qml/MostlySunny.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-import Qt 4.6
-
-ForecastView {
-    id: root
-
-    SmallCloud {
-        id: cloud3
-        x: scaledX(-7)
-        y: scaledY(-800)
-        finalY: scaledY(-540);
-        type: isDay ? "cloud" : "cloud_rain"
-    }
-
-    SmallCloud {
-        id: cloud2
-        x: scaledX(399)
-        y: scaledY(-800)
-        finalY: scaledY(-409);
-        type: isDay ? "cloud" : "cloud_rain"
-    }
-
-    HungItem {
-        id: sun
-        x: isDay ? scaledX(120) : scaledX(220)
-        y: scaledY(-800)
-        itemX: 0
-        itemY:  isDay ? 200 : 180
-        height:  isDay ? 500 : 440
-        finalY: isDay ? scaledY(-198) : scaledY(-205)
-        itemImage: isDay ? "images/sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/sun_line.png" : "images/moon_line.png"
-    }
-
-    MediumCloud {
-        id: cloud1
-        x: scaledX(-20)
-        y: scaledY(-800)
-        finalY: scaledY(-218)
-        type: isDay ? "cloud" : "cloud_rain"
-    }
-
-    states : State {
-        name: "final"
-        PropertyChanges { target: sun; y: sun.finalY; }
-        PropertyChanges { target: cloud1; y: cloud1.finalY; }
-        PropertyChanges { target: cloud2; y: cloud2.finalY; }
-        PropertyChanges { target: cloud3; y: cloud3.finalY; }
-    }
-
-    transitions: Transition {
-        SequentialAnimation {
-            ParallelAnimation {
-               NumberAnimation { target: cloud1; properties: "y";
-                                 easing.type: "OutBack"; duration: 500 }
-
-               SequentialAnimation {
-                   PauseAnimation { duration: 200 }
-                   NumberAnimation { target: cloud2; properties: "y";
-                                     easing.type: "OutBack"; duration: 500 }
-               }
-
-               SequentialAnimation {
-                   PauseAnimation { duration: 400 }
-                   NumberAnimation { target: cloud3; properties: "y";
-                                     easing.type: "OutBack"; duration: 500 }
-               }
-            }
-
-            NumberAnimation { target: sun; properties: "y";
-                              easing.type: "OutBack"; duration: 500 }
-        }
-    }
-
-    onPresent: { root.state = "final"; }
-}
diff --git a/weather-qml/ParallaxView.qml b/weather-qml/ParallaxView.qml
deleted file mode 100644
index cfd4414..0000000
--- a/weather-qml/ParallaxView.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: root
-
-    Component {
-        id: cityDelegate
-
-        Item {
-            id: itemInner
-            width: 432
-            height: window.height
-
-            signal present();
-
-            Component.onCompleted: {
-                var component = createComponent(weather + ".qml");
-                var element = component.createObject();
-
-                if (element != 0) {
-                    element.parent = itemInner;
-                    element.cityName = cityName;
-                    element.isDay = !isNight;
-                    element.lowTemperature = lower;
-                    element.highTemperature = upper;
-                    element.currentTemperature = current;
-                }
-            }
-        }
-    }
-
-    ListView {
-        id: list
-        property bool moving: false
-
-        anchors.fill: parent
-        orientation: "Horizontal"
-        currentIndex: window.currentIndex
-
-        onCurrentIndexChanged: {
-            if (!moving && currentItem)
-                currentItem.present();
-        }
-
-        onMovementStarted: {
-            moving = true;
-        }
-
-        onMovementEnded: {
-            moving = false;
-            currentItem.present();
-        }
-
-        model: cityModel
-        delegate: cityDelegate
-
-        snapMode: ListView.SnapOneItem
-        highlightRangeMode: "StrictlyEnforceRange"
-    }
-}
diff --git a/weather-qml/PartlyCloudy.qml b/weather-qml/PartlyCloudy.qml
deleted file mode 100644
index 39a01a8..0000000
--- a/weather-qml/PartlyCloudy.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-import Qt 4.6
-
-ForecastView {
-    id: root
-
-    SmallCloud {
-        id: cloud3
-        x: scaledX(396)
-        y: scaledY(-800)
-        finalY: scaledY(-446);
-        type: isDay ? "cloud" : "cloud_rain"
-    }
-
-    HungItem {
-        id: sun
-        x: isDay ? scaledX(120) : scaledX(220)
-        y: scaledY(-800)
-        itemX: 0
-        itemY:  isDay ? 200 : 180
-        height:  isDay ? 500 : 440
-        finalY: isDay ? scaledY(-198) : scaledY(-205)
-        itemImage: isDay ? "images/sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/sun_line.png" : "images/moon_line.png"
-    }
-
-    MediumCloud {
-        id: cloud2
-        x: scaledX(0)
-        y: scaledY(-800)
-        finalY: scaledY(-307)
-        type: isDay ? "cloud" : "cloud_rain"
-    }
-
-    LargeCloud {
-        id: cloud1
-        x: scaledX(267)
-        y: scaledY(-800)
-        finalY: scaledY(-291)
-        type: isDay ? "cloud" : "cloud_rain"
-    }
-
-    states : State {
-        name: "final"
-        PropertyChanges { target: sun; y: sun.finalY; }
-        PropertyChanges { target: cloud1; y: cloud1.finalY; }
-        PropertyChanges { target: cloud2; y: cloud2.finalY; }
-        PropertyChanges { target: cloud3; y: cloud3.finalY; }
-    }
-
-    transitions: Transition {
-        SequentialAnimation {
-            ParallelAnimation {
-               NumberAnimation { target: cloud1; properties: "y";
-                                 easing.type: "OutBack"; duration: 500 }
-
-               SequentialAnimation {
-                   PauseAnimation { duration: 200 }
-                   NumberAnimation { target: cloud2; properties: "y";
-                                     easing.type: "OutBack"; duration: 500 }
-               }
-
-               SequentialAnimation {
-                   PauseAnimation { duration: 400 }
-                   NumberAnimation { target: cloud3; properties: "y";
-                                     easing.type: "OutBack"; duration: 500 }
-               }
-            }
-
-            NumberAnimation { target: sun; properties: "y";
-                              easing.type: "OutBack"; duration: 500 }
-        }
-    }
-
-    onPresent: { root.state = "final"; }
-}
diff --git a/weather-qml/README.rtf b/weather-qml/README.rtf
deleted file mode 100644
index 2819044..0000000
--- a/weather-qml/README.rtf
+++ /dev/null
@@ -1,7 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww9000\viewh8400\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\f0\fs24 \cf0 Just need to run the "default.qml" file.}
\ No newline at end of file
diff --git a/weather-qml/RainItem.qml b/weather-qml/RainItem.qml
deleted file mode 100644
index 47d9e6f..0000000
--- a/weather-qml/RainItem.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.6
-
-Image {
-    id: rainItem
-    property int frame : 1;
-    property string rainType: "rain";
-
-    source: "images/" + rainType + "_0" + rainItem.frame + ".png"
-
-    frame: NumberAnimation {
-        repeat: true
-        duration: 1100
-        from: 1; to: 5;
-    }
-}
diff --git a/weather-qml/ScrollBar.qml b/weather-qml/ScrollBar.qml
deleted file mode 100644
index 2361c32..0000000
--- a/weather-qml/ScrollBar.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: scrollBar
-
-    property real position
-    property real pageSize
-
-    Rectangle {
-        id: background
-        anchors.fill: parent
-        opacity: 0.3
-        color: "white"
-        radius: (width / 2 - 1)
-    }
-
-    Rectangle {
-        opacity: 0.7
-        color: "black"
-        radius: (width / 2 - 1)
-        x: 1
-        y: Math.min(Math.max(0.0, scrollBar.position),
-                    Math.max(0.0, 1.0 - scrollBar.pageSize)) * (scrollBar.height - 2) + 1
-        width: parent.width - 2
-        height: Math.min(1.0, scrollBar.pageSize) * (scrollBar.height - 2)
-    }
-}
diff --git a/weather-qml/SmallCloud.qml b/weather-qml/SmallCloud.qml
deleted file mode 100644
index 38db715..0000000
--- a/weather-qml/SmallCloud.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.6
-
-HungItem {
-    id: root
-    itemX: 10;
-    itemY: 492;
-
-    property string type: "cloud";
-    itemImage: "images/" + root.type + "_3.png"
-    lineImage: "images/" + root.type + "_3_line.png"
-}
diff --git a/weather-qml/SplashScreen.qml b/weather-qml/SplashScreen.qml
deleted file mode 100644
index bee13c8..0000000
--- a/weather-qml/SplashScreen.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-import Qt 4.6
-
-Item {
-    id: splash
-
-    Image {
-        id: bg
-        source: "images/bg_loading.png"
-        anchors.fill: parent
-    }
-
-    Image {
-        id: bottomMenu
-        source: "images/city_name_background_bigger.png"
-        anchors.bottom: bottomBar.top
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    Throbber {
-        id: "progress"
-        anchors.topMargin: 10
-        anchors.top: infoLabel.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    Text {
-        id: infoLabel
-        text: "Loading"
-        color: "white"
-        font.family: "Nokia Sans"
-        font.pixelSize: 22
-        anchors.top: parent.top
-        anchors.topMargin: parent.height * 0.3
-        anchors.horizontalCenter: parent.horizontalCenter
-        verticalAlignment: "AlignVCenter"
-        horizontalAlignment: "AlignHCenter"
-    }
-
-    Image {
-        id: umbrella
-        source: "images/umbrella.png"
-        anchors.bottom: bottomBar.top
-        anchors.bottomMargin: 20
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    Image {
-        id: bottomBar
-        source: "images/bg_bottom_options.png"
-        anchors.bottom: parent.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-}
diff --git a/weather-qml/Sunny.qml b/weather-qml/Sunny.qml
deleted file mode 100644
index 046ba6d..0000000
--- a/weather-qml/Sunny.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.6
-
-ForecastView {
-    id: root
-
-    HungItem {
-        id: sun
-        x: isDay ? scaledX(120) : scaledX(220)
-        y: scaledY(-800)
-        itemX: 0
-        itemY:  isDay ? 200 : 180
-        height:  isDay ? 500 : 440
-        finalY: isDay ? scaledY(-198) : scaledY(-205)
-        itemImage: isDay ? "images/sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/sun_line.png" : "images/moon_line.png"
-    }
-
-    states : State {
-        name: "final"
-        PropertyChanges { target: sun; y: sun.finalY; }
-    }
-
-    transitions : Transition {
-        SequentialAnimation {
-            NumberAnimation { target: sun; properties: "y";
-                              easing.type: "OutBack"; duration: 500 }
-        }
-    }
-
-    onPresent: root.state = "final"
-}
diff --git a/weather-qml/Throbber.qml b/weather-qml/Throbber.qml
deleted file mode 100644
index 8174c1d..0000000
--- a/weather-qml/Throbber.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.6
-
-Image {
-    id: throbber
-    property int frame : 1;
-
-    source: "images/loading_" + throbber.frame + ".png"
-
-    frame: NumberAnimation {
-        repeat: true
-        duration: 700
-        from: 1; to: 25;
-    }
-}
diff --git a/weather-qml/UnknownForecast.qml b/weather-qml/UnknownForecast.qml
deleted file mode 100644
index 4f86cbe..0000000
--- a/weather-qml/UnknownForecast.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import Qt 4.6
-
-ForecastView {
-    id: root
-    isClear: true
-
-    HungItem {
-        id: question
-        x: scaledX(260)
-        y: scaledY(-800)
-        itemX: 8
-        itemY: 190
-        height: 476
-        finalY: scaledY(-255)
-        itemImage: "images/na_icon.png"
-        lineImage: "images/na_icon_line.png"
-    }
-
-    states : State {
-        name: "final"
-        PropertyChanges { target: question; y: question.finalY; }
-    }
-
-    transitions: Transition {
-        NumberAnimation { target: question; properties: "y";
-                          easing.type: "OutBack"; duration: 500 }
-    }
-
-    onPresent: { root.state = "final"; }
-}
diff --git a/weather-qml/Weather.qmlproject b/weather-qml/Weather.qmlproject
deleted file mode 100644
index 3923c0e..0000000
--- a/weather-qml/Weather.qmlproject
+++ /dev/null
@@ -1,19 +0,0 @@
-// File generated by QtCreator
-
-import QmlProject 1.0
-
-Project {
-    // Scan current directory and subdirectories for .qml, .js, and image files
-    QmlFiles {
-        directory: "."
-        recursive: true
-    }
-    JavaScriptFiles {
-        directory: "."
-        recursive: true
-    }
-    ImageFiles {
-        directory: "."
-        recursive: true
-    }
-}
diff --git a/weather-qml/build/build.pro b/weather-qml/build/build.pro
new file mode 100755
index 0000000..58daaab
--- /dev/null
+++ b/weather-qml/build/build.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+
+QT += network xml declarative
+
+maemo5 || unix {
+    TARGET = ../weatherqml
+    RESOURCES += resource_n900.qrc
+}
+
+symbian {
+    TARGET = Weather
+    LIBS += -lesock -lconnmon -lcone -lavkon
+    ICON += ../icons/weatherqml.svg
+    RESOURCES += resource_s60.qrc
+}
+
+HEADERS += mainwindow.h
+SOURCES += main.cpp mainwindow.cpp
diff --git a/weather-qml/build/main.cpp b/weather-qml/build/main.cpp
new file mode 100755
index 0000000..9e3d7ad
--- /dev/null
+++ b/weather-qml/build/main.cpp
@@ -0,0 +1,19 @@
+#include <QApplication>
+
+#include "mainwindow.h"
+
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    MainWindow view;
+
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+    view.showFullScreen();
+#else
+    view.show();
+#endif
+
+    return app.exec();
+}
diff --git a/weather-qml/build/mainwindow.cpp b/weather-qml/build/mainwindow.cpp
new file mode 100755
index 0000000..9e9659c
--- /dev/null
+++ b/weather-qml/build/mainwindow.cpp
@@ -0,0 +1,49 @@
+#include "mainwindow.h"
+
+#include <QApplication>
+#include <QDeclarativeEngine>
+
+#if defined(Q_OS_SYMBIAN)
+#include <QTimer>
+#include <eikenv.h>
+#include <coemain.h>
+#include <aknappui.h>
+#endif
+
+MainWindow::MainWindow()
+    : QDeclarativeView()
+{
+#if defined(Q_OS_SYMBIAN)
+    QUrl mainqml("qrc:main_s60.qml");
+#else
+    QUrl mainqml("qrc:main_n900.qml");
+#endif
+    setSource(mainqml);
+
+    setWindowTitle("Weather QML");
+
+    connect(engine(), SIGNAL(quit()), qApp, SLOT(quit()));
+
+    m_isPortrait = true;
+
+#if defined(Q_OS_SYMBIAN)
+    QTimer::singleShot(0, this, SLOT(lockViewMode()));
+#elif defined(Q_WS_MAEMO_5)
+    setAttribute(Qt::WA_Maemo5PortraitOrientation, true);
+#endif
+}
+
+#if defined(Q_OS_SYMBIAN)
+void MainWindow::lockViewMode()
+{
+    CAknAppUi *aknAppUi = dynamic_cast<CAknAppUi *>(CEikonEnv::Static()->AppUi());
+
+    if (!aknAppUi)
+      return;
+
+    if (m_isPortrait)
+        aknAppUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait);
+    else
+        aknAppUi->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape);
+}
+#endif
diff --git a/weather-qml/build/mainwindow.h b/weather-qml/build/mainwindow.h
new file mode 100755
index 0000000..8e92912
--- /dev/null
+++ b/weather-qml/build/mainwindow.h
@@ -0,0 +1,22 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QDeclarativeView>
+
+class MainWindow : public QDeclarativeView
+{
+    Q_OBJECT
+
+public:
+    MainWindow();
+
+protected slots:
+#ifdef Q_OS_SYMBIAN
+    void lockViewMode();
+#endif
+
+private:
+    bool m_isPortrait;
+};
+
+#endif
diff --git a/weather-qml/build/resource_n900.qrc b/weather-qml/build/resource_n900.qrc
new file mode 100644
index 0000000..252ff93
--- /dev/null
+++ b/weather-qml/build/resource_n900.qrc
@@ -0,0 +1,137 @@
+<RCC>
+<qresource prefix="/">
+	<file>../content/Throbber.qml</file>
+	<file>../content/SplashScreen.qml</file>
+	<file>../content/CityModel.qml</file>
+	<file>../content/ForecastView.qml</file>
+	<file>../content/WeatherView.qml</file>
+	<file>../content/CityPanel.qml</file>
+	<file>../content/images/n900/cloud_tstorm_2.png</file>
+	<file>../content/images/n900/loading_15.png</file>
+	<file>../content/images/n900/title_bar.png</file>
+	<file>../content/images/n900/bg_night_clear.png</file>
+	<file>../content/images/n900/sun_line.png</file>
+	<file>../content/images/n900/cloud_rain_3_line.png</file>
+	<file>../content/images/n900/snow_flake_08.png</file>
+	<file>../content/images/n900/cloud_2.png</file>
+	<file>../content/images/n900/icon_min.png</file>
+	<file>../content/images/n900/snow_flake_06.png</file>
+	<file>../content/images/n900/cloud_3.png</file>
+	<file>../content/images/n900/thunder.png</file>
+	<file>../content/images/n900/fog.png</file>
+	<file>../content/images/n900/bg_day_rain.png</file>
+	<file>../content/images/n900/bg_loading.png</file>
+	<file>../content/images/n900/star_01.png</file>
+	<file>../content/images/n900/loading_14.png</file>
+	<file>../content/images/n900/moon.png</file>
+	<file>../content/images/n900/snow_flake_07.png</file>
+	<file>../content/images/n900/loading_4.png</file>
+	<file>../content/images/n900/loading_6.png</file>
+	<file>../content/images/n900/bg_bottom_options.png</file>
+	<file>../content/images/n900/snow_flake.png</file>
+	<file>../content/images/n900/cloud_rain_1.png</file>
+	<file>../content/images/n900/cloud_rain_3.png</file>
+	<file>../content/images/n900/rain_01.png</file>
+	<file>../content/images/n900/background_add_city.png</file>
+	<file>../content/images/n900/centigrades.png</file>
+	<file>../content/images/n900/storm_03.png</file>
+	<file>../content/images/n900/scroll.png</file>
+	<file>../content/images/n900/rain_03.png</file>
+	<file>../content/images/n900/snow_flake_02.png</file>
+	<file>../content/images/n900/loading_17.png</file>
+	<file>../content/images/n900/loading_22.png</file>
+	<file>../content/images/n900/haze.png</file>
+	<file>../content/images/n900/cloud_2_line.png</file>
+	<file>../content/images/n900/loading_8.png</file>
+	<file>../content/images/n900/bg_day_clear.png</file>
+	<file>../content/images/n900/cloud_tstorm_2_line.png</file>
+	<file>../content/images/n900/snow_flake_09.png</file>
+	<file>../content/images/n900/snow_flake_05.png</file>
+	<file>../content/images/n900/loading_9.png</file>
+	<file>../content/images/n900/list_item_selected_bg.png</file>
+	<file>../content/images/n900/loading_10.png</file>
+	<file>../content/images/n900/umbrella.png</file>
+	<file>../content/images/n900/list_item_bg.png</file>
+	<file>../content/images/n900/icon_max.png</file>
+	<file>../content/images/n900/list_check.png</file>
+	<file>../content/images/n900/scroll_knob.png</file>
+	<file>../content/images/n900/button_softkey_right.png</file>
+	<file>../content/images/n900/star_02.png</file>
+	<file>../content/images/n900/loading_12.png</file>
+	<file>../content/images/n900/division_line.png</file>
+	<file>../content/images/n900/cloud_rain_2.png</file>
+	<file>../content/images/n900/cloud_storm_3.png</file>
+	<file>../content/images/n900/cloud_storm_2.png</file>
+	<file>../content/images/n900/cloud_rain_1_line.png</file>
+	<file>../content/images/n900/star_03.png</file>
+	<file>../content/images/n900/loading_16.png</file>
+	<file>../content/images/n900/rain_02.png</file>
+	<file>../content/images/n900/sun.png</file>
+	<file>../content/images/n900/storm_02.png</file>
+	<file>../content/images/n900/cloud_tstorm_1_line.png</file>
+	<file>../content/images/n900/storm_05.png</file>
+	<file>../content/images/n900/list_top.png</file>
+	<file>../content/images/n900/loading_20.png</file>
+	<file>../content/images/n900/cloud_1_line.png</file>
+	<file>../content/images/n900/bg_day_heavyrain.png</file>
+	<file>../content/images/n900/storm_01.png</file>
+	<file>../content/images/n900/snow_flake_01.png</file>
+	<file>../content/images/n900/snow_flake_03.png</file>
+	<file>../content/images/n900/cloud_3_line.png</file>
+	<file>../content/images/n900/loading_19.png</file>
+	<file>../content/images/n900/loading_23.png</file>
+	<file>../content/images/n900/cold_sun.png</file>
+	<file>../content/images/n900/moon_line.png</file>
+	<file>../content/images/n900/city_name_background_bigger.png</file>
+	<file>../content/images/n900/loading_11.png</file>
+	<file>../content/images/n900/cloud_storm_2_line.png</file>
+	<file>../content/images/n900/loading_25.png</file>
+	<file>../content/images/n900/storm_04.png</file>
+	<file>../content/images/n900/textfield_add_city.png</file>
+	<file>../content/images/n900/cold_sun_line.png</file>
+	<file>../content/images/n900/loading_1.png</file>
+	<file>../content/images/n900/loading_21.png</file>
+	<file>../content/images/n900/button_softkey_left.png</file>
+	<file>../content/images/n900/loading_13.png</file>
+	<file>../content/images/n900/loading_3.png</file>
+	<file>../content/images/n900/button_close.png</file>
+	<file>../content/images/n900/loading_18.png</file>
+	<file>../content/images/n900/cloud_tstorm_1.png</file>
+	<file>../content/images/n900/city_panel_bg.png</file>
+	<file>../content/images/n900/cloud_storm_3_line.png</file>
+	<file>../content/images/n900/cloud_rain_2_line.png</file>
+	<file>../content/images/n900/loading_5.png</file>
+	<file>../content/images/n900/cloud_storm_1_line.png</file>
+	<file>../content/images/n900/background_error_adding.png</file>
+	<file>../content/images/n900/snow_flake_04.png</file>
+	<file>../content/images/n900/loading_2.png</file>
+	<file>../content/images/n900/minus_sign.png</file>
+	<file>../content/images/n900/button_city_send.png</file>
+	<file>../content/images/n900/cloud_1.png</file>
+	<file>../content/images/n900/loading_7.png</file>
+	<file>../content/images/n900/loading_24.png</file>
+	<file>../content/images/n900/bg_night_rain.png</file>
+	<file>../content/images/n900/button_list_delete.png</file>
+	<file>../content/images/n900/cloud_storm_1.png</file>
+	<file>../content/ScrollBar.qml</file>
+	<file>../content/forecasts/MostlySunny.qml</file>
+	<file>../content/forecasts/elements/MediumCloud.qml</file>
+	<file>../content/forecasts/elements/LargeCloud.qml</file>
+	<file>../content/forecasts/elements/ForecastLabel.qml</file>
+	<file>../content/forecasts/elements/SmallCloud.qml</file>
+	<file>../content/forecasts/elements/HungItem.qml</file>
+	<file>../content/forecasts/elements/RainItem.qml</file>
+	<file>../content/forecasts/Haze.qml</file>
+	<file>../content/forecasts/Mist.qml</file>
+	<file>../content/forecasts/Sunny.qml</file>
+	<file>../content/forecasts/UnknownForecast.qml</file>
+	<file>../content/forecasts/Thunderstorm.qml</file>
+	<file>../content/forecasts/MostlyCloudy.qml</file>
+	<file>../content/forecasts/Rain.qml</file>
+	<file>../content/forecasts/PartlyCloudy.qml</file>
+	<file>../content/forecasts/Cloudy.qml</file>
+	<file>../content/forecasts/Storm.qml</file>
+	<file>../content/forecasts/Fog.qml</file>
+	<file>../main_n900.qml</file>
+</qresource>
+</RCC>
diff --git a/weather-qml/build/resource_s60.qrc b/weather-qml/build/resource_s60.qrc
new file mode 100644
index 0000000..138eabc
--- /dev/null
+++ b/weather-qml/build/resource_s60.qrc
@@ -0,0 +1,129 @@
+<RCC>
+<qresource prefix="/">
+	<file>../content/Throbber.qml</file>
+	<file>../content/SplashScreen.qml</file>
+	<file>../content/CityModel.qml</file>
+	<file>../content/ForecastView.qml</file>
+	<file>../content/WeatherView.qml</file>
+	<file>../content/CityPanel.qml</file>
+	<file>../content/images/s60/cloud_tstorm_2.png</file>
+	<file>../content/images/s60/loading_15.png</file>
+	<file>../content/images/s60/bg_night_clear.png</file>
+	<file>../content/images/s60/sun_line.png</file>
+	<file>../content/images/s60/cloud_rain_3_line.png</file>
+	<file>../content/images/s60/mist_03.png</file>
+	<file>../content/images/s60/cloud_2.png</file>
+	<file>../content/images/s60/icon_min.png</file>
+	<file>../content/images/s60/cloud_3.png</file>
+	<file>../content/images/s60/thunder.png</file>
+	<file>../content/images/s60/fog.png</file>
+	<file>../content/images/s60/bg_day_rain.png</file>
+	<file>../content/images/s60/bg_loading.png</file>
+	<file>../content/images/s60/star_01.png</file>
+	<file>../content/images/s60/loading_14.png</file>
+	<file>../content/images/s60/moon.png</file>
+	<file>../content/images/s60/loading_4.png</file>
+	<file>../content/images/s60/loading_6.png</file>
+	<file>../content/images/s60/na_icon_line.png</file>
+	<file>../content/images/s60/bg_bottom_options.png</file>
+	<file>../content/images/s60/cloud_rain_1.png</file>
+	<file>../content/images/s60/cloud_rain_3.png</file>
+	<file>../content/images/s60/rain_01.png</file>
+	<file>../content/images/s60/centigrades.png</file>
+	<file>../content/images/s60/storm_03.png</file>
+	<file>../content/images/s60/scroll.png</file>
+	<file>../content/images/s60/rain_03.png</file>
+	<file>../content/images/s60/loading_17.png</file>
+	<file>../content/images/s60/loading_22.png</file>
+	<file>../content/images/s60/haze.png</file>
+	<file>../content/images/s60/cloud_2_line.png</file>
+	<file>../content/images/s60/loading_8.png</file>
+	<file>../content/images/s60/bt_options_bg.png</file>
+	<file>../content/images/s60/bg_day_clear.png</file>
+	<file>../content/images/s60/cloud_tstorm_2_line.png</file>
+	<file>../content/images/s60/loading_9.png</file>
+	<file>../content/images/s60/list_item_selected_bg.png</file>
+	<file>../content/images/s60/mist_04.png</file>
+	<file>../content/images/s60/loading_10.png</file>
+	<file>../content/images/s60/umbrella.png</file>
+	<file>../content/images/s60/list_item_bg.png</file>
+	<file>../content/images/s60/icon_max.png</file>
+	<file>../content/images/s60/scroll_knob.png</file>
+	<file>../content/images/s60/na_icon.png</file>
+	<file>../content/images/s60/star_02.png</file>
+	<file>../content/images/s60/loading_12.png</file>
+	<file>../content/images/s60/division_line.png</file>
+	<file>../content/images/s60/cloud_rain_2.png</file>
+	<file>../content/images/s60/cloud_storm_3.png</file>
+	<file>../content/images/s60/cloud_storm_2.png</file>
+	<file>../content/images/s60/cloud_rain_1_line.png</file>
+	<file>../content/images/s60/star_03.png</file>
+	<file>../content/images/s60/loading_16.png</file>
+	<file>../content/images/s60/rain_02.png</file>
+	<file>../content/images/s60/sun.png</file>
+	<file>../content/images/s60/storm_02.png</file>
+	<file>../content/images/s60/cloud_tstorm_1_line.png</file>
+	<file>../content/images/s60/storm_05.png</file>
+	<file>../content/images/s60/list_top.png</file>
+	<file>../content/images/s60/loading_20.png</file>
+	<file>../content/images/s60/cloud_1_line.png</file>
+	<file>../content/images/s60/bg_day_heavyrain.png</file>
+	<file>../content/images/s60/storm_01.png</file>
+	<file>../content/images/s60/cloud_3_line.png</file>
+	<file>../content/images/s60/loading_19.png</file>
+	<file>../content/images/s60/loading_23.png</file>
+	<file>../content/images/s60/cold_sun.png</file>
+	<file>../content/images/s60/moon_line.png</file>
+	<file>../content/images/s60/city_name_background_bigger.png</file>
+	<file>../content/images/s60/list_item_pressed_bg.png</file>
+	<file>../content/images/s60/loading_11.png</file>
+	<file>../content/images/s60/cloud_storm_2_line.png</file>
+	<file>../content/images/s60/loading_25.png</file>
+	<file>../content/images/s60/storm_04.png</file>
+	<file>../content/images/s60/mist_05.png</file>
+	<file>../content/images/s60/cold_sun_line.png</file>
+	<file>../content/images/s60/loading_1.png</file>
+	<file>../content/images/s60/rain_04.png</file>
+	<file>../content/images/s60/loading_21.png</file>
+	<file>../content/images/s60/loading_13.png</file>
+	<file>../content/images/s60/loading_3.png</file>
+	<file>../content/images/s60/mist_01.png</file>
+	<file>../content/images/s60/loading_18.png</file>
+	<file>../content/images/s60/cloud_tstorm_1.png</file>
+	<file>../content/images/s60/city_panel_bg.png</file>
+	<file>../content/images/s60/cloud_storm_3_line.png</file>
+	<file>../content/images/s60/cloud_rain_2_line.png</file>
+	<file>../content/images/s60/loading_5.png</file>
+	<file>../content/images/s60/cloud_storm_1_line.png</file>
+	<file>../content/images/s60/mist_02.png</file>
+	<file>../content/images/s60/rain_05.png</file>
+	<file>../content/images/s60/loading_2.png</file>
+	<file>../content/images/s60/minus_sign.png</file>
+	<file>../content/images/s60/cloud_1.png</file>
+	<file>../content/images/s60/loading_7.png</file>
+	<file>../content/images/s60/loading_24.png</file>
+	<file>../content/images/s60/bg_night_rain.png</file>
+	<file>../content/images/s60/button_list_delete.png</file>
+	<file>../content/images/s60/cloud_storm_1.png</file>
+	<file>../content/ScrollBar.qml</file>
+	<file>../content/forecasts/MostlySunny.qml</file>
+	<file>../content/forecasts/elements/MediumCloud.qml</file>
+	<file>../content/forecasts/elements/LargeCloud.qml</file>
+	<file>../content/forecasts/elements/ForecastLabel.qml</file>
+	<file>../content/forecasts/elements/SmallCloud.qml</file>
+	<file>../content/forecasts/elements/HungItem.qml</file>
+	<file>../content/forecasts/elements/RainItem.qml</file>
+	<file>../content/forecasts/Haze.qml</file>
+	<file>../content/forecasts/Mist.qml</file>
+	<file>../content/forecasts/Sunny.qml</file>
+	<file>../content/forecasts/UnknownForecast.qml</file>
+	<file>../content/forecasts/Thunderstorm.qml</file>
+	<file>../content/forecasts/MostlyCloudy.qml</file>
+	<file>../content/forecasts/Rain.qml</file>
+	<file>../content/forecasts/PartlyCloudy.qml</file>
+	<file>../content/forecasts/Cloudy.qml</file>
+	<file>../content/forecasts/Storm.qml</file>
+	<file>../content/forecasts/Fog.qml</file>
+	<file>../main_s60.qml</file>
+</qresource>
+</RCC>
diff --git a/weather-qml/CityModel.qml b/weather-qml/content/CityModel.qml
index d4760a8..33a06c4 100644..100755
--- a/weather-qml/CityModel.qml
+++ b/weather-qml/content/CityModel.qml
@@ -1,4 +1,45 @@
-import Qt 4.6
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
 
 ListModel {
     ListElement {
diff --git a/weather-qml/CityPanel.qml b/weather-qml/content/CityPanel.qml
index 19b4ef1..4b660e2 100644..100755
--- a/weather-qml/CityPanel.qml
+++ b/weather-qml/content/CityPanel.qml
@@ -1,4 +1,45 @@
-import Qt 4.6
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
 
 Item {
     id: root
@@ -19,7 +60,7 @@ Item {
         id: backPanel
         opacity: 0.0
         y: frontPanel.y
-        source: "images/city_panel_bg.png"
+        source: folder + "city_panel_bg.png"
     }
 
     Rectangle {
@@ -27,16 +68,14 @@ Item {
         x: 0
         y: 36
         width: 360
-        height: 64
         color: "#071217"
         opacity: 0.0
-        anchors.topMargin: -1 // XXX workaround for internal rounding bug
+        anchors.topMargin: -1
         anchors.top: backPanel.bottom
         anchors.left: parent.left
         anchors.right: parent.right
 
-        /// XXX: list item bg
-        height: (80 * Math.min(cityListView.count, 5)) + 17
+        height: (100 * Math.min(cityModel.count, 5) + 23) * scaleFactorY
 
         Component {
             id: cityDelegate
@@ -60,7 +99,7 @@ Item {
 
                 Image {
                     id: background;
-                    source: "images/list_item_bg.png"
+                    source: folder + "list_item_bg.png"
                     MouseArea {
                         anchors.fill: parent
                         onClicked: { root.gotoCity(cityId); }
@@ -88,7 +127,7 @@ Item {
             delegate: cityDelegate
             anchors.fill: cityRect
             anchors.topMargin: -17
-            anchors.bottomMargin: 35
+            anchors.bottomMargin: 50 * scaleFactorY
 
             ScrollBar {
                 id: scroll
@@ -106,7 +145,7 @@ Item {
 
     Image {
         id: frontPanel
-        source: "images/city_name_background_bigger.png"
+        source: folder + "city_name_background_bigger.png"
         anchors.bottom: root.bottom
         MouseArea {
             anchors.fill: frontPanel
@@ -124,7 +163,7 @@ Item {
         PropertyChanges { target: cityListView; opacity: 1.0; }
     }
 
-    transitions: Transition {
+    transitions: [Transition {
         from: ""; to: "final"
         SequentialAnimation {
             ParallelAnimation {
@@ -136,9 +175,9 @@ Item {
             NumberAnimation { target: backPanel; properties: "y"; duration: 250 }
             NumberAnimation { target: cityListView; properties: "opacity"; duration: 200 }
         }
-    }
+    },
 
-    transitions: Transition {
+    Transition {
         from: "final"; to: ""
         SequentialAnimation {
             NumberAnimation { target: cityListView; properties: "opacity"; duration: 200 }
@@ -150,5 +189,5 @@ Item {
                 NumberAnimation { target: cityRect; properties: "opacity"; duration: 300 }
             }
         }
-    }
+   }]
 }
diff --git a/weather-qml/content/ForecastView.qml b/weather-qml/content/ForecastView.qml
new file mode 100755
index 0000000..20077be
--- /dev/null
+++ b/weather-qml/content/ForecastView.qml
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "forecasts/elements"
+
+Item {
+    id: root
+    anchors.fill: parent
+
+    signal present();
+
+    property bool isDay : true;
+    property bool isClear : true;
+    property string cityName;
+    property int lowTemperature;
+    property int highTemperature;
+    property int currentTemperature;
+
+    function scaledX(x) {
+        return x * window.scaleFactorX;
+    }
+
+    function scaledY(y) {
+        return y * window.scaleFactorY + yOffset;
+    }
+
+    Image {
+        id: bg
+        x: root.width / 2 - bg.width / 2
+        source: root.isDay ? (root.isClear ? folder + "bg_day_clear.png" : folder + "bg_day_rain.png")
+                       : (root.isClear ? folder + "bg_night_clear.png" : folder + "bg_night_rain.png");
+    }
+
+    ForecastLabel {
+        id: display1
+        z: 99
+        width: scaledX(320)
+        height: 180
+        anchors.left: parent.left
+        anchors.leftMargin: (128 * window.scaleFactorX) - xOffset
+        anchors.bottomMargin: 106
+        anchors.bottom: parent.bottom
+        currentTemperature: root.currentTemperature
+        lowTemperature: root.lowTemperature
+        highTemperature: root.highTemperature
+    }
+
+    Text {
+        id: cityLabel
+        z: 99
+        text: root.cityName
+        font.family: "Nokia Sans"
+        font.pixelSize: scaledX(50)
+        color: "#ffffff"
+        horizontalAlignment: "AlignHCenter"
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.leftMargin: scaledX(50)
+        anchors.bottomMargin: textOffset
+        anchors.bottom: parent.bottom
+    }
+
+    Connections { target: parent; onPresent: present(); }
+}
diff --git a/weather-qml/content/ScrollBar.qml b/weather-qml/content/ScrollBar.qml
new file mode 100755
index 0000000..34a1bfb
--- /dev/null
+++ b/weather-qml/content/ScrollBar.qml
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Item {
+    id: scrollBar
+
+    property real position
+    property real pageSize
+
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        opacity: 0.3
+        color: "white"
+        radius: (width / 2 - 1)
+    }
+
+    Rectangle {
+        opacity: 0.7
+        color: "black"
+        radius: (width / 2 - 1)
+        x: 1
+        y: Math.min(Math.max(0.0, scrollBar.position),
+                    Math.max(0.0, 1.0 - scrollBar.pageSize)) * (scrollBar.height - 2) + 1
+        width: parent.width - 2
+        height: Math.min(1.0, scrollBar.pageSize) * (scrollBar.height - 2)
+    }
+}
diff --git a/weather-qml/content/SplashScreen.qml b/weather-qml/content/SplashScreen.qml
new file mode 100755
index 0000000..48aa20b
--- /dev/null
+++ b/weather-qml/content/SplashScreen.qml
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Item {
+    id: splash
+
+    Image {
+        id: bg
+        source: folder + "bg_loading.png"
+        anchors.fill: parent
+    }
+
+    Image {
+        id: bottomMenu
+        source: folder + "city_name_background_bigger.png"
+        anchors.bottom: bottomBar.top
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    Throbber {
+        id: "progress"
+        anchors.topMargin: 10
+        anchors.top: infoLabel.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    Text {
+        id: infoLabel
+        text: "Loading"
+        color: "white"
+        font.family: "Nokia Sans"
+        font.pixelSize: 22
+        anchors.top: parent.top
+        anchors.topMargin: parent.height * 0.3
+        anchors.horizontalCenter: parent.horizontalCenter
+        verticalAlignment: "AlignVCenter"
+        horizontalAlignment: "AlignHCenter"
+    }
+
+    Image {
+        id: umbrella
+        source: folder + "umbrella.png"
+        anchors.bottom: bottomBar.top
+        anchors.bottomMargin: 20
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    Image {
+        id: bottomBar
+        source: folder + "bg_bottom_options.png"
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+}
diff --git a/weather-qml/content/Throbber.qml b/weather-qml/content/Throbber.qml
new file mode 100755
index 0000000..a3efbc1
--- /dev/null
+++ b/weather-qml/content/Throbber.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Image {
+    id: throbber
+
+    source: folder + "loading_1.png"
+
+    NumberAnimation on rotation {
+        running: true; from: 0; to: 360; loops: Animation.Infinite; duration: 1200
+    }
+}
diff --git a/weather-qml/content/WeatherView.qml b/weather-qml/content/WeatherView.qml
new file mode 100755
index 0000000..e7650f9
--- /dev/null
+++ b/weather-qml/content/WeatherView.qml
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Item {
+    id: root
+
+    Component {
+        id: cityDelegate
+
+        Item {
+            id: itemInner
+            width: 572 * scaleFactorX
+            height: parent.height
+
+            signal present();
+
+            Component.onCompleted: {
+                var component = Qt.createComponent("forecasts/" + model.weather + ".qml");
+                var element = component.createObject(itemInner);
+
+                if (element != undefined) {
+                    element.cityName = model.cityName;
+                    element.isDay = !model.isNight;
+                    element.lowTemperature = model.lower;
+                    element.highTemperature = model.upper;
+                    element.currentTemperature = model.current;
+                }
+            }
+        }
+    }
+
+    ListView {
+        id: list
+        property bool moving: false
+
+        anchors.fill: parent
+        orientation: "Horizontal"
+        //currentIndex: window.currentIndex
+
+        onCurrentIndexChanged: {
+            if (!moving && list.currentItem)
+                list.currentItem.present();
+        }
+
+        onMovementStarted: {
+            moving = true;
+        }
+
+        onMovementEnded: {
+            moving = false;
+            list.currentItem.present();
+        }
+
+        model: cityModel
+        //cacheBuffer: 1000
+        delegate: cityDelegate
+
+        snapMode: ListView.SnapOneItem
+        highlightRangeMode: "StrictlyEnforceRange"
+    }
+}
diff --git a/weather-qml/Cloudy.qml b/weather-qml/content/forecasts/Cloudy.qml
index 84e6f92..cbf3691 100644..100755
--- a/weather-qml/Cloudy.qml
+++ b/weather-qml/content/forecasts/Cloudy.qml
@@ -1,4 +1,47 @@
-import Qt 4.6
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
 
 ForecastView {
     id: root
@@ -28,8 +71,8 @@ ForecastView {
         itemY:  isDay ? 176 : 180
         height:  isDay ? 460 : 440
         finalY: isDay ? scaledY(-255) : scaledY(-205)
-        itemImage: isDay ? "images/cold_sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/cold_sun_line.png" : "images/moon_line.png"
+        itemImage: isDay ? folder + "cold_sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "cold_sun_line.png" : folder + "moon_line.png"
     }
 
     MediumCloud {
@@ -71,32 +114,27 @@ ForecastView {
             ParallelAnimation {
                NumberAnimation { target: cloud1; properties: "y";
                                  easing.type: "OutBack"; duration: 500 }
-
                SequentialAnimation {
                    PauseAnimation { duration: 200 }
                    NumberAnimation { target: cloud3; properties: "y";
                                      easing.type: "OutBack"; duration: 500 }
                }
-
                SequentialAnimation {
                    PauseAnimation { duration: 400 }
                    NumberAnimation { target: cloud2; properties: "y";
                                      easing.type: "OutBack"; duration: 500 }
                }
-
                SequentialAnimation {
                    PauseAnimation { duration: 600 }
                    NumberAnimation { target: cloud4; properties: "y";
                                      easing.type: "OutBack"; duration: 500 }
                }
-
                SequentialAnimation {
                    PauseAnimation { duration: 600 }
                    NumberAnimation { target: cloud5; properties: "y";
                                      easing.type: "OutBack"; duration: 500 }
                }
             }
-
             NumberAnimation { target: sun; properties: "y";
                               easing.type: "OutBack"; duration: 500 }
         }
diff --git a/weather-qml/content/forecasts/Fog.qml b/weather-qml/content/forecasts/Fog.qml
new file mode 100755
index 0000000..7f9c718
--- /dev/null
+++ b/weather-qml/content/forecasts/Fog.qml
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
+
+ForecastView {
+    id: root
+    isClear: false
+
+    SmallCloud {
+        id: cloud2
+        x: scaledX(308)
+        y: scaledY(-800)
+        finalY: scaledY(-468);
+        type: "cloud_rain"
+    }
+
+    HungItem {
+        id: sun
+        x: isDay ? scaledX(198) : scaledX(220)
+        y: scaledY(-800)
+        itemX: 0
+        itemY:  isDay ? 176 : 180
+        height:  isDay ? 460 : 440
+        finalY: isDay ? scaledY(-255) : scaledY(-205)
+        itemImage: isDay ? folder + "cold_sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "cold_sun_line.png" : folder + "moon_line.png"
+    }
+
+    MediumCloud {
+        id: cloud1
+        x: scaledX(3)
+        y: scaledY(-800)
+        finalY: scaledY(-296)
+        type: "cloud_rain"
+    }
+
+    Image {
+        id: fog
+        x: scaledX(-30)
+        source: "../" + folder + "fog.png"
+    }
+
+    states : State {
+        name: "final"
+        PropertyChanges { target: sun; y: sun.finalY; }
+        PropertyChanges { target: cloud1; y: cloud1.finalY; }
+        PropertyChanges { target: cloud2; y: cloud2.finalY; }
+    }
+
+    transitions: Transition {
+        SequentialAnimation {
+            ParallelAnimation {
+               NumberAnimation { target: cloud1; properties: "y";
+                                 easing.type: "OutBack"; duration: 500 }
+
+               SequentialAnimation {
+                   PauseAnimation { duration: 200 }
+                   NumberAnimation { target: cloud2; properties: "y";
+                                     easing.type: "OutBack"; duration: 500 }
+               }
+            }
+
+            NumberAnimation { target: sun; properties: "y";
+                              easing.type: "OutBack"; duration: 500 }
+        }
+    }
+
+    onPresent: { root.state = "final"; }
+}
diff --git a/weather-qml/content/forecasts/Haze.qml b/weather-qml/content/forecasts/Haze.qml
new file mode 100755
index 0000000..0739896
--- /dev/null
+++ b/weather-qml/content/forecasts/Haze.qml
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
+
+ForecastView {
+    id: root
+    isClear: false
+
+    SmallCloud {
+        id: cloud2
+        x: scaledX(341)
+        y: scaledY(-800)
+        finalY: scaledY(-469);
+        type: "cloud_rain"
+    }
+
+    HungItem {
+        id: sun
+        x: isDay ? scaledX(198) : scaledX(220)
+        y: scaledY(-800)
+        itemX: 0
+        itemY:  isDay ? 176 : 180
+        height:  isDay ? 460 : 440
+        finalY: isDay ? scaledY(-255) : scaledY(-205)
+        itemImage: isDay ? folder + "cold_sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "cold_sun_line.png" : folder + "moon_line.png"
+    }
+
+    MediumCloud {
+        id: cloud1
+        x: scaledX(6)
+        y: scaledY(-800)
+        finalY: scaledY(-296)
+        type: "cloud_rain"
+    }
+
+    Image {
+        id: haze
+        x: scaledX(-30)
+        source: "../" + folder + "haze.png"
+    }
+
+    states : State {
+        name: "final"
+        PropertyChanges { target: sun; y: sun.finalY; }
+        PropertyChanges { target: cloud1; y: cloud1.finalY; }
+        PropertyChanges { target: cloud2; y: cloud2.finalY; }
+    }
+
+    transitions: Transition {
+        SequentialAnimation {
+            ParallelAnimation {
+               NumberAnimation { target: cloud1; properties: "y";
+                                 easing.type: "OutBack"; duration: 500 }
+
+               SequentialAnimation {
+                   PauseAnimation { duration: 200 }
+                   NumberAnimation { target: cloud2; properties: "y";
+                                     easing.type: "OutBack"; duration: 500 }
+               }
+            }
+
+            NumberAnimation { target: sun; properties: "y";
+                              easing.type: "OutBack"; duration: 500 }
+        }
+    }
+
+    onPresent: { root.state = "final"; }
+}
diff --git a/weather-qml/Mist.qml b/weather-qml/content/forecasts/Mist.qml
index d30e604..ad61f12 100644..100755
--- a/weather-qml/Mist.qml
+++ b/weather-qml/content/forecasts/Mist.qml
@@ -1,9 +1,60 @@
-import Qt 4.6
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
 
 ForecastView {
     id: root
     isClear: false
 
+    RainItem {
+        id: rain
+        x: scaledX(30)
+        y: scaledY(300) - yOffset
+        visible: false
+        rainType: "rain"
+    }
+
     SmallCloud {
         id: cloud5
         x: scaledX(297)
@@ -28,8 +79,8 @@ ForecastView {
         itemY:  isDay ? 176 : 180
         height:  isDay ? 460 : 440
         finalY: isDay ? scaledY(-255) : scaledY(-205)
-        itemImage: isDay ? "images/cold_sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/cold_sun_line.png" : "images/moon_line.png"
+        itemImage: isDay ? folder + "cold_sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "cold_sun_line.png" : folder + "moon_line.png"
     }
 
     MediumCloud {
@@ -40,14 +91,6 @@ ForecastView {
         type: "cloud_rain"
     }
 
-    RainItem {
-        id: rain
-        x: scaledX(70)
-        y: scaledY(376)
-        visible: false
-        rainType: "mist"
-    }
-
     LargeCloud {
         id: cloud2
         x: scaledX(315)
diff --git a/weather-qml/MostlyCloudy.qml b/weather-qml/content/forecasts/MostlyCloudy.qml
index 8485f2f..d19ad6a 100644..100755
--- a/weather-qml/MostlyCloudy.qml
+++ b/weather-qml/content/forecasts/MostlyCloudy.qml
@@ -1,4 +1,47 @@
-import Qt 4.6
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
 
 ForecastView {
     id: root
@@ -20,8 +63,8 @@ ForecastView {
         itemY:  isDay ? 176 : 180
         height:  isDay ? 460 : 440
         finalY: isDay ? scaledY(-255) : scaledY(-205)
-        itemImage: isDay ? "images/cold_sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/cold_sun_line.png" : "images/moon_line.png"
+        itemImage: isDay ? folder + "cold_sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "cold_sun_line.png" : folder + "moon_line.png"
     }
 
     MediumCloud {
diff --git a/weather-qml/content/forecasts/MostlySunny.qml b/weather-qml/content/forecasts/MostlySunny.qml
new file mode 100755
index 0000000..e587c7e
--- /dev/null
+++ b/weather-qml/content/forecasts/MostlySunny.qml
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
+
+ForecastView {
+    id: root
+
+    SmallCloud {
+        id: cloud3
+        x: scaledX(-7)
+        y: scaledY(-800)
+        finalY: scaledY(-540);
+        type: isDay ? "cloud" : "cloud_rain"
+    }
+
+    SmallCloud {
+        id: cloud2
+        x: scaledX(399)
+        y: scaledY(-800)
+        finalY: scaledY(-409);
+        type: isDay ? "cloud" : "cloud_rain"
+    }
+
+    HungItem {
+        id: sun
+        x: isDay ? scaledX(120) : scaledX(220)
+        y: scaledY(-800)
+        itemX: 0
+        itemY:  isDay ? 200 : 180
+        height:  isDay ? 500 : 440
+        finalY: isDay ? scaledY(-198) : scaledY(-205)
+        itemImage: isDay ? folder + "sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "sun_line.png" : folder + "moon_line.png"
+    }
+
+    MediumCloud {
+        id: cloud1
+        x: scaledX(-20)
+        y: scaledY(-800)
+        finalY: scaledY(-218)
+        type: isDay ? "cloud" : "cloud_rain"
+    }
+
+    states : State {
+        name: "final"
+        PropertyChanges { target: sun; y: sun.finalY; }
+        PropertyChanges { target: cloud1; y: cloud1.finalY; }
+        PropertyChanges { target: cloud2; y: cloud2.finalY; }
+        PropertyChanges { target: cloud3; y: cloud3.finalY; }
+    }
+
+    transitions: Transition {
+        SequentialAnimation {
+            ParallelAnimation {
+               NumberAnimation { target: cloud1; properties: "y";
+                                 easing.type: "OutBack"; duration: 500 }
+
+               SequentialAnimation {
+                   PauseAnimation { duration: 200 }
+                   NumberAnimation { target: cloud2; properties: "y";
+                                     easing.type: "OutBack"; duration: 500 }
+               }
+
+               SequentialAnimation {
+                   PauseAnimation { duration: 400 }
+                   NumberAnimation { target: cloud3; properties: "y";
+                                     easing.type: "OutBack"; duration: 500 }
+               }
+            }
+
+            NumberAnimation { target: sun; properties: "y";
+                              easing.type: "OutBack"; duration: 500 }
+        }
+    }
+
+    onPresent: { root.state = "final"; }
+}
diff --git a/weather-qml/content/forecasts/PartlyCloudy.qml b/weather-qml/content/forecasts/PartlyCloudy.qml
new file mode 100755
index 0000000..fabc19f
--- /dev/null
+++ b/weather-qml/content/forecasts/PartlyCloudy.qml
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
+
+ForecastView {
+    id: root
+
+    SmallCloud {
+        id: cloud3
+        x: scaledX(396)
+        y: scaledY(-800)
+        finalY: scaledY(-446);
+        type: isDay ? "cloud" : "cloud_rain"
+    }
+
+    HungItem {
+        id: sun
+        x: isDay ? scaledX(120) : scaledX(220)
+        y: scaledY(-800)
+        itemX: 0
+        itemY:  isDay ? 200 : 180
+        height:  isDay ? 500 : 440
+        finalY: isDay ? scaledY(-198) : scaledY(-205)
+        itemImage: isDay ? folder + "sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "sun_line.png" : folder + "moon_line.png"
+    }
+
+    MediumCloud {
+        id: cloud2
+        x: scaledX(0)
+        y: scaledY(-800)
+        finalY: scaledY(-307)
+        type: isDay ? "cloud" : "cloud_rain"
+    }
+
+    LargeCloud {
+        id: cloud1
+        x: scaledX(267)
+        y: scaledY(-800)
+        finalY: scaledY(-291)
+        type: isDay ? "cloud" : "cloud_rain"
+    }
+
+    states : State {
+        name: "final"
+        PropertyChanges { target: sun; y: sun.finalY; }
+        PropertyChanges { target: cloud1; y: cloud1.finalY; }
+        PropertyChanges { target: cloud2; y: cloud2.finalY; }
+        PropertyChanges { target: cloud3; y: cloud3.finalY; }
+    }
+
+    transitions: Transition {
+        SequentialAnimation {
+            ParallelAnimation {
+               NumberAnimation { target: cloud1; properties: "y";
+                                 easing.type: "OutBack"; duration: 500 }
+
+               SequentialAnimation {
+                   PauseAnimation { duration: 200 }
+                   NumberAnimation { target: cloud2; properties: "y";
+                                     easing.type: "OutBack"; duration: 500 }
+               }
+
+               SequentialAnimation {
+                   PauseAnimation { duration: 400 }
+                   NumberAnimation { target: cloud3; properties: "y";
+                                     easing.type: "OutBack"; duration: 500 }
+               }
+            }
+
+            NumberAnimation { target: sun; properties: "y";
+                              easing.type: "OutBack"; duration: 500 }
+        }
+    }
+
+    onPresent: { root.state = "final"; }
+}
diff --git a/weather-qml/Rain.qml b/weather-qml/content/forecasts/Rain.qml
index 1774b2b..bd5f92a 100644..100755
--- a/weather-qml/Rain.qml
+++ b/weather-qml/content/forecasts/Rain.qml
@@ -1,9 +1,60 @@
-import Qt 4.6
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
 
 ForecastView {
     id: root
     isClear: false
 
+    RainItem {
+        id: rain
+        x: scaledX(30)
+        y: scaledY(300) - yOffset
+        visible: false
+        rainType: "rain"
+    }
+
     SmallCloud {
         id: cloud5
         x: scaledX(300)
@@ -20,8 +71,8 @@ ForecastView {
         itemY:  isDay ? 176 : 180
         height:  isDay ? 460 : 440
         finalY: isDay ? scaledY(-255) : scaledY(-205)
-        itemImage: isDay ? "images/cold_sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/cold_sun_line.png" : "images/moon_line.png"
+        itemImage: isDay ? folder + "cold_sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "cold_sun_line.png" : folder + "moon_line.png"
     }
 
     MediumCloud {
@@ -40,14 +91,6 @@ ForecastView {
         type: "cloud_rain"
     }
 
-    RainItem {
-        id: rain
-        x: scaledX(70)
-        y: scaledY(376)
-        visible: false
-        rainType: "rain"
-    }
-
     LargeCloud {
         id: cloud2
         x: scaledX(186)
diff --git a/weather-qml/Storm.qml b/weather-qml/content/forecasts/Storm.qml
index d92de47..f139a00 100644..100755
--- a/weather-qml/Storm.qml
+++ b/weather-qml/content/forecasts/Storm.qml
@@ -1,9 +1,60 @@
-import Qt 4.6
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
 
 ForecastView {
     id: root
     isClear: false
 
+    RainItem {
+        id: rain
+        x: scaledX(30)
+        y: scaledY(300) - yOffset
+        visible: false
+        rainType: "storm"
+    }
+
     SmallCloud {
         id: cloud5
         x: scaledX(280)
@@ -28,8 +79,8 @@ ForecastView {
         itemY:  isDay ? 176 : 180
         height:  isDay ? 460 : 440
         finalY: isDay ? scaledY(-255) : scaledY(-205)
-        itemImage: isDay ? "images/cold_sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/cold_sun_line.png" : "images/moon_line.png"
+        itemImage: isDay ? folder + "cold_sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "cold_sun_line.png" : folder + "moon_line.png"
     }
 
     MediumCloud {
@@ -48,14 +99,6 @@ ForecastView {
         type: "cloud_storm"
     }
 
-    RainItem {
-        id: rain
-        x: scaledX(70)
-        y: scaledY(376)
-        visible: false
-        rainType: "storm"
-    }
-
     LargeCloud {
         id: cloud1
         x: scaledX(202)
diff --git a/weather-qml/content/forecasts/Sunny.qml b/weather-qml/content/forecasts/Sunny.qml
new file mode 100755
index 0000000..319856f
--- /dev/null
+++ b/weather-qml/content/forecasts/Sunny.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
+
+ForecastView {
+    id: root
+
+    HungItem {
+        id: sun
+        x: isDay ? scaledX(120) : scaledX(220)
+        y: scaledY(-800)
+        itemX: 0
+        itemY:  isDay ? 200 : 180
+        height:  isDay ? 500 : 440
+        finalY: isDay ? scaledY(-198) : scaledY(-205)
+        itemImage: isDay ? folder + "sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "sun_line.png" : folder + "moon_line.png"
+    }
+
+    states : State {
+        name: "final"
+        PropertyChanges { target: sun; y: sun.finalY; }
+    }
+
+    transitions : Transition {
+        SequentialAnimation {
+            NumberAnimation { target: sun; properties: "y";
+                              easing.type: "OutBack"; duration: 500 }
+        }
+    }
+
+    onPresent: root.state = "final"
+}
diff --git a/weather-qml/Thunderstorm.qml b/weather-qml/content/forecasts/Thunderstorm.qml
index 094c23c..f075907 100644..100755
--- a/weather-qml/Thunderstorm.qml
+++ b/weather-qml/content/forecasts/Thunderstorm.qml
@@ -1,9 +1,60 @@
-import Qt 4.6
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
 
 ForecastView {
     id: root
     isClear: false
 
+    RainItem {
+        id: rain
+        x: scaledX(30)
+        y: scaledY(300) - yOffset
+        visible: false
+        rainType: "storm"
+    }
+
     SmallCloud {
         id: cloud5
         x: scaledX(56)
@@ -28,8 +79,8 @@ ForecastView {
         itemY:  isDay ? 176 : 180
         height:  isDay ? 460 : 440
         finalY: isDay ? scaledY(-255) : scaledY(-205)
-        itemImage: isDay ? "images/cold_sun.png" : "images/moon.png"
-        lineImage: isDay ? "images/cold_sun_line.png" : "images/moon_line.png"
+        itemImage: isDay ? folder + "cold_sun.png" : folder + "moon.png"
+        lineImage: isDay ? folder + "cold_sun_line.png" : folder + "moon_line.png"
     }
 
     MediumCloud {
@@ -48,14 +99,6 @@ ForecastView {
         type: "cloud_storm"
     }
 
-    RainItem {
-        id: rain
-        x: scaledX(70)
-        y: scaledY(376)
-        visible: false
-        rainType: "storm"
-    }
-
     LargeCloud {
         id: cloud1
         x: scaledX(249)
diff --git a/weather-qml/content/forecasts/UnknownForecast.qml b/weather-qml/content/forecasts/UnknownForecast.qml
new file mode 100755
index 0000000..084095a
--- /dev/null
+++ b/weather-qml/content/forecasts/UnknownForecast.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "elements"
+import "../"
+
+ForecastView {
+    id: root
+    isClear: true
+
+    HungItem {
+        id: question
+        x: scaledX(260)
+        y: scaledY(-800)
+        itemX: 8
+        itemY: 190
+        height: 476
+        finalY: scaledY(-255)
+        itemImage: folder + "na_icon.png"
+        lineImage: folder + "na_icon_line.png"
+    }
+
+    states : State {
+        name: "final"
+        PropertyChanges { target: question; y: question.finalY; }
+    }
+
+    transitions: Transition {
+        NumberAnimation { target: question; properties: "y";
+                          easing.type: "OutBack"; duration: 500 }
+    }
+
+    onPresent: { root.state = "final"; }
+}
diff --git a/weather-qml/content/forecasts/elements/ForecastLabel.qml b/weather-qml/content/forecasts/elements/ForecastLabel.qml
new file mode 100755
index 0000000..64dc9be
--- /dev/null
+++ b/weather-qml/content/forecasts/elements/ForecastLabel.qml
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Item {
+    id: root
+
+    property string lowTemperature
+    property string highTemperature
+    property string currentTemperature
+    property string folder: "../../" + window.folder
+
+    Row {
+        anchors.bottomMargin: 58
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: line.horizontalCenter
+
+        Text {
+            id: temperatureText
+            text: currentTemperature
+            font.family: "Nokia Sans"
+            font.pixelSize: 170 * scaleFactorX
+            font.bold: true
+            color: "white"
+        }
+
+        Image {
+            source: folder + "centigrades.png"
+            anchors.bottom: temperatureText.bottom
+            anchors.bottomMargin: 34 * scaleFactorX
+        }
+    }
+
+    Image {
+        id: line
+        source: folder + "division_line.png"
+        anchors.top: parent.top
+        anchors.topMargin: 104
+        anchors.left: parent.left
+        anchors.leftMargin: 50 * scaleFactorX
+    }
+
+    Row {
+        anchors.left: line.left
+        anchors.top: line.bottom
+
+        Image {
+            source: folder + "icon_max.png"
+            anchors.bottom: highTempText.bottom
+            anchors.bottomMargin: 10 * scaleFactorX
+        }
+
+        Text {
+            id: highTempText
+            text: highTemperature + "°C"
+            font.family: "Nokia Sans"
+            font.pixelSize: 40 * scaleFactorX
+            color: "white"
+            opacity: 0.7
+        }
+    }
+
+    Row {
+        anchors.right: line.right
+        anchors.top: line.bottom
+
+        Image {
+            source: folder + "icon_min.png"
+            anchors.bottom: lowTempText.bottom
+            anchors.bottomMargin: 10 * scaleFactorX
+        }
+
+        Text {
+            id: lowTempText
+            text: lowTemperature + "°C"
+            font.family: "Nokia Sans"
+            font.pixelSize: 40 * scaleFactorX
+            color: "white"
+            opacity: 0.7
+        }
+    }
+}
diff --git a/weather-qml/content/forecasts/elements/HungItem.qml b/weather-qml/content/forecasts/elements/HungItem.qml
new file mode 100755
index 0000000..fff6b67
--- /dev/null
+++ b/weather-qml/content/forecasts/elements/HungItem.qml
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Item {
+    id: root
+
+    property real itemX
+    property real itemY
+    property real finalY
+    property string lineImage
+    property string itemImage
+    property string folder: "../../" + window.folder
+
+    width: item.width
+    height: itemY + item.height
+
+    Image {
+        id: line
+        source: root.lineImage
+        anchors.horizontalCenter: root.horizontalCenter
+    }
+
+    Image {
+        id: item
+        x: root.itemX
+        y: root.itemY
+        source: root.itemImage
+        anchors.bottom: parent.bottom
+    }
+}
diff --git a/weather-qml/content/forecasts/elements/LargeCloud.qml b/weather-qml/content/forecasts/elements/LargeCloud.qml
new file mode 100755
index 0000000..f0d68a9
--- /dev/null
+++ b/weather-qml/content/forecasts/elements/LargeCloud.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+HungItem {
+    id: root
+    itemX: 15;
+    itemY: 420;
+
+    property string type: "cloud";
+    itemImage: folder + root.type + "_1.png"
+    lineImage: folder + root.type + "_1_line.png"
+}
diff --git a/weather-qml/content/forecasts/elements/MediumCloud.qml b/weather-qml/content/forecasts/elements/MediumCloud.qml
new file mode 100755
index 0000000..1e477a6
--- /dev/null
+++ b/weather-qml/content/forecasts/elements/MediumCloud.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+HungItem {
+    id: root
+    itemX: 13;
+    itemY: 420;
+
+    property string type: "cloud";
+    itemImage: folder + root.type + "_2.png"
+    lineImage: folder + root.type + "_2_line.png"
+}
diff --git a/weather-qml/content/forecasts/elements/RainItem.qml b/weather-qml/content/forecasts/elements/RainItem.qml
new file mode 100755
index 0000000..344f641
--- /dev/null
+++ b/weather-qml/content/forecasts/elements/RainItem.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Image {
+    id: rainItem
+    property int frame : 1;
+    property int frameControl : 1;
+
+    property string rainType: "rain";
+
+    source: "../../" + folder + rainType + "_0" + rainItem.frame + ".png"
+
+    SequentialAnimation {
+        id: rainAnim
+        loops: Animation.Infinite
+        PauseAnimation {
+            duration: 200
+        }
+
+        ScriptAction {
+            script: {
+                rainItem.frameControl++
+                if(rainItem.frameControl > 3)
+                  rainItem.frameControl = 1
+
+                rainItem.frame = rainItem.frameControl
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        //rainAnim.running = true
+    }
+}
diff --git a/weather-qml/content/forecasts/elements/SmallCloud.qml b/weather-qml/content/forecasts/elements/SmallCloud.qml
new file mode 100755
index 0000000..f2397c5
--- /dev/null
+++ b/weather-qml/content/forecasts/elements/SmallCloud.qml
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+
+HungItem {
+    id: root
+    itemX: 10;
+    itemY: 492;
+
+    property string type: "cloud";
+    itemImage: folder + root.type + "_3.png"
+    lineImage: folder + root.type + "_3_line.png"
+}
diff --git a/weather-qml/content/images/n900/background_add_city.png b/weather-qml/content/images/n900/background_add_city.png
new file mode 100755
index 0000000..ec8d8a6
--- /dev/null
+++ b/weather-qml/content/images/n900/background_add_city.png
diff --git a/weather-qml/content/images/n900/background_error_adding.png b/weather-qml/content/images/n900/background_error_adding.png
new file mode 100755
index 0000000..9b8cb97
--- /dev/null
+++ b/weather-qml/content/images/n900/background_error_adding.png
diff --git a/weather-qml/content/images/n900/bg_bottom_options.png b/weather-qml/content/images/n900/bg_bottom_options.png
new file mode 100755
index 0000000..34d5e40
--- /dev/null
+++ b/weather-qml/content/images/n900/bg_bottom_options.png
diff --git a/weather-qml/content/images/n900/bg_day_clear.png b/weather-qml/content/images/n900/bg_day_clear.png
new file mode 100755
index 0000000..cee5ce4
--- /dev/null
+++ b/weather-qml/content/images/n900/bg_day_clear.png
diff --git a/weather-qml/content/images/n900/bg_day_heavyrain.png b/weather-qml/content/images/n900/bg_day_heavyrain.png
new file mode 100755
index 0000000..1cf9122
--- /dev/null
+++ b/weather-qml/content/images/n900/bg_day_heavyrain.png
diff --git a/weather-qml/content/images/n900/bg_day_rain.png b/weather-qml/content/images/n900/bg_day_rain.png
new file mode 100755
index 0000000..48052c5
--- /dev/null
+++ b/weather-qml/content/images/n900/bg_day_rain.png
diff --git a/weather-qml/content/images/n900/bg_loading.png b/weather-qml/content/images/n900/bg_loading.png
new file mode 100755
index 0000000..aa3c1ed
--- /dev/null
+++ b/weather-qml/content/images/n900/bg_loading.png
diff --git a/weather-qml/content/images/n900/bg_night_clear.png b/weather-qml/content/images/n900/bg_night_clear.png
new file mode 100755
index 0000000..a30a1a7
--- /dev/null
+++ b/weather-qml/content/images/n900/bg_night_clear.png
diff --git a/weather-qml/content/images/n900/bg_night_rain.png b/weather-qml/content/images/n900/bg_night_rain.png
new file mode 100755
index 0000000..f2ae59b
--- /dev/null
+++ b/weather-qml/content/images/n900/bg_night_rain.png
diff --git a/weather-qml/content/images/n900/button_city_send.png b/weather-qml/content/images/n900/button_city_send.png
new file mode 100755
index 0000000..124f299
--- /dev/null
+++ b/weather-qml/content/images/n900/button_city_send.png
diff --git a/weather-qml/content/images/n900/button_close.png b/weather-qml/content/images/n900/button_close.png
new file mode 100755
index 0000000..d1e935a
--- /dev/null
+++ b/weather-qml/content/images/n900/button_close.png
diff --git a/weather-qml/content/images/n900/button_list_delete.png b/weather-qml/content/images/n900/button_list_delete.png
new file mode 100755
index 0000000..17210c0
--- /dev/null
+++ b/weather-qml/content/images/n900/button_list_delete.png
diff --git a/weather-qml/content/images/n900/button_softkey_left.png b/weather-qml/content/images/n900/button_softkey_left.png
new file mode 100755
index 0000000..56f1d26
--- /dev/null
+++ b/weather-qml/content/images/n900/button_softkey_left.png
diff --git a/weather-qml/content/images/n900/button_softkey_right.png b/weather-qml/content/images/n900/button_softkey_right.png
new file mode 100755
index 0000000..c6cb619
--- /dev/null
+++ b/weather-qml/content/images/n900/button_softkey_right.png
diff --git a/weather-qml/content/images/n900/centigrades.png b/weather-qml/content/images/n900/centigrades.png
new file mode 100755
index 0000000..e9ac387
--- /dev/null
+++ b/weather-qml/content/images/n900/centigrades.png
diff --git a/weather-qml/content/images/n900/city_name_background_bigger.png b/weather-qml/content/images/n900/city_name_background_bigger.png
new file mode 100755
index 0000000..60c68cc
--- /dev/null
+++ b/weather-qml/content/images/n900/city_name_background_bigger.png
diff --git a/weather-qml/content/images/n900/city_panel_bg.png b/weather-qml/content/images/n900/city_panel_bg.png
new file mode 100755
index 0000000..c7cd1d6
--- /dev/null
+++ b/weather-qml/content/images/n900/city_panel_bg.png
diff --git a/weather-qml/content/images/n900/cloud_1.png b/weather-qml/content/images/n900/cloud_1.png
new file mode 100755
index 0000000..ed8f1c8
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_1.png
diff --git a/weather-qml/images/cloud_1_line.png b/weather-qml/content/images/n900/cloud_1_line.png
index 8a4b090..8a4b090 100644..100755
--- a/weather-qml/images/cloud_1_line.png
+++ b/weather-qml/content/images/n900/cloud_1_line.png
diff --git a/weather-qml/content/images/n900/cloud_2.png b/weather-qml/content/images/n900/cloud_2.png
new file mode 100755
index 0000000..981bbd2
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_2.png
diff --git a/weather-qml/images/cloud_2_line.png b/weather-qml/content/images/n900/cloud_2_line.png
index b9b8ca3..b9b8ca3 100644..100755
--- a/weather-qml/images/cloud_2_line.png
+++ b/weather-qml/content/images/n900/cloud_2_line.png
diff --git a/weather-qml/content/images/n900/cloud_3.png b/weather-qml/content/images/n900/cloud_3.png
new file mode 100755
index 0000000..ea9faa2
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_3.png
diff --git a/weather-qml/images/cloud_3_line.png b/weather-qml/content/images/n900/cloud_3_line.png
index 0486741..0486741 100644..100755
--- a/weather-qml/images/cloud_3_line.png
+++ b/weather-qml/content/images/n900/cloud_3_line.png
diff --git a/weather-qml/content/images/n900/cloud_rain_1.png b/weather-qml/content/images/n900/cloud_rain_1.png
new file mode 100755
index 0000000..7ae8b71
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_rain_1.png
diff --git a/weather-qml/images/cloud_rain_1_line.png b/weather-qml/content/images/n900/cloud_rain_1_line.png
index 204207b..204207b 100644..100755
--- a/weather-qml/images/cloud_rain_1_line.png
+++ b/weather-qml/content/images/n900/cloud_rain_1_line.png
diff --git a/weather-qml/content/images/n900/cloud_rain_2.png b/weather-qml/content/images/n900/cloud_rain_2.png
new file mode 100755
index 0000000..b0812a3
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_rain_2.png
diff --git a/weather-qml/images/cloud_rain_2_line.png b/weather-qml/content/images/n900/cloud_rain_2_line.png
index ddef2d4..ddef2d4 100644..100755
--- a/weather-qml/images/cloud_rain_2_line.png
+++ b/weather-qml/content/images/n900/cloud_rain_2_line.png
diff --git a/weather-qml/content/images/n900/cloud_rain_3.png b/weather-qml/content/images/n900/cloud_rain_3.png
new file mode 100755
index 0000000..5f2a442
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_rain_3.png
diff --git a/weather-qml/images/cloud_rain_3_line.png b/weather-qml/content/images/n900/cloud_rain_3_line.png
index 862f631..862f631 100644..100755
--- a/weather-qml/images/cloud_rain_3_line.png
+++ b/weather-qml/content/images/n900/cloud_rain_3_line.png
diff --git a/weather-qml/content/images/n900/cloud_storm_1.png b/weather-qml/content/images/n900/cloud_storm_1.png
new file mode 100755
index 0000000..147656f
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_storm_1.png
diff --git a/weather-qml/images/cloud_storm_1_line.png b/weather-qml/content/images/n900/cloud_storm_1_line.png
index 013a082..013a082 100644..100755
--- a/weather-qml/images/cloud_storm_1_line.png
+++ b/weather-qml/content/images/n900/cloud_storm_1_line.png
diff --git a/weather-qml/content/images/n900/cloud_storm_2.png b/weather-qml/content/images/n900/cloud_storm_2.png
new file mode 100755
index 0000000..2f02fa7
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_storm_2.png
diff --git a/weather-qml/images/cloud_storm_2_line.png b/weather-qml/content/images/n900/cloud_storm_2_line.png
index 51b38b1..51b38b1 100644..100755
--- a/weather-qml/images/cloud_storm_2_line.png
+++ b/weather-qml/content/images/n900/cloud_storm_2_line.png
diff --git a/weather-qml/content/images/n900/cloud_storm_3.png b/weather-qml/content/images/n900/cloud_storm_3.png
new file mode 100755
index 0000000..3bc4f02
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_storm_3.png
diff --git a/weather-qml/images/cloud_storm_3_line.png b/weather-qml/content/images/n900/cloud_storm_3_line.png
index ad52b91..ad52b91 100644..100755
--- a/weather-qml/images/cloud_storm_3_line.png
+++ b/weather-qml/content/images/n900/cloud_storm_3_line.png
diff --git a/weather-qml/content/images/n900/cloud_tstorm_1.png b/weather-qml/content/images/n900/cloud_tstorm_1.png
new file mode 100755
index 0000000..4de4bc8
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_tstorm_1.png
diff --git a/weather-qml/images/cloud_tstorm_1_line.png b/weather-qml/content/images/n900/cloud_tstorm_1_line.png
index 013a082..013a082 100644..100755
--- a/weather-qml/images/cloud_tstorm_1_line.png
+++ b/weather-qml/content/images/n900/cloud_tstorm_1_line.png
diff --git a/weather-qml/content/images/n900/cloud_tstorm_2.png b/weather-qml/content/images/n900/cloud_tstorm_2.png
new file mode 100755
index 0000000..e3e60c7
--- /dev/null
+++ b/weather-qml/content/images/n900/cloud_tstorm_2.png
diff --git a/weather-qml/images/cloud_tstorm_2_line.png b/weather-qml/content/images/n900/cloud_tstorm_2_line.png
index 51b38b1..51b38b1 100644..100755
--- a/weather-qml/images/cloud_tstorm_2_line.png
+++ b/weather-qml/content/images/n900/cloud_tstorm_2_line.png
diff --git a/weather-qml/content/images/n900/cold_sun.png b/weather-qml/content/images/n900/cold_sun.png
new file mode 100755
index 0000000..1493215
--- /dev/null
+++ b/weather-qml/content/images/n900/cold_sun.png
diff --git a/weather-qml/images/cold_sun_line.png b/weather-qml/content/images/n900/cold_sun_line.png
index f51062b..f51062b 100644..100755
--- a/weather-qml/images/cold_sun_line.png
+++ b/weather-qml/content/images/n900/cold_sun_line.png
diff --git a/weather-qml/images/division_line.png b/weather-qml/content/images/n900/division_line.png
index 896c69c..896c69c 100644..100755
--- a/weather-qml/images/division_line.png
+++ b/weather-qml/content/images/n900/division_line.png
diff --git a/weather-qml/content/images/n900/fog.png b/weather-qml/content/images/n900/fog.png
new file mode 100755
index 0000000..1f95acf
--- /dev/null
+++ b/weather-qml/content/images/n900/fog.png
diff --git a/weather-qml/content/images/n900/haze.png b/weather-qml/content/images/n900/haze.png
new file mode 100755
index 0000000..2f53bd0
--- /dev/null
+++ b/weather-qml/content/images/n900/haze.png
diff --git a/weather-qml/content/images/n900/icon_max.png b/weather-qml/content/images/n900/icon_max.png
new file mode 100755
index 0000000..6228c74
--- /dev/null
+++ b/weather-qml/content/images/n900/icon_max.png
diff --git a/weather-qml/content/images/n900/icon_min.png b/weather-qml/content/images/n900/icon_min.png
new file mode 100755
index 0000000..919bf67
--- /dev/null
+++ b/weather-qml/content/images/n900/icon_min.png
diff --git a/weather-qml/content/images/n900/list_check.png b/weather-qml/content/images/n900/list_check.png
new file mode 100755
index 0000000..5abbceb
--- /dev/null
+++ b/weather-qml/content/images/n900/list_check.png
diff --git a/weather-qml/content/images/n900/list_item_bg.png b/weather-qml/content/images/n900/list_item_bg.png
new file mode 100755
index 0000000..79f4bc0
--- /dev/null
+++ b/weather-qml/content/images/n900/list_item_bg.png
diff --git a/weather-qml/content/images/n900/list_item_selected_bg.png b/weather-qml/content/images/n900/list_item_selected_bg.png
new file mode 100755
index 0000000..24ad847
--- /dev/null
+++ b/weather-qml/content/images/n900/list_item_selected_bg.png
diff --git a/weather-qml/content/images/n900/list_top.png b/weather-qml/content/images/n900/list_top.png
new file mode 100755
index 0000000..faa8e97
--- /dev/null
+++ b/weather-qml/content/images/n900/list_top.png
diff --git a/weather-qml/content/images/n900/loading_1.png b/weather-qml/content/images/n900/loading_1.png
new file mode 100755
index 0000000..446d187
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_1.png
diff --git a/weather-qml/content/images/n900/loading_10.png b/weather-qml/content/images/n900/loading_10.png
new file mode 100755
index 0000000..15f4e74
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_10.png
diff --git a/weather-qml/content/images/n900/loading_11.png b/weather-qml/content/images/n900/loading_11.png
new file mode 100755
index 0000000..a2913d5
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_11.png
diff --git a/weather-qml/content/images/n900/loading_12.png b/weather-qml/content/images/n900/loading_12.png
new file mode 100755
index 0000000..9e49661
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_12.png
diff --git a/weather-qml/content/images/n900/loading_13.png b/weather-qml/content/images/n900/loading_13.png
new file mode 100755
index 0000000..d8e9ae3
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_13.png
diff --git a/weather-qml/content/images/n900/loading_14.png b/weather-qml/content/images/n900/loading_14.png
new file mode 100755
index 0000000..8204828
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_14.png
diff --git a/weather-qml/content/images/n900/loading_15.png b/weather-qml/content/images/n900/loading_15.png
new file mode 100755
index 0000000..bcbf674
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_15.png
diff --git a/weather-qml/content/images/n900/loading_16.png b/weather-qml/content/images/n900/loading_16.png
new file mode 100755
index 0000000..fcc2c1b
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_16.png
diff --git a/weather-qml/content/images/n900/loading_17.png b/weather-qml/content/images/n900/loading_17.png
new file mode 100755
index 0000000..6648e66
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_17.png
diff --git a/weather-qml/content/images/n900/loading_18.png b/weather-qml/content/images/n900/loading_18.png
new file mode 100755
index 0000000..19ab609
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_18.png
diff --git a/weather-qml/content/images/n900/loading_19.png b/weather-qml/content/images/n900/loading_19.png
new file mode 100755
index 0000000..54a16a3
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_19.png
diff --git a/weather-qml/content/images/n900/loading_2.png b/weather-qml/content/images/n900/loading_2.png
new file mode 100755
index 0000000..9957967
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_2.png
diff --git a/weather-qml/content/images/n900/loading_20.png b/weather-qml/content/images/n900/loading_20.png
new file mode 100755
index 0000000..fd0a7ba
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_20.png
diff --git a/weather-qml/content/images/n900/loading_21.png b/weather-qml/content/images/n900/loading_21.png
new file mode 100755
index 0000000..c8ba99b
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_21.png
diff --git a/weather-qml/content/images/n900/loading_22.png b/weather-qml/content/images/n900/loading_22.png
new file mode 100755
index 0000000..a95cc75
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_22.png
diff --git a/weather-qml/content/images/n900/loading_23.png b/weather-qml/content/images/n900/loading_23.png
new file mode 100755
index 0000000..2c17a33
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_23.png
diff --git a/weather-qml/content/images/n900/loading_24.png b/weather-qml/content/images/n900/loading_24.png
new file mode 100755
index 0000000..23f0562
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_24.png
diff --git a/weather-qml/content/images/n900/loading_25.png b/weather-qml/content/images/n900/loading_25.png
new file mode 100755
index 0000000..3011252
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_25.png
diff --git a/weather-qml/content/images/n900/loading_3.png b/weather-qml/content/images/n900/loading_3.png
new file mode 100755
index 0000000..4b14071
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_3.png
diff --git a/weather-qml/content/images/n900/loading_4.png b/weather-qml/content/images/n900/loading_4.png
new file mode 100755
index 0000000..1a4f43e
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_4.png
diff --git a/weather-qml/content/images/n900/loading_5.png b/weather-qml/content/images/n900/loading_5.png
new file mode 100755
index 0000000..a5558c2
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_5.png
diff --git a/weather-qml/content/images/n900/loading_6.png b/weather-qml/content/images/n900/loading_6.png
new file mode 100755
index 0000000..bc75c0f
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_6.png
diff --git a/weather-qml/content/images/n900/loading_7.png b/weather-qml/content/images/n900/loading_7.png
new file mode 100755
index 0000000..735562f
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_7.png
diff --git a/weather-qml/content/images/n900/loading_8.png b/weather-qml/content/images/n900/loading_8.png
new file mode 100755
index 0000000..2c5e984
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_8.png
diff --git a/weather-qml/content/images/n900/loading_9.png b/weather-qml/content/images/n900/loading_9.png
new file mode 100755
index 0000000..4c7d957
--- /dev/null
+++ b/weather-qml/content/images/n900/loading_9.png
diff --git a/weather-qml/content/images/n900/minus_sign.png b/weather-qml/content/images/n900/minus_sign.png
new file mode 100755
index 0000000..a91f055
--- /dev/null
+++ b/weather-qml/content/images/n900/minus_sign.png
diff --git a/weather-qml/content/images/n900/moon.png b/weather-qml/content/images/n900/moon.png
new file mode 100755
index 0000000..0a8037d
--- /dev/null
+++ b/weather-qml/content/images/n900/moon.png
diff --git a/weather-qml/images/moon_line.png b/weather-qml/content/images/n900/moon_line.png
index 449cb4a..449cb4a 100644..100755
--- a/weather-qml/images/moon_line.png
+++ b/weather-qml/content/images/n900/moon_line.png
diff --git a/weather-qml/content/images/n900/rain_01.png b/weather-qml/content/images/n900/rain_01.png
new file mode 100755
index 0000000..c35f47a
--- /dev/null
+++ b/weather-qml/content/images/n900/rain_01.png
diff --git a/weather-qml/content/images/n900/rain_02.png b/weather-qml/content/images/n900/rain_02.png
new file mode 100755
index 0000000..cbc9a74
--- /dev/null
+++ b/weather-qml/content/images/n900/rain_02.png
diff --git a/weather-qml/content/images/n900/rain_03.png b/weather-qml/content/images/n900/rain_03.png
new file mode 100755
index 0000000..9d36a7c
--- /dev/null
+++ b/weather-qml/content/images/n900/rain_03.png
diff --git a/weather-qml/content/images/n900/scroll.png b/weather-qml/content/images/n900/scroll.png
new file mode 100755
index 0000000..ff83da6
--- /dev/null
+++ b/weather-qml/content/images/n900/scroll.png
diff --git a/weather-qml/content/images/n900/scroll_knob.png b/weather-qml/content/images/n900/scroll_knob.png
new file mode 100755
index 0000000..9a6bc28
--- /dev/null
+++ b/weather-qml/content/images/n900/scroll_knob.png
diff --git a/weather-qml/content/images/n900/snow_flake.png b/weather-qml/content/images/n900/snow_flake.png
new file mode 100755
index 0000000..39c5751
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake.png
diff --git a/weather-qml/content/images/n900/snow_flake_01.png b/weather-qml/content/images/n900/snow_flake_01.png
new file mode 100755
index 0000000..39c5751
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_01.png
diff --git a/weather-qml/content/images/n900/snow_flake_02.png b/weather-qml/content/images/n900/snow_flake_02.png
new file mode 100755
index 0000000..3aaeb24
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_02.png
diff --git a/weather-qml/content/images/n900/snow_flake_03.png b/weather-qml/content/images/n900/snow_flake_03.png
new file mode 100755
index 0000000..a84c736
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_03.png
diff --git a/weather-qml/content/images/n900/snow_flake_04.png b/weather-qml/content/images/n900/snow_flake_04.png
new file mode 100755
index 0000000..007d921
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_04.png
diff --git a/weather-qml/content/images/n900/snow_flake_05.png b/weather-qml/content/images/n900/snow_flake_05.png
new file mode 100755
index 0000000..c833da1
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_05.png
diff --git a/weather-qml/content/images/n900/snow_flake_06.png b/weather-qml/content/images/n900/snow_flake_06.png
new file mode 100755
index 0000000..2db4a02
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_06.png
diff --git a/weather-qml/content/images/n900/snow_flake_07.png b/weather-qml/content/images/n900/snow_flake_07.png
new file mode 100755
index 0000000..e1a3bed
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_07.png
diff --git a/weather-qml/content/images/n900/snow_flake_08.png b/weather-qml/content/images/n900/snow_flake_08.png
new file mode 100755
index 0000000..5a6ac67
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_08.png
diff --git a/weather-qml/content/images/n900/snow_flake_09.png b/weather-qml/content/images/n900/snow_flake_09.png
new file mode 100755
index 0000000..bbee2d9
--- /dev/null
+++ b/weather-qml/content/images/n900/snow_flake_09.png
diff --git a/weather-qml/content/images/n900/star_01.png b/weather-qml/content/images/n900/star_01.png
new file mode 100755
index 0000000..9648e70
--- /dev/null
+++ b/weather-qml/content/images/n900/star_01.png
diff --git a/weather-qml/content/images/n900/star_02.png b/weather-qml/content/images/n900/star_02.png
new file mode 100755
index 0000000..01e920f
--- /dev/null
+++ b/weather-qml/content/images/n900/star_02.png
diff --git a/weather-qml/content/images/n900/star_03.png b/weather-qml/content/images/n900/star_03.png
new file mode 100755
index 0000000..80816b0
--- /dev/null
+++ b/weather-qml/content/images/n900/star_03.png
diff --git a/weather-qml/content/images/n900/storm_01.png b/weather-qml/content/images/n900/storm_01.png
new file mode 100755
index 0000000..68f8e89
--- /dev/null
+++ b/weather-qml/content/images/n900/storm_01.png
diff --git a/weather-qml/content/images/n900/storm_02.png b/weather-qml/content/images/n900/storm_02.png
new file mode 100755
index 0000000..282e927
--- /dev/null
+++ b/weather-qml/content/images/n900/storm_02.png
diff --git a/weather-qml/content/images/n900/storm_03.png b/weather-qml/content/images/n900/storm_03.png
new file mode 100755
index 0000000..a766587
--- /dev/null
+++ b/weather-qml/content/images/n900/storm_03.png
diff --git a/weather-qml/content/images/n900/storm_04.png b/weather-qml/content/images/n900/storm_04.png
new file mode 100755
index 0000000..8a66d62
--- /dev/null
+++ b/weather-qml/content/images/n900/storm_04.png
diff --git a/weather-qml/content/images/n900/storm_05.png b/weather-qml/content/images/n900/storm_05.png
new file mode 100755
index 0000000..9643b8a
--- /dev/null
+++ b/weather-qml/content/images/n900/storm_05.png
diff --git a/weather-qml/content/images/n900/sun.png b/weather-qml/content/images/n900/sun.png
new file mode 100755
index 0000000..304cae9
--- /dev/null
+++ b/weather-qml/content/images/n900/sun.png
diff --git a/weather-qml/images/sun_line.png b/weather-qml/content/images/n900/sun_line.png
index f963c27..f963c27 100644..100755
--- a/weather-qml/images/sun_line.png
+++ b/weather-qml/content/images/n900/sun_line.png
diff --git a/weather-qml/content/images/n900/textfield_add_city.png b/weather-qml/content/images/n900/textfield_add_city.png
new file mode 100755
index 0000000..6562849
--- /dev/null
+++ b/weather-qml/content/images/n900/textfield_add_city.png
diff --git a/weather-qml/content/images/n900/thunder.png b/weather-qml/content/images/n900/thunder.png
new file mode 100755
index 0000000..d07b36b
--- /dev/null
+++ b/weather-qml/content/images/n900/thunder.png
diff --git a/weather-qml/content/images/n900/title_bar.png b/weather-qml/content/images/n900/title_bar.png
new file mode 100755
index 0000000..5943884
--- /dev/null
+++ b/weather-qml/content/images/n900/title_bar.png
diff --git a/weather-qml/content/images/n900/umbrella.png b/weather-qml/content/images/n900/umbrella.png
new file mode 100755
index 0000000..48db979
--- /dev/null
+++ b/weather-qml/content/images/n900/umbrella.png
diff --git a/weather-qml/images/bg_bottom_options.png b/weather-qml/content/images/s60/bg_bottom_options.png
index 10a2877..10a2877 100644..100755
--- a/weather-qml/images/bg_bottom_options.png
+++ b/weather-qml/content/images/s60/bg_bottom_options.png
diff --git a/weather-qml/images/bg_day_clear.png b/weather-qml/content/images/s60/bg_day_clear.png
index 2609bbb..2609bbb 100644..100755
--- a/weather-qml/images/bg_day_clear.png
+++ b/weather-qml/content/images/s60/bg_day_clear.png
diff --git a/weather-qml/images/bg_day_heavyrain.png b/weather-qml/content/images/s60/bg_day_heavyrain.png
index 6f0f80e..6f0f80e 100644..100755
--- a/weather-qml/images/bg_day_heavyrain.png
+++ b/weather-qml/content/images/s60/bg_day_heavyrain.png
diff --git a/weather-qml/images/bg_day_rain.png b/weather-qml/content/images/s60/bg_day_rain.png
index f3a578e..f3a578e 100644..100755
--- a/weather-qml/images/bg_day_rain.png
+++ b/weather-qml/content/images/s60/bg_day_rain.png
diff --git a/weather-qml/images/bg_loading.png b/weather-qml/content/images/s60/bg_loading.png
index aa9a5f8..aa9a5f8 100644..100755
--- a/weather-qml/images/bg_loading.png
+++ b/weather-qml/content/images/s60/bg_loading.png
diff --git a/weather-qml/images/bg_night_clear.png b/weather-qml/content/images/s60/bg_night_clear.png
index bfe23ce..bfe23ce 100644..100755
--- a/weather-qml/images/bg_night_clear.png
+++ b/weather-qml/content/images/s60/bg_night_clear.png
diff --git a/weather-qml/images/bg_night_rain.png b/weather-qml/content/images/s60/bg_night_rain.png
index db8ffba..db8ffba 100644..100755
--- a/weather-qml/images/bg_night_rain.png
+++ b/weather-qml/content/images/s60/bg_night_rain.png
diff --git a/weather-qml/images/bt_options_bg.png b/weather-qml/content/images/s60/bt_options_bg.png
index 10a2877..10a2877 100644..100755
--- a/weather-qml/images/bt_options_bg.png
+++ b/weather-qml/content/images/s60/bt_options_bg.png
diff --git a/weather-qml/images/button_list_delete.png b/weather-qml/content/images/s60/button_list_delete.png
index 81358e7..81358e7 100755
--- a/weather-qml/images/button_list_delete.png
+++ b/weather-qml/content/images/s60/button_list_delete.png
diff --git a/weather-qml/images/centigrades.png b/weather-qml/content/images/s60/centigrades.png
index fabfd9f..fabfd9f 100644..100755
--- a/weather-qml/images/centigrades.png
+++ b/weather-qml/content/images/s60/centigrades.png
diff --git a/weather-qml/content/images/s60/city_name_background_bigger.png b/weather-qml/content/images/s60/city_name_background_bigger.png
new file mode 100755
index 0000000..661e99b
--- /dev/null
+++ b/weather-qml/content/images/s60/city_name_background_bigger.png
diff --git a/weather-qml/images/city_panel_bg.png b/weather-qml/content/images/s60/city_panel_bg.png
index 6dde03f..6dde03f 100644..100755
--- a/weather-qml/images/city_panel_bg.png
+++ b/weather-qml/content/images/s60/city_panel_bg.png
diff --git a/weather-qml/images/cloud_1.png b/weather-qml/content/images/s60/cloud_1.png
index dfab8e2..dfab8e2 100644..100755
--- a/weather-qml/images/cloud_1.png
+++ b/weather-qml/content/images/s60/cloud_1.png
diff --git a/weather-qml/content/images/s60/cloud_1_line.png b/weather-qml/content/images/s60/cloud_1_line.png
new file mode 100755
index 0000000..8a4b090
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_1_line.png
diff --git a/weather-qml/images/cloud_2.png b/weather-qml/content/images/s60/cloud_2.png
index a219b5e..a219b5e 100644..100755
--- a/weather-qml/images/cloud_2.png
+++ b/weather-qml/content/images/s60/cloud_2.png
diff --git a/weather-qml/content/images/s60/cloud_2_line.png b/weather-qml/content/images/s60/cloud_2_line.png
new file mode 100755
index 0000000..b9b8ca3
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_2_line.png
diff --git a/weather-qml/images/cloud_3.png b/weather-qml/content/images/s60/cloud_3.png
index 45cde4d..45cde4d 100644..100755
--- a/weather-qml/images/cloud_3.png
+++ b/weather-qml/content/images/s60/cloud_3.png
diff --git a/weather-qml/content/images/s60/cloud_3_line.png b/weather-qml/content/images/s60/cloud_3_line.png
new file mode 100755
index 0000000..0486741
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_3_line.png
diff --git a/weather-qml/images/cloud_rain_1.png b/weather-qml/content/images/s60/cloud_rain_1.png
index 063be25..063be25 100644..100755
--- a/weather-qml/images/cloud_rain_1.png
+++ b/weather-qml/content/images/s60/cloud_rain_1.png
diff --git a/weather-qml/content/images/s60/cloud_rain_1_line.png b/weather-qml/content/images/s60/cloud_rain_1_line.png
new file mode 100755
index 0000000..204207b
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_rain_1_line.png
diff --git a/weather-qml/images/cloud_rain_2.png b/weather-qml/content/images/s60/cloud_rain_2.png
index fc7a9c3..fc7a9c3 100644..100755
--- a/weather-qml/images/cloud_rain_2.png
+++ b/weather-qml/content/images/s60/cloud_rain_2.png
diff --git a/weather-qml/content/images/s60/cloud_rain_2_line.png b/weather-qml/content/images/s60/cloud_rain_2_line.png
new file mode 100755
index 0000000..ddef2d4
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_rain_2_line.png
diff --git a/weather-qml/images/cloud_rain_3.png b/weather-qml/content/images/s60/cloud_rain_3.png
index 89b64dd..89b64dd 100644..100755
--- a/weather-qml/images/cloud_rain_3.png
+++ b/weather-qml/content/images/s60/cloud_rain_3.png
diff --git a/weather-qml/content/images/s60/cloud_rain_3_line.png b/weather-qml/content/images/s60/cloud_rain_3_line.png
new file mode 100755
index 0000000..862f631
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_rain_3_line.png
diff --git a/weather-qml/images/cloud_storm_1.png b/weather-qml/content/images/s60/cloud_storm_1.png
index 77ef7c1..77ef7c1 100644..100755
--- a/weather-qml/images/cloud_storm_1.png
+++ b/weather-qml/content/images/s60/cloud_storm_1.png
diff --git a/weather-qml/content/images/s60/cloud_storm_1_line.png b/weather-qml/content/images/s60/cloud_storm_1_line.png
new file mode 100755
index 0000000..013a082
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_storm_1_line.png
diff --git a/weather-qml/images/cloud_storm_2.png b/weather-qml/content/images/s60/cloud_storm_2.png
index 1ab2ea6..1ab2ea6 100644..100755
--- a/weather-qml/images/cloud_storm_2.png
+++ b/weather-qml/content/images/s60/cloud_storm_2.png
diff --git a/weather-qml/content/images/s60/cloud_storm_2_line.png b/weather-qml/content/images/s60/cloud_storm_2_line.png
new file mode 100755
index 0000000..51b38b1
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_storm_2_line.png
diff --git a/weather-qml/images/cloud_storm_3.png b/weather-qml/content/images/s60/cloud_storm_3.png
index e896b01..e896b01 100644..100755
--- a/weather-qml/images/cloud_storm_3.png
+++ b/weather-qml/content/images/s60/cloud_storm_3.png
diff --git a/weather-qml/content/images/s60/cloud_storm_3_line.png b/weather-qml/content/images/s60/cloud_storm_3_line.png
new file mode 100755
index 0000000..ad52b91
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_storm_3_line.png
diff --git a/weather-qml/images/cloud_tstorm_1.png b/weather-qml/content/images/s60/cloud_tstorm_1.png
index 784a4be..784a4be 100644..100755
--- a/weather-qml/images/cloud_tstorm_1.png
+++ b/weather-qml/content/images/s60/cloud_tstorm_1.png
diff --git a/weather-qml/content/images/s60/cloud_tstorm_1_line.png b/weather-qml/content/images/s60/cloud_tstorm_1_line.png
new file mode 100755
index 0000000..013a082
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_tstorm_1_line.png
diff --git a/weather-qml/images/cloud_tstorm_2.png b/weather-qml/content/images/s60/cloud_tstorm_2.png
index 130c3cd..130c3cd 100644..100755
--- a/weather-qml/images/cloud_tstorm_2.png
+++ b/weather-qml/content/images/s60/cloud_tstorm_2.png
diff --git a/weather-qml/content/images/s60/cloud_tstorm_2_line.png b/weather-qml/content/images/s60/cloud_tstorm_2_line.png
new file mode 100755
index 0000000..51b38b1
--- /dev/null
+++ b/weather-qml/content/images/s60/cloud_tstorm_2_line.png
diff --git a/weather-qml/images/cold_sun.png b/weather-qml/content/images/s60/cold_sun.png
index deefdef..deefdef 100644..100755
--- a/weather-qml/images/cold_sun.png
+++ b/weather-qml/content/images/s60/cold_sun.png
diff --git a/weather-qml/content/images/s60/cold_sun_line.png b/weather-qml/content/images/s60/cold_sun_line.png
new file mode 100755
index 0000000..f51062b
--- /dev/null
+++ b/weather-qml/content/images/s60/cold_sun_line.png
diff --git a/weather-qml/content/images/s60/division_line.png b/weather-qml/content/images/s60/division_line.png
new file mode 100755
index 0000000..896c69c
--- /dev/null
+++ b/weather-qml/content/images/s60/division_line.png
diff --git a/weather-qml/images/fog.png b/weather-qml/content/images/s60/fog.png
index 6066207..6066207 100644..100755
--- a/weather-qml/images/fog.png
+++ b/weather-qml/content/images/s60/fog.png
diff --git a/weather-qml/images/haze.png b/weather-qml/content/images/s60/haze.png
index 58c1532..58c1532 100644..100755
--- a/weather-qml/images/haze.png
+++ b/weather-qml/content/images/s60/haze.png
diff --git a/weather-qml/images/icon_max.png b/weather-qml/content/images/s60/icon_max.png
index e6910d1..e6910d1 100644..100755
--- a/weather-qml/images/icon_max.png
+++ b/weather-qml/content/images/s60/icon_max.png
diff --git a/weather-qml/images/icon_min.png b/weather-qml/content/images/s60/icon_min.png
index 04f2819..04f2819 100644..100755
--- a/weather-qml/images/icon_min.png
+++ b/weather-qml/content/images/s60/icon_min.png
diff --git a/weather-qml/images/list_item_bg.png b/weather-qml/content/images/s60/list_item_bg.png
index 4b61700..4b61700 100644..100755
--- a/weather-qml/images/list_item_bg.png
+++ b/weather-qml/content/images/s60/list_item_bg.png
diff --git a/weather-qml/images/list_item_pressed_bg.png b/weather-qml/content/images/s60/list_item_pressed_bg.png
index 2941e00..2941e00 100644..100755
--- a/weather-qml/images/list_item_pressed_bg.png
+++ b/weather-qml/content/images/s60/list_item_pressed_bg.png
diff --git a/weather-qml/images/list_item_selected_bg.png b/weather-qml/content/images/s60/list_item_selected_bg.png
index aa4ffb9..aa4ffb9 100644..100755
--- a/weather-qml/images/list_item_selected_bg.png
+++ b/weather-qml/content/images/s60/list_item_selected_bg.png
diff --git a/weather-qml/images/list_top.png b/weather-qml/content/images/s60/list_top.png
index b943e0b..b943e0b 100644..100755
--- a/weather-qml/images/list_top.png
+++ b/weather-qml/content/images/s60/list_top.png
diff --git a/weather-qml/images/loading_1.png b/weather-qml/content/images/s60/loading_1.png
index c06c275..c06c275 100644..100755
--- a/weather-qml/images/loading_1.png
+++ b/weather-qml/content/images/s60/loading_1.png
diff --git a/weather-qml/images/loading_10.png b/weather-qml/content/images/s60/loading_10.png
index 22d483e..22d483e 100644..100755
--- a/weather-qml/images/loading_10.png
+++ b/weather-qml/content/images/s60/loading_10.png
diff --git a/weather-qml/images/loading_11.png b/weather-qml/content/images/s60/loading_11.png
index 3723524..3723524 100644..100755
--- a/weather-qml/images/loading_11.png
+++ b/weather-qml/content/images/s60/loading_11.png
diff --git a/weather-qml/images/loading_12.png b/weather-qml/content/images/s60/loading_12.png
index bc8cb15..bc8cb15 100644..100755
--- a/weather-qml/images/loading_12.png
+++ b/weather-qml/content/images/s60/loading_12.png
diff --git a/weather-qml/images/loading_13.png b/weather-qml/content/images/s60/loading_13.png
index 6b0999a..6b0999a 100644..100755
--- a/weather-qml/images/loading_13.png
+++ b/weather-qml/content/images/s60/loading_13.png
diff --git a/weather-qml/images/loading_14.png b/weather-qml/content/images/s60/loading_14.png
index b93671d..b93671d 100644..100755
--- a/weather-qml/images/loading_14.png
+++ b/weather-qml/content/images/s60/loading_14.png
diff --git a/weather-qml/images/loading_15.png b/weather-qml/content/images/s60/loading_15.png
index 5e6cf81..5e6cf81 100644..100755
--- a/weather-qml/images/loading_15.png
+++ b/weather-qml/content/images/s60/loading_15.png
diff --git a/weather-qml/images/loading_16.png b/weather-qml/content/images/s60/loading_16.png
index 5bb7fce..5bb7fce 100644..100755
--- a/weather-qml/images/loading_16.png
+++ b/weather-qml/content/images/s60/loading_16.png
diff --git a/weather-qml/images/loading_17.png b/weather-qml/content/images/s60/loading_17.png
index 5cdf620..5cdf620 100644..100755
--- a/weather-qml/images/loading_17.png
+++ b/weather-qml/content/images/s60/loading_17.png
diff --git a/weather-qml/images/loading_18.png b/weather-qml/content/images/s60/loading_18.png
index c0fe963..c0fe963 100644..100755
--- a/weather-qml/images/loading_18.png
+++ b/weather-qml/content/images/s60/loading_18.png
diff --git a/weather-qml/images/loading_19.png b/weather-qml/content/images/s60/loading_19.png
index 2ba879b..2ba879b 100644..100755
--- a/weather-qml/images/loading_19.png
+++ b/weather-qml/content/images/s60/loading_19.png
diff --git a/weather-qml/images/loading_2.png b/weather-qml/content/images/s60/loading_2.png
index d8f06e1..d8f06e1 100644..100755
--- a/weather-qml/images/loading_2.png
+++ b/weather-qml/content/images/s60/loading_2.png
diff --git a/weather-qml/images/loading_20.png b/weather-qml/content/images/s60/loading_20.png
index d1b665b..d1b665b 100644..100755
--- a/weather-qml/images/loading_20.png
+++ b/weather-qml/content/images/s60/loading_20.png
diff --git a/weather-qml/images/loading_21.png b/weather-qml/content/images/s60/loading_21.png
index 5d8f865..5d8f865 100644..100755
--- a/weather-qml/images/loading_21.png
+++ b/weather-qml/content/images/s60/loading_21.png
diff --git a/weather-qml/images/loading_22.png b/weather-qml/content/images/s60/loading_22.png
index ab23e6d..ab23e6d 100644..100755
--- a/weather-qml/images/loading_22.png
+++ b/weather-qml/content/images/s60/loading_22.png
diff --git a/weather-qml/images/loading_23.png b/weather-qml/content/images/s60/loading_23.png
index 0da026d..0da026d 100644..100755
--- a/weather-qml/images/loading_23.png
+++ b/weather-qml/content/images/s60/loading_23.png
diff --git a/weather-qml/images/loading_24.png b/weather-qml/content/images/s60/loading_24.png
index 09a123f..09a123f 100644..100755
--- a/weather-qml/images/loading_24.png
+++ b/weather-qml/content/images/s60/loading_24.png
diff --git a/weather-qml/images/loading_25.png b/weather-qml/content/images/s60/loading_25.png
index 9946381..9946381 100644..100755
--- a/weather-qml/images/loading_25.png
+++ b/weather-qml/content/images/s60/loading_25.png
diff --git a/weather-qml/images/loading_3.png b/weather-qml/content/images/s60/loading_3.png
index 55bb39e..55bb39e 100644..100755
--- a/weather-qml/images/loading_3.png
+++ b/weather-qml/content/images/s60/loading_3.png
diff --git a/weather-qml/images/loading_4.png b/weather-qml/content/images/s60/loading_4.png
index 6036e50..6036e50 100644..100755
--- a/weather-qml/images/loading_4.png
+++ b/weather-qml/content/images/s60/loading_4.png
diff --git a/weather-qml/images/loading_5.png b/weather-qml/content/images/s60/loading_5.png
index 28e1994..28e1994 100644..100755
--- a/weather-qml/images/loading_5.png
+++ b/weather-qml/content/images/s60/loading_5.png
diff --git a/weather-qml/images/loading_6.png b/weather-qml/content/images/s60/loading_6.png
index 18cf24c..18cf24c 100644..100755
--- a/weather-qml/images/loading_6.png
+++ b/weather-qml/content/images/s60/loading_6.png
diff --git a/weather-qml/images/loading_7.png b/weather-qml/content/images/s60/loading_7.png
index a43d161..a43d161 100644..100755
--- a/weather-qml/images/loading_7.png
+++ b/weather-qml/content/images/s60/loading_7.png
diff --git a/weather-qml/images/loading_8.png b/weather-qml/content/images/s60/loading_8.png
index 99706c2..99706c2 100644..100755
--- a/weather-qml/images/loading_8.png
+++ b/weather-qml/content/images/s60/loading_8.png
diff --git a/weather-qml/images/loading_9.png b/weather-qml/content/images/s60/loading_9.png
index 113aa50..113aa50 100644..100755
--- a/weather-qml/images/loading_9.png
+++ b/weather-qml/content/images/s60/loading_9.png
diff --git a/weather-qml/images/minus_sign.png b/weather-qml/content/images/s60/minus_sign.png
index 6a9c06a..6a9c06a 100644..100755
--- a/weather-qml/images/minus_sign.png
+++ b/weather-qml/content/images/s60/minus_sign.png
diff --git a/weather-qml/images/mist_01.png b/weather-qml/content/images/s60/mist_01.png
index c3b5d5c..c3b5d5c 100644..100755
--- a/weather-qml/images/mist_01.png
+++ b/weather-qml/content/images/s60/mist_01.png
diff --git a/weather-qml/images/mist_02.png b/weather-qml/content/images/s60/mist_02.png
index 63b15d8..63b15d8 100644..100755
--- a/weather-qml/images/mist_02.png
+++ b/weather-qml/content/images/s60/mist_02.png
diff --git a/weather-qml/images/mist_03.png b/weather-qml/content/images/s60/mist_03.png
index 7e67747..7e67747 100644..100755
--- a/weather-qml/images/mist_03.png
+++ b/weather-qml/content/images/s60/mist_03.png
diff --git a/weather-qml/images/mist_04.png b/weather-qml/content/images/s60/mist_04.png
index 42bb6b8..42bb6b8 100644..100755
--- a/weather-qml/images/mist_04.png
+++ b/weather-qml/content/images/s60/mist_04.png
diff --git a/weather-qml/images/mist_05.png b/weather-qml/content/images/s60/mist_05.png
index 636b4a6..636b4a6 100644..100755
--- a/weather-qml/images/mist_05.png
+++ b/weather-qml/content/images/s60/mist_05.png
diff --git a/weather-qml/images/moon.png b/weather-qml/content/images/s60/moon.png
index 5862179..5862179 100644..100755
--- a/weather-qml/images/moon.png
+++ b/weather-qml/content/images/s60/moon.png
diff --git a/weather-qml/images/na_icon_line.png b/weather-qml/content/images/s60/moon_line.png
index 449cb4a..449cb4a 100644..100755
--- a/weather-qml/images/na_icon_line.png
+++ b/weather-qml/content/images/s60/moon_line.png
diff --git a/weather-qml/images/na_icon.png b/weather-qml/content/images/s60/na_icon.png
index 2a7877f..2a7877f 100644..100755
--- a/weather-qml/images/na_icon.png
+++ b/weather-qml/content/images/s60/na_icon.png
diff --git a/weather-qml/content/images/s60/na_icon_line.png b/weather-qml/content/images/s60/na_icon_line.png
new file mode 100755
index 0000000..449cb4a
--- /dev/null
+++ b/weather-qml/content/images/s60/na_icon_line.png
diff --git a/weather-qml/images/rain_01.png b/weather-qml/content/images/s60/rain_01.png
index 04ec51a..04ec51a 100644..100755
--- a/weather-qml/images/rain_01.png
+++ b/weather-qml/content/images/s60/rain_01.png
diff --git a/weather-qml/images/rain_02.png b/weather-qml/content/images/s60/rain_02.png
index fcc9e7e..fcc9e7e 100644..100755
--- a/weather-qml/images/rain_02.png
+++ b/weather-qml/content/images/s60/rain_02.png
diff --git a/weather-qml/images/rain_03.png b/weather-qml/content/images/s60/rain_03.png
index 4ab82aa..4ab82aa 100644..100755
--- a/weather-qml/images/rain_03.png
+++ b/weather-qml/content/images/s60/rain_03.png
diff --git a/weather-qml/images/rain_04.png b/weather-qml/content/images/s60/rain_04.png
index 0cd9506..0cd9506 100644..100755
--- a/weather-qml/images/rain_04.png
+++ b/weather-qml/content/images/s60/rain_04.png
diff --git a/weather-qml/images/rain_05.png b/weather-qml/content/images/s60/rain_05.png
index cf59516..cf59516 100644..100755
--- a/weather-qml/images/rain_05.png
+++ b/weather-qml/content/images/s60/rain_05.png
diff --git a/weather-qml/images/scroll.png b/weather-qml/content/images/s60/scroll.png
index 8ebce0f..8ebce0f 100644..100755
--- a/weather-qml/images/scroll.png
+++ b/weather-qml/content/images/s60/scroll.png
diff --git a/weather-qml/images/scroll_knob.png b/weather-qml/content/images/s60/scroll_knob.png
index 379e54a..379e54a 100644..100755
--- a/weather-qml/images/scroll_knob.png
+++ b/weather-qml/content/images/s60/scroll_knob.png
diff --git a/weather-qml/images/star_01.png b/weather-qml/content/images/s60/star_01.png
index 6e60dcc..6e60dcc 100644..100755
--- a/weather-qml/images/star_01.png
+++ b/weather-qml/content/images/s60/star_01.png
diff --git a/weather-qml/images/star_02.png b/weather-qml/content/images/s60/star_02.png
index 6ca331a..6ca331a 100644..100755
--- a/weather-qml/images/star_02.png
+++ b/weather-qml/content/images/s60/star_02.png
diff --git a/weather-qml/images/star_03.png b/weather-qml/content/images/s60/star_03.png
index f8ebb43..f8ebb43 100644..100755
--- a/weather-qml/images/star_03.png
+++ b/weather-qml/content/images/s60/star_03.png
diff --git a/weather-qml/images/storm_01.png b/weather-qml/content/images/s60/storm_01.png
index 436df98..436df98 100644..100755
--- a/weather-qml/images/storm_01.png
+++ b/weather-qml/content/images/s60/storm_01.png
diff --git a/weather-qml/images/storm_02.png b/weather-qml/content/images/s60/storm_02.png
index 16da93f..16da93f 100644..100755
--- a/weather-qml/images/storm_02.png
+++ b/weather-qml/content/images/s60/storm_02.png
diff --git a/weather-qml/images/storm_03.png b/weather-qml/content/images/s60/storm_03.png
index 7ca4192..7ca4192 100644..100755
--- a/weather-qml/images/storm_03.png
+++ b/weather-qml/content/images/s60/storm_03.png
diff --git a/weather-qml/images/storm_04.png b/weather-qml/content/images/s60/storm_04.png
index f2ba7ce..f2ba7ce 100644..100755
--- a/weather-qml/images/storm_04.png
+++ b/weather-qml/content/images/s60/storm_04.png
diff --git a/weather-qml/images/storm_05.png b/weather-qml/content/images/s60/storm_05.png
index c35fd7f..c35fd7f 100644..100755
--- a/weather-qml/images/storm_05.png
+++ b/weather-qml/content/images/s60/storm_05.png
diff --git a/weather-qml/images/sun.png b/weather-qml/content/images/s60/sun.png
index f99abdf..f99abdf 100644..100755
--- a/weather-qml/images/sun.png
+++ b/weather-qml/content/images/s60/sun.png
diff --git a/weather-qml/content/images/s60/sun_line.png b/weather-qml/content/images/s60/sun_line.png
new file mode 100755
index 0000000..f963c27
--- /dev/null
+++ b/weather-qml/content/images/s60/sun_line.png
diff --git a/weather-qml/images/thunder.png b/weather-qml/content/images/s60/thunder.png
index de95d9a..de95d9a 100644..100755
--- a/weather-qml/images/thunder.png
+++ b/weather-qml/content/images/s60/thunder.png
diff --git a/weather-qml/images/umbrella.png b/weather-qml/content/images/s60/umbrella.png
index afc79e4..afc79e4 100644..100755
--- a/weather-qml/images/umbrella.png
+++ b/weather-qml/content/images/s60/umbrella.png
diff --git a/weather-qml/debian/changelog b/weather-qml/debian/changelog
new file mode 100755
index 0000000..b18a0be
--- /dev/null
+++ b/weather-qml/debian/changelog
@@ -0,0 +1,5 @@
+weatherqml (1.0-maemo1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>  Fri, 17 Aug 2010 14:10:34 -0300
diff --git a/weather-qml/debian/compat b/weather-qml/debian/compat
new file mode 100755
index 0000000..7ed6ff8
--- /dev/null
+++ b/weather-qml/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/weather-qml/debian/control b/weather-qml/debian/control
new file mode 100755
index 0000000..9affe08
--- /dev/null
+++ b/weather-qml/debian/control
@@ -0,0 +1,12 @@
+Source: weatherqml
+Section: user/apps
+Priority: optional
+Maintainer: Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>
+Build-Depends: debhelper (>= 4)
+Standards-Version: 3.8.1
+
+Package: weatherqml
+Architecture: any
+Depends: libqt4-declarative
+Maemo-Display-Name: WeatherQML
+Description: Weather QML
diff --git a/weather-qml/debian/copyright b/weather-qml/debian/copyright
new file mode 100644
index 0000000..678de42
--- /dev/null
+++ b/weather-qml/debian/copyright
@@ -0,0 +1,44 @@
+This package was debianized by Anselmo Melo <anselmo.melo@openbossa.org> on
+Tue, 24 Aug 2010 11:09:45 -0300.
+
+Upstream Author: Ian Andrade <ian.andrade@openbossa.org>
+
+Copyright: 2010 Nokia Corporation and/or its subsidiary(-ies).
+           All rights reserved.
+           Contact:  Nokia Corporation (qt-info@nokia.com)
+
+License:
+   You may use this file under the terms of the BSD license as follows:
+
+   "Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+     * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+       the names of its contributors may be used to endorse or promote
+       products derived from this software without specific prior written
+       permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE."
+
+
+The Debian packaging is (C) 2010, Anselmo Melo <anselmo.melo@openbossa.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/weather-qml/debian/rules b/weather-qml/debian/rules
new file mode 100755
index 0000000..64327a8
--- /dev/null
+++ b/weather-qml/debian/rules
@@ -0,0 +1,43 @@
+#!/usr/bin/make -f
+
+configure:
+	dh_testdir
+
+build: build-stamp
+	/usr/bin/qmake
+	make
+
+build-stamp: configure
+	dh_testdir
+
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	install -D -m 755 $(CURDIR)/weatherqml $(CURDIR)/debian/weatherqml/usr/bin/weatherqml
+	install -D -m 644 $(CURDIR)/weatherqml.desktop $(CURDIR)/debian/weatherqml/usr/share/applications/hildon/weatherqml.desktop
+	install -D -m 644 $(CURDIR)/icons/weatherqml.png $(CURDIR)/debian/weatherqml/usr/share/pixmaps/weatherqml.png
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/weather-qml/default.qml b/weather-qml/default.qml
deleted file mode 100644
index 64c4ce7..0000000
--- a/weather-qml/default.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: window
-    width: 360
-    height: 640
-    color: "black"
-
-    property int currentIndex : -1;
-    property bool splashVisible : true
-    property string weatherSource : ""
-
-    property int verticalOffset: -40
-    property real scaleFactorX: window.width / 480.0
-    property real scaleFactorY: window.height / 864.0
-
-    CityModel {
-        id: cityModel
-    }
-
-    ParallaxView {
-        id: view
-        x: -58
-        width: 432
-        height: window.height
-    }
-
-    CityPanel {
-        id: cityPanel
-        anchors.top: parent.top
-        anchors.bottom: bottomBar.top
-
-        onGotoCity: console.log("todo: goto city")
-    }
-
-    Image {
-        id: bottomBar
-        source: "images/bg_bottom_options.png"
-        anchors.bottom: parent.bottom
-    }
-
-    SplashScreen {
-        id: splash
-        anchors.fill: parent
-        visible: true
-    }
-
-    Timer {
-        interval: 1000
-        repeat: false
-        running: true
-        onTriggered: splash.visible = false;
-    }
-
-    Text {
-        id: exitLabel
-        text: "Exit"
-        color: "white"
-        font.family: "Nokia Sans"
-        font.pixelSize: 22
-
-        anchors.fill: bottomBar
-        anchors.rightMargin: 15
-        anchors.leftMargin: window.width / 2
-        verticalAlignment: "AlignVCenter"
-        horizontalAlignment: "AlignRight"
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: { Qt.quit(); }
-        }
-    }
-}
diff --git a/weather-qml/icons/weatherqml.png b/weather-qml/icons/weatherqml.png
new file mode 100644
index 0000000..1f43399
--- /dev/null
+++ b/weather-qml/icons/weatherqml.png
diff --git a/weather-qml/icons/weatherqml.svg b/weather-qml/icons/weatherqml.svg
new file mode 100644
index 0000000..c3a8ff4
--- /dev/null
+++ b/weather-qml/icons/weatherqml.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="64px" height="64px" viewBox="-1 0 64 64" enable-background="new -1 0 64 64" xml:space="preserve">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="302.3994" y1="-325.333" x2="302.3993" y2="-387.3755" gradientTransform="matrix(1 0 0 -1 -265.5 -326)">
+	<stop  offset="0" style="stop-color:#0C527D"/>
+	<stop  offset="1" style="stop-color:#6BA3C6"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M59.4,2.9c2.3,0,4.1,1.8,4.1,4.1v45c0,2.3-1.8,4.1-4.1,4.1h-45c-2.3,0-4.1-1.8-4.1-4.1V7
+	c0-2.3,1.8-4.1,4.1-4.1H59.4z"/>
+<line fill="none" x1="10.2" y1="33.8" x2="28.4" y2="2.9"/>
+<line fill="none" x1="22.5" y1="56.2" x2="53.6" y2="3.1"/>
+<line fill="none" x1="24.7" y1="56.2" x2="55.8" y2="3.1"/>
+<line fill="none" x1="29.4" y1="56.2" x2="60.6" y2="3.1"/>
+<line opacity="0.31" fill="none" stroke="#FFFFFF" stroke-width="0.05" enable-background="new    " x1="18.6" y1="56.1" x2="47.3" y2="2.9"/>
+<line opacity="0.5" fill="none" stroke="#FFFFFF" stroke-width="0.05" enable-background="new    " x1="36" y1="56.1" x2="63.6" y2="6.1"/>
+<line opacity="0.31" fill="none" stroke="#FFFFFF" stroke-width="0.05" enable-background="new    " x1="10.2" y1="48" x2="34.2" y2="2.9"/>
+<line opacity="0.31" fill="none" stroke="#FFFFFF" stroke-width="0.05" enable-background="new    " x1="10.2" y1="16.6" x2="17.2" y2="2.9"/>
+<line fill="none" x1="10.2" y1="51.8" x2="37.8" y2="3"/>
+<line opacity="0.31" fill="none" stroke="#FFFFFF" stroke-width="0.25" enable-background="new    " x1="15.5" y1="56.1" x2="44.3" y2="2.8"/>
+<line opacity="0.5" fill="none" stroke="#FFFFFF" stroke-width="0.25" enable-background="new    " x1="32.1" y1="56.2" x2="60.1" y2="2.9"/>
+<line opacity="0.31" fill="none" stroke="#FFFFFF" stroke-width="0.25" enable-background="new    " x1="10" y1="43.7" x2="32.1" y2="2.8"/>
+<line opacity="0.31" fill="none" stroke="#FFFFFF" stroke-width="0.25" enable-background="new    " x1="10.1" y1="20.7" x2="19.5" y2="2.8"/>
+<line fill="none" x1="10" y1="49.9" x2="35.5" y2="2.9"/>
+<path fill="none" d="M59.3,2.8c2.3,0,4.101,1.8,4.101,4.1v45c0,2.3-1.801,4.1-4.101,4.1h-45c-2.3,0-4.1-1.8-4.1-4.1V7
+	c0-2.3,1.8-4.1,4.1-4.1h45V2.8z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="304.0879" y1="-376.8687" x2="304.0879" y2="-346.245" gradientTransform="matrix(1 0 0 -1 -265.5 -326)">
+	<stop  offset="0" style="stop-color:#0C527D"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M63.5,25.4c-1.1,0-2.4,0.3-3.4,0.7c2.9,3.2,1.801,5.2,1.801,5.2s-2-4-3.2-4.8c-1.7-1.7-5-1.6-5-1.7
+	c0-0.5,2.899-1,5.3,0.3c0.3-1,0.4-1.1,0.5-2.2c0.7-6-4.3-10.6-9.7-10.6c-4.6,0-8.5,2.2-9.399,6.6c1.5,0.8,2.8,2.6,2.3,5.3
+	c-0.7,3.2-4.3,4.3-5.9,2.4c0.101,0,0-0.2,0.2-0.2c0.3,0.1,2.7,1,3.9-0.5c1.3-1.5,1.899-5.4-3.101-6.5c-4.7-1-9.7,5.4-9.7,10.7
+	c0,0.4,0-0.4,0,0c-0.9-0.5-1.9-0.5-3-0.5c-3.7,0-6.8,3.9-6.8,7.7c0,1.5,0.5,2.101,1.4,3.2c-2.7,0.5-6.9,3.1-6,3.1
+	c0.7,0,18,0.101,34.6,0c-0.8-0.399-2.7-2-3.899-3.699C42.3,36.8,45.4,32.3,45.6,32.1C46.7,31,49.4,29.2,52,29.7
+	c6.5,1.2,3.9,6.6,3.8,6.8c-0.1,0.2-1.8,2.9-4.6,1.5c-2.9-1.4-0.9-3.8,0.3-3.7c1.2,0.101,1.2,0.9,1.2,0.9s0.1,0.7-0.101,0.3
+	c-0.199-0.4-0.399-0.6-0.8-0.6c-0.3,0-1.3,0.5-0.8,1.699c0.4,1.101,1.6,0.7,1.9,0.7c0.3,0,2.699-0.1,2.699-3.8c0-1.9-3-2.9-4.6-2.9
+	c-0.2,0-5.4,0.7-5.3,6.5c0.1,3.7,3.5,6.4,5,6.4c4.399,0,9,0,12.899,0V25.4H63.5z"/>
+<line fill="none" x1="42.6" y1="56.3" x2="63.6" y2="20.5"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="304.6543" y1="-349.0195" x2="304.6543" y2="-378.2723" gradientTransform="matrix(1 0 0 -1 -265.5 -326)">
+	<stop  offset="0" style="stop-color:#F3F8F9"/>
+	<stop  offset="0.2636" style="stop-color:#CDE2E7"/>
+	<stop  offset="0.5549" style="stop-color:#9FC8D1"/>
+	<stop  offset="1" style="stop-color:#85A8B0"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M63.5,25.4c-1.1,0-2.4,0.3-3.4,0.7c0.2,0.3,2.9,3.3,1.801,5.2c-0.801-2.1-1.101-3-3.2-4.8
+	c-2.2-2-5-1.6-5-1.7c0-0.5,2.899-1,5.3,0.3c0.3-1,0.5-2,0.5-3.1c0-5.3-4.3-9.7-9.7-9.7c-4.6,0-8.5,2.2-9.399,6.6
+	c0.5,0,2.899,1.7,2.3,5.3c-0.601,3.3-4.2,4.1-5.9,2.4c0.2-0.5,2.7,1.1,4.2-0.7c1.2-1.6,1.9-5.3-2.9-6.5
+	c-4.699-1-9.899,4.5-9.899,9.8c0,0.4,0,0.8,0.1,1.2c-0.9-0.5-1.9-0.7-3-0.7c-3.7,0-6.8,3-6.8,6.8c0,1.5,0.5,3,1.4,4.1
+	C17.1,41,14,42.8,15,42.8c0.7,0,15.8,0.101,32.4,0C41.1,38.6,45.3,32.6,45.9,32.1c1.1-1.1,3.699-2.8,6.3-2.4
+	c6.5,1.2,3.8,6.7,3.7,6.899C55.8,36.8,54.1,39.4,51.2,38c-2.9-1.5-0.9-3.8,0.3-3.7c1.2,0.101,1.2,1,1.2,1s0,0.2-0.2-0.1
+	c-0.6-0.7-2.1,0.2-1.6,1.399C51.3,37.7,52.8,37.4,53,37.4c0.3,0,3.3-0.601,2.4-4.101c-0.301-1.1-0.801-1.4-1.5-1.8
+	c-2.5-1.7-6-0.2-7.5,2c-0.601,0.9-1,2.3-1,3.9c0,2.899,3,4.899,5.3,5.399c4.399,0,8.7,0,12.7,0V25.4H63.5z"/>
+<rect fill="none" width="64" height="64"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="289.0811" y1="-384.7373" x2="288.2475" y2="-326.2346" gradientTransform="matrix(1 0 0 -1 -265.5 -326)">
+	<stop  offset="0" style="stop-color:#0C527D"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="25.7,42.9 19.7,56.2 21.2,56.2 27.2,42.9 "/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="287.374" y1="-345.4019" x2="287.374" y2="-398.6749" gradientTransform="matrix(1 0 0 -1 -265.5 -326)">
+	<stop  offset="0" style="stop-color:#000000"/>
+	<stop  offset="0.5" style="stop-color:#A3A3A3"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path fill="url(#SVGID_5_)" d="M18.5,60.5L18.5,60.5L18.5,60.5l15-33.6c0.2-0.3,0-0.8-0.3-0.9c-0.3-0.2-0.8,0-0.9,0.3L18.5,57.1l0,0
+	L17.2,60l0,0c-0.7,1.5-2.4,2.1-3.9,1.5c-1.5-0.7-2.1-2.4-1.5-3.9l0,0l0,0c0.1-0.3,0-0.699-0.4-0.899c-0.3-0.2-0.7,0-0.9,0.3l0,0l0,0
+	l0,0c0,0,0,0,0,0.1c-0.9,2.2,0.1,4.7,2.2,5.601C15,63.7,17.5,62.7,18.5,60.5L18.5,60.5L18.5,60.5z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="257.9111" y1="-312.2236" x2="242.2144" y2="-288.1409" gradientTransform="matrix(0.9999 0.0143 0.0143 -0.9999 -220.7415 -268.9306)">
+	<stop  offset="0" style="stop-color:#6D110F"/>
+	<stop  offset="1" style="stop-color:#B32024"/>
+</linearGradient>
+<path fill="url(#SVGID_6_)" d="M5.5,30.3c1.8,0.7,3.1,2.1,3.2,3.5c1.7-0.6,4-0.399,6.3,0.7c2,1,3.5,2.5,4.2,4.1
+	c2-0.8,4.9-0.699,7.7,0.4c3.3,1.2,5.7,3.5,6.4,5.7c1.601-0.601,3.8-0.601,5.9,0.2c2.5,0.899,4.399,2.699,5,4.5
+	c1.1-0.801,2.8-1,4.5-0.301c2,0.801,3.3,2.5,3.3,4l0,0C52.6,41,46.8,31.2,32.4,25.4C19.3,20.1,8.2,23.8,0.9,30.7
+	C2,29.9,3.8,29.7,5.5,30.3z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="243.5928" y1="-290.9302" x2="254.8809" y2="-304.7876" gradientTransform="matrix(0.9999 0.0143 0.0143 -0.9999 -220.7415 -268.9306)">
+	<stop  offset="0" style="stop-color:#6D110F"/>
+	<stop  offset="1" style="stop-color:#B32024"/>
+</linearGradient>
+<path opacity="0.5" fill="url(#SVGID_7_)" enable-background="new    " d="M8.7,33.8c1.7-0.6,4-0.399,6.3,0.7c2,1,3.5,2.5,4.2,4.1
+	c2-0.8,4.9-0.699,7.7,0.4c3.3,1.2,5.7,3.5,6.4,5.7c1.601-0.601,3.8-0.601,5.9,0.2c2.5,0.899,4.399,2.699,5,4.5
+	c1.1-0.801,0.899-18.9-11.8-24C20.6,20.6,8.6,32.4,8.7,33.8z"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="261.0293" y1="-301.6294" x2="241.5499" y2="-293.4046" gradientTransform="matrix(0.9999 0.0143 0.0143 -0.9999 -220.7415 -268.9306)">
+	<stop  offset="0" style="stop-color:#6D110F"/>
+	<stop  offset="0.5275" style="stop-color:#B32024"/>
+	<stop  offset="0.7249" style="stop-color:#981A1C"/>
+	<stop  offset="1" style="stop-color:#6D110F"/>
+</linearGradient>
+<path opacity="0.5" fill="url(#SVGID_8_)" enable-background="new    " d="M19.3,38.6c2-0.8,5.4-0.699,7.7,0.4
+	c3.2,1.4,5.7,3.5,6.4,5.7c0.6-1.3,4.8-16.8-0.4-19.1C27.8,23.3,19.8,37.3,19.3,38.6z"/>
+</svg>
diff --git a/weather-qml/images/city_name_background_bigger.png b/weather-qml/images/city_name_background_bigger.png
deleted file mode 100644
index a5e83d0..0000000
--- a/weather-qml/images/city_name_background_bigger.png
+++ /dev/null
diff --git a/weather-qml/main_n900.qml b/weather-qml/main_n900.qml
new file mode 100755
index 0000000..c6e54e6
--- /dev/null
+++ b/weather-qml/main_n900.qml
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "content"
+
+Rectangle {
+    id: window
+    width: 480
+    height: 800
+    color: "black"
+
+    property string folder: "images/n900/"
+
+    property int currentIndex : -1;
+    property bool splashVisible : true
+    property string weatherSource : ""
+
+    property int verticalOffset: -40
+    property real scaleFactorX: window.width / 480.0
+    property real scaleFactorY: window.height / 800.0
+    property int yOffset: 140
+    property int xOffset: 0
+    property int textOffset: 30
+
+    CityModel {
+        id: cityModel
+    }
+
+    WeatherView {
+        id: view
+        x: -65 * scaleFactorX
+        width: 550
+        height: window.height - bottomBar.height
+    }
+
+    CityPanel {
+        id: cityPanel
+        anchors.top: parent.top
+        anchors.bottom: bottomBar.top
+    }
+
+    Image {
+        id: bottomBar
+        source: "content/" + folder + "bg_bottom_options.png"
+        anchors.bottom: parent.bottom
+    }
+
+    SplashScreen {
+        id: splash
+        anchors.fill: parent
+        visible: true
+    }
+
+    Timer {
+        interval: 1000
+        repeat: false
+        running: true
+        onTriggered: splash.visible = false;
+    }
+
+    Text {
+        id: exitLabel
+        text: "Exit"
+        color: "white"
+        font.family: "Nokia Sans"
+        font.pixelSize: 28
+
+        anchors.fill: bottomBar
+        anchors.rightMargin: 15
+        anchors.leftMargin: window.width / 2
+        verticalAlignment: "AlignVCenter"
+        horizontalAlignment: "AlignRight"
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: { Qt.quit(); }
+        }
+    }
+}
diff --git a/weather-qml/main_s60.qml b/weather-qml/main_s60.qml
new file mode 100755
index 0000000..353eee5
--- /dev/null
+++ b/weather-qml/main_s60.qml
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** This file is part of Weather
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** All rights reserved.
+** Contact:  Nokia Corporation (qt-info@nokia.com)
+**
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in the
+**     documentation and/or other materials provided with the distribution.
+**
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+**  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+**  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+**  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+**  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+**  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+**  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+**  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+**  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+**  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+**  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+**  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+**  POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
+
+import Qt 4.7
+import "content"
+
+Rectangle {
+    id: window
+    width: 360
+    height: 640
+    color: "black"
+
+    property string folder: "images/s60/"
+
+    property int currentIndex : -1;
+    property bool splashVisible : true
+    property string weatherSource : ""
+
+    property int verticalOffset: -40
+    property real scaleFactorX: window.width / 480.0
+    property real scaleFactorY: window.height / 800.0
+    property int yOffset: 0
+    property int xOffset: 35
+    property int textOffset: bottomBar.height + 20
+
+    CityModel {
+        id: cityModel
+    }
+
+    WeatherView {
+        id: view
+        x: -65 * scaleFactorX
+        width: 432
+        height: window.height
+    }
+
+    CityPanel {
+        id: cityPanel
+        anchors.top: parent.top
+        anchors.bottom: bottomBar.top
+    }
+
+    Image {
+        id: bottomBar
+        source: "content/" + folder + "bg_bottom_options.png"
+        anchors.bottom: parent.bottom
+    }
+
+    SplashScreen {
+        id: splash
+        anchors.fill: parent
+        visible: true
+    }
+
+    Timer {
+        interval: 1000
+        repeat: false
+        running: true
+        onTriggered: splash.visible = false;
+    }
+
+    Text {
+        id: exitLabel
+        text: "Exit"
+        color: "white"
+        font.family: "Nokia Sans"
+        font.pixelSize: 22
+
+        anchors.fill: bottomBar
+        anchors.rightMargin: 15
+        anchors.leftMargin: window.width / 2
+        verticalAlignment: "AlignVCenter"
+        horizontalAlignment: "AlignRight"
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: { Qt.quit(); }
+        }
+    }
+}
diff --git a/weather-qml/weatherqml.desktop b/weather-qml/weatherqml.desktop
new file mode 100755
index 0000000..9a27860
--- /dev/null
+++ b/weather-qml/weatherqml.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Weather QML
+Categories=Applications
+Exec=/usr/bin/weatherqml
+Icon=weatherqml
+X-Icon-path=/usr/share/pixmaps/
+X-Osso-Type=application/x-executable
diff --git a/weather-qml/weatherqml.pro b/weather-qml/weatherqml.pro
new file mode 100644
index 0000000..5d88636
--- /dev/null
+++ b/weather-qml/weatherqml.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = build