@@ -56,23 +56,23 @@ Rectangle {
5656 when: windowShown
5757
5858 function test_loadImage() {
59− var lazyImage = findChild(zoomableImage, "lazyImage");
59+ var imageRenderer = findChild(zoomableImage, "imageRenderer");
6060
6161 zoomableImage.source = widgetData0["source"];
6262 zoomableImage.zoomable = widgetData0["zoomable"];
6363 waitForRendering(zoomableImage);
64− tryCompare(zoomableImage, "imageState", "default");
64+ tryCompare(zoomableImage, "imageStatus", Image.Null);
6565
66− signalSpy.signalName = "onStateChanged";
67− signalSpy.target = lazyImage;
66+ signalSpy.signalName = "onStatusChanged";
67+ signalSpy.target = imageRenderer;
6868 signalSpy.clear();
6969
7070 zoomableImage.source = widgetData1["source"];
7171 zoomableImage.zoomable = widgetData1["zoomable"];
72− waitForRendering(lazyImage);
73− tryCompareFunction(function() { return get_filename(lazyImage.source.toString()) === get_filename(widgetData1["source"]); }, true);
72+ waitForRendering(imageRenderer);
73+ tryCompareFunction(function() { return get_filename(imageRenderer.source.toString()) === get_filename(widgetData1["source"]); }, true);
7474 waitForRendering(zoomableImage);
75− tryCompare(zoomableImage, "imageState", "ready");
75+ tryCompare(zoomableImage, "imageStatus", Image.Ready);
7676 compare (signalSpy.count, 1);
7777 }
7878
@@ -84,15 +84,15 @@ Rectangle {
8484
8585 function test_mousewheel() {
8686 var image = findChild(zoomableImage, "image");
87− var lazyImage = findChild(zoomableImage, "lazyImage");
87+ var imageRenderer = findChild(zoomableImage, "imageRenderer");
8888 var flickable = findChild(zoomableImage, "flickable");
8989
9090 zoomableImage.source = widgetData2["source"];
9191 zoomableImage.zoomable = true;
9292 waitForRendering(zoomableImage);
9393
94− tryCompare(zoomableImage, "imageState", "ready");
95− tryCompareFunction(function() { return get_filename(lazyImage.source.toString()) === get_filename(widgetData2["source"]); }, true);
94+ tryCompare(zoomableImage, "imageStatus", Image.Ready);
95+ tryCompareFunction(function() { return get_filename(imageRenderer.source.toString()) === get_filename(widgetData2["source"]); }, true);
9696 waitForRendering(image);
9797
9898 // move mouse to center
@@ -105,16 +105,16 @@ Rectangle {
105105 for (var i=0; i<10; i++) {
106106 mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);
107107 tryCompare(image, "scale", oldScale + (i + 1) * 0.1);
108− compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
109− compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
108+ compare(flickable.contentWidth, Math.max(imageRenderer.width * image.scale, flickable.width));
109+ compare(flickable.contentHeight, Math.max(imageRenderer.height * image.scale, flickable.height));
110110 }
111111
112112 // zoom out
113113 for (var i=0; i<10; i++) {
114114 mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);
115115 tryCompare(image, "scale", oldScale + 1.0 - (i + 1) * 0.1);
116− compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
117− compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
116+ compare(flickable.contentWidth, Math.max(imageRenderer.width * image.scale, flickable.width));
117+ compare(flickable.contentHeight, Math.max(imageRenderer.height * image.scale, flickable.height));
118118 }
119119 }
120120 }
@@ -135,7 +135,7 @@ Rectangle {
135135
136136 function test_pinch(data) {
137137 var image = findChild(zoomableImage, "image");
138− var lazyImage = findChild(zoomableImage, "lazyImage");
138+ var imageRenderer = findChild(zoomableImage, "imageRenderer");
139139 var flickable = findChild(zoomableImage, "flickable");
140140
141141 signalSpy.signalName = "onScaleChanged";
@@ -146,8 +146,8 @@ Rectangle {
146146 zoomableImage.zoomable = data.zoomable;
147147 waitForRendering(zoomableImage);
148148
149− tryCompare(zoomableImage, "imageState", "ready");
150− tryCompareFunction(function() { return get_filename(lazyImage.source.toString()) === get_filename(data.source); }, true);
149+ tryCompare(zoomableImage, "imageStatus", Image.Ready);
150+ tryCompareFunction(function() { return get_filename(imageRenderer.source.toString()) === get_filename(data.source); }, true);
151151 waitForRendering(image);
152152
153153 var x1Start = zoomableImage.width * 2 / 6;
@@ -179,15 +179,15 @@ Rectangle {
179179 compare(newScale > oldScale, data.answer2, "scale factor didn't changed");
180180 compare(signalSpy.count == 0, data.answer3, "scale signal count error");
181181 compare(image.scale, newScale, "scale factor error");
182− compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
183− compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
182+ compare(flickable.contentWidth, Math.max(imageRenderer.width * image.scale, flickable.width));
183+ compare(flickable.contentHeight, Math.max(imageRenderer.height * image.scale, flickable.height));
184184
185185 wait(3000); // have to delay between two consequent pinch event.
186186 // pinch zoom-out
187187 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);
188188 tryCompare(image, "scale", oldScale);
189− compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
190− compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
189+ compare(flickable.contentWidth, Math.max(imageRenderer.width * image.scale, flickable.width));
190+ compare(flickable.contentHeight, Math.max(imageRenderer.height * image.scale, flickable.height));
191191 }
192192 }
193193 }