1
=== modified file 'qml/Components/Carousel.qml'
2
--- qml/Components/Carousel.qml	2014-07-08 17:49:18 +0000
3
+++ qml/Components/Carousel.qml	2014-10-10 11:46:46 +0000
4
@@ -17,6 +17,7 @@
5
17
import QtQuick 2.0
17
import QtQuick 2.0
6
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
7
19
import "carousel.js" as CarouselJS
19
import "carousel.js" as CarouselJS
8
20
import "Flickables" as Flickables
9
20
21
10
21
/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
22
/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
11
22
    cover flow. But it stops at it's boundaries (therefore no PathView is used).
23
    cover flow. But it stops at it's boundaries (therefore no PathView is used).
12
@@ -63,7 +64,7 @@
13
63
       and footer item to compensate that.
64
       and footer item to compensate that.
14
64
65
15
65
       The scaling of the items is controlled by the variable continuousIndex, described below. */
66
       The scaling of the items is controlled by the variable continuousIndex, described below. */
17
66
    ListView {
67
    Flickables.ListView {
18
67
        id: listView
68
        id: listView
19
68
        objectName: "listView"
69
        objectName: "listView"
20
69
70
21
@@ -135,8 +136,6 @@
22
135
136
23
136
        boundsBehavior: Flickable.DragOverBounds
137
        boundsBehavior: Flickable.DragOverBounds
24
137
        cacheBuffer: carousel.cacheBuffer
138
        cacheBuffer: carousel.cacheBuffer
25
138
        flickDeceleration: Math.max(1500 * Math.pow(realWidth / referenceWidth, 1.5), 1500) // 1500 is platform default
26
139
        maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default
27
140
        orientation: ListView.Horizontal
139
        orientation: ListView.Horizontal
28
141
140
29
142
        function getXFromContinuousIndex(index) {
141
        function getXFromContinuousIndex(index) {
30
143
142
31
=== added directory 'qml/Components/Flickables'
32
=== added file 'qml/Components/Flickables/Flickable.qml'
33
--- qml/Components/Flickables/Flickable.qml	1970-01-01 00:00:00 +0000
34
+++ qml/Components/Flickables/Flickable.qml	2014-10-10 11:46:46 +0000
35
@@ -0,0 +1,23 @@
36
1
/*
37
2
 * Copyright (C) 2014 Canonical, Ltd.
38
3
 *
39
4
 * This program is free software; you can redistribute it and/or modify
40
5
 * it under the terms of the GNU General Public License as published by
41
6
 * the Free Software Foundation; version 3.
42
7
 *
43
8
 * This program is distributed in the hope that it will be useful,
44
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
45
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
46
11
 * GNU General Public License for more details.
47
12
 *
48
13
 * You should have received a copy of the GNU General Public License
49
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
50
15
 */
51
16
52
17
import QtQuick 2.3 as QtQuick
53
18
import Ubuntu.Components 1.1
54
19
55
20
QtQuick.Flickable {
56
21
    flickDeceleration: 1500 * units.gridUnit / 8
57
22
    maximumFlickVelocity: 2500 * units.gridUnit / 8
58
23
}
59
0
24
60
=== added file 'qml/Components/Flickables/GridView.qml'
61
--- qml/Components/Flickables/GridView.qml	1970-01-01 00:00:00 +0000
62
+++ qml/Components/Flickables/GridView.qml	2014-10-10 11:46:46 +0000
63
@@ -0,0 +1,25 @@
64
1
/*
65
2
 * Copyright (C) 2014 Canonical, Ltd.
66
3
 *
67
4
 * This program is free software; you can redistribute it and/or modify
68
5
 * it under the terms of the GNU General Public License as published by
69
6
 * the Free Software Foundation; version 3.
70
7
 *
71
8
 * This program is distributed in the hope that it will be useful,
72
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
73
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
74
11
 * GNU General Public License for more details.
75
12
 *
76
13
 * You should have received a copy of the GNU General Public License
77
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
78
15
 */
79
16
80
17
import QtQuick 2.3 as QtQuick
81
18
import Ubuntu.Components 1.1
82
19
83
20
QtQuick.GridView {
84
21
    // Attached components and usages like GridView.onRemove are known not to work
85
22
    // please use GridView directly from QtQuick if needed
86
23
    flickDeceleration: 1500 * units.gridUnit / 8
87
24
    maximumFlickVelocity: 2500 * units.gridUnit / 8
88
25
}
89
0
26
90
=== added file 'qml/Components/Flickables/ListView.qml'
91
--- qml/Components/Flickables/ListView.qml	1970-01-01 00:00:00 +0000
92
+++ qml/Components/Flickables/ListView.qml	2014-10-10 11:46:46 +0000
93
@@ -0,0 +1,25 @@
94
1
/*
95
2
 * Copyright (C) 2014 Canonical, Ltd.
96
3
 *
97
4
 * This program is free software; you can redistribute it and/or modify
98
5
 * it under the terms of the GNU General Public License as published by
99
6
 * the Free Software Foundation; version 3.
100
7
 *
101
8
 * This program is distributed in the hope that it will be useful,
102
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
103
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
104
11
 * GNU General Public License for more details.
105
12
 *
106
13
 * You should have received a copy of the GNU General Public License
107
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
108
15
 */
109
16
110
17
import QtQuick 2.3 as QtQuick
111
18
import Ubuntu.Components 1.1
112
19
113
20
QtQuick.ListView {
114
21
    // Attached components and usages like ListView.onRemove are known not to work
115
22
    // please use ListView directly from QtQuick if needed
116
23
    flickDeceleration: 1500 * units.gridUnit / 8
117
24
    maximumFlickVelocity: 2500 * units.gridUnit / 8
118
25
}
119
0
26
120
=== added file 'qml/Components/Flickables/ListViewWithPageHeader.qml'
121
--- qml/Components/Flickables/ListViewWithPageHeader.qml	1970-01-01 00:00:00 +0000
122
+++ qml/Components/Flickables/ListViewWithPageHeader.qml	2014-10-10 11:46:46 +0000
123
@@ -0,0 +1,23 @@
124
1
/*
125
2
 * Copyright (C) 2014 Canonical, Ltd.
126
3
 *
127
4
 * This program is free software; you can redistribute it and/or modify
128
5
 * it under the terms of the GNU General Public License as published by
129
6
 * the Free Software Foundation; version 3.
130
7
 *
131
8
 * This program is distributed in the hope that it will be useful,
132
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
133
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
134
11
 * GNU General Public License for more details.
135
12
 *
136
13
 * You should have received a copy of the GNU General Public License
137
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
138
15
 */
139
16
140
17
import Dash 0.1
141
18
import Ubuntu.Components 1.1
142
19
143
20
ListViewWithPageHeader {
144
21
    flickDeceleration: 1500 * units.gridUnit / 8
145
22
    maximumFlickVelocity: 2500 * units.gridUnit / 8
146
23
}
147
0
24
148
=== modified file 'qml/Components/ResponsiveGridView.qml'
149
--- qml/Components/ResponsiveGridView.qml	2014-09-19 10:31:14 +0000
150
+++ qml/Components/ResponsiveGridView.qml	2014-10-10 11:46:46 +0000
151
@@ -16,6 +16,7 @@
152
16
16
153
17
import QtQuick 2.3
17
import QtQuick 2.3
154
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
155
19
import "Flickables" as Flickables
156
19
20
157
20
/*
21
/*
158
21
   Essentially a GridView where you can specify the maximum number of columns it can have.
22
   Essentially a GridView where you can specify the maximum number of columns it can have.
159
@@ -55,7 +56,7 @@
160
55
        return rows * height
56
        return rows * height
161
56
    }
57
    }
162
57
58
164
58
    GridView {
59
    Flickables.GridView {
165
59
        id: gridView
60
        id: gridView
166
60
        objectName: "responsiveGridViewGrid"
61
        objectName: "responsiveGridViewGrid"
167
61
        anchors {
62
        anchors {
168
62
63
169
=== modified file 'qml/Components/ZoomableImage.qml'
170
--- qml/Components/ZoomableImage.qml	2014-04-30 13:51:11 +0000
171
+++ qml/Components/ZoomableImage.qml	2014-10-10 11:46:46 +0000
172
@@ -16,7 +16,7 @@
173
16
16
174
17
import QtQuick 2.0
17
import QtQuick 2.0
175
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
177
19
import "../Components"
19
import "Flickables" as Flickables
178
20
20
179
21
/*! \brief Zoomable for image.
21
/*! \brief Zoomable for image.
180
22
22
181
@@ -32,7 +32,7 @@
182
32
    property alias scaleTo: lazyImage.scaleTo
32
    property alias scaleTo: lazyImage.scaleTo
183
33
    property alias asynchronous: lazyImage.asynchronous
33
    property alias asynchronous: lazyImage.asynchronous
184
34
34
186
35
    Flickable {
35
    Flickables.Flickable {
187
36
        id: flickable
36
        id: flickable
188
37
        objectName: "flickable"
37
        objectName: "flickable"
189
38
        clip: true
38
        clip: true
190
39
39
191
=== modified file 'qml/Dash/CardHorizontalList.qml'
192
--- qml/Dash/CardHorizontalList.qml	2014-09-30 09:23:23 +0000
193
+++ qml/Dash/CardHorizontalList.qml	2014-10-10 11:46:46 +0000
194
@@ -17,6 +17,7 @@
195
17
import QtQuick 2.2
17
import QtQuick 2.2
196
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.1
197
19
import "../Components"
19
import "../Components"
198
20
import "../Components/Flickables" as Flickables
199
20
21
200
21
DashRenderer {
22
DashRenderer {
201
22
    id: root
23
    id: root
202
@@ -25,7 +26,7 @@
203
25
    collapsedHeight: expandedHeight
26
    collapsedHeight: expandedHeight
204
26
    clip: true
27
    clip: true
205
27
28
207
28
    ListView {
29
    Flickables.ListView {
208
29
        id: listView
30
        id: listView
209
30
        anchors {
31
        anchors {
210
31
            fill: parent
32
            fill: parent
211
32
33
212
=== modified file 'qml/Dash/DashContent.qml'
213
--- qml/Dash/DashContent.qml	2014-09-22 14:24:34 +0000
214
+++ qml/Dash/DashContent.qml	2014-10-10 11:46:46 +0000
215
@@ -19,6 +19,7 @@
216
19
import Unity 0.2
19
import Unity 0.2
217
20
import Utils 0.1
20
import Utils 0.1
218
21
import "../Components"
21
import "../Components"
219
22
import "../Components/Flickables" as Flickables
220
22
23
221
23
Item {
24
Item {
222
24
    id: dashContent
25
    id: dashContent
223
@@ -97,7 +98,7 @@
224
97
            anchors.fill: parent
98
            anchors.fill: parent
225
98
        }
99
        }
226
99
100
228
100
        ListView {
101
        Flickables.ListView {
229
101
            id: dashContentList
102
            id: dashContentList
230
102
            objectName: "dashContentList"
103
            objectName: "dashContentList"
231
103
104
232
@@ -105,8 +106,6 @@
233
105
            anchors.fill: parent
106
            anchors.fill: parent
234
106
            orientation: ListView.Horizontal
107
            orientation: ListView.Horizontal
235
107
            boundsBehavior: Flickable.DragAndOvershootBounds
108
            boundsBehavior: Flickable.DragAndOvershootBounds
236
108
            flickDeceleration: units.gu(625)
237
109
            maximumFlickVelocity: width * 5
238
110
            snapMode: ListView.SnapOneItem
109
            snapMode: ListView.SnapOneItem
239
111
            highlightMoveDuration: 250
110
            highlightMoveDuration: 250
240
112
            highlightRangeMode: ListView.StrictlyEnforceRange
111
            highlightRangeMode: ListView.StrictlyEnforceRange
241
113
112
242
=== modified file 'qml/Dash/DashNavigationButton.qml'
243
--- qml/Dash/DashNavigationButton.qml	2014-08-29 07:59:08 +0000
244
+++ qml/Dash/DashNavigationButton.qml	2014-10-10 11:46:46 +0000
245
@@ -16,6 +16,7 @@
246
16
16
247
17
import QtQuick 2.2
17
import QtQuick 2.2
248
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.1
249
19
import "../Components/Flickables" as Flickables
250
19
20
251
20
AbstractButton {
21
AbstractButton {
252
21
    id: root
22
    id: root
253
@@ -75,7 +76,7 @@
254
75
    }
76
    }
255
76
77
256
77
    //  navigationListView is outside root
78
    //  navigationListView is outside root
258
78
    ListView {
79
    Flickables.ListView {
259
79
        id: navigationListView
80
        id: navigationListView
260
80
        objectName: "navigationListView"
81
        objectName: "navigationListView"
261
81
        visible: height > 0
82
        visible: height > 0
262
82
83
263
=== modified file 'qml/Dash/DashNavigationList.qml'
264
--- qml/Dash/DashNavigationList.qml	2014-08-27 10:25:47 +0000
265
+++ qml/Dash/DashNavigationList.qml	2014-10-10 11:46:46 +0000
266
@@ -17,6 +17,7 @@
267
17
import QtQuick 2.2
17
import QtQuick 2.2
268
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.1
269
19
import "../Components"
19
import "../Components"
270
20
import "../Components/Flickables" as Flickables
271
20
21
272
21
Item {
22
Item {
273
22
    id: root
23
    id: root
274
@@ -45,7 +46,7 @@
275
45
        }
46
        }
276
46
    }
47
    }
277
47
48
279
48
    Flickable {
49
    Flickables.Flickable {
280
49
        id: flickable
50
        id: flickable
281
50
51
282
51
        anchors.fill: parent
52
        anchors.fill: parent
283
52
53
284
=== modified file 'qml/Dash/PageHeader.qml'
285
--- qml/Dash/PageHeader.qml	2014-09-18 21:25:41 +0000
286
+++ qml/Dash/PageHeader.qml	2014-10-10 11:46:46 +0000
287
@@ -21,6 +21,7 @@
288
21
import Ubuntu.Components.ListItems 1.0
21
import Ubuntu.Components.ListItems 1.0
289
22
import "../Components"
22
import "../Components"
290
23
import "../Components/SearchHistoryModel"
23
import "../Components/SearchHistoryModel"
291
24
import "../Components/Flickables" as Flickables
292
24
25
293
25
Item {
26
Item {
294
26
    id: root
27
    id: root
295
@@ -127,7 +128,7 @@
296
127
        }
128
        }
297
128
    }
129
    }
298
129
130
300
130
    Flickable {
131
    Flickables.Flickable {
301
131
        id: headerContainer
132
        id: headerContainer
302
132
        objectName: "headerContainer"
133
        objectName: "headerContainer"
303
133
        clip: contentY < height
134
        clip: contentY < height
304
134
135
305
=== modified file 'qml/Dash/PreviewListView.qml'
306
--- qml/Dash/PreviewListView.qml	2014-09-18 05:05:56 +0000
307
+++ qml/Dash/PreviewListView.qml	2014-10-10 11:46:46 +0000
308
@@ -18,6 +18,7 @@
309
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
310
19
import Unity 0.2
19
import Unity 0.2
311
20
import "../Components"
20
import "../Components"
312
21
import "../Components/Flickables" as Flickables
313
21
import "Previews" as Previews
22
import "Previews" as Previews
314
22
23
315
23
Item {
24
Item {
316
@@ -52,7 +53,7 @@
317
52
        onBackClicked: root.backClicked()
53
        onBackClicked: root.backClicked()
318
53
    }
54
    }
319
54
55
321
55
    ListView  {
56
    Flickables.ListView {
322
56
        id: previewListView
57
        id: previewListView
323
57
        objectName: "listView"
58
        objectName: "listView"
324
58
        anchors {
59
        anchors {
325
@@ -66,8 +67,6 @@
326
66
        snapMode: ListView.SnapOneItem
67
        snapMode: ListView.SnapOneItem
327
67
        boundsBehavior: Flickable.DragAndOvershootBounds
68
        boundsBehavior: Flickable.DragAndOvershootBounds
328
68
        highlightMoveDuration: 250
69
        highlightMoveDuration: 250
329
69
        flickDeceleration: units.gu(625)
330
70
        maximumFlickVelocity: width * 5
331
71
        cacheBuffer: 0
70
        cacheBuffer: 0
332
72
71
333
73
        property bool open: false
72
        property bool open: false
334
74
73
335
=== modified file 'qml/Dash/Previews/Preview.qml'
336
--- qml/Dash/Previews/Preview.qml	2014-08-11 18:32:23 +0000
337
+++ qml/Dash/Previews/Preview.qml	2014-10-10 11:46:46 +0000
338
@@ -16,6 +16,7 @@
339
16
16
340
17
import QtQuick 2.0
17
import QtQuick 2.0
341
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
342
19
import "../../Components/Flickables" as Flickables
343
19
20
344
20
/*! \brief This component constructs the Preview UI.
21
/*! \brief This component constructs the Preview UI.
345
21
 *
22
 *
346
@@ -63,7 +64,7 @@
347
63
        Repeater {
64
        Repeater {
348
64
            model: previewModel
65
            model: previewModel
349
65
66
351
66
            delegate: ListView {
67
            delegate: Flickables.ListView {
352
67
                id: column
68
                id: column
353
68
                anchors { top: parent.top; bottom: parent.bottom }
69
                anchors { top: parent.top; bottom: parent.bottom }
354
69
                width: row.columnWidth
70
                width: row.columnWidth
355
70
71
356
=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
357
--- qml/Dash/Previews/PreviewImageGallery.qml	2014-09-30 08:12:23 +0000
358
+++ qml/Dash/Previews/PreviewImageGallery.qml	2014-10-10 11:46:46 +0000
359
@@ -17,6 +17,7 @@
360
17
import QtQuick 2.0
17
import QtQuick 2.0
361
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.1
362
19
import "../../Components"
19
import "../../Components"
363
20
import "../../Components/Flickables" as Flickables
364
20
21
365
21
/*! This preview widget shows a horizontal list of images.
22
/*! This preview widget shows a horizontal list of images.
366
22
 *  The URIs for the images should be an array in widgetData["sources"].
23
 *  The URIs for the images should be an array in widgetData["sources"].
367
@@ -28,7 +29,7 @@
368
28
29
369
29
    property Item rootItem: QuickUtils.rootItem(root)
30
    property Item rootItem: QuickUtils.rootItem(root)
370
30
31
372
31
    ListView {
32
    Flickables.ListView {
373
32
        id: previewImageListView
33
        id: previewImageListView
374
33
        objectName: "previewImageListView"
34
        objectName: "previewImageListView"
375
34
        spacing: units.gu(1)
35
        spacing: units.gu(1)
376
@@ -102,7 +103,7 @@
377
102
            UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
103
            UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
378
103
        }
104
        }
379
104
105
381
105
        ListView  {
106
        Flickables.ListView {
382
106
            id: slideShowListView
107
            id: slideShowListView
383
107
            objectName: "slideShowListView"
108
            objectName: "slideShowListView"
384
108
            anchors.fill: parent
109
            anchors.fill: parent
385
109
110
386
=== modified file 'qml/Dash/ScopeListView.qml'
387
--- qml/Dash/ScopeListView.qml	2014-08-26 09:44:35 +0000
388
+++ qml/Dash/ScopeListView.qml	2014-10-10 11:46:46 +0000
389
@@ -1,5 +1,5 @@
390
1
/*
1
/*
392
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2014 Canonical, Ltd.
393
3
 *
3
 *
394
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
395
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
396
@@ -14,11 +14,8 @@
397
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
398
15
 */
15
 */
399
16
16
402
17
import QtQuick 2.0
17
import "../Components/Flickables" as Flickables
401
18
import Dash 0.1
403
19
18
407
20
ListViewWithPageHeader {
19
Flickables.ListViewWithPageHeader {
405
21
    maximumFlickVelocity: height * 10
406
22
    flickDeceleration: height * 2
408
23
    cacheBuffer: Number.MAX_VALUE
20
    cacheBuffer: Number.MAX_VALUE
409
24
}
21
}
410
25
22
411
=== modified file 'qml/Dash/ScopeSettingsPage.qml'
412
--- qml/Dash/ScopeSettingsPage.qml	2014-09-30 15:02:23 +0000
413
+++ qml/Dash/ScopeSettingsPage.qml	2014-10-10 11:46:46 +0000
414
@@ -18,6 +18,7 @@
415
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.1
416
19
import Unity 0.2
19
import Unity 0.2
417
20
import "../Components"
20
import "../Components"
418
21
import "../Components/Flickables" as Flickables
419
21
import "ScopeSettings"
22
import "ScopeSettings"
420
22
23
421
23
Item {
24
Item {
422
@@ -39,7 +40,7 @@
423
39
        onBackClicked: root.backClicked()
40
        onBackClicked: root.backClicked()
424
40
    }
41
    }
425
41
42
427
42
    ListView {
43
    Flickables.ListView {
428
43
        id: scopeSettings
44
        id: scopeSettings
429
44
        objectName: "scopeSettings"
45
        objectName: "scopeSettings"
430
45
        anchors {
46
        anchors {
431
46
47
432
=== modified file 'qml/Dash/ScopesOverviewAll.qml'
433
--- qml/Dash/ScopesOverviewAll.qml	2014-09-19 10:36:07 +0000
434
+++ qml/Dash/ScopesOverviewAll.qml	2014-10-10 11:46:46 +0000
435
@@ -16,8 +16,9 @@
436
16
16
437
17
import QtQuick 2.0
17
import QtQuick 2.0
438
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
439
19
import "../Components/Flickables" as Flickables
440
19
20
442
20
Flickable {
21
Flickables.Flickable {
443
21
    id: root
22
    id: root
444
22
23
445
23
    property alias model: cardGrid.model
24
    property alias model: cardGrid.model
446
24
25
447
=== modified file 'qml/Dash/ScopesOverviewFavorites.qml'
448
--- qml/Dash/ScopesOverviewFavorites.qml	2014-09-04 16:54:15 +0000
449
+++ qml/Dash/ScopesOverviewFavorites.qml	2014-10-10 11:46:46 +0000
450
@@ -14,9 +14,11 @@
451
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
452
15
 */
15
 */
453
16
16
455
17
import QtQuick 2.0
17
import QtQuick 2.3
456
18
import Ubuntu.Components 1.1
457
19
import "../Components/Flickables" as Flickables
458
18
20
460
19
Flickable {
21
Flickables.Flickable {
461
20
    id: root
22
    id: root
462
21
23
463
22
    signal clicked(int index, var result, var itemModel)
24
    signal clicked(int index, var result, var itemModel)
464
23
25
465
=== modified file 'qml/Greeter/LoginList.qml'
466
--- qml/Greeter/LoginList.qml	2014-10-08 19:17:28 +0000
467
+++ qml/Greeter/LoginList.qml	2014-10-10 11:46:46 +0000
468
@@ -18,6 +18,7 @@
469
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
470
19
import LightDM 0.1 as LightDM
19
import LightDM 0.1 as LightDM
471
20
import "../Components"
20
import "../Components"
472
21
import "../Components/Flickables" as Flickables
473
21
22
474
22
Item {
23
Item {
475
23
    id: root
24
    id: root
476
@@ -68,7 +69,7 @@
477
68
        antialiasing: true
69
        antialiasing: true
478
69
    }
70
    }
479
70
71
481
71
    ListView {
72
    Flickables.ListView {
482
72
        id: userList
73
        id: userList
483
73
        objectName: "userList"
74
        objectName: "userList"
484
74
75
485
@@ -78,7 +79,6 @@
486
78
        preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
79
        preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
487
79
        highlightRangeMode: ListView.StrictlyEnforceRange
80
        highlightRangeMode: ListView.StrictlyEnforceRange
488
80
        highlightMoveDuration: root.moveDuration
81
        highlightMoveDuration: root.moveDuration
489
81
        flickDeceleration: 10000
490
82
82
491
83
        readonly property bool movingInternally: moveTimer.running || userList.moving
83
        readonly property bool movingInternally: moveTimer.running || userList.moving
492
84
84
493
85
85
494
=== modified file 'qml/Hud/Hud.qml'
495
--- qml/Hud/Hud.qml	2014-06-11 15:36:51 +0000
496
+++ qml/Hud/Hud.qml	2014-10-10 11:46:46 +0000
497
@@ -19,6 +19,7 @@
498
19
import HudClient 0.1
19
import HudClient 0.1
499
20
20
500
21
import "../Components"
21
import "../Components"
501
22
import "../Components/Flickables" as Flickables
502
22
23
503
23
Item {
24
Item {
504
24
    id: hud
25
    id: hud
505
@@ -400,7 +401,7 @@
506
400
                    }
401
                    }
507
401
                    progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1)
402
                    progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1)
508
402
403
510
403
                    Flickable {
404
                    Flickables.Flickable {
511
404
                        anchors.left: parent.left
405
                        anchors.left: parent.left
512
405
                        anchors.right: parent.right
406
                        anchors.right: parent.right
513
406
                        contentHeight: resultList.height
407
                        contentHeight: resultList.height
514
407
408
515
=== modified file 'qml/Hud/HudParametrizedActionsPage.qml'
516
--- qml/Hud/HudParametrizedActionsPage.qml	2014-08-13 11:56:16 +0000
517
+++ qml/Hud/HudParametrizedActionsPage.qml	2014-10-10 11:46:46 +0000
518
@@ -18,6 +18,7 @@
519
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.1
520
19
import Ubuntu.Components.Themes.Ambiance 1.1
19
import Ubuntu.Components.Themes.Ambiance 1.1
521
20
import "../Components"
20
import "../Components"
522
21
import "../Components/Flickables" as Flickables
523
21
22
524
22
Item {
23
Item {
525
23
    property alias header: header.title
24
    property alias header: header.title
526
@@ -74,7 +75,7 @@
527
74
        return values
75
        return values
528
75
    }
76
    }
529
76
77
531
77
    Flickable {
78
    Flickables.Flickable {
532
78
        anchors.top: parent.top
79
        anchors.top: parent.top
533
79
        anchors.bottom: buttons.top
80
        anchors.bottom: buttons.top
534
80
        anchors.left: parent.left
81
        anchors.left: parent.left
535
81
82
536
=== modified file 'qml/Launcher/LauncherPanel.qml'
537
--- qml/Launcher/LauncherPanel.qml	2014-10-07 08:25:59 +0000
538
+++ qml/Launcher/LauncherPanel.qml	2014-10-10 11:46:46 +0000
539
@@ -21,6 +21,7 @@
540
21
import Ubuntu.Components.Popups 0.1
21
import Ubuntu.Components.Popups 0.1
541
22
import "../Components/ListItems"
22
import "../Components/ListItems"
542
23
import "../Components/"
23
import "../Components/"
543
24
import "../Components/Flickables" as Flickables
544
24
25
545
25
Rectangle {
26
Rectangle {
546
26
    id: root
27
    id: root
547
@@ -74,7 +75,7 @@
548
74
                anchors.fill: parent
75
                anchors.fill: parent
549
75
                clip: true
76
                clip: true
550
76
77
552
77
                ListView {
78
                Flickables.ListView {
553
78
                    id: launcherListView
79
                    id: launcherListView
554
79
                    objectName: "launcherListView"
80
                    objectName: "launcherListView"
555
80
                    anchors {
81
                    anchors {
556
81
82
557
=== modified file 'qml/Notifications/Notification.qml'
558
--- qml/Notifications/Notification.qml	2014-09-18 21:25:00 +0000
559
+++ qml/Notifications/Notification.qml	2014-10-10 11:46:46 +0000
560
@@ -20,6 +20,7 @@
561
20
import Unity.Notifications 1.0
20
import Unity.Notifications 1.0
562
21
import QMenuModel 0.1
21
import QMenuModel 0.1
563
22
import Utils 0.1
22
import Utils 0.1
564
23
import "../Components/Flickables" as Flickables
565
23
24
566
24
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 0.1 as ListItem
567
25
26
568
@@ -455,7 +456,7 @@
569
455
                onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
456
                onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
570
456
                expanded: false
457
                expanded: false
571
457
                expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
458
                expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
573
458
                comboList: Flickable {
459
                comboList: Flickables.Flickable {
574
459
                    // this has to be wrapped inside a flickable
460
                    // this has to be wrapped inside a flickable
575
460
                    // to work around a feature/bug? of the
461
                    // to work around a feature/bug? of the
576
461
                    // ComboButton SDK-element, making a regular
462
                    // ComboButton SDK-element, making a regular
577
462
463
578
=== modified file 'qml/Notifications/Notifications.qml'
579
--- qml/Notifications/Notifications.qml	2014-08-25 11:31:05 +0000
580
+++ qml/Notifications/Notifications.qml	2014-10-10 11:46:46 +0000
581
@@ -19,8 +19,9 @@
582
19
import Unity.Notifications 1.0 as UnityNotifications
19
import Unity.Notifications 1.0 as UnityNotifications
583
20
import Utils 0.1
20
import Utils 0.1
584
21
import "../Components"
21
import "../Components"
585
22
import "../Components/Flickables" as Flickables
586
22
23
588
23
ListView {
24
Flickables.ListView {
589
24
    id: notificationList
25
    id: notificationList
590
25
26
591
26
    objectName: "notificationList"
27
    objectName: "notificationList"
592
27
28
593
=== modified file 'qml/Panel/IndicatorRow.qml'
594
--- qml/Panel/IndicatorRow.qml	2014-05-07 13:59:58 +0000
595
+++ qml/Panel/IndicatorRow.qml	2014-10-10 11:46:46 +0000
596
@@ -18,6 +18,7 @@
597
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
598
19
import Unity.Indicators 0.1 as Indicators
19
import Unity.Indicators 0.1 as Indicators
599
20
import "../Components"
20
import "../Components"
600
21
import "../Components/Flickables" as Flickables
601
21
22
602
22
Item {
23
Item {
603
23
    id: indicatorRow
24
    id: indicatorRow
604
@@ -60,7 +61,7 @@
605
60
        }
61
        }
606
61
    }
62
    }
607
62
63
609
63
    ListView {
64
    Flickables.ListView {
610
64
        id: itemView
65
        id: itemView
611
65
        objectName: "indicatorRowItems"
66
        objectName: "indicatorRowItems"
612
66
        interactive: false
67
        interactive: false
613
67
68
614
=== modified file 'qml/Panel/Indicators/DefaultIndicatorPage.qml'
615
--- qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-09-29 10:24:58 +0000
616
+++ qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-10-10 11:46:46 +0000
617
@@ -21,6 +21,7 @@
618
21
import QtQuick 2.0
21
import QtQuick 2.0
619
22
import Ubuntu.Components 0.1 as Components
22
import Ubuntu.Components 0.1 as Components
620
23
import Unity.Indicators 0.1 as Indicators
23
import Unity.Indicators 0.1 as Indicators
621
24
import "../../Components/Flickables" as Flickables
622
24
25
623
25
IndicatorBase {
26
IndicatorBase {
624
26
    id: main
27
    id: main
625
@@ -65,7 +66,7 @@
626
65
        }
66
        }
627
66
    }
67
    }
628
67
68
630
68
    ListView {
69
    Flickables.ListView {
631
69
        id: mainMenu
70
        id: mainMenu
632
70
        objectName: "mainMenu"
71
        objectName: "mainMenu"
633
71
        model: menuStack.rootMenu
72
        model: menuStack.rootMenu
634
72
73
635
=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
636
--- qml/Panel/Indicators/client/IndicatorsList.qml	2014-01-30 14:54:01 +0000
637
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2014-10-10 11:46:46 +0000
638
@@ -22,6 +22,7 @@
639
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 0.1 as ListItem
640
23
import Unity.Indicators 0.1 as Indicators
23
import Unity.Indicators 0.1 as Indicators
641
24
import "../.."
24
import "../.."
642
25
import "../../../Components/Flickables" as Flickables
643
25
26
644
26
Page {
27
Page {
645
27
    id: page
28
    id: page
646
@@ -35,7 +36,7 @@
647
35
        Component.onCompleted: load(profile)
36
        Component.onCompleted: load(profile)
648
36
    }
37
    }
649
37
38
651
38
    ListView {
39
    Flickables.ListView {
652
39
        id: mainMenu
40
        id: mainMenu
653
40
        objectName: "mainMenu"
41
        objectName: "mainMenu"
654
41
        anchors.fill: parent
42
        anchors.fill: parent
655
42
43
656
=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
657
--- qml/Panel/Indicators/client/IndicatorsTree.qml	2013-11-24 02:23:56 +0000
658
+++ qml/Panel/Indicators/client/IndicatorsTree.qml	2014-10-10 11:46:46 +0000
659
@@ -22,6 +22,7 @@
660
22
import Unity.Indicators 0.1 as Indicators
22
import Unity.Indicators 0.1 as Indicators
661
23
import QMenuModel 0.1
23
import QMenuModel 0.1
662
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 0.1 as ListItem
663
25
import "../../../Components/Flickables" as Flickables
664
25
26
665
26
Page {
27
Page {
666
27
    id: page
28
    id: page
667
@@ -52,7 +53,7 @@
668
52
        model: unityModel
53
        model: unityModel
669
53
    }
54
    }
670
54
55
672
55
    Flickable {
56
    Flickables.Flickable {
673
56
        anchors.fill: parent
57
        anchors.fill: parent
674
57
        contentHeight: all_data.height
58
        contentHeight: all_data.height
675
58
        clip:true
59
        clip:true
676
59
60
677
=== modified file 'qml/Panel/MenuContent.qml'
678
--- qml/Panel/MenuContent.qml	2014-09-29 10:24:58 +0000
679
+++ qml/Panel/MenuContent.qml	2014-10-10 11:46:46 +0000
680
@@ -20,6 +20,7 @@
681
20
import Unity.Indicators 0.1 as Indicators
20
import Unity.Indicators 0.1 as Indicators
682
21
import Utils 0.1
21
import Utils 0.1
683
22
import "../Components"
22
import "../Components"
684
23
import "../Components/Flickables" as Flickables
685
23
import "Indicators"
24
import "Indicators"
686
24
25
687
25
Rectangle {
26
Rectangle {
688
@@ -39,7 +40,7 @@
689
39
        listViewHeader.currentIndex = index;
40
        listViewHeader.currentIndex = index;
690
40
    }
41
    }
691
41
42
693
42
    ListView {
43
    Flickables.ListView {
694
43
        id: listViewHeader
44
        id: listViewHeader
695
44
        objectName: "indicatorsHeaderListView"
45
        objectName: "indicatorsHeaderListView"
696
45
        model: content.indicatorsModel
46
        model: content.indicatorsModel
697
@@ -80,7 +81,7 @@
698
80
        }
81
        }
699
81
    }
82
    }
700
82
83
702
83
    ListView {
84
    Flickables.ListView {
703
84
        id: listViewContent
85
        id: listViewContent
704
85
        objectName: "indicatorsContentListView"
86
        objectName: "indicatorsContentListView"
705
86
        anchors {
87
        anchors {
706
87
88
707
=== modified file 'qml/Stages/PhoneStage.qml'
708
--- qml/Stages/PhoneStage.qml	2014-10-07 18:18:44 +0000
709
+++ qml/Stages/PhoneStage.qml	2014-10-10 11:46:46 +0000
710
@@ -21,6 +21,7 @@
711
21
import Unity.Session 0.1
21
import Unity.Session 0.1
712
22
import Utils 0.1
22
import Utils 0.1
713
23
import "../Components"
23
import "../Components"
714
24
import "../Components/Flickables" as Flickables
715
24
25
716
25
Rectangle {
26
Rectangle {
717
26
    id: root
27
    id: root
718
@@ -120,7 +121,7 @@
719
120
121
720
121
    }
122
    }
721
122
123
723
123
    Flickable {
124
    Flickables.Flickable {
724
124
        id: spreadView
125
        id: spreadView
725
125
        objectName: "spreadView"
126
        objectName: "spreadView"
726
126
        anchors.fill: parent
127
        anchors.fill: parent
727
127
128
728
=== modified file 'qml/Stages/TabletStage.qml'
729
--- qml/Stages/TabletStage.qml	2014-10-07 18:39:38 +0000
730
+++ qml/Stages/TabletStage.qml	2014-10-10 11:46:46 +0000
731
@@ -20,6 +20,7 @@
732
20
import Unity.Application 0.1
20
import Unity.Application 0.1
733
21
import Utils 0.1
21
import Utils 0.1
734
22
import "../Components"
22
import "../Components"
735
23
import "../Components/Flickables" as Flickables
736
23
24
737
24
Rectangle {
25
Rectangle {
738
25
    id: root
26
    id: root
739
@@ -153,7 +154,7 @@
740
153
        }
154
        }
741
154
    }
155
    }
742
155
156
744
156
    Flickable {
157
    Flickables.Flickable {
745
157
        id: spreadView
158
        id: spreadView
746
158
        anchors.fill: parent
159
        anchors.fill: parent
747
159
        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
160
        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-10-10	Needs Fixing on 2014-10-10
Albert Astals Cid (community)		2014-10-10	Approve on 2014-10-10
Review via email: mp+237944@code.launchpad.net