git.iko.soy/unity8
on xenial help sign in
Fixed whitespaces
0946923Andrea Cimitan
tests/plugins/Dash/cardcreator/2.res+104−104
compare with xenial
unifiedsplit
@@ -1,128 +1,128 @@
1−AbstractButton {
1+AbstractButton {
2− id: root;
2+ id: root;
3− property var template;
3+ property var template;
4− property var components;
4+ property var components;
5− property var cardData;
5+ property var cardData;
6− property var artShapeBorderSource: undefined;
6+ property var artShapeBorderSource: undefined;
7− property real fontScale: 1.0;
7+ property real fontScale: 1.0;
8− property var scopeStyle: null;
8+ property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int headerAlignment: Text.AlignLeft;
10− property int fixedHeaderHeight: -1;
10+ property int fixedHeaderHeight: -1;
11− property size fixedArtShapeSize: Qt.size(-1, -1);
11+ property size fixedArtShapeSize: Qt.size(-1, -1);
12− readonly property string title: cardData && cardData["title"] || "";
12+ readonly property string title: cardData && cardData["title"] || "";
13− property bool asynchronous: true;
13+ property bool asynchronous: true;
14− property bool showHeader: true;
14+ property bool showHeader: true;
15− implicitWidth: childrenRect.width;
15+ implicitWidth: childrenRect.width;
16Loader {
16Loader {
17− id: backgroundLoader;
17+ id: backgroundLoader;
18− objectName: "backgroundLoader";
18+ objectName: "backgroundLoader";
19− anchors.fill: parent;
19+ anchors.fill: parent;
20− asynchronous: root.asynchronous;
20+ asynchronous: root.asynchronous;
21− visible: status == Loader.Ready;
21+ visible: status == Loader.Ready;
22− sourceComponent: UbuntuShape {
22+ sourceComponent: UbuntuShape {
23− objectName: "background";
23+ objectName: "background";
24− radius: "medium";
24+ radius: "medium";
25− color: getColor(0) || "white";
25+ color: getColor(0) || "white";
26− gradientColor: getColor(1) || color;
26+ gradientColor: getColor(1) || color;
27− anchors.fill: parent;
27+ anchors.fill: parent;
28− image: backgroundImage.source ? backgroundImage : null;
28+ image: backgroundImage.source ? backgroundImage : null;
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;
30− property Image backgroundImage: Image {
30+ property Image backgroundImage: Image {
31− objectName: "backgroundImage";
31+ objectName: "backgroundImage";
32− source: {
32+ source: {
33− if (cardData && typeof cardData["background"] === "string") return cardData["background"];
33+ if (cardData && typeof cardData["background"] === "string") return cardData["background"];
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"];
35− else return "";
35+ else return "";
36− }
36+ }
37− }
37+ }
38− function getColor(index) {
38+ function getColor(index) {
39− if (cardData && typeof cardData["background"] === "object"
39+ if (cardData && typeof cardData["background"] === "object"
40− && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {
40+ && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {
41− return cardData["background"]["elements"][index];
41+ return cardData["background"]["elements"][index];
42− } else if (template && typeof template["card-background"] === "object"
42+ } else if (template && typeof template["card-background"] === "object"
43− && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
43+ && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
44− return template["card-background"]["elements"][index];
44+ return template["card-background"]["elements"][index];
45− } else return undefined;
45+ } else return undefined;
46− }
46+ }
47− }
47+ }
48 }
48 }
49readonly property size artShapeSize: Qt.size(-1, -1);
49readonly property size artShapeSize: Qt.size(-1, -1);
50readonly property int headerHeight: row.height;
50readonly property int headerHeight: row.height;
51−Row {
51+Row {
52− id: row;
52+ id: row;
53− objectName: "outerRow";
53+ objectName: "outerRow";
54− property real margins: units.gu(1);
54+ property real margins: units.gu(1);
55− spacing: margins;
55+ spacing: margins;
56− height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
56+ height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
57− anchors { top: parent.top;
57+ anchors { top: parent.top;
58 topMargin: units.gu(1);
58 topMargin: units.gu(1);
59 left: parent.left;
59 left: parent.left;
60− }
60+ }
61− anchors.right: parent.right;
61+ anchors.right: parent.right;
62 anchors.margins: margins;
62 anchors.margins: margins;
63 anchors.rightMargin: 0;
63 anchors.rightMargin: 0;
64 data: [
64 data: [
65−Image {
65+Image {
66− id: mascotImage;
66+ id: mascotImage;
67− objectName: "mascotImage";
67+ objectName: "mascotImage";
68− anchors { verticalCenter: parent.verticalCenter; }
68+ anchors { verticalCenter: parent.verticalCenter; }
69− readonly property int maxSize: Math.max(width, height) * 4;
69+ readonly property int maxSize: Math.max(width, height) * 4;
70 source: cardData && cardData["mascot"] || "";
70 source: cardData && cardData["mascot"] || "";
71− width: units.gu(6);
71+ width: units.gu(6);
72− height: units.gu(5.625);
72+ height: units.gu(5.625);
73− sourceSize { width: maxSize; height: maxSize }
73+ sourceSize { width: maxSize; height: maxSize }
74− fillMode: Image.PreserveAspectCrop;
74+ fillMode: Image.PreserveAspectCrop;
75− horizontalAlignment: Image.AlignHCenter;
75+ horizontalAlignment: Image.AlignHCenter;
76− verticalAlignment: Image.AlignVCenter;
76+ verticalAlignment: Image.AlignVCenter;
77− visible: showHeader;
77+ visible: showHeader;
78 }
78 }
79−,Item {
79+,Item {
80− id: headerTitleContainer;
80+ id: headerTitleContainer;
81− anchors { verticalCenter: parent.verticalCenter; }
81+ anchors { verticalCenter: parent.verticalCenter; }
82− width: parent.width - x;
82+ width: parent.width - x;
83− implicitHeight: titleLabel.height + subtitleLabel.height;
83+ implicitHeight: titleLabel.height + subtitleLabel.height;
84− data: [
84+ data: [
85− Label {
85+ Label {
86− id: titleLabel;
86+ id: titleLabel;
87− objectName: "titleLabel";
87+ objectName: "titleLabel";
88 anchors { right: parent.right;
88 anchors { right: parent.right;
89 rightMargin: units.gu(1);
89 rightMargin: units.gu(1);
90 left: parent.left;
90 left: parent.left;
91− top: parent.top; }
91+ top: parent.top; }
92− elide: Text.ElideRight;
92+ elide: Text.ElideRight;
93− fontSize: "small";
93+ fontSize: "small";
94− wrapMode: Text.Wrap;
94+ wrapMode: Text.Wrap;
95− maximumLineCount: 2;
95+ maximumLineCount: 2;
96− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
96+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
97− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
97+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
98− visible: showHeader ;
98+ visible: showHeader ;
99− text: root.title;
99+ text: root.title;
100− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
100+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
101− horizontalAlignment: root.headerAlignment;
101+ horizontalAlignment: root.headerAlignment;
102 }
102 }
103− ,Label {
103+ ,Label {
104− id: subtitleLabel;
104+ id: subtitleLabel;
105− objectName: "subtitleLabel";
105+ objectName: "subtitleLabel";
106 anchors { right: parent.right;
106 anchors { right: parent.right;
107 left: parent.left;
107 left: parent.left;
108 rightMargin: units.gu(1);
108 rightMargin: units.gu(1);
109 top: titleLabel.bottom;
109 top: titleLabel.bottom;
110− }
110+ }
111− anchors.topMargin: units.dp(2);
111+ anchors.topMargin: units.dp(2);
112− elide: Text.ElideRight;
112+ elide: Text.ElideRight;
113− fontSize: "small";
113+ fontSize: "small";
114− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
114+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
115+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
116− visible: titleLabel.visible && titleLabel.text;
116+ visible: titleLabel.visible && titleLabel.text;
117− text: cardData && cardData["subtitle"] || "";
117+ text: cardData && cardData["subtitle"] || "";
118− font.weight: Font.Light;
118+ font.weight: Font.Light;
119− horizontalAlignment: root.headerAlignment;
119+ horizontalAlignment: root.headerAlignment;
120 }
120 }
121−
121+
122− ]
122+ ]
123 }
123 }
124−
124+
125− ]
125+ ]
126 }
126 }
127UbuntuShape {
127UbuntuShape {
128 id: touchdown;
128 id: touchdown;
tests/plugins/Dash/cardcreator/4.res+76−76
@@ -1,102 +1,102 @@
1−AbstractButton {
1+AbstractButton {
2− id: root;
2+ id: root;
3− property var template;
3+ property var template;
4− property var components;
4+ property var components;
5− property var cardData;
5+ property var cardData;
6− property var artShapeBorderSource: undefined;
6+ property var artShapeBorderSource: undefined;
7− property real fontScale: 1.0;
7+ property real fontScale: 1.0;
8 property var scopeStyle: null;
8 property var scopeStyle: null;
9 property int headerAlignment: Text.AlignLeft;
9 property int headerAlignment: Text.AlignLeft;
10− property int fixedHeaderHeight: -1;
10+ property int fixedHeaderHeight: -1;
11− property size fixedArtShapeSize: Qt.size(-1, -1);
11+ property size fixedArtShapeSize: Qt.size(-1, -1);
12− readonly property string title: cardData && cardData["title"] || "";
12+ readonly property string title: cardData && cardData["title"] || "";
13− property bool asynchronous: true;
13+ property bool asynchronous: true;
14− property bool showHeader: true;
14+ property bool showHeader: true;
15− implicitWidth: childrenRect.width;
15+ implicitWidth: childrenRect.width;
16readonly property size artShapeSize: Qt.size(-1, -1);
16readonly property size artShapeSize: Qt.size(-1, -1);
17readonly property int headerHeight: row.height;
17readonly property int headerHeight: row.height;
18−Row {
18+Row {
19− id: row;
19+ id: row;
20− objectName: "outerRow";
20+ objectName: "outerRow";
21− property real margins: units.gu(1);
21+ property real margins: units.gu(1);
22− spacing: margins;
22+ spacing: margins;
23 height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
23 height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
24− anchors { top: parent.top;
24+ anchors { top: parent.top;
25 topMargin: units.gu(1);
25 topMargin: units.gu(1);
26 left: parent.left;
26 left: parent.left;
27}
27}
28− anchors.right: parent.right;
28+ anchors.right: parent.right;
29 anchors.margins: margins;
29 anchors.margins: margins;
30 anchors.rightMargin: 0;
30 anchors.rightMargin: 0;
31−data: [
31+data: [
32−Loader {
32+Loader {
33− id: mascotShapeLoader;
33+ id: mascotShapeLoader;
34− objectName: "mascotShapeLoader";
34+ objectName: "mascotShapeLoader";
35− asynchronous: root.asynchronous;
35+ asynchronous: root.asynchronous;
36− active: mascotImage.status === Image.Ready;
36+ active: mascotImage.status === Image.Ready;
37− visible: showHeader && active && status == Loader.Ready;
37+ visible: showHeader && active && status == Loader.Ready;
38− width: units.gu(6);
38+ width: units.gu(6);
39− height: units.gu(5.625);
39+ height: units.gu(5.625);
40− sourceComponent: UbuntuShape { image: mascotImage }
40+ sourceComponent: UbuntuShape { image: mascotImage }
41 anchors { verticalCenter: parent.verticalCenter; }
41 anchors { verticalCenter: parent.verticalCenter; }
42 }
42 }
43
43
44−,Image {
44+,Image {
45− id: mascotImage;
45+ id: mascotImage;
46− objectName: "mascotImage";
46+ objectName: "mascotImage";
47 anchors { verticalCenter: parent.verticalCenter; }
47 anchors { verticalCenter: parent.verticalCenter; }
48− readonly property int maxSize: Math.max(width, height) * 4;
48+ readonly property int maxSize: Math.max(width, height) * 4;
49− source: cardData && cardData["mascot"] || "";
49+ source: cardData && cardData["mascot"] || "";
50− width: units.gu(6);
50+ width: units.gu(6);
51− height: units.gu(5.625);
51+ height: units.gu(5.625);
52− sourceSize { width: maxSize; height: maxSize }
52+ sourceSize { width: maxSize; height: maxSize }
53− fillMode: Image.PreserveAspectCrop;
53+ fillMode: Image.PreserveAspectCrop;
54− horizontalAlignment: Image.AlignHCenter;
54+ horizontalAlignment: Image.AlignHCenter;
55− verticalAlignment: Image.AlignVCenter;
55+ verticalAlignment: Image.AlignVCenter;
56− visible: false;
56+ visible: false;
57 }
57 }
58
58
59−,Item {
59+,Item {
60− id: headerTitleContainer;
60+ id: headerTitleContainer;
61− anchors { verticalCenter: parent.verticalCenter; }
61+ anchors { verticalCenter: parent.verticalCenter; }
62− width: parent.width - x;
62+ width: parent.width - x;
63− implicitHeight: titleLabel.height + subtitleLabel.height;
63+ implicitHeight: titleLabel.height + subtitleLabel.height;
64− data: [
64+ data: [
65−Label {
65+Label {
66− id: titleLabel;
66+ id: titleLabel;
67− objectName: "titleLabel";
67+ objectName: "titleLabel";
68 anchors { right: parent.right;
68 anchors { right: parent.right;
69− rightMargin: units.gu(1);
69+ rightMargin: units.gu(1);
70− left: parent.left;
70+ left: parent.left;
71 top: parent.top; }
71 top: parent.top; }
72− elide: Text.ElideRight;
72+ elide: Text.ElideRight;
73− fontSize: "small";
73+ fontSize: "small";
74− wrapMode: Text.Wrap;
74+ wrapMode: Text.Wrap;
75− maximumLineCount: 2;
75+ maximumLineCount: 2;
76− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
76+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
77 color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
77 color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
78− visible: showHeader ;
78+ visible: showHeader ;
79− text: root.title;
79+ text: root.title;
80− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
80+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
81− horizontalAlignment: root.headerAlignment;
81+ horizontalAlignment: root.headerAlignment;
82 }
82 }
83−,Label {
83+,Label {
84− id: subtitleLabel;
84+ id: subtitleLabel;
85− objectName: "subtitleLabel";
85+ objectName: "subtitleLabel";
86− anchors { right: parent.right;
86+ anchors { right: parent.right;
87− left: parent.left;
87+ left: parent.left;
88− rightMargin: units.gu(1);
88+ rightMargin: units.gu(1);
89− top: titleLabel.bottom;
89+ top: titleLabel.bottom;
90 }
90 }
91 anchors.topMargin: units.dp(2);
91 anchors.topMargin: units.dp(2);
92− elide: Text.ElideRight;
92+ elide: Text.ElideRight;
93− fontSize: "small";
93+ fontSize: "small";
94− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
94+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
95 color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
95 color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
96− visible: titleLabel.visible && titleLabel.text;
96+ visible: titleLabel.visible && titleLabel.text;
97− text: cardData && cardData["subtitle"] || "";
97+ text: cardData && cardData["subtitle"] || "";
98− font.weight: Font.Light;
98+ font.weight: Font.Light;
99− horizontalAlignment: root.headerAlignment;
99+ horizontalAlignment: root.headerAlignment;
100 }
100 }
101]
101]
102}
102}
tests/plugins/Dash/cardcreator/6.res+84−84
@@ -14,100 +14,100 @@ AbstractButton {
14 property bool showHeader: true;
14 property bool showHeader: true;
15 implicitWidth: childrenRect.width;
15 implicitWidth: childrenRect.width;
16Loader {
16Loader {
17− id: backgroundLoader;
17+ id: backgroundLoader;
18− objectName: "backgroundLoader";
18+ objectName: "backgroundLoader";
19− anchors.fill: parent;
19+ anchors.fill: parent;
20− asynchronous: root.asynchronous;
20+ asynchronous: root.asynchronous;
21− visible: status == Loader.Ready;
21+ visible: status == Loader.Ready;
22− sourceComponent: UbuntuShape {
22+ sourceComponent: UbuntuShape {
23− objectName: "background";
23+ objectName: "background";
24− radius: "medium";
24+ radius: "medium";
25− color: getColor(0) || "white";
25+ color: getColor(0) || "white";
26− gradientColor: getColor(1) || color;
26+ gradientColor: getColor(1) || color;
27− anchors.fill: parent;
27+ anchors.fill: parent;
28− image: backgroundImage.source ? backgroundImage : null;
28+ image: backgroundImage.source ? backgroundImage : null;
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;
30− property Image backgroundImage: Image {
30+ property Image backgroundImage: Image {
31− objectName: "backgroundImage";
31+ objectName: "backgroundImage";
32− source: {
32+ source: {
33− if (cardData && typeof cardData["background"] === "string") return cardData["background"];
33+ if (cardData && typeof cardData["background"] === "string") return cardData["background"];
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"];
35− else return "";
35+ else return "";
36− }
36+ }
37− }
37+ }
38− function getColor(index) {
38+ function getColor(index) {
39− if (cardData && typeof cardData["background"] === "object"
39+ if (cardData && typeof cardData["background"] === "object"
40− && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {
40+ && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {
41− return cardData["background"]["elements"][index];
41+ return cardData["background"]["elements"][index];
42− } else if (template && typeof template["card-background"] === "object"
42+ } else if (template && typeof template["card-background"] === "object"
43− && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
43+ && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
44− return template["card-background"]["elements"][index];
44+ return template["card-background"]["elements"][index];
45− } else return undefined;
45+ } else return undefined;
46− }
46+ }
47− }
47+ }
48 }
48 }
49readonly property size artShapeSize: Qt.size(-1, -1);
49readonly property size artShapeSize: Qt.size(-1, -1);
50readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
50readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
51−Item {
51+Item {
52− id: headerTitleContainer;
52+ id: headerTitleContainer;
53 anchors { right: parent.right; left: parent.left;
53 anchors { right: parent.right; left: parent.left;
54− top: parent.top;
54+ top: parent.top;
55 topMargin: units.gu(1);
55 topMargin: units.gu(1);
56 leftMargin: units.gu(1);
56 leftMargin: units.gu(1);
57− }
57+ }
58− width: parent.width - x;
58+ width: parent.width - x;
59− implicitHeight: titleLabel.height + subtitleLabel.height;
59+ implicitHeight: titleLabel.height + subtitleLabel.height;
60− data: [
60+ data: [
61− Label {
61+ Label {
62− id: titleLabel;
62+ id: titleLabel;
63− objectName: "titleLabel";
63+ objectName: "titleLabel";
64− anchors { right: emblemImage.left;
64+ anchors { right: emblemImage.left;
65− rightMargin: emblemImage.width > 0 ? units.gu(0.5) : 0;
65+ rightMargin: emblemImage.width > 0 ? units.gu(0.5) : 0;
66− left: parent.left;
66+ left: parent.left;
67− top: parent.top; }
67+ top: parent.top; }
68− elide: Text.ElideRight;
68+ elide: Text.ElideRight;
69− fontSize: "small";
69+ fontSize: "small";
70− wrapMode: Text.Wrap;
70+ wrapMode: Text.Wrap;
71− maximumLineCount: 2;
71+ maximumLineCount: 2;
72− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
72+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
73− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
73+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
74− visible: showHeader ;
74+ visible: showHeader ;
75− text: root.title;
75+ text: root.title;
76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
76+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
77− horizontalAlignment: root.headerAlignment;
77+ horizontalAlignment: root.headerAlignment;
78 }
78 }
79−,Label {
79+,Label {
80− id: subtitleLabel;
80+ id: subtitleLabel;
81− objectName: "subtitleLabel";
81+ objectName: "subtitleLabel";
82− anchors { right: parent.right;
82+ anchors { right: parent.right;
83− left: parent.left;
83+ left: parent.left;
84− rightMargin: units.gu(1);
84+ rightMargin: units.gu(1);
85 top: titleLabel.bottom;
85 top: titleLabel.bottom;
86− }
86+ }
87− anchors.topMargin: units.dp(2);
87+ anchors.topMargin: units.dp(2);
88− elide: Text.ElideRight;
88+ elide: Text.ElideRight;
89− fontSize: "small";
89+ fontSize: "small";
90− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
90+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
91− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
91+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
92− visible: titleLabel.visible && titleLabel.text;
92+ visible: titleLabel.visible && titleLabel.text;
93− text: cardData && cardData["subtitle"] || "";
93+ text: cardData && cardData["subtitle"] || "";
94− font.weight: Font.Light;
94+ font.weight: Font.Light;
95− horizontalAlignment: root.headerAlignment;
95+ horizontalAlignment: root.headerAlignment;
96 }
96 }
97−,Image {
97+,Image {
98− id: emblemImage;
98+ id: emblemImage;
99− objectName: "emblemImage";
99+ objectName: "emblemImage";
100− anchors {
100+ anchors {
101− bottom: titleLabel.baseline;
101+ bottom: titleLabel.baseline;
102− right: parent.right;
102+ right: parent.right;
103− rightMargin: status === Image.Ready ? units.gu(1) : 0;
103+ rightMargin: status === Image.Ready ? units.gu(1) : 0;
104− }
104+ }
105− source: cardData && cardData["emblem"] || "";
105+ source: cardData && cardData["emblem"] || "";
106− width: height;
106+ width: height;
107− height: status === Image.Ready ? titleLabel.font.pixelSize : 0;
107+ height: status === Image.Ready ? titleLabel.font.pixelSize : 0;
108− fillMode: Image.PreserveAspectFit;
108+ fillMode: Image.PreserveAspectFit;
109 }
109 }
110−
110+
111 ]
111 ]
112 }
112 }
113UbuntuShape {
113UbuntuShape {
tests/plugins/Dash/cardcreator/7.res+119−119
@@ -1,140 +1,140 @@
1−AbstractButton {
1+AbstractButton {
2− id: root;
2+ id: root;
3− property var template;
3+ property var template;
4− property var components;
4+ property var components;
5− property var cardData;
5+ property var cardData;
6− property var artShapeBorderSource: undefined;
6+ property var artShapeBorderSource: undefined;
7− property real fontScale: 1.0;
7+ property real fontScale: 1.0;
8− property var scopeStyle: null;
8+ property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int headerAlignment: Text.AlignLeft;
10− property int fixedHeaderHeight: -1;
10+ property int fixedHeaderHeight: -1;
11− property size fixedArtShapeSize: Qt.size(-1, -1);
11+ property size fixedArtShapeSize: Qt.size(-1, -1);
12− readonly property string title: cardData && cardData["title"] || "";
12+ readonly property string title: cardData && cardData["title"] || "";
13− property bool asynchronous: true;
13+ property bool asynchronous: true;
14− property bool showHeader: true;
14+ property bool showHeader: true;
15− implicitWidth: childrenRect.width;
15+ implicitWidth: childrenRect.width;
16Loader {
16Loader {
17− id: backgroundLoader;
17+ id: backgroundLoader;
18− objectName: "backgroundLoader";
18+ objectName: "backgroundLoader";
19− anchors.fill: parent;
19+ anchors.fill: parent;
20− asynchronous: root.asynchronous;
20+ asynchronous: root.asynchronous;
21− visible: status == Loader.Ready;
21+ visible: status == Loader.Ready;
22− sourceComponent: UbuntuShape {
22+ sourceComponent: UbuntuShape {
23− objectName: "background";
23+ objectName: "background";
24− radius: "medium";
24+ radius: "medium";
25− color: getColor(0) || "white";
25+ color: getColor(0) || "white";
26− gradientColor: getColor(1) || color;
26+ gradientColor: getColor(1) || color;
27− anchors.fill: parent;
27+ anchors.fill: parent;
28− image: backgroundImage.source ? backgroundImage : null;
28+ image: backgroundImage.source ? backgroundImage : null;
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;
30− property Image backgroundImage: Image {
30+ property Image backgroundImage: Image {
31− objectName: "backgroundImage";
31+ objectName: "backgroundImage";
32− source: {
32+ source: {
33− if (cardData && typeof cardData["background"] === "string") return cardData["background"];
33+ if (cardData && typeof cardData["background"] === "string") return cardData["background"];
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"];
35− else return "";
35+ else return "";
36− }
36+ }
37− }
37+ }
38− function getColor(index) {
38+ function getColor(index) {
39− if (cardData && typeof cardData["background"] === "object"
39+ if (cardData && typeof cardData["background"] === "object"
40− && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {
40+ && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {
41− return cardData["background"]["elements"][index];
41+ return cardData["background"]["elements"][index];
42− } else if (template && typeof template["card-background"] === "object"
42+ } else if (template && typeof template["card-background"] === "object"
43− && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
43+ && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
44− return template["card-background"]["elements"][index];
44+ return template["card-background"]["elements"][index];
45− } else return undefined;
45+ } else return undefined;
46− }
46+ }
47− }
47+ }
48 }
48 }
49readonly property size artShapeSize: Qt.size(-1, -1);
49readonly property size artShapeSize: Qt.size(-1, -1);
50readonly property int headerHeight: row.height;
50readonly property int headerHeight: row.height;
51−Row {
51+Row {
52− id: row;
52+ id: row;
53− objectName: "outerRow";
53+ objectName: "outerRow";
54− property real margins: units.gu(1);
54+ property real margins: units.gu(1);
55− spacing: margins;
55+ spacing: margins;
56− height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
56+ height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
57− anchors { top: parent.top;
57+ anchors { top: parent.top;
58 topMargin: units.gu(1);
58 topMargin: units.gu(1);
59 left: parent.left;
59 left: parent.left;
60− }
60+ }
61− anchors.right: parent.right;
61+ anchors.right: parent.right;
62 anchors.margins: margins;
62 anchors.margins: margins;
63 anchors.rightMargin: 0;
63 anchors.rightMargin: 0;
64− data: [
64+ data: [
65−Image {
65+Image {
66− id: mascotImage;
66+ id: mascotImage;
67− objectName: "mascotImage";
67+ objectName: "mascotImage";
68− anchors { verticalCenter: parent.verticalCenter; }
68+ anchors { verticalCenter: parent.verticalCenter; }
69− readonly property int maxSize: Math.max(width, height) * 4;
69+ readonly property int maxSize: Math.max(width, height) * 4;
70− source: cardData && cardData["mascot"] || "";
70+ source: cardData && cardData["mascot"] || "";
71− width: units.gu(6);
71+ width: units.gu(6);
72− height: units.gu(5.625);
72+ height: units.gu(5.625);
73− sourceSize { width: maxSize; height: maxSize }
73+ sourceSize { width: maxSize; height: maxSize }
74− fillMode: Image.PreserveAspectCrop;
74+ fillMode: Image.PreserveAspectCrop;
75− horizontalAlignment: Image.AlignHCenter;
75+ horizontalAlignment: Image.AlignHCenter;
76− verticalAlignment: Image.AlignVCenter;
76+ verticalAlignment: Image.AlignVCenter;
77− visible: showHeader;
77+ visible: showHeader;
78 }
78 }
79
79
80−,Item {
80+,Item {
81− id: headerTitleContainer;
81+ id: headerTitleContainer;
82− anchors { verticalCenter: parent.verticalCenter; }
82+ anchors { verticalCenter: parent.verticalCenter; }
83− width: parent.width - x;
83+ width: parent.width - x;
84− implicitHeight: titleLabel.height + subtitleLabel.height + attributesRow.height;
84+ implicitHeight: titleLabel.height + subtitleLabel.height + attributesRow.height;
85− data: [
85+ data: [
86− Label {
86+ Label {
87− id: titleLabel;
87+ id: titleLabel;
88− objectName: "titleLabel";
88+ objectName: "titleLabel";
89− anchors { right: parent.right;
89+ anchors { right: parent.right;
90− rightMargin: units.gu(1);
90+ rightMargin: units.gu(1);
91− left: parent.left;
91+ left: parent.left;
92− top: parent.top; }
92+ top: parent.top; }
93− elide: Text.ElideRight;
93+ elide: Text.ElideRight;
94− fontSize: "small";
94+ fontSize: "small";
95− wrapMode: Text.Wrap;
95+ wrapMode: Text.Wrap;
96− maximumLineCount: 2;
96+ maximumLineCount: 2;
97− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
97+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
98− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
98+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
99− visible: showHeader ;
99+ visible: showHeader ;
100− text: root.title;
100+ text: root.title;
101− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
101+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
102− horizontalAlignment: root.headerAlignment;
102+ horizontalAlignment: root.headerAlignment;
103 }
103 }
104−,Label {
104+,Label {
105− id: subtitleLabel;
105+ id: subtitleLabel;
106− objectName: "subtitleLabel";
106+ objectName: "subtitleLabel";
107− anchors { right: parent.right;
107+ anchors { right: parent.right;
108− left: parent.left;
108+ left: parent.left;
109− rightMargin: units.gu(1);
109+ rightMargin: units.gu(1);
110− top: titleLabel.bottom;
110+ top: titleLabel.bottom;
111− }
111+ }
112− anchors.topMargin: units.dp(2);
112+ anchors.topMargin: units.dp(2);
113− elide: Text.ElideRight;
113+ elide: Text.ElideRight;
114− fontSize: "small";
114+ fontSize: "small";
115− font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
116− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
116+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
117− visible: titleLabel.visible && titleLabel.text;
117+ visible: titleLabel.visible && titleLabel.text;
118− text: cardData && cardData["subtitle"] || "";
118+ text: cardData && cardData["subtitle"] || "";
119− font.weight: Font.Light;
119+ font.weight: Font.Light;
120− horizontalAlignment: root.headerAlignment;
120+ horizontalAlignment: root.headerAlignment;
121 }
121 }
122−,CardAttributes {
122+,CardAttributes {
123− id: attributesRow;
123+ id: attributesRow;
124− objectName: "attributesRow";
124+ objectName: "attributesRow";
125 anchors { right: parent.right;
125 anchors { right: parent.right;
126 left: parent.left;
126 left: parent.left;
127 rightMargin: units.gu(1);
127 rightMargin: units.gu(1);
128− top: subtitleLabel.bottom;
128+ top: subtitleLabel.bottom;
129− }
129+ }
130− color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
130+ color: backgroundLoader.active && backgroundLoader.item && backgroundLoader.item.luminance < 0.7 ? "white" : (root.scopeStyle ? root.scopeStyle.foreground : "grey");
131− model: cardData && cardData["attributes"];
131+ model: cardData && cardData["attributes"];
132 }
132 }
133−
133+
134 ]
134 ]
135 }
135 }
136−
136+
137− ]
137+ ]
138 }
138 }
139UbuntuShape {
139UbuntuShape {
140 id: touchdown;
140 id: touchdown;