Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/2-migrate-add-city-listitems into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Migrate World City page listitems to the new 15.04 listitems

Migrate World City page listitems to the new 15.04 listitems

#blocked

Blocked due to,

1. Pre-requisite branch needs to go in first
2. There is a bug where deleting a world city does not remove the listitem when the world city count is 1.
3. Autopilot tests and qml tests needs to be updated.

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

FAILED: Continuous integration, rev:272
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/685/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/31/console

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

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-clock-dev/ubuntu-clock-app/2-migrate-add-city-listitems]

273. By Nekhelesh Ramananthan on 2015-07-24

Merged lp:ubuntu-clock-app and resolved conflicts

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

PASSED: Continuous integration, rev:273
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/701/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/46

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

lgtm

review: Approve

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2015-06-18 22:57:49 +0000
+++ app/worldclock/WorldCityList.qml	2015-07-24 13:17:12 +0000
@@ -19,7 +19,6 @@
 import QtQuick 2.4
 import Timezone 1.0
 import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../components"
 import "../upstreamcomponents"
 
@@ -304,12 +303,23 @@
         section.criteria: ViewSection.FirstCharacter
         section.labelPositioning: ViewSection.InlineLabels
 
-        section.delegate: ListItem.Header {
-            text: section
+        section.delegate: ListItem {
+            height: header.implicitHeight + units.gu(2)
+            Label {
+                id: header
+                text: section
+                font.weight: Font.DemiBold
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+            }
         }
 
-        delegate: ListItem.Empty {
-            showDivider: false
+        delegate: ListItem {
+            height: worldCityDelegateColumn.height + units.gu(2)
+            divider.visible: false
             objectName: "defaultWorldCityItem" + index
 
             Column {