Merge lp:~verzegnassi-stefano/ubuntu-clock-app/fix-1371229 into lp:ubuntu-clock-app

[Stefano Verzegnassi]

Fixed the wrong alignment of "Add city" button when the application is not localized in English.

Fixed the wrong alignment of "Add city" button when the application is not localized in English.

[Nekhelesh Ramananthan (nik90)]

LGTM! Nice work and thnx for the patch Stefano. Would you mind updating the debian/changelog file please.

Just nano debian/changelog, and add an entry with your name and bug number as others have done.

review: Approve

[Stefano Verzegnassi (verzegnassi-stefano)]

Updated as requested. (Not sure if Launchpad notifies proposed branch changes)

[Nekhelesh Ramananthan (nik90)]

Perfect! Thanks a lot mate! I cannot merge yet since the jenkins autolander seems broken atm, but it should go in asap.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-clock-app-autolanding/73/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/432
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-clock-app-utopic-amd64-autolanding/52
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/676
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13479

review: Needs Fixing (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-clock-app-autolanding/171/
Executed test runs:

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-09-04 20:08:39 +0000
+++ app/clock/ClockPage.qml	2014-09-19 15:23:29 +0000
@@ -156,7 +156,6 @@
             anchors {
                 top: worldCityColumn.bottom
                 topMargin: units.gu(1)
-                horizontalCenter: parent.horizontalCenter
             }
         }
 

=== modified file 'app/worldclock/AddWorldCityButton.qml'
--- app/worldclock/AddWorldCityButton.qml	2014-09-04 12:16:59 +0000
+++ app/worldclock/AddWorldCityButton.qml	2014-09-19 15:23:29 +0000
@@ -23,45 +23,47 @@
 AbstractButton {
     id: addWorldCityButton
 
-    width: childrenRect.width
-    height: childrenRect.height
-
-    Row {
-        spacing: units.gu(1)
-
-        width: childrenRect.width
-        height: _addButton.height
-
-        Label {
-            text: i18n.tr("Add")
-            color: UbuntuColors.midAubergine
-            anchors.verticalCenter: parent.verticalCenter
+    width: parent.width
+    height: _addButton.height
+
+    Label {
+        text: i18n.tr("Add")
+        color: UbuntuColors.midAubergine
+        anchors {
+            right: _addButton.left
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
         }
+    }
+
+    ClockCircle {
+        id: _addButton
+
+        isOuter: true
+        width: units.gu(5)
+        anchors.horizontalCenter: parent.horizontalCenter
 
         ClockCircle {
-            id: _addButton
-
-            isOuter: true
-            width: units.gu(5)
-
-            ClockCircle {
-                width: units.gu(3.5)
+            width: units.gu(3.5)
+            anchors.centerIn: parent
+
+            Icon {
                 anchors.centerIn: parent
-
-                Icon {
-                    anchors.centerIn: parent
-                    color: UbuntuColors.coolGrey
-                    name: "add"
-                    height: units.gu(2)
-                    width: height
-                }
+                color: UbuntuColors.coolGrey
+                name: "add"
+                height: units.gu(2)
+                width: height
             }
         }
+    }
 
-        Label {
-            text: i18n.tr("City")
-            color: UbuntuColors.midAubergine
-            anchors.verticalCenter: parent.verticalCenter
+    Label {
+        text: i18n.tr("City")
+        color: UbuntuColors.midAubergine
+        anchors {
+            left: _addButton.right
+            leftMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
         }
     }
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-12 19:29:00 +0000
+++ debian/changelog	2014-09-19 15:23:29 +0000
@@ -47,6 +47,10 @@
   [Dennis O'Flaherty]
   * Show a message to the user when the alarm list is empty (LP: #1364555)
 
+  [Stefano Verzegnassi]
+  * Fixed wrong alignment of "Add city" button when the application is not
+    localized in English. (LP: #1371229)
+
  -- Nekhelesh Ramananthan <[e-mail]>  Wed, 13 Aug 2014 15:46:12 +0200
 
 ubuntu-clock-app (3.0-0ubuntu1) utopic; urgency=medium