1
=== modified file 'plugins/Dash/CardCreator.js'
2
--- plugins/Dash/CardCreator.js	2014-07-09 19:44:44 +0000
3
+++ plugins/Dash/CardCreator.js	2014-07-24 16:23:16 +0000
4
@@ -224,7 +224,7 @@
5
224
                        }\n';
224
                        }\n';
6
225
225
7
226
// %1 is used as anchors of titleLabel
226
// %1 is used as anchors of titleLabel
9
227
// %1 is used as color of titleLabel
227
// %2 is used as color of titleLabel
10
228
// %3 is used as extra condition for visible of titleLabel
228
// %3 is used as extra condition for visible of titleLabel
11
229
var kTitleLabelCode = 'Label { \n\
229
var kTitleLabelCode = 'Label { \n\
12
230
                        id: titleLabel; \n\
230
                        id: titleLabel; \n\
13
@@ -242,6 +242,16 @@
14
242
                        horizontalAlignment: root.headerAlignment; \n\
242
                        horizontalAlignment: root.headerAlignment; \n\
15
243
                    }\n';
243
                    }\n';
16
244
244
17
245
// %1 is used as anchors of touchdown effect
18
246
var kTouchdownCode = 'UbuntuShape { \n\
19
247
                        id: touchdown; \n\
20
248
                        objectName: "touchdown"; \n\
21
249
                        anchors { %1 } \n\
22
250
                        visible: root.pressed; \n\
23
251
                        radius: "medium"; \n\
24
252
                        borderSource: "radius_pressed.sci" \n\
25
253
                    }\n';
26
254
27
245
// %1 is used as anchors of subtitleLabel
255
// %1 is used as anchors of subtitleLabel
28
246
// %2 is used as color of subtitleLabel
256
// %2 is used as color of subtitleLabel
29
247
var kSubtitleLabelCode = 'Label { \n\
257
var kSubtitleLabelCode = 'Label { \n\
30
@@ -504,6 +514,16 @@
31
504
        code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);
514
        code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);
32
505
    }
515
    }
33
506
516
34
517
    var touchdownAnchors;
35
518
    if (hasBackground) {
36
519
        touchdownAnchors = 'fill: backgroundLoader';
37
520
    } else if (hasArt && !hasMascot && !hasSummary) {
38
521
        touchdownAnchors = 'fill: artShapeHolder';
39
522
    } else {
40
523
        touchdownAnchors = 'fill: root'
41
524
    }
42
525
    code += kTouchdownCode.arg(touchdownAnchors);
