Merge lp:~neokore/ubuntu-weather-app/ActivityIndicatorLoading into lp:ubuntu-weather-app/obsolete.trunk

[Raúl Yeguas]

Added an ActivityIndicator to appear while loading data or adding a new location

Added an ActivityIndicator to appear while loading data or adding a new location

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

PASSED: Continuous integration, rev:20
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/12/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/12
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/12/rebuild

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Fine!

review: Approve

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-05-01 17:10:19 +0000
+++ ubuntu-weather-app.qml	2013-05-01 17:43:30 +0000
@@ -55,8 +55,9 @@
             tabsString += "Components.LocationTabEmpty { }"
         }
         tabsString += "}"; // END Tabs componen
-        if(loading != null)
-            loading.destroy();
+        if(bigLoading !== null)
+            bigLoading.destroy();
+        loading.running = false;
         tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs")
         if(focusToLast)
             tabsObject.selectedTabIndex = locLength -1;
@@ -71,7 +72,8 @@
         locationDataWorker.sendMessage({
             action: "newLocationData",
             params: {location:locationObj, units:"metric"}
-        })
+        });
+        loading.running = true;
     }
 
     function onNewLocationDataSuccess(resp) {
@@ -80,6 +82,8 @@
     }
 
     function refreshData() {
+        if(bigLoading === null)
+            loading.running = true;
         storage.getLocations(function(locations) {
             locationDataWorker.sendMessage({
                 action: "updateData",
@@ -104,12 +108,14 @@
     Page {
         id: tabPage
         title: "Simple page"
-
+        ActivityIndicator{id:loading; running: false; z: 1; anchors{top: parent.top; topMargin: units.gu(0.5); right: parent.right; rightMargin: units.gu(1)}}
         Tabs {
             id: tabs
             objectName: "Tabs"
             anchors.fill: parent
-            Tab {Components.LoadingComponent{id:loading; anchors.fill: tabs}}
+            Tab {
+                Components.LoadingComponent{id:bigLoading; anchors.fill: parent; z: 2;}
+            }
         }
     }
 }