Merge lp:~vthompson/ubuntu-weather-app/reboot-locationspage-empty-state into lp:ubuntu-weather-app

[Victor Thompson]

* Rename EmptyStateComponent to HomePageEmptyStateComponent
* Add a LocationsPageEmptyStateComponent

* Rename EmptyStateComponent to HomePageEmptyStateComponent
* Add a LocationsPageEmptyStateComponent

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

PASSED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/169/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/139
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/169

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/169/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Hah I was going to do this as well, great minds think alike :-)

One inline comment

review: Needs Fixing

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

FAILED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/170/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/140/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/170/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/170/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/173/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/143
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/173

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/173/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, thanks for the extra fixes :-)

review: Approve

[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-weather-app-reboot-autolanding/79/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-autolanding/70/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/79/console

review: Needs Fixing (continuous-integration)

[lp:~vthompson/ubuntu-weather-app/reboot-locationspage-empty-state]

79. By Victor Thompson on 2015-08-07

Regenerate pot file

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

PASSED: Continuous integration, rev:79
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/178/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/148
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/178

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/178/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/ubuntu-weather-app/reboot-locationspage-empty-state]

80. By Victor Thompson on 2015-08-07

Merge of trunk and resolve conflicts

[Victor Thompson (vthompson)]

review: Approve

=== renamed file 'app/components/EmptyStateComponent.qml' => 'app/components/HomePageEmptyStateComponent.qml'
=== added file 'app/components/LocationsPageEmptyStateComponent.qml'
--- app/components/LocationsPageEmptyStateComponent.qml	1970-01-01 00:00:00 +0000
+++ app/components/LocationsPageEmptyStateComponent.qml	2015-08-07 01:23:00 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import "../components"
+
+
+Item {
+    anchors {
+        fill: parent
+        margins: units.gu(2)
+    }
+
+    Label {
+        id: emptyStateLabel
+        anchors {
+            centerIn: parent
+        }
+        horizontalAlignment: Text.AlignHCenter
+        text: i18n.tr("No locations found. Tap the plus icon to search for one.")
+        width: parent.width - units.gu(4)
+        wrapMode: Text.WordWrap
+    }
+}
 
=== modified file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml	2015-07-29 21:34:56 +0000
+++ app/ui/HomePage.qml	2015-08-07 01:23:00 +0000
@@ -192,7 +192,7 @@
             fill: parent
         }
         asynchronous: true
-        source: "../components/EmptyStateComponent.qml"
+        source: "../components/HomePageEmptyStateComponent.qml"
         visible: status === Loader.Ready && active
     }
 }
 
=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-08-02 13:43:34 +0000
+++ app/ui/LocationsPage.qml	2015-08-07 01:23:00 +0000
@@ -250,6 +250,16 @@
         }
     }
 
+    Loader {
+        active: locationsList === null || locationsList.length === 0
+        anchors {
+            fill: parent
+        }
+        asynchronous: true
+        source: "../components/LocationsPageEmptyStateComponent.qml"
+        visible: status === Loader.Ready && active
+    }
+
     function populateLocationsModel() {
         currentLocationModel.clear()
         locationsModel.clear()
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-08-07 00:12:11 +0000
+++ debian/changelog	2015-08-07 01:23:00 +0000
@@ -9,6 +9,8 @@
   * Default to OWM if the key file for TWC is blank.
   * Add sunrise and sunset icons from the spec
   * Fix the CMakeLists.txt to include the app icon
+  * Rename EmptyStateComponent to HomePageEmptyStateComponent
+  * Add a LocationsPageEmptyStateComponent
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data
 
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-08-06 00:10:53 +0000
+++ po/com.ubuntu.weather.pot	2015-08-07 01:23:00 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-06 01:02+0100\n"
+"POT-Creation-Date: 2015-08-06 19:16-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -46,15 +46,15 @@
 msgid "Sunset"
 msgstr ""
 
-#: ../app/components/EmptyStateComponent.qml:51
+#: ../app/components/HomePageEmptyStateComponent.qml:51
 msgid "Searching for current location..."
 msgstr ""
 
-#: ../app/components/EmptyStateComponent.qml:52
+#: ../app/components/HomePageEmptyStateComponent.qml:52
 msgid "Cannot determine your location"
 msgstr ""
 
-#: ../app/components/EmptyStateComponent.qml:62
+#: ../app/components/HomePageEmptyStateComponent.qml:62
 msgid "Manually add a location by swiping up from the bottom of the display"
 msgstr ""
 
@@ -66,6 +66,10 @@
 msgid "Remove"
 msgstr ""
 
+#: ../app/components/LocationsPageEmptyStateComponent.qml:36
+msgid "No locations found. Tap the plus icon to search for one."
+msgstr ""
+
 #: ../app/components/MultiSelectHeadState.qml:27
 msgid "Select All"
 msgstr ""