Victor Thompson has proposed merging
lp:~vthompson/ubuntu-weather-app/reboot-current-location-ui-changes into
lp:ubuntu-weather-app/reboot with
lp:~vthompson/ubuntu-weather-app/reboot-manage-current-location as a
prerequisite.
Commit message:
Update LocationsPage layout to better match the design spec.
Requested reviews:
Ubuntu Weather Developers (ubuntu-weather-dev)
For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-weather-app/reboot-current-location-ui-changes/+merge/261299
Update LocationsPage layout to better match the design spec.
--
Your team Ubuntu Weather Developers is requested to review the proposed merge
of lp:~vthompson/ubuntu-weather-app/reboot-current-location-ui-changes into
lp:ubuntu-weather-app/reboot.
=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml 2015-06-05 23:08:19 +0000
+++ app/ui/LocationsPage.qml 2015-06-05 23:08:19 +0000
@@ -87,21 +87,37 @@
rightMargin: units.gu(2)
}
- Label {
- id: locationName
+ Column {
anchors {
left: parent.left
right: weatherImage.visible ? weatherImage.left : parent.right
rightMargin: units.gu(1)
verticalCenter: parent.verticalCenter
}
- elide: Text.ElideRight
- text: name
+
+ Label {
+ id: locationName
+ elide: Text.ElideRight
+ fontSize: "medium"
+ text: index != 0 ? name : i18n.tr("Current Location")
+ }
+ Label {
+ id: locationName2
+ elide: Text.ElideRight
+ fontSize: "small"
+ font.weight: Font.Light
+ text: index != 0 ? (adminName1 == name ? countryName : adminName1)
+ : name + ", " + (adminName1 == name ? countryName : adminName1)
+ }
}
Icon {
id: weatherImage
- anchors.centerIn: parent
+ anchors {
+ right: parent.right
+ rightMargin: units.gu(12)
+ verticalCenter: parent.verticalCenter
+ }
name: icon
height: units.gu(3)
width: units.gu(3)
@@ -143,6 +159,9 @@
data = weatherApp.locationsList[i];
loc = {
"name": data.location.name,
+ "adminName1": data.location.adminName1,
+ "areaLabel": data.location.areaLabel,
+ "countryName": data.location.countryName,
"temp": Math.round(data.data[0].current[tempUnits].temp).toString(),
"icon": iconMap[data.data[0].current.icon]
}
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot 2015-06-03 17:49:50 +0000
+++ po/com.ubuntu.weather.pot 2015-06-05 23:08:19 +0000
@@ -8,7 +8,11 @@
msgstr ""
"Project-Id-Version: ubuntu-weather-app\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
"POT-Creation-Date: 2015-05-29 05:21+0100\n"
+=======
+"POT-Creation-Date: 2015-06-05 18:04-0500\n"
+>>>>>>> MERGE-SOURCE
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -102,6 +106,10 @@
msgid "Locations"
msgstr ""
+#: ../app/ui/LocationsPage.qml:102
+msgid "Current Location"
+msgstr ""
+
#: ../app/ui/SettingsPage.qml:24
msgid "Settings"
msgstr ""
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
