1
=== modified file 'app/components/CMakeLists.txt'
2
--- app/components/CMakeLists.txt	2015-03-03 18:37:59 +0000
3
+++ app/components/CMakeLists.txt	2015-12-10 01:16:13 +0000
4
@@ -1,5 +1,3 @@
5
1
add_subdirectory(ListItemActions)
6
2
7
3
file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
1
file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
8
4
2
9
5
add_custom_target(ubuntu-weather-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
3
add_custom_target(ubuntu-weather-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
10
6
4
11
=== removed directory 'app/components/ListItemActions'
12
=== removed file 'app/components/ListItemActions/CMakeLists.txt'
13
--- app/components/ListItemActions/CMakeLists.txt	2015-03-03 18:37:59 +0000
14
+++ app/components/ListItemActions/CMakeLists.txt	1970-01-01 00:00:00 +0000
15
@@ -1,5 +0,0 @@
16
1
file(GLOB LISTITEMACTIONS_QML_JS_FILES *.qml *.js)
17
2
18
3
add_custom_target(ubuntu-weather-app_listitemactions_QMlFiles ALL SOURCES ${LISTITEMACTIONS_QML_JS_FILES})
19
4
20
5
install(FILES ${LISTITEMACTIONS_QML_JS_FILES} DESTINATION ${UBUNTU-WEATHER_APP_DIR}/components/ListItemActions)
21
6
0
22
=== removed file 'app/components/ListItemActions/CheckBox.qml'
23
--- app/components/ListItemActions/CheckBox.qml	2015-11-02 21:28:34 +0000
24
+++ app/components/ListItemActions/CheckBox.qml	1970-01-01 00:00:00 +0000
25
@@ -1,25 +0,0 @@
26
1
/*
27
2
 * Copyright (C) 2012-2014, 2015 Canonical, Ltd.
28
3
 *
29
4
 * This program is free software; you can redistribute it and/or modify
30
5
 * it under the terms of the GNU General Public License as published by
31
6
 * the Free Software Foundation; version 3.
32
7
 *
33
8
 * This program is distributed in the hope that it will be useful,
34
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
35
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
36
11
 * GNU General Public License for more details.
37
12
 *
38
13
 * You should have received a copy of the GNU General Public License
39
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
40
15
 */
41
16
42
17
import QtQuick 2.4
43
18
import Ubuntu.Components 1.3
44
19
45
20
CheckBox {
46
21
    checked: root.selected
47
22
    width: implicitWidth
48
23
    // disable item mouse area to avoid conflicts with parent mouse area
49
24
    __mouseArea.enabled: false
50
25
}
51
26
0
52
=== removed file 'app/components/ListItemActions/Remove.qml'
53
--- app/components/ListItemActions/Remove.qml	2015-11-02 21:28:34 +0000
54
+++ app/components/ListItemActions/Remove.qml	1970-01-01 00:00:00 +0000
55
@@ -1,27 +0,0 @@
56
1
/*
57
2
 * Copyright (C) 2014, 2015 Andrew Hayzen <ahayzen@gmail.com>
58
3
 *                    Daniel Holm <d.holmen@gmail.com>
59
4
 *                    Victor Thompson <victor.thompson@gmail.com>
60
5
 *
61
6
 * This program is free software; you can redistribute it and/or modify
62
7
 * it under the terms of the GNU General Public License as published by
63
8
 * the Free Software Foundation; version 3.
64
9
 *
65
10
 * This program is distributed in the hope that it will be useful,
66
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
67
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
68
13
 * GNU General Public License for more details.
69
14
 *
70
15
 * You should have received a copy of the GNU General Public License
71
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
72
17
 */
73
18
74
19
import QtQuick 2.4
75
20
import Ubuntu.Components 1.3
76
21
77
22
Action {
78
23
    id: removeAction
79
24
    iconName: "delete"
80
25
    objectName: "swipeDeleteAction"
81
26
    text: i18n.tr("Remove")
82
27
}
83
28
0
84
=== removed file 'app/components/ListItemReorderComponent.qml'
85
--- app/components/ListItemReorderComponent.qml	2015-11-02 21:28:34 +0000
86
+++ app/components/ListItemReorderComponent.qml	1970-01-01 00:00:00 +0000
87
@@ -1,106 +0,0 @@
88
1
/*
89
2
 * Copyright (C) 2013, 2014, 2015
90
3
 *      Andrew Hayzen <ahayzen@gmail.com>
91
4
 *      Nekhelesh Ramananthan <krnekhelesh@gmail.com>
92
5
 *      Victor Thompson <victor.thompson@gmail.com>
93
6
 *
94
7
 * This program is free software; you can redistribute it and/or modify
95
8
 * it under the terms of the GNU General Public License as published by
96
9
 * the Free Software Foundation; version 3.
97
10
 *
98
11
 * This program is distributed in the hope that it will be useful,
99
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
100
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
101
14
 * GNU General Public License for more details.
102
15
 *
103
16
 * You should have received a copy of the GNU General Public License
104
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
105
18
 */
106
19
107
20
import QtQuick 2.4
108
21
import Ubuntu.Components 1.3
109
22
110
23
111
24
Item {
112
25
    id: actionReorder
113
26
    width: units.gu(4)
114
27
115
28
    Icon {
116
29
        anchors {
117
30
            horizontalCenter: parent.horizontalCenter
118
31
            verticalCenter: parent.verticalCenter
119
32
        }
120
33
        name: "navigation-menu"  // TODO: use proper image
121
34
        height: width
122
35
        width: units.gu(3)
123
36
    }
124
37
125
38
    MouseArea {
126
39
        id: actionReorderMouseArea
127
40
        anchors {
128
41
            fill: parent
129
42
        }
130
43
        property int startY: 0
131
44
        property int startContentY: 0
132
45
133
46
        onPressed: {
134
47
            root.parent.parent.interactive = false;  // stop scrolling of listview
135
48
            startY = root.y;
136
49
            startContentY = root.parent.parent.contentY;
137
50
            root.z += 10;  // force ontop of other elements
138
51
139
52
            console.debug("Reorder listitem pressed", root.y)
140
53
        }
141
54
        onMouseYChanged: root.y += mouse.y - (root.height / 2);
142
55
        onReleased: {
143
56
            console.debug("Reorder diff by position", getDiff());
144
57
145
58
            var diff = getDiff();
146
59
147
60
            // Remove the height of the actual item if moved down
148
61
            if (diff > 0) {
149
62
                diff -= 1;
150
63
            }
151
64
152
65
            root.parent.parent.interactive = true;  // reenable scrolling
153
66
154
67
            if (diff === 0) {
155
68
                // Nothing has changed so reset the item
156
69
                // z index is restored after animation
157
70
                resetListItemYAnimation.start();
158
71
            }
159
72
            else {
160
73
                var newIndex = index + diff;
161
74
162
75
                if (newIndex < 0) {
163
76
                    newIndex = 0;
164
77
                }
165
78
                else if (newIndex > root.parent.parent.count - 1) {
166
79
                    newIndex = root.parent.parent.count - 1;
167
80
                }
168
81
169
82
                root.z -= 10;  // restore z index
170
83
                reorder(index, newIndex)
171
84
            }
172
85
        }
173
86
174
87
        function getDiff() {
175
88
            // Get the amount of items that have been passed over (by centre)
176
89
            return Math.round((((root.y - startY) + (root.parent.parent.contentY - startContentY)) / root.height) + 0.5);
177
90
        }
178
91
    }
179
92
180
93
    SequentialAnimation {
181
94
        id: resetListItemYAnimation
182
95
        UbuntuNumberAnimation {
183
96
            target: root;
184
97
            property: "y";
185
98
            to: actionReorderMouseArea.startY
186
99
        }
187
100
        ScriptAction {
188
101
            script: {
189
102
                root.z -= 10;  // restore z index
190
103
            }
191
104
        }
192
105
    }
193
106
}
194
107
0
195
=== removed file 'app/components/ListItemWithActions.qml'
196
--- app/components/ListItemWithActions.qml	2015-11-02 21:28:34 +0000
197
+++ app/components/ListItemWithActions.qml	1970-01-01 00:00:00 +0000
198
@@ -1,496 +0,0 @@
199
1
/*
200
2
 * Copyright (C) 2012-2015 Canonical, Ltd.
201
3
 *
202
4
 * This program is free software; you can redistribute it and/or modify
203
5
 * it under the terms of the GNU General Public License as published by
204
6
 * the Free Software Foundation; version 3.
205
7
 *
206
8
 * This program is distributed in the hope that it will be useful,
207
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
208
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
209
11
 * GNU General Public License for more details.
210
12
 *
211
13
 * You should have received a copy of the GNU General Public License
212
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
213
15
 */
214
16
215
17
import QtQuick 2.4
216
18
import Ubuntu.Components 1.3
217
19
import Ubuntu.Components.ListItems 1.0 as ListItem
218
20
219
21
220
22
Item {
221
23
    id: root
222
24
    width: parent.width
223
25
224
26
    property Action leftSideAction: null
225
27
    property list<Action> rightSideActions
226
28
    property double defaultHeight: units.gu(8)
227
29
    property bool locked: false
228
30
    property Action activeAction: null
229
31
    property var activeItem: null
230
32
    property bool triggerActionOnMouseRelease: false
231
33
    property color color: Theme.palette.normal.background
232
34
    property color selectedColor: "#E6E6E6"
233
35
    property bool selected: false
234
36
    property bool selectionMode: false
235
37
    property alias internalAnchors: mainContents.anchors
236
38
    default property alias contents: mainContents.children
237
39
238
40
    readonly property double actionWidth: units.gu(4)
239
41
    readonly property double leftActionWidth: units.gu(10)
240
42
    readonly property double actionThreshold: actionWidth * 0.4
241
43
    readonly property double threshold: 0.4
242
44
    readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
243
45
    readonly property alias swipping: mainItemMoving.running
244
46
    readonly property bool _showActions: mouseArea.pressed || swipeState != "Normal" || swipping
245
47
246
48
    property alias _main: main  // CUSTOM
247
49
    property alias pressed: mouseArea.pressed  // CUSTOM
248
50
249
51
    /* internal */
250
52
    property var _visibleRightSideActions: filterVisibleActions(rightSideActions)
251
53
252
54
    signal itemClicked(var mouse)
253
55
    signal itemPressAndHold(var mouse)
254
56
255
57
    function returnToBoundsRTL(direction)
256
58
    {
257
59
        var actionFullWidth = actionWidth + units.gu(2)
258
60
259
61
        // go back to normal state if swipping reverse
260
62
        if (direction === "LTR") {
261
63
            updatePosition(0)
262
64
            return
263
65
        } else if (!triggerActionOnMouseRelease) {
264
66
            updatePosition(-rightActionsView.width + units.gu(2))
265
67
            return
266
68
        }
267
69
268
70
        var xOffset = Math.abs(main.x)
269
71
        var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
270
72
        var newX = 0
271
73
272
74
        if (index === _visibleRightSideActions.length) {
273
75
            newX = -(rightActionsView.width - units.gu(2))
274
76
        } else if (index >= 1) {
275
77
            newX = -(actionFullWidth * index)
276
78
        }
277
79
278
80
        updatePosition(newX)
279
81
    }
280
82
281
83
    function returnToBoundsLTR(direction)
282
84
    {
283
85
        var finalX = leftActionWidth
284
86
        if ((direction === "RTL") || (main.x <= (finalX * root.threshold)))
285
87
            finalX = 0
286
88
        updatePosition(finalX)
287
89
    }
288
90
289
91
    function returnToBounds(direction)
290
92
    {
291
93
        if (main.x < 0) {
292
94
            returnToBoundsRTL(direction)
293
95
        } else if (main.x > 0) {
294
96
            returnToBoundsLTR(direction)
295
97
        } else {
296
98
            updatePosition(0)
297
99
        }
298
100
    }
299
101
300
102
    function contains(item, point, marginX)
301
103
    {
302
104
        var itemStartX = item.x - marginX
303
105
        var itemEndX = item.x + item.width + marginX
304
106
        return (point.x >= itemStartX) && (point.x <= itemEndX) &&
305
107
               (point.y >= item.y) && (point.y <= (item.y + item.height));
306
108
    }
307
109
308
110
    function getActionAt(point)
309
111
    {
310
112
        if (leftSideAction && contains(leftActionViewLoader.item, point, 0)) {
311
113
            return leftSideAction
312
114
        } else if (contains(rightActionsView, point, 0)) {
313
115
            var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
314
116
            for (var i = 0; i < rightActionsRepeater.count; i++) {
315
117
                var child = rightActionsRepeater.itemAt(i)
316
118
                if (contains(child, newPoint, units.gu(1))) {
317
119
                    return i
318
120
                }
319
121
            }
320
122
        }
321
123
        return -1
322
124
    }
323
125
324
126
    function updateActiveAction()
325
127
    {
326
128
        if (triggerActionOnMouseRelease &&
327
129
            (main.x <= -(root.actionWidth + units.gu(2))) &&
328
130
            (main.x > -(rightActionsView.width - units.gu(2)))) {
329
131
            var actionFullWidth = actionWidth + units.gu(2)
330
132
            var xOffset = Math.abs(main.x)
331
133
            var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
332
134
            index = index - 1
333
135
            if (index > -1) {
334
136
                root.activeItem = rightActionsRepeater.itemAt(index)
335
137
                root.activeAction = root._visibleRightSideActions[index]
336
138
            }
337
139
        } else {
338
140
            root.activeAction = null
339
141
        }
340
142
    }
341
143
342
144
    function resetSwipe()
343
145
    {
344
146
        updatePosition(0)
345
147
    }
346
148
347
149
    function filterVisibleActions(actions)
348
150
    {
349
151
        var visibleActions = []
350
152
        for(var i = 0; i < actions.length; i++) {
351
153
            var action = actions[i]
352
154
            if (action.visible) {
353
155
                visibleActions.push(action)
354
156
            }
355
157
        }
356
158
        return visibleActions
357
159
    }
358
160
359
161
    function updatePosition(pos)
360
162
    {
361
163
        if (!root.triggerActionOnMouseRelease && (pos !== 0)) {
362
164
            mouseArea.state = pos > 0 ? "RightToLeft" : "LeftToRight"
363
165
        } else {
364
166
            mouseArea.state = ""
365
167
        }
366
168
        main.x = pos
367
169
    }
368
170
369
171
    // CUSTOM remove animation
370
172
    SequentialAnimation {
371
173
        id: removeAnimation
372
174
373
175
        property var action
374
176
375
177
        UbuntuNumberAnimation {
376
178
            target: root
377
179
            duration: UbuntuAnimation.BriskDuration
378
180
            property: "height";
379
181
            to: 0
380
182
        }
381
183
        ScriptAction {
382
184
            script: removeAnimation.action.trigger()
383
185
        }
384
186
    }
385
187
386
188
    states: [
387
189
        State {
388
190
            name: "select"
389
191
            when: selectionMode || selected
390
192
            PropertyChanges {
391
193
                target: selectionIcon
392
194
                source: Qt.resolvedUrl("ListItemActions/CheckBox.qml")
393
195
                anchors.leftMargin: units.gu(2)
394
196
            }
395
197
            PropertyChanges {
396
198
                target: root
397
199
                locked: true
398
200
            }
399
201
            PropertyChanges {
400
202
                target: main
401
203
                x: 0
402
204
            }
403
205
        }
404
206
    ]
405
207
406
208
    height: defaultHeight
407
209
    //clip: height !== defaultHeight  // CUSTOM
408
210
409
211
    Loader {  // CUSTOM
410
212
        id: leftActionViewLoader
411
213
        anchors {
412
214
            top: parent.top
413
215
            bottom: parent.bottom
414
216
            right: main.left
415
217
        }
416
218
        asynchronous: true
417
219
        sourceComponent: leftSideAction ? leftActionViewComponent : undefined
418
220
    }
419
221
420
222
    Component {  // CUSTOM
421
223
        id: leftActionViewComponent
422
224
423
225
        Rectangle {
424
226
            id: leftActionView
425
227
            width: root.leftActionWidth + actionThreshold
426
228
            color: UbuntuColors.red
427
229
428
230
            Icon {
429
231
                id: leftActionIcon
430
232
                anchors {
431
233
                    centerIn: parent
432
234
                    horizontalCenterOffset: actionThreshold / 2
433
235
                }
434
236
                objectName: "swipeDeleteAction"  // CUSTOM
435
237
                name: leftSideAction && _showActions ? leftSideAction.iconName : ""
436
238
                color: Theme.palette.selected.field
437
239
                height: units.gu(3)
438
240
                width: units.gu(3)
439
241
            }
440
242
        }
441
243
    }
442
244
443
245
    //Rectangle {
444
246
    Item {  // CUSTOM
445
247
       id: rightActionsView
446
248
447
249
       anchors {
448
250
           top: main.top
449
251
           left: main.right
450
252
           bottom: main.bottom
451
253
       }
452
254
       visible: _visibleRightSideActions.length > 0
453
255
       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(2) : 0
454
256
       // color: "white"  // CUSTOM
455
257
456
258
       Row {
457
259
           anchors{
458
260
               top: parent.top
459
261
               left: parent.left
460
262
               leftMargin: units.gu(2)
461
263
               right: parent.right
462
264
               rightMargin: units.gu(2)
463
265
               bottom: parent.bottom
464
266
           }
465
267
           spacing: units.gu(2)
466
268
           Repeater {
467
269
               id: rightActionsRepeater
468
270
469
271
               model: _showActions ? _visibleRightSideActions : []
470
272
               Item {
471
273
                   property alias image: img
472
274
473
275
                   height: rightActionsView.height
474
276
                   width: root.actionWidth
475
277
476
278
                   Icon {
477
279
                       id: img
478
280
479
281
                       anchors.centerIn: parent
480
282
                       objectName: rightSideActions[index].objectName  // CUSTOM
481
283
                       width: units.gu(3)
482
284
                       height: units.gu(3)
483
285
                       name: modelData.iconName
484
286
                       color: root.activeAction === modelData ? UbuntuColors.orange : UbuntuColors.coolGrey  // CUSTOM
485
287
                   }
486
288
               }
487
289
           }
488
290
       }
489
291
    }
490
292
491
293
    Rectangle {
492
294
        id: main
493
295
        objectName: "mainItem"
494
296
495
297
        anchors {
496
298
            top: parent.top
497
299
            bottom: parent.bottom
498
300
        }
499
301
500
302
        width: parent.width
501
303
        color: root.selected ? root.selectedColor : root.color
502
304
503
305
        Loader {
504
306
            id: selectionIcon
505
307
506
308
            anchors {
507
309
                left: main.left
508
310
                verticalCenter: main.verticalCenter
509
311
            }
510
312
            asynchronous: true  // CUSTOM
511
313
            width: (status === Loader.Ready) ? item.implicitWidth : 0
512
314
            visible: (status === Loader.Ready) && (item.width === item.implicitWidth)
513
315
514
316
            Behavior on width {
515
317
                NumberAnimation {
516
318
                    duration: UbuntuAnimation.SnapDuration
517
319
                }
518
320
            }
519
321
        }
520
322
521
323
        Item {
522
324
            id: mainContents
523
325
524
326
            anchors {
525
327
                left: selectionIcon.right
526
328
                //leftMargin: units.gu(2)  // CUSTOM
527
329
                top: parent.top
528
330
                //topMargin: units.gu(1)  // CUSTOM
529
331
                right: parent.right
530
332
                //rightMargin: units.gu(2)  // CUSTOM
531
333
                bottom: parent.bottom
532
334
                //bottomMargin: units.gu(1)  // CUSTOM
533
335
            }
534
336
        }
535
337
536
338
        Behavior on x {
537
339
            UbuntuNumberAnimation {
538
340
                id: mainItemMoving
539
341
540
342
                easing.type: Easing.OutElastic
541
343
                duration: UbuntuAnimation.SlowDuration
542
344
            }
543
345
        }
544
346
    }
545
347
546
348
    SequentialAnimation {
547
349
        id: triggerAction
548
350
549
351
        property var currentItem: root.activeItem ? root.activeItem.image : null
550
352
551
353
        running: false
552
354
        ParallelAnimation {
553
355
            UbuntuNumberAnimation {
554
356
                target: triggerAction.currentItem
555
357
                property: "opacity"
556
358
                from: 1.0
557
359
                to: 0.0
558
360
                duration: UbuntuAnimation.SlowDuration
559
361
                easing {type: Easing.InOutBack; }
560
362
            }
561
363
            UbuntuNumberAnimation {
562
364
                target: triggerAction.currentItem
563
365
                properties: "width, height"
564
366
                from: units.gu(3)
565
367
                to: root.actionWidth
566
368
                duration: UbuntuAnimation.SlowDuration
567
369
                easing {type: Easing.InOutBack; }
568
370
            }
569
371
        }
570
372
        PropertyAction {
571
373
            target: triggerAction.currentItem
572
374
            properties: "width, height"
573
375
            value: units.gu(3)
574
376
        }
575
377
        PropertyAction {
576
378
            target: triggerAction.currentItem
577
379
            properties: "opacity"
578
380
            value: 1.0
579
381
        }
580
382
        ScriptAction {
581
383
            script: {
582
384
                root.activeAction.triggered(root)
583
385
                mouseArea.state = ""
584
386
            }
585
387
        }
586
388
        PauseAnimation {
587
389
            duration: 500
588
390
        }
589
391
        UbuntuNumberAnimation {
590
392
            target: main
591
393
            property: "x"
592
394
            to: 0
593
395
        }
594
396
    }
595
397
596
398
    MouseArea {
597
399
        id: mouseArea
598
400
599
401
        property bool locked: root.locked || ((root.leftSideAction === null) && (root._visibleRightSideActions.count === 0))  // CUSTOM
600
402
        property bool manual: false
601
403
        property string direction: "None"
602
404
        property real lastX: -1
603
405
604
406
        anchors.fill: parent
605
407
        drag {
606
408
            target: locked ? null : main
607
409
            axis: Drag.XAxis
608
410
            minimumX: rightActionsView.visible ? -(rightActionsView.width) : 0
609
411
            maximumX: leftSideAction ? leftActionViewLoader.item.width : 0
610
412
            threshold: root.actionThreshold
611
413
        }
612
414
613
415
        states: [
614
416
            State {
615
417
                name: "LeftToRight"
616
418
                PropertyChanges {
617
419
                    target: mouseArea
618
420
                    drag.maximumX: 0
619
421
                }
620
422
            },
621
423
            State {
622
424
                name: "RightToLeft"
623
425
                PropertyChanges {
624
426
                    target: mouseArea
625
427
                    drag.minimumX: 0
626
428
                }
627
429
            }
628
430
        ]
629
431
630
432
        onMouseXChanged: {
631
433
            var offset = (lastX - mouseX)
632
434
            if (Math.abs(offset) <= root.actionThreshold) {
633
435
                return
634
436
            }
635
437
            lastX = mouseX
636
438
            direction = offset > 0 ? "RTL" : "LTR";
637
439
        }
638
440
639
441
        onPressed: {
640
442
            lastX = mouse.x
641
443
        }
642
444
643
445
        onReleased: {
644
446
            if (root.triggerActionOnMouseRelease && root.activeAction) {
645
447
                triggerAction.start()
646
448
            } else {
647
449
                root.returnToBounds()
648
450
                root.activeAction = null
649
451
            }
650
452
            lastX = -1
651
453
            direction = "None"
652
454
        }
653
455
        onClicked: {
654
456
            if (selectionMode) {  // CUSTOM - selecting a listitem should toggle selection if in selectionMode
655
457
                selected = !selected
656
458
                return
657
459
            } else if (main.x === 0) {
658
460
                root.itemClicked(mouse)
659
461
            } else if (main.x > 0) {
660
462
                var action = getActionAt(Qt.point(mouse.x, mouse.y))
661
463
                if (action && action !== -1) {
662
464
                    //action.triggered(root)
663
465
                    removeAnimation.action = action  // CUSTOM - use our animation instead
664
466
                    removeAnimation.start()  // CUSTOM
665
467
                }
666
468
            } else {
667
469
                var actionIndex = getActionAt(Qt.point(mouse.x, mouse.y))
668
470
669
471
                if (actionIndex !== -1 && actionIndex !== leftSideAction) {  // CUSTOM - can be leftAction
670
472
                    root.activeItem = rightActionsRepeater.itemAt(actionIndex)
671
473
                    root.activeAction = root.rightSideActions[actionIndex]
672
474
                    triggerAction.start()
673
475
                    return
674
476
                }
675
477
            }
676
478
            root.resetSwipe()
677
479
        }
678
480
679
481
        onPositionChanged: {
680
482
            if (mouseArea.pressed) {
681
483
                updateActiveAction()
682
484
683
485
                listItemSwiping(index)  // CUSTOM - tells other listitems to dismiss any swipe
684
486
            }
685
487
        }
686
488
        onPressAndHold: {
687
489
            if (main.x === 0) {
688
490
                root.itemPressAndHold(mouse)
689
491
            }
690
492
        }
691
493
692
494
        z: -1
693
495
    }
694
496
}
695
497
0
696
=== removed file 'app/components/MultiSelectHeadState.qml'
697
--- app/components/MultiSelectHeadState.qml	2015-11-02 21:28:34 +0000
698
+++ app/components/MultiSelectHeadState.qml	1970-01-01 00:00:00 +0000
699
@@ -1,72 +0,0 @@
700
1
/*
701
2
 * Copyright (C) 2015
702
3
 *      Andrew Hayzen <ahayzen@gmail.com>
703
4
 *      Victor Thompson <victor.thompson@gmail.com>
704
5
 *
705
6
 * This program is free software; you can redistribute it and/or modify
706
7
 * it under the terms of the GNU General Public License as published by
707
8
 * the Free Software Foundation; version 3.
708
9
 *
709
10
 * This program is distributed in the hope that it will be useful,
710
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
711
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
712
13
 * GNU General Public License for more details.
713
14
 *
714
15
 * You should have received a copy of the GNU General Public License
715
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
716
17
 */
717
18
718
19
import QtQuick 2.4
719
20
import Ubuntu.Components 1.3
720
21
721
22
PageHeadState {
722
23
    id: selectionState
723
24
    actions: [
724
25
        Action {
725
26
            iconName: "select"
726
27
            text: i18n.tr("Select All")
727
28
            onTriggered: {
728
29
                if (listview.selectedItems.length === listview.model.count) {
729
30
                    listview.clearSelection()
730
31
                } else {
731
32
                    listview.selectAll()
732
33
                }
733
34
            }
734
35
        },
735
36
        Action {
736
37
            enabled: listview.selectedItems.length > 0
737
38
            iconName: "delete"
738
39
            text: i18n.tr("Delete")
739
40
            visible: removable
740
41
741
42
            onTriggered: {
742
43
                removed(listview.selectedItems)
743
44
744
45
                listview.closeSelection()
745
46
            }
746
47
        }
747
48
748
49
    ]
749
50
    backAction: Action {
750
51
        text: i18n.tr("Cancel selection")
751
52
        iconName: "back"
752
53
        onTriggered: {
753
54
            listview.clearSelection()
754
55
            listview.state = "normal"
755
56
        }
756
57
    }
757
58
    head: thisPage.head
758
59
    name: "selection"
759
60
760
61
    PropertyChanges {
761
62
        target: thisPage.head
762
63
        backAction: selectionState.backAction
763
64
        actions: selectionState.actions
764
65
    }
765
66
766
67
    property ListView listview
767
68
    property bool removable: false
768
69
    property Page thisPage
769
70
770
71
    signal removed(var selectedItems)
771
72
}
772
73
0
773
=== modified file 'app/components/MultiSelectListView.qml'
774
--- app/components/MultiSelectListView.qml	2015-11-02 21:28:34 +0000
775
+++ app/components/MultiSelectListView.qml	2015-12-10 01:16:13 +0000
776
@@ -20,21 +20,24 @@
777
20
import QtQuick 2.4
20
import QtQuick 2.4
778
21
import Ubuntu.Components 1.3
21
import Ubuntu.Components 1.3
779
22
22
780
23
781
24
WeatherListView {
23
WeatherListView {
782
25
    property var selectedItems: []
783
26
784
27
    signal clearSelection()
24
    signal clearSelection()
785
28
    signal closeSelection()
25
    signal closeSelection()
786
29
    signal selectAll()
26
    signal selectAll()
789
30
27
    signal reorder(int from, int to)
790
31
    onClearSelection: selectedItems = []
28
791
29
    onClearSelection: {
792
30
        ViewItems.selectedIndices = []
793
31
    }
794
32
795
32
    onCloseSelection: {
33
    onCloseSelection: {
796
33
        clearSelection()
34
        clearSelection()
798
34
        state = "normal"
35
        ViewItems.selectMode = false
799
36
        ViewItems.dragMode = false
800
35
    }
37
    }
801
38
802
36
    onSelectAll: {
39
    onSelectAll: {
804
37
        var tmp = selectedItems
40
        var tmp = []
805
38
41
806
39
        for (var i=0; i < model.count; i++) {
42
        for (var i=0; i < model.count; i++) {
807
40
            if (tmp.indexOf(i) === -1) {
43
            if (tmp.indexOf(i) === -1) {
808
@@ -42,11 +45,27 @@
809
42
            }
45
            }
810
43
        }
46
        }
811
44
47
813
45
        selectedItems = tmp
48
        ViewItems.selectedIndices = tmp
814
46
    }
49
    }
815
50
816
47
    onVisibleChanged: {
51
    onVisibleChanged: {
817
48
        if (!visible) {
52
        if (!visible) {
818
49
            closeSelection()
53
            closeSelection()
819
50
        }
54
        }
820
51
    }
55
    }
821
56
822
57
    moveDisplaced: Transition {
823
58
        UbuntuNumberAnimation {
824
59
            property: "y"
825
60
        }
826
61
    }
827
62
828
63
    ViewItems.onDragUpdated: {
829
64
        if (event.status === ListItemDrag.Moving) {
830
65
            event.accept = false
831
66
        } else if (event.status === ListItemDrag.Dropped) {
832
67
            model.move(event.from, event.to, 1)
833
68
            reorder(event.from, event.to)
834
69
        }
835
70
    }
836
52
}
71
}
837
53
72
838
=== removed file 'app/components/WeatherListItem.qml'
839
--- app/components/WeatherListItem.qml	2015-11-02 21:28:34 +0000
840
+++ app/components/WeatherListItem.qml	1970-01-01 00:00:00 +0000
841
@@ -1,138 +0,0 @@
842
1
/*
843
2
 * Copyright (C) 2013, 2014, 2015
844
3
 *      Andrew Hayzen <ahayzen@gmail.com>
845
4
 *      Nekhelesh Ramananthan <krnekhelesh@gmail.com>
846
5
 *      Victor Thompson <victor.thompson@gmail.com>
847
6
 *
848
7
 * This program is free software; you can redistribute it and/or modify
849
8
 * it under the terms of the GNU General Public License as published by
850
9
 * the Free Software Foundation; version 3.
851
10
 *
852
11
 * This program is distributed in the hope that it will be useful,
853
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
854
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
855
14
 * GNU General Public License for more details.
856
15
 *
857
16
 * You should have received a copy of the GNU General Public License
858
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
859
18
 */
860
19
861
20
import QtQuick 2.4
862
21
import Ubuntu.Components 1.3
863
22
864
23
ListItemWithActions {
865
24
    id: root
866
25
    color: "transparent"
867
26
868
27
    property int listItemIndex: index
869
28
    property bool multiselectable: false
870
29
    property int previousListItemIndex: -1
871
30
    property bool reorderable: false
872
31
873
32
    signal reorder(int from, int to)
874
33
875
34
    onItemPressAndHold: {
876
35
        if (multiselectable) {
877
36
            selectionMode = true
878
37
        }
879
38
    }
880
39
881
40
    onListItemIndexChanged: {
882
41
        var i = parent.parent.selectedItems.lastIndexOf(previousListItemIndex)
883
42
884
43
        if (i !== -1) {
885
44
            parent.parent.selectedItems[i] = listItemIndex
886
45
        }
887
46
888
47
        previousListItemIndex = listItemIndex
889
48
    }
890
49
891
50
    onSelectedChanged: {
892
51
        if (selectionMode) {
893
52
            var tmp = parent.parent.selectedItems
894
53
895
54
            if (selected) {
896
55
                if (parent.parent.selectedItems.indexOf(listItemIndex) === -1) {
897
56
                    tmp.push(listItemIndex)
898
57
                    parent.parent.selectedItems = tmp
899
58
                }
900
59
            } else {
901
60
                tmp.splice(parent.parent.selectedItems.indexOf(listItemIndex), 1)
902
61
                parent.parent.selectedItems = tmp
903
62
            }
904
63
        }
905
64
    }
906
65
907
66
    onSelectionModeChanged: {
908
67
        if (reorderable && selectionMode) {
909
68
            resetSwipe()
910
69
        }
911
70
912
71
        for (var j=0; j < _main.children.length; j++) {
913
72
            if (_main.children[j] !== actionReorderLoader) {
914
73
                _main.children[j].anchors.rightMargin = reorderable && selectionMode ? actionReorderLoader.width + units.gu(2) : 0
915
74
            }
916
75
        }
917
76
918
77
        parent.parent.state = selectionMode ? "multiselectable" : "normal"
919
78
920
79
        if (!selectionMode) {
921
80
            selected = false
922
81
        }
923
82
    }
924
83
925
84
    /* Highlight the listitem on press */
926
85
    Rectangle {
927
86
        id: listItemBrighten
928
87
        color: root.pressed ? UbuntuColors.coolGrey : "transparent"
929
88
        opacity: 0.1
930
89
        height: root.height
931
90
        x: root.x - parent.x  // -parent.x due to selectionIcon in ListItemWithActions
932
91
        width: root.width
933
92
    }
934
93
935
94
    /* Reorder Component */
936
95
    Loader {
937
96
        id: actionReorderLoader
938
97
        active: reorderable && selectionMode && root.parent.parent.selectedItems.length === 0
939
98
        anchors {
940
99
            bottom: parent.bottom
941
100
            right: parent.right
942
101
            rightMargin: units.gu(1)
943
102
            top: parent.top
944
103
        }
945
104
        asynchronous: true
946
105
        source: "ListItemReorderComponent.qml"
947
106
    }
948
107
949
108
    Item {
950
109
        Connections {  // Only allow one ListItem to be swiping at any time
951
110
            target: weatherApp
952
111
            onListItemSwiping: {
953
112
                if (i !== index) {
954
113
                    root.resetSwipe();
955
114
                }
956
115
            }
957
116
        }
958
117
959
118
        Connections {  // Connections from signals in the ListView
960
119
            target: root.parent.parent
961
120
            onClearSelection: selected = false
962
121
            onFlickingChanged: {
963
122
                if (root.parent.parent.flicking) {
964
123
                    root.resetSwipe()
965
124
                }
966
125
            }
967
126
            onSelectAll: selected = true
968
127
            onStateChanged: selectionMode = root.parent.parent.state === "multiselectable"
969
128
        }
970
129
    }
971
130
972
131
    Component.onCompleted: {  // reload settings as delegates are destroyed
973
132
        if (parent.parent.selectedItems.indexOf(index) !== -1) {
974
133
            selected = true
975
134
        }
976
135
977
136
        selectionMode = root.parent.parent.state === "multiselectable"
978
137
    }
979
138
}
980
139
0
981
=== modified file 'app/components/WeatherListView.qml'
982
--- app/components/WeatherListView.qml	2015-11-02 21:28:34 +0000
983
+++ app/components/WeatherListView.qml	2015-12-10 01:16:13 +0000
984
@@ -20,8 +20,7 @@
985
20
import QtQuick 2.4
20
import QtQuick 2.4
986
21
import Ubuntu.Components 1.3
21
import Ubuntu.Components 1.3
987
22
22
990
23
23
UbuntuListView {
989
24
ListView {
991
25
    Component.onCompleted: {
24
    Component.onCompleted: {
992
26
        // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
25
        // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
993
27
        // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
26
        // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
994
28
27
995
=== modified file 'app/ui/LocationsPage.qml'
996
--- app/ui/LocationsPage.qml	2015-11-02 21:28:34 +0000
997
+++ app/ui/LocationsPage.qml	2015-12-10 01:16:13 +0000
998
@@ -18,22 +18,19 @@
999
18
18
1000
19
import QtQuick 2.4
19
import QtQuick 2.4
1001
20
import Ubuntu.Components 1.3
20
import Ubuntu.Components 1.3
1003
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.0 as ListItems
1004
22
import "../components"
22
import "../components"
1005
23
import "../components/ListItemActions"
1006
24
1007
25
23
1008
26
Page {
24
Page {
1009
27
    id: locationsPage
25
    id: locationsPage
1010
28
    objectName: "locationsPage"
26
    objectName: "locationsPage"
1011
29
    title: i18n.tr("Locations")
27
    title: i18n.tr("Locations")
1012
30
28
1014
31
    state: locationsListView.state === "multiselectable" ? "selection" : "default"
29
    state: "default"
1015
32
    states: [
30
    states: [
1016
33
        PageHeadState {
31
        PageHeadState {
1017
34
            id: defaultState
1018
35
            head: locationsPage.head
1019
36
            name: "default"
32
            name: "default"
1020
33
            head: locationsPage.head
1021
37
            actions: [
34
            actions: [
1022
38
                Action {
35
                Action {
1023
39
                    iconName: "add"
36
                    iconName: "add"
1024
@@ -48,12 +45,28 @@
1025
48
                }
45
                }
1026
49
            }
46
            }
1027
50
        },
47
        },
1034
51
        MultiSelectHeadState {
48
        PageHeadState {
1035
52
            listview: locationsListView
49
            name: "selection"
1036
53
            removable: true
50
            head: locationsPage.head
1037
54
            thisPage: locationsPage
51
            when: locationsListView.ViewItems.selectMode
1038
55
52
            backAction: Action {
1039
56
            onRemoved: storage.removeMultiLocations(selectedItems.slice());
53
                iconName: "back"
1040
54
                onTriggered: {
1041
55
                    locationsListView.closeSelection()
1042
56
                    locationsPage.state = "default"
1043
57
                }
1044
58
            }
1045
59
            actions: [
1046
60
                Action {
1047
61
                    iconName: "delete"
1048
62
                    enabled: locationsListView.ViewItems.selectedIndices.length !== 0
1049
63
                    onTriggered: {
1050
64
                        storage.removeMultiLocations(locationsListView.ViewItems.selectedIndices)
1051
65
                        locationsListView.closeSelection()
1052
66
                        locationsPage.state = "default"
1053
67
                    }
1054
68
                }
1055
69
            ]
1056
57
        }
70
        }
1057
58
    ]
71
    ]
1058
59
72
1059
@@ -73,17 +86,16 @@
1060
73
        }
86
        }
1061
74
        header: MultiSelectListView {
87
        header: MultiSelectListView {
1062
75
            id: currentLocationListView
88
            id: currentLocationListView
1068
76
            anchors {
89
1069
77
                left: parent.left
90
            height: settings.addedCurrentLocation && settings.detectCurrentLocation ? units.gu(7) : units.gu(0)
1065
78
                right: parent.right
1066
79
            }
1067
80
            height: settings.addedCurrentLocation && settings.detectCurrentLocation ? units.gu(8) : units.gu(0)
1070
81
            interactive: false
91
            interactive: false
1071
82
            model: currentLocationModel
92
            model: currentLocationModel
1073
83
            delegate: WeatherListItem {
93
            width: parent.width
1074
94
1075
95
            delegate: ListItem {
1076
84
                id: currentLocationListItem
96
                id: currentLocationListItem
1077
85
97
1079
86
                onItemClicked: {
98
                onClicked: {
1080
87
                    settings.current = index;
99
                    settings.current = index;
1081
88
                    pageStack.pop()
100
                    pageStack.pop()
1082
89
                }
101
                }
1083
@@ -154,39 +166,48 @@
1084
154
                    horizontalAlignment: Text.AlignRight
166
                    horizontalAlignment: Text.AlignRight
1085
155
                    text: temp + settings.tempScale
167
                    text: temp + settings.tempScale
1086
156
                }
168
                }
1087
169
1088
170
                ListItems.ThinDivider { anchors.bottom: parent.bottom }
1089
157
            }
171
            }
1090
158
        }
172
        }
1091
159
173
1093
160
        delegate: WeatherListItem {
174
        // Added a thindivider to the listview since by default the last listitem does not show
1094
175
        // a thindivider which does not follow design specs.
1095
176
        footer: ListItems.ThinDivider {
1096
177
            visible: locationsModel.count !== 0
1097
178
        }
1098
179
1099
180
        onReorder: {
1100
181
            console.debug("Move: ", from, to);
1101
182
            storage.moveLocation(from, to);
1102
183
        }
1103
184
1104
185
        delegate: ListItem {
1105
161
            id: locationsListItem
186
            id: locationsListItem
1106
162
            objectName: "location" + index
187
            objectName: "location" + index
1115
163
            leftSideAction: Remove {
188
1116
164
                onTriggered: storage.removeLocation(index)
189
            leadingActions: ListItemActions {
1117
165
            }
190
                actions: [
1118
166
            multiselectable: true
191
                    Action {
1119
167
            reorderable: true
192
                        iconName: 'delete'
1120
168
193
                        onTriggered: storage.removeLocation(index)
1121
169
            onItemClicked: {
194
                    }
1122
170
                if (settings.addedCurrentLocation && settings.detectCurrentLocation) {
195
                ]
1123
196
            }
1124
197
1125
198
            onPressAndHold: {
1126
199
                ListView.view.ViewItems.selectMode = !ListView.view.ViewItems.selectMode
1127
200
                ListView.view.ViewItems.dragMode = !ListView.view.ViewItems.dragMode
1128
201
            }
1129
202
1130
203
            onClicked: {
1131
204
                if (!selectMode) {
1132
171
                    settings.current = index + 1;
205
                    settings.current = index + 1;
1135
172
                } else {
206
                    pageStack.pop()
1134
173
                    settings.current = index;
1136
174
                }
207
                }
1137
175
208
1138
176
                pageStack.pop()
209
                pageStack.pop()
1139
177
            }
210
            }
1140
178
            onReorder: {
1141
179
                console.debug("Move: ", from, to);
1142
180
1143
181
                storage.moveLocation(from, to);
1144
182
            }
1145
183
1146
184
            ListItem.ThinDivider {
1147
185
                anchors {
1148
186
                    top: parent.top
1149
187
                }
1150
188
                visible: index == 0
1151
189
            }
1152
190
211
1153
191
            Item {
212
            Item {
1154
192
                anchors {
213
                anchors {
1155
@@ -252,12 +273,6 @@
1156
252
                    visible: locationsPage.state === "default"
273
                    visible: locationsPage.state === "default"
1157
253
                }
274
                }
1158
254
            }
275
            }
1159
255
1160
256
            ListItem.ThinDivider {
1161
257
                anchors {
1162
258
                    bottom: parent.bottom
1163
259
                }
1164
260
            }
1165
261
        }
276
        }
1166
262
    }
277
    }
1167
263
278
1168
264
279
1169
=== modified file 'debian/changelog'
1170
--- debian/changelog	2015-12-03 15:22:45 +0000
1171
+++ debian/changelog	2015-12-10 01:16:13 +0000
1172
@@ -1,7 +1,11 @@
1173
1
ubuntu-weather-app (3.2) UNRELEASED; urgency=medium
1
ubuntu-weather-app (3.2) UNRELEASED; urgency=medium
1174
2
2
1175
3
  [ Andrew Hayzen ]
1176
3
  * Release 3.1 and bump version to 3.2
4
  * Release 3.1 and bump version to 3.2
1177
4
5
1178
6
  [ Victor Thompson ]
1179
7
  * Use the new ListItems from Ubuntu Components 1.3
1180
8
1181
5
 -- Andrew Hayzen <ahayzen@gmail.com>  Thu, 03 Dec 2015 15:20:49 +0000
9
 -- Andrew Hayzen <ahayzen@gmail.com>  Thu, 03 Dec 2015 15:20:49 +0000
1182
6
10
1183
7
ubuntu-weather-app (3.1ubuntu1) vivid; urgency=medium
11
ubuntu-weather-app (3.1ubuntu1) vivid; urgency=medium
1184
8
12
1185
=== modified file 'po/com.ubuntu.weather.pot'
1186
--- po/com.ubuntu.weather.pot	2015-11-26 02:05:13 +0000
1187
+++ po/com.ubuntu.weather.pot	2015-12-10 01:16:13 +0000
1188
@@ -8,7 +8,7 @@
1189
8
msgstr ""
8
msgstr ""
1190
9
"Project-Id-Version: ubuntu-weather-app\n"
9
"Project-Id-Version: ubuntu-weather-app\n"
1191
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
1193
11
"POT-Creation-Date: 2015-11-26 02:04+0000\n"
11
"POT-Creation-Date: 2015-12-09 19:09-0600\n"
1194
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1195
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1196
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
1197
@@ -62,26 +62,10 @@
1198
62
msgid "Today"
62
msgid "Today"
1199
63
msgstr ""
63
msgstr ""
1200
64
64
1201
65
#: ../app/components/ListItemActions/Remove.qml:26
1202
66
msgid "Remove"
1203
67
msgstr ""
1204
68
1205
69
#: ../app/components/LocationsPageEmptyStateComponent.qml:36
65
#: ../app/components/LocationsPageEmptyStateComponent.qml:36
1206
70
msgid "No locations found. Tap the plus icon to search for one."
66
msgid "No locations found. Tap the plus icon to search for one."
1207
71
msgstr ""
67
msgstr ""
1208
72
68
1209
73
#: ../app/components/MultiSelectHeadState.qml:27
1210
74
msgid "Select All"
1211
75
msgstr ""
1212
76
1213
77
#: ../app/components/MultiSelectHeadState.qml:39
1214
78
msgid "Delete"
1215
79
msgstr ""
1216
80
1217
81
#: ../app/components/MultiSelectHeadState.qml:51
1218
82
msgid "Cancel selection"
1219
83
msgstr ""
1220
84
1221
85
#: ../app/components/NetworkErrorStateComponent.qml:48
69
#: ../app/components/NetworkErrorStateComponent.qml:48
1222
86
msgid "Network Error"
70
msgid "Network Error"
1223
87
msgstr ""
71
msgstr ""
1224
@@ -136,11 +120,11 @@
1225
136
msgid "OK"
120
msgid "OK"
1226
137
msgstr ""
121
msgstr ""
1227
138
122
1229
139
#: ../app/ui/HomePage.qml:32 ../app/ui/LocationsPage.qml:29
123
#: ../app/ui/HomePage.qml:32 ../app/ui/LocationsPage.qml:27
1230
140
msgid "Locations"
124
msgid "Locations"
1231
141
msgstr ""
125
msgstr ""
1232
142
126
1234
143
#: ../app/ui/LocationsPage.qml:109
127
#: ../app/ui/LocationsPage.qml:121
1235
144
msgid "Current Location"
128
msgid "Current Location"
1236
145
msgstr ""
129
msgstr ""
1237
146
130
Status:	Needs review
Proposed branch:	lp:~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration
Merge into:	lp:ubuntu-weather-app
Prerequisite:	lp:~ahayzen/ubuntu-weather-app/reboot-uc1.3-bump
Diff against target:	1236 lines (+98/-948) 13 files modified app/components/CMakeLists.txt (+0/-2) app/components/ListItemActions/CMakeLists.txt (+0/-5) app/components/ListItemActions/CheckBox.qml (+0/-25) app/components/ListItemActions/Remove.qml (+0/-27) app/components/ListItemReorderComponent.qml (+0/-106) app/components/ListItemWithActions.qml (+0/-496) app/components/MultiSelectHeadState.qml (+0/-72) app/components/MultiSelectListView.qml (+27/-8) app/components/WeatherListItem.qml (+0/-138) app/components/WeatherListView.qml (+1/-2) app/ui/LocationsPage.qml (+63/-48) debian/changelog (+4/-0) po/com.ubuntu.weather.pot (+3/-19)
To merge this branch:	bzr merge lp:~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jenkins Bot	continuous-integration	2015-11-20	Approve on 2015-12-10
Andrew Hayzen		2015-11-20	Pending
Ubuntu Phone Apps Jenkins Bot	continuous-integration	2015-11-20	Pending
Review via email: mp+278209@code.launchpad.net