Merge lp:~martin-borho/ubuntu-weather-app/anchors-refactoring into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Refactored all "width:parent.width" and "height:parent.height" through corresponding anchors and fixed bugs.

* Refactored all "width:parent.width" and "height:parent.height" through corresponding anchors.
* added a contentsWidth to all Sheet components, which should expand the sheets over the full window size.
* removed obsolete code
* fixed resizing bug in phone mode

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:209
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/149/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/147
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/147
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/61

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/149/rebuild

review: Needs Fixing (continuous-integration)

[lp:~martin-borho/ubuntu-weather-app/anchors-refactoring]

210. By Martin Borho on 2014-02-22

fix for ap tests

211. By Martin Borho on 2014-02-22

a second ap fix

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:211
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/150/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/148
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/148
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/62

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/150/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

At the moment due to it assuming a tablet layout on my n4, the tests fail (4 of them)

review: Needs Fixing

[lp:~martin-borho/ubuntu-weather-app/anchors-refactoring]

212. By Martin Borho on 2014-02-26

fixed AP tests to reflect tablet mode, switched initial MainView back to phone mode

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:212
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/151/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/149
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/149
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/63

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/151/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

review: Approve

=== modified file 'components/AddLocationSheet.qml'
--- components/AddLocationSheet.qml	2014-02-18 20:48:23 +0000
+++ components/AddLocationSheet.qml	2014-02-26 17:08:27 +0000
@@ -31,6 +31,7 @@
         objectName: "AddLocationSheet"
         title: i18n.tr("Add city")
         contentsHeight: parent.height
