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

[Raúl Yeguas]

Added the settingsDialog for setting units (by now).

Added the settingsDialog for setting units (by now).

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

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

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

review: Approve

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-06-04 21:11:27 +0000
+++ components/LocationTab.qml	2013-06-12 17:15:33 +0000
@@ -93,6 +93,16 @@
                     mainView.refreshData();
                 }
             }
+
+            Action {
+                id: configAction
+                iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
+                text: i18n.tr("Configuration")
+
+                onTriggered: {
+                    PopupUtils.open(settingsDialog, locationTab);
+                }
+            }
         }
     }
 

=== added file 'components/SettingsDialog.qml'
--- components/SettingsDialog.qml	1970-01-01 00:00:00 +0000
+++ components/SettingsDialog.qml	2013-06-12 17:15:33 +0000
@@ -0,0 +1,67 @@
+import QtQuick 2.0
+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: {
+                if(imperialSwitch.checked){
+                    console.debug("Saving imperial units");
+                    storage.saveSetting("units","imperial");
+                }else{
+                    console.debug("Saving metric units");
+                    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();
+                });
+            }
+        }
+
+        Button {
+            id:settingsCancelButton
+            text: i18n.tr("Cancel")
+            color: "#C00000"
+            onClicked: PopupUtils.close(settingsDialogue)
+        }
+    }
+}

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-06-09 15:42:41 +0000
+++ ubuntu-weather-app.qml	2013-06-12 17:15:33 +0000
@@ -106,6 +106,10 @@
     Components.AddLocationDialog {
         id: addLocationDialog
     }
+
+    Components.SettingsDialog {
+        id: settingsDialog
+    }
     
     Components.Storage{
         id: storage