Merge lp:~nik90/ubuntu-weather-app/minor-headerrow-tweak into lp:ubuntu-weather-app

[Nekhelesh Ramananthan]

- Adjusted the top margin spacing of the location name shown in the home page to 2 grid units as shown in the design spec [1].

- Improved HeaderRow.qml by using RowLayout which allows us to remove calculations like width: parent.width - spacing - icon.width and so on.

- Minor code clean up of LocationsPage.qml

[1] https://docs.google.com/presentation/d/1tXcyMBvJAYvwFvUAmTTYzmBP2NFQgbG_Gy8e2gv91kU/edit#slide=id.g3c301e3c2_05

Just a minor MP which does the following,
- Adjusted the top margin spacing of the location name shown in the home page to 2 grid units as shown in the design spec [1].

- Improved HeaderRow.qml by using RowLayout which allows us to remove calculations like width: parent.width - spacing - icon.width and so on.

- Minor code clean up of LocationsPage.qml

[1] https://docs.google.com/presentation/d/1tXcyMBvJAYvwFvUAmTTYzmBP2NFQgbG_Gy8e2gv91kU/edit#slide=id.g3c301e3c2_05

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

PASSED: Continuous integration, rev:35
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/69/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/69

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

lgtm, however, I think some of the instances where properties are being reordered seem odd--as I'm used to either mostly strict alphabetical ordering (Andrew is quite adamant about this) or some mix of logical grouping and alphabetization (height and width grouped, but height is always first).

review: Approve

[Nekhelesh Ramananthan (nik90)]

> lgtm, however, I think some of the instances where properties are being
> reordered seem odd--as I'm used to either mostly strict alphabetical ordering
> (Andrew is quite adamant about this) or some mix of logical grouping and
> alphabetization (height and width grouped, but height is always first).

Ah I wasn't aware of that. I fixed the order.

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

PASSED: Continuous integration, rev:36
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/72/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/72

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-autolanding/34/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-autolanding/25/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/34/console

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

Merge conflict \o/

Text conflict in po/com.ubuntu.weather.pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

[Victor Thompson (vthompson)]

It'd be nice if we found a way to have CMake not update the *.pot file if no strings are changing. Having it update the date when nothing has changed is unnecessary.

[lp:~nik90/ubuntu-weather-app/minor-headerrow-tweak]

37. By Nekhelesh Ramananthan on 2015-04-11

Merged lp:ubuntu-weather-app/reboot and fixed code conflict

[Nekhelesh Ramananthan (nik90)]

Code conflict resolved :-)

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

PASSED: Continuous integration, rev:37
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/73/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/43
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/73

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Damn Jenkins runs really fast on weather reboot. Takes ages in the clock app.

[Victor Thompson (vthompson)]

I've noticed the same in comparison to music. Having no tests will do that. ;)

Approved!

review: Approve

=== modified file 'app/components/HeaderRow.qml'
--- app/components/HeaderRow.qml	2015-02-09 19:49:06 +0000
+++ app/components/HeaderRow.qml	2015-04-11 00:28:08 +0000
@@ -17,15 +17,16 @@
  */
 
 import QtQuick 2.3
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.1
 
-
-Row {
-    spacing: units.gu(2)
+RowLayout {
+    id: headerRow
+
+    property alias locationName: locationNameLabel.text
+
     width: parent.width
 
-    property alias locationName: locationNameLabel.text
-
     Label {
         id: locationNameLabel
         color: UbuntuColors.darkGrey
@@ -33,7 +34,7 @@
         font.weight: Font.Normal
         fontSize: "large"
         height: settingsButton.height
-        width: parent.width - settingsButton.width - parent.spacing
+        Layout.fillWidth: true
         verticalAlignment: Text.AlignVCenter
     }
 
@@ -45,20 +46,16 @@
         onClicked: mainPageStack.push(Qt.resolvedUrl("../ui/SettingsPage.qml"))
 
         Rectangle {
-            anchors {
-                fill: parent
-            }
+            anchors.fill: parent
             color: Theme.palette.selected.background
             visible: parent.pressed
         }
 
         Icon {
-            anchors {
-                centerIn: parent
-            }
+            anchors.centerIn: parent
             color: UbuntuColors.darkGrey
+            height: width
             name: "settings"
-            height: width
             width: units.gu(2.5)
         }
     }

=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml	2015-04-04 12:01:21 +0000
+++ app/ui/LocationPane.qml	2015-04-11 00:28:08 +0000
@@ -113,7 +113,9 @@
 
     Column {
         id: locationTop
+
         anchors {
+            top: parent.top
             left: parent.left
             right: parent.right
             margins: units.gu(2)

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-03-21 17:08:40 +0000
+++ app/ui/LocationsPage.qml	2015-04-11 00:28:08 +0000
@@ -82,16 +82,13 @@
 
             Item {
                 anchors {
-                    bottom: parent.bottom
-                    left: parent.left
+                    fill: parent
                     leftMargin: units.gu(2)
-                    right: parent.right
                     rightMargin: units.gu(2)
-                    top: parent.top
                 }
 
                 Label {
-                    id: nameLabel
+                    id: locationName
                     anchors {
                         left: parent.left
                         right: weatherImage.visible ? weatherImage.left : parent.right
@@ -104,18 +101,15 @@
 
                 Icon {
                     id: weatherImage
-                    anchors {
-                        horizontalCenter: parent.horizontalCenter
-                        verticalCenter: parent.verticalCenter
-                    }
+                    anchors.centerIn: parent
+                    name: icon
                     height: units.gu(3)
-                    name: icon
-                    visible: locationsPage.state === "default"
                     width: units.gu(3)
+                    visible: locationsPage.state === "default"
                 }
 
                 Label {
-                    id: nowLabel
+                    id: temperatureLabel
                     anchors {
                         left: weatherImage.right
                         leftMargin: units.gu(1)
@@ -126,13 +120,10 @@
                     elide: Text.ElideRight
                     font.pixelSize: units.gu(4)
                     font.weight: Font.Light
-                    horizontalAlignment: Text.AlignRight                    
-                    text: temp + ""+ settings.tempScale
+                    horizontalAlignment: Text.AlignRight
+                    text: temp + settings.tempScale
                     visible: locationsPage.state === "default"
                 }
-                Component.onCompleted: {
-
-                }
             }
 
             ListItem.ThinDivider {

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-04-09 22:28:40 +0000
+++ po/com.ubuntu.weather.pot	2015-04-11 00:28:08 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-07 21:22+0200\n"
+"POT-Creation-Date: 2015-04-11 02:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"