43
526
44
507
    if (hasSummary) {
527
    if (hasSummary) {
45
508
        code += 'implicitHeight: summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
528
        code += 'implicitHeight: summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
46
509
    } else if (hasHeaderRow) {
529
    } else if (hasHeaderRow) {
47
510
530
48
=== modified file 'tests/plugins/Dash/cardcreator/1.res'
49
--- tests/plugins/Dash/cardcreator/1.res	2014-07-08 12:37:34 +0000
50
+++ tests/plugins/Dash/cardcreator/1.res	2014-07-24 16:23:16 +0000
51
@@ -15,59 +15,59 @@
52
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
53
16
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
16
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
54
17
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
17
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
57
18
Item  { 
18
Item  {
58
19
                    id: artShapeHolder; 
19
                    id: artShapeHolder;
59
20
                    height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;
20
                    height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;
60
21
                    width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;
21
                    width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;
61
22
                    anchors { horizontalCenter: parent.horizontalCenter; }
22
                    anchors { horizontalCenter: parent.horizontalCenter; }
71
23
                    Loader { 
23
                    Loader {
72
24
                        id: artShapeLoader; 
24
                        id: artShapeLoader;
73
25
                        objectName: "artShapeLoader"; 
25
                        objectName: "artShapeLoader";
74
26
                        active: cardData && cardData["art"] || false; 
26
                        active: cardData && cardData["art"] || false;
75
27
                        asynchronous: root.asynchronous; 
27
                        asynchronous: root.asynchronous;
76
28
                        visible: status == Loader.Ready; 
28
                        visible: status == Loader.Ready;
77
29
                        sourceComponent: UbuntuShape { 
29
                        sourceComponent: UbuntuShape {
78
30
                            id: artShape; 
30
                            id: artShape;
79
31
                            objectName: "artShape"; 
31
                            objectName: "artShape";
80
32
                            radius: "medium";
32
                            radius: "medium";
82
33
                            visible: image.status == Image.Ready; 
33
                            visible: image.status == Image.Ready;
83
34
                            readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
34
                            readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
84
35
                            readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;
35
                            readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;
85
36
                            readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
36
                            readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
86
37
                            Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
37
                            Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
87
38
                            onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
38
                            onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
88
39
                            Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }
39
                            Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }
90
40
                            function updateWidthHeightBindings() { 
40
                            function updateWidthHeightBindings() {
91
41
                                if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {
41
                                if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {
92
42
                                            width = root.fixedArtShapeSize.width;
42
                                            width = root.fixedArtShapeSize.width;
93
43
                                            height = root.fixedArtShapeSize.height;
43
                                            height = root.fixedArtShapeSize.height;
94
44
                                } else if (aspectSmallerThanImageAspect) {
44
                                } else if (aspectSmallerThanImageAspect) {
110
45
                                    width = Qt.binding(function() { return !visible ? 0 : image.width }); 
45
                                    width = Qt.binding(function() { return !visible ? 0 : image.width });
111
46
                                    height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect }); 
46
                                    height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect });
112
47
                                } else { 
47
                                } else {
113
48
                                    width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect }); 
48
                                    width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });
114
49
                                    height = Qt.binding(function() { return !visible ? 0 : image.height }); 
49
                                    height = Qt.binding(function() { return !visible ? 0 : image.height });
115
50
                                } 
50
                                }
116
51
                            } 
51
                            }
117
52
                            image: Image { 
52
                            image: Image {
118
53
                                objectName: "artImage"; 
53
                                objectName: "artImage";
119
54
                                source: cardData && cardData["art"] || ""; 
54
                                source: cardData && cardData["art"] || "";
120
55
                                cache: true; 
55
                                cache: true;
121
56
                                asynchronous: root.asynchronous; 
56
                                asynchronous: root.asynchronous;
122
57
                                fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop; 
57
                                fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop;
123
58
                                readonly property real aspect: implicitWidth / implicitHeight; 
58
                                readonly property real aspect: implicitWidth / implicitHeight;
124
59
                                width: root.width; 
59
                                width: root.width;
125
60
                                height: width / artShape.aspect;
60
                                height: width / artShape.aspect;
129
61
                            } 
61
                            }
130
62
                        } 
62
                        }
131
63
                    } 
63
                    }
132
64
                }
64
                }
133
65
readonly property int headerHeight: titleLabel.height;
65
readonly property int headerHeight: titleLabel.height;
134
66
Label { 
66
Label { 
135
67
                    id: titleLabel; 
67
                    id: titleLabel; 
136
68
                    objectName: "titleLabel"; 
68
                    objectName: "titleLabel"; 
137
69
                    anchors { right: parent.right;left: parent.left;
69
                    anchors { right: parent.right;left: parent.left;
139
70
top: artShapeHolder.bottom; 
70
top: artShapeHolder.bottom;
140
71
                                         topMargin: units.gu(1);
71
                                         topMargin: units.gu(1);
141
72
leftMargin: units.gu(1);
72
leftMargin: units.gu(1);
142
73
 }
73
 }
143
@@ -82,5 +82,13 @@
144
82
                    font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
82
                    font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
145
83
                    horizontalAlignment: root.headerAlignment; 
83
                    horizontalAlignment: root.headerAlignment; 
146
84
                }
84
                }
147
85
UbuntuShape {
148
86
    id: touchdown;
149
87
    objectName: "touchdown";
150
88
    anchors { fill: artShapeHolder }
151
89
    visible: root.pressed;
152
90
    radius: "medium";
153
91
    borderSource: "radius_pressed.sci"
154
92
}
155
85
implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
93
implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
156
86
}
94
}
157
87
95
158
=== modified file 'tests/plugins/Dash/cardcreator/2.res'
159
--- tests/plugins/Dash/cardcreator/2.res	2014-07-08 12:53:51 +0000
160
+++ tests/plugins/Dash/cardcreator/2.res	2014-07-24 16:23:16 +0000
161
@@ -14,37 +14,37 @@
162
14
                property bool showHeader: true; 
