Merge lp:~nik90/ubuntu-clock-app/improved-listitem-appearance into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

- Removed custom listitem header used in the world city page
- Adjusted the anchor margins in the alarm settings page after the recent sdk update

- Removed custom listitem header used in the world city page
- Adjusted the anchor margins in the alarm settings page after the recent sdk update

With the new margins it should look like https://imgur.com/a/V38Vf

[lp:~nik90/ubuntu-clock-app/improved-listitem-appearance]

115. By Nekhelesh Ramananthan on 2014-09-24

Updated changelog

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

FAILED: Continuous integration, rev:115
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/492/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/513/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/139/console

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/improved-listitem-appearance]

116. By Nekhelesh Ramananthan on 2014-09-24

merged trunk

[Mihir Soni (mihirsoni)]

Looks good to me !!

review: Approve

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

PASSED: Continuous integration, rev:116
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/493/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/516
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/516/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/140

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

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2014-09-06 16:33:35 +0000
+++ app/alarm/AlarmSettingsPage.qml	2014-09-24 12:35:17 +0000
@@ -115,7 +115,6 @@
                 anchors {
                     left: parent.left
                     right: parent.right
-                    margins: units.gu(-2)
                 }
 
                 collapseOnClick: true
@@ -123,7 +122,12 @@
 
                 Column {
                     id: _contentColumn
-                    width: parent.width
+
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        margins: units.gu(-2)
+                    }
 
                     Item {
                         width: parent.width
@@ -178,7 +182,6 @@
                 anchors {
                     left: parent.left
                     right: parent.right
-                    margins: units.gu(-2)
                 }
 
                 collapseOnClick: true
@@ -186,7 +189,12 @@
 
                 Column {
                     id: _snoozeContentColumn
-                    width: parent.width
+
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        margins: units.gu(-2)
+                    }
 
                     Item {
                         width: parent.width

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2014-09-21 13:20:37 +0000
+++ app/worldclock/WorldCityList.qml	2014-09-24 12:35:17 +0000
@@ -242,16 +242,7 @@
         section.labelPositioning: ViewSection.InlineLabels
 
         section.delegate: ListItem.Header {
-            anchors.margins: units.gu(2)
-            Label {
-                /*
-                  Ideally we wouldn't need this label inside a listitem header,
-                  however the default header text is indented right 2 gu which
-                  doesn't match design spec.
-                */
-                text: section
-                anchors.verticalCenter: parent.verticalCenter
-            }
+            text: section
         }
 
         delegate: ListItem.Base {

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-24 11:50:27 +0000
+++ debian/changelog	2014-09-24 12:35:17 +0000
@@ -33,6 +33,8 @@
   * Added alarm snooze settings (LP: #1354400)
   * Fixed default alarm label not being translatable (LP: #1365012)
   * Improved multiselect mode behavior and appearance (LP: #1370146)
+  * Removed custom listitem header used in the world city page and fixed listitem
+    anchors in the alarm settings page.
   * Enabled alarms automatically after updating it (LP: #1372090)
   * Automatically focus textfield (LP: #1372089)