1
=== modified file 'debian/control'
2
--- debian/control	2014-11-17 10:09:40 +0000
3
+++ debian/control	2014-12-01 15:53:18 +0000
4
@@ -173,7 +173,6 @@
5
173
         libhardware2,
173
         libhardware2,
6
174
         unity-schemas (>= 7.3.1+14.10.20140915),
174
         unity-schemas (>= 7.3.1+14.10.20140915),
7
175
         pay-service,
175
         pay-service,
8
176
         qml-module-ubuntu-connectivity,
9
177
         ${misc:Depends},
176
         ${misc:Depends},
10
178
         ${shlibs:Depends},
177
         ${shlibs:Depends},
11
179
Provides: unity-launcher-impl,
178
Provides: unity-launcher-impl,
12
180
179
13
=== modified file 'plugins/Dash/CardCreator.js'
14
--- plugins/Dash/CardCreator.js	2014-12-01 15:53:18 +0000
15
+++ plugins/Dash/CardCreator.js	2014-12-01 15:53:18 +0000
16
@@ -85,8 +85,7 @@
17
85
                                    CroppedImageMinimumSourceSize { \n\
85
                                    CroppedImageMinimumSourceSize { \n\
18
86
                                        id: artImage; \n\
86
                                        id: artImage; \n\
19
87
                                        objectName: "artImage"; \n\
87
                                        objectName: "artImage"; \n\
22
88
                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
88
                                        source: cardData && cardData["art"] || ""; \n\
21
89
                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
23
90
                                        asynchronous: root.asynchronous; \n\
89
                                        asynchronous: root.asynchronous; \n\
24
91
                                        visible: false; \n\
90
                                        visible: false; \n\
25
92
                                        width: %2; \n\
91
                                        width: %2; \n\
26
@@ -196,8 +195,7 @@
27
196
                            id: mascotImage; \n\
195
                            id: mascotImage; \n\
28
197
                            objectName: "mascotImage"; \n\
196
                            objectName: "mascotImage"; \n\
29
198
                            anchors { %1 } \n\
197
                            anchors { %1 } \n\
32
199
                            property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
198
                            source: cardData && cardData["mascot"] || ""; \n\
31
200
                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
33
201
                            width: units.gu(6); \n\
199
                            width: units.gu(6); \n\
34
202
                            height: units.gu(5.625); \n\
200
                            height: units.gu(5.625); \n\
35
203
                            horizontalAlignment: Image.AlignHCenter; \n\
201
                            horizontalAlignment: Image.AlignHCenter; \n\
36
@@ -656,7 +654,6 @@
37
656
    var imports = 'import QtQuick 2.2; \n\
654
    var imports = 'import QtQuick 2.2; \n\
38
657
                   import Ubuntu.Components 1.1; \n\
655
                   import Ubuntu.Components 1.1; \n\
39
658
                   import Ubuntu.Settings.Components 0.1; \n\
656
                   import Ubuntu.Settings.Components 0.1; \n\
40
659
                   import Ubuntu.Connectivity 1.0; \n\
41
660
                   import Dash 0.1;\n\
657
                   import Dash 0.1;\n\
42
661
                   import Utils 0.1;\n';
658
                   import Utils 0.1;\n';
43
662
    var card = cardString(template, components);
659
    var card = cardString(template, components);
44
663
660
45
=== modified file 'plugins/Dash/CroppedImageMinimumSourceSize.qml'
46
--- plugins/Dash/CroppedImageMinimumSourceSize.qml	2014-12-01 15:53:18 +0000
47
+++ plugins/Dash/CroppedImageMinimumSourceSize.qml	2014-12-01 15:53:18 +0000
48
@@ -39,6 +39,6 @@
49
39
        anchors.fill: parent
39
        anchors.fill: parent
50
40
        fillMode: Image.PreserveAspectCrop
40
        fillMode: Image.PreserveAspectCrop
51
41
        sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize
41
        sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize
53
42
        source: sourceSize.width == -1 && sourceSize.height == -1 ? "" : root.source
42
        source: sizer.sourceSize.width == -1 && sizer.sourceSize.height == -1 ? "" : root.source
54
43
    }
43
    }
55
44
}
44
}
56
45
45
57
=== modified file 'plugins/Dash/croppedimagesizer.cpp'
58
--- plugins/Dash/croppedimagesizer.cpp	2014-12-01 15:53:18 +0000
59
+++ plugins/Dash/croppedimagesizer.cpp	2014-12-01 15:53:18 +0000
60
@@ -24,6 +24,9 @@
61
24
#include <QQuickView>
24
#include <QQuickView>
62
25
25
63
26
CroppedImageSizer::CroppedImageSizer()
26
CroppedImageSizer::CroppedImageSizer()
64
27
 : m_width(0),