14
                property bool showHeader: true; 
163
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
164
16
Loader {
16
Loader {
196
17
                    id: backgroundLoader; 
17
                    id: backgroundLoader;
197
18
                    objectName: "backgroundLoader"; 
18
                    objectName: "backgroundLoader";
198
19
                    anchors.fill: parent; 
19
                    anchors.fill: parent;
199
20
                    asynchronous: root.asynchronous; 
20
                    asynchronous: root.asynchronous;
200
21
                    visible: status == Loader.Ready; 
21
                    visible: status == Loader.Ready;
201
22
                    sourceComponent: UbuntuShape { 
22
                    sourceComponent: UbuntuShape {
202
23
                        objectName: "background"; 
23
                        objectName: "background";
203
24
                        radius: "medium"; 
24
                        radius: "medium";
204
25
                        color: getColor(0) || "white"; 
25
                        color: getColor(0) || "white";
205
26
                        gradientColor: getColor(1) || color; 
26
                        gradientColor: getColor(1) || color;
206
27
                        anchors.fill: parent; 
27
                        anchors.fill: parent;
207
28
                        image: backgroundImage.source ? backgroundImage : null; 
28
                        image: backgroundImage.source ? backgroundImage : null;
208
29
                        property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b; 
29
                        property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;
209
30
                        property Image backgroundImage: Image { 
30
                        property Image backgroundImage: Image {
210
31
                            objectName: "backgroundImage"; 
31
                            objectName: "backgroundImage";
211
32
                            source: { 
32
                            source: {
212
33
                                if (cardData && typeof cardData["background"] === "string") return cardData["background"]; 
33
                                if (cardData && typeof cardData["background"] === "string") return cardData["background"];
213
34
                                else if (template && typeof template["card-background"] === "string") return template["card-background"]; 
34
                                else if (template && typeof template["card-background"] === "string") return template["card-background"];
214
35
                                else return ""; 
35
                                else return "";
215
36
                            } 
36
                            }
216
37
                        } 
37
                        }
217
38
                        function getColor(index) { 
38
                        function getColor(index) {
218
39
                            if (cardData && typeof cardData["background"] === "object" 
39
                            if (cardData && typeof cardData["background"] === "object"
219
40
                                && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) { 
40
                                && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {
220
41
                                return cardData["background"]["elements"][index]; 
41
                                return cardData["background"]["elements"][index];
221
42
                            } else if (template && typeof template["card-background"] === "object" 
42
                            } else if (template && typeof template["card-background"] === "object"
222
43
                                    && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient"))  { 
43
                                    && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient"))  {
223
44
                                return template["card-background"]["elements"][index]; 
44
                                return template["card-background"]["elements"][index];
224
45
                            } else return undefined; 
45
                            } else return undefined;
225
46
                        } 
46
                        }
226
47
                    } 
47
                    }
227
48
                }
48
                }
228
49
readonly property size artShapeSize: Qt.size(-1, -1);
49
readonly property size artShapeSize: Qt.size(-1, -1);
229
50
readonly property int headerHeight: row.height;
50
readonly property int headerHeight: row.height;
230
@@ -58,28 +58,29 @@
231
58
                                     topMargin: units.gu(1);
58
                                     topMargin: units.gu(1);
232
59
                    left: parent.left;
59
                    left: parent.left;
233
60
}
60
}
235
61
                    anchors.right: parent.right; 
61
                    anchors.right: parent.right;
236
62
                    anchors.margins: margins;
62
                    anchors.margins: margins;
