diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-02-03 14:43:05 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 22:23:34 +0100 |
commit | 3f622e0dc71d67cc922e530511d2f34ad678fb00 (patch) | |
tree | 6438b00467f134918deabc77642b7ad1254e4c52 /examples/declarative/imageelements | |
parent | eda4b3dc3c9421a0b3009c11b858f4e5fe1d8ba2 (diff) |
Homogenize examples
Several groups of examples are now organized like the other Qt examples,
with a project file, doc entry, and single launch point.
Change-Id: I2fd957c00e0d1121ebe47c806e54e6999425d1d3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'examples/declarative/imageelements')
-rw-r--r-- | examples/declarative/imageelements/content/ImageCell.qml (renamed from examples/declarative/imageelements/ImageCell.qml) | 3 | ||||
-rw-r--r-- | examples/declarative/imageelements/image.qml | 1 | ||||
-rw-r--r-- | examples/declarative/imageelements/imageelements.qml | 58 | ||||
-rw-r--r-- | examples/declarative/imageelements/imageelements.qmlproject | 16 |
4 files changed, 76 insertions, 2 deletions
diff --git a/examples/declarative/imageelements/ImageCell.qml b/examples/declarative/imageelements/content/ImageCell.qml index 86a8417fe0..fcc6b47af5 100644 --- a/examples/declarative/imageelements/ImageCell.qml +++ b/examples/declarative/imageelements/content/ImageCell.qml @@ -38,7 +38,6 @@ ** ****************************************************************************/ import QtQuick 2.0 -import "content" Item { property alias mode: image.fillMode @@ -49,7 +48,7 @@ Item { Image { id: image width: parent.width; height: parent.height - captionItem.height - source: "content/qt-logo.png" + source: "qt-logo.png" clip: true // only makes a difference if mode is PreserveAspectCrop smooth: true } diff --git a/examples/declarative/imageelements/image.qml b/examples/declarative/imageelements/image.qml index 0107cbf43a..4ca26c1630 100644 --- a/examples/declarative/imageelements/image.qml +++ b/examples/declarative/imageelements/image.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import "content" Rectangle { width: 490 diff --git a/examples/declarative/imageelements/imageelements.qml b/examples/declarative/imageelements/imageelements.qml new file mode 100644 index 0000000000..2ef5154968 --- /dev/null +++ b/examples/declarative/imageelements/imageelements.qml @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import "../shared" + +Item { + height: 480 + width: 640 + LauncherList { + id: ll + anchors.fill: parent + Component.onCompleted: { + addExample("BorderImage", "An image with scaled borders", Qt.resolvedUrl("borderimage.qml")); + addExample("Image", "A showcase of the options available to Image", Qt.resolvedUrl("image.qml")); + addExample("Shadows", "Rectangles with a drop-shadow effect", Qt.resolvedUrl("shadows.qml")); + addExample("Simple Sprite", "A simple sprite-based animation", Qt.resolvedUrl("simplesprite.qml")); + addExample("Sprite Image", "A sprite-based animation with complex transitions", Qt.resolvedUrl("spriteimage.qml")); + } + } +} diff --git a/examples/declarative/imageelements/imageelements.qmlproject b/examples/declarative/imageelements/imageelements.qmlproject new file mode 100644 index 0000000000..4292a0c112 --- /dev/null +++ b/examples/declarative/imageelements/imageelements.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "imageelements.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} |