05f351d · unity8 · git.iko.soy

git.iko.soy/unity8

Adapt tests

commit05f351d488a9ed8d23e8f8f1457d4fe760a47cbd authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 3 Mar 2016, 13:03 (11 years ago) parent7189f31

8 files changed+25−81

compare with xenial

unifiedsplit

tests/plugins/Dash/cardcreator/1.res+4−11 tests/plugins/Dash/cardcreator/1.res.cardcreator+3−10 tests/plugins/Dash/cardcreator/11.res+3−10 tests/plugins/Dash/cardcreator/11.res.cardcreator+3−10 tests/plugins/Dash/cardcreator/3.res+3−10 tests/plugins/Dash/cardcreator/3.res.cardcreator+3−10 tests/plugins/Dash/cardcreator/5.res+3−10 tests/plugins/Dash/cardcreator/5.res.cardcreator+3−10

tests/plugins/Dash/cardcreator/1.res+4−11

@@ -30,14 +30,6 @@ Item {

3030 objectName: "artShape";

3131 visible: image.status == Image.Ready;

3232 readonly property alias image: artImage;

33− ShaderEffectSource {

34− id: artShapeSource;

35− sourceItem: artImage;

36− anchors.centerIn: parent;

37− width: 1;

38− height: 1;

39− hideSource: true;

40− }

4133 Loader {

4234 anchors.fill: parent;

4335 visible: true;

@@ -45,7 +37,7 @@ Item {

4537 Component {

4638 id: artShapeShapeComponent;

4739 UbuntuShape {

48− source: artShapeSource;

40+ source: artImage;

4941 sourceFillMode: UbuntuShape.PreserveAspectCrop;

5042 radius: "medium";

5143 aspect: {

@@ -60,7 +52,7 @@ Item {

6052 }

6153 Component {

6254 id: artShapeIconComponent;

63− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

55+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

6456 }

6557 }

6658 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -81,7 +73,8 @@ Item {

8173 objectName: "artImage";

8274 source: artShapeLoader.cardArt;

8375 asynchronous: true;

84− width: root.width;

76+ visible: !true;

77+ width: root.width;

8578 height: width / artShape.aspect;

8679 }

8780 }

tests/plugins/Dash/cardcreator/1.res.cardcreator+3−10

@@ -29,14 +29,6 @@ Item {

2929 objectName: "artShape";

3030 visible: image.status == Image.Ready;

3131 readonly property alias image: artImage;

32− ShaderEffectSource {

33− id: artShapeSource;

34− sourceItem: artImage;

35− anchors.centerIn: parent;

36− width: 1;

37− height: 1;

38− hideSource: true;

39− }

4032 Loader {

4133 anchors.fill: parent;

4234 visible: true;

@@ -44,7 +36,7 @@ Item {

4436 Component {

4537 id: artShapeShapeComponent;

4638 UbuntuShape {

47− source: artShapeSource;

39+ source: artImage;

4840 sourceFillMode: UbuntuShape.PreserveAspectCrop;

4941 radius: "medium";

5042 aspect: {

@@ -59,7 +51,7 @@ Item {

5951 }

6052 Component {

6153 id: artShapeIconComponent;

62− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

54+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

6355 }

6456 }

6557 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -80,6 +72,7 @@ Item {

8072 objectName: "artImage";

8173 source: artShapeLoader.cardArt;

8274 asynchronous: false;

75+ visible: !true;

8376 width: root.width;

8477 height: width / artShape.aspect;

8578 }

tests/plugins/Dash/cardcreator/11.res+3−10

@@ -68,14 +68,6 @@ Item {

6868 objectName: "artShape";

6969 visible: image.status == Image.Ready;

7070 readonly property alias image: artImage;

71− ShaderEffectSource {

72− id: artShapeSource;

73− sourceItem: artImage;

74− anchors.centerIn: parent;

75− width: 1;

76− height: 1;

77− hideSource: true;

78− }

7971 Loader {

8072 anchors.fill: parent;

8173 visible: true;

@@ -83,7 +75,7 @@ Item {

8375 Component {

8476 id: artShapeShapeComponent;

8577 UbuntuShape {

86− source: artShapeSource;

78+ source: artImage;

8779 sourceFillMode: UbuntuShape.PreserveAspectCrop;

8880 radius: "medium";

8981 aspect: {

@@ -98,7 +90,7 @@ Item {

9890 }

9991 Component {

10092 id: artShapeIconComponent;

101− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

93+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

10294 }

10395 }

10496 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -119,6 +111,7 @@ Item {

119111 objectName: "artImage";

120112 source: artShapeLoader.cardArt;

121113 asynchronous: true;

114+ visible: !true;

122115 width: root.width;

123116 height: width / artShape.aspect;

124117 onStatusChanged: if (status === Image.Error) source = decodeURI("%5C");

tests/plugins/Dash/cardcreator/11.res.cardcreator+3−10

@@ -67,14 +67,6 @@ Item {

6767 objectName: "artShape";

6868 visible: image.status == Image.Ready;

6969 readonly property alias image: artImage;

70− ShaderEffectSource {

71− id: artShapeSource;

72− sourceItem: artImage;

73− anchors.centerIn: parent;

74− width: 1;

75− height: 1;

76− hideSource: true;

77− }

7870 Loader {

7971 anchors.fill: parent;

8072 visible: true;

@@ -82,7 +74,7 @@ Item {

8274 Component {

8375 id: artShapeShapeComponent;

8476 UbuntuShape {

85− source: artShapeSource;

77+ source: artImage;

8678 sourceFillMode: UbuntuShape.PreserveAspectCrop;

8779 radius: "medium";

8880 aspect: {

@@ -97,7 +89,7 @@ Item {

9789 }

9890 Component {

9991 id: artShapeIconComponent;

100− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

92+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

10193 }

10294 }

10395 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -118,6 +110,7 @@ Item {

118110 objectName: "artImage";

119111 source: artShapeLoader.cardArt;

120112 asynchronous: false;

113+ visible: !true;

121114 width: root.width;

122115 height: width / artShape.aspect;

123116 }

tests/plugins/Dash/cardcreator/3.res+3−10

@@ -30,14 +30,6 @@ Item {

3030 objectName: "artShape";

3131 visible: image.status == Image.Ready;

3232 readonly property alias image: artImage;

33− ShaderEffectSource {

34− id: artShapeSource;

35− sourceItem: artImage;

36− anchors.centerIn: parent;

37− width: 1;

38− height: 1;

39− hideSource: true;

40− }

4133 Loader {

4234 anchors.fill: parent;

4335 visible: true;

@@ -45,7 +37,7 @@ Item {

4537 Component {

4638 id: artShapeShapeComponent;

4739 UbuntuShape {

48− source: artShapeSource;

40+ source: artImage;

4941 sourceFillMode: UbuntuShape.PreserveAspectCrop;

5042 radius: "medium";

5143 aspect: {

@@ -60,7 +52,7 @@ Item {

6052 }

6153 Component {

6254 id: artShapeIconComponent;

63− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

55+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

6456 }

6557 }

6658 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -81,6 +73,7 @@ Item {

8173 objectName: "artImage";

8274 source: artShapeLoader.cardArt;

8375 asynchronous: true;

76+ visible: !true;

8477 width: root.width;

8578 height: width / artShape.aspect;

8679 onStatusChanged: if (status === Image.Error) source = decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");

tests/plugins/Dash/cardcreator/3.res.cardcreator+3−10

@@ -29,14 +29,6 @@ Item {

2929 objectName: "artShape";

3030 visible: image.status == Image.Ready;

3131 readonly property alias image: artImage;

32− ShaderEffectSource {

33− id: artShapeSource;

34− sourceItem: artImage;

35− anchors.centerIn: parent;

36− width: 1;

37− height: 1;

38− hideSource: true;

39− }

4032 Loader {

4133 anchors.fill: parent;

4234 visible: true;

@@ -44,7 +36,7 @@ Item {

4436 Component {

4537 id: artShapeShapeComponent;

4638 UbuntuShape {

47− source: artShapeSource;

39+ source: artImage;

4840 sourceFillMode: UbuntuShape.PreserveAspectCrop;

4941 radius: "medium";

5042 aspect: {

@@ -59,7 +51,7 @@ Item {

5951 }

6052 Component {

6153 id: artShapeIconComponent;

62− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

54+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

6355 }

6456 }

6557 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -80,6 +72,7 @@ Item {

8072 objectName: "artImage";

8173 source: artShapeLoader.cardArt;

8274 asynchronous: false;

75+ visible: !true;

8376 width: root.width;

8477 height: width / artShape.aspect;

8578 }

tests/plugins/Dash/cardcreator/5.res+3−10

@@ -30,14 +30,6 @@ Item {

3030 objectName: "artShape";

3131 visible: image.status == Image.Ready;

3232 readonly property alias image: artImage;

33− ShaderEffectSource {

34− id: artShapeSource;

35− sourceItem: artImage;

36− anchors.centerIn: parent;

37− width: 1;

38− height: 1;

39− hideSource: false;

40− }

4133 Loader {

4234 anchors.fill: parent;

4335 visible: false;

@@ -45,7 +37,7 @@ Item {

4537 Component {

4638 id: artShapeShapeComponent;

4739 UbuntuShape {

48− source: artShapeSource;

40+ source: artImage;

4941 sourceFillMode: UbuntuShape.PreserveAspectCrop;

5042 radius: "medium";

5143 aspect: {

@@ -60,7 +52,7 @@ Item {

6052 }

6153 Component {

6254 id: artShapeIconComponent;

63− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

55+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

6456 }

6557 }

6658 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -81,6 +73,7 @@ Item {

8173 objectName: "artImage";

8274 source: artShapeLoader.cardArt;

8375 asynchronous: true;

76+ visible: !false;

8477 width: root.width;

8578 height: width / artShape.aspect;

8679 }

tests/plugins/Dash/cardcreator/5.res.cardcreator+3−10

@@ -29,14 +29,6 @@ Item {

2929 objectName: "artShape";

3030 visible: image.status == Image.Ready;

3131 readonly property alias image: artImage;

32− ShaderEffectSource {

33− id: artShapeSource;

34− sourceItem: artImage;

35− anchors.centerIn: parent;

36− width: 1;

37− height: 1;

38− hideSource: false;

39− }

4032 Loader {

4133 anchors.fill: parent;

4234 visible: false;

@@ -44,7 +36,7 @@ Item {

4436 Component {

4537 id: artShapeShapeComponent;

4638 UbuntuShape {

47− source: artShapeSource;

39+ source: artImage;

4840 sourceFillMode: UbuntuShape.PreserveAspectCrop;

4941 radius: "medium";

5042 aspect: {

@@ -59,7 +51,7 @@ Item {

5951 }

6052 Component {

6153 id: artShapeIconComponent;

62− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

54+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

6355 }

6456 }

6557 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -80,6 +72,7 @@ Item {

8072 objectName: "artImage";

8173 source: artShapeLoader.cardArt;

8274 asynchronous: false;

75+ visible: !false;

8376 width: root.width;

8477 height: width / artShape.aspect;

8578 }