65
28
   m_height(0),
66
29
   m_sourceSize(QSize(-1, -1))
67
27
{
30
{
68
28
    connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
31
    connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
69
29
    connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);
32
    connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);
70
30
33
71
=== modified file 'plugins/Dash/croppedimagesizer.h'
72
--- plugins/Dash/croppedimagesizer.h	2014-12-01 15:53:18 +0000
73
+++ plugins/Dash/croppedimagesizer.h	2014-12-01 15:53:18 +0000
74
@@ -61,9 +61,9 @@
75
61
61
76
62
private:
62
private:
77
63
    QUrl m_source;
63
    QUrl m_source;
81
64
    qreal m_width = 0;
64
    qreal m_width;
82
65
    qreal m_height = 0;
65
    qreal m_height;
83
66
    QSize m_sourceSize = QSize(-1, -1);
66
    QSize m_sourceSize;
84
67
    QSize m_imageSize;
67
    QSize m_imageSize;
85
68
    QNetworkReply *m_reply = nullptr;
68
    QNetworkReply *m_reply = nullptr;
86
69
};
69
};
87
70
70
88
=== modified file 'qml/Dash/CardCarousel.qml'
89
--- qml/Dash/CardCarousel.qml	2014-09-12 09:31:56 +0000
90
+++ qml/Dash/CardCarousel.qml	2014-12-01 15:53:18 +0000
91
@@ -52,6 +52,7 @@
92
52
            function pressAndHold() { cardCarousel.pressAndHold(index, model.result, model) }
52
            function pressAndHold() { cardCarousel.pressAndHold(index, model.result, model) }
93
53
53
94
54
            sourceComponent: cardTool.cardComponent
54
            sourceComponent: cardTool.cardComponent
95
55
            asynchronous: true
