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

[Raúl Yeguas]

Tabs move to new added location's tab when you add one. Made it with Martin's help.

Tabs move to new added location's tab when you add one. Made it with Martin's help.

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

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

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

review: Approve

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-05-01 16:37:10 +0000
+++ ubuntu-weather-app.qml	2013-05-01 17:14:24 +0000
@@ -37,12 +37,15 @@
 
     // see https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1124071, temporary workaround
     function buildTabs(locations) {
+        // check if there was a location added
+        var locLength = locations.length,
+            locBeforeLen = locationsList.length,
+            focusToLast = (locBeforeLen > 0 && locLength > locBeforeLen) ? true : false;
         locationsList = locations;
         if(tabsObject !== null) {
             tabsObject.destroy()
         }
-        var locLength = locations.length,
-            tabsString = "import QtQuick 2.0; import Ubuntu.Components 0.1; import Ubuntu.Components.Popups 0.1; import \"components\" as Components; "
+        var tabsString = "import QtQuick 2.0; import Ubuntu.Components 0.1; import Ubuntu.Components.Popups 0.1; import \"components\" as Components; "
                    + "Tabs {id: tabs; anchors.fill: parent;"
         if(locLength > 0) {
             for(var x=0;x<locLength;x++) {
@@ -55,6 +58,8 @@
         if(loading != null)
             loading.destroy();
         tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs")
+        if(focusToLast)
+            tabsObject.selectedTabIndex = locLength -1;
     }
 
     function removeLocation(dbId) {
@@ -104,7 +109,7 @@
             id: tabs
             objectName: "Tabs"
             anchors.fill: parent
-            Tab {Components.LoadingComponent{id:loading; anchors.fill: parent}}
+            Tab {Components.LoadingComponent{id:loading; anchors.fill: tabs}}
         }
     }
 }