Merge lp:~martin-borho/ubuntu-weather-app/pagestack into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Replaced used Sheet components for settings and managing locations with Page components.

Replaced the Sheet components used for settings and managing locations with Page components. No extra confirm button anymore.

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

FAILED: Continuous integration, rev:340
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/234/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/55
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/55/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/41/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:341
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/235/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/56
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/42

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good, thanks Martin!

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-autolanding/138/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-land-weather-app/41/console
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/59/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-autolanding/28

review: Needs Fixing (continuous-integration)

[Martin Borho (martin-borho)]

balloons ran in this yesterday too, seems like a jenkins related issue...

https://code.launchpad.net/~nskaggs/ubuntu-weather-app/1362234/+merge/232443/comments/566430

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

FAILED: Continuous integration, rev:341
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/237/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/62/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/44

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:341
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/238/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/63/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/45

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:341
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/240/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/65/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/47

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:342
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/241/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/66/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/66/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/48/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:343
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/242/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/67/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/49

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:344
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/244/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/70/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/51

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:345
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/245/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/71/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/71/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/52/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:346
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/246/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/72/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/53

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tried running the tests locally on my nexus 4 and they fail here. http://paste.ubuntu.com/8209507/

review: Needs Fixing

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

FAILED: Continuous integration, rev:346
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/247/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/73/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/54

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

review: Needs Fixing (continuous-integration)

[Martin Borho (martin-borho)]

popey: test on devices shuldbe fixed when https://code.launchpad.net/~canonical-platform-qa/ubuntu-weather-app/fix1365279-setup_once/+merge/233305 has landed.

But the jenkins errors I can't reproduce neither on device nor on desktop... and I have no clue why.

Some files were removed/added, should the deb-version get increased perhaps?

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

PASSED: Continuous integration, rev:347
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/253/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/81
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/60

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

\o/

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Sweet!