240
63
data: [ Image { 
63
data: [ Image {
241
64
                    id: mascotImage; 
64
                    id: mascotImage;
242
65
                    objectName: "mascotImage"; 
65
                    objectName: "mascotImage";
243
66
                    anchors { verticalCenter: parent.verticalCenter; }
66
                    anchors { verticalCenter: parent.verticalCenter; }
253
67
                    readonly property int maxSize: Math.max(width, height) * 4; 
67
                    readonly property int maxSize: Math.max(width, height) * 4;
254
68
                    source: cardData && cardData["mascot"]; 
68
                    source: cardData && cardData["mascot"];
255
69
                    width: units.gu(6); 
69
                    width: units.gu(6);
256
70
                    height: units.gu(5.625); 
70
                    height: units.gu(5.625);
257
71
                    sourceSize { width: maxSize; height: maxSize } 
71
                    sourceSize { width: maxSize; height: maxSize }
258
72
                    fillMode: Image.PreserveAspectCrop; 
72
                    fillMode: Image.PreserveAspectCrop;
259
73
                    horizontalAlignment: Image.AlignHCenter; 
73
                    horizontalAlignment: Image.AlignHCenter;
260
74
                    verticalAlignment: Image.AlignVCenter; 
74
                    verticalAlignment: Image.AlignVCenter;
261
75
                    visible: showHeader; 
75
                    visible: showHeader;
262
76
                }
76
                }
263
77
,
77
,
267
78
Column { 
78
Column {
268
79
                        anchors.verticalCenter: parent.verticalCenter; 
79
                        anchors.verticalCenter: parent.verticalCenter;
269
80
                        spacing: units.dp(2); 
80
                        spacing: units.dp(2);
270
81
                        width: parent.width - x;
81
                        width: parent.width - x;
272
82
                        data: [ Label {
82
                        data: [
273
83
Label {
274
83
                    id: titleLabel; 
84
                    id: titleLabel; 
275
84
                    objectName: "titleLabel"; 
85
                    objectName: "titleLabel"; 
276
85
                    anchors { left: parent.left; right: parent.right }
86
                    anchors { left: parent.left; right: parent.right }
277
@@ -95,9 +96,9 @@
278
95
                    horizontalAlignment: root.headerAlignment; 
96
                    horizontalAlignment: root.headerAlignment; 
279
96
                }
97
                }
280
97
,
98
,
284
98
Label { 
99
Label {
285
99
                        id: subtitleLabel; 
100
                        id: subtitleLabel;
286
100
                        objectName: "subtitleLabel"; 
101
                        objectName: "subtitleLabel";
287
101
                        anchors { left: parent.left; right: parent.right }
102
                        anchors { left: parent.left; right: parent.right }
288
102
103
289
103
                        elide: Text.ElideRight; 
104
                        elide: Text.ElideRight; 
290
@@ -113,5 +114,13 @@
291
113
}
114
}
292
114
]
115
]
293
115
}
116
}
294
117
UbuntuShape {
295
118
    id: touchdown;
296
119
    objectName: "touchdown";
297
120
    anchors { fill: backgroundLoader }
298
121
    visible: root.pressed;
299
122
    radius: "medium";
300
123
    borderSource: "radius_pressed.sci"
301
124
}
302
116
implicitHeight: row.y + row.height + units.gu(1);
125
implicitHeight: row.y + row.height + units.gu(1);
303
117
}
126
}
304
118
127
305
=== modified file 'tests/plugins/Dash/cardcreator/3.res'
306
--- tests/plugins/Dash/cardcreator/3.res	2014-07-08 12:37:34 +0000
307
+++ tests/plugins/Dash/cardcreator/3.res	2014-07-24 16:23:16 +0000
308
@@ -15,22 +15,22 @@
309
15
                implicitWidth: childrenRect.width; 
15
                implicitWidth: childrenRect.width; 
