Merge lp:~rpadovani/ubuntu-weather-app/1200600 into lp:ubuntu-weather-app/obsolete.trunk

[Riccardo Padovani]

Added "No city" in city list when no city is found.
See #1200600

Added "No city" in city list when no city is found.
See #1200600

[Martin Borho (martin-borho)]

Thanks for the fix, that was fast!

But one request:

By using only "if (citiesModel.count < 1) {" in the onMessage handler instead of "if (!number) {", you could remove the "number" var. Leads to less code.

Cheers
Martin

review: Needs Fixing

[lp:~rpadovani/ubuntu-weather-app/1200600]

61. By Riccardo Padovani on 2013-07-13

lightened the control for no city message

[Riccardo Padovani (rpadovani)]

Good point, done :)

[Nekhelesh Ramananthan (nik90)]

@Martin, Riccardo: I do not it is necessary to provide a width to the Label? Also I was told wherever possible try using anchors instead of hard coding width or height.

review: Needs Fixing

[Martin Borho (martin-borho)]

@Nekhelesh, Riccardo: I guess the design of the label is likely to be changed anyways when the visual design is ready. So for me it's ok for the moment.

But Riccardo can change it, if he wants to?

[Nekhelesh Ramananthan (nik90)]

@Martin: Yes the design might change in the future, however my point was that you do not need to specify the width of the label. Since Riccardo has specified the anchors in the page, that alone is sufficient.

Label {
 text: "Sometext"
 anchors.centerin: parent
}

This code alone would do it.

review: Needs Fixing

[Martin Borho (martin-borho)]

@Nekhelesh: ah, got you! your're right of course.

[lp:~rpadovani/ubuntu-weather-app/1200600]

62. By Riccardo Padovani on 2013-07-13

Delete width of label

[Riccardo Padovani (rpadovani)]

Ok, done it.
Sorry for the error, but I have not figured everything yet.

[Martin Borho (martin-borho)]

Fine, thanks Riccardo!

review: Approve

[Nekhelesh Ramananthan (nik90)]

lgtm now. Ready for merge.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'components/AddLocationPage.qml'
--- components/AddLocationPage.qml	2013-07-03 19:39:29 +0000
+++ components/AddLocationPage.qml	2013-07-13 13:37:26 +0000
@@ -28,10 +28,15 @@
                 listView.visible = true
                 messageObject.result.locations.forEach(function(loc) {
                     citiesModel.append(loc);
+                    noCityError.visible = false
                 });
             } else {
                 console.log(messageObject.error.msg+" / "+messageObject.error.request.url)
             }
+            if (!citiesModel.count) {
+                noCityError.visible = true
+                noCityError.text = i18n.tr("No location was found for ") + locationString.text
+            }
         }
     }
 
@@ -74,6 +79,13 @@
         width: parent.width
         height: units.gu(52)
         color: "transparent"
+        Label {
+            id: noCityError
+            visible: false
+            anchors.centerIn: parent;
+            font.pixelSize: 18
+        }
+
         ListView {
             id: listView;
             objectName: "SearchResultList"