Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Alpert authored and Qt by Nokia committed Feb 6, 2012
1 parent eda4b3d commit 3f622e0
Show file tree
Hide file tree
Showing 27 changed files with 431 additions and 5 deletions.
100 changes: 100 additions & 0 deletions doc/src/examples/examples-groups.qdoc
@@ -0,0 +1,100 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
** GNU Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** this file.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms
** and conditions contained in a signed written agreement between you
** and Nokia.
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

/*!
\title QML Examples - Internationalization
\example declarative/i18n
\image qml-i18n-example.png
\brief This is an internationalization example
*/
/*!
\title QML Examples - Shader Effects
\example declarative/shadereffects
\image qml-shadereffects-example.png
\brief This is a shader effects example

This example demonstrates a couple of visual effects that you can perform
with shaders in QtQuick 2.0
*/
/*!
\title QML Examples - Positioners
\example declarative/positioners
\brief This is a positioners example
\image qml-positioners-example.png

This example demonstrates the positioners and some of their animations.
*/
/*!
\title QML Examples - Animation
\example declarative/animation
\brief This is a collection of QML examples
\image qml-animations-example.png

This is a collection of small QML examples relating to animation. Each example is
a small QML file, usually containing or emphasizing a particular element or
feature. You can run and observe the behavior of each example.
*/
/*!
\title QML Examples - Image Elements
\example declarative/imageelements
\brief This is a collection of QML examples
\image qml-imageelements-example.png

This is a collection of small QML examples relating to image elements. Each example is
a small QML file, usually containing or emphasizing a particular element or
feature. You can run and observe the behavior of each example.
*/
/*!
\title QML Examples - Models and Views
\example declarative/modelviews
\brief This is a collection of QML examples
\image qml-modelviews-example.png

This is a collection of small QML examples relating to models and views. Each example is
a small QML file, usually containing or emphasizing a particular element or
feature. You can run and observe the behavior of each example.
*/
/*!
\title QML Examples - Text
\example declarative/text
\brief This is a collection of QML examples
\image qml-text-example.png

This is a collection of small QML examples relating to text. Each example is
a small QML file, usually containing or emphasizing a particular element or
feature. You can run and observe the behavior of each example.
*/
/*!
\title QML Examples - Touch Interaction
\example declarative/touchinteraction
\brief This is a collection of QML examples
\image qml-touchinteraction-example.png

This is a collection of small QML examples relating to touch and multi-point touch. Each example is
a small QML file, usually containing or emphasizing a particular element or
feature. You can run and observe the behavior of each example.
*/
Binary file added doc/src/images/qml-animations-example.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/src/images/qml-i18n-example.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/src/images/qml-imageelements-example.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/src/images/qml-modelviews-example.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/src/images/qml-positioners-example.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/src/images/qml-shadereffects-example.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/src/images/qml-text-example.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions examples/declarative/animation/animation.qmlproject
@@ -0,0 +1,16 @@
import QmlProject 1.1

Project {
mainFile: "animation.qml"

/* Include .qml, .js, and image files from current directory and subdirectories */
QmlFiles {
directory: "."
}
JavaScriptFiles {
directory: "."
}
ImageFiles {
directory: "."
}
}
Expand Up @@ -38,7 +38,6 @@
**
****************************************************************************/
import QtQuick 2.0
import "content"

Item {
property alias mode: image.fillMode
Expand All @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions examples/declarative/imageelements/image.qml
Expand Up @@ -39,6 +39,7 @@
****************************************************************************/

import QtQuick 2.0
import "content"

Rectangle {
width: 490
Expand Down
58 changes: 58 additions & 0 deletions 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"));
}
}
}
16 changes: 16 additions & 0 deletions 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: "."
}
}
4 changes: 4 additions & 0 deletions examples/declarative/modelviews/gridview/gridview-example.qml
Expand Up @@ -70,6 +70,10 @@ Rectangle {
anchors { top: myIcon.bottom; horizontalCenter: parent.horizontalCenter }
text: name
}
MouseArea {
anchors.fill: parent
onClicked: parent.GridView.view.currentIndex = index
}
}
}

Expand Down
64 changes: 64 additions & 0 deletions examples/declarative/modelviews/modelviews.qml
@@ -0,0 +1,64 @@
/****************************************************************************
**
** 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: 480
LauncherList {
id: ll
anchors.fill: parent
Component.onCompleted: {
addExample("Dynamic List", "A ListView harboring dynamic data", Qt.resolvedUrl("listview/dynamiclist.qml"));
addExample("Expanding Delegates", "Delegates that expand to fill the list when clicked", Qt.resolvedUrl("listview/expandingdelegates.qml"));
addExample("Highlight", "Adding a highlight to the current item", Qt.resolvedUrl("listview/highlight.qml"));
addExample("Sections", "A ListView with section headers", Qt.resolvedUrl("listview/sections.qml"));
addExample("GridView", "A view laid out in a grid", Qt.resolvedUrl("gridview/gridview-example.qml"));
addExample("PathView", "A view laid out along a path", Qt.resolvedUrl("pathview/pathview-example.qml"));
addExample("Package", "Using a package to transition items between views", Qt.resolvedUrl("package/view.qml"));
addExample("Parallax", "Adds a background and a parallax effect to a ListView", Qt.resolvedUrl("parallax/parallax.qml"));
addExample("Slideshow", "A model demonstrating delayed image loading", Qt.resolvedUrl("visualdatamodel/slideshow.qml"));
addExample("Sorted Model", "Two views on a model, one of which is sorted", Qt.resolvedUrl("visualdatamodel/sortedmodel.qml"));
addExample("VisualItemModel", "A model that consists of the actual Items", Qt.resolvedUrl("visualitemmodel/visualitemmodel.qml"));
}
}
}
16 changes: 16 additions & 0 deletions examples/declarative/modelviews/modelviews.qmlproject
@@ -0,0 +1,16 @@
import QmlProject 1.1

Project {
mainFile: "modelviews.qml"

/* Include .qml, .js, and image files from current directory and subdirectories */
QmlFiles {
directory: "."
}
JavaScriptFiles {
directory: "."
}
ImageFiles {
directory: "."
}
}
Expand Up @@ -40,6 +40,7 @@
****************************************************************************/

import QtQuick 2.0
import "content"

Image {
width: 640
Expand Down Expand Up @@ -90,13 +91,13 @@ Image {
Image {
width: 160
height: 140
source: "qt-logo.png"
source: "content/qt-logo.png"
smooth: true
}
Image {
width: 160
height: 140
source: "face-smile.png"
source: "content/face-smile.png"
smooth: true
}
}
Expand Down
7 changes: 6 additions & 1 deletion examples/declarative/shared/LauncherList.qml
Expand Up @@ -65,7 +65,7 @@ ListView {
Rectangle {
id: bg
anchors.fill: parent
color: "black"
color: "white"
}
MouseArea{
anchors.fill: parent
Expand All @@ -83,6 +83,11 @@ ListView {
anchors.bottom: parent.bottom
width: parent.width
height: 40
MouseArea{
anchors.fill: parent
enabled: ei.visible
//Eats mouse events
}
Image {
source: "back.png"
anchors.verticalCenter: parent.verticalCenter
Expand Down

0 comments on commit 3f622e0

Please sign in to comment.