1
=== modified file 'plugins/Dash/CardCreator.js'
2
--- plugins/Dash/CardCreator.js	2014-10-10 11:13:26 +0000
3
+++ plugins/Dash/CardCreator.js	2014-10-27 13:45:30 +0000
4
@@ -313,7 +313,9 @@
5
313
                readonly property string title: cardData && cardData["title"] || ""; \n\
313
                readonly property string title: cardData && cardData["title"] || ""; \n\
6
314
                property bool asynchronous: true; \n\
314
                property bool asynchronous: true; \n\
7
315
                property bool showHeader: true; \n\
315
                property bool showHeader: true; \n\
9
316
                implicitWidth: childrenRect.width; \n';
316
                implicitWidth: childrenRect.width; \n\
10
317
                enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true); \n\
11
318
                \n';
12
317
319
13
318
    var hasArt = components["art"] && components["art"]["field"] || false;
320
    var hasArt = components["art"] && components["art"]["field"] || false;
14
319
    var hasSummary = components["summary"] || false;
321
    var hasSummary = components["summary"] || false;
15
320
322
16
=== modified file 'tests/plugins/Dash/cardcreator/1.res'
17
--- tests/plugins/Dash/cardcreator/1.res	2014-10-06 08:01:08 +0000
18
+++ tests/plugins/Dash/cardcreator/1.res	2014-10-27 13:45:30 +0000
19
@@ -13,6 +13,8 @@
20
13
                property bool asynchronous: true; 
13
                property bool asynchronous: true; 
21
14
                property bool showHeader: true; 
14
                property bool showHeader: true; 
22
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
23
16
                enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true);
