Flat cards
commit02204659c399b93704d56321fe115924fa39d37c
authorAndrea Cimitan <andrea.cimitan@gmail.com>
dateMon 3 Oct 2016, 13:50 (10 years ago)
parentc898524
plugins/Dash/CardCreator.js+1−1
@@ -439,7 +439,7 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
439439 code = 'AbstractButton { \n\
440440 id: root; \n\
441441 property var cardData; \n\
442− property string backgroundShapeStyle: "inset"; \n\
442+ property string backgroundShapeStyle: "flat"; \n\
443443 property real fontScale: 1.0; \n\
444444 property var scopeStyle: null; \n\
445445 readonly property string title: cardData && cardData["title"] || ""; \n\
qml/Dash/CardGrid.qml+1−1
@@ -25,7 +25,7 @@ DashRenderer {
2525 if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;
2626 return cardTool.template["collapsed-rows"];
2727 }
28− property string backgroundShapeStyle: "inset";
28+ property string backgroundShapeStyle: "flat";
2929 property alias minimumHorizontalSpacing: grid.minimumHorizontalSpacing
3030
3131 expandedHeight: grid.totalContentHeight
qml/Dash/CardTool.qml+1−1
@@ -69,7 +69,7 @@ Item {
6969
7070
7171 // Not readonly because gets overwritten from GenericScopeView in some cases
72− property string artShapeStyle: categoryLayout === "carousel" ? "shadow" : "inset"
72+ property string artShapeStyle: categoryLayout === "carousel" ? "shadow" : "flat"
7373
7474 // FIXME ? This seems like it should not be needed, but on Qt 5.4 + phone
7575 // we are doing unneeded calls to getCardComponent with artShapeStyle and categoryLayout being empty
tests/plugins/Dash/cardcreator/1.res+2−2
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
@@ -32,7 +32,7 @@ Loader {
3232 source: artImage;
3333 sourceFillMode: UbuntuShape.PreserveAspectCrop;
3434 radius: "medium";
35− aspect: UbuntuShape.Inset;
35+ aspect: UbuntuShape.Flat;
3636 }
3737 width: root.fixedArtShapeSize.width;
3838 height: root.fixedArtShapeSize.height;
tests/plugins/Dash/cardcreator/1.res.cardcreator+2−2
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
@@ -29,7 +29,7 @@ Loader {
2929 source: artImage;
3030 sourceFillMode: UbuntuShape.PreserveAspectCrop;
3131 radius: "medium";
32− aspect: UbuntuShape.Inset;
32+ aspect: UbuntuShape.Flat;
3333 }
3434 width: image.status !== Image.Ready ? 0 : image.width;
3535 height: image.status !== Image.Ready ? 0 : image.height;
tests/plugins/Dash/cardcreator/1.tst+1−1
@@ -1,4 +1,4 @@
11template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
22components: {"art":{"aspect-ratio":1.6,"field":"art"},"title":{"field":"title"},"attributes":{}}
3−artShapeStyle: inset
3+artShapeStyle: flat
44result: 1.res
tests/plugins/Dash/cardcreator/10.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/10.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/11.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/11.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/12.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/12.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/2.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/2.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/3.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/3.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/4.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/4.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/5.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/5.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/6.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/6.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/6.tst+1−1
@@ -1,4 +1,4 @@
11template: {"card-background":"http://assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu-grey.png","card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}
22components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"subtitle":{"field":"author"},"title":{"field":"title"},"emblem":{"field":"source"},"attributes":{}}
3−artShapeStyle: inset
3+artShapeStyle: flat
44result: 6.res
tests/plugins/Dash/cardcreator/7.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/7.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/8.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/8.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/8.tst+1−1
@@ -1,4 +1,4 @@
11template: {"card-background":{"elements":["#E9E9E9","#E9AAE9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}
22components: {"background":{"field":"background"},"mascot":{"field":"icon"},"title":{"field":"title"},"attributes":{}}
3−artShapeStyle: inset
3+artShapeStyle: flat
44result: 8.res
tests/plugins/Dash/cardcreator/9.res+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/9.res.cardcreator+1−1
@@ -1,7 +1,7 @@
11AbstractButton {
22 id: root;
33 property var cardData;
4− property string backgroundShapeStyle: "inset";
4+ property string backgroundShapeStyle: "flat";
55 property real fontScale: 1.0;
66 property var scopeStyle: null;
77 readonly property string title: cardData && cardData["title"] || "";
tests/plugins/Dash/cardcreator/9.tst+1−1
@@ -1,4 +1,4 @@
11template: {"card-layout":"horizontal","card-size":"medium","category-layout":"grid","collapsed-rows":2,"quick-preview-type": "audio"}
22components: {"art":{"aspect-ratio":1},"subtitle":{"field":"author"},"title":{"field":"title"}, "quickPreviewData": "quickPreviewData"}
3−artShapeStyle: inset
3+artShapeStyle: flat
44result: 9.res