Ubuntu Weather App

Merge lp:~nik90/ubuntu-weather-app/fix-ota10-sdk-issues into lp:ubuntu-weather-app

  1. fix-ota10-sdk-issues
  2. Merge into reboot
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Victor Thompson
Approved revision: 227
Merged at revision: 230
Proposed branch: lp:~nik90/ubuntu-weather-app/fix-ota10-sdk-issues
Merge into: lp:ubuntu-weather-app
Diff against target: 830 lines (+218/-199)
13 files modified
app/components/ExpandableListItem.qml (+17/-24)
app/components/NoAPIKeyErrorStateComponent.qml (+2/-3)
app/components/StandardListItem.qml (+11/-17)
app/ui/AddLocationPage.qml (+52/-70)
app/ui/HomePage.qml (+2/-3)
app/ui/SettingsPage.qml (+33/-11)
app/ui/settings/DataProviderPage.qml (+12/-7)
app/ui/settings/LocationPage.qml (+20/-11)
app/ui/settings/RefreshIntervalPage.qml (+12/-7)
app/ui/settings/UnitsPage.qml (+18/-13)
debian/changelog (+7/-1)
manifest.json.in (+1/-1)
po/com.ubuntu.weather.pot (+31/-31)
To merge this branch: bzr merge lp:~nik90/ubuntu-weather-app/fix-ota10-sdk-issues
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Review via email: mp+287421@code.launchpad.net

Commit message

- Migrated Settings Page (and its child settings pages) to ListItemLayouts and PageHeader which fixes lot of the colouring issues. Also, in UC 1.3, the page.head, page.title and page.flickable is deprecated.

- Updated framework to ubuntu-sdk-15.04.3-qml
- Fixed label color issue in AddLocationsPage

Description of the change

- Migrated Settings Page (and its child settings pages) to ListItemLayouts and PageHeader which fixes lot of the colouring issues. Also, in UC 1.3, the page.head, page.title and page.flickable is deprecated.

- Updated framework to ubuntu-sdk-15.04.3-qml

To post a comment you must log in.
lp:~nik90/ubuntu-weather-app/fix-ota10-sdk-issues updated
227. By Nekhelesh Ramananthan

Replace clock with weather in header

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:227
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1084/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/641/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1084/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Functionally, issues #2 and #4 (recently added) are still occurring. I suspect Issues #4 is possibly an SDK issue--it affects Music as well. Although the code is probably similar, as I'm sure we borrowed the header state logic from Music.

Other comments on functionality:

1. Could we make the Settings and AddCityPage pages white to match the header? It is slightly off-white now and the header is white.
2. FastScroll is currently the light blue color--while it looks OK it doesn't fit the theme very well.

Code looks good at first glance--will need to actually review it.

review: Needs Fixing
Revision history for this message
Victor Thompson (vthompson) wrote :

In the above review, I meant issues #1 and #4 are still occurring. For #4, the music app made changes to set the visible property rather than the enabled property.

Revision history for this message
Victor Thompson (vthompson) wrote :

