Ubuntu Weather App

Merge lp:~vthompson/ubuntu-weather-app/fix-1469460 into lp:ubuntu-weather-app

  1. fix-1469460
  2. Merge into reboot
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 113
Merged at revision: 123
Proposed branch: lp:~vthompson/ubuntu-weather-app/fix-1469460
Merge into: lp:ubuntu-weather-app
Diff against target: 76 lines (+8/-1)
3 files modified
app/ui/AddLocationPage.qml (+2/-0)
app/ui/LocationsPage.qml (+5/-1)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/fix-1469460
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+269451@code.launchpad.net

Commit message

* Make sure the text elides on the LocationsPage and the AddLocationPage.

Description of the change

* Make sure the text elides on the LocationsPage and the AddLocationPage.

This was taken from the blocked ListItems branch and improved to also elide for Current location and AddLocationPage ListItems.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:110
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/232/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/202
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/232

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

The current location width seems to be to big, causing it to elide over the icon unlike the others. Also should this be added to the AddLocationPage delegates?

review: Needs Information
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:112
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/239/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/209
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/239

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM :-)

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-autolanding/105/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-autolanding/96/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/105/console

review: Needs Fixing (continuous-integration)
lp:~vthompson/ubuntu-weather-app/fix-1469460 updated
113. By Victor Thompson

Merge and resolve conflicts.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:113
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/246/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/216
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/246

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/ui/AddLocationPage.qml'
--- app/ui/AddLocationPage.qml 2015-08-11 00:58:15 +0000
+++ app/ui/AddLocationPage.qml 2015-09-10 23:44:17 +0000
@@ -236,6 +236,7 @@
236 elide: Text.ElideRight236 elide: Text.ElideRight
237 fontSize: "medium"237 fontSize: "medium"
238 text: name238 text: name
239 width: parent.width
239 }240 }
240241
241 Label {242 Label {
@@ -243,6 +244,7 @@
243 elide: Text.ElideRight244 elide: Text.ElideRight
244 fontSize: "xx-small"245 fontSize: "xx-small"
245 text: areaLabel246 text: areaLabel
247 width: parent.width
246 }248 }
247 }249 }
248250
249251
=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml 2015-09-05 22:50:32 +0000
+++ app/ui/LocationsPage.qml 2015-09-10 23:44:17 +0000
@@ -89,7 +89,7 @@
89 anchors {89 anchors {
90 left: parent.left90 left: parent.left
91 right: currentWeatherImage.left91 right: currentWeatherImage.left
92 rightMargin: units.gu(1)92 rightMargin: units.gu(3)
93 verticalCenter: parent.verticalCenter93 verticalCenter: parent.verticalCenter
94 }94 }
9595
@@ -104,6 +104,7 @@
104 elide: Text.ElideRight104 elide: Text.ElideRight
105 fontSize: "medium"105 fontSize: "medium"
106 text: i18n.tr("Current Location")106 text: i18n.tr("Current Location")
107 width: parent.width
107 }108 }
108 Label {109 Label {
109 id: currentLocationName2110 id: currentLocationName2
@@ -118,6 +119,7 @@
118 fontSize: "small"119 fontSize: "small"
119 font.weight: Font.Light120 font.weight: Font.Light
120 text: name + ", " + (adminName1 == name ? countryName : adminName1)121 text: name + ", " + (adminName1 == name ? countryName : adminName1)
122 width: parent.width
121 }123 }
122 }124 }
123125
@@ -204,6 +206,7 @@
204 elide: Text.ElideRight206 elide: Text.ElideRight
205 fontSize: "medium"207 fontSize: "medium"
206 text: name208 text: name
209 width: parent.width
207 }210 }
208 Label {211 Label {
209 id: locationName2212 id: locationName2
@@ -212,6 +215,7 @@
212 fontSize: "small"215 fontSize: "small"
213 font.weight: Font.Light216 font.weight: Font.Light
214 text: adminName1 == name ? countryName : adminName1217 text: adminName1 == name ? countryName : adminName1
218 width: parent.width
215 }219 }
216 }220 }
217221
218222
=== modified file 'debian/changelog'
--- debian/changelog 2015-09-05 22:54:51 +0000
+++ debian/changelog 2015-09-10 23:44:17 +0000
@@ -25,6 +25,7 @@
25 * Get the condition text to be translated from the OWM API. (LP: #1487793)25 * Get the condition text to be translated from the OWM API. (LP: #1487793)
26 * Add a Network Error State Component for when a connection error takes place.26 * Add a Network Error State Component for when a connection error takes place.
27 * Allow the LocationsPage to be flickable. (LP: #1490044)27 * Allow the LocationsPage to be flickable. (LP: #1490044)
28 * Make sure the text elides on the LocationsPage and the AddLocationPage. (LP: #1469460)
2829
29 [ Andrew Hayzen ]30 [ Andrew Hayzen ]
30 * Add mocked locations for autopilot and add a test using the data31 * Add mocked locations for autopilot and add a test using the data

Subscribers

People subscribed via source and target branches

to all changes: