b65d58b · unity8 · git.iko.soy

plugins/Dash/CardCreator.js+4

compare with xenial

unifiedsplit

@@ -84,6 +84,8 @@ var kArtProportionalShapeCode = 'ProportionalShape { \n\

84// %8 is used as image fallback

85var kArtShapeHolderCode = 'Loader { \n\

86 id: artShapeLoader; \n\

87+ height: root.fixedArtShapeSize.height; \n\

88+ width: root.fixedArtShapeSize.width; \n\

87 anchors { %1 } \n\

89 anchors { %1 } \n\

88 objectName: "artShapeLoader"; \n\

90 objectName: "artShapeLoader"; \n\

89 readonly property string cardArt: cardData && cardData["art"] || %8; \n\

91 readonly property string cardArt: cardData && cardData["art"] || %8; \n\

@@ -122,6 +124,8 @@ var kArtShapeHolderCode = 'Loader { \n\

122// %8 is used as image fallback

124// %8 is used as image fallback

123var kArtShapeHolderCodeCardToolCard = 'Loader { \n\

125var kArtShapeHolderCodeCardToolCard = 'Loader { \n\

124 id: artShapeLoader; \n\

126 id: artShapeLoader; \n\

127+ height: root.fixedArtShapeSize.height; \n\

128+ width: root.fixedArtShapeSize.width; \n\

125 anchors { %1 } \n\

129 anchors { %1 } \n\

126 objectName: "artShapeLoader"; \n\

130 objectName: "artShapeLoader"; \n\

127 readonly property string cardArt: cardData && cardData["art"] || %8; \n\

131 readonly property string cardArt: cardData && cardData["art"] || %8; \n\

tests/plugins/Dash/cardcreator/1.res+2

@@ -14,6 +14,8 @@ signal action(var actionId);

14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

