Merge and fix
commit4603daa0ba6c84b2eea879ac7b2a181136299af9
authorAndrea Cimitan <andrea.cimitan@gmail.com>
dateThu 20 Aug 2015, 11:45 (11 years ago)
parent2d8cb0f6df2dc6
plugins/Dash/CardCreator.js+1−1
@@ -30,7 +30,7 @@ var kBackgroundLoaderCode = 'Loader {\n\
3030 radius: "medium"; \n\
3131 backgroundColor: getColor(0) || "white"; \n\
3232 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\
3434 anchors.fill: parent; \n\
3535 source: backgroundImage.source ? backgroundImage : null; \n\
3636 property real luminance: Style.luminance(backgroundColor); \n\
tests/plugins/Dash/cardcreator/2.res+2−2
@@ -25,8 +25,8 @@ Loader {
2525 radius: "medium";
2626 backgroundColor: getColor(0) || "white";
2727 secondaryBackgroundColor: getColor(1) || backgroundColor;
28− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor;
29− anchors.fill: parent;
28+ backgroundMode: UbuntuShape.VerticalGradient;
29+ anchors.fill: parent;
3030 source: backgroundImage.source ? backgroundImage : null;
3131 property real luminance: Style.luminance(backgroundColor);
3232 property Image backgroundImage: Image {
tests/plugins/Dash/cardcreator/6.res+2−2
@@ -25,8 +25,8 @@ Loader {
2525 radius: "medium";
2626 backgroundColor: getColor(0) || "white";
2727 secondaryBackgroundColor: getColor(1) || backgroundColor;
28− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor;
29− anchors.fill: parent;
28+ backgroundMode: UbuntuShape.VerticalGradient;
29+ anchors.fill: parent;
3030 source: backgroundImage.source ? backgroundImage : null;
3131 property real luminance: Style.luminance(backgroundColor);
3232 property Image backgroundImage: Image {
tests/plugins/Dash/cardcreator/7.res+2−2
@@ -25,8 +25,8 @@ Loader {
2525 radius: "medium";
2626 backgroundColor: getColor(0) || "white";
2727 secondaryBackgroundColor: getColor(1) || backgroundColor;
28− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor;
29− anchors.fill: parent;
28+ backgroundMode: UbuntuShape.VerticalGradient;
29+ anchors.fill: parent;
3030 source: backgroundImage.source ? backgroundImage : null;
3131 property real luminance: Style.luminance(backgroundColor);
3232 property Image backgroundImage: Image {
tests/plugins/Dash/cardcreator/8.res+1−1
@@ -25,7 +25,7 @@ Loader {
2525 radius: "medium";
2626 backgroundColor: getColor(0) || "white";
2727 secondaryBackgroundColor: getColor(1) || backgroundColor;
28− backgroundMode: cardData && typeof cardData["background"] === "object" && cardData["background"]["type"] === "gradient" ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor;
28+ backgroundMode: UbuntuShape.VerticalGradient;
2929 anchors.fill: parent;
3030 source: backgroundImage.source ? backgroundImage : null;
3131 property real luminance: Style.luminance(backgroundColor);
tests/qmltests/Dash/tst_DashContent.qml+1−1
@@ -215,7 +215,7 @@ Item {
215215 verify(pageHeader, "Could not find the scope page header.");
216216 var innerHeader = findChild(pageHeader, "innerPageHeader");
217217 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);
219219 }
220220
221221 function test_is_active_data() {
tests/qmltests/Dash/tst_PreviewListView.qml+1−1
@@ -91,7 +91,7 @@ Rectangle {
9191 var header = findChild(listView, "innerPageHeader");
9292 verify(header, "Could not find the preview header");
9393
94− compare(header.title, "Mock Scope");
94+ compare(header.config.title, "Mock Scope");
9595 }
9696
9797 function test_header_style() {