From 56cd215c6d7583e05c052b43c8a50254487e5fab Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 6 Nov 2017 12:37:09 +0100 Subject: Doc: Describe hiding invisible items in the Qt Quick Designer Navigator Update screenshots. Change-Id: I8335131298d2a400403be2879f4f363d687c78cc Reviewed-by: Thomas Hartmann --- doc/images/qmldesigner-element-size.png | Bin 7772 -> 32345 bytes doc/images/qmldesigner-navigator-arrows.png | Bin 3321 -> 8740 bytes doc/images/qmldesigner-navigator.png | Bin 3475 -> 9431 bytes doc/src/qtquick/qtquick-designer.qdoc | 9 ++++++--- 4 files changed, 6 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/images/qmldesigner-element-size.png b/doc/images/qmldesigner-element-size.png index 47c555642f..ad2d3b666b 100644 Binary files a/doc/images/qmldesigner-element-size.png and b/doc/images/qmldesigner-element-size.png differ diff --git a/doc/images/qmldesigner-navigator-arrows.png b/doc/images/qmldesigner-navigator-arrows.png index 06d884b5c5..ecc59fcec1 100644 Binary files a/doc/images/qmldesigner-navigator-arrows.png and b/doc/images/qmldesigner-navigator-arrows.png differ diff --git a/doc/images/qmldesigner-navigator.png b/doc/images/qmldesigner-navigator.png index fc168249f8..4fe5e737c6 100644 Binary files a/doc/images/qmldesigner-navigator.png and b/doc/images/qmldesigner-navigator.png differ diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index 7063351e25..8c835d12c0 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -120,8 +120,8 @@ When you copy an item, all its child items are also copied. When you remove an item, the child items are also removed. - You can show and hide items to focus on specific parts of the application. - Click the \inlineimage icon_color_none.png + You can show and hide items on the canvas to focus on specific parts of the + application. Click the \inlineimage icon_color_none.png (\uicontrol Transparent) button to change the visibility of an item on the canvas. To change the visibility of an item in the application, select the \uicontrol Visibility @@ -134,6 +134,9 @@ As all properties, visibility and opacity are inherited from the parent item. To hide or show child items, edit the properties of the parent item. + To hide invisible items in the navigator, click \inlineimage filtericon.png + (\uicontrol {Filter Tree}) and select \uicontrol {Show only visible items}. + To reset item size, position, or anchors, select context menu commands. To change the source of an Image type, select \uicontrol {Change Source URL} in the context menu. -- cgit v1.2.3 From 40fa1d594aaef2a89f1f62c5b6f1a54fa7d97239 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 6 Nov 2017 15:31:49 +0100 Subject: Doc: Remove remaining reference to deploying incomplete APKs to Android ... and update the screenshot. Change-Id: I9c93b0c94bec6c3f685160dd2fd0e73e33044b5c Reviewed-by: Jake Petroules --- .../qtcreator-android-deploy-configurations.png | Bin 23062 -> 33466 bytes doc/src/android/deploying-android.qdoc | 6 ------ 2 files changed, 6 deletions(-) (limited to 'doc') diff --git a/doc/images/qtcreator-android-deploy-configurations.png b/doc/images/qtcreator-android-deploy-configurations.png index 8cd0a22003..b09cbce6de 100644 Binary files a/doc/images/qtcreator-android-deploy-configurations.png and b/doc/images/qtcreator-android-deploy-configurations.png differ diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc index 0074867b77..455855f3ed 100644 --- a/doc/src/android/deploying-android.qdoc +++ b/doc/src/android/deploying-android.qdoc @@ -44,12 +44,6 @@ The Ministro tool downloads the necessary Qt libraries from a repository of your choice. - \li As an incomplete APK that is suitable for testing and debugging - applications on a device connected to the development host. The APK - relies on the device containing the Qt libraries in the correct - location. \QC copies the libraries to that location the first time - you deploy the application. - \endlist To specify settings for application packages, select \uicontrol Projects > -- cgit v1.2.3 From 7cf755bc062cd5bc3624e46bb407af3f0f767462 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 2 Nov 2017 14:51:45 +0100 Subject: Doc: Update info about Qt Quick Application project wizards There are now wizards for creating apps that use Qt Quick 2 types or Qt Quick 2 controls (ScrollView, StackView, or SwipeView). Some wizards generate ui.qml pages, while others don't. Therefore, an include file can no longer be shared between the tutorials and the creating projects topic. Change-Id: If06e20511cb5f6fe9da28feff40cec0250a49416 Reviewed-by: Tim Jenssen --- doc/images/qmldesigner-new-project.png | Bin 49117 -> 54934 bytes doc/images/qtcreator-new-qt-gui-application.png | Bin 49035 -> 56828 bytes .../qtcreator-new-qt-quick-project-wizard.png | Bin 49392 -> 55197 bytes doc/src/projects/creator-projects-creating.qdoc | 14 +-- .../creator-tutorial-create-qq-project.qdocinc | 15 ++-- doc/src/qtquick/qtquick-creating.qdoc | 99 ++++++++++++++++----- 6 files changed, 93 insertions(+), 35 deletions(-) (limited to 'doc') diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png index 10480502f9..bd6679aa08 100644 Binary files a/doc/images/qmldesigner-new-project.png and b/doc/images/qmldesigner-new-project.png differ diff --git a/doc/images/qtcreator-new-qt-gui-application.png b/doc/images/qtcreator-new-qt-gui-application.png index 62895ef9d1..fff63015df 100644 Binary files a/doc/images/qtcreator-new-qt-gui-application.png and b/doc/images/qtcreator-new-qt-gui-application.png differ diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png index 5b518dc225..1f8dcabd2d 100644 Binary files a/doc/images/qtcreator-new-qt-quick-project-wizard.png and b/doc/images/qtcreator-new-qt-quick-project-wizard.png differ diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 2facd5ad14..26209b6c04 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -107,18 +107,20 @@ Use \QD forms to design a Qt widget based user interface for the desktop and C++ to implement the application logic - \li Qt Quick Application + \li Qt Quick Application - Empty + + Create an empty Qt Quick application that uses Qt Quick 2 types. - Create a Qt Quick application that contains both QML and C++ - code. The project includes a QQuickView. You can build the application and deploy it to desktop, embedded, and mobile target platforms. - \li Qt Quick Controls 2 Application + \li Qt Quick Application - Scroll, Stack, or Swipe - Create a Qt Quick application using + Create a Qt Quick application that uses \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html} - {Qt Quick Controls 2} (requires Qt 5.7 or later) + {Qt Quick Controls 2} to implement a scrollable list (requires + Qt 5.9 or later) or a set of pages with a stack-based or + swipe-based navigation model (requires Qt 5.7 or later). \li Qt Canvas 3D Application diff --git a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc index 44923b221b..eab08b2971 100644 --- a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc +++ b/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc @@ -26,13 +26,13 @@ /*! //! [qt quick application] - \section1 Creating Qt Quick Controls 2 Applications + \section1 Creating the Project \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol Application > \uicontrol {Qt Quick Controls 2 Application} - > \uicontrol Choose. + \uicontrol Application > \uicontrol {Qt Quick Application - Swipe} > + \uicontrol Choose. \li In the \uicontrol Name field, enter a name for the application. @@ -66,10 +66,11 @@ \endlist - \QC generates a UI file, \e Page1Form.ui.qml, that you can modify in the - \QMLD \uicontrol {Form Editor} and two QML files, \e Page1.qml and - \e main.qml, that you can modify in the \uicontrol {Text Editor} to add the - application logic. + \QC generates two UI files, \e Page1Form.ui.qml and \e Page2Form.ui.qml, + and a QML file, \e main.qml. You can modify \e Page1Form.ui.qml in the + \uicontrol {Form Editor} to create the application main view and \e main.qml + in the \uicontrol {Text Editor} to add the application logic. For the + purposes of this example, you can ignore \e Page2Form.ui.qml. //! [qt quick application] */ diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index c663018498..5b9d5d4834 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -45,15 +45,25 @@ \list - \li \uicontrol {Qt Quick Application} creates a Qt Quick 2 application - project that can contain both QML and C++ code. The project includes - a QQuickView. You can build the application and deploy it to desktop, - embedded, and mobile target platforms. - - \li \uicontrol {Qt Quick Controls 2 Application} is like - \uicontrol {Qt Quick Application}, but using - \l{http://doc.qt.io/qt-5/qtquickcontrols2-index.html} - {Qt Quick Controls 2} (requires Qt 5.7 or later). + \li \uicontrol {Qt Quick Application - Empty} creates a Qt Quick 2 + application project that can contain both QML and C++ code. You can + build the application and deploy it to desktop, embedded, and mobile + target platforms. + + \li \uicontrol {Qt Quick Application - Scroll} uses the + \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-scrollview.html} + {ScrollView} type to implement a scrollable list view + (requires Qt 5.9 or later). + + \li \uicontrol {Qt Quick Application - Stack} uses the + \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-stackview.html} + {StackView} type to implement a set of pages with a stack-based + navigation model (requires Qt 5.7 or later). + + \li \uicontrol {Qt Quick Application - Swipe} uses the + \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-swipeview.html} + {SwipeWiew} type to implement a set of pages with a swipe-based + navigation model (requires Qt 5.7 or later). \li \uicontrol {Qt Canvas 3D Application} creates a Qt Quick application that imports the Qt Canvas 3D module and, optionally, includes @@ -85,12 +95,12 @@ \QC creates the necessary boilerplate files. Some of the files are specific to a particular target platform. - \section1 Creating Qt Quick Applications + \section1 Creating Empty Qt Quick Applications \list 1 \li Select \uicontrol File > \uicontrol {New File or Project} > - \uicontrol Application > \uicontrol {Qt Quick Application} > + \uicontrol Application > \uicontrol {Qt Quick Application - Empty} > \uicontrol Choose. \li In the \uicontrol Name field, enter a name for the application. @@ -110,11 +120,9 @@ The Qt version determines the Qt Quick imports that are used in the QML files. - \li Select the - \uicontrol {With .ui.qml file} check box to create an UI - form that can contain a subset of the QML language. Similarly as - with the UI forms for \QD, it is recommended that you use \QMLD to - edit the UI forms. For more information, see \l{Qt Quick UI Forms}. + \li Select the \uicontrol {Use Qt Virtual Keyboard} check box to add + support for \l{http://doc.qt.io/qt-5/qtvirtualkeyboard-index.html} + {Qt Virtual Keyboard} to the application. \li Select \uicontrol Next. @@ -130,13 +138,60 @@ \endlist - \QC generates a UI file, \e Page1Form.ui.qml, that you can modify in the - \QMLD \uicontrol {Form Editor} and two QML files, \e Page1.qml and - \e main.qml, that you can modify in the \uicontrol {Text Editor} to add the - application logic. The \e .ui.qml file is created if you selected the - \uicontrol {With .ui.qml file} check box. + \QC generates a QML file, \e main.qml, that you can modify in \QMLD. + + \section1 Creating Qt Quick Controls 2 Applications + + \list 1 + + \li Select \uicontrol File > \uicontrol {New File or Project} > + \uicontrol Application > \uicontrol {Qt Quick Application - Scroll}, + \uicontrol {Qt Quick Application - Stack}, or + \uicontrol {Qt Quick Application - Swipe} > \uicontrol Choose. + + \li In the \uicontrol Name field, enter a name for the application. + + \li In the \uicontrol {Create in} field, enter the path for the project + files, and then select \uicontrol Next (or \uicontrol Continue on + \macos). + + \li In the \uicontrol {Build system} field, select the build system to + use for building and running the project: \l qmake, + \l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}. + + \li In the \uicontrol {Qt Quick Controls 2 Style} field, select one of + the predefined \l{Styling Qt Quick Controls 2}{UI styles} to use, + and then select \uicontrol Next. + + \li Select the \uicontrol {Use Qt Virtual Keyboard} check box to add + support for \l{http://doc.qt.io/qt-5/qtvirtualkeyboard-index.html} + {Qt Virtual Keyboard} to the application. + + \li Select \l{glossary-buildandrun-kit}{kits} for the platforms that + you want to build the application for. To build applications for + mobile devices, select kits for Android ARM and iPhone OS, and + click \uicontrol{Next}. + + \note Kits are listed if they have been specified in \uicontrol + Tools > \uicontrol Options > \uicontrol {Build & Run} > + \uicontrol Kits (on Windows and Linux) or in \uicontrol {Qt Creator} + > \uicontrol Preferences \uicontrol {Build & Run} > \uicontrol Kits + (on \macos). + + \li Select \uicontrol Next. + + \li Review the project settings, and click \uicontrol{Finish} (or + \uicontrol Done on \macos). + + \endlist + + For the Scroll application, \QC creates a QML file, \e main.qml, that you + can modify in \QMLD. - \include creator-tutorial-create-qq-project.qdocinc qt quick application + For the Stack and Swipe applications, \QC generates two UI files, + \e Page1Form.ui.qml and \e Page2Form.ui.qml, that you can modify in the + \QMLD \uicontrol {Form Editor} and a QML file, \e main.qml, that you can + modify in the \uicontrol {Text Editor} to add the application logic. \section1 Creating Qt Quick UI Projects -- cgit v1.2.3 From a1a47242c6c46f7002dec069b4412aa43a1f2660 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 7 Nov 2017 10:09:20 +0100 Subject: Doc: Update the Transitions example to use the Swipe wizard Change-Id: I17e6d8ddba96d28ea8f533d5993f8665fd380ca0 Reviewed-by: Tim Jenssen --- doc/examples/transitions/Page1.qml | 5 -- doc/examples/transitions/Page1Form.ui.qml | 67 +++++++++++++++-- doc/examples/transitions/Page2Form.ui.qml | 67 +++++++++++++++++ doc/examples/transitions/main.cpp | 55 +++++++++++++- doc/examples/transitions/main.qml | 94 ++++++++++++++++++++---- doc/examples/transitions/qml.qrc | 3 +- doc/examples/transitions/qtquickcontrols2.conf | 13 +--- doc/examples/transitions/transitions.pro | 23 +++--- doc/images/qmldesigner-tutorial-design-mode.png | Bin 26640 -> 27536 bytes doc/images/qmldesigner-tutorial-topleftrect.png | Bin 24934 -> 77853 bytes doc/images/qmldesigner-tutorial-ui-ready.png | Bin 29135 -> 12223 bytes doc/images/qmldesigner-tutorial-user-icon.png | Bin 21853 -> 51818 bytes doc/images/qmldesigner-tutorial.png | Bin 4130 -> 5014 bytes doc/src/qtquick/qtquick-app-tutorial.qdoc | 5 +- 14 files changed, 281 insertions(+), 51 deletions(-) delete mode 100644 doc/examples/transitions/Page1.qml create mode 100644 doc/examples/transitions/Page2Form.ui.qml (limited to 'doc') diff --git a/doc/examples/transitions/Page1.qml b/doc/examples/transitions/Page1.qml deleted file mode 100644 index 67336b4af7..0000000000 --- a/doc/examples/transitions/Page1.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.7 - -Page1Form { - -} diff --git a/doc/examples/transitions/Page1Form.ui.qml b/doc/examples/transitions/Page1Form.ui.qml index 2637f1d0af..785433154d 100644 --- a/doc/examples/transitions/Page1Form.ui.qml +++ b/doc/examples/transitions/Page1Form.ui.qml @@ -1,11 +1,66 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.3 +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 The Qt Company Ltd 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.9 +import QtQuick.Controls 2.2 -Item { +Page { id: page - width: 300 - height: 300 + width: 600 + height: 400 + + header: Label { + text: qsTr("Page 1") + font.pixelSize: Qt.application.font.pixelSize * 2 + padding: 10 + } + property alias icon: icon property alias topLeftRect: topLeftRect property alias bottomLeftRect: bottomLeftRect diff --git a/doc/examples/transitions/Page2Form.ui.qml b/doc/examples/transitions/Page2Form.ui.qml new file mode 100644 index 0000000000..11a8abff4a --- /dev/null +++ b/doc/examples/transitions/Page2Form.ui.qml @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 The Qt Company Ltd 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.9 +import QtQuick.Controls 2.2 + +Page { + width: 600 + height: 400 + + header: Label { + text: qsTr("Page 2") + font.pixelSize: Qt.application.font.pixelSize * 2 + padding: 10 + } + + Label { + text: qsTr("You are on Page 2.") + anchors.centerIn: parent + } +} diff --git a/doc/examples/transitions/main.cpp b/doc/examples/transitions/main.cpp index 34614e7477..4e002b280e 100644 --- a/doc/examples/transitions/main.cpp +++ b/doc/examples/transitions/main.cpp @@ -1,13 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 The Qt Company Ltd 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 #include int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; - engine.load(QUrl(QLatin1String("qrc:/main.qml"))); + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + if (engine.rootObjects().isEmpty()) + return -1; return app.exec(); } diff --git a/doc/examples/transitions/main.qml b/doc/examples/transitions/main.qml index 3775d82158..464b48e545 100644 --- a/doc/examples/transitions/main.qml +++ b/doc/examples/transitions/main.qml @@ -1,26 +1,82 @@ -import QtQuick 2.7 +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 The Qt Company Ltd 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.Controls 2.0 -import QtQuick.Layouts 1.3 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ApplicationWindow { visible: true width: 640 height: 480 - title: qsTr("Transitions") + title: qsTr("Tabs") - Page1Form { + SwipeView { + id: swipeView anchors.fill: parent - id: page + currentIndex: tabBar.currentIndex - mouseArea { - onClicked: stateGroup.state = ' ' - } - mouseArea1 { - onClicked: stateGroup.state = 'State1' + Page1Form { + id: page + + mouseArea { + onClicked: stateGroup.state = ' ' + } + mouseArea1 { + onClicked: stateGroup.state = 'State1' + } + mouseArea2 { + onClicked: stateGroup.state = 'State2' + } } - mouseArea2 { - onClicked: stateGroup.state = 'State2' + + Page2Form { } } @@ -71,4 +127,16 @@ ApplicationWindow { } ] } + + footer: TabBar { + id: tabBar + currentIndex: swipeView.currentIndex + + TabButton { + text: qsTr("Page 1") + } + TabButton { + text: qsTr("Page 2") + } + } } diff --git a/doc/examples/transitions/qml.qrc b/doc/examples/transitions/qml.qrc index bba8291fc0..299ee42d85 100644 --- a/doc/examples/transitions/qml.qrc +++ b/doc/examples/transitions/qml.qrc @@ -1,8 +1,9 @@ main.qml - Page1.qml Page1Form.ui.qml + Page2Form.ui.qml + main.qml qtquickcontrols2.conf qt-logo.png diff --git a/doc/examples/transitions/qtquickcontrols2.conf b/doc/examples/transitions/qtquickcontrols2.conf index 1764b16fb4..75b2cb8fff 100644 --- a/doc/examples/transitions/qtquickcontrols2.conf +++ b/doc/examples/transitions/qtquickcontrols2.conf @@ -1,15 +1,6 @@ ; This file can be edited to change the style of the application -; See Styling Qt Quick Controls 2 in the documentation for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-styles.html +; Read "Qt Quick Controls 2 Configuration File" for details: +; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html [Controls] Style=Default - -[Universal] -Theme=Light -;Accent=Steel - -[Material] -Theme=Light -;Accent=BlueGrey -;Primary=BlueGray diff --git a/doc/examples/transitions/transitions.pro b/doc/examples/transitions/transitions.pro index d0d4cd2979..e2173bcccb 100644 --- a/doc/examples/transitions/transitions.pro +++ b/doc/examples/transitions/transitions.pro @@ -1,17 +1,6 @@ -QT += qml quick - +QT += quick CONFIG += c++11 -SOURCES += main.cpp - -RESOURCES += qml.qrc - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Additional import path used to resolve QML modules just for Qt Quick Designer -QML_DESIGNER_IMPORT_PATH = - # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the @@ -23,6 +12,16 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +SOURCES += main.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Additional import path used to resolve QML modules just for Qt Quick Designer +QML_DESIGNER_IMPORT_PATH = + # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin diff --git a/doc/images/qmldesigner-tutorial-design-mode.png b/doc/images/qmldesigner-tutorial-design-mode.png index d2a522f01c..e8b2bd2301 100644 Binary files a/doc/images/qmldesigner-tutorial-design-mode.png and b/doc/images/qmldesigner-tutorial-design-mode.png differ diff --git a/doc/images/qmldesigner-tutorial-topleftrect.png b/doc/images/qmldesigner-tutorial-topleftrect.png index 17bc686d8f..c3b181965b 100644 Binary files a/doc/images/qmldesigner-tutorial-topleftrect.png and b/doc/images/qmldesigner-tutorial-topleftrect.png differ diff --git a/doc/images/qmldesigner-tutorial-ui-ready.png b/doc/images/qmldesigner-tutorial-ui-ready.png index 0cc60262ed..1ed4037cd1 100644 Binary files a/doc/images/qmldesigner-tutorial-ui-ready.png and b/doc/images/qmldesigner-tutorial-ui-ready.png differ diff --git a/doc/images/qmldesigner-tutorial-user-icon.png b/doc/images/qmldesigner-tutorial-user-icon.png index e5a36ebceb..5422a42f34 100644 Binary files a/doc/images/qmldesigner-tutorial-user-icon.png and b/doc/images/qmldesigner-tutorial-user-icon.png differ diff --git a/doc/images/qmldesigner-tutorial.png b/doc/images/qmldesigner-tutorial.png index 64b1e4752e..39cd385885 100644 Binary files a/doc/images/qmldesigner-tutorial.png and b/doc/images/qmldesigner-tutorial.png differ diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index dbbee8e71b..147df44a43 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -73,10 +73,10 @@ \image qmldesigner-tutorial-design-mode.png "Transitions project in Design Mode" - \li In the \uicontrol Navigator, select \uicontrol RowLayout and press + \li In the \uicontrol Navigator, select \uicontrol Label and press \key Delete to delete it. - \li Select \uicontrol Item in the navigator, and enter \e page in the + \li Select \uicontrol Page in the navigator, and enter \e page in the \uicontrol Id field. \li In \uicontrol Library > \uicontrol Resources, select qt-logo.png and @@ -242,6 +242,7 @@ expressions for the x and y properties, as illustrated by the following code snippet: + \skipto StateGroup \printuntil ] \li Press \key {Ctrl+R} to run the application. -- cgit v1.2.3 From 072e8c323bdb0170a86de415fb8164c72cfc2329 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 3 Nov 2017 15:38:54 +0100 Subject: Doc: Update Accelerate Bubble example to use the Swipe wizard Change-Id: I6f3d88788707c4ecd18c327c9145529ec0bd8fc6 Reviewed-by: Tim Jenssen --- doc/examples/accelbubble/Bubble.qml | 7 +- doc/examples/accelbubble/Page1.qml | 55 ---------- doc/examples/accelbubble/Page1Form.ui.qml | 21 ++-- doc/examples/accelbubble/Page2Form.ui.qml | 67 ++++++++++++ doc/examples/accelbubble/accelbubble.pro | 30 ++++-- doc/examples/accelbubble/main.cpp | 7 +- doc/examples/accelbubble/main.qml | 115 ++++++++++++--------- doc/examples/accelbubble/qml.qrc | 4 +- doc/examples/accelbubble/qtquickcontrols2.conf | 13 +-- doc/images/creator_android_tutorial_ex_app.png | Bin 5025 -> 7954 bytes ...qtcreator-move-component-into-separate-file.png | Bin 8350 -> 19362 bytes doc/src/qtquick/creator-mobile-app-tutorial.qdoc | 33 +++--- 12 files changed, 192 insertions(+), 160 deletions(-) delete mode 100644 doc/examples/accelbubble/Page1.qml create mode 100644 doc/examples/accelbubble/Page2Form.ui.qml (limited to 'doc') diff --git a/doc/examples/accelbubble/Bubble.qml b/doc/examples/accelbubble/Bubble.qml index bb21875951..67e1c5922d 100644 --- a/doc/examples/accelbubble/Bubble.qml +++ b/doc/examples/accelbubble/Bubble.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator @@ -48,9 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Image { source: "Bluebubble.svg" diff --git a/doc/examples/accelbubble/Page1.qml b/doc/examples/accelbubble/Page1.qml deleted file mode 100644 index 0619779873..0000000000 --- a/doc/examples/accelbubble/Page1.qml +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, 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 The Qt Company Ltd 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.7 - -Page1Form { - -} diff --git a/doc/examples/accelbubble/Page1Form.ui.qml b/doc/examples/accelbubble/Page1Form.ui.qml index d336fa3b7a..0ab08fc483 100644 --- a/doc/examples/accelbubble/Page1Form.ui.qml +++ b/doc/examples/accelbubble/Page1Form.ui.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator @@ -47,14 +47,21 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ +import QtQuick 2.9 +import QtQuick.Controls 2.2 -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 - -Item { - property alias mainWindow: mainWindow +Page { + width: 600 + height: 400 property alias bubble: bubble + property alias mainWindow: mainWindow + + header: Label { + text: qsTr("Page 1") + font.pixelSize: Qt.application.font.pixelSize * 2 + padding: 10 + } + Rectangle { id: mainWindow color: "#ffffff" diff --git a/doc/examples/accelbubble/Page2Form.ui.qml b/doc/examples/accelbubble/Page2Form.ui.qml new file mode 100644 index 0000000000..11a8abff4a --- /dev/null +++ b/doc/examples/accelbubble/Page2Form.ui.qml @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 The Qt Company Ltd 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.9 +import QtQuick.Controls 2.2 + +Page { + width: 600 + height: 400 + + header: Label { + text: qsTr("Page 2") + font.pixelSize: Qt.application.font.pixelSize * 2 + padding: 10 + } + + Label { + text: qsTr("You are on Page 2.") + anchors.centerIn: parent + } +} diff --git a/doc/examples/accelbubble/accelbubble.pro b/doc/examples/accelbubble/accelbubble.pro index dca3207dce..2dfcd42652 100644 --- a/doc/examples/accelbubble/accelbubble.pro +++ b/doc/examples/accelbubble/accelbubble.pro @@ -1,17 +1,7 @@ -QT += qml quick sensors svg xml +QT += quick sensors svg xml CONFIG += c++11 -SOURCES += main.cpp - -RESOURCES += qml.qrc - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Additional import path used to resolve QML modules just for Qt Quick Designer -QML_DESIGNER_IMPORT_PATH = - # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the @@ -23,7 +13,25 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +SOURCES += main.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Additional import path used to resolve QML modules just for Qt Quick Designer +QML_DESIGNER_IMPORT_PATH = + # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target + + ios { + QTPLUGIN += qsvg qsvgicon qtsensors_ios + QMAKE_INFO_PLIST = Info.plist + } + +DISTFILES += \ + Bluebubble.svg diff --git a/doc/examples/accelbubble/main.cpp b/doc/examples/accelbubble/main.cpp index 6ff25a462c..4e002b280e 100644 --- a/doc/examples/accelbubble/main.cpp +++ b/doc/examples/accelbubble/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator @@ -54,10 +54,13 @@ int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; - engine.load(QUrl(QLatin1String("qrc:/main.qml"))); + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + if (engine.rootObjects().isEmpty()) + return -1; return app.exec(); } diff --git a/doc/examples/accelbubble/main.qml b/doc/examples/accelbubble/main.qml index ddd617af69..26fe2598f0 100644 --- a/doc/examples/accelbubble/main.qml +++ b/doc/examples/accelbubble/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator @@ -48,10 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import QtSensors 5.7 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtSensors 5.9 ApplicationWindow { visible: true @@ -59,64 +58,84 @@ ApplicationWindow { height: 480 title: qsTr("Accelerate Bubble") - Page1 { + SwipeView { + id: swipeView anchors.fill: parent - bubble { - id: bubble - centerX: mainWindow.width / 2 - centerY: mainWindow.height / 2 - bubbleCenter: bubble.width / 2 - x: bubble.centerX - bubble.bubbleCenter - y: bubble.centerY - bubble.bubbleCenter - - Behavior on y { - SmoothedAnimation { - easing.type: Easing.Linear - duration: 100 + currentIndex: tabBar.currentIndex + + Page1Form { + bubble { + id: bubble + centerX: mainWindow.width / 2 + centerY: mainWindow.height / 2 + bubbleCenter: bubble.width / 2 + x: bubble.centerX - bubble.bubbleCenter + y: bubble.centerY - bubble.bubbleCenter + + Behavior on y { + SmoothedAnimation { + easing.type: Easing.Linear + duration: 100 + } } - } - Behavior on x { - SmoothedAnimation { - easing.type: Easing.Linear - duration: 100 + Behavior on x { + SmoothedAnimation { + easing.type: Easing.Linear + duration: 100 + } } } } + + Page2Form { + } + } + + footer: TabBar { + id: tabBar + currentIndex: swipeView.currentIndex + + TabButton { + text: qsTr("Page 1") + } + TabButton { + text: qsTr("Page 2") + } } Accelerometer { - id: accel - dataRate: 100 - active: true + id: accel + dataRate: 100 + active: true - onReadingChanged: { - var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1) - var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1) + onReadingChanged: { + var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1) + var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1) - if (isNaN(newX) || isNaN(newY)) - return; + if (isNaN(newX) || isNaN(newY)) + return; - if (newX < 0) - newX = 0 + if (newX < 0) + newX = 0 - if (newX > mainWindow.width - bubble.width) - newX = mainWindow.width - bubble.width + if (newX > mainWindow.width - bubble.width) + newX = mainWindow.width - bubble.width - if (newY < 18) - newY = 18 + if (newY < 18) + newY = 18 - if (newY > mainWindow.height - bubble.height) - newY = mainWindow.height - bubble.height + if (newY > mainWindow.height - bubble.height) + newY = mainWindow.height - bubble.height - bubble.x = newX - bubble.y = newY - } + bubble.x = newX + bubble.y = newY } + } - function calcPitch(x, y, z) { - return -(Math.atan(y / Math.sqrt(x * x + z * z)) * 57.2957795); - } - function calcRoll(x, y, z) { - return -(Math.atan(x / Math.sqrt(y * y + z * z)) * 57.2957795); - } + function calcPitch(x, y, z) { + return -(Math.atan(y / Math.sqrt(x * x + z * z)) * 57.2957795); + } + function calcRoll(x, y, z) { + return -(Math.atan(x / Math.sqrt(y * y + z * z)) * 57.2957795); + } } diff --git a/doc/examples/accelbubble/qml.qrc b/doc/examples/accelbubble/qml.qrc index 1825fab490..7d7777aca0 100644 --- a/doc/examples/accelbubble/qml.qrc +++ b/doc/examples/accelbubble/qml.qrc @@ -1,10 +1,10 @@ - main.qml - Page1.qml Page1Form.ui.qml + Page2Form.ui.qml qtquickcontrols2.conf Bubble.qml Bluebubble.svg + main.qml diff --git a/doc/examples/accelbubble/qtquickcontrols2.conf b/doc/examples/accelbubble/qtquickcontrols2.conf index 1764b16fb4..75b2cb8fff 100644 --- a/doc/examples/accelbubble/qtquickcontrols2.conf +++ b/doc/examples/accelbubble/qtquickcontrols2.conf @@ -1,15 +1,6 @@ ; This file can be edited to change the style of the application -; See Styling Qt Quick Controls 2 in the documentation for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-styles.html +; Read "Qt Quick Controls 2 Configuration File" for details: +; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html [Controls] Style=Default - -[Universal] -Theme=Light -;Accent=Steel - -[Material] -Theme=Light -;Accent=BlueGrey -;Primary=BlueGray diff --git a/doc/images/creator_android_tutorial_ex_app.png b/doc/images/creator_android_tutorial_ex_app.png index ad4cfc0765..3be9f31fe2 100644 Binary files a/doc/images/creator_android_tutorial_ex_app.png and b/doc/images/creator_android_tutorial_ex_app.png differ diff --git a/doc/images/qtcreator-move-component-into-separate-file.png b/doc/images/qtcreator-move-component-into-separate-file.png index d5bf10192e..a0de19b24e 100644 Binary files a/doc/images/qtcreator-move-component-into-separate-file.png and b/doc/images/qtcreator-move-component-into-separate-file.png differ diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc index 5ab76d6302..f0fddbacfd 100644 --- a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc +++ b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc @@ -82,14 +82,14 @@ \list 1 - \li In the \uicontrol Projects view, double-click the Page1Form.ui.qml + \li In the \uicontrol Projects view, double-click the \e Page1Form.ui.qml file to open it in \QMLD. - \li In the \uicontrol Navigator, select \uicontrol RowLayout and press + \li In the \uicontrol Navigator, select \uicontrol Label and press \key Delete to delete it. \li In \uicontrol Library > \uicontrol {QML Types}, select - \uicontrol Rectangle and drag and drop it to the \uicontrol Item in + \uicontrol Rectangle and drag and drop it to the \uicontrol Page in the navigator. \li Select the rectangle in the navigator to edit its properties: @@ -137,39 +137,32 @@ \endlist - \QC creates a reference to the Bubble type in Page1Form.ui.qml. + \QC creates a reference to the Bubble type in \e Page1Form.ui.qml. - To check your code, you can compare Page1Form.ui.qml with the + To check your code, you can compare \e Page1Form.ui.qml with the \l{accelbubble/Page1Form.ui.qml}{Page1Form.ui.qml} example file and - Bubble.qml with the \l{accelbubble/Bubble.qml}{Bubble.qml} example file. + \e Bubble.qml with the \l{accelbubble/Bubble.qml}{Bubble.qml} example file. - The UI is now ready and you can switch to editing the Page1.qml and - Bubble.qml files in the \uicontrol {Text Editor}, as described in the + The UI is now ready and you can switch to editing the \e Bubble.qml and + \e main.qml files in the \uicontrol {Text Editor}, as described in the following section. \section1 Moving the Bubble - The new project wizard adds boilerplate code to the main.qml file to create - menu items and push buttons. Modify the boilerplate code by removing - obsolete code and by adding new code. You removed the push buttons from the - UI Form, so you also need to remove the corresponding code from Page1.qml - (or the application cannot be built). - - In the \uicontrol {Text Editor}, edit Bubble.qml to add properties that we - use to will position the image: + In the \uicontrol {Text Editor}, edit \e Bubble.qml to add properties that we + will use to position the image: \quotefromfile accelbubble/Bubble.qml \skipto Image \printuntil } - In the \uicontrol {Text Editor}, edit main.qml to specify the application + In the \uicontrol {Text Editor}, edit \e main.qml to specify the application title, as illustrated by the following code snippet: \quotefromfile accelbubble/main.qml \skipto ApplicationWindow \printuntil title - Remove the rest of the boilerplate code in main.qml, except the Page1 type. Specify bubble properties to position the image: \printuntil bubbleCenter @@ -183,10 +176,10 @@ Then add code to move the bubble based on Accelerometer sensor values: \list 1 - \li Add the following import statement to main.qml: + \li Add the following import statement to \e main.qml: \code - import QtSensors 5.7 + import QtSensors 5.9 \endcode \li Add the \l{Accelerometer} type with the necessary properties: -- cgit v1.2.3