310
16
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
16
onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } 
311
17
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
17
readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
314
18
Item  { 
18
Item  {
315
19
                    id: artShapeHolder; 
19
                    id: artShapeHolder;
316
20
                    height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;
20
                    height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;
317
21
                    width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;
21
                    width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;
318
22
                    anchors { horizontalCenter: parent.horizontalCenter; }
22
                    anchors { horizontalCenter: parent.horizontalCenter; }
330
23
                    Loader { 
23
                    Loader {
331
24
                        id: artShapeLoader; 
24
                        id: artShapeLoader;
332
25
                        objectName: "artShapeLoader"; 
25
                        objectName: "artShapeLoader";
333
26
                        active: cardData && cardData["art"] || false; 
26
                        active: cardData && cardData["art"] || false;
334
27
                        asynchronous: root.asynchronous; 
27
                        asynchronous: root.asynchronous;
335
28
                        visible: status == Loader.Ready; 
28
                        visible: status == Loader.Ready;
336
29
                        sourceComponent: UbuntuShape { 
29
                        sourceComponent: UbuntuShape {
337
30
                            id: artShape; 
30
                            id: artShape;
338
31
                            objectName: "artShape"; 
31
                            objectName: "artShape";
339
32
                            radius: "medium"; 
32
                            radius: "medium";
340
33
                            visible: image.status == Image.Ready; 
33
                            visible: image.status == Image.Ready;
341
34
                            readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
34
                            readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
342
35
                            readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;
35
                            readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;
343
36
                            readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
36
                            readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
344
@@ -48,26 +48,26 @@
345
48
                                    width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });
48
                                    width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });
346
49
                                    height = Qt.binding(function() { return !visible ? 0 : image.height });
49
                                    height = Qt.binding(function() { return !visible ? 0 : image.height });
347
50
                                }
50
                                }
357
51
                            } 
51
                            }
358
52
                            image: Image { 
52
                            image: Image {
359
53
                                objectName: "artImage"; 
53
                                objectName: "artImage";
360
54
                                source: cardData && cardData["art"] || ""; 
54
                                source: cardData && cardData["art"] || "";
361
55
                                cache: true; 
55
                                cache: true;
362
56
                                asynchronous: root.asynchronous; 
56
                                asynchronous: root.asynchronous;
363
57
                                fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop; 
57
                                fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop;
364
58
                                readonly property real aspect: implicitWidth / implicitHeight; 
58
                                readonly property real aspect: implicitWidth / implicitHeight;
365
59
                                width: root.width; 
59
                                width: root.width;
366
60
                                height: width / artShape.aspect;
60
                                height: width / artShape.aspect;
370
61
                            } 
61
                            }
371
62
                        } 
62
                        }
372
63
                    } 
63
                    }
373
64
                }
64
                }
374
65
readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
65
readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
375
66
Label { 
66
Label { 
376
67
                    id: titleLabel; 
67
                    id: titleLabel; 
377
68
                    objectName: "titleLabel"; 
68
                    objectName: "titleLabel"; 
378
69
                    anchors { right: parent.right;left: parent.left;
69
                    anchors { right: parent.right;left: parent.left;
380
70
top: artShapeHolder.bottom; 
70
top: artShapeHolder.bottom;
381
71
                                         topMargin: units.gu(1);
71
                                         topMargin: units.gu(1);
382
72
leftMargin: units.gu(1);
72
leftMargin: units.gu(1);
383
73
}
73
}
384
@@ -82,6 +82,7 @@
385
82
                    font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
82
                    font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; 
386
83
                    horizontalAlignment: root.headerAlignment; 
83
                    horizontalAlignment: root.headerAlignment; 
387
84
                }
84
                }
388
85
389
85
Label { 
86
Label { 
390
86
                        id: subtitleLabel; 
87
                        id: subtitleLabel; 
391
87
                        objectName: "subtitleLabel"; 
88
                        objectName: "subtitleLabel"; 
392
@@ -89,8 +90,7 @@
393
89
                               leftMargin: titleLabel.leftMargin; 
90
                               leftMargin: titleLabel.leftMargin; 
394
90
                               right: titleLabel.right; 
91
                               right: titleLabel.right; 
395
91
                               top: titleLabel.bottom; 
92
                               top: titleLabel.bottom; 
398
92
                               topMargin: units.dp(2);
93
                               topMargin: units.dp(2); }
397
93
                               }
399
94
                        elide: Text.ElideRight; 
94
                        elide: Text.ElideRight; 
400
95
                        fontSize: "small"; 
