on xenial help sign in
Renamed preview image
commitb354215d739d86f8c6e91503e5e028b0b8ff53eb authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 11 Feb 2014, 13:40 (13 years ago) parent778cf03
3 files changed+10−10
qml/Dash/Previews/PreviewImage.qml → qml/Dash/Previews/PreviewZoomableImage.qml+1−1 tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/Dash/Previews/tst_PreviewImage.qml → tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+8−8
qml/Dash/Previews/PreviewImage.qml → qml/Dash/Previews/PreviewZoomableImage.qmlrenamed+1−1
@@ -29,7 +29,7 @@ PreviewWidget {
2929 implicitHeight: units.gu(22)
3030
3131 LazyImage {
32− objectName: "lazyImage"
32+ objectName: "image"
3333 anchors.fill: parent
3434 scaleTo: "height"
3535 source: widgetData["source"]
tests/qmltests/CMakeLists.txt+1−1
@@ -55,9 +55,9 @@ add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} $
5555add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5656add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5757add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
58−add_qml_test(Dash/Previews PreviewImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5958add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
6059add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
60+add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
6161add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
6262 PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
6363add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
tests/qmltests/Dash/Previews/tst_PreviewImage.qml → tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qmlrenamed+8−8
@@ -34,24 +34,24 @@ Rectangle {
3434 "zoomable": false
3535 }
3636
37− PreviewImage {
38− id: image
37+ PreviewZoomableImage {
38+ id: zoomableImage
3939 width: parent.width
4040 widgetData: widgetData1
4141 }
4242
4343 UT.UnityTestCase {
44− name: "PreviewImageTest"
44+ name: "PreviewZoomableImageTest"
4545 when: windowShown
4646
4747 function test_loadImage() {
48− var lazyImage = findChild(image, "lazyImage");
48+ var image = findChild(zoomableImage, "image");
4949
50− image.widgetData = widgetData0;
51− tryCompare(lazyImage.state, "default");
50+ zoomableImage.widgetData = widgetData0;
51+ tryCompare(image.state, "default");
5252
53− image.widgetData = widgetData1;
54− tryCompare(lazyImage.state, "ready");
53+ zoomableImage.widgetData = widgetData1;
54+ tryCompare(image.state, "ready");
5555 }
5656 }
5757}