git.iko.soy/unity8
on xenial help sign in
Merge and fix
4603daaAndrea Cimitan
plugins/Dash/CardCreator.js+1−1
compare with xenial
unifiedsplit
@@ -30,7 +30,7 @@ var kBackgroundLoaderCode = 'Loader {\n\
30 radius: "medium"; \n\
30 radius: "medium"; \n\
31 backgroundColor: getColor(0) || "white"; \n\
31 backgroundColor: getColor(0) || "white"; \n\
32 secondaryBackgroundColor: getColor(1) || backgroundColor; \n\
32 secondaryBackgroundColor: getColor(1) || backgroundColor; \n\
33− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor; \n\
33+ backgroundMode: UbuntuShape.VerticalGradient; \n\
34 anchors.fill: parent; \n\
34 anchors.fill: parent; \n\
35 source: backgroundImage.source ? backgroundImage : null; \n\
35 source: backgroundImage.source ? backgroundImage : null; \n\
36 property real luminance: Style.luminance(backgroundColor); \n\
36 property real luminance: Style.luminance(backgroundColor); \n\
tests/plugins/Dash/cardcreator/2.res+2−2
@@ -25,8 +25,8 @@ Loader {
25 radius: "medium";
25 radius: "medium";
26 backgroundColor: getColor(0) || "white";
26 backgroundColor: getColor(0) || "white";
27 secondaryBackgroundColor: getColor(1) || backgroundColor;
27 secondaryBackgroundColor: getColor(1) || backgroundColor;
28− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor;
28+ backgroundMode: UbuntuShape.VerticalGradient;
29− anchors.fill: parent;
29+ anchors.fill: parent;
30 source: backgroundImage.source ? backgroundImage : null;
30 source: backgroundImage.source ? backgroundImage : null;
31 property real luminance: Style.luminance(backgroundColor);
31 property real luminance: Style.luminance(backgroundColor);
32 property Image backgroundImage: Image {
32 property Image backgroundImage: Image {
tests/plugins/Dash/cardcreator/6.res+2−2
@@ -25,8 +25,8 @@ Loader {
25 radius: "medium";
25 radius: "medium";
26 backgroundColor: getColor(0) || "white";
26 backgroundColor: getColor(0) || "white";
27 secondaryBackgroundColor: getColor(1) || backgroundColor;
27 secondaryBackgroundColor: getColor(1) || backgroundColor;
28− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor;
28+ backgroundMode: UbuntuShape.VerticalGradient;
29− anchors.fill: parent;
29+ anchors.fill: parent;
30 source: backgroundImage.source ? backgroundImage : null;
30 source: backgroundImage.source ? backgroundImage : null;
31 property real luminance: Style.luminance(backgroundColor);
31 property real luminance: Style.luminance(backgroundColor);
32 property Image backgroundImage: Image {
32 property Image backgroundImage: Image {
tests/plugins/Dash/cardcreator/7.res+2−2
@@ -25,8 +25,8 @@ Loader {
25 radius: "medium";
25 radius: "medium";
26 backgroundColor: getColor(0) || "white";
26 backgroundColor: getColor(0) || "white";
27 secondaryBackgroundColor: getColor(1) || backgroundColor;
27 secondaryBackgroundColor: getColor(1) || backgroundColor;
28− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor;
28+ backgroundMode: UbuntuShape.VerticalGradient;
29− anchors.fill: parent;
29+ anchors.fill: parent;
30 source: backgroundImage.source ? backgroundImage : null;
30 source: backgroundImage.source ? backgroundImage : null;
31 property real luminance: Style.luminance(backgroundColor);
31 property real luminance: Style.luminance(backgroundColor);
32 property Image backgroundImage: Image {
32 property Image backgroundImage: Image {
tests/plugins/Dash/cardcreator/8.res+1−1
@@ -25,7 +25,7 @@ Loader {
25 radius: "medium";
25 radius: "medium";
26 backgroundColor: getColor(0) || "white";
26 backgroundColor: getColor(0) || "white";
27 secondaryBackgroundColor: getColor(1) || backgroundColor;
27 secondaryBackgroundColor: getColor(1) || backgroundColor;
28− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor;
28+ backgroundMode: UbuntuShape.VerticalGradient;
29 anchors.fill: parent;
29 anchors.fill: parent;
30 source: backgroundImage.source ? backgroundImage : null;
30 source: backgroundImage.source ? backgroundImage : null;
31 property real luminance: Style.luminance(backgroundColor);
31 property real luminance: Style.luminance(backgroundColor);
tests/qmltests/Dash/tst_DashContent.qml+1−1
@@ -215,7 +215,7 @@ Item {
215 verify(pageHeader, "Could not find the scope page header.");
215 verify(pageHeader, "Could not find the scope page header.");
216 var innerHeader = findChild(pageHeader, "innerPageHeader");
216 var innerHeader = findChild(pageHeader, "innerPageHeader");
217 verify(innerHeader, "Could not find the scope page header.");
217 verify(innerHeader, "Could not find the scope page header.");
218− compare(innerHeader.title, scopesModel.getScope(data.index).name);
218+ compare(innerHeader.config.title, scopesModel.getScope(data.index).name);
219 }
219 }
220
220
221 function test_is_active_data() {
221 function test_is_active_data() {
tests/qmltests/Dash/tst_PreviewListView.qml+1−1
@@ -91,7 +91,7 @@ Rectangle {
91 var header = findChild(listView, "innerPageHeader");
91 var header = findChild(listView, "innerPageHeader");
92 verify(header, "Could not find the preview header");
92 verify(header, "Could not find the preview header");
93
93
94− compare(header.title, "Mock Scope");
94+ compare(header.config.title, "Mock Scope");
95 }
95 }
96
96
97 function test_header_style() {
97 function test_header_style() {