95
                        fontSize: "small"; 
401
96
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
96
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
402
@@ -100,5 +100,13 @@
403
100
                        font.weight: Font.Light; 
100
                        font.weight: Font.Light; 
404
101
                        horizontalAlignment: root.headerAlignment; 
101
                        horizontalAlignment: root.headerAlignment; 
405
102
                    }
102
                    }
406
103
UbuntuShape {
407
104
    id: touchdown;
408
105
    objectName: "touchdown";
409
106
    anchors { fill: artShapeHolder }
410
107
    visible: root.pressed;
411
108
    radius: "medium";
412
109
    borderSource: "radius_pressed.sci"
413
110
}
414
103
implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
111
implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
415
104
}
112
}
416
105
113
417
=== modified file 'tests/plugins/Dash/cardcreator/4.res'
418
--- tests/plugins/Dash/cardcreator/4.res	2014-07-08 12:37:34 +0000
419
+++ tests/plugins/Dash/cardcreator/4.res	2014-07-24 16:23:16 +0000
420
@@ -25,44 +25,44 @@
421
25
                                     topMargin: units.gu(1);
25
                                     topMargin: units.gu(1);
422
26
                    left: parent.left;
26
                    left: parent.left;
423
27
}
27
}
425
28
                    anchors.right: parent.right; 
28
                    anchors.right: parent.right;
426
29
                    anchors.margins: margins;
29
                    anchors.margins: margins;
436
30
data: [ Loader { 
30
data: [ Loader {
437
31
                        id: mascotShapeLoader; 
31
                        id: mascotShapeLoader;
438
32
                        objectName: "mascotShapeLoader"; 
32
                        objectName: "mascotShapeLoader";
439
33
                        asynchronous: root.asynchronous; 
33
                        asynchronous: root.asynchronous;
440
34
                        active: mascotImage.status === Image.Ready; 
34
                        active: mascotImage.status === Image.Ready;
441
35
                        visible: showHeader && active && status == Loader.Ready; 
35
                        visible: showHeader && active && status == Loader.Ready;
442
36
                        width: units.gu(6); 
36
                        width: units.gu(6);
443
37
                        height: units.gu(5.625); 
37
                        height: units.gu(5.625);
444
38
                        sourceComponent: UbuntuShape { image: mascotImage } 
38
                        sourceComponent: UbuntuShape { image: mascotImage }
445
39
                        anchors { verticalCenter: parent.verticalCenter; }
39
                        anchors { verticalCenter: parent.verticalCenter; }
446
40
                    }
40
                    }
447
41
41
448
42
,
42
,
452
43
Image { 
43
Image {
453
44
                    id: mascotImage; 
44
                    id: mascotImage;
454
45
                    objectName: "mascotImage"; 
45
                    objectName: "mascotImage";
455
46
                    anchors { verticalCenter: parent.verticalCenter; }
46
                    anchors { verticalCenter: parent.verticalCenter; }
465
47
                    readonly property int maxSize: Math.max(width, height) * 4; 
47
                    readonly property int maxSize: Math.max(width, height) * 4;
466
48
                    source: cardData && cardData["mascot"]; 
48
                    source: cardData && cardData["mascot"];
467
49
                    width: units.gu(6); 
49
                    width: units.gu(6);
468
50
                    height: units.gu(5.625); 
50
                    height: units.gu(5.625);
469
51
                    sourceSize { width: maxSize; height: maxSize } 
51
                    sourceSize { width: maxSize; height: maxSize }
470
52
                    fillMode: Image.PreserveAspectCrop; 
52
                    fillMode: Image.PreserveAspectCrop;
471
53
                    horizontalAlignment: Image.AlignHCenter; 
53
                    horizontalAlignment: Image.AlignHCenter;
472
54
                    verticalAlignment: Image.AlignVCenter; 
54
                    verticalAlignment: Image.AlignVCenter;
473
55
                    visible: false; 
55
                    visible: false;
474
56
                }
56
                }
475
57
57
476
58
,
58
,
480
59
Column { 
59
Column {
481
60
                        anchors.verticalCenter: parent.verticalCenter; 
60
                        anchors.verticalCenter: parent.verticalCenter;
482
61
                        spacing: units.dp(2); 
61
                        spacing: units.dp(2);
483
62
                        width: parent.width - x;
62
                        width: parent.width - x;
487
63
data: [ Label { 
63
data: [ Label {
488
64
                    id: titleLabel; 
64
                    id: titleLabel;
489
65
                    objectName: "titleLabel"; 
65
                    objectName: "titleLabel";
490
66
                    anchors { left: parent.left; right: parent.right }
66
                    anchors { left: parent.left; right: parent.right }
491
67
                    elide: Text.ElideRight; 
67
                    elide: Text.ElideRight; 
492
68
                    fontSize: "small"; 
68
                    fontSize: "small"; 
493
@@ -76,9 +76,9 @@
494
76
                    horizontalAlignment: root.headerAlignment; 
76
                    horizontalAlignment: root.headerAlignment; 
495
77
                }
77
                }
496
78
,
78
,
500
79
Label { 
79
Label {
501
80
                        id: subtitleLabel; 
80
                        id: subtitleLabel;
502
81
                        objectName: "subtitleLabel"; 
81
                        objectName: "subtitleLabel";
503
82
                        anchors { left: parent.left; right: parent.right }
82
                        anchors { left: parent.left; right: parent.right }
504
83
83
505
84
                        elide: Text.ElideRight; 
84
                        elide: Text.ElideRight; 
506
@@ -94,5 +94,13 @@
507
94
}
94
}
508
95
]
95
]
509
96
}
96
}
510
97
UbuntuShape {
511
98
    id: touchdown;
512
99
    objectName: "touchdown";
513
100
    anchors { fill: root }
514
101
    visible: root.pressed;
515
102
    radius: "medium";
516
103
    borderSource: "radius_pressed.sci"
517
104
}
518
97
implicitHeight: row.y + row.height + units.gu(1);
105
implicitHeight: row.y + row.height + units.gu(1);
519
98
}
106
}
520
99
107
521
=== modified file 'tests/plugins/Dash/cardcreator/5.res'
522
--- tests/plugins/Dash/cardcreator/5.res	2014-07-08 12:37:34 +0000
523
+++ tests/plugins/Dash/cardcreator/5.res	2014-07-24 16:23:16 +0000
524
@@ -141,5 +141,13 @@
525
141
                        font.weight: Font.Light; 