[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-autolanding/143/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-land-weather-app/46/console
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/82/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/82/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-autolanding/33/console

review: Needs Fixing (continuous-integration)

[lp:~martin-borho/ubuntu-weather-app/pagestack]

348. By Martin Borho on 2014-09-04

merged from trunk, fixed conflict

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

PASSED: Continuous integration, rev:348
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/254/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/83
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/61

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

review: Approve (continuous-integration)

=== renamed file 'components/AddLocationSheet.qml' => 'components/AddLocationPage.qml'
--- components/AddLocationSheet.qml	2014-09-02 07:21:28 +0000
+++ components/AddLocationPage.qml	2014-09-04 17:21:39 +0000
@@ -25,102 +25,122 @@
 import "WeatherApi.js" as WeatherApi
 import "CitiesList.js" as Cities
 
-Component {
-
-    DefaultSheet {
-        id: addLocationSheet
-        objectName: "AddLocationSheet"
-        title: i18n.tr("Add city")
-        contentsHeight: parent.height
-        contentsWidth: parent.width
-        doneButton: false
-
-        Component.onCompleted: {
-            Cities.preList.forEach(function(loc) {
-                citiesModel.append(loc)
-            })
-        }
-
-        Connections {
-            target: mainView
-            onEscapeKey: {
-                PopupUtils.close(addLocationSheet)
-                clear()
-            }
-        }
-
-        function searchResponseHandler(messageObject) {
-            searching.running = false;
-            if(!messageObject.error) {
-                listView.visible = true
-                var results = [],
+Page {
+    id: addLocationPage
+    objectName: "AddLocationPage"
+    title: i18n.tr("Add city")
+    anchors.fill: parent
+    visible: false
+
+    readonly property real headerHeight: units.gu(9.5)
+    readonly property real bottomHeight: units.gu(9.5)
+
+    property variant addCallback: null
+
+    Connections {
+        target: mainView
+        onEscapeKey: {
+            pageStack.pop()
+            clear()
+        }
+    }
+
+    head.backAction: Action {
+        iconName: "back"
+        visible: true
+        onTriggered: {
+            pageStack.pop()
+        }
+    }
+
+    Component.onCompleted: {
+        Cities.preList.forEach(function(loc) {
+            citiesModel.append(loc)
+        })
+        console.log(addCallback)
+    }
+
+    function searchResponseHandler(messageObject) {
+        searching.running = false;
+        if(!messageObject.error) {
+            listView.visible = true
+            var results = [],
                     a1Counts = {},
-                    a3Counts = {},
-                    location;
-                // build a temp list and count the adminAreas
-                messageObject.result.locations.forEach(function(loc) {
-                    a1Counts[loc.name+loc.adminName1] = (!a1Counts[loc.name+loc.adminName1]) ? 1 : a1Counts[loc.name+loc.adminName1]+1;
-                    a3Counts[loc.name+loc.adminName3] = (!a3Counts[loc.name+loc.adminName3]) ? 1 : a3Counts[loc.name+loc.adminName3]+1;
-                    results.push(loc);
-                });
-                // append results to the model and build a distinct subtitle
-                for(var x=0;x<results.length;x++) {
-                    location = results[x];
-                    location["areaLabel"] = buildAreaLabel(location, a1Counts ,a3Counts)
-                    citiesModel.append(location);
-                    noCityError.visible = false
-                }
-                //
-                if (!citiesModel.count) {
-                    noCityError.visible = true
-                    noCityError.text = i18n.tr("No location was found for %1").arg(locationString.text)
-                }
-            } else {
-                console.log("search: "+messageObject.error.msg+" / "+messageObject.error.request.url)
-                httpFailedSearch.show();
-            }
-        }
-
-        function buildAreaLabel(loc, a1Counts, a3Counts) {
-            var label = "";
-            label += ((loc.adminName1) ? loc.adminName1.replace(/ Region$/,'')+", ":"");
-            label += ((loc.adminName2 && a1Counts[loc.name+loc.adminName1] > 1 && a3Counts[loc.name+loc.adminName3] > 1) ? loc.adminName2.replace(/ Region$/,'')+", ":"");
-            label += ((loc.adminName3 && a1Counts[loc.name+loc.adminName1] > 1) ? loc.adminName3.replace(/ Region$/,'')+", ":"");
-            label += ((Countries.codes[loc.country]) ? i18n.tr(Countries.codes[loc.country]): loc.country);
-            return label;
-        }
-
-        function clear() {
-            locationString.text = '';
+            a3Counts = {},
+            location;
+            // build a temp list and count the adminAreas
+            messageObject.result.locations.forEach(function(loc) {
+                a1Counts[loc.name+loc.adminName1] = (!a1Counts[loc.name+loc.adminName1]) ? 1 : a1Counts[loc.name+loc.adminName1]+1;
+                a3Counts[loc.name+loc.adminName3] = (!a3Counts[loc.name+loc.adminName3]) ? 1 : a3Counts[loc.name+loc.adminName3]+1;
+                results.push(loc);
+            });
+            // append results to the model and build a distinct subtitle
+            for(var x=0;x<results.length;x++) {
+                location = results[x];
+                location["areaLabel"] = buildAreaLabel(location, a1Counts ,a3Counts)
+                citiesModel.append(location);
+                noCityError.visible = false
+            }
+            //
+            if (!citiesModel.count) {
+                noCityError.visible = true
+                noCityError.text = i18n.tr("No location was found for %1").arg(locationString.text)
+            }
+        } else {
+            console.log("search: "+messageObject.error.msg+" / "+messageObject.error.request.url)
+            httpFailedSearch.show();
+        }
+    }
+
+    function buildAreaLabel(loc, a1Counts, a3Counts) {
+        var label = "";
+        label += ((loc.adminName1) ? loc.adminName1.replace(/ Region$/,'')+", ":"");
+        label += ((loc.adminName2 && a1Counts[loc.name+loc.adminName1] > 1 && a3Counts[loc.name+loc.adminName3] > 1) ? loc.adminName2.replace(/ Region$/,'')+", ":"");
+        label += ((loc.adminName3 && a1Counts[loc.name+loc.adminName1] > 1) ? loc.adminName3.replace(/ Region$/,'')+", ":"");
+        label += ((Countries.codes[loc.country]) ? i18n.tr(Countries.codes[loc.country]): loc.country);
+        return label;
+    }
+
+    function clear() {
+        locationString.text = '';
+        citiesModel.clear();
+        listView.visible = true;
+    }
+
+    function doSearch() {
+        if(locationString.text !== "") {
+            cityList.visible = true
             citiesModel.clear();
-            listView.visible = true;
-        }
-
-        function doSearch() {
-            if(locationString.text !== "") {
-                cityList.visible = true
-                citiesModel.clear();
-                searching.running = true;
-                WeatherApi.sendRequest({
-                    action: "searchByName",
-                    params: {name:locationString.text, units:"metric"}
-                }, searchResponseHandler)
-            }
-        }
-
-        SplashComponent {
-            id: httpFailedSearch
-            objectName: "HTTPFailedSearch"
-        }
-
-        ListModel {
-            id: citiesModel
-        }
-
-        container: Item {
+            searching.running = true;
+            WeatherApi.sendRequest({
+                                       action: "searchByName",
+                                       params: {name:locationString.text, units:"metric"}
+                                   }, searchResponseHandler)
+        }
+    }
+
+    SplashComponent {
+        id: httpFailedSearch
+        objectName: "HTTPFailedSearch"
+    }
+
+    ListModel {
+        id: citiesModel
+    }
+
+    Rectangle {
+        anchors.fill:parent
+        color: "lightgrey"
+
+        Item {
             anchors {
+                top:parent.top
+                topMargin:headerHeight+units.gu(1)
+                margins: units.gu(2)
                 right: parent.right
                 left: parent.left
+                bottom: parent.bottom
+                bottomMargin:bottomHeight
             }
             Rectangle {
                 id: searchInput
@@ -134,7 +154,7 @@
                 color: "transparent"
                 TextField {
                     id: locationString
-                    objectName: "SearchField"                    
+                    objectName: "SearchField"
                     anchors.fill: parent
                     placeholderText: i18n.tr("Enter a city name")
                     hasClearButton: true
@@ -184,7 +204,7 @@
                     left: parent.left
                     right: parent.right
                 }
-                height: addLocationSheet.height-searchInput.height-units.gu(9.5)
+                height: addLocationPage.height-searchInput.height-units.gu(9.5)
                 color: "transparent"
                 visible: true
                 Label {
@@ -214,7 +234,7 @@
                             fontSize: "medium"
                         }
                     }
-                }                
+                }
                 ListView {
                     id: listView;
                     objectName: "SearchResultList"
@@ -256,8 +276,8 @@
                         }
                         onClicked: {
                             var location = citiesModel.get(index)
-                            locationManagerSheet.addLocation(location)
-                            PopupUtils.close(addLocationSheet)
+                            locationManagerPage.addLocation(location)
+                            pageStack.pop()
                             clear()
                         }
                     }
@@ -269,4 +289,5 @@
             }
         }
     }
+
 }

=== renamed file 'components/LocationManagerSheet.qml' => 'components/LocationManagerPage.qml'
--- components/LocationManagerSheet.qml	2014-09-02 07:21:28 +0000
+++ components/LocationManagerPage.qml	2014-09-04 17:21:39 +0000
@@ -24,93 +24,152 @@
 import "CountryCodes.js" as Countries
 import "WeatherApi.js" as WeatherApi
 
-Component {
-    id: locationManagerComponent
-
-    ComposerSheet {
-        id: locationManagerSheet
-        objectName: "LocationManagerSheet"
-        title: i18n.tr("Edit locations")
-        contentsHeight: parent.height
-        contentsWidth: parent.width
-
-        property int initial_sum: 0
-        property bool limited: (locationModel.count > 7)
-
-        signal cancelSheet()
-        onCancelSheet: {
-            if(initial_sum === 0) {
-                // refresh mainview to land again here,
-                // when no locations were defined when
-                // opening the sheet
-                mainView.refreshData()
-            } else {
+Page {
+    id: locationManagerPage
+    objectName: "LocationManagerPage"
+    title: i18n.tr("Edit locations")
+    anchors.fill: parent
+    visible: false
+
+    readonly property real headerHeight: units.gu(9.5)
+    readonly property real bottomHeight: units.gu(9.5)
+
+    property int initial_sum: 0
+    property bool limited: (locationModel.count > 7)
+
+    head.backAction: Action {
+        iconName: "back"
+        onTriggered: {
+            var locationsChanged = false,
+                refresh = false;
+            // remove
+            for(var x=0;x<locationsRemoved.count;x++) {
+                var delLoc = locationsRemoved.get(x);
+                storage.clearLocation(delLoc.dbId);
+                locationsChanged = true;
+            }
+            // add
+            for(var y=0;y<locationModel.count;y++) {
+                var loc = locationModel.get(y);
+                if(loc.dbId === undefined || loc.dbId=== 0) {
+                    storage.insertLocation({location:loc});
+                    locationsChanged = true;
+                }
+            }
+            // refresh tabs if neccessary
+            if(locationsChanged || locationModel.count === 0) {
+                refresh = true;
+            }
+            // handle dummy "current location" item
+            currentLocationItem.visible = false
+            locationLookupItem.visible = true
+            lookupItemAddButton.visible = true
+            mainView.shortCutsLimited = false;
+            if(locationModel.count > 0) {
+                // reset text color
                 Theme.palette.selected.backgroundText = "#f4f4e8"
-            }
-            mainView.shortCutsLimited = false;
-            PopupUtils.close(locationManagerSheet)
-        }
-        Connections { target: mainView; onEscapeKey: cancelSheet()}
-
-        Component.onCompleted: {
-            mainView.shortCutsLimited = true;
-            locationsRemoved.clear();
-            loadData();
-            Theme.palette.selected.backgroundText = "#656565"
-        }
-
-        function lookupResponseHandler(messageObject) {
-            lookupIndicator.running = false;
-            if(!messageObject.error) {
-                if(messageObject.result.locations && messageObject.result.locations.length > 0) {
-                    var location = messageObject.result.locations[0];
-                    currentLocationItem.detectedLocation = location;
-                    currentLocationLabel.text = location.name
-                    currentLocationAreaLabel.text = location.adminName1
-                    locationLookupItem.visible = false
-                    currentLocationItem.visible = true;
-                }
-            } else {
-                console.log("search: "+messageObject.error.msg+" / "+messageObject.error.request.url)
-                httpFailedLookup.show();
-            }
-        }
-
-        function loadData() {
-            storage.getLocations(fillLocationsList);
-        }
-
-        function checkLocationExists(location) {                            
-            for(var x=0;x<locationModel.count;x++) {
-                var loc = locationModel.get(x);
-                if(loc.services.geonames && (loc.services.geonames === location.services.geonames)) {
-                    existsNotification.show()
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        function fillLocationsList(locations) {
-            initial_sum = locations.length;
-            locationModel.clear()
-            for(var x=0;x<locations.length;x++) {
-                var dbId = locations[x].db.id,
+                popFromStack(refresh)
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        mainView.shortCutsLimited = true;
+        locationsRemoved.clear();
+        loadData();
+        Theme.palette.selected.backgroundText = "#656565"
+    }
+
+    Connections { target: mainView; onEscapeKey: popFromStack()}
+
+    function popFromStack(refresh) {
+        Theme.palette.selected.backgroundText = "#f3f3e7"
+        pageStack.pop()
+        // refresh at least from storage, to prevent header content from disapearing
+        refreshData(!refresh, refresh);
+    }
+
+    function lookupResponseHandler(messageObject) {
+        lookupIndicator.running = false;
+        if(!messageObject.error) {
+            if(messageObject.result.locations && messageObject.result.locations.length > 0) {
+                var location = messageObject.result.locations[0];
+                currentLocationItem.detectedLocation = location;
+                currentLocationLabel.text = location.name
+                currentLocationAreaLabel.text = location.adminName1
+                locationLookupItem.visible = false
+                currentLocationItem.visible = true;
+            }
+        } else {
+            console.log("search: "+messageObject.error.msg+" / "+messageObject.error.request.url)
+            httpFailedLookup.show();
+        }
+    }
+
+    function loadData() {
+        storage.getLocations(fillLocationsList);
+    }
+
+    function checkLocationExists(location) {
+        for(var x=0;x<locationModel.count;x++) {
+            var loc = locationModel.get(x);
+            if(loc.services.geonames && (loc.services.geonames === location.services.geonames)) {
+                existsNotification.show()
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function fillLocationsList(locations) {
+        initial_sum = locations.length;
+        locationModel.clear()
+        for(var x=0;x<locations.length;x++) {
+            var dbId = locations[x].db.id,
                     location = locations[x].location;
-                // add db-id to the location object
-                location.dbId = dbId;
-                locationModel.append(locations[x].location);
-            }
-        }
-
-        function addLocation(location) {
-            if(!checkLocationExists(location)) {
-                locationModel.append(location)
-            }
-        }
-
-        container: Column {
-            anchors.fill: parent
+            // add db-id to the location object
+            location.dbId = dbId;
+            locationModel.append(locations[x].location);
+        }
+    }
+
+    function addLocation(location) {
+        if(!checkLocationExists(location)) {
+            locationModel.append(location)
+        }
+    }
+
+    Dialog {
+        id:existsNotification
+        title: i18n.tr("Location already added.")
+        Button {
+            text: i18n.tr("OK")
+            onClicked: PopupUtils.close(existsNotification)
+        }
+    }
+
+    ListModel {
+        id: locationModel
+    }
+
+    ListModel {
+        id: locationsRemoved
+    }
+
+    Rectangle {
+        anchors.fill:parent
+        color: "lightgrey"
+
+        Column {
+            anchors {
+                top:parent.top
+                topMargin:headerHeight
+                margins: units.gu(2)
+                right: parent.right
+                left: parent.left
+                bottom: parent.bottom
+                bottomMargin:bottomHeight
+            }
             Rectangle {
                 anchors {
                     left:parent.left
@@ -161,12 +220,12 @@
                     anchors.left: parent.left
                     anchors.leftMargin: units.gu(3)
                 }
-                onClicked: {       
+                onClicked: {
                     lookupIndicator.running = true;
                     WeatherApi.sendRequest({
-                        action: "getGeoIp",
-                        params: {}
-                    }, lookupResponseHandler);
+                                               action: "getGeoIp",
+                                               params: {}
+                                           }, lookupResponseHandler);
                 }
             }
             ListItem.Standard {
@@ -181,7 +240,7 @@
                     objectName: "CurrentLocationLabel"
                     text: ""
                     elide: Text.ElideRight
-                    anchors {                        
+                    anchors {
                         top: parent.top
                         topMargin: units.gu(0.5)
                         left: parent.left
@@ -255,7 +314,7 @@
                 }
                 clip:true
                 color:"transparent"
-                height: locationManagerSheet.height-locationLookupItem.height-units.gu(19.2)
+                height: locationManagerPage.height-locationLookupItem.height-units.gu(19.2)
                 ListView {
                     objectName: "LocationList"
                     anchors.fill: parent
@@ -338,71 +397,17 @@
                             fontSize: "small"
                         }
                         onClicked: {
-                            PopupUtils.open(addLocationSheet)
+                            pageStack.push(Qt.createComponent("AddLocationPage.qml"))
                         }
                     }
                 }
             }
         }
-
-        Dialog {
-            id:existsNotification
-            title: i18n.tr("Location already added.")
-            Button {
-                text: i18n.tr("OK")
-                onClicked: PopupUtils.close(existsNotification)
-            }
-        }
-
-        ListModel {
-            id: locationModel
-        }
-
-        ListModel {
-            id: locationsRemoved
-        }
-
-        onConfirmClicked: {
-            var locationsChanged = false;
-            // remove
-            for(var x=0;x<locationsRemoved.count;x++) {
-                var delLoc = locationsRemoved.get(x);
-                storage.clearLocation(delLoc.dbId);
-                locationsChanged = true;
-            }
-            // add
-            for(var y=0;y<locationModel.count;y++) {
-                var loc = locationModel.get(y);
-                if(loc.dbId === undefined || loc.dbId=== 0) {
-                    storage.insertLocation({location:loc});
-                    locationsChanged = true;
-                }
-            }
-            // refresh tabs if neccessary
-            if(locationsChanged || locationModel.count === 0) {
-                mainView.refreshData()
-            }
-            // handle dummy "current location" item
-            currentLocationItem.visible = false
-            locationLookupItem.visible = true
-            lookupItemAddButton.visible = true
-            if(locationModel.count > 0) {
-                // reset text color
-                Theme.palette.selected.backgroundText = "#f4f4e8"
-            }
-            mainView.shortCutsLimited = false;
-        }
-
-        onCancelClicked: cancelSheet()
-
-        AddLocationSheet {
-            id:addLocationSheet
-        }
-
-        SplashComponent {
-            id: httpFailedLookup
-            objectName: "HTTPFailedLookup"
-            message: i18n.tr("Couldn't specify your current location, please try later again!")
-        }
+    }
+
+    SplashComponent {
+        id: httpFailedLookup
+        objectName: "HTTPFailedLookup"
+        message: i18n.tr("Couldn't specify your current location, please try later again!")
     }
 }

=== added file 'components/SettingsPage.qml'
--- components/SettingsPage.qml	1970-01-01 00:00:00 +0000
+++ components/SettingsPage.qml	2014-09-04 17:21:39 +0000
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2013, 2014 Canonical Ltd
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ *
+ * Authored by: Raúl Yeguas <[e-mail]>
+ *              Martin Borho <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Page {
+    title: i18n.tr("Settings")
+    anchors.fill: parent
+    visible: false
+    readonly property real headerHeight: units.gu(9.5)
+    readonly property real bottomHeight: units.gu(9.5)
+    property bool refresh_from_storage: false
+    property bool refresh_from_service: false
+
+    head.backAction: Action {
+        iconName: "back"
+        onTriggered: {
+            if(refresh_from_storage === true || refresh_from_service === true) {
+                storage.getSettings(function(storedSettings) {
+                    for(var settingName in storedSettings) {
+                        settings[settingName] = storedSettings[settingName];
+                    }
+                    refreshData(refresh_from_storage, refresh_from_service);
+                });
+            } else {
+                // reload tabs from storage, to prevent header content from diappearing
+                refreshData(true);
+            }
+            popFromStack()
+        }
+    }
+
+    Connections { target: mainView; onEscapeKey: popFromStack()}
+
+    function popFromStack() {
+        Theme.palette.selected.backgroundText = "#f3f3e7"
+        pageStack.pop()
+    }
+
+    function fillTempSelector() {
+        temperatureUnitsSelectorModel.append({ name: "celsiusOption", label: i18n.tr("Celsius")});
+        temperatureUnitsSelectorModel.append({ name: "fahrenheitOption", label: i18n.tr("Fahrenheit")});
+        temperatureUnitsSelector.selectedIndex = (settings["units"] === "imperial") ? 1 : 0;
+    }
+
+    function fillWindSelector() {
+        windUnitsSelectorModel.append({ name: "kmhOption", label: i18n.tr("Kilometers per hour")});
+        windUnitsSelectorModel.append({ name: "mphOption", label: i18n.tr("Miles per hour")});
+        windUnitsSelector.selectedIndex = (settings["wind_units"] === "mph") ? 1 : 0;
+    }
+
+    function fillPrecipSelector() {
+        precipitationUnitsSelectorModel.append({ name: "millimetersOption", label: i18n.tr("Millimeters")});
+        precipitationUnitsSelectorModel.append({ name: "inchesOption", label: i18n.tr("Inches")});
+        precipitationUnitsSelector.selectedIndex = (settings["precip_units"] === "in") ? 1 : 0;
+    }
+
+    Component.onCompleted: {
+        refresh_from_service = false;
+        refresh_from_storage = false;
+        fillTempSelector();
+        fillWindSelector();
+        fillPrecipSelector();
+        mainView.shortCutsLimited = true;
+        Theme.palette.selected.backgroundText = "#656565"
+        //Theme.palette.selected.background = "#656565"
+    }
+
+    Rectangle {
+        anchors.fill:parent
+        color: "lightgrey"
+
+        Column {
+            anchors {
+                top:parent.top
+                topMargin:headerHeight+units.gu(3)
+                margins: units.gu(2)
+                right: parent.right
+                left: parent.left
+                bottom: parent.bottom
+                bottomMargin:bottomHeight
+            }
+
+
+            Component {
+                id: unitsSelectorDelegate
+                OptionSelectorDelegate {
+                    text: i18n.tr(label)
+                    objectName: name
+                }
+            }
+
+            ListModel {
+                id: temperatureUnitsSelectorModel
+            }
+
+            OptionSelector {
+                id: temperatureUnitsSelector
+                objectName: "TemperatureUnitsSelector"
+                text: i18n.tr("Temperature units")
+                delegate: unitsSelectorDelegate
+                model: temperatureUnitsSelectorModel
+                onSelectedIndexChanged: {
+                    var selectedUnit = (selectedIndex === 0) ? "metric" : "imperial";
+                    storage.saveSetting("units", selectedUnit);
+                    refresh_from_storage = true;
+                }
+            }
+
+            ListModel {
+                id: windUnitsSelectorModel
+            }
+
+            OptionSelector {
+                id: windUnitsSelector
+                objectName: "WindUnitsSelector"
+                text: i18n.tr("Wind speed units")
+                delegate: unitsSelectorDelegate
+                model: windUnitsSelectorModel
+                onSelectedIndexChanged: {
+                    var selectedWindUnit = (selectedIndex === 0) ? "kmh" : "mph";
+                    storage.saveSetting("wind_units", selectedWindUnit);
+                    refresh_from_storage = true;
+                }
+            }
+
+            ListModel {
+                id: precipitationUnitsSelectorModel
+            }
+
+            OptionSelector {
+                id: precipitationUnitsSelector
+                objectName: "PrecipitationUnitsSelector"
+                text: i18n.tr("Precipitation units")
+                delegate: unitsSelectorDelegate
+                model: precipitationUnitsSelectorModel
+                // Precipitation units not available at TWC
+                visible: (serviceSelector.selectedIndex !== 0) ?  1 : 0
+                opacity: (serviceSelector.selectedIndex !== 0) ?  1 : 0
+                Behavior on visible {
+                    enabled: (serviceSelector.selectedIndex === 0)
+                    NumberAnimation { duration:  1500}
+                }
+                Behavior on opacity {
+                    NumberAnimation {
+                        easing: UbuntuAnimation.StandardEasingReverse;
+                        duration: UbuntuAnimation.SlowDuration
+                    }
+                }
+                onSelectedIndexChanged: {
+                    var selectedPrecipUnit = (selectedIndex === 0) ? "mm" : "in";
+                    storage.saveSetting("precip_units", selectedPrecipUnit);
+                    refresh_from_storage = true;
+                }
+            }
+
+            ListModel {
+                id: serviceSelectorModel
+                ListElement { name: "twcOption"; label: "The Weather Channel" }
+                ListElement { name: "owmOption"; label: "Openweathermap" }
+            }
+
+            OptionSelector {
+                id: serviceSelector
+                objectName: "ServiceSelector"
+                text: i18n.tr("Weather Service")
+                delegate: unitsSelectorDelegate
+                model: serviceSelectorModel
+                selectedIndex: (settings["service"] === "openweathermap") ? 1 : 0;
+                onSelectedIndexChanged: {
+                    var selectedService = (selectedIndex === 0) ? "weatherchannel" : "openweathermap";
+                    storage.saveSetting("service", selectedService);
+                    refresh_from_service = true;
+                }
+            }
+        }
+    }
+}

=== removed file 'components/SettingsSheet.qml'
--- components/SettingsSheet.qml	2014-09-02 07:21:28 +0000
+++ components/SettingsSheet.qml	1970-01-01 00:00:00 +0000
@@ -1,195 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program 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.
- *
- * This program 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/>.
- *
- * Authored by: Raúl Yeguas <[e-mail]>
- *              Martin Borho <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
-
-Component {
-    ComposerSheet {
-        id: sheet
-        objectName: "SettingsSheet"
-        title: i18n.tr("Settings")
-        contentsHeight: parent.height
-        contentsWidth: parent.width
-
-        function fillTempSelector() {
-            with(temperatureUnitsSelectorModel) {
-                append({ name: "celsiusOption", label: i18n.tr("Celsius")});
-                append({ name: "fahrenheitOption", label: i18n.tr("Fahrenheit")});
-            }
-            temperatureUnitsSelector.selectedIndex = (settings["units"] === "imperial") ? 1 : 0;
-        }
-
-        function fillWindSelector() {
-            with(windUnitsSelectorModel) {
-                append({ name: "kmhOption", label: i18n.tr("Kilometers per hour")});
-                append({ name: "mphOption", label: i18n.tr("Miles per hour")});
-            }
-            windUnitsSelector.selectedIndex = (settings["wind_units"] === "mph") ? 1 : 0;
-        }
-
-        function fillPrecipSelector() {
-            with(precipitationUnitsSelectorModel) {
-                append({ name: "millimetersOption", label: i18n.tr("Millimeters")});
-                append({ name: "inchesOption", label: i18n.tr("Inches")});
-            }
-            precipitationUnitsSelector.selectedIndex = (settings["precip_units"] === "in") ? 1 : 0;
-        }
-
-        Component.onCompleted: {
-            fillTempSelector();
-            fillWindSelector();
-            fillPrecipSelector();
-            mainView.shortCutsLimited = true;
-            Theme.palette.selected.backgroundText = "#656565"
-        }
-
-        container: Column {
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            Component {
-                id: unitsSelectorDelegate
-                OptionSelectorDelegate { 
-                    text: i18n.tr(label)
-                    objectName: name 
-                }
-            }
-
-            ListModel {
-                id: temperatureUnitsSelectorModel
-            }
-
-            OptionSelector {
-                id: temperatureUnitsSelector
-                objectName: "TemperatureUnitsSelector"
-                text: i18n.tr("Temperature units")
-                delegate: unitsSelectorDelegate
-                model: temperatureUnitsSelectorModel
-            }
-
-            ListModel {
-                id: windUnitsSelectorModel
-            }
-
-            OptionSelector {
-                id: windUnitsSelector
-                objectName: "WindUnitsSelector"
-                text: i18n.tr("Wind speed units")
-                delegate: unitsSelectorDelegate
-                model: windUnitsSelectorModel
-            }
-
-            ListModel {
-                id: precipitationUnitsSelectorModel
-            }
-
-            OptionSelector {
-                id: precipitationUnitsSelector
-                objectName: "PrecipitationUnitsSelector"
-                text: i18n.tr("Precipitation units")
-                delegate: unitsSelectorDelegate
-                model: precipitationUnitsSelectorModel
-                // Precipitation units not available at TWC
-                visible: (serviceSelector.selectedIndex !== 0) ?  1 : 0
-                opacity: (serviceSelector.selectedIndex !== 0) ?  1 : 0
-                Behavior on visible {
-                    enabled: (serviceSelector.selectedIndex === 0)
-                    NumberAnimation { duration:  1500}
-                }
-                Behavior on opacity {
-                    NumberAnimation {
-                        easing: UbuntuAnimation.StandardEasingReverse;
-                        duration: UbuntuAnimation.SlowDuration
-                    }
-                }
-            }
-
-            ListModel {
-                id: serviceSelectorModel
-                ListElement { name: "twcOption"; label: "The Weather Channel" }
-                ListElement { name: "owmOption"; label: "Openweathermap" }
-            }
-
-            OptionSelector {
-                id: serviceSelector
-                objectName: "ServiceSelector"
-                text: i18n.tr("Weather Service")
-                delegate: unitsSelectorDelegate
-                model: serviceSelectorModel
-                selectedIndex: (settings["service"] === "openweathermap") ? 1 : 0;
-            }
-        }
-
-        signal cancelSheet()
-        onCancelSheet: {
-            Theme.palette.selected.backgroundText = "#f4f4e8";
-            mainView.shortCutsLimited = false;
-            PopupUtils.close(sheet)
-        }
-        Connections { target: mainView; onEscapeKey: cancelSheet() }
-
-        onConfirmClicked: {
-            var refresh_from_storage = false,
-                refresh_from_service = false,
-                selectedUnit = (temperatureUnitsSelector.selectedIndex === 0) ? "metric" : "imperial",
-                selectedWindUnit = (windUnitsSelector.selectedIndex === 0) ? "kmh" : "mph",
-                selectedPrecipUnit = (precipitationUnitsSelector.selectedIndex === 0) ? "mm" : "in",
-                selectedService = (serviceSelector.selectedIndex === 0) ? "weatherchannel" : "openweathermap";
-            // check if temperaure scale was changed
-            if(settings["units"] !== selectedUnit) {
-                storage.saveSetting("units", selectedUnit);
-                refresh_from_storage = true;
-            }
-            //
-            if(settings["wind_units"] !== selectedWindUnit) {
-                storage.saveSetting("wind_units", selectedWindUnit);
-                refresh_from_storage = true;
-            }
-            //
-            if(settings["precip_units"] !== selectedPrecipUnit) {
-                storage.saveSetting("precip_units", selectedPrecipUnit);
-                refresh_from_storage = true;
-            }
-            //
-            if(settings["service"] !== selectedService) {
-                storage.saveSetting("service", selectedService);
-                refresh_from_service = true;
-            }
-            // handling of other settings here
-            // ....
-
-            // a setting was changed, reload settings and refresh the location tabs
-            if(refresh_from_storage === true || refresh_from_service === true) {
-                storage.getSettings(function(storedSettings) {
-                    for(var settingName in storedSettings) {
-                        settings[settingName] = storedSettings[settingName];
-                    }
-                    refreshData(refresh_from_storage, refresh_from_service);
-                });
-            }
-            Theme.palette.selected.backgroundText = "#f4f4e8"
-            PopupUtils.close(sheet)
-        }
-
-        onCancelClicked: {
-            cancelSheet()
-        }
-    }
-}

=== removed file 'tests/autopilot/ubuntu_weather_app/emulators.py'
--- tests/autopilot/ubuntu_weather_app/emulators.py	2014-05-19 16:05:56 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators.py	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program 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.
-#
-# Authored by: Martin Borho <[e-mail]>
-
-"""weather app autopilot tests and emulators - top level package."""
-
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-
-class MainView(toolkit_emulators.MainView):
-
-    def get_tabs(self):
-        """Return the LocationTabs emulator of the MainView."""
-        tabs = self.wait_select_single(Tabs)
-        assert tabs is not None, toolkit_emulators._NO_TABS_ERROR
-        return tabs
-
-    def wait_for_activity_to_finish(self):
-        """Wait for any running activity indicator to finish"""
-        try:
-            self._get_activity_indicator().running.wait_for(False)
-        except:
-            # No activity in progress.
-            pass
-
-    def _get_activity_indicator(self):
-        """Return an activity indicator"""
-        return self.select_single("ActivityIndicator", running="True")
-
-
-class Tabs(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
-    """LocationTabs Autopilot emulator."""
-
-    def get_current_tab(self):
-        """Return the currently selected tab."""
-        return self.select_many('LocationTab')[self.selectedTabIndex]
-
-    def get_number_of_tabs(self):
-        """Return the number of tabs."""
-        return len(self.select_many('LocationTab'))

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-09-04 05:56:22 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-09-04 17:21:39 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
+# Copyright 2013, 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -25,11 +25,44 @@
     base,
     emulators as toolkit_emulators
 )
-from ubuntu_weather_app import emulators
+from ubuntuuitoolkit._custom_proxy_objects import AppHeader
 import ubuntu_weather_app
 
 logger = logging.getLogger(__name__)
 
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013 Canonical
+#
+# This program 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.
+#
+# Authored by: Martin Borho <[e-mail]>
+
+"""weather app autopilot tests and emulators - top level package."""
+
+import ubuntuuitoolkit
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    def get_tabs(self):
+        tabs = self.wait_select_single(Tabs)
+        assert tabs is not None, toolkit_emulators._NO_TABS_ERROR
+        return tabs
+
+    def wait_for_activity_to_finish(self):
+        """Wait for any running activity indicator to finish"""
+        try:
+            self._get_activity_indicator().running.wait_for(False)
+        except:
+            # No activity in progress.
+            pass
+
+    def _get_activity_indicator(self):
+        """Return an activity indicator"""
+        return self.select_single("ActivityIndicator", running="True")
+
 
 class WeatherTestCase(base.UbuntuUIToolkitAppTestCase):
 
@@ -89,23 +122,45 @@
 
     @property
     def main_view(self):
-        return self.app.wait_select_single(emulators.MainView)
-
-
-class SheetMixin(object):
+        return self.app.wait_select_single(MainView)
+
+
+class AppHeader(AppHeader):
+    """AppHeader Autopilot custom proxy object."""
+
+    def click_action_button(self, action_object_name):
+        """Click an action button of the header.
+
+        :parameter object_name: The QML objectName property of the action
+        :raise ToolkitException: If there is no action button with that object
+            name.
+
+        """
+        self._show_if_not_visible()
+
+        button = self._get_action_button(action_object_name)
+        time.sleep(2)
+        self.pointing_device.click_object(button)
+
+
+class Tabs(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    """LocationTabs Autopilot emulator."""
+
+    def get_current_tab(self):
+        """Return the currently selected tab."""
+        return self.select_many('LocationTab')[self.selectedTabIndex]
+
+    def get_number_of_tabs(self):
+        """Return the number of tabs."""
+        return len(self.select_many('LocationTab'))
+
+
+class PageMixin(object):
     """A mixin to to give access to common sheet elements"""
 
-    def _click_sheet_confirm(self):
-        """Clicks the confirm button"""
-        button = self.main_view.select_single(
-            'Button', objectName='confirmButton')
-        self.pointing_device.click_object(button)
-
-    def _click_sheet_cancel(self):
-        """Clicks the cancel button"""
-        button = self.main_view.select_single(
-            'Button', objectName='cancelButton')
-        self.pointing_device.click_object(button)
+    def _go_back(self):
+        """Go back in PageStack"""
+        self.main_view.get_header().click_custom_back_button()
 
 
 class LocationManagerMixin(object):
@@ -119,8 +174,8 @@
         self.pointing_device.move_to_object(addCityItem)
         self.pointing_device.click()
 
-        addLocPage = self.main_view.select_single(
-            "DefaultSheet", objectName="AddLocationSheet")
+        addLocPage = self.main_view.wait_select_single(
+            "AddLocationPage", objectName="AddLocationPage")
         self.assertThat(addLocPage.visible, Eventually(Equals(True)))
 
 

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-09-04 06:37:54 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-09-04 17:21:39 +0000
@@ -17,7 +17,7 @@
 from ubuntu_weather_app.tests import (
     WeatherTestCase,
     DatabaseMixin,
-    SheetMixin,
+    PageMixin,
     LocationManagerMixin
 )
 
@@ -30,7 +30,7 @@
 # FIXME Use fixtures instead of the complex multiple inheritance.
 # --elopio - 2014-09-03
 class BaseTestLocationManager(
-        WeatherTestCase, DatabaseMixin, SheetMixin, LocationManagerMixin):
+        WeatherTestCase, DatabaseMixin, PageMixin, LocationManagerMixin):
 
     def _open_location_manager(self, kb=False):
         """Opens the location manager"""
@@ -40,8 +40,8 @@
             self.main_view.get_header().click_action_button("EditButton")
 
         # test location manager becomes visible
-        managerSheet = self.main_view.select_single(
-            'ComposerSheet', objectName='LocationManagerSheet')
+        managerSheet = self.main_view.wait_select_single(
+            'LocationManagerPage', objectName='LocationManagerPage')
         self.assertThat(managerSheet.visible, Eventually(Equals(True)))
 
     def _swipe_first_location_to_remove(self):
@@ -58,8 +58,8 @@
                         Eventually(Equals(number_of_locations - 1)))
 
     def _get_number_of_locations(self):
-        qqlw = self.app.wait_select_single("ComposerSheet").wait_select_single(
-            "QQuickListView")
+        qqlw = self.app.wait_select_single(
+            "LocationManagerPage").wait_select_single("QQuickListView")
         return qqlw.count
 
     def _add_location(self, location):
@@ -81,7 +81,7 @@
         # LocationManagerPage should be visible and location added
         addedItem = self.main_view.wait_select_single('Label', text=location)
         self.assertThat(addedItem.text, Eventually(Equals(location)))
-        self._click_sheet_confirm()
+        self._go_back()
 
         # back to locations, wait till data is loaded
         self.main_view.wait_for_activity_to_finish()
@@ -144,7 +144,7 @@
         addedItem = self.main_view.wait_select_single(
             'Label', objectName="existingLocation0")
         self.assertThat(addedItem.text, Eventually(Equals(location)))
-        self._click_sheet_confirm()
+        self._go_back()
 
         # back to locations, wait till data is loaded
         self.main_view.wait_for_activity_to_finish()
@@ -188,7 +188,7 @@
     def test_cancel_adding_location(self):
         """Cancel the cities search"""
         self._open_add_location_page()
-        self._click_sheet_cancel()
+        self._go_back()
         locationList = self.main_view.wait_select_single(
             'QQuickListView', objectName='LocationList')
         self.assertThat(locationList.visible, Eventually(Equals(True)))
@@ -231,7 +231,7 @@
         addedItem = self.main_view.wait_select_single(
             'Label', objectName="existingLocation0")
         self.assertThat(addedItem.text, Eventually(Equals(location_name)))
-        self._click_sheet_confirm()
+        self._go_back()
 
         # back to locations, wait till data is loaded
         self.main_view.wait_for_activity_to_finish()
@@ -260,10 +260,11 @@
         self.add_locations_to_database()
         logger.debug("Re-Launching app to introspect")
 
-    def _remove_location(self):
+    def _remove_location(self, stay=False):
         self._open_location_manager()
         self._swipe_first_location_to_remove()
-        self._click_sheet_confirm()
+        if not stay:
+            self._go_back()
 
     def _wait_for_tab(self):
         loadingPage = self.main_view.get_tabs()
@@ -286,6 +287,7 @@
         tabObjects = lambda: len(self.main_view.select_many('LocationTab'))
         self.assertThat(tabObjects, Eventually(Equals(tabsSumStart - 1)))
 
+    @skip("skipped because of no cancel action exists atm")
     def test_cancel_remove_location(self):
         """Cancels removing of location"""
         # wait data is loaded
@@ -309,10 +311,9 @@
         """Tests if removing and add a location in one action works
            https://bugs.launchpad.net/ubuntu-weather-app/+bug/1230297"""
         # remove a location
-        self._remove_location()
+        self._remove_location(stay=True)
 
         # add a location
-        self._open_location_manager()
         self._add_location("Cairo")
 
         # back to locations, wait till data is loaded

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2014-07-10 19:34:54 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2014-09-04 17:21:39 +0000
@@ -10,14 +10,15 @@
 from __future__ import absolute_import
 from testtools.matchers import Equals, Is, Not
 from autopilot.matchers import Eventually
+from unittest import skip
 import logging
 
-from ubuntu_weather_app.tests import WeatherTestCase, DatabaseMixin, SheetMixin
+from ubuntu_weather_app.tests import WeatherTestCase, DatabaseMixin, PageMixin
 
 logger = logging.getLogger(__name__)
 
 
-class TestSettings(WeatherTestCase, DatabaseMixin, SheetMixin):
+class TestSettings(WeatherTestCase, DatabaseMixin, PageMixin):
     def setUp(self):
         # we want to start with fake settings data
         self.create_blank_db()
@@ -28,7 +29,7 @@
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
-    def _open_settings_sheet(self):
+    def _open_settings_page(self):
         """Opens the settings sheet"""
         self.main_view.get_header().click_action_button("SettingsButton")
 
@@ -146,37 +147,38 @@
         """Tests switching the scale in the settings"""
         # first check metric values and open the settings sheet
         self._check_units('metric')
-        self._open_settings_sheet()
+        self._open_settings_page()
 
         # get temp selector
         units_selector = self._get_selector("TemperatureUnitsSelector")
 
         # choose second option, fahrenheit
         units_selector.select_option(objectName="fahrenheitOption")
-        self._click_sheet_confirm()
+        self._go_back()
 
         # wait for reload and check the imperial values
         self.main_view.wait_for_activity_to_finish()
         self._check_units('imperial')
 
         # switch back to metric values again
-        self._open_settings_sheet()
+        self._open_settings_page()
         units_selector = self._get_selector("TemperatureUnitsSelector")
 
         # click celsius option
         units_selector.select_option(objectName="celsiusOption")
-        self._click_sheet_confirm()
+        self._go_back()
 
         # wait for reload and check the metric values again
         self.main_view.wait_for_activity_to_finish()
         self._check_units('metric')
 
+    @skip("skipped because of missing cancel action")
     def test_switch_scale_cancel(self):
         """Test canceling switching scale"""
         # first check metric values and open the settings sheet
         self._check_units('metric')
         self._check_wind_units('kmh')
-        self._open_settings_sheet()
+        self._open_settings_page()
 
         # open the temp value selector
         units_selector = self._get_selector("TemperatureUnitsSelector")
@@ -197,22 +199,22 @@
         """Tests switching the wind scale in the settings"""
         # first check metric values and open the settings sheet
         self._check_wind_units('kmh')
-        self._open_settings_sheet()
+        self._open_settings_page()
 
         # choose mph and confirm
         wind_selector = self._get_selector("WindUnitsSelector")
         wind_selector.select_option(objectName="mphOption")
-        self._click_sheet_confirm()
+        self._go_back()
 
         # wait for reload and check the mph values
         self.main_view.wait_for_activity_to_finish()
         self._check_wind_units('mph')
 
         # switch back to kmh values again
-        self._open_settings_sheet()
+        self._open_settings_page()
         wind_selector = self._get_selector("WindUnitsSelector")
         wind_selector.select_option(objectName="kmhOption")
-        self._click_sheet_confirm()
+        self._go_back()
 
         # wait for reload and check the metric values again
         self.main_view.wait_for_activity_to_finish()
@@ -222,7 +224,7 @@
         """Tests switching the scale in the settings"""
         # first check metric values and open the settings sheet
         self._check_service('weatherchannel')
-        self._open_settings_sheet()
+        self._open_settings_page()
 
         # choose second option, openweathermap
         selector = self._get_selector("ServiceSelector")
@@ -232,14 +234,14 @@
         self.assertThat(lambda: self.main_view.select_single('OptionSelector',
                         objectName='PrecipitationUnitsSelector'),
                         Eventually(Not(Is(None))))
-        self._click_sheet_confirm()
+        self._go_back()
 
         # wait for reload and check the used service
         self.main_view.wait_for_activity_to_finish()
         self._check_service('openweathermap')
 
         # switch back to twc values again
-        self._open_settings_sheet()
+        self._open_settings_page()
         selector = self._get_selector("ServiceSelector")
         selector.select_option(objectName="twcOption")
 
@@ -247,7 +249,7 @@
         self.assertThat(lambda: self.main_view.select_single('OptionSelector',
                         objectName='PrecipitationUnitsSelector'),
                         Eventually(Not(Is(None))))
-        self._click_sheet_confirm()
+        self._go_back()
 
         # wait for reload and check the metric values again
         self.main_view.wait_for_activity_to_finish()

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2014-09-02 07:21:28 +0000
+++ ubuntu-weather-app.qml	2014-09-04 17:21:39 +0000
@@ -185,7 +185,7 @@
             };
         }
         tabsString += "}"; // END Tabs componen
-        tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs")
+        tabsObject = Qt.createQmlObject(tabsString, pageStack, "tabs")
         if(focusToLast) {
             tabsObject.selectedTabIndex = locLength -1;
         } else if(tabIndexAtRefresh > -1) {
@@ -215,11 +215,11 @@
     }
 
     function showLocationManager() {
-        PopupUtils.open(locationManager)
+        pageStack.push(Qt.resolvedUrl("components/LocationManagerPage.qml"))
     }
 
     function showSettings() {
-        PopupUtils.open(settingsSheet)
+        pageStack.push(Qt.resolvedUrl("components/SettingsPage.qml"))
     }
 
     Component.onCompleted: {
@@ -237,19 +237,11 @@
             refreshData();
         })
     }
-
-    Components.SettingsSheet {
-        id: settingsSheet
-    }
     
     Components.Storage{
         id: storage
     }    
 
-    Components.LocationManagerSheet {
-        id:locationManager
-    }
-
     Components.SplashComponent {
         id:httpFailedSplash
         objectName: "HTTPFailedSplash"
@@ -259,8 +251,8 @@
         id:refresh
     }
 
-    Item {
-        id:tabPage
+    PageStack {
+        id:pageStack
         anchors.fill: parent
     }