96
55
            onLoaded: {
56
            onLoaded: {
97
56
                item.fixedHeaderHeight = Qt.binding(function() { return carousel.headerHeight; });
57
                item.fixedHeaderHeight = Qt.binding(function() { return carousel.headerHeight; });
98
57
                item.height = Qt.binding(function() { return cardTool.cardHeight; });
58
                item.height = Qt.binding(function() { return cardTool.cardHeight; });
99
58
59
100
=== modified file 'qml/Dash/CardGrid.qml'
101
--- qml/Dash/CardGrid.qml	2014-09-30 09:23:23 +0000
102
+++ qml/Dash/CardGrid.qml	2014-12-01 15:53:18 +0000
103
@@ -55,11 +55,11 @@
104
55
        delegate: Item {
55
        delegate: Item {
105
56
            width: grid.cellWidth
56
            width: grid.cellWidth
106
57
            height: grid.cellHeight
57
            height: grid.cellHeight
107
58
            visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
108
59
            Loader {
58
            Loader {
109
60
                id: loader
59
                id: loader
110
61
                sourceComponent: cardTool.cardComponent
60
                sourceComponent: cardTool.cardComponent
111
62
                anchors.horizontalCenter: parent.horizontalCenter
61
                anchors.horizontalCenter: parent.horizontalCenter
112
62
                asynchronous: true
113
63
                onLoaded: {
63
                onLoaded: {
114
64
                    item.objectName = "delegate" + index;
64
                    item.objectName = "delegate" + index;
115
65
                    item.width = Qt.binding(function() { return cardTool.cardWidth; });
65
                    item.width = Qt.binding(function() { return cardTool.cardWidth; });
116
66
66
117
=== modified file 'qml/Dash/CardHorizontalList.qml'
118
--- qml/Dash/CardHorizontalList.qml	2014-10-23 11:59:22 +0000
119
+++ qml/Dash/CardHorizontalList.qml	2014-12-01 15:53:18 +0000
120
@@ -42,6 +42,7 @@
121
42
            sourceComponent: cardTool.cardComponent
42
            sourceComponent: cardTool.cardComponent
122
43
            anchors { top: parent.top; bottom: parent.bottom }
43
            anchors { top: parent.top; bottom: parent.bottom }
123
44
            width: cardTool.cardWidth
44
            width: cardTool.cardWidth
124
45
            asynchronous: true
125
45
            onLoaded: {
46
            onLoaded: {
126
46
                item.objectName = "delegate" + index;
47
                item.objectName = "delegate" + index;
127
47
                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
48
                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
128
48
49
129
=== modified file 'qml/Dash/CardVerticalJournal.qml'
130
--- qml/Dash/CardVerticalJournal.qml	2014-10-15 15:03:51 +0000
131
+++ qml/Dash/CardVerticalJournal.qml	2014-12-01 15:53:18 +0000
132
@@ -66,7 +66,6 @@
133
66
            id: loader
66
            id: loader
134
67
            sourceComponent: cardTool.cardComponent
67
            sourceComponent: cardTool.cardComponent
135
68
            width: cardTool.cardWidth
68
            width: cardTool.cardWidth
136
69
            visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
137
70
            onLoaded: {
69
            onLoaded: {
138
71
                item.objectName = "delegate" + index;
70
                item.objectName = "delegate" + index;
139
72
                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
71
                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
140
73
72
141
=== modified file 'qml/Dash/DashRenderer.qml'
142
--- qml/Dash/DashRenderer.qml	2014-10-02 09:53:26 +0000
143
+++ qml/Dash/DashRenderer.qml	2014-12-01 15:53:18 +0000
144
@@ -27,10 +27,6 @@
145
27
27
146
28
    property int displayMarginEnd: 0
28
    property int displayMarginEnd: 0
147
29
29
148
30
    property int visibleRangeBegin: 0
149
31
150
32
    property int visibleRangeEnd: 0
151
33
152
34
    property real originY: 0
30
    property real originY: 0
153
35
31
154
36
    // The model to renderer
32
    // The model to renderer
155
37
33
156
=== modified file 'qml/Dash/GenericScopeView.qml'
157
--- qml/Dash/GenericScopeView.qml	2014-11-04 12:52:02 +0000
158
+++ qml/Dash/GenericScopeView.qml	2014-12-01 15:53:18 +0000
159
@@ -379,32 +379,29 @@
160
379
                        }
379
                        }
161
380
                    }
380
                    }
162
381
381
163
382
                    if (item && item.hasOwnProperty("visibleRangeBegin")) {
164
383
                        item.visibleRangeBegin = Math.max(-baseItem.y, 0)
165
384
                        item.visibleRangeEnd = item.visibleRangeBegin + Math.min(categoryView.height, rendererLoader.height)
166
385
                    }
167
386
168
387
                    if (item && item.hasOwnProperty("displayMarginBeginning")) {
382
                    if (item && item.hasOwnProperty("displayMarginBeginning")) {
189
388
                        // TODO do we need item.originY here, test 1300302 once we have a silo
383
                        // A item view is considered visible from
190
389
                        // and we can run it on the phone
384
                        //     -displayMarginBeginning
191
390
                        if (scopeView.isCurrent) {
385
                        // to
192
391
                            // 1073741823 is s^30 -1. A quite big number so that you have "infinite" display margin, but not so
386
                        //     height + item.displayMarginEnd
193
392
                            // big so that if you add if with itself you're outside the 2^31 int range
387
                        // We adjust displayMarginBeginning and displayMarginEnd so
194
393
                            item.displayMarginBeginning = 1073741823;
388
                        //   * In non visible scopes only the viewport is considered visible
195
394
                            item.displayMarginEnd = 1073741823;
389
                        //     that way when you switch to it the visible items are there
196
395
                        } else if (baseItem.y + baseItem.height <= 0) {
390
                        //   * For visible scopes we increase the visible range by categoryView.height * 1.5
197
396
                            // Not visible (item at top of the list viewport)
391
                        //     in both directions to make scrolling nicer by mantaining a higher number of
198
397
                            item.displayMarginBeginning = -baseItem.height;
392
                        //     cached items
199
398
                            item.displayMarginEnd = 0;
393
                        // TODO Improvements
200
399
                        } else if (baseItem.y >= categoryView.height) {
394
                        //  - For non visible scopes we should always have a visible range of 0 and
201
400
                            // Not visible (item at bottom of the list viewport)
395
                        //    make sure the items in the viewport are created with the cache buffer feature
202
401
                            item.displayMarginBeginning = 0;
396
                        //  - For visible scopes we should always the have a visible range be exactly the
203
402
                            item.displayMarginEnd = -baseItem.height;
397
                        //    viewport and make sure the rest of items are created with the cache buffer feature
204
403
                        } else {
398
                        //  To be able to implement that feature VerticalJournal/AbstractDashView needs to
205
404
                            item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y, 0));
399
                        //  make the cache buffer value setable externally
206
405
                            item.displayMarginEnd = -Math.round(Math.max(baseItem.height - seeAll.height -
400
                        var extraMargins = scopeView.isCurrent ? categoryView.height * 1.5 : 0;
207
406
                                                                         categoryView.height + baseItem.y, 0));
401
208
407
                        }
402
                        item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y - extraMargins, 0));
209
403
                        item.displayMarginEnd = -Math.round(Math.max(baseItem.height - extraMargins - seeAll.height -
210
404
                                                                        categoryView.height + baseItem.y, 0));
211
408
                    }
405
                    }
212
409
                }
406
                }
213
410
            }
407
            }
