diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2012-08-08 12:18:55 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-21 10:25:11 +0200 |
commit | 5c88efc06d152ac675b4369d854699b137631fa0 (patch) | |
tree | 85e833ecd1914c71ae92280aaf44c48a878d0453 /examples/quick/touchinteraction | |
parent | f66624bf294663a3dd0777692e8ad8dbb19f3819 (diff) |
Examples: Moved example documentation.
-inline \example pages into separate .qdoc files
-fixed broken links to paths
-moved ui-components under examples/quick
Change-Id: I6e009b9213be3e1f4bed51bdbeb76a7a2142c80b
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'examples/quick/touchinteraction')
-rw-r--r-- | examples/quick/touchinteraction/doc/src/touchinteraction.qdoc | 56 | ||||
-rw-r--r-- | examples/quick/touchinteraction/touchinteraction.qml | 30 |
2 files changed, 56 insertions, 30 deletions
diff --git a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc new file mode 100644 index 0000000000..48c7b0b4ab --- /dev/null +++ b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** 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 QtQuick Examples - Touch Interaction + \example quick/touchinteraction + \brief This is a collection of QML Touch Interaction examples. + \image qml-touchinteraction-example.png + + This is a collection of small QML examples relating to touch interaction methods. + + Multipoint Flames demonstrates distinguishing different fingers in a MultiPointTouchArea, by assigning a different colored flame to each touch point. + The MultipointTouchArea sets up multiple touch points: + \snippet examples/quick/touchinteraction/multipointtouch/multiflame.qml 0 + The flames are then simply bound to the coordiates of the touch point, and whether it is currently pressed, like so: + \snippet examples/quick/touchinteraction/multipointtouch/multiflame.qml 1 + + Bear-Whack demonstrates using a MultiPointTouchArea to add multiple finger support to a simple game. The interaction with the game + is done through a SpriteGoal that follows the TouchPoint. The TouchPoints added to the MultiPointTouchArea are a component with all + this logic embedded into it: + \snippet examples/quick/touchinteraction/multipointtouch/bearwhack/content/AugmentedTouchPoint.qml 0 + + Flick Resize uses a PinchArea to allow Pinch-to-Resize behavior. This is easily achieved just by listening to the PinchArea signals and responding + to user input. + \snippet examples/quick/touchinteraction/pincharea/flickresize.qml 0 + + Flickable is a simple example demonstrating the Flickable element. The element inside the flickable is very big, but the flickable itself is very small: + \snippet examples/quick/touchinteraction/flickable/basic-flickable.qml 0 + + Corkboards shows a more complex Flickable usecase, with elements on the flickable that respond to mouse and keyboard interaction. + This doesn't require special code, the QtQuick elements automatically cooperate with Flickable for accepting the touch events. +*/ + diff --git a/examples/quick/touchinteraction/touchinteraction.qml b/examples/quick/touchinteraction/touchinteraction.qml index c8285438ef..f72500eaa2 100644 --- a/examples/quick/touchinteraction/touchinteraction.qml +++ b/examples/quick/touchinteraction/touchinteraction.qml @@ -41,36 +41,6 @@ import QtQuick 2.0 import "../../shared" -/*! - \title QtQuick Examples - Touch Interaction - \example quick/touchinteraction - \brief This is a collection of QML Touch Interaction examples. - \image qml-touchinteraction-example.png - - This is a collection of small QML examples relating to touch interaction methods. - - Multipoint Flames demonstrates distinguishing different fingers in a MultiPointTouchArea, by assigning a different colored flame to each touch point. - The MultipointTouchArea sets up multiple touch points: - \snippet examples/quick/touchinteraction/multipointtouch/multiflame.qml 0 - The flames are then simply bound to the coordiates of the touch point, and whether it is currently pressed, like so: - \snippet examples/quick/touchinteraction/multipointtouch/multiflame.qml 1 - - Bear-Whack demonstrates using a MultiPointTouchArea to add multiple finger support to a simple game. The interaction with the game - is done through a SpriteGoal that follows the TouchPoint. The TouchPoints added to the MultiPointTouchArea are a component with all - this logic embedded into it: - \snippet examples/quick/touchinteraction/multipointtouch/bearwhack/content/AugmentedTouchPoint.qml 0 - - Flick Resize uses a PinchArea to allow Pinch-to-Resize behavior. This is easily achieved just by listening to the PinchArea signals and responding - to user input. - \snippet examples/quick/touchinteraction/pincharea/flickresize.qml 0 - - Flickable is a simple example demonstrating the Flickable element. The element inside the flickable is very big, but the flickable itself is very small: - \snippet examples/quick/touchinteraction/flickable/basic-flickable.qml 0 - - Corkboards shows a more complex Flickable usecase, with elements on the flickable that respond to mouse and keyboard interaction. - This doesn't require special code, the QtQuick elements automatically cooperate with Flickable for accepting the touch events. -*/ - Item { height: 480 width: 320 |