+        contentsWidth: parent.width
         doneButton: false
 
         Component.onCompleted: {
@@ -120,18 +121,24 @@
         }
 
         container: Item {
-            width: parent.width
+            anchors {
+                right: parent.right
+                left: parent.left
+            }
             Rectangle {
                 id: searchInput
-                width:parent.width-units.gu(2)
                 height:units.gu(5)
-                anchors.horizontalCenter: parent.horizontalCenter
+                anchors {
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                    left: parent.left
+                    leftMargin: units.gu(1)
+                }
                 color: "transparent"
                 TextField {
                     id: locationString
-                    objectName: "SearchField"
-                    width: parent.width
-                    height:parent.height
+                    objectName: "SearchField"                    
+                    anchors.fill: parent
                     placeholderText: i18n.tr("Enter a city name")
                     hasClearButton: true
                     onAccepted: {
@@ -140,8 +147,8 @@
                         locationString.focus = false
                     }
                     primaryItem: Image {
-                        height: parent.height*0.5
-                        width: parent.height*0.5
+                        height: searchInput.height*0.5
+                        width: searchInput.height*0.5
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.verticalCenterOffset: -units.gu(0.2)
                         source: Qt.resolvedUrl("../resources/images/search.svg")
@@ -174,19 +181,26 @@
 
             Rectangle {
                 id: cityList;
-                anchors.top: searchInput.bottom
-                width: parent.width
+                anchors {
+                    top:searchInput.bottom
+                    left: parent.left
+                    right: parent.right
+                }
                 height: addLocationSheet.height-searchInput.height-units.gu(9.5)
                 color: "transparent"
                 visible: true
                 Label {
                     id: noCityError
                     objectName: "noCityError"
-                    width: parent.width-units.gu(6)
                     visible: false
-                    anchors.centerIn: parent
+                    anchors {
+                        fill: parent
+                        leftMargin: units.gu(3)
+                        rightMargin: units.gu(3)
+                    }
                     fontSize: "medium"
                     wrapMode: Text.WordWrap
+                    verticalAlignment: Text.AlignVCenter
                     horizontalAlignment: Text.AlignHCenter
                 }
                 Component {
@@ -218,25 +232,27 @@
                             id: searchResultName
                             objectName: "searchResult" + index
                             text: name
-                            width: parent.width-units.gu(3)
                             elide: Text.ElideRight
                             anchors {
                                 top: parent.top
                                 topMargin: units.gu(0.5)
                                 left: parent.left
                                 leftMargin: units.gu(3)
+                                right: parent.right
+                                rightMargin: units.gu(2)
                             }
                             fontSize: "large"
                         }
                         Label {
                             text: areaLabel
-                            width: parent.width-units.gu(3)
                             elide: Text.ElideRight
                             anchors {
                                 top: searchResultName.bottom
                                 bottom: parent.bottom
                                 left: parent.left
                                 leftMargin: units.gu(3)
+                                right: parent.right
+                                rightMargin: units.gu(2)
                             }
                             fontSize: "small"
                         }

=== removed file 'components/ChartComponent.js'
--- components/ChartComponent.js	2013-03-14 22:12:02 +0000
+++ components/ChartComponent.js	1970-01-01 00:00:00 +0000
@@ -1,197 +0,0 @@
-.pragma library
-
-//canvas object from .pragma
-var canvas = 0;
-var chart = 0;
-
-//enables debugging
-var debug_enabled = 0;
-
-//measurements setted in QML
-var canvasHeight = 0;
-var canvasWidth = 0;
-var canvasXOffset = 0;
-var canvasYOffset = 0;
-
-//array of header labels(times)
-var xLabels = new Array();
-
-function debug(text)
-{
-    if (debug_enabled)
-        console.debug(text);
-}
-
-function refresh()
-{
-    canvas.requestPaint();
-}
-
-//main draw function
-function draw()
-{
-    var context = canvas.getContext("2d");
-    context.clearRect(0, 0, canvas.width, canvas.height);
-    context.save();
-    context.globalAlpha = canvas.alpha;
-
-    drawGrid(context);
-    drawTemperatures(context);
-    drawCurrentTime(context);
-    context.restore();
-}
-
-//draw background grid
-function drawGrid(context)
-{
-    //remove all xLabels
-    while (xLabels.length > 0)
-    {
-        var label = xLabels.pop();
-        label.text = "";
-        label.destroy();
-    }
-
-    var maxHSections = 24;
-    var hSectionSize = canvasWidth/maxHSections;
-
-    var hours = chart.xAxisHours;
-    var startX = 0, startY = 0, endX = 0, endY = 0;
-
-    //draw vertical lines
-    for (var i = 1 ; i < hours.length - 1; i++)
-    {
-        startX = hours[i]*hSectionSize + canvasXOffset;
-        startY = canvas.height;
-        endX = hours[i]*hSectionSize + canvasXOffset;
-        endY = canvasYOffset;
-        drawLine(context, startX, startY, endX, endY, chart.gridColor,1);
-        //create and add hourLabel to the array
-        xLabels.push(Qt.createQmlObject("import QtQuick 2.0;Text{text:\"" + hours[i] +":00\"; y:" + canvasYOffset + " - height; x:" + hours[i]*hSectionSize + "- width/2; color:\"" + chart.trendColor + "\"}", canvas, "labels"));
-    }
-
-    //draw horizontal lines
-    var vSectionSize = canvasHeight/(chart.gridHorizontalLinesCount + 1);
-    for (var i = 1 ; i < chart.gridHorizontalLinesCount +1  ; i++)
-    {
-        startX = canvasXOffset;
-        startY = i * vSectionSize + canvasYOffset;
-        endX = canvasXOffset+canvas.width;
-        endY = i*vSectionSize + canvasYOffset;
-
-        drawLine(context, startX, startY, endX, endY, chart.gridColor,1);
-    }
-}
-
-//draw current time vertical bar
-function drawCurrentTime(context)
-{
-    var currentMinutes = parseFloat(Qt.formatDateTime(new Date(), "m")) + (parseFloat(Qt.formatDateTime(new Date(), "h")) * 60);
-    var currentTimeWidth = 4;
-    var currentTimeColor = "#DD4814";
-    var position = ((currentMinutes * canvas.width)/(24 * 60)) - (currentTimeWidth/2);
-
-    drawLine(context,position+canvasXOffset, canvas.height,position+canvasXOffset,canvasYOffset+1, currentTimeColor, currentTimeWidth);
-}
-
-//draw temperature points and lines on the chart
-function drawTemperatures(context)
-{
-    context.strokeStyle = chart.trendColor;
-    context.lineWidth = chart.trendWidth;
-
-    var maxTemp = -999;
-    var minTemp = 999;
-    var circleColor = "#DD4814";
-    var circleRadius = 4;
-    var temperatures = chart.temperatures;
-
-    //determine min and max temp
-    for (var i = 0 ; i < temperatures.length ; i++)
-    {
-        if (parseFloat(temperatures[i].temp) > maxTemp)
-            maxTemp = temperatures[i].temp;
-        if (parseFloat(temperatures[i].temp) < minTemp)
-            minTemp = temperatures[i].temp;
-    }
-
-    var positions = new Array();
-
-    //draw temperature points
-    for (var i = 0 ; i < temperatures.length ; i++)
-    {
-        //get time and temp from array
-        var temp = temperatures[i].temp;
-        var times = temperatures[i].time.split(":");
-        var time = (parseFloat(times[0]) * 60) + parseFloat(times[1]);
-
-        //count X and Y based on canvas dimensions and offsets
-        var posX = canvasXOffset + ((time * canvas.width)/(24 * 60)) - (chart.trendWidth/2);
-        var posY = (canvasHeight) - (canvasHeight - canvasYOffset - circleRadius) * ((parseInt(temp) - Math.abs(minTemp)) / (maxTemp - minTemp));
-        if (posY == canvasHeight)
-            posY -= circleRadius;
-
-        //draw temperature point
-        //drawCircle(context, posX, posY, circleRadius, circleColor);
-        positions.push({'posY':posY, 'posX':posX})
-    }
-
-    drawTemperatureLines(context,positions,circleColor);
-}
-
-//draw lines connecting temperature points
-//WORK IN PROGRESS. should be smooth paths
-function drawTemperatureLines(context, positions, color)
-{
-    var posX = 0, posY = 0, prevX, prevY;
-
-    context.save();
-    context.strokeStyle = chart.trendColor;
-    context.lineWidth = 2;
-    context.lineJoin  = "round";
-    context.beginPath();
-
-    for (var i = 0 ; i < positions.length ; i++)
-    {
-        posY = positions[i].posY;
-        posX = positions[i].posX;
-
-        if (i == 0)
-        {
-            context.moveTo(posX, posY);
-        }
-        else
-        {
-            prevX = positions[i-1].posX;
-            prevY = positions[i-1].posY;
-            context.lineTo(posX, posY);
-        }
-    }
-    context.stroke();
-    context.restore();
-}
-
-//general function for circle drawing
-function drawCircle(context, x, y, radius, color)
-{
-  context.save();
-  context.fillStyle = color;
-  context.beginPath();
-  context.arc(x, y, radius,0,Math.PI*2,true); // Outer circle
-  context.fill();
-  context.restore();
-}
-
-//general function for line drawing
-function drawLine(context, startX, startY, endX, endY, color, width)
-{
-    context.save();
-    context.lineWidth = width;
-    context.strokeStyle = color;
-    context.beginPath();
-    context.moveTo(startX,startY);
-    context.lineTo(endX,endY);
-    context.closePath();
-    context.stroke();
-    context.restore();
-}

=== removed file 'components/ChartComponent.qml'
--- components/ChartComponent.qml	2013-03-14 21:46:34 +0000
+++ components/ChartComponent.qml	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "ChartComponent.js" as ChartFunctions
-
-Rectangle {
-    id: chart
-    anchors.horizontalCenter: parent.horizontalCenter
-    width: parent.width-units.gu(2)
-    height: units.gu(20)
-
-    property string backgroundColor: "#D6D6D6"
-    property string gridColor: "#FFFFFF"
-    property int gridWidth: 1
-    property int gridHorizontalLinesCount: 4
-    property int headerSize: units.gu(4)
-    property string trendColor: "#313131"
-    property int trendWidth: 2
-    //property variant xAxisHours: [0,6,12,18,24]
-    property variant xAxisHours: [0,3,6,9,12,15,18,21,24]
-    property variant temperatures: [{"time" : "0:10", "temp" : "3"},
-                                    {"time" : "2:00", "temp" : "7"},
-                                    {"time" : "6:00", "temp" : "9"},
-                                    {"time" : "10:30", "temp" : "12"},
-                                    {"time" : "12:00", "temp" : "24"},
-                                    {"time" : "18:10", "temp" : "20"},
-                                    {"time" : "22:22", "temp" : "10"}]
-    property bool showExtremeHours: false
-
-    function refresh()
-    {
-        ChartFunctions.refresh();
-    }
-
-    UbuntuShape{
-       id: contentShape
-       radius: "small"
-       width: parent.width
-       height: parent.height-units.gu(6)
-       anchors.bottom: parent.bottom
-       anchors.bottomMargin: units.gu(1)
-       color: backgroundColor
-    }
-    Canvas{
-        id:canvas
-        width: parent.width
-        height: parent.height-units.gu(2)
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: units.gu(1)
-        antialiasing: true
-
-        onPaint: {
-            ChartFunctions.canvas = canvas;
-            ChartFunctions.chart = chart;
-
-            ChartFunctions.canvasHeight = canvas.height;
-            ChartFunctions.canvasWidth = canvas.width;
-            ChartFunctions.canvasXOffset = 0;
-            ChartFunctions.canvasYOffset = canvas.height - contentShape.height;
-
-            ChartFunctions.draw();
-        }
-   }
-}

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2014-02-20 16:17:04 +0000
+++ components/CurrentWeather.qml	2014-02-26 17:08:27 +0000
@@ -54,7 +54,6 @@
 
     property NumberAnimation appearAnimation: frontrect.conditionIcon.appearAnimation
 
-    width: parent.width
     anchors.fill: parent
     anchors.horizontalCenter: parent.horizontalCenter
 
@@ -103,12 +102,12 @@
                          anchors {
                              horizontalCenter: parent.horizontalCenter
                              verticalCenter: parent.verticalCenter
-                             verticalCenterOffset: -(parent.height*0.1);
+                             verticalCenterOffset: -(layouts.height*0.1);
                          }
                      }
                      CurrentWeatherDetail {
                          id: backrect
-                         height: parent.height/2
+                         height: layouts.height/2
                          shapeSize: units.gu(14)
                          gridColumns: 4
                          anchors {
@@ -123,10 +122,7 @@
         ]
         Flipable {
             id: flipable
-            height: parent.height
-            width:parent.width
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.verticalCenterOffset: -units.gu(3)
+            anchors.fill: parent
             property bool flipped: false
 
             Components.ScrollingArea {}

=== modified file 'components/DateComponent.qml'
--- components/DateComponent.qml	2013-10-08 19:26:12 +0000
+++ components/DateComponent.qml	2014-02-26 17:08:27 +0000
@@ -19,14 +19,14 @@
 import Ubuntu.Components 0.1
 
 Rectangle {
-    width: parent.width
-    height: childrenRect.height
+    anchors {
+        left: parent.left
+        right:parent.right
+    }
+    height: units.gu(4)
     color: "transparent"
-    property bool borderTopVisible: true
     property string dateRelative: ""
     property string dateString: ""
-    property string borderColor: "transparent"
-    property int borderHeight: units.gu(0.1)
 
     Component.onCompleted: {        
         renderText()
@@ -41,35 +41,15 @@
         dayText.text = dateText
     }
 
-    Rectangle {
-        id: topBorder
-        visible: borderTopVisible
-        width:parent.width
-        height: borderHeight
-        color: borderColor
-    }
-
-    Item {
-        id: dayLabel
-        width:parent.width-units.gu(4.5)
-        height: units.gu(4)
-        anchors.top: topBorder.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-
-        Label {
-            id: dayText
-            objectName: "DayDateLabel"
-            height: parent.height
-            verticalAlignment: Text.AlignVCenter
-            color: Theme.palette.normal.baseText
-            style: Text.Raised
+    Label {
+        id: dayText
+        objectName: "DayDateLabel"
+        anchors {
+            fill: parent
+            leftMargin: units.gu(2.2)
         }
-    }
-
-    Rectangle {
-        width:parent.width
-        height: borderHeight
-        anchors.top: dayLabel.bottom
-        color: borderColor
+        verticalAlignment: Text.AlignVCenter
+        color: Theme.palette.normal.baseText
+        style: Text.Raised
     }
 }

=== modified file 'components/LastUpdatedComponent.qml'
--- components/LastUpdatedComponent.qml	2013-10-08 19:26:12 +0000
+++ components/LastUpdatedComponent.qml	2014-02-26 17:08:27 +0000
@@ -20,11 +20,13 @@
 import Ubuntu.Components 0.1
 
 Rectangle {
-    width:parent.width-units.gu(4.5)
     height: units.gu(4)
-    anchors.bottom: parent.bottom
-    anchors.bottomMargin: units.gu(2)
-    anchors.horizontalCenter: parent.horizontalCenter
+    anchors {
+        left: parent.left
+        right:parent.right
+        bottom: parent.bottom
+        bottomMargin: units.gu(2)
+    }
     color: "transparent"
 
     property string updateDate;
@@ -44,7 +46,10 @@
     Label {
         id: lastUpdatedLabel
         objectName: "LastUpdatedLabel"
-        height: parent.height
+        anchors {
+            fill: parent
+            leftMargin: units.gu(2.2)
+        }
         verticalAlignment: Text.AlignVCenter
         color: Theme.palette.normal.baseText
         style: Text.Raised

=== modified file 'components/LocationManagerSheet.qml'
--- components/LocationManagerSheet.qml	2014-02-08 13:25:26 +0000
+++ components/LocationManagerSheet.qml	2014-02-26 17:08:27 +0000
@@ -31,6 +31,7 @@
         objectName: "LocationManagerSheet"
         title: i18n.tr("Edit locations")
         contentsHeight: parent.height
+        contentsWidth: parent.width
 
         property int initial_sum: 0
 
@@ -112,7 +113,10 @@
         container: Column {
             anchors.fill: parent
             Rectangle {
-                width: parent.width
+                anchors {
+                    left:parent.left
+                    right: parent.right
+                }
                 height: units.gu(5)
                 color: "transparent"
                 Label {
@@ -127,7 +131,10 @@
             }
             Rectangle {
                 color: "#A9A9A9"
-                width:parent.width
+                anchors {
+                    left:parent.left
+                    right: parent.right
+                }
                 height: units.gu(0.1)
             }
             ListItem.Standard {
@@ -170,26 +177,28 @@
                     id: currentLocationLabel
                     objectName: "CurrentLocationLabel"
                     text: ""
-                    width: parent.width-lookupItemAddButton.width-units.gu(5.5)
                     elide: Text.ElideRight
-                    anchors {
+                    anchors {                        
                         top: parent.top
                         topMargin: units.gu(0.5)
                         left: parent.left
                         leftMargin: units.gu(3)
+                        right:parent.right
+                        rightMargin: lookupItemAddButton.width+units.gu(5.5)
                     }
                     fontSize: "large"
                 }
                 Label {
                     id: currentLocationAreaLabel
                     text: ""
-                    width: parent.width-lookupItemAddButton.width-units.gu(5.5)
                     elide: Text.ElideRight
                     anchors {
                         top: currentLocationLabel.bottom
                         bottom: parent.bottom
                         left: parent.left
                         leftMargin: units.gu(3)
+                        right:parent.right
+                        rightMargin: lookupItemAddButton.width+units.gu(5.5)
                     }
                     fontSize: "small"
                 }
@@ -212,7 +221,10 @@
                 }
             }
             Rectangle {
-                width: parent.width
+                anchors {
+                    left:parent.left
+                    right: parent.right
+                }
                 height: units.gu(5)
                 color: "transparent"
                 Label {
@@ -227,11 +239,17 @@
             }
             Rectangle {
                 color: "#A9A9A9"
-                width:parent.width
+                anchors {
+                    left:parent.left
+                    right: parent.right
+                }
                 height: units.gu(0.1)
             }
             Rectangle {
-                width: parent.width
+                anchors {
+                    left:parent.left
+                    right: parent.right
+                }
                 clip:true
                 color:"transparent"
                 height: locationManagerSheet.height-locationLookupItem.height-units.gu(19.2)
@@ -245,25 +263,27 @@
                             id: searchResultName
                             objectName: "existingLocation" + index
                             text: name
-                            width: parent.width-units.gu(3)
                             elide: Text.ElideRight
                             anchors {
                                 top: parent.top
                                 topMargin: units.gu(0.5)
                                 left: parent.left
                                 leftMargin: units.gu(3)
+                                right:parent.right
+                                rightMargin: units.gu(3)
                             }
                             fontSize: "large"
                         }
                         Label {
                             text: adminName1.replace(/ Region$/,'')+", "+((Countries.codes[country]) ? i18n.tr(Countries.codes[country]): country)
-                            width: parent.width-units.gu(3)
                             elide: Text.ElideRight
                             anchors {
                                 top: searchResultName.bottom
                                 bottom: parent.bottom
                                 left: parent.left
                                 leftMargin: units.gu(3)
+                                right:parent.right
+                                rightMargin: units.gu(3)
                             }
                             fontSize: "small"
                         }

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2014-02-21 10:25:47 +0000
+++ components/LocationTab.qml	2014-02-26 17:08:27 +0000
@@ -143,14 +143,19 @@
                         color: "transparent"
                         ItemLayout {
                             item: "ForecastList"
-                            width: parent.width*0.625
-                            height:parent.height
+                            width: layouts.width*0.625
+                            anchors {
+                                top: parent.top
+                                bottom: parent.bottom
+                            }
                         }
                         Rectangle {
-                            width: parent.width*0.375
-                            height:parent.height
-                            anchors.right: parent.right
-                            anchors.top: parent.top
+                            width: layouts.width*0.375
+                            anchors {
+                                top: parent.top
+                                bottom:parent.bottom
+                                right: parent.right
+                            }
                             color: "black"
                             opacity: 0.3
                         }
@@ -158,34 +163,37 @@
                             item: "TabFooter"
                             // We're making the footer to be full-width
                             // so that it looks good on a Nexus 7
-                            //width: parent.width // * 0.625
                             height: units.gu(8)
-                            anchors.bottom: parent.bottom
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            clip: true
+                            anchors {
+                                bottom: parent.bottom
+                                left: parent.left
+                                right: parent.right
+                            }
                         }
                         Rectangle {
                             id: sideLabel
+                            objectName: "SideLabel"
                             anchors.top: parent.top
                             anchors.right: parent.right
-                            width: parent.width*0.375
+                            width: layouts.width*0.375
                             height: units.gu(6)
                             color: "transparent"
                             Label {
                                 text: i18n.tr("Forecast")
                                 fontSize: "large"
-                                anchors.left:parent.left
-                                anchors.leftMargin: units.gu(3)
-                                verticalAlignment: Text.AlignVCenter
-                                anchors.top: parent.top;
-                                anchors.bottom: parent.bottom
+                                anchors {
+                                    left:parent.left
+                                    leftMargin: units.gu(3)
+                                    top: parent.top;
+                                    bottom: parent.bottom
+                                }
+                                verticalAlignment: Text.AlignVCenter                                
                             }
                         }
                         ListView {
                             id: locationDailySide
-                            width: (parent.width*0.375)-units.gu(1)
-                            height: parent.height-sideLabel.height-units.gu(9)
+                            width: (layouts.width*0.375)-units.gu(1)
+                            height: layouts.height-sideLabel.height-units.gu(9)
                             anchors.right: parent.right
                             anchors.top: sideLabel.bottom
                             model:dayForecastModel
@@ -230,8 +238,7 @@
             ListView {
                 id: dailyForecastList
                 objectName: "DailyForecastList"
-                width: parent.width
-                height:parent.height
+                anchors.fill:parent
                 model:dayForecastModel
                 Layouts.item: "ForecastList"
                 onCurrentIndexChanged: {
@@ -251,7 +258,10 @@
 
                 delegate: Item {
                     id: dailyForecastItem
-                    width:parent.width
+                    anchors {
+                        left:parent.left
+                        right: parent.right
+                    }
                     height: locationPage.height
 
                     property NumberAnimation appearAnimation: currentWeatherComponent.appearAnimation
@@ -261,16 +271,18 @@
 
                     Rectangle {
                         id: listRectangle
-                        width: parent.width
                         height: dailyForecastList.height-tabFooter.height
-                        anchors.top: parent.top
+                        anchors {
+                            left:parent.left
+                            right: parent.right
+                            top: parent.top
+                        }
                         color: "transparent"
 
                         DateComponent {
                             id: dateComponent
                             dateRelative: dateRel
                             dateString: date
-                            borderTopVisible: false
                         }
                         CurrentWeather {
                             id: currentWeatherComponent
@@ -325,12 +337,17 @@
                 Rectangle {
                     id: noDataAvaible
                     visible: false
-                    width:parent.width-units.gu(10)
-                    anchors.centerIn:parent
-                    anchors.verticalCenterOffset: -units.gu(10)
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(5)
+                        right: parent.right
+                        rightMargin: units.gu(5)
+                        verticalCenter: parent.verticalCenter
+                        verticalCenterOffset: -units.gu(10)
+                    }
                     color: "transparent"
                     Label {
-                        width:parent.width
+                        anchors.fill:parent
                         text: i18n.tr("No weather data available at the moment, please try to refresh later again!")
                         fontSize: "large"
                         wrapMode: Text.WordWrap

=== modified file 'components/ScrollingArea.qml'
--- components/ScrollingArea.qml	2014-02-18 17:55:17 +0000
+++ components/ScrollingArea.qml	2014-02-26 17:08:27 +0000
@@ -9,7 +9,7 @@
     property int lastIndex: -1
     anchors.fill: parent
     anchors.top: parent.top
-    anchors.topMargin: units.gu(3.5)
+    anchors.topMargin: units.gu(1.2)
     onClicked: {
         mouse.accepted = true;
         if(!wasHourlyScrolled) {
@@ -36,7 +36,7 @@
     }
     onPositionChanged: {
         mouse.accepted = true;
-        var distance = (parent.height - mouse.y),
+        var distance = (flippedarea.height - mouse.y),
             now = new Date().getTime(),
             speed = distance/(now-startTime);
         if(speed < 2.3 && !flipable.flipped) {

=== modified file 'components/SettingsSheet.qml'
--- components/SettingsSheet.qml	2014-02-15 14:31:10 +0000
+++ components/SettingsSheet.qml	2014-02-26 17:08:27 +0000
@@ -26,6 +26,7 @@
         objectName: "SettingsSheet"
         title: i18n.tr("Settings")
         contentsHeight: parent.height
+        contentsWidth: parent.width
 
         container: Column {
             anchors.left: parent.left

=== modified file 'components/SplashComponent.qml'
--- components/SplashComponent.qml	2013-10-01 19:51:22 +0000
+++ components/SplashComponent.qml	2014-02-26 17:08:27 +0000
@@ -19,23 +19,26 @@
 import Ubuntu.Components 0.1
 
 UbuntuShape {
-    id: httpFailedSplash
-    width: parent.width-units.gu(10)
+    id: httpFailedSplash    
     color: "#F5F5F5"
     visible: (opacity > 0.0)
     opacity: 0
     z:100
     anchors {
-        horizontalCenter: parent.horizontalCenter
         top: parent.top
         topMargin:units.gu(15)
+        left: parent.left
+        leftMargin: units.gu(5)
+        right: parent.right
+        rightMargin: units.gu(5)
     }
     property string message: i18n.tr("Couldn't load weather data, please try later again!")
 
     Label {
         text: message
-        anchors.centerIn: parent
-        width: parent.width-units.gu(3)
+        anchors.fill:parent
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
         fontSize: "medium"
         color: "#838383"
         wrapMode: Text.WordWrap
@@ -45,7 +48,6 @@
         interval: 2000
         repeat: false
         onTriggered: {
-
             hideSplashBox.start()
         }
     }

=== modified file 'components/TabFooter.qml'
--- components/TabFooter.qml	2014-02-19 13:39:04 +0000
+++ components/TabFooter.qml	2014-02-26 17:08:27 +0000
@@ -19,16 +19,13 @@
 import Ubuntu.Components 0.1
 
 Rectangle {
-    width: parent.width
     height: units.gu(8)
-    anchors.bottom: parent.bottom
+    anchors {
+        left: parent.left
+        right: parent.right
+        bottom: parent.bottom
+    }
 
-    /**
-    * TODO
-    *
-    * at the moment it's unknown to the developer, in which way a link to
-    * the weatherchannel website can be generated from wunderground-API data
-    */
     function openTWCLink(type) {
         var serviceId = locationTab.locationData.location.services["weatherchannel"],
             loc_name = Qt.locale().name, url = "http://";
@@ -85,12 +82,19 @@
 
     Rectangle {
         id: forecastLink
-        anchors.left:parent.left
-        anchors.leftMargin: units.gu(1)
+        anchors {
+            left:parent.left
+            leftMargin: units.gu(1)
+            top: parent.top
+            bottom:parent.bottom
+        }
         width:units.gu(14)
-        height:parent.height
         Label {
-            anchors.verticalCenter: parent.verticalCenter
+            verticalAlignment: Text.AlignVCenter
+            anchors {
+                bottom: parent.bottom
+                top: parent.top
+            }
             text: i18n.tr("10 days forecast")
             fontSize:"medium"
             color: mainView.footerColor
@@ -101,11 +105,18 @@
         }
     }
     Rectangle {
-        anchors.left:forecastLink.right
+        anchors {
+            top: parent.top
+            bottom:parent.bottom
+            left:forecastLink.right
+        }
         width:units.gu(15)
-        height:parent.height
         Label {
-            anchors.verticalCenter: parent.verticalCenter
+            verticalAlignment: Text.AlignVCenter
+            anchors {
+                bottom: parent.bottom
+                top: parent.top
+            }
             text: ">> "+i18n.tr("Hourly forecast")
             fontSize:"medium"
             color: mainView.footerColor
@@ -116,16 +127,22 @@
         }
     }
     Rectangle {
-        anchors.right: serviceLogo.left
         width:units.gu(0.25)
-        height: parent.height
+        anchors {
+            top: parent.top
+            bottom:parent.bottom
+            right: serviceLogo.left
+        }
         color: mainView.footerColor
     }
     Rectangle {
         id: serviceLogo
         width:units.gu(9)
-        height:parent.height
-        anchors.right: parent.right
+        anchors {
+            top: parent.top
+            bottom:parent.bottom
+            right: parent.right
+        }
         Label {
             anchors.verticalCenter: parent.verticalCenter
             anchors.centerIn: parent

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2014-02-18 17:55:17 +0000
+++ components/WeatherApi.js	2014-02-26 17:08:27 +0000
@@ -585,14 +585,8 @@
                 }),
                 onErrorHandler = (function(err) {
                     onError(err);
-                }),
-                retryHandler = (function(err) {
-                    print(JSON.stringify(err))
-                    console.log("retry of "+err.request.url);
-                    //var retryFunc = handlerMap[err.request.type];
-                    //apiCaller(retryFunc, addDataToResponse, onErrorHandler);
-                })
-            apiCaller(handlerMap.all, addDataToResponse, retryHandler);
+                });
+            apiCaller(handlerMap.all, addDataToResponse, onErrorHandler);
         }
     }
 })();

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-02-15 14:31:10 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-02-26 17:08:27 +0000
@@ -20,7 +20,7 @@
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
-from testtools.matchers import Equals
+from testtools.matchers import Equals, Is, Not
 from autopilot.matchers import Eventually
 
 import ubuntu_weather_app
@@ -88,11 +88,15 @@
     def get_qml_view(self):
         return self.app.select_single("QQuickView")
 
+    """Test if tabs with data are present in tablet mode"""
+    def _ensure_tablet_tabs_loaded(self):
+        self.assertThat(lambda: self.main_window.wait_select_single('QQuickRectangle', visible=True, objectName='SideLabel'), 
+            Eventually(Not(Is(None)), timeout=60))
+
     @property
     def main_window(self):
         return self.app.select_single(MainView)
 
-
 class SheetMixin(object):
     """A mixin to to give access to common sheet elements"""
 

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2014-02-15 14:31:10 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2014-02-26 17:08:27 +0000
@@ -84,6 +84,8 @@
 
     def _refresh(self, kb=False):
         # get the dates from the test data
+        if self.main_window.wideAspect:
+            self._ensure_tablet_tabs_loaded()
         self.assertThat(lambda: self.main_window.select_many('Label', objectName='DayDateLabel'), Eventually(Not(Is(None))))
         curr_dates = self.main_window.select_many('Label', objectName='DayDateLabel')
         tab1_curr_date = curr_dates[0].text
@@ -96,7 +98,7 @@
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
 
         # get the data from the refreshed tabs, have to be new
-        self.assertThat(lambda: self.main_window.select_many('Label',objectName='DayDateLabel'), Eventually(Not(Is(None))))
+        self.assertThat(lambda: self.main_window.select_many('Label',objectName='DayDateLabel'), Eventually(Not(Is(None)), timeout=60))
         refreshed_dates = self.main_window.select_many('Label',objectName='DayDateLabel')
         self.assertNotEqual(tab1_curr_date, refreshed_dates[0].text)
         self.assertNotEqual(tab2_curr_date, refreshed_dates[2].text)

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2014-02-18 17:55:17 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2014-02-26 17:08:27 +0000
@@ -41,14 +41,16 @@
         self.pointing_device.move_to_object(sheet)
 
     def _check_units(self, units):
-        """Checks selected units by values from the first location tab"""
-        self.assertThat(lambda: self.main_window.select_many('QQuickText', objectName='CurrentTempText'), 
+        """Checks selected units by values from the first location tab"""        
+        if self.main_window.wideAspect:
+            self._ensure_tablet_tabs_loaded()
+        self.assertThat(lambda: self.main_window.select_many('QQuickText', objectName='CurrentTempText'),
             Eventually(Not(Is(None))))
-        current_location_tab = self.main_window.select_single(
+        current_location_tab = self.main_window.wait_select_single(
             'LocationTab', visible=True)
-        today_item = current_location_tab.select_single(
+        today_item = current_location_tab.wait_select_single(
             'QQuickItem', focus=True)
-        today_temp = today_item.select_single(
+        today_temp = today_item.wait_select_single(
             'QQuickText', objectName='CurrentTempText')
         today_temp_scale = today_item.select_single(
             'QQuickText', objectName='CurrentTempScale')
@@ -67,8 +69,10 @@
 
     def _check_wind_units(self, wind_units):
         """Checks selected units by values from the first location tab"""
-        self.assertThat(lambda: self.main_window.select_many('WeatherDetailComponent', objectName='WindSpeedValue')[0], 
-            Eventually(Not(Is(None))))
+        if self.main_window.wideAspect:
+            self._ensure_tablet_tabs_loaded()
+        self.assertThat(lambda: self.main_window.select_many('WeatherDetailComponent', objectName='WindSpeedValue')[0],
+             Eventually(Not(Is(None))))
         current_location_tab = self.main_window.select_single(
             'LocationTab', visible=True)
         focused_item = current_location_tab.select_single(
@@ -90,7 +94,9 @@
 
     def _check_precipitation_units(self, pre_units):
         """Checks selected units by values from the first location tab"""
-        self.assertThat(lambda: self.main_window.select_many('WeatherDetailComponent', objectName='PrecipitationValue')[0], 
+        if self.main_window.wideAspect:
+            self._ensure_tablet_tabs_loaded()
+        self.assertThat(lambda: self.main_window.select_many('WeatherDetailComponent', objectName='PrecipitationValue')[0],
             Eventually(Not(Is(None))))
         current_location_tab = self.main_window.select_single(
             'LocationTab', visible=True)
@@ -113,7 +119,9 @@
 
     def _check_service(self, service):
         """Checks selected units weather data service from the first location tab"""
-        self.assertThat(lambda: self.main_window.select_many('TabFooter', objectName='TabFooter')[0], 
+        if self.main_window.wideAspect:
+            self._ensure_tablet_tabs_loaded()
+        self.assertThat(lambda: self.main_window.select_many('TabFooter', objectName='TabFooter')[0],
             Eventually(Not(Is(None))))
         current_location_tab = self.main_window.select_single('LocationTab', visible=True)
         self.assertThat(lambda: current_location_tab.select_single('TabFooter', objectName='TabFooter'), 

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2014-02-21 10:40:01 +0000
+++ ubuntu-weather-app.qml	2014-02-26 17:08:27 +0000
@@ -31,7 +31,7 @@
 
     id: mainView
     
-    width: units.gu(107)
+    width: units.gu(50)
     height: units.gu(67)
 
     headerColor: "#E04414"
@@ -42,6 +42,8 @@
     property string newBackgroundColor: "#E04414"
     property string newFooterColor: "#E1983E"
 
+    property bool wideAspect: width >= units.gu(80)
+
     property var locationsList: []
     property var tabsObject: null
     property int tabIndexAtRefresh: -1
@@ -257,8 +259,7 @@
 
     Page {
         id:tabPage
-        width: parent.width
-        height:parent.height
+        anchors.fill: parent
     }
 
 }