From 6051714b12b2c633a8f2800c96c98cef59d4fea1 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 29 Feb 2012 17:21:11 +1000 Subject: [PATCH] Update MouseArea and KeyInteraction to new guidelines Change-Id: Icf207005a48fa2a994632a88c4238d821622133c Reviewed-by: Yann Bodson --- .../quick/keyinteraction/keyinteraction.pro | 10 ++++ .../quick/keyinteraction/keyinteraction.qml | 58 +++++++++++++++++++ .../keyinteraction/keyinteraction.qmlproject | 16 +++++ examples/quick/keyinteraction/main.cpp | 41 +++++++++++++ examples/quick/mousearea/main.cpp | 41 +++++++++++++ examples/quick/mousearea/mousearea.pro | 10 ++++ .../{mousearea-example.qml => mousearea.qml} | 11 +++- examples/quick/mousearea/mousearea.qmlproject | 16 +++++ 8 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 examples/quick/keyinteraction/keyinteraction.pro create mode 100644 examples/quick/keyinteraction/keyinteraction.qml create mode 100644 examples/quick/keyinteraction/keyinteraction.qmlproject create mode 100644 examples/quick/keyinteraction/main.cpp create mode 100644 examples/quick/mousearea/main.cpp create mode 100644 examples/quick/mousearea/mousearea.pro rename examples/quick/mousearea/{mousearea-example.qml => mousearea.qml} (96%) create mode 100644 examples/quick/mousearea/mousearea.qmlproject diff --git a/examples/quick/keyinteraction/keyinteraction.pro b/examples/quick/keyinteraction/keyinteraction.pro new file mode 100644 index 0000000000..890d5b1449 --- /dev/null +++ b/examples/quick/keyinteraction/keyinteraction.pro @@ -0,0 +1,10 @@ +TEMPLATE = app + +QT += quick declarative +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/keyinteraction +qml.files = keyinteraction.qml focus +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/keyinteraction +INSTALLS += target qml + diff --git a/examples/quick/keyinteraction/keyinteraction.qml b/examples/quick/keyinteraction/keyinteraction.qml new file mode 100644 index 0000000000..546ba4cf05 --- /dev/null +++ b/examples/quick/keyinteraction/keyinteraction.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" as Examples + +/*! + \title QtQuick Examples - Key Interaction + \example quick/keyinteraction + \brief This is a collection of QML keyboard interaction examples. + \image qml-keyinteraction-example.png + + This example demonstrates combining various methods of interacting with keyboard focus. +*/ + +Loader {//Just loader, since there's only one. + source: "focus/focus.qml" + focus: true + // Exception to the standard sizing, because this is primarily a desktop + // example and it benefits from being able to see everything at once. +} diff --git a/examples/quick/keyinteraction/keyinteraction.qmlproject b/examples/quick/keyinteraction/keyinteraction.qmlproject new file mode 100644 index 0000000000..e8cbc449d5 --- /dev/null +++ b/examples/quick/keyinteraction/keyinteraction.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "keyinteraction.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/examples/quick/keyinteraction/main.cpp b/examples/quick/keyinteraction/main.cpp new file mode 100644 index 0000000000..1c9d67ef85 --- /dev/null +++ b/examples/quick/keyinteraction/main.cpp @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ +#include "../../shared/shared.h" +DECLARATIVE_EXAMPLE_MAIN(keyinteraction) diff --git a/examples/quick/mousearea/main.cpp b/examples/quick/mousearea/main.cpp new file mode 100644 index 0000000000..a85bac3b05 --- /dev/null +++ b/examples/quick/mousearea/main.cpp @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ +#include "../../shared/shared.h" +DECLARATIVE_EXAMPLE_MAIN(mousearea) diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro new file mode 100644 index 0000000000..e9a715aae5 --- /dev/null +++ b/examples/quick/mousearea/mousearea.pro @@ -0,0 +1,10 @@ +TEMPLATE = app + +QT += quick declarative +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/mousearea +qml.files = mousearea.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/mousearea +INSTALLS += target qml + diff --git a/examples/quick/mousearea/mousearea-example.qml b/examples/quick/mousearea/mousearea.qml similarity index 96% rename from examples/quick/mousearea/mousearea-example.qml rename to examples/quick/mousearea/mousearea.qml index 30e3e62864..df26e05a3c 100644 --- a/examples/quick/mousearea/mousearea-example.qml +++ b/examples/quick/mousearea/mousearea.qml @@ -40,9 +40,18 @@ import QtQuick 2.0 +/*! + \title QtQuick Examples - MouseArea + \example quick/mousearea + \brief This is a collection of QML Animation examples. + \image qml-mousearea-example.png + + This example shows you how to respond to clicks and drags with a MouseArea. +*/ + Rectangle { id: box - width: 400; height: 300 + width: 320; height: 480 Rectangle { id: redSquare diff --git a/examples/quick/mousearea/mousearea.qmlproject b/examples/quick/mousearea/mousearea.qmlproject new file mode 100644 index 0000000000..6595e118d8 --- /dev/null +++ b/examples/quick/mousearea/mousearea.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "mousearea.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +}