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

[Raúl Yeguas]

SettingsDialog conversion to Page.

SettingsDialog conversion to Page.

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

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

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

review: Approve

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-06-14 13:11:16 +0000
+++ components/LocationTab.qml	2013-06-17 19:25:31 +0000
@@ -77,10 +77,10 @@
             Action {
                 id: configAction
                 iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
-                text: i18n.tr("Configuration")
+                text: i18n.tr("Settings")
 
                 onTriggered: {
-                    PopupUtils.open(settingsDialog, locationTab);
+                    mainView.showSettingsPage();
                 }
             }
         }

=== renamed file 'components/SettingsDialog.qml' => 'components/SettingsPage.qml'
--- components/SettingsDialog.qml	2013-06-14 10:09:37 +0000
+++ components/SettingsPage.qml	2013-06-17 19:25:31 +0000
@@ -2,66 +2,72 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 
-// Dialog for settings (units by now)
-Component {
-    id: settingsDialog
-
-    Dialog {
-        id: settingsDialogue
-        height: units.gu(10)
-        title: i18n.tr("Settings")
-
-        Row {
-            Label {
-                id: imperialString
-                width: units.gu(21)
-                anchors.verticalCenter: parent.verticalCenter
-                text: i18n.tr("Use imperial units")
-            }
-            Switch {
-                id: imperialSwitch
-                Component.onCompleted: {
-                    storage.getSettings(function(storedSettings) {
-                        if (storedSettings['units'] === 'imperial')
-                            imperialSwitch.checked = true;
-                        else
-                            imperialSwitch.checked = false;
-                    });
-                }
-            }
-        }
-
-        Button {
-            id: settingsOkButton
-            text: i18n.tr("Save")
-            onClicked: {
+// Page for settings (units by now)
+Page {
+    id: settingsPage
+    objectName: "SettingsPage"
+    title: i18n.tr("Settings")
+    visible:false
+
+    property bool settingsChanged: false
+
+    tools: ToolbarActions {
+        locked: true
+        opened: true
+        back.onTriggered: {
+            if(settingsChanged) {
                 if(imperialSwitch.checked){
-                    console.debug("Saving imperial units");
-                    storage.saveSetting("units","imperial");
+                  storage.saveSetting("units","imperial");
                 }else{
-                    console.debug("Saving metric units");
-                    storage.saveSetting("units","metric");
+                  storage.saveSetting("units","metric");
                 }
-                PopupUtils.close(settingsDialogue);
-                //Loading tab
-                var tabsString = "import QtQuick 2.0; import Ubuntu.Components 0.1; import Ubuntu.Components.Popups 0.1;"
-                           + "Tabs {id: tabs; anchors.fill: parent; Tab { title: 'Loading...';  LoadingComponent{id:bigLoading; anchors.fill: parent; z: 2;}}}"
-                tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs");
-                // Refresh settings and Data
                 storage.getSettings(function(storedSettings) {
                     for(var settingName in storedSettings) {
                         settings[settingName] = storedSettings[settingName];
                     }
-                    refreshData(true);
-                });
-            }
-        }
-
-        Button {
-            id:settingsCancelButton
-            text: i18n.tr("Cancel")
-            color: "#C00000"
-            onClicked: PopupUtils.close(settingsDialogue)
+                    refreshData();
+                });
+                settingsChanged = false;
+            }
+        }
+    }
+
+    Rectangle {
+        anchors {
+            right: parent.right
+            rightMargin: units.gu(1)
+            left: parent.left
+            leftMargin: units.gu(1)
+            top: parent.top
+            topMargin: units.gu(3)
+        }
+        Label {
+            id: imperialString
+            width: units.gu(21)
+            anchors {
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+
+            text: i18n.tr("Use imperial units")
+        }
+        Switch {
+            id: imperialSwitch
+            anchors {
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            Component.onCompleted: {
+                storage.getSettings(function(storedSettings) {
+                    if (storedSettings['units'] === 'imperial')
+                        imperialSwitch.checked = true;
+                    else
+                        imperialSwitch.checked = false;
+                });
+            }
+            onCheckedChanged: {
+                settingsChanged = true;
+            }
         }
     }
 }

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-06-14 13:11:16 +0000
+++ ubuntu-weather-app.qml	2013-06-17 19:25:31 +0000
@@ -91,6 +91,10 @@
         locationManager.loadData()
     }
 
+    function showSettingsPage() {
+        pageStack.push(settingsPage)
+    }
+
     Component.onCompleted: {
         //storage.clearDB();
         //storage.clearSetting('units');
@@ -107,8 +111,8 @@
         id: addLocationDialog
     }
 
-    Components.SettingsDialog {
-        id: settingsDialog
+    Components.SettingsPage {
+        id: settingsPage
     }
     
     Components.Storage{