I support merging this and fixing the remaining issues shortly.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/ExpandableListItem.qml'
2--- app/components/ExpandableListItem.qml 2015-11-02 21:28:34 +0000
3+++ app/components/ExpandableListItem.qml 2016-02-28 22:59:00 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2015 Canonical Ltd
7+ * Copyright (C) 2015-2016 Canonical Ltd
8 *
9 * This file is part of Ubuntu Weather App
10 *
11@@ -18,31 +18,27 @@
12
13 import QtQuick 2.4
14 import Ubuntu.Components 1.3
15-import Ubuntu.Components.ListItems 1.0 as ListItem
16
17 /*
18 Component which extends the SDK Expandable list item and provides a easy
19- to use component where the title, subtitle and listview can be displayed. It
20+ to use component where the title, subtitle and a listview can be displayed. It
21 matches the design specification provided for clock.
22 */
23
24-ListItem.Expandable {
25+ListItem {
26 id: expandableListItem
27
28+ // Public APIs
29 property ListModel model
30 property Component delegate
31- property alias text: expandableHeader.text
32- property alias subText: expandableHeader.subText
33+ property alias title: expandableHeader.title
34+ property alias subText: expandableHeader.subtitle
35 property alias listViewHeight: expandableList.height
36
37- anchors {
38- left: parent.left
39- right: parent.right
40- margins: units.gu(-2)
41- }
42-
43- collapseOnClick: true
44- expandedHeight: contentColumn.height + units.gu(1)
45+ highlightColor: "Transparent"
46+ height: expandableHeader.height + divider.height
47+ expansion.height: contentColumn.height
48+ onClicked: expansion.expanded = !expansion.expanded
49
50 Column {
51 id: contentColumn
52@@ -52,25 +48,21 @@
53 right: parent.right
54 }
55
56- Item {
57- width: parent.width
58- height: expandableListItem.collapsedHeight
59-
60- ListItem.Subtitled {
61+ ListItem {
62+ height: expandableHeader.height + divider.height
63+ ListItemLayout {
64 id: expandableHeader
65- onClicked: expandableListItem.expanded = true
66
67 Icon {
68 id: arrow
69
70 width: units.gu(2)
71 height: width
72- anchors.right: parent.right
73+ SlotsLayout.position: SlotsLayout.Trailing
74+ SlotsLayout.overrideVerticalPositioning: true
75 anchors.verticalCenter: parent.verticalCenter
76-
77 name: "go-down"
78- color: "Grey"
79- rotation: expandableListItem.expanded ? 180 : 0
80+ rotation: expandableListItem.expansion.expanded ? 180 : 0
81
82 Behavior on rotation {
83 UbuntuNumberAnimation {}
84@@ -88,3 +80,4 @@
85 }
86 }
87 }
88+
89
90=== modified file 'app/components/NoAPIKeyErrorStateComponent.qml'
91--- app/components/NoAPIKeyErrorStateComponent.qml 2015-11-12 01:45:36 +0000
92+++ app/components/NoAPIKeyErrorStateComponent.qml 2016-02-28 22:59:00 +0000
93@@ -1,5 +1,5 @@
94 /*
95- * Copyright (C) 2015 Canonical Ltd
96+ * Copyright (C) 2015-2016 Canonical Ltd
97 *
98 * This file is part of Ubuntu Weather App
99 *
100@@ -17,10 +17,9 @@
101 */
102
103 import QtQuick 2.4
104-import Ubuntu.Components 1.5
105+import Ubuntu.Components 1.3
106 import "../components"
107
108-
109 Rectangle {
110 color: "white"
111 anchors.fill: parent
112
113=== modified file 'app/components/StandardListItem.qml'
114--- app/components/StandardListItem.qml 2015-11-02 21:28:34 +0000
115+++ app/components/StandardListItem.qml 2016-02-28 22:59:00 +0000
116@@ -17,32 +17,26 @@
117 */
118
119 import QtQuick 2.4
120-import QtQuick.Layouts 1.1
121 import Ubuntu.Components 1.3
122
123 ListItem {
124 id: listItem
125
126- property alias title: _title.text
127- property alias icon: _icon.name
128- property alias showIcon: _icon.visible
129-
130- RowLayout {
131- anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(2) }
132- height: _icon.height
133- spacing: units.gu(2)
134-
135- Label {
136- id: _title
137- anchors.verticalCenter: _icon.verticalCenter
138- elide: Text.ElideRight
139- Layout.fillWidth: true
140- }
141-
142+ property alias title: listitemlayout.title
143+ property alias icon: _icon
144+
145+ height: listitemlayout.height + divider.height
146+
147+ ListItemLayout {
148+ id: listitemlayout
149+
150+ title.text: ""
151+
152 Icon {
153 id: _icon
154 height: units.gu(2); width: height
155 name: "go-next"
156+ SlotsLayout.position: SlotsLayout.Last
157 }
158 }
159 }
160
161=== modified file 'app/ui/AddLocationPage.qml'
162--- app/ui/AddLocationPage.qml 2015-11-02 21:28:34 +0000
163+++ app/ui/AddLocationPage.qml 2016-02-28 22:59:00 +0000
164@@ -1,5 +1,5 @@
165 /*
166- * Copyright (C) 2015 Canonical Ltd
167+ * Copyright (C) 2015-2016 Canonical Ltd
168 *
169 * This file is part of Ubuntu Weather App
170 *
171@@ -26,65 +26,60 @@
172 Page {
173 id: addLocationPage
174 objectName: "addLocationPage"
175- title: i18n.tr("Select a city")
176+
177 visible: false
178
179- /*
180- Flickable is set to null to stop page header from hiding since the fast
181- scroll component hides top anchor margin is incorrect.
182- */
183- flickable: null
184-
185 property bool searching: citiesModel.loading || searchTimer.running
186
187- state: "default"
188- states: [
189- PageHeadState {
190- name: "default"
191- head: addLocationPage.head
192- backAction: Action {
193- iconName: "back"
194- text: i18n.tr("Back")
195- onTriggered: mainPageStack.pop()
196+ header: standardHeader
197+
198+ PageHeader {
199+ id: standardHeader
200+ title: i18n.tr("Select a city")
201+ /*
202+ Flickable is set to null to stop page header from hiding since the fast
203+ scroll component hides top anchor margin is incorrect.
204+ */
205+ flickable: null
206+ visible: addLocationPage.header === standardHeader
207+ trailingActionBar.actions: [
208+ Action {
209+ iconName: "search"
210+ objectName: "search"
211+ text: i18n.tr("City")
212+ onTriggered: {
213+ addLocationPage.header = searchHeader
214+ searchComponentLoader.sourceComponent = searchComponent
215+ searchComponentLoader.item.forceActiveFocus()
216+ }
217 }
218- actions: [
219- Action {
220- iconName: "search"
221- objectName: "search"
222- text: i18n.tr("City")
223- onTriggered: {
224- addLocationPage.state = "search"
225- searchComponentLoader.sourceComponent = searchComponent
226- searchComponentLoader.item.forceActiveFocus()
227- }
228- }
229- ]
230- },
231+ ]
232+ }
233
234- PageHeadState {
235- name: "search"
236- head: addLocationPage.head
237- backAction: Action {
238+ PageHeader {
239+ id: searchHeader
240+ visible: addLocationPage.header === searchHeader
241+ leadingActionBar.actions: [
242+ Action {
243 iconName: "back"
244 text: i18n.tr("Back")
245 onTriggered: {
246 locationList.forceActiveFocus()
247 searchComponentLoader.item.text = ""
248- addLocationPage.state = "default"
249+ addLocationPage.header = standardHeader
250 searchComponentLoader.sourceComponent = undefined
251 }
252 }
253-
254- contents: Loader {
255- id: searchComponentLoader
256- anchors {
257- left: parent ? parent.left : undefined
258- right: parent ? parent.right : undefined
259- rightMargin: units.gu(2)
260- }
261+ ]
262+ contents: Loader {
263+ id: searchComponentLoader
264+ anchors {
265+ left: parent ? parent.left : undefined
266+ right: parent ? parent.right : undefined
267+ verticalCenter: parent ? parent.verticalCenter : undefined
268 }
269 }
270- ]
271+ }
272
273 // Outside component so property can bind to for autopilot
274 Timer {
275@@ -181,9 +176,12 @@
276 ListView {
277 id: locationList
278 anchors {
279- fill: parent
280+ top: addLocationPage.header.bottom
281+ topMargin: units.gu(2)
282+ left: parent.left
283+ right: parent.right
284 rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1) : 0
285- topMargin: units.gu(2)
286+ bottom: parent.bottom
287 }
288
289 objectName: "locationList"
290@@ -224,30 +222,14 @@
291 delegate: ListItem {
292 divider.visible: false
293 objectName: "addLocation" + index
294- Column {
295- anchors {
296- left: parent.left
297- leftMargin: units.gu(2)
298- right: parent.right
299- rightMargin: units.gu(2)
300- verticalCenter: parent.verticalCenter
301- }
302-
303- Label {
304- color: UbuntuColors.darkGrey
305- elide: Text.ElideRight
306- fontSize: "medium"
307- text: name
308- width: parent.width
309- }
310-
311- Label {
312- color: UbuntuColors.lightGrey
313- elide: Text.ElideRight
314- fontSize: "xx-small"
315- text: areaLabel
316- width: parent.width
317- }
318+
319+ height: listDelegateLayout.height
320+
321+ ListItemLayout {
322+ id: listDelegateLayout
323+ title.text: name
324+ subtitle.text: areaLabel
325+ subtitle.textSize: Label.Small
326 }
327
328 onClicked: {
329
330=== modified file 'app/ui/HomePage.qml'
331--- app/ui/HomePage.qml 2015-11-26 02:05:13 +0000
332+++ app/ui/HomePage.qml 2016-02-28 22:59:00 +0000
333@@ -1,5 +1,5 @@
334 /*
335- * Copyright (C) 2015 Canonical Ltd
336+ * Copyright (C) 2015-2016 Canonical Ltd
337 *
338 * This file is part of Ubuntu Weather App
339 *
340@@ -85,8 +85,7 @@
341 }
342
343 // Do not show the Page Header
344- head {
345- locked: true
346+ header: PageHeader {
347 visible: false
348 }
349
350
351=== modified file 'app/ui/SettingsPage.qml'
352--- app/ui/SettingsPage.qml 2015-11-02 21:28:34 +0000
353+++ app/ui/SettingsPage.qml 2016-02-28 22:59:00 +0000
354@@ -1,5 +1,5 @@
355 /*
356- * Copyright (C) 2015 Canonical Ltd
357+ * Copyright (C) 2015-2016 Canonical Ltd
358 *
359 * This file is part of Ubuntu Weather App
360 *
361@@ -21,31 +21,53 @@
362 import "../components"
363
364 Page {
365- title: i18n.tr("Settings")
366+ id: settingsPage
367+
368+ header: PageHeader {
369+ title: i18n.tr("Settings")
370+ }
371+
372 property bool bug1341671workaround: true
373
374 Column {
375 id: settingsColumn
376
377- anchors.fill: parent
378+ anchors {
379+ top: settingsPage.header.bottom
380+ left: parent.left
381+ right: parent.right
382+ bottom: parent.bottom
383+ }
384
385- StandardListItem {
386- title: i18n.tr("Units")
387+ ListItem {
388+ ListItemLayout {
389+ title.text: i18n.tr("Units")
390+ ProgressionSlot{}
391+ }
392 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/UnitsPage.qml"))
393 }
394
395- StandardListItem {
396- title: i18n.tr("Data Provider")
397+ ListItem {
398+ ListItemLayout {
399+ title.text: i18n.tr("Data Provider")
400+ ProgressionSlot{}
401+ }
402 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/DataProviderPage.qml"))
403 }
404
405- StandardListItem {
406- title: i18n.tr("Refresh Interval")
407+ ListItem {
408+ ListItemLayout {
409+ title.text: i18n.tr("Refresh Interval")
410+ ProgressionSlot{}
411+ }
412 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/RefreshIntervalPage.qml"))
413 }
414
415- StandardListItem {
416- title: i18n.tr("Location")
417+ ListItem {
418+ ListItemLayout {
419+ title.text: i18n.tr("Location")
420+ ProgressionSlot{}
421+ }
422 onClicked: mainPageStack.push(Qt.resolvedUrl("settings/LocationPage.qml"))
423 }
424 }
425
426=== modified file 'app/ui/settings/DataProviderPage.qml'
427--- app/ui/settings/DataProviderPage.qml 2015-11-02 21:28:34 +0000
428+++ app/ui/settings/DataProviderPage.qml 2016-02-28 22:59:00 +0000
429@@ -1,5 +1,5 @@
430 /*
431- * Copyright (C) 2015 Canonical Ltd
432+ * Copyright (C) 2015-2016 Canonical Ltd
433 *
434 * This file is part of Ubuntu Weather App
435 *
436@@ -22,7 +22,11 @@
437 import "../../data/keys.js" as Keys
438
439 Page {
440- title: i18n.tr("Data Provider")
441+ id: dataProviderPage
442+
443+ header: PageHeader {
444+ title: i18n.tr("Data Provider")
445+ }
446
447 ListModel {
448 id: dataProviderModel
449@@ -32,15 +36,16 @@
450 ExpandableListItem {
451 id: dataProviderSetting
452
453+ anchors.top: dataProviderPage.header.bottom
454 listViewHeight: dataProviderModel.count*units.gu(7) - units.gu(1)
455 model: dataProviderModel
456- text: i18n.tr("Provider")
457- subText: settings.service === "weatherchannel" ? "The Weather Channel" : "OpenWeatherMap"
458+ title.text: i18n.tr("Provider")
459+ subText.text: settings.service === "weatherchannel" ? "The Weather Channel" : "OpenWeatherMap"
460
461 delegate: StandardListItem {
462- title: model.text
463- icon: "ok"
464- showIcon: dataProviderSetting.subText === model.text
465+ title.text: model.text
466+ icon.name: "ok"
467+ icon.visible: dataProviderSetting.subText === model.text
468 onClicked: {
469 if (model.text === "The Weather Channel") {
470 settings.service = "weatherchannel"
471
472=== modified file 'app/ui/settings/LocationPage.qml'
473--- app/ui/settings/LocationPage.qml 2015-11-02 21:28:34 +0000
474+++ app/ui/settings/LocationPage.qml 2016-02-28 22:59:00 +0000
475@@ -1,5 +1,5 @@
476 /*
477- * Copyright (C) 2015 Canonical Ltd
478+ * Copyright (C) 2015-2016 Canonical Ltd
479 *
480 * This file is part of Ubuntu Weather App
481 *
482@@ -18,19 +18,28 @@
483
484 import QtQuick 2.4
485 import Ubuntu.Components 1.3
486-import Ubuntu.Components.ListItems 1.0 as ListItem
487
488 Page {
489- title: i18n.tr("Location")
490-
491- ListItem.Standard {
492- control: CheckBox {
493- checked: settings.detectCurrentLocation
494-
495- onCheckedChanged: settings.detectCurrentLocation = checked;
496+ id: locationPage
497+
498+ header: PageHeader {
499+ title: i18n.tr("Location")
500+ }
501+
502+ ListItem {
503+ anchors.top: locationPage.header.bottom
504+ height: locationLayout.height + divider.height
505+ ListItemLayout {
506+ id: locationLayout
507+ title.text: i18n.tr("Detect current location")
508+ Switch {
509+ id: locationSwitch
510+ SlotsLayout.position: SlotsLayout.Last
511+ checked: settings.detectCurrentLocation
512+ onCheckedChanged: settings.detectCurrentLocation = checked;
513+ }
514 }
515- text: i18n.tr("Detect current location")
516
517- onClicked: control.checked = !control.checked
518+ onClicked: locationSwitch.checked = !locationSwitch.checked
519 }
520 }
521
522=== modified file 'app/ui/settings/RefreshIntervalPage.qml'
523--- app/ui/settings/RefreshIntervalPage.qml 2015-11-02 21:28:34 +0000
524+++ app/ui/settings/RefreshIntervalPage.qml 2016-02-28 22:59:00 +0000
525@@ -1,5 +1,5 @@
526 /*
527- * Copyright (C) 2015 Canonical Ltd
528+ * Copyright (C) 2015-2016 Canonical Ltd
529 *
530 * This file is part of Ubuntu Weather App
531 *
532@@ -21,7 +21,11 @@
533 import "../../components"
534
535 Page {
536- title: i18n.tr("Refresh Interval")
537+ id: refreshIntervalPage
538+
539+ header: PageHeader {
540+ title: i18n.tr("Refresh Interval")
541+ }
542
543 ListModel {
544 id: refreshModel
545@@ -37,15 +41,16 @@
546 ExpandableListItem {
547 id: dataProviderSetting
548
549+ anchors.top: refreshIntervalPage.header.bottom
550 listViewHeight: refreshModel.count*units.gu(7) - units.gu(1)
551 model: refreshModel
552- text: i18n.tr("Interval")
553- subText: i18n.tr("%1 minute", "%1 minutes", Math.floor(settings.refreshInterval / 60).toString()).arg(Math.floor(settings.refreshInterval / 60).toString())
554+ title.text: i18n.tr("Interval")
555+ subText.text: i18n.tr("%1 minute", "%1 minutes", Math.floor(settings.refreshInterval / 60).toString()).arg(Math.floor(settings.refreshInterval / 60).toString())
556
557 delegate: StandardListItem {
558- title: model.text
559- icon: "ok"
560- showIcon: settings.refreshInterval === model.interval
561+ title.text: model.text
562+ icon.name: "ok"
563+ icon.visible: settings.refreshInterval === model.interval
564 onClicked: {
565 settings.refreshInterval = model.interval
566 refreshData(false, true)
567
568=== modified file 'app/ui/settings/UnitsPage.qml'
569--- app/ui/settings/UnitsPage.qml 2015-11-02 21:28:34 +0000
570+++ app/ui/settings/UnitsPage.qml 2016-02-28 22:59:00 +0000
571@@ -1,5 +1,5 @@
572 /*
573- * Copyright (C) 2015 Canonical Ltd
574+ * Copyright (C) 2015-2016 Canonical Ltd
575 *
576 * This file is part of Ubuntu Weather App
577 *
578@@ -21,12 +21,17 @@
579 import "../../components"
580
581 Page {
582- title: i18n.tr("Units")
583+ id: unitsPage
584+
585 property bool bug1341671workaround: true
586
587- flickable: null
588+ header: PageHeader {
589+ title: i18n.tr("Units")
590+ flickable: unitsFlickable
591+ }
592
593 Flickable {
594+ id: unitsFlickable
595 clip: true
596 anchors.fill: parent
597 height: parent.height
598@@ -74,14 +79,14 @@
599
600 listViewHeight: temperatureModel.count*units.gu(7) - units.gu(1)
601 model: temperatureModel
602- text: i18n.tr("Temperature")
603- subText: settings.tempScale === "°C" ? i18n.tr("°C")
604+ title.text: i18n.tr("Temperature")
605+ subText.text: settings.tempScale === "°C" ? i18n.tr("°C")
606 : i18n.tr("°F")
607
608 delegate: StandardListItem {
609- title: model.text
610- icon: "ok"
611- showIcon: settings.tempScale === model.value
612+ title.text: model.text
613+ icon.name: "ok"
614+ icon.visible: settings.tempScale === model.value
615 onClicked: {
616 settings.tempScale = model.value
617 refreshData(true)
618@@ -95,14 +100,14 @@
619
620 listViewHeight: windSpeedModel.count*units.gu(7) - units.gu(1)
621 model: windSpeedModel
622- text: i18n.tr("Wind Speed")
623- subText: settings.windUnits === "kph" ? i18n.tr("kph")
624+ title.text: i18n.tr("Wind Speed")
625+ subText.text: settings.windUnits === "kph" ? i18n.tr("kph")
626 : i18n.tr("mph")
627
628 delegate: StandardListItem {
629- title: model.text
630- icon: "ok"
631- showIcon: settings.windUnits === model.value
632+ title.text: model.text
633+ icon.name: "ok"
634+ icon.visible: settings.windUnits === model.value
635 onClicked: {
636 settings.windUnits = model.value
637 refreshData(true)
638
639=== modified file 'debian/changelog'
640--- debian/changelog 2016-01-29 23:07:11 +0000
641+++ debian/changelog 2016-02-28 22:59:00 +0000
642@@ -8,7 +8,13 @@
643 * Added new READMEs
644
645 [ Victor Thompson ]
646- * Change translatable string from "rain" to "precipitation" (LP:1521701)
647+ * Change translatable string from "rain" to "precipitation" (LP: #1521701)
648+
649+ [ Nekhelesh Ramananthan ]
650+ * Update frameworks to ubuntu-sdk-15.04.3-qml
651+ * Migrate Settings Page (and child settings pages) to ListItemLayout
652+ and PageLayout.
653+ * Fix label color issues due to SDK Palette changed in OTA10 (LP: #1550507)
654
655 -- Andrew Hayzen <ahayzen@gmail.com> Thu, 03 Dec 2015 15:20:49 +0000
656
657
658=== modified file 'manifest.json.in'
659--- manifest.json.in 2015-12-03 15:22:45 +0000
660+++ manifest.json.in 2016-02-28 22:59:00 +0000
661@@ -1,7 +1,7 @@
662 {
663 "architecture": "all",
664 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
665- "framework": "ubuntu-sdk-15.04.1-qml",
666+ "framework": "ubuntu-sdk-15.04.3-qml",
667 "hooks": {
668 "weather": {
669 "apparmor": "ubuntu-weather-app.apparmor",
670
671=== modified file 'po/com.ubuntu.weather.pot'
672--- po/com.ubuntu.weather.pot 2015-12-12 03:41:27 +0000
673+++ po/com.ubuntu.weather.pot 2016-02-28 22:59:00 +0000
674@@ -8,7 +8,7 @@
675 msgstr ""
676 "Project-Id-Version: ubuntu-weather-app\n"
677 "Report-Msgid-Bugs-To: \n"
678-"POT-Creation-Date: 2015-12-11 21:39-0600\n"
679+"POT-Creation-Date: 2016-02-29 04:21+0530\n"
680 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
681 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
682 "Language-Team: LANGUAGE <LL@li.org>\n"
683@@ -104,35 +104,35 @@
684 "to obtain your own Open Weather Map API key."
685 msgstr ""
686
687-#: ../app/ui/AddLocationPage.qml:29
688+#: ../app/ui/AddLocationPage.qml:38
689 msgid "Select a city"
690 msgstr ""
691
692-#: ../app/ui/AddLocationPage.qml:47 ../app/ui/AddLocationPage.qml:69
693+#: ../app/ui/AddLocationPage.qml:49
694+msgid "City"
695+msgstr ""
696+
697+#: ../app/ui/AddLocationPage.qml:65
698 msgid "Back"
699 msgstr ""
700
701-#: ../app/ui/AddLocationPage.qml:54
702-msgid "City"
703-msgstr ""
704-
705-#: ../app/ui/AddLocationPage.qml:113
706+#: ../app/ui/AddLocationPage.qml:108
707 msgid "Search city"
708 msgstr ""
709
710-#: ../app/ui/AddLocationPage.qml:299
711+#: ../app/ui/AddLocationPage.qml:281
712 msgid "No city found"
713 msgstr ""
714
715-#: ../app/ui/AddLocationPage.qml:312
716+#: ../app/ui/AddLocationPage.qml:294
717 msgid "Couldn't load weather data, please try later again!"
718 msgstr ""
719
720-#: ../app/ui/AddLocationPage.qml:322
721+#: ../app/ui/AddLocationPage.qml:304
722 msgid "Location already added."
723 msgstr ""
724
725-#: ../app/ui/AddLocationPage.qml:325
726+#: ../app/ui/AddLocationPage.qml:307
727 msgid "OK"
728 msgstr ""
729
730@@ -144,82 +144,82 @@
731 msgid "Current Location"
732 msgstr ""
733
734-#: ../app/ui/SettingsPage.qml:24
735+#: ../app/ui/SettingsPage.qml:27
736 msgid "Settings"
737 msgstr ""
738
739-#: ../app/ui/SettingsPage.qml:33 ../app/ui/settings/UnitsPage.qml:24
740+#: ../app/ui/SettingsPage.qml:44 ../app/ui/settings/UnitsPage.qml:29
741 msgid "Units"
742 msgstr ""
743
744-#: ../app/ui/SettingsPage.qml:38 ../app/ui/settings/DataProviderPage.qml:25
745+#: ../app/ui/SettingsPage.qml:52 ../app/ui/settings/DataProviderPage.qml:28
746 msgid "Data Provider"
747 msgstr ""
748
749-#: ../app/ui/SettingsPage.qml:43 ../app/ui/settings/RefreshIntervalPage.qml:24
750+#: ../app/ui/SettingsPage.qml:60 ../app/ui/settings/RefreshIntervalPage.qml:27
751 msgid "Refresh Interval"
752 msgstr ""
753
754-#: ../app/ui/SettingsPage.qml:48 ../app/ui/settings/LocationPage.qml:24
755+#: ../app/ui/SettingsPage.qml:68 ../app/ui/settings/LocationPage.qml:26
756 msgid "Location"
757 msgstr ""
758
759-#: ../app/ui/settings/DataProviderPage.qml:37
760+#: ../app/ui/settings/DataProviderPage.qml:42
761 msgid "Provider"
762 msgstr ""
763
764-#: ../app/ui/settings/LocationPage.qml:32
765+#: ../app/ui/settings/LocationPage.qml:34
766 msgid "Detect current location"
767 msgstr ""
768
769-#: ../app/ui/settings/RefreshIntervalPage.qml:30
770-#: ../app/ui/settings/RefreshIntervalPage.qml:31
771-#: ../app/ui/settings/RefreshIntervalPage.qml:32
772-#: ../app/ui/settings/RefreshIntervalPage.qml:33
773-#: ../app/ui/settings/RefreshIntervalPage.qml:43
774+#: ../app/ui/settings/RefreshIntervalPage.qml:34
775+#: ../app/ui/settings/RefreshIntervalPage.qml:35
776+#: ../app/ui/settings/RefreshIntervalPage.qml:36
777+#: ../app/ui/settings/RefreshIntervalPage.qml:37
778+#: ../app/ui/settings/RefreshIntervalPage.qml:48
779 #, qt-format
780 msgid "%1 minute"
781 msgid_plural "%1 minutes"
782 msgstr[0] ""
783 msgstr[1] ""
784
785-#: ../app/ui/settings/RefreshIntervalPage.qml:42
786+#: ../app/ui/settings/RefreshIntervalPage.qml:47
787 msgid "Interval"
788 msgstr ""
789
790 #. TRANSLATORS: The strings are standard measurement units
791 #. of temperature in Celcius and are shown in the settings page.
792 #. Only the abbreviated form of Celcius should be used.
793-#: ../app/ui/settings/UnitsPage.qml:42 ../app/ui/settings/UnitsPage.qml:78
794+#: ../app/ui/settings/UnitsPage.qml:47 ../app/ui/settings/UnitsPage.qml:83
795 msgid "°C"
796 msgstr ""
797
798 #. TRANSLATORS: The strings are standard measurement units
799 #. of temperature in Fahrenheit and are shown in the settings page.
800 #. Only the abbreviated form of Fahrenheit should be used.
801-#: ../app/ui/settings/UnitsPage.qml:47 ../app/ui/settings/UnitsPage.qml:79
802+#: ../app/ui/settings/UnitsPage.qml:52 ../app/ui/settings/UnitsPage.qml:84
803 msgid "°F"
804 msgstr ""
805
806 #. TRANSLATORS: The strings are standard measurement units
807 #. of wind speed in kilometers per hour and are shown in the settings page.
808 #. Only the abbreviated form of kilometers per hour should be used.
809-#: ../app/ui/settings/UnitsPage.qml:58 ../app/ui/settings/UnitsPage.qml:99
810+#: ../app/ui/settings/UnitsPage.qml:63 ../app/ui/settings/UnitsPage.qml:104
811 msgid "kph"
812 msgstr ""
813
814 #. TRANSLATORS: The strings are standard measurement units
815 #. of wind speed in miles per hour and are shown in the settings page.
816 #. Only the abbreviated form of miles per hour should be used.
817-#: ../app/ui/settings/UnitsPage.qml:63 ../app/ui/settings/UnitsPage.qml:100
818+#: ../app/ui/settings/UnitsPage.qml:68 ../app/ui/settings/UnitsPage.qml:105
819 msgid "mph"
820 msgstr ""
821
822-#: ../app/ui/settings/UnitsPage.qml:77
823+#: ../app/ui/settings/UnitsPage.qml:82
824 msgid "Temperature"
825 msgstr ""
826
827-#: ../app/ui/settings/UnitsPage.qml:98
828+#: ../app/ui/settings/UnitsPage.qml:103
829 msgid "Wind Speed"
830 msgstr ""
831

Subscribers

People subscribed via source and target branches