141
                        font.weight: Font.Light; 
526
142
                        horizontalAlignment: root.headerAlignment; 
142
                        horizontalAlignment: root.headerAlignment; 
527
143
                    }
143
                    }
528
144
UbuntuShape { 
529
145
    id: touchdown; 
530
146
    objectName: "touchdown"; 
531
147
    anchors { fill: artShapeHolder } 
532
148
    visible: root.pressed; 
533
149
    radius: "medium"; 
534
150
    borderSource: "radius_pressed.sci" 
535
151
}
536
144
implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
152
implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);
537
145
}
153
}
538
146
154
539
=== modified file 'tests/plugins/Dash/cardcreator/6.res'
540
--- tests/plugins/Dash/cardcreator/6.res	2014-07-10 18:03:16 +0000
541
+++ tests/plugins/Dash/cardcreator/6.res	2014-07-24 16:23:16 +0000
542
@@ -63,5 +63,13 @@
543
63
                    }
63
                    }
544
64
                }
64
                }
545
65
readonly property int headerHeight: 0;
65
readonly property int headerHeight: 0;
546
66
UbuntuShape {
547
67
    id: touchdown;
548
68
    objectName: "touchdown";
549
69
    anchors { fill: artShapeHolder }
550
70
    visible: root.pressed;
551
71
    radius: "medium";
552
72
    borderSource: "radius_pressed.sci"
553
73
}
554
66
implicitHeight: artShapeHolder.height;
74
implicitHeight: artShapeHolder.height;
555
67
}
75
}
556
68
76
557
=== modified file 'tests/plugins/Dash/cardcreatortest.cpp'
558
--- tests/plugins/Dash/cardcreatortest.cpp	2014-05-06 13:09:08 +0000
559
+++ tests/plugins/Dash/cardcreatortest.cpp	2014-07-24 16:23:16 +0000
560
@@ -19,6 +19,7 @@
561
19
#include <QQuickItem>
19
#include <QQuickItem>
562
20
#include <QQuickView>
20
#include <QQuickView>
563
21
#include <QtTestGui>
21
#include <QtTestGui>
564
22
#include <QDebug>
565
22
23
566
23
class CardCreatorTest : public QObject
24
class CardCreatorTest : public QObject
567
24
{
25
{
568
@@ -73,8 +74,13 @@
569
73
            QFile testResultFile(testDirPath + resultFileName);
74
            QFile testResultFile(testDirPath + resultFileName);
570
74
            QVERIFY(testResultFile.open(QIODevice::ReadOnly));
75
            QVERIFY(testResultFile.open(QIODevice::ReadOnly));
571
75
            QTextStream ts2(&testResultFile);
76
            QTextStream ts2(&testResultFile);
574
76
            const QString expectedResult = ts2.readAll();
77
            const QStringList expectedLines = ts2.readAll().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
575
77
            QCOMPARE(cardStringResult.toString().simplified(), expectedResult.simplified());
78
            const QStringList cardStringResultLines = cardStringResult.toString().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
576
79
            //QCOMPARE(cardStringResultLines.size(), expectedLines.size());
577
80
            for (int i = 0; i < expectedLines.size(); ++i) {
578
81
                //qDebug() << cardStringResultLines[i].simplified() << expectedLines[i].simplified();
579
82
                QCOMPARE(cardStringResultLines[i].simplified(), expectedLines[i].simplified());
580
83
            }
581
78
84
582
79
            QVariant createCardComponentResult;
85
            QVariant createCardComponentResult;
583
80
            QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));
86
            QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));
584
81
87
585
=== modified file 'tests/qmltests/Dash/tst_Card.qml'
586
--- tests/qmltests/Dash/tst_Card.qml	2014-06-27 08:47:04 +0000
587
+++ tests/qmltests/Dash/tst_Card.qml	2014-07-24 16:23:16 +0000
588
@@ -473,5 +473,17 @@
589
473
            compare(shape !== null, data.shape);
473
            compare(shape !== null, data.shape);
590
474
            tryCompare(mascotImage, "visible", !data.shape);
474
            tryCompare(mascotImage, "visible", !data.shape);
591
475
        }
475
        }
592
476
593
477
        function test_touchdown_visibility() {
594
478
            selector.selectedIndex = 0;
595
479
596
480
            var touchdown = findChild(card, "touchdown");
597
481
598
482
            compare(touchdown.visible, false);
599
483
            mousePress(card, card.width/2, card.height/2);
600
484
            compare(touchdown.visible, true);
601
485
            mouseRelease(card, card.width/2, card.height/2);
602
486
            compare(touchdown.visible, false);
603
487
        }
604
476
    }
488
    }
605
477
}
489
}
Status:	Rejected
Rejected by:	Michał Sawicz on 2014-07-27
Proposed branch:	lp:~cimi/unity8/card_touchdown
Merge into:	lp:unity8
Diff against target:	605 lines (+232/-145) 9 files modified plugins/Dash/CardCreator.js (+21/-1) tests/plugins/Dash/cardcreator/1.res (+40/-32) tests/plugins/Dash/cardcreator/2.res (+60/-51) tests/plugins/Dash/cardcreator/3.res (+36/-28) tests/plugins/Dash/cardcreator/4.res (+39/-31) tests/plugins/Dash/cardcreator/5.res (+8/-0) tests/plugins/Dash/cardcreator/6.res (+8/-0) tests/plugins/Dash/cardcreatortest.cpp (+8/-2) tests/qmltests/Dash/tst_Card.qml (+12/-0)
To merge this branch:	bzr merge lp:~cimi/unity8/card_touchdown
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2014-05-27	Disapprove on 2014-07-27
Albert Astals Cid (community)			Abstain on 2014-07-25
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-07-24
Review via email: mp+221113@code.launchpad.net