15Loader {

16 id: artShapeLoader;

17+ height: root.fixedArtShapeSize.height; \n\

18+ width: root.fixedArtShapeSize.width; \n\

17 anchors { horizontalCenter: parent.horizontalCenter; }

19 anchors { horizontalCenter: parent.horizontalCenter; }

18 objectName: "artShapeLoader";

20 objectName: "artShapeLoader";

19 readonly property string cardArt: cardData && cardData["art"] || "";

21 readonly property string cardArt: cardData && cardData["art"] || "";

tests/plugins/Dash/cardcreator/1.res.cardcreator+2

@@ -12,6 +12,8 @@ signal action(var actionId);

12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

13Loader {

14 id: artShapeLoader;

15+ height: root.fixedArtShapeSize.height; \n\

16+ width: root.fixedArtShapeSize.width; \n\

15 anchors { horizontalCenter: parent.horizontalCenter; }

17 anchors { horizontalCenter: parent.horizontalCenter; }

16 objectName: "artShapeLoader";

18 objectName: "artShapeLoader";

17 readonly property string cardArt: cardData && cardData["art"] || "";

19 readonly property string cardArt: cardData && cardData["art"] || "";

tests/plugins/Dash/cardcreator/11.res+2

@@ -52,6 +52,8 @@ Loader {

52readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

53Loader {

54 id: artShapeLoader;

55+ height: root.fixedArtShapeSize.height; \n\

56+ width: root.fixedArtShapeSize.width; \n\

55 anchors { horizontalCenter: parent.horizontalCenter; }

57 anchors { horizontalCenter: parent.horizontalCenter; }

56 objectName: "artShapeLoader";

58 objectName: "artShapeLoader";

57 readonly property string cardArt: cardData && cardData["art"] || decodeURI("%5C");

59 readonly property string cardArt: cardData && cardData["art"] || decodeURI("%5C");

tests/plugins/Dash/cardcreator/11.res.cardcreator+2

@@ -50,6 +50,8 @@ Loader {

50readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

51Loader {

52 id: artShapeLoader;

53+ height: root.fixedArtShapeSize.height; \n\

54+ width: root.fixedArtShapeSize.width; \n\

53 anchors { horizontalCenter: parent.horizontalCenter; }

55 anchors { horizontalCenter: parent.horizontalCenter; }

54 objectName: "artShapeLoader";

56 objectName: "artShapeLoader";

55 readonly property string cardArt: cardData && cardData["art"] || "";

57 readonly property string cardArt: cardData && cardData["art"] || "";

tests/plugins/Dash/cardcreator/12.res+2

@@ -14,6 +14,8 @@ signal action(var actionId);

14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

15Loader {

16 id: artShapeLoader;

17+ height: root.fixedArtShapeSize.height; \n\

18+ width: root.fixedArtShapeSize.width; \n\

17 anchors { horizontalCenter: parent.horizontalCenter; }

19 anchors { horizontalCenter: parent.horizontalCenter; }

18 objectName: "artShapeLoader";

20 objectName: "artShapeLoader";

19 readonly property string cardArt: cardData && cardData["art"] || "";

21 readonly property string cardArt: cardData && cardData["art"] || "";

tests/plugins/Dash/cardcreator/12.res.cardcreator+2

@@ -12,6 +12,8 @@ signal action(var actionId);

12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

13Loader {

14 id: artShapeLoader;

15+ height: root.fixedArtShapeSize.height; \n\

16+ width: root.fixedArtShapeSize.width; \n\

15 anchors { horizontalCenter: parent.horizontalCenter; }

17 anchors { horizontalCenter: parent.horizontalCenter; }

16 objectName: "artShapeLoader";

18 objectName: "artShapeLoader";

17 readonly property string cardArt: cardData && cardData["art"] || "";

19 readonly property string cardArt: cardData && cardData["art"] || "";

tests/plugins/Dash/cardcreator/3.res+2

@@ -14,6 +14,8 @@ signal action(var actionId);

14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

15Loader {

16 id: artShapeLoader;

17+ height: root.fixedArtShapeSize.height; \n\

18+ width: root.fixedArtShapeSize.width; \n\

17 anchors { horizontalCenter: parent.horizontalCenter; }

19 anchors { horizontalCenter: parent.horizontalCenter; }

18 objectName: "artShapeLoader";

20 objectName: "artShapeLoader";

19 readonly property string cardArt: cardData && cardData["art"] || decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");

21 readonly property string cardArt: cardData && cardData["art"] || decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");

tests/plugins/Dash/cardcreator/3.res.cardcreator+2

@@ -12,6 +12,8 @@ signal action(var actionId);

12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

13Loader {

14 id: artShapeLoader;

15+ height: root.fixedArtShapeSize.height; \n\

16+ width: root.fixedArtShapeSize.width; \n\

15 anchors { horizontalCenter: parent.horizontalCenter; }

17 anchors { horizontalCenter: parent.horizontalCenter; }

16 objectName: "artShapeLoader";

18 objectName: "artShapeLoader";

17 readonly property string cardArt: cardData && cardData["art"] || "";

19 readonly property string cardArt: cardData && cardData["art"] || "";

tests/plugins/Dash/cardcreator/5.res+2

@@ -14,6 +14,8 @@ signal action(var actionId);

14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

15Loader {

16 id: artShapeLoader;

17+ height: root.fixedArtShapeSize.height; \n\

18+ width: root.fixedArtShapeSize.width; \n\

17 anchors { horizontalCenter: parent.horizontalCenter; }

19 anchors { horizontalCenter: parent.horizontalCenter; }

18 objectName: "artShapeLoader";

20 objectName: "artShapeLoader";

19 readonly property string cardArt: cardData && cardData["art"] || "";

21 readonly property string cardArt: cardData && cardData["art"] || "";

tests/plugins/Dash/cardcreator/5.res.cardcreator+2

@@ -12,6 +12,8 @@ signal action(var actionId);

12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

13Loader {

14 id: artShapeLoader;

15+ height: root.fixedArtShapeSize.height; \n\

16+ width: root.fixedArtShapeSize.width; \n\

15 anchors { horizontalCenter: parent.horizontalCenter; }

17 anchors { horizontalCenter: parent.horizontalCenter; }

16 objectName: "artShapeLoader";

18 objectName: "artShapeLoader";

17 readonly property string cardArt: cardData && cardData["art"] || "";

19 readonly property string cardArt: cardData && cardData["art"] || "";