214
411
408
215
=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
216
--- qml/Dash/Previews/PreviewZoomableImage.qml	2014-10-22 17:35:15 +0000
217
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2014-12-01 15:53:18 +0000
218
@@ -40,6 +40,7 @@
219
40
        }
40
        }
220
41
        scaleTo: "height"
41
        scaleTo: "height"
221
42
        source: widgetData["source"]
42
        source: widgetData["source"]
222
43
        asynchronous: true
223
43
44
224
44
        borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"
45
        borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"
225
45
46
226
46
47
227
=== modified file 'qml/Dash/ScopesOverviewAll.qml'
228
--- qml/Dash/ScopesOverviewAll.qml	2014-10-23 11:59:22 +0000
229
+++ qml/Dash/ScopesOverviewAll.qml	2014-12-01 15:53:18 +0000
230
@@ -43,8 +43,6 @@
231
43
        id: cardGrid
43
        id: cardGrid
232
44
        width: root.width
44
        width: root.width
233
45
        height: parent.height
45
        height: parent.height
234
46
        visibleRangeBegin: root.contentY
235
47
        visibleRangeEnd: root.contentY + root.height
236
48
46
237
49
        onClicked: {
47
        onClicked: {
238
50
            root.clicked(index, result, item, itemModel);
48
            root.clicked(index, result, item, itemModel);
239
51
49
240
=== renamed file 'qml/graphics/applicationIcons/dash@18.png' => 'qml/graphics/applicationIcons/dash.png'
241
=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
242
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-10-30 14:38:28 +0000
243
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-12-01 15:53:18 +0000
244
@@ -204,7 +204,7 @@
245
204
204
246
205
        """
205
        """
247
206
        category_element = self._get_category_element(category)
206
        category_element = self._get_category_element(category)
249
207
        icon = category_element.select_single('AbstractButton', title=title)
207
        icon = category_element.wait_select_single('AbstractButton', title=title)
250
208
        self.pointing_device.click_object(icon)
208
        self.pointing_device.click_object(icon)
251
209
209
252
210
    def _get_category_element(self, category):
210
    def _get_category_element(self, category):
253
211
211
254
=== modified file 'tests/plugins/Dash/cardcreator/1.res'
255
--- tests/plugins/Dash/cardcreator/1.res	2014-12-01 15:53:18 +0000
256
+++ tests/plugins/Dash/cardcreator/1.res	2014-12-01 15:53:18 +0000
257
@@ -49,8 +49,7 @@
258
49
                                    CroppedImageMinimumSourceSize {
49
                                    CroppedImageMinimumSourceSize {
259
50
                                        id: artImage;
50
                                        id: artImage;
260
51
                                        objectName: "artImage"; 
51
                                        objectName: "artImage"; 
263
52
                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
52
                                        source: cardData && cardData["art"] || ""; 
262
53
                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
264
54
                                        asynchronous: root.asynchronous; 
53
                                        asynchronous: root.asynchronous; 
265
55
                                        visible: false; 
54
                                        visible: false; 
266
56
                                        width: root.width; 
55
                                        width: root.width; 
267
57
56
268
=== modified file 'tests/plugins/Dash/cardcreator/2.res'
269
--- tests/plugins/Dash/cardcreator/2.res	2014-12-01 15:53:18 +0000
270
+++ tests/plugins/Dash/cardcreator/2.res	2014-12-01 15:53:18 +0000
271
@@ -68,8 +68,7 @@
272
68
                            id: mascotImage; 
68
                            id: mascotImage; 
273
69
                            objectName: "mascotImage"; 
69
                            objectName: "mascotImage"; 
274
70
                            anchors { verticalCenter: parent.verticalCenter; } 
70
                            anchors { verticalCenter: parent.verticalCenter; } 
277
71
                            property bool doLoadSource: !NetworkingStatus.limitedBandwith;
71
                            source: cardData && cardData["mascot"] || ""; 
276
72
                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
278
73
                            width: units.gu(6); 
72
                            width: units.gu(6); 
279
74
                            height: units.gu(5.625); 
73
                            height: units.gu(5.625); 
280
75
                            horizontalAlignment: Image.AlignHCenter; 
74
                            horizontalAlignment: Image.AlignHCenter; 
281
76
75
282
=== modified file 'tests/plugins/Dash/cardcreator/3.res'
283
--- tests/plugins/Dash/cardcreator/3.res	2014-12-01 15:53:18 +0000
284
+++ tests/plugins/Dash/cardcreator/3.res	2014-12-01 15:53:18 +0000
285
@@ -49,8 +49,7 @@
286
49
                                    CroppedImageMinimumSourceSize {
49
                                    CroppedImageMinimumSourceSize {
287
50
                                        id: artImage;
50
                                        id: artImage;
288
51
                                        objectName: "artImage";
51
                                        objectName: "artImage";
291
52
                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
52
                                        source: cardData && cardData["art"] || ""; 
290
53
                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
292
54
                                        asynchronous: root.asynchronous;
53
                                        asynchronous: root.asynchronous;
293
55
                                        visible: false;
54
                                        visible: false;
294
56
                                        width: root.width;
55
                                        width: root.width;
295
57
56
296
=== modified file 'tests/plugins/Dash/cardcreator/4.res'
297
--- tests/plugins/Dash/cardcreator/4.res	2014-12-01 15:53:18 +0000
298
+++ tests/plugins/Dash/cardcreator/4.res	2014-12-01 15:53:18 +0000
299
@@ -47,8 +47,7 @@
300
47
                    id: mascotImage; 
47
                    id: mascotImage; 
301
48
                    objectName: "mascotImage"; 
48
                    objectName: "mascotImage"; 
302
49
                    anchors { verticalCenter: parent.verticalCenter; }
49
                    anchors { verticalCenter: parent.verticalCenter; }
305
50
                    property bool doLoadSource: !NetworkingStatus.limitedBandwith;
50
                    source: cardData && cardData["mascot"] || ""; 
304
51
                    source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
306
52
                    width: units.gu(6);
51
                    width: units.gu(6);
307
53
                    height: units.gu(5.625); 
52
                    height: units.gu(5.625); 
308
54
                    horizontalAlignment: Image.AlignHCenter; 
53
                    horizontalAlignment: Image.AlignHCenter; 
309
55
54
310
=== modified file 'tests/plugins/Dash/cardcreator/5.res'
311
--- tests/plugins/Dash/cardcreator/5.res	2014-12-01 15:53:18 +0000
312
+++ tests/plugins/Dash/cardcreator/5.res	2014-12-01 15:53:18 +0000
313
@@ -49,8 +49,7 @@
314
49
                                    CroppedImageMinimumSourceSize {
49
                                    CroppedImageMinimumSourceSize {
315
50
                                        id: artImage;
50
                                        id: artImage;
316
51
                                        objectName: "artImage";
51
                                        objectName: "artImage";
319
52
                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
52
                                        source: cardData && cardData["art"] || ""; 
318
53
                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
320
54
                                        asynchronous: root.asynchronous;
53
                                        asynchronous: root.asynchronous;
321
55
                                        visible: false;
54
                                        visible: false;
322
56
                                        width: root.width;
55
                                        width: root.width;
323
57
56
324
=== modified file 'tests/plugins/Dash/cardcreator/7.res'
325
--- tests/plugins/Dash/cardcreator/7.res	2014-12-01 15:53:18 +0000
326
+++ tests/plugins/Dash/cardcreator/7.res	2014-12-01 15:53:18 +0000
327
@@ -68,8 +68,7 @@
328
68
                            id: mascotImage; 
68
                            id: mascotImage; 
329
69
                            objectName: "mascotImage"; 
69
                            objectName: "mascotImage"; 
330
70
                            anchors { verticalCenter: parent.verticalCenter; } 
70
                            anchors { verticalCenter: parent.verticalCenter; } 
333
71
                            property bool doLoadSource: !NetworkingStatus.limitedBandwith;
71
                            source: cardData && cardData["mascot"] || ""; 
332
72
                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
334
73
                            width: units.gu(6);
72
                            width: units.gu(6);
335
74
                            height: units.gu(5.625); 
73
                            height: units.gu(5.625); 
336
75
                            horizontalAlignment: Image.AlignHCenter; 
74
                            horizontalAlignment: Image.AlignHCenter; 
337
76
75
338
=== modified file 'tests/qmltests/Dash/tst_Card.qml'
339
--- tests/qmltests/Dash/tst_Card.qml	2014-10-14 15:44:00 +0000
340
+++ tests/qmltests/Dash/tst_Card.qml	2014-12-01 15:53:18 +0000
341
@@ -17,7 +17,6 @@
342
17
import QtQuick 2.0
17
import QtQuick 2.0
343
18
import QtTest 1.0
18
import QtTest 1.0
344
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
345
20
import Ubuntu.Connectivity 1.0
346
21
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
347
22
import "../../../qml/Dash"
21
import "../../../qml/Dash"
348
23
import "CardHelpers.js" as Helpers
22
import "CardHelpers.js" as Helpers
349
@@ -221,7 +220,6 @@
350
221
220
351
222
        function init() {
221
        function init() {
352
223
            loader.visible = true;
222
            loader.visible = true;
353
224
            NetworkingStatus.limitedBandwith = false;
354
225
        }
223
        }
355
226
224
356
227
        function cleanup() {
225
        function cleanup() {
357
@@ -585,25 +583,5 @@
358
585
                verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));
583
                verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));
359
586
            }
584
            }
360
587
        }
585
        }
361
588
362
589
        function test_load_images_visibility_network_data() {
363
590
            return [
364
591
                { tag: "Visible, network", visible: true, limitedBandwith: false },
365
592
                { tag: "Visible, no network", visible: true, limitedBandwith: true },
366
593
                { tag: "Not Visible, network", visible: false, limitedBandwith: false },
367
594
                { tag: "Not Visible, no network", visible: false, limitedBandwith: true }
368
595
            ];
369
596
        }
370
597
371
598
        function test_load_images_visibility_network(data) {
372
599
            loader.visible = data.visible;
373
600
            NetworkingStatus.limitedBandwith = data.limitedBandwith;
374
601
375
602
            selector.selectedIndex = 0;
376
603
            waitForRendering(selector);
377
604
            waitForRendering(card);
378
605
379
606
            verify(data.visible || !data.limitedBandwith || artImage.source == "");
380
607
        }
381
608
    }
586
    }
