ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/ubuntu-weather-app/reboot-update-settings-text into lp:ubuntu-weather-app/reboot.

Commit message:
* Display a more readable version of the data provider names

Requested reviews:
  Ubuntu Weather Developers (ubuntu-weather-dev)

For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-weather-app/reboot-update-settings-text/+merge/258701

* Display a more readable version of the data provider names
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-weather-app/reboot-update-settings-text into lp:ubuntu-weather-app/reboot.

=== modified file 'app/ui/settings/DataProviderPage.qml'
--- app/ui/settings/DataProviderPage.qml	2015-03-20 00:36:07 +0000
+++ app/ui/settings/DataProviderPage.qml	2015-05-09 01:17:16 +0000
@@ -26,8 +26,8 @@
 
     ListModel {
         id: dataProviderModel
-        ListElement { text: "openweathermap" }
-        ListElement { text: "weatherchannel" }
+        ListElement { text: "OpenWeatherMap" }
+        ListElement { text: "The Weather Channel" }
     }
 
     ExpandableListItem {
@@ -36,12 +36,16 @@
         listViewHeight: dataProviderModel.count*units.gu(6) - units.gu(1)
         model: dataProviderModel
         text: i18n.tr("Provider")
-        subText: settings.service
+        subText: settings.service === "weatherchannel" ? "The Weather Channel" : "OpenWeatherMap"
 
         delegate: ListItem.Standard {
             text: model.text
             onClicked: {
-                settings.service = model.text
+                if (model.text === "The Weather Channel") {
+                    settings.service = "weatherchannel"
+                } else {
+                    settings.service = "openweathermap"
+                }
                 refreshData(false, true)
             }
 
@@ -49,7 +53,7 @@
                 width: units.gu(2)
                 height: width
                 name: "ok"
-                visible: settings.service === model.text
+                visible: dataProviderSetting.subText === model.text
                 anchors.right: parent.right
                 anchors.rightMargin: units.gu(2)
                 anchors.verticalCenter: parent.verticalCenter