Merge lp:~nik90/ubuntu-clock-app/change-countryname-position into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Reduces the country name font size and positions it below the city name to prevent overflowing text.

This branch changes the design of the cities results list by reducing the font size of the state, country names and also positioning them beneath the city names. This prevents any results being too long that it goes off screen. The implementation is as per the new design which can be seen at https://mail-attachment.googleusercontent.com/attachment/u/0/?ui=2&ik=4f90c10d21&view=att&th=140eebe8c2fcc5e8&attid=0.1&disp=inline&realattid=f_hl84vo4e0&safe=1&zw&saduie=AG9B_P8X6flBM44Q7TV0yPjSPEw3&sadet=1378499656117&sads=JseR2_3XGhSwN2Pdg33HFc3juCE&sadssc=1.

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

PASSED: Continuous integration, rev:187
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/13/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/294
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/13

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

review: Approve (continuous-integration)

=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml	2013-09-06 20:22:31 +0000
+++ clock/WorldClock.qml	2013-09-06 21:01:12 +0000
@@ -164,11 +164,19 @@
 
         delegate: ListItem.Standard {
             Label {
-                text: searchCityModel.status == XmlListModel.Ready ? (adminName ? (city + ", " + adminName + ", " + country) : (city + ", " + country)) : i18n.tr("Loading");
-                anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
+                id: cityDelegate
+                text: city
+                anchors { top: parent.top; topMargin: units.gu(0.5); left: parent.left; leftMargin: units.gu(3) }
                 color: Theme.palette.normal.baseText
                 fontSize: "large"
             }
+            Label {
+                text: adminName ? adminName + ", " + country : country
+                anchors { top: cityDelegate.bottom; bottom: parent.bottom; left: parent.left; leftMargin: units.gu(3) }
+                color: Theme.palette.normal.baseText
+                fontSize: "small"
+            }
+
             selected: worldList.currentIndex == index;
 
             onClicked: {