24
17
25
16
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
18
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
26
17
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
19
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
27
18
Item  { 
20
Item  { 
28
19
21
29
=== modified file 'tests/plugins/Dash/cardcreator/2.res'
30
--- tests/plugins/Dash/cardcreator/2.res	2014-10-10 11:13:26 +0000
31
+++ tests/plugins/Dash/cardcreator/2.res	2014-10-27 13:45:30 +0000
32
@@ -13,6 +13,8 @@
33
13
                property bool asynchronous: true; 
13
                property bool asynchronous: true; 
34
14
                property bool showHeader: true; 
14
                property bool showHeader: true; 
35
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
36
16
                enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true);
37
17
38
16
Loader {
18
Loader {
39
17
                                id: backgroundLoader; 
19
                                id: backgroundLoader; 
40
18
                                objectName: "backgroundLoader"; 
20
                                objectName: "backgroundLoader"; 
41
19
21
42
=== modified file 'tests/plugins/Dash/cardcreator/3.res'
43
--- tests/plugins/Dash/cardcreator/3.res	2014-10-06 08:01:08 +0000
44
+++ tests/plugins/Dash/cardcreator/3.res	2014-10-27 13:45:30 +0000
45
@@ -13,6 +13,8 @@
46
13
                property bool asynchronous: true; 
13
                property bool asynchronous: true; 
47
14
                property bool showHeader: true; 
14
                property bool showHeader: true; 
48
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
49
16
                enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true);
50
17
51
16
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
18
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
52
17
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
19
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
53
18
Item  { 
20
Item  { 
54
19
21
55
=== modified file 'tests/plugins/Dash/cardcreator/4.res'
56
--- tests/plugins/Dash/cardcreator/4.res	2014-10-06 08:01:08 +0000
57
+++ tests/plugins/Dash/cardcreator/4.res	2014-10-27 13:45:30 +0000
58
@@ -13,6 +13,8 @@
59
13
                property bool asynchronous: true; 
13
                property bool asynchronous: true; 
60
14
                property bool showHeader: true; 
14
                property bool showHeader: true; 
61
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
62
16
                enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true);
63
17
64
16
readonly property size artShapeSize: Qt.size(-1, -1);
18
readonly property size artShapeSize: Qt.size(-1, -1);
65
17
readonly property int headerHeight: row.height;
19
readonly property int headerHeight: row.height;
66
18
Row { 
20
Row { 
67
19
21
68
=== modified file 'tests/plugins/Dash/cardcreator/5.res'
69
--- tests/plugins/Dash/cardcreator/5.res	2014-10-10 11:13:26 +0000
70
+++ tests/plugins/Dash/cardcreator/5.res	2014-10-27 13:45:30 +0000
71
@@ -13,6 +13,8 @@
72
13
                property bool asynchronous: true; 
13
                property bool asynchronous: true; 
73
14
                property bool showHeader: true; 
14
                property bool showHeader: true; 
74
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
75
16
                enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true);
76
17
77
16
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
18
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
78
17
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
19
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
79
18
Item  { 
20
Item  { 
80
@@ -143,7 +145,7 @@
81
143
    id: touchdown; 
145
    id: touchdown; 
82
144
    objectName: "touchdown"; 
146
    objectName: "touchdown"; 
83
145
    anchors { fill: artShapeHolder } 
147
    anchors { fill: artShapeHolder } 
85
146
    visible: root.pressed; 
148
    visible: root.pressed;
86
147
    radius: "medium"; 
149
    radius: "medium"; 
87
148
    borderSource: "radius_pressed.sci" 
150
    borderSource: "radius_pressed.sci" 
88
149
}
151
}
89
150
152
90
=== modified file 'tests/plugins/Dash/cardcreator/6.res'
91
--- tests/plugins/Dash/cardcreator/6.res	2014-09-29 08:19:06 +0000
92
+++ tests/plugins/Dash/cardcreator/6.res	2014-10-27 13:45:30 +0000
93
@@ -13,6 +13,8 @@
94
13
                property bool asynchronous: true;
13
                property bool asynchronous: true;
95
14
                property bool showHeader: true;
14
                property bool showHeader: true;
96
15
                implicitWidth: childrenRect.width;
15
                implicitWidth: childrenRect.width;
97
16
                enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true);
98
17
99
16
Loader {
18
Loader {
100
17
                                id: backgroundLoader; 
19
                                id: backgroundLoader; 
101
18
                                objectName: "backgroundLoader"; 
20
                                objectName: "backgroundLoader"; 
102
19
21
103
=== modified file 'tests/plugins/Dash/cardcreator/7.res'
104
--- tests/plugins/Dash/cardcreator/7.res	2014-10-10 11:13:26 +0000
105
+++ tests/plugins/Dash/cardcreator/7.res	2014-10-27 13:45:30 +0000
106
@@ -13,6 +13,8 @@
107
13
                property bool asynchronous: true; 
13
                property bool asynchronous: true; 
108
14
                property bool showHeader: true; 
14
                property bool showHeader: true; 
109
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
110
16
                enabled: root.template == null ? true : (root.template["non-interactive"] !== undefined ? !root.template["non-interactive"] : true);
111
17
112
16
Loader {
18
Loader {
113
17
                                id: backgroundLoader; 
19
                                id: backgroundLoader; 
114
18
                                objectName: "backgroundLoader"; 
20
                                objectName: "backgroundLoader"; 
115
19
21
116
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
117
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-10-10 11:13:26 +0000
118
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-10-27 13:45:30 +0000
119
@@ -603,6 +603,39 @@
120
603
                spy.wait()
603
                spy.wait()
121
604
                compare(spy.count, 1)
604
                compare(spy.count, 1)
122
605
            }
605
            }
123
606
124
607
            function test_item_noninteractive() {
125
608
                waitForRendering(genericScopeView);
126
609
127
610
                var categoryListView = findChild(genericScopeView, "categoryListView");
128
611
                waitForRendering(categoryListView);
129
612
130
613
                var category0 = findChild(categoryListView, "dashCategory0");
131
614
                waitForRendering(category0);
132
615
133
616
                var cardTool = findChild(category0, "cardTool");
134
617
                var cardGrid = category0.item;
135
618
136
619
                cardTool.template["non-interactive"] = true;
137
620
                compare(cardGrid.cardTool.template["non-interactive"], true);
138
621
139
622
                var item0 = findChild(cardGrid, "delegate0");
140
623
                waitForRendering(item0);
141
624
                item0.template = cardTool.template;
142
625
                compare(item0.template["non-interactive"], true);
143
626
                compare(item0.enabled, false);
144
627
                var touchdown = findChild(item0, "touchdown");
145
628
146
629
                compare(touchdown.visible, false);
147
630
                mouseClick(item0, item0.width / 2, item0.height / 2);
148
631
                compare(touchdown.visible, false);
149
632
150
633
                cardTool.template["non-interactive"] = false;
151
634
                compare(cardGrid.cardTool.template["non-interactive"], false);
152
635
                item0.template = cardTool.template;
153
636
                compare(item0.template["non-interactive"], false);
154
637
                compare(item0.enabled, true);
155
638
            }
156
606
        }
639
        }
157
607
    }
640
    }
158
608
}
641
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-10-28
Albert Astals Cid (community)		2014-08-21	Approve on 2014-10-21
Review via email: mp+231746@code.launchpad.net