From 2019ba7875037ea932d9ce12e4a12ad9bb7ae2d3 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Wed, 20 Mar 2019 09:14:09 +0200 Subject: Rename "qml streams" folder to "qml" Task-number: QT3DS-3182 Change-Id: Ifb1b7f18b6652d26f38eeab2351c329e7cbeb425 Reviewed-by: Mahmoud Badri Reviewed-by: Janne Kangas Reviewed-by: Miikka Heikkinen --- .../30-using-sub-presentations.qdoc | 2 +- examples/studio3d/SampleProject/SampleProject.uia | 2 +- .../studio3d/SampleProject/qml streams/Map.jpg | Bin 48073 -> 0 bytes .../SampleProject/qml streams/Navigation.qml | 74 --------------------- examples/studio3d/SampleProject/qml/Map.jpg | Bin 0 -> 48073 bytes examples/studio3d/SampleProject/qml/Navigation.qml | 74 +++++++++++++++++++++ src/Authoring/Client/Code/Core/Core/Core.cpp | 2 +- .../Palettes/Project/ProjectFileSystemModel.cpp | 6 +- 8 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 examples/studio3d/SampleProject/qml streams/Map.jpg delete mode 100644 examples/studio3d/SampleProject/qml streams/Navigation.qml create mode 100644 examples/studio3d/SampleProject/qml/Map.jpg create mode 100644 examples/studio3d/SampleProject/qml/Navigation.qml diff --git a/doc/src/10-best-practices/30-using-sub-presentations.qdoc b/doc/src/10-best-practices/30-using-sub-presentations.qdoc index 6b33d194..21aff488 100644 --- a/doc/src/10-best-practices/30-using-sub-presentations.qdoc +++ b/doc/src/10-best-practices/30-using-sub-presentations.qdoc @@ -68,7 +68,7 @@ To import a sub-presentation, do one of the following: Sub-presentations will be imported to the folder that is selected in the project palette. If no folder is selected, sub-presentations will be imported to the \e{presentations} or -\e{qml streams} folder depending on the type of the sub-presentation. All assets (such as images, +\e{qml} folder depending on the type of the sub-presentation. All assets (such as images, 3D models and effects) and folders of the imported sub-presentation will be imported. \image {subpresentation-project-structure.png} diff --git a/examples/studio3d/SampleProject/SampleProject.uia b/examples/studio3d/SampleProject/SampleProject.uia index 5b7bbffc..f3f79c90 100644 --- a/examples/studio3d/SampleProject/SampleProject.uia +++ b/examples/studio3d/SampleProject/SampleProject.uia @@ -2,7 +2,7 @@ - + diff --git a/examples/studio3d/SampleProject/qml streams/Map.jpg b/examples/studio3d/SampleProject/qml streams/Map.jpg deleted file mode 100644 index 4db7a3fd..00000000 Binary files a/examples/studio3d/SampleProject/qml streams/Map.jpg and /dev/null differ diff --git a/examples/studio3d/SampleProject/qml streams/Navigation.qml b/examples/studio3d/SampleProject/qml streams/Navigation.qml deleted file mode 100644 index 7635d985..00000000 --- a/examples/studio3d/SampleProject/qml streams/Navigation.qml +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt 3D Studio. -** -** $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.0 - -Item { - width: 768 - height: 288 - - Image { - id: fakeMap - source: "./Map.jpg" - y: -231 - width: 768 - height: 462 - } - - PropertyAnimation { - target: fakeMap - property: "y" - loops: Animation.Infinite - duration: 25000 - running: true - from: -231 - to: 0 - } -} diff --git a/examples/studio3d/SampleProject/qml/Map.jpg b/examples/studio3d/SampleProject/qml/Map.jpg new file mode 100644 index 00000000..4db7a3fd Binary files /dev/null and b/examples/studio3d/SampleProject/qml/Map.jpg differ diff --git a/examples/studio3d/SampleProject/qml/Navigation.qml b/examples/studio3d/SampleProject/qml/Navigation.qml new file mode 100644 index 00000000..7635d985 --- /dev/null +++ b/examples/studio3d/SampleProject/qml/Navigation.qml @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt 3D Studio. +** +** $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.0 + +Item { + width: 768 + height: 288 + + Image { + id: fakeMap + source: "./Map.jpg" + y: -231 + width: 768 + height: 462 + } + + PropertyAnimation { + target: fakeMap + property: "y" + loops: Animation.Infinite + duration: 25000 + running: true + from: -231 + to: 0 + } +} diff --git a/src/Authoring/Client/Code/Core/Core/Core.cpp b/src/Authoring/Client/Code/Core/Core/Core.cpp index 6d375843..0e5f2348 100644 --- a/src/Authoring/Client/Code/Core/Core/Core.cpp +++ b/src/Authoring/Client/Code/Core/Core/Core.cpp @@ -247,7 +247,7 @@ bool CCore::OnNewDocument(const QString &inDocument, bool isNewProject, bool sil dir.mkdir(QStringLiteral("materials")); dir.mkdir(QStringLiteral("models")); dir.mkdir(QStringLiteral("presentations")); - dir.mkdir(QStringLiteral("qml streams")); + dir.mkdir(QStringLiteral("qml")); dir.mkdir(QStringLiteral("scripts")); // create the project .uia file diff --git a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp index 875954f3..832f4ddc 100644 --- a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp +++ b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp @@ -445,7 +445,7 @@ Q3DStudio::DocumentEditorFileType::Enum ProjectFileSystemModel::assetTypeForRow( return Q3DStudio::DocumentEditorFileType::Behavior; else if (path == QLatin1String("presentations")) return Q3DStudio::DocumentEditorFileType::Presentation; - else if (path == QLatin1String("qml streams")) + else if (path == QLatin1String("qml")) return Q3DStudio::DocumentEditorFileType::QmlStream; return Q3DStudio::DocumentEditorFileType::Unknown; @@ -823,7 +823,7 @@ void ProjectFileSystemModel::importUrl(QDir &targetDir, const QUrl &url, qmlRoot = getQmlStreamRootNode(qmlEngine, sourceFile, isQmlStream); if (qmlRoot) { if (isQmlStream && targetDir.path().endsWith(QLatin1String("/scripts"))) { - const QString path(QStringLiteral("../qml streams")); + const QString path(QStringLiteral("../qml")); targetDir.mkpath(path); // create the folder if doesn't exist targetDir.cd(path); } @@ -1251,7 +1251,7 @@ void ProjectFileSystemModel::updateDefaultDirMap() m_defaultDirToAbsPathMap.insert(QStringLiteral("models"), QString()); m_defaultDirToAbsPathMap.insert(QStringLiteral("scripts"), QString()); m_defaultDirToAbsPathMap.insert(QStringLiteral("presentations"), QString()); - m_defaultDirToAbsPathMap.insert(QStringLiteral("qml streams"), QString()); + m_defaultDirToAbsPathMap.insert(QStringLiteral("qml"), QString()); } const QString rootPath = m_items[0].index.data(QFileSystemModel::FilePathRole).toString(); -- cgit v1.2.3