From c245b25dd2ed8b9e141ac85b77f58d3522815823 Mon Sep 17 00:00:00 2001 From: Titta Heikkala Date: Fri, 8 Sep 2017 10:46:10 +0300 Subject: Add .ui.qml file to Qml Charts Example MainForm.ui.qml file added to Qml Charts Example to make it work with Qt Quick Designer. Change-Id: I709dd460ac179b5d65db0ca29196351c89ade5eb Task-number: QTBUG-60662 Reviewed-by: Miikka Heikkinen --- .../charts/qmlchart/qml/qmlchart/MainForm.ui.qml | 87 ++++++++++++++++++++++ examples/charts/qmlchart/qml/qmlchart/main.qml | 56 +------------- examples/charts/qmlchart/resources.qrc | 1 + 3 files changed, 92 insertions(+), 52 deletions(-) create mode 100644 examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml diff --git a/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml b/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml new file mode 100644 index 00000000..1adbfd70 --- /dev/null +++ b/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Item { + width: 600 + height: 400 + property bool sourceLoaded: false + property alias currentIndex: root.currentIndex + property alias info: infoText + + ListView { + id: root + focus: true + anchors.fill: parent + snapMode: ListView.SnapOneItem + highlightRangeMode: ListView.StrictlyEnforceRange + highlightMoveDuration: 250 + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + + model: ListModel { + ListElement {component: "View1.qml"} + ListElement {component: "View2.qml"} + ListElement {component: "View3.qml"} + ListElement {component: "View4.qml"} + ListElement {component: "View5.qml"} + ListElement {component: "View6.qml"} + ListElement {component: "View7.qml"} + ListElement {component: "View8.qml"} + ListElement {component: "View9.qml"} + ListElement {component: "View10.qml"} + ListElement {component: "View11.qml"} + ListElement {component: "View12.qml"} + } + + delegate: Loader { + width: root.width + height: root.height + + source: component + asynchronous: true + + onLoaded: sourceLoaded = true + } + } + + Rectangle { + id: infoText + anchors.centerIn: parent + width: parent.width + height: 40 + color: "black" + Text { + color: "white" + anchors.centerIn: parent + text: "You can navigate between views using swipe or arrow keys" + } + } +} diff --git a/examples/charts/qmlchart/qml/qmlchart/main.qml b/examples/charts/qmlchart/qml/qmlchart/main.qml index 3d63eac6..8cb1d09c 100644 --- a/examples/charts/qmlchart/qml/qmlchart/main.qml +++ b/examples/charts/qmlchart/qml/qmlchart/main.qml @@ -34,66 +34,18 @@ import QtQuick 2.0 Item { width: 600 height: 400 - property bool sourceLoaded: false - - ListView { - id: root - focus: true - anchors.fill: parent - snapMode: ListView.SnapOneItem - highlightRangeMode: ListView.StrictlyEnforceRange - highlightMoveDuration: 250 - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds + MainForm { onCurrentIndexChanged: { - if (infoText.opacity > 0.0) { + if (info.opacity > 0.0) { if (sourceLoaded) - infoText.opacity = 0.0; + info.opacity = 0.0; else if (currentIndex != 0) currentIndex = 0; } } - model: ListModel { - ListElement {component: "View1.qml"} - ListElement {component: "View2.qml"} - ListElement {component: "View3.qml"} - ListElement {component: "View4.qml"} - ListElement {component: "View5.qml"} - ListElement {component: "View6.qml"} - ListElement {component: "View7.qml"} - ListElement {component: "View8.qml"} - ListElement {component: "View9.qml"} - ListElement {component: "View10.qml"} - ListElement {component: "View11.qml"} - ListElement {component: "View12.qml"} - } - - delegate: Loader { - width: root.width - height: root.height - - source: component - asynchronous: true - - onLoaded: sourceLoaded = true - } - } - - Rectangle { - id: infoText - anchors.centerIn: parent - width: parent.width - height: 40 - color: "black" - Text { - color: "white" - anchors.centerIn: parent - text: "You can navigate between views using swipe or arrow keys" - } - - Behavior on opacity { + Behavior on info.opacity { NumberAnimation { duration: 400 } } } diff --git a/examples/charts/qmlchart/resources.qrc b/examples/charts/qmlchart/resources.qrc index 7b14dace..28b3a8a4 100644 --- a/examples/charts/qmlchart/resources.qrc +++ b/examples/charts/qmlchart/resources.qrc @@ -13,5 +13,6 @@ qml/qmlchart/View10.qml qml/qmlchart/View11.qml qml/qmlchart/View12.qml + qml/qmlchart/MainForm.ui.qml -- cgit v1.2.3