1
=== added file 'app/components/ExpandableListItem.qml'
2
--- app/components/ExpandableListItem.qml	1970-01-01 00:00:00 +0000
3
+++ app/components/ExpandableListItem.qml	2015-04-05 22:31:23 +0000
4
@@ -0,0 +1,90 @@
5
1
/*
6
2
 * Copyright (C) 2015 Canonical Ltd
7
3
 *
8
4
 * This file is part of Ubuntu Weather App
9
5
 *
10
6
 * Ubuntu Weather App is free software: you can redistribute it and/or modify
11
7
 * it under the terms of the GNU General Public License version 3 as
12
8
 * published by the Free Software Foundation.
13
9
 *
14
10
 * Ubuntu Weather App is distributed in the hope that it will be useful,
15
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
13
 * GNU General Public License for more details.
18
14
 *
19
15
 * You should have received a copy of the GNU General Public License
20
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
17
 */
22
18
23
19
import QtQuick 2.3
24
20
import Ubuntu.Components 1.1
25
21
import Ubuntu.Components.ListItems 1.0 as ListItem
26
22
27
23
/*
28
24
 Component which extends the SDK Expandable list item and provides a easy
29
25
 to use component where the title, subtitle and listview can be displayed. It
30
26
 matches the design specification provided for clock.
31
27
*/
32
28
33
29
ListItem.Expandable {
34
30
    id: expandableListItem
35
31
36
32
    property ListModel model
37
33
    property Component delegate
38
34
    property alias text: expandableHeader.text
39
35
    property alias subText: expandableHeader.subText
40
36
    property alias listViewHeight: expandableList.height
41
37
42
38
    anchors {
43
39
        left: parent.left
44
40
        right: parent.right
45
41
        margins: units.gu(-2)
46
42
    }
47
43
48
44
    collapseOnClick: true
49
45
    expandedHeight: contentColumn.height + units.gu(1)
50
46
51
47
    Column {
52
48
        id: contentColumn
53
49
54
50
        anchors {
55
51
            left: parent.left
56
52
            right: parent.right
57
53
        }
58
54
59
55
        Item {
60
56
            width: parent.width
61
57
            height: expandableListItem.collapsedHeight
62
58
63
59
            ListItem.Subtitled {
64
60
                id: expandableHeader
65
61
                onClicked: expandableListItem.expanded = true
66
62
67
63
                Icon {
68
64
                    id: arrow
69
65
70
66
                    width: units.gu(2)
71
67
                    height: width
72
68
                    anchors.right: parent.right
73
69
                    anchors.verticalCenter: parent.verticalCenter
74
70
75
71
                    name: "go-down"
76
72
                    color: "Grey"
77
73
                    rotation: expandableListItem.expanded ? 180 : 0
78
74
79
75
                    Behavior on rotation {
80
76
                        UbuntuNumberAnimation {}
81
77
                    }
82
78
                }
83
79
            }
84
80
        }
85
81
86
82
        ListView {
87
83
            id: expandableList
88
84
            width: parent.width
89
85
            interactive: false
90
86
            model: expandableListItem.model
91
87
            delegate: expandableListItem.delegate
92
88
        }
93
89
    }
94
90
}
95
0
91
96
=== modified file 'app/ui/settings/DataProviderPage.qml'
97
--- app/ui/settings/DataProviderPage.qml	2015-02-10 14:17:08 +0000
98
+++ app/ui/settings/DataProviderPage.qml	2015-04-05 22:31:23 +0000
99
@@ -19,34 +19,40 @@
100
19
import QtQuick 2.3
19
import QtQuick 2.3
101
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
102
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 0.1 as ListItem
104
22
22
import "../../components"
105
23
23
106
24
Page {
24
Page {
107
25
    title: i18n.tr("Data Provider")
25
    title: i18n.tr("Data Provider")
108
26
26
120
27
    Flickable {
27
    ListModel {
121
28
        anchors {
28
        id: dataProviderModel
122
29
            fill: parent
29
        ListElement { text: "openweathermap" }
123
30
        }
30
        ListElement { text: "weatherchannel" }
124
31
        height: parent.height
31
    }
125
32
        contentHeight: unitsColumn.childrenRect.height
32
126
33
33
    ExpandableListItem {
127
34
        Column {
34
        id: dataProviderSetting
128
35
            id: unitsColumn
35
129
36
            anchors {
36
        listViewHeight: dataProviderModel.count*units.gu(6) - units.gu(1)
130
37
                fill: parent
37
        model: dataProviderModel
131
38
        text: i18n.tr("Provider")
132
39
        subText: settings.service
133
40
134
41
        delegate: ListItem.Standard {
135
42
            text: model.text
136
43
            onClicked: {
137
44
                settings.service = model.text
138
45
                refreshData(false, true)
139
38
            }
46
            }
140
39
47
151
40
            ListItem.ItemSelector {
48
            Icon {
152
41
                expanded: true
49
                width: units.gu(2)
153
42
                model: ["openweathermap", "weatherchannel"]  // "geonames", "geoip"]
50
                height: width
154
43
                selectedIndex: model.indexOf(settings.service)
51
                name: "ok"
155
44
                text: i18n.tr("Provider")
52
                visible: settings.service === model.text
156
45
53
                anchors.right: parent.right
157
46
                onDelegateClicked: {
54
                anchors.rightMargin: units.gu(2)
158
47
                    settings.service = model[index]
55
                anchors.verticalCenter: parent.verticalCenter
149
48
                    refreshData(false, true)
150
49
                }
159
50
            }
56
            }
160
51
        }
57
        }
161
52
    }
58
    }
162
53
59
163
=== modified file 'app/ui/settings/RefreshIntervalPage.qml'
164
--- app/ui/settings/RefreshIntervalPage.qml	2015-03-07 16:47:19 +0000
165
+++ app/ui/settings/RefreshIntervalPage.qml	2015-04-05 22:31:23 +0000
166
@@ -19,37 +19,45 @@
167
19
import QtQuick 2.3
19
import QtQuick 2.3
168
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
169
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 0.1 as ListItem
171
22
22
import "../../components"
172
23
23
173
24
Page {
24
Page {
174
25
    title: i18n.tr("Refresh Interval")
25
    title: i18n.tr("Refresh Interval")
175
26
26
179
27
    Flickable {
27
    ListModel {
180
28
        anchors {
28
        id: refreshModel
181
29
            fill: parent
29
        Component.onCompleted: initialize()
182
30
        function initialize() {
183
31
            refreshModel.append({"interval": 600, "text": i18n.tr("%1 minute", "%1 minutes", 10).arg(10)})
184
32
            refreshModel.append({"interval": 900, "text": i18n.tr("%1 minute", "%1 minutes", 15).arg(15)})
185
33
            refreshModel.append({"interval": 1800, "text": i18n.tr("%1 minute", "%1 minutes", 30).arg(30)})
186
34
            refreshModel.append({"interval": 3600, "text": i18n.tr("%1 minute", "%1 minutes", 60).arg(60)})
187
30
        }
35
        }
195
31
        height: parent.height
36
    }
196
32
        contentHeight: unitsColumn.childrenRect.height
37
197
33
38
    ExpandableListItem {
198
34
        Column {
39
        id: dataProviderSetting
199
35
            id: unitsColumn
40
200
36
            anchors {
41
        listViewHeight: refreshModel.count*units.gu(6)
201
37
                fill: parent
42
        model: refreshModel
202
43
        text: i18n.tr("Interval")
203
44
        subText: i18n.tr("%1 minute", "%1 minutes", Math.floor(settings.refreshInterval / 60).toString()).arg(Math.floor(settings.refreshInterval / 60).toString())
204
45
205
46
        delegate: ListItem.Standard {
206
47
            text: model.text
207
48
            onClicked: {
208
49
                settings.refreshInterval = model.interval
209
50
                refreshData(false, true)
210
38
            }
51
            }
211
39
52
225
40
            ListItem.ItemSelector {
53
            Icon {
226
41
                delegate: OptionSelectorDelegate {
54
                width: units.gu(2)
227
42
                    text: Math.floor(modelData / 60).toString() + " " + i18n.tr("minutes")
55
                height: width
228
43
                }
56
                name: "ok"
229
44
                expanded: true
57
                visible: settings.refreshInterval === model.interval
230
45
                model: [600, 900, 1800, 3600]
58
                anchors.right: parent.right
231
46
                selectedIndex: model.indexOf(settings.refreshInterval)
59
                anchors.rightMargin: units.gu(2)
232
47
                text: i18n.tr("Interval")
60
                anchors.verticalCenter: parent.verticalCenter
220
48
221
49
                onDelegateClicked: {
222
50
                    settings.refreshInterval = model[index]
223
51
                    refreshData(false, true)
224
52
                }
233
53
            }
61
            }
234
54
        }
62
        }
235
55
    }
63
    }
236
56
64
237
=== modified file 'app/ui/settings/UnitsPage.qml'
238
--- app/ui/settings/UnitsPage.qml	2015-03-08 17:25:16 +0000
239
+++ app/ui/settings/UnitsPage.qml	2015-04-05 22:31:23 +0000
240
@@ -19,57 +19,151 @@
241
19
import QtQuick 2.3
19
import QtQuick 2.3
242
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
243
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 0.1 as ListItem
245
22
22
import "../../components"
246
23
23
247
24
Page {
24
Page {
248
25
    title: i18n.tr("Units")
25
    title: i18n.tr("Units")
249
26
26
250
27
    flickable: null
251
28
252
27
    Flickable {
29
    Flickable {
256
28
        anchors {
30
        anchors.fill: parent
254
29
            fill: parent
255
30
        }
257
31
        height: parent.height
31
        height: parent.height
258
32
        contentHeight: unitsColumn.childrenRect.height
32
        contentHeight: unitsColumn.childrenRect.height
259
33
33
260
34
        ListModel {
261
35
            id: temperatureModel
262
36
            Component.onCompleted: initialize()
263
37
            function initialize() {
264
38
                // TRANSLATORS: The strings are standard measurement units
265
39
                // of temperature in Celcius and are shown in the settings page.
266
40
                // Only the abbreviated form of Celcius should be used.
267
41
                temperatureModel.append({"text": i18n.tr("°C"), "value": "°C"})
268
42
269
43
                // TRANSLATORS: The strings are standard measurement units
270
44
                // of temperature in Fahrenheit and are shown in the settings page.
271
45
                // Only the abbreviated form of Fahrenheit should be used.
272
46
                temperatureModel.append({"text": i18n.tr("°F"), "value": "°F"})
273
47
            }
274
48
        }
275
49
276
50
        ListModel {
277
51
            id: precipationModel
278
52
            Component.onCompleted: initialize()
279
53
            function initialize() {
280
54
                // TRANSLATORS: The strings are standard measurement units
281
55
                // of precipitation in millimeters and are shown in the settings page.
282
56
                // Only the abbreviated form of millimeters should be used.
283
57
                precipationModel.append({"text": i18n.tr("mm"), "value": "mm"})
284
58
285
59
                // TRANSLATORS: The strings are standard measurement units
286
60
                // of precipitation in inches and are shown in the settings page.
287
61
                // Only the abbreviated form of inches should be used.
288
62
                precipationModel.append({"text": i18n.tr("in"), "value": "in"})
289
63
            }
290
64
        }
291
65
292
66
        ListModel {
293
67
            id: windSpeedModel
294
68
            Component.onCompleted: initialize()
295
69
            function initialize() {
296
70
                // TRANSLATORS: The strings are standard measurement units
297
71
                // of wind speed in kilometers per hour and are shown in the settings page.
298
72
                // Only the abbreviated form of kilometers per hour should be used.
299
73
                windSpeedModel.append({"text": i18n.tr("kmh"), "value": "kmh"})
300
74
301
75
                // TRANSLATORS: The strings are standard measurement units
302
76
                // of wind speed in miles per hour and are shown in the settings page.
303
77
                // Only the abbreviated form of miles per hour should be used.
304
78
                windSpeedModel.append({"text": i18n.tr("mph"), "value": "mph"})
305
79
            }
306
80
        }
307
81
308
34
        Column {
82
        Column {
309
35
            id: unitsColumn
83
            id: unitsColumn
318
36
            anchors {
84
            anchors.fill: parent
319
37
                fill: parent
85
320
38
            }
86
            ExpandableListItem {
321
39
87
                id: temperatureSetting
322
40
            ListItem.ItemSelector {
88
323
41
                expanded: true
89
                listViewHeight: temperatureModel.count*units.gu(6) - units.gu(0.5)
324
42
                model: ["°C", "°F"]
90
                model: temperatureModel
317
43
                selectedIndex: model.indexOf(settings.tempScale)
325
44
                text: i18n.tr("Temperature")
91
                text: i18n.tr("Temperature")
330
45
92
                subText: settings.tempScale === "°C" ? i18n.tr("°C")
331
46
                onDelegateClicked: {
93
                                                     : i18n.tr("°F")
332
47
                    settings.tempScale = model[index]
94
333
48
                    refreshData(true)
95
                delegate: ListItem.Standard {
334
96
                    text: model.text
335
97
                    onClicked: {
336
98
                        settings.tempScale = model.value
337
99
                        refreshData(true)
338
100
                    }
339
101
340
102
                    Icon {
341
103
                        width: units.gu(2)
342
104
                        height: width
343
105
                        name: "ok"
344
106
                        visible: settings.tempScale === model.value
345
107
                        anchors.right: parent.right
346
108
                        anchors.rightMargin: units.gu(2)
347
109
                        anchors.verticalCenter: parent.verticalCenter
348
110
                    }
349
49
                }
111
                }
350
50
            }
112
            }
351
51
113
356
52
            ListItem.ItemSelector {
114
            ExpandableListItem {
357
53
                expanded: true
115
                id: precipationSetting
358
54
                model: ["mm", "in"]
116
359
55
                selectedIndex: model.indexOf(settings.precipUnits)
117
                listViewHeight: precipationModel.count*units.gu(6) - units.gu(0.5)
360
118
                model: precipationModel
361
56
                text: i18n.tr("Precipitation")
119
                text: i18n.tr("Precipitation")
366
57
120
                subText: settings.precipUnits === "mm" ? i18n.tr("mm")
367
58
                onDelegateClicked: {
121
                                                       : i18n.tr("in")
368
59
                    settings.precipUnits = model[index]
122
369
60
                    refreshData(true)
123
                delegate: ListItem.Standard {
370
124
                    text: model.text
371
125
                    onClicked: {
372
126
                        settings.precipUnits = model.value
373
127
                        refreshData(true)
374
128
                    }
375
129
376
130
                    Icon {
377
131
                        width: units.gu(2)
378
132
                        height: width
379
133
                        name: "ok"
380
134
                        visible: settings.precipUnits === model.value
381
135
                        anchors.right: parent.right
382
136
                        anchors.rightMargin: units.gu(2)
383
137
                        anchors.verticalCenter: parent.verticalCenter
384
138
                    }
385
61
                }
139
                }
386
62
            }
140
            }
387
63
141
391
64
            ListItem.ItemSelector {
142
            ExpandableListItem {
392
65
                expanded: true
143
                id: windSetting
393
66
                model: ["kmh", "mph"]
144
394
145
                listViewHeight: windSpeedModel.count*units.gu(6) - units.gu(0.5)
395
146
                model: windSpeedModel
396
67
                text: i18n.tr("Wind Speed")
147
                text: i18n.tr("Wind Speed")
402
68
                selectedIndex: model.indexOf(settings.windUnits)
148
                subText: settings.windUnits === "kmh" ? i18n.tr("kmh")
403
69
149
                                                      : i18n.tr("mph")
404
70
                onDelegateClicked: {
150
405
71
                    settings.windUnits = model[index]
151
                delegate: ListItem.Standard {
406
72
                    refreshData(true)
152
                    text: model.text
407
153
                    onClicked: {
408
154
                        settings.windUnits = model.value
409
155
                        refreshData(true)
410
156
                    }
411
157
412
158
                    Icon {
413
159
                        width: units.gu(2)
414
160
                        height: width
415
161
                        name: "ok"
416
162
                        visible: settings.windUnits === model.value
417
163
                        anchors.right: parent.right
418
164
                        anchors.rightMargin: units.gu(2)
419
165
                        anchors.verticalCenter: parent.verticalCenter
420
166
                    }
421
73
                }
167
                }
422
74
            }
168
            }
423
75
        }
169
        }
424
76
170
425
=== modified file 'po/com.ubuntu.weather.pot'
426
--- po/com.ubuntu.weather.pot	2015-04-03 20:20:20 +0000
427
+++ po/com.ubuntu.weather.pot	2015-04-05 22:31:23 +0000
428
@@ -8,14 +8,15 @@
429
8
msgstr ""
8
msgstr ""
430
9
"Project-Id-Version: ubuntu-weather-app\n"
9
"Project-Id-Version: ubuntu-weather-app\n"
431
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
433
11
"POT-Creation-Date: 2015-04-03 21:18+0100\n"
11
"POT-Creation-Date: 2015-04-04 09:58+0200\n"
434
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
435
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
436
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
437
15
"Language: \n"
15
"Language: \n"
438
16
"MIME-Version: 1.0\n"
16
"MIME-Version: 1.0\n"
440
17
"Content-Type: text/plain; charset=CHARSET\n"
17
"Content-Type: text/plain; charset=UTF-8\n"
441
18
"Content-Transfer-Encoding: 8bit\n"
18
"Content-Transfer-Encoding: 8bit\n"
442
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
443
19
20
444
20
#: ../app/components/HomeTempInfo.qml:38
21
#: ../app/components/HomeTempInfo.qml:38
445
21
msgid "Today"
22
msgid "Today"
446
@@ -89,27 +90,76 @@
447
89
msgid "Refresh Interval"
90
msgid "Refresh Interval"
448
90
msgstr ""
91
msgstr ""
449
91
92
451
92
#: ../app/ui/settings/DataProviderPage.qml:44
93
#: ../app/ui/settings/DataProviderPage.qml:38
452
93
msgid "Provider"
94
msgid "Provider"
453
94
msgstr ""
95
msgstr ""
454
95
96
458
96
#: ../app/ui/settings/RefreshIntervalPage.qml:42
97
#: ../app/ui/settings/RefreshIntervalPage.qml:31
459
97
msgid "minutes"
98
#: ../app/ui/settings/RefreshIntervalPage.qml:32
460
98
msgstr ""
99
#: ../app/ui/settings/RefreshIntervalPage.qml:33
461
100
#: ../app/ui/settings/RefreshIntervalPage.qml:34
462
101
#: ../app/ui/settings/RefreshIntervalPage.qml:44
463
102
#, qt-format
464
103
msgid "%1 minute"
465
104
msgid_plural "%1 minutes"
466
105
msgstr[0] ""
467
106
msgstr[1] ""
468
99
107
470
100
#: ../app/ui/settings/RefreshIntervalPage.qml:47
108
#: ../app/ui/settings/RefreshIntervalPage.qml:43
471
101
msgid "Interval"
109
msgid "Interval"
472
102
msgstr ""
110
msgstr ""
473
103
111
475
104
#: ../app/ui/settings/UnitsPage.qml:44
112
#. TRANSLATORS: The strings are standard measurement units
476
113
#. of temperature in Celcius and are shown in the settings page.
477
114
#. Only the abbreviated form of Celcius should be used.
478
115
#: ../app/ui/settings/UnitsPage.qml:41 ../app/ui/settings/UnitsPage.qml:92
479
116
msgid "°C"
480
117
msgstr ""
481
118
482
119
#. TRANSLATORS: The strings are standard measurement units
483
120
#. of temperature in Fahrenheit and are shown in the settings page.
484
121
#. Only the abbreviated form of Fahrenheit should be used.
485
122
#: ../app/ui/settings/UnitsPage.qml:46 ../app/ui/settings/UnitsPage.qml:93
486
123
msgid "°F"
487
124
msgstr ""
488
125
489
126
#. TRANSLATORS: The strings are standard measurement units
490
127
#. of precipitation in millimeters and are shown in the settings page.
491
128
#. Only the abbreviated form of millimeters should be used.
492
129
#: ../app/ui/settings/UnitsPage.qml:57 ../app/ui/settings/UnitsPage.qml:120
493
130
msgid "mm"
494
131
msgstr ""
495
132
496
133
#. TRANSLATORS: The strings are standard measurement units
497
134
#. of precipitation in inches and are shown in the settings page.
498
135
#. Only the abbreviated form of inches should be used.
499
136
#: ../app/ui/settings/UnitsPage.qml:62 ../app/ui/settings/UnitsPage.qml:121
500
137
msgid "in"
501
138
msgstr ""
502
139
503
140
#. TRANSLATORS: The strings are standard measurement units
504
141
#. of wind speed in kilometers per hour and are shown in the settings page.
505
142
#. Only the abbreviated form of kilometers per hour should be used.
506
143
#: ../app/ui/settings/UnitsPage.qml:73 ../app/ui/settings/UnitsPage.qml:148
507
144
msgid "kmh"
508
145
msgstr ""
509
146
510
147
#. TRANSLATORS: The strings are standard measurement units
511
148
#. of wind speed in miles per hour and are shown in the settings page.
512
149
#. Only the abbreviated form of miles per hour should be used.
513
150
#: ../app/ui/settings/UnitsPage.qml:78 ../app/ui/settings/UnitsPage.qml:149
514
151
msgid "mph"
515
152
msgstr ""
516
153
517
154
#: ../app/ui/settings/UnitsPage.qml:91
518
105
msgid "Temperature"
155
msgid "Temperature"
519
106
msgstr ""
156
msgstr ""
520
107
157
522
108
#: ../app/ui/settings/UnitsPage.qml:56
158
#: ../app/ui/settings/UnitsPage.qml:119
523
109
msgid "Precipitation"
159
msgid "Precipitation"
524
110
msgstr ""
160
msgstr ""
525
111
161
527
112
#: ../app/ui/settings/UnitsPage.qml:67
162
#: ../app/ui/settings/UnitsPage.qml:147
528
113
msgid "Wind Speed"
163
msgid "Wind Speed"
529
114
msgstr ""
164
msgstr ""
530
115
165
Status:	Merged
Approved by:	Victor Thompson on 2015-04-06
Approved revision:	26
Merged at revision:	30
Proposed branch:	lp:~nik90/ubuntu-weather-app/improved-settings-page
Merge into:	lp:ubuntu-weather-app
Diff against target:	529 lines (+336/-88) 5 files modified app/components/ExpandableListItem.qml (+90/-0) app/ui/settings/DataProviderPage.qml (+28/-22) app/ui/settings/RefreshIntervalPage.qml (+32/-24) app/ui/settings/UnitsPage.qml (+126/-32) po/com.ubuntu.weather.pot (+60/-10)
To merge this branch:	bzr merge lp:~nik90/ubuntu-weather-app/improved-settings-page
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Victor Thompson			Approve on 2015-04-06
Andrew Hayzen		2015-03-20	Approve on 2015-04-05
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-04-05
Review via email: mp+253619@code.launchpad.net