382
609
}
587
}
383
610
588
384
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
385
--- tests/qmltests/Dash/tst_Dash.qml	2014-10-30 14:55:29 +0000
386
+++ tests/qmltests/Dash/tst_Dash.qml	2014-12-01 15:53:18 +0000
387
@@ -243,8 +243,10 @@
388
243
            tryCompare(scopesOverviewRepeater, "count", 0);
243
            tryCompare(scopesOverviewRepeater, "count", 0);
389
244
244
390
245
            // Click on a temp scope in the search
245
            // Click on a temp scope in the search
393
246
            var dashCategorysearchA = findChild(searchResultsViewer, "dashCategorysearchA");
246
            tryCompareFunction( function() {
394
247
            var cardTempScope = findChild(dashCategorysearchA, "delegate2");
247
                return findChild(findChild(searchResultsViewer, "dashCategorysearchA"), "delegate2") != null;
395
248
            }, true);
396
249
            var cardTempScope = findChild(findChild(searchResultsViewer, "dashCategorysearchA"), "delegate2");
397
248
            verify(cardTempScope, "Could not find delegate2");
250
            verify(cardTempScope, "Could not find delegate2");
398
249
251
399
250
            waitForRendering(cardTempScope);
252
            waitForRendering(cardTempScope);
400
251
253
401
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
402
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-11-24 11:28:41 +0000
403
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-12-01 15:53:18 +0000
404
@@ -293,6 +293,7 @@
405
293
                                    },
293
                                    },
406
294
                                    true);
294
                                    true);
407
295
                var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
295
                var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
408
296
                waitForRendering(tile);
409
296
                mouseClick(tile, tile.width / 2, tile.height / 2);
297
                mouseClick(tile, tile.width / 2, tile.height / 2);
410
297
                tryCompare(testCase.subPageLoader, "open", true);
298
                tryCompare(testCase.subPageLoader, "open", true);
411
298
                tryCompare(testCase.subPageLoader, "x", 0);
299
                tryCompare(testCase.subPageLoader, "x", 0);
Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Approve on 2014-12-02
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-12-01
Andrea Cimitan (community)	code	2014-10-28	Approve on 2014-11-20
Review via email: mp+239834@code.launchpad.net