From 5d7345c937e795806ce12884026eee56bfadf19b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 26 Jan 2023 13:35:18 +0100 Subject: Move QtQuickUltralite items directly to compatibility This shortens the path and avoids building issues on Windows. Removing QtAndroidAutomotive for now. Change-Id: I76a4ba4269b626ec9ae31d735bc2eef244760d1f Reviewed-by: Qt CI Bot Reviewed-by: Thomas Hartmann --- src/imports/compatibility/CMakeLists.txt | 5 +- src/imports/compatibility/Extras/CMakeLists.txt | 16 ++ .../compatibility/Extras/ColorizedImage.qml | 55 +++++ src/imports/compatibility/Extras/StaticText.qml | 34 +++ .../compatibility/Extras/designer/CMakeLists.txt | 16 ++ .../Extras/designer/ColorizedImageSpecifics.qml | 254 +++++++++++++++++++++ .../designer/QtQuickUltraliteExtras.metainfo | 28 +++ .../Extras/designer/StaticTextSpecifics.qml | 60 +++++ .../Extras/designer/images/image-icon.png | Bin 0 -> 434 bytes .../Extras/designer/images/image-icon@2x.png | Bin 0 -> 596 bytes .../Extras/designer/images/text-icon.png | Bin 0 -> 126 bytes .../Extras/designer/images/text-icon@2x.png | Bin 0 -> 156 bytes src/imports/compatibility/Extras/plugins.qmltypes | 13 ++ src/imports/compatibility/Extras/qmldir | 9 + .../Extras/studiocompatibilityqulextras.cpp | 57 +++++ .../compatibility/Layers/+DesignMode/Screen.qml | 43 ++++ src/imports/compatibility/Layers/Application.qml | 35 +++ src/imports/compatibility/Layers/CMakeLists.txt | 18 ++ src/imports/compatibility/Layers/ImageLayer.qml | 49 ++++ src/imports/compatibility/Layers/ItemLayer.qml | 49 ++++ src/imports/compatibility/Layers/Screen.qml | 48 ++++ src/imports/compatibility/Layers/SpriteLayer.qml | 41 ++++ .../Layers/designer/ApplicationSpecifics.qml | 43 ++++ .../compatibility/Layers/designer/CMakeLists.txt | 16 ++ .../Layers/designer/ImageLayerSpecifics.qml | 82 +++++++ .../Layers/designer/ItemLayerSpecifics.qml | 101 ++++++++ .../designer/QtQuickUltraliteLayers.metainfo | 87 +++++++ .../Layers/designer/ScreenSpecifics.qml | 112 +++++++++ .../Layers/designer/SpriteLayerSpecifics.qml | 73 ++++++ .../Layers/designer/images/item-icon.png | Bin 0 -> 148 bytes .../Layers/designer/images/item-icon@2x.png | Bin 0 -> 167 bytes src/imports/compatibility/Layers/plugins.qmltypes | 10 + src/imports/compatibility/Layers/qmldir | 12 + .../Layers/studiocompatibilityqullayers.cpp | 55 +++++ .../compatibility/QtQuickUltralite/CMakeLists.txt | 3 - .../QtQuickUltralite/Extras/CMakeLists.txt | 16 -- .../QtQuickUltralite/Extras/ColorizedImage.qml | 55 ----- .../QtQuickUltralite/Extras/StaticText.qml | 34 --- .../Extras/designer/CMakeLists.txt | 16 -- .../Extras/designer/ColorizedImageSpecifics.qml | 254 --------------------- .../designer/QtQuickUltraliteExtras.metainfo | 28 --- .../Extras/designer/StaticTextSpecifics.qml | 60 ----- .../Extras/designer/images/image-icon.png | Bin 434 -> 0 bytes .../Extras/designer/images/image-icon@2x.png | Bin 596 -> 0 bytes .../Extras/designer/images/text-icon.png | Bin 126 -> 0 bytes .../Extras/designer/images/text-icon@2x.png | Bin 156 -> 0 bytes .../QtQuickUltralite/Extras/plugins.qmltypes | 13 -- .../compatibility/QtQuickUltralite/Extras/qmldir | 9 - .../Extras/studiocompatibilityqulextras.cpp | 57 ----- .../QtQuickUltralite/Layers/+DesignMode/Screen.qml | 43 ---- .../QtQuickUltralite/Layers/Application.qml | 35 --- .../QtQuickUltralite/Layers/CMakeLists.txt | 18 -- .../QtQuickUltralite/Layers/ImageLayer.qml | 49 ---- .../QtQuickUltralite/Layers/ItemLayer.qml | 49 ---- .../QtQuickUltralite/Layers/Screen.qml | 48 ---- .../QtQuickUltralite/Layers/SpriteLayer.qml | 41 ---- .../Layers/designer/ApplicationSpecifics.qml | 43 ---- .../Layers/designer/CMakeLists.txt | 16 -- .../Layers/designer/ImageLayerSpecifics.qml | 82 ------- .../Layers/designer/ItemLayerSpecifics.qml | 101 -------- .../designer/QtQuickUltraliteLayers.metainfo | 87 ------- .../Layers/designer/ScreenSpecifics.qml | 112 --------- .../Layers/designer/SpriteLayerSpecifics.qml | 73 ------ .../Layers/designer/images/item-icon.png | Bin 148 -> 0 bytes .../Layers/designer/images/item-icon@2x.png | Bin 167 -> 0 bytes .../QtQuickUltralite/Layers/plugins.qmltypes | 10 - .../compatibility/QtQuickUltralite/Layers/qmldir | 12 - .../Layers/studiocompatibilityqullayers.cpp | 55 ----- 68 files changed, 1419 insertions(+), 1421 deletions(-) create mode 100644 src/imports/compatibility/Extras/CMakeLists.txt create mode 100644 src/imports/compatibility/Extras/ColorizedImage.qml create mode 100644 src/imports/compatibility/Extras/StaticText.qml create mode 100644 src/imports/compatibility/Extras/designer/CMakeLists.txt create mode 100644 src/imports/compatibility/Extras/designer/ColorizedImageSpecifics.qml create mode 100644 src/imports/compatibility/Extras/designer/QtQuickUltraliteExtras.metainfo create mode 100644 src/imports/compatibility/Extras/designer/StaticTextSpecifics.qml create mode 100644 src/imports/compatibility/Extras/designer/images/image-icon.png create mode 100644 src/imports/compatibility/Extras/designer/images/image-icon@2x.png create mode 100644 src/imports/compatibility/Extras/designer/images/text-icon.png create mode 100644 src/imports/compatibility/Extras/designer/images/text-icon@2x.png create mode 100644 src/imports/compatibility/Extras/plugins.qmltypes create mode 100644 src/imports/compatibility/Extras/qmldir create mode 100644 src/imports/compatibility/Extras/studiocompatibilityqulextras.cpp create mode 100644 src/imports/compatibility/Layers/+DesignMode/Screen.qml create mode 100644 src/imports/compatibility/Layers/Application.qml create mode 100644 src/imports/compatibility/Layers/CMakeLists.txt create mode 100644 src/imports/compatibility/Layers/ImageLayer.qml create mode 100644 src/imports/compatibility/Layers/ItemLayer.qml create mode 100644 src/imports/compatibility/Layers/Screen.qml create mode 100644 src/imports/compatibility/Layers/SpriteLayer.qml create mode 100644 src/imports/compatibility/Layers/designer/ApplicationSpecifics.qml create mode 100644 src/imports/compatibility/Layers/designer/CMakeLists.txt create mode 100644 src/imports/compatibility/Layers/designer/ImageLayerSpecifics.qml create mode 100644 src/imports/compatibility/Layers/designer/ItemLayerSpecifics.qml create mode 100644 src/imports/compatibility/Layers/designer/QtQuickUltraliteLayers.metainfo create mode 100644 src/imports/compatibility/Layers/designer/ScreenSpecifics.qml create mode 100644 src/imports/compatibility/Layers/designer/SpriteLayerSpecifics.qml create mode 100644 src/imports/compatibility/Layers/designer/images/item-icon.png create mode 100644 src/imports/compatibility/Layers/designer/images/item-icon@2x.png create mode 100644 src/imports/compatibility/Layers/plugins.qmltypes create mode 100644 src/imports/compatibility/Layers/qmldir create mode 100644 src/imports/compatibility/Layers/studiocompatibilityqullayers.cpp delete mode 100644 src/imports/compatibility/QtQuickUltralite/CMakeLists.txt delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/CMakeLists.txt delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/ColorizedImage.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/StaticText.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/designer/CMakeLists.txt delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/designer/StaticTextSpecifics.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon.png delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon@2x.png delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon.png delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon@2x.png delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/qmldir delete mode 100644 src/imports/compatibility/QtQuickUltralite/Extras/studiocompatibilityqulextras.cpp delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/Application.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/CMakeLists.txt delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/ApplicationSpecifics.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/CMakeLists.txt delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/ScreenSpecifics.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/SpriteLayerSpecifics.qml delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon.png delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon@2x.png delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/qmldir delete mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/studiocompatibilityqullayers.cpp diff --git a/src/imports/compatibility/CMakeLists.txt b/src/imports/compatibility/CMakeLists.txt index dcd7319..d35facf 100644 --- a/src/imports/compatibility/CMakeLists.txt +++ b/src/imports/compatibility/CMakeLists.txt @@ -1,2 +1,3 @@ -add_subdirectory(QtAndroidAutomotive) -add_subdirectory(QtQuickUltralite) +add_subdirectory(Extras) +add_subdirectory(Layers) + diff --git a/src/imports/compatibility/Extras/CMakeLists.txt b/src/imports/compatibility/Extras/CMakeLists.txt new file mode 100644 index 0000000..32b4306 --- /dev/null +++ b/src/imports/compatibility/Extras/CMakeLists.txt @@ -0,0 +1,16 @@ +qt_internal_add_qml_module(QuickUltraLiteStudioExtras + URI "QtQuickUltralite.Extras" + VERSION "${PROJECT_VERSION}" + DESIGNER_SUPPORTED + NO_SYNC_QT + PAST_MAJOR_VERSIONS 1 + QML_FILES + ColorizedImage.qml + StaticText.qml +) + +if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS) + add_subdirectory(designer) +endif() + + diff --git a/src/imports/compatibility/Extras/ColorizedImage.qml b/src/imports/compatibility/Extras/ColorizedImage.qml new file mode 100644 index 0000000..ee509d4 --- /dev/null +++ b/src/imports/compatibility/Extras/ColorizedImage.qml @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.12 +import Qt5Compat.GraphicalEffects +import QtQuickUltralite.Extras 1.9 + +Item { + id: colorizedRoot + property var color: "transparent" + property alias source: internalImg.source + property alias fillMode: internalImg.fillMode + property alias horizontalAlignment: internalImg.horizontalAlignment + property alias verticalAlignment: internalImg.verticalAlignment + + implicitWidth: internalImg.sourceSize.width + implicitHeight: internalImg.sourceSize.height + + Image { + id: internalImg + + layer.enabled: true + layer.effect: ColorOverlay { + anchors.fill: internalImg + source: internalImg + color: colorizedRoot.color + } + } +} diff --git a/src/imports/compatibility/Extras/StaticText.qml b/src/imports/compatibility/Extras/StaticText.qml new file mode 100644 index 0000000..47483e3 --- /dev/null +++ b/src/imports/compatibility/Extras/StaticText.qml @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 +//! [StaticText compatibility] +Text { +} +//! [StaticText compatibility] diff --git a/src/imports/compatibility/Extras/designer/CMakeLists.txt b/src/imports/compatibility/Extras/designer/CMakeLists.txt new file mode 100644 index 0000000..19ad43d --- /dev/null +++ b/src/imports/compatibility/Extras/designer/CMakeLists.txt @@ -0,0 +1,16 @@ +qt_path_join(installdesignerdir "${INSTALL_QMLDIR}" "QtQuickUltralite/Extras") +qt_path_join(targetdesignerdir "${CMAKE_BINARY_DIR}" "${installdesignerdir}/designer") + +file( + COPY . + DESTINATION ${targetdesignerdir} + FILES_MATCHING PATTERN "*qml" + PATTERN "*metainfo" + PATTERN "images/*png" + PATTERN "CMakeFiles" EXCLUDE +) + +qt_install( + DIRECTORY ${targetdesignerdir} + DESTINATION ${installdesignerdir} +) diff --git a/src/imports/compatibility/Extras/designer/ColorizedImageSpecifics.qml b/src/imports/compatibility/Extras/designer/ColorizedImageSpecifics.qml new file mode 100644 index 0000000..c0e9ce5 --- /dev/null +++ b/src/imports/compatibility/Extras/designer/ColorizedImageSpecifics.qml @@ -0,0 +1,254 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 +import QtQuick.Layouts 1.15 +import HelperWidgets 2.0 +import StudioTheme 1.0 as StudioTheme + +//! [ColorizedImage compatibility] +Section { + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr("Colorized Image") + + SectionLayout { + PropertyLabel { text: qsTr("Image color") } + + ColorEditor { + backendValue: backendValues.color + supportGradient: false + } + + PropertyLabel { text: qsTr("Source") } + + SecondColumnLayout { + UrlChooser { + backendValue: backendValues.source + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Fill mode") } + + SecondColumnLayout { + ComboBox { + scope: "Image" + model: ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally", "Pad"] + backendValue: backendValues.fillMode + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + width: implicitWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Source size") + blockedByTemplate: !backendValues.sourceSize.isAvailable + } + + SecondColumnLayout { + SpinBox { + backendValue: backendValues.sourceSize_width + minimumValue: 0 + maximumValue: 8192 + decimals: 0 + enabled: backendValue.isAvailable + } + + Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } + + ControlLabel { + //: The width of the object + text: qsTr("W", "width") + enabled: backendValues.sourceSize_width.isAvailable + } + + SpinBox { + backendValue: backendValues.sourceSize_height + minimumValue: 0 + maximumValue: 8192 + decimals: 0 + enabled: backendValue.isAvailable + } + + Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } + + ControlLabel { + //: The height of the object + text: qsTr("H", "height") + enabled: backendValues.sourceSize_height.isAvailable + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Alignment H") } + + SecondColumnLayout { + ComboBox { + scope: "Image" + model: ["AlignLeft", "AlignRight", "AlignHCenter"] + backendValue: backendValues.horizontalAlignment + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + width: implicitWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Alignment V") } + + SecondColumnLayout { + ComboBox { + scope: "Image" + model: ["AlignTop", "AlignBottom", "AlignVCenter"] + backendValue: backendValues.verticalAlignment + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + width: implicitWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Asynchronous") + tooltip: qsTr("Loads images on the local filesystem asynchronously in a separate thread.") + blockedByTemplate: !backendValues.asynchronous.isAvailable + } + + SecondColumnLayout { + CheckBox { + enabled: backendValues.asynchronous.isAvailable + text: backendValues.asynchronous.valueToString + backendValue: backendValues.asynchronous + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Auto transform") + tooltip: qsTr("Automatically applies image transformation metadata such as EXIF orientation.") + blockedByTemplate: !backendValues.autoTransform.isAvailable + } + + SecondColumnLayout { + CheckBox { + enabled: backendValues.autoTransform.isAvailable + text: backendValues.autoTransform.valueToString + backendValue: backendValues.autoTransform + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Cache") + tooltip: qsTr("Caches the image.") + blockedByTemplate: !backendValues.cache.isAvailable + } + + SecondColumnLayout { + CheckBox { + enabled: backendValues.cache.isAvailable + text: backendValues.cache.valueToString + backendValue: backendValues.cache + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Mipmap") + tooltip: qsTr("Uses mipmap filtering when the image is scaled or transformed.") + blockedByTemplate: !backendValues.mipmap.isAvailable + } + + SecondColumnLayout { + CheckBox { + enabled: backendValues.mipmap.isAvailable + text: backendValues.mipmap.valueToString + backendValue: backendValues.mipmap + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Mirror") + tooltip: qsTr("Inverts the image horizontally.") + blockedByTemplate: !backendValues.mirror.isAvailable + } + + SecondColumnLayout { + CheckBox { + enabled: backendValues.mirror.isAvailable + text: backendValues.mirror.valueToString + backendValue: backendValues.mirror + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Smooth") + tooltip: qsTr("Smoothly filters the image when it is scaled or transformed.") + blockedByTemplate: !backendValues.smooth.isAvailable + } + + SecondColumnLayout { + CheckBox { + enabled: backendValues.smooth.isAvailable + text: backendValues.smooth.valueToString + backendValue: backendValues.smooth + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + } +} +//! [ColorizedImage compatibility] diff --git a/src/imports/compatibility/Extras/designer/QtQuickUltraliteExtras.metainfo b/src/imports/compatibility/Extras/designer/QtQuickUltraliteExtras.metainfo new file mode 100644 index 0000000..ab5716c --- /dev/null +++ b/src/imports/compatibility/Extras/designer/QtQuickUltraliteExtras.metainfo @@ -0,0 +1,28 @@ +MetaInfo { + Type { + name: "QtQuickUltralite.Extras.ColorizedImage" + icon: "images/image-icon.png" + + ItemLibraryEntry { + name: "Colorized Image" + category: "QtQuickUltralite - Extras" + libraryIcon: "images/image-icon@2x.png" + version: "1.9" + requiredImport: "QtQuickUltralite.Extras" + Property { name: "source"; type: "binding"; value: "\"source/text\""; } + } + } + Type { + name: "QtQuickUltralite.Extras.StaticText" + icon: "images/text-icon.png" + + ItemLibraryEntry { + name: "Static Text" + category: "QtQuickUltralite - Extras" + libraryIcon: "images/text-icon@2x.png" + version: "1.9" + requiredImport: "QtQuickUltralite.Extras" + Property { name: "text"; type: "binding"; value: "qsTr(\"Static Text\")"; } + } + } +} diff --git a/src/imports/compatibility/Extras/designer/StaticTextSpecifics.qml b/src/imports/compatibility/Extras/designer/StaticTextSpecifics.qml new file mode 100644 index 0000000..e75bbfa --- /dev/null +++ b/src/imports/compatibility/Extras/designer/StaticTextSpecifics.qml @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 +import QtQuick.Layouts 1.15 +import HelperWidgets 2.0 + +//! [StaticText compatibility] +Column { + anchors.left: parent.left + anchors.right: parent.right + + CharacterSection { + richTextEditorAvailable: true + showLineHeight: true + showVerticalAlignment: true + } + + TextExtrasSection { + showElide: true + showWrapMode: true + showFormatProperty: true + showFontSizeMode: true + showLineHeight: true + } + + FontExtrasSection { + showStyle: true + } + + PaddingSection {} +} + +//! [StaticText compatibility] diff --git a/src/imports/compatibility/Extras/designer/images/image-icon.png b/src/imports/compatibility/Extras/designer/images/image-icon.png new file mode 100644 index 0000000..318ce08 Binary files /dev/null and b/src/imports/compatibility/Extras/designer/images/image-icon.png differ diff --git a/src/imports/compatibility/Extras/designer/images/image-icon@2x.png b/src/imports/compatibility/Extras/designer/images/image-icon@2x.png new file mode 100644 index 0000000..cc84918 Binary files /dev/null and b/src/imports/compatibility/Extras/designer/images/image-icon@2x.png differ diff --git a/src/imports/compatibility/Extras/designer/images/text-icon.png b/src/imports/compatibility/Extras/designer/images/text-icon.png new file mode 100644 index 0000000..29a81f5 Binary files /dev/null and b/src/imports/compatibility/Extras/designer/images/text-icon.png differ diff --git a/src/imports/compatibility/Extras/designer/images/text-icon@2x.png b/src/imports/compatibility/Extras/designer/images/text-icon@2x.png new file mode 100644 index 0000000..1df8f76 Binary files /dev/null and b/src/imports/compatibility/Extras/designer/images/text-icon@2x.png differ diff --git a/src/imports/compatibility/Extras/plugins.qmltypes b/src/imports/compatibility/Extras/plugins.qmltypes new file mode 100644 index 0000000..6a6c815 --- /dev/null +++ b/src/imports/compatibility/Extras/plugins.qmltypes @@ -0,0 +1,13 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls 2.15' + +Module { + dependencies: [ + "QtQuick 2.12" + ] +} diff --git a/src/imports/compatibility/Extras/qmldir b/src/imports/compatibility/Extras/qmldir new file mode 100644 index 0000000..fec69a2 --- /dev/null +++ b/src/imports/compatibility/Extras/qmldir @@ -0,0 +1,9 @@ +module QtQuickUltralite.Extras +linktarget studioqtquickultraliteextrasplugin +optional plugin studioqtquickultraliteextrasplugin +classname QtQuickUltralite_ExtrasPlugin +typeinfo studioqtquickultraliteextras.qmltypes +prefer :/QtQuickUltralite/Extras/ +ColorizedImage 1.0 ColorizedImage.qml +StaticText 1.0 StaticText.qml + diff --git a/src/imports/compatibility/Extras/studiocompatibilityqulextras.cpp b/src/imports/compatibility/Extras/studiocompatibilityqulextras.cpp new file mode 100644 index 0000000..8b2804d --- /dev/null +++ b/src/imports/compatibility/Extras/studiocompatibilityqulextras.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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$ +** +****************************************************************************/ + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class StudioCompatibilityQULExtras: public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) + +public: + StudioCompatibilityQULExtras(QObject *parent = nullptr); + void registerTypes(const char *uri) override; +}; + +StudioCompatibilityQULExtras::StudioCompatibilityQULExtras(QObject *parent) + : QQmlExtensionPlugin(parent) +{ +} + +void StudioCompatibilityQULExtras::registerTypes(const char *) +{ +} + +QT_END_NAMESPACE + +#include "studiocompatibilityqulextras.moc" diff --git a/src/imports/compatibility/Layers/+DesignMode/Screen.qml b/src/imports/compatibility/Layers/+DesignMode/Screen.qml new file mode 100644 index 0000000..f86c272 --- /dev/null +++ b/src/imports/compatibility/Layers/+DesignMode/Screen.qml @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 + +//! [Screen compatibility] +Rectangle { + id: wnd + property var outputDevice: "device" + property alias backgroundColor: color + + property int defaultApplicationWidth: width + property int defaultApplicationHeight: height + + visible: true +} +//! [Screen compatibility] diff --git a/src/imports/compatibility/Layers/Application.qml b/src/imports/compatibility/Layers/Application.qml new file mode 100644 index 0000000..f13f25e --- /dev/null +++ b/src/imports/compatibility/Layers/Application.qml @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 + +//! [Application compatibility] +Item { +} +//! [Application compatibility] diff --git a/src/imports/compatibility/Layers/CMakeLists.txt b/src/imports/compatibility/Layers/CMakeLists.txt new file mode 100644 index 0000000..1903505 --- /dev/null +++ b/src/imports/compatibility/Layers/CMakeLists.txt @@ -0,0 +1,18 @@ +qt_internal_add_qml_module(QuickUltraLiteStudioLayers + URI "QtQuickUltralite.Layers" + VERSION "${PROJECT_VERSION}" + DESIGNER_SUPPORTED + NO_SYNC_QT + PAST_MAJOR_VERSIONS 1 + QML_FILES + Application.qml + ImageLayer.qml + ItemLayer.qml + Screen.qml + SpriteLayer.qml +) + +if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS) + add_subdirectory(designer) +endif() + diff --git a/src/imports/compatibility/Layers/ImageLayer.qml b/src/imports/compatibility/Layers/ImageLayer.qml new file mode 100644 index 0000000..f4c0647 --- /dev/null +++ b/src/imports/compatibility/Layers/ImageLayer.qml @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 + +//! [ImageLayer compatibility] +Item { + enum RenderingHints { + OptimizeForSpeed, + OptimizeForSize, + StaticContents + } + + property int platformId: 0 + property int renderingHints: ImageLayer.RenderingHints.OptimizeForSpeed + property alias source: internalImage.source + + Image { + id: internalImage + anchors.fill: parent + } +} +//! [ImageLayer compatibility] diff --git a/src/imports/compatibility/Layers/ItemLayer.qml b/src/imports/compatibility/Layers/ItemLayer.qml new file mode 100644 index 0000000..231c3d3 --- /dev/null +++ b/src/imports/compatibility/Layers/ItemLayer.qml @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 + +//! [ItemLayer compatibility] +Item { + enum ColorDepth { + Bpp16, Bpp16Alpha, Bpp24, Bpp32, Bpp32Alpha + } + + enum RenderingHints { + OptimizeForSpeed, + OptimizeForSize, + StaticContents + } + + property int depth: ColorDepth.Bpp32 + property int refreshInterval: 1 + property int platformId: 0 + property int renderingHints: RenderingHints.OptimizeForSpeed +} +//! [ItemLayer compatibility] diff --git a/src/imports/compatibility/Layers/Screen.qml b/src/imports/compatibility/Layers/Screen.qml new file mode 100644 index 0000000..ad50a8d --- /dev/null +++ b/src/imports/compatibility/Layers/Screen.qml @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 +import QtQuick.Window 2.2 + +//! [Screen compatibility] +Item { + id: root + + property var outputDevice: "device" + property alias backgroundColor: wnd.color + + property alias defaultApplicationWidth: wnd.width + property alias defaultApplicationHeight: wnd.height + + Window { + id: wnd + visible: true + } +} +//! [Screen compatibility] diff --git a/src/imports/compatibility/Layers/SpriteLayer.qml b/src/imports/compatibility/Layers/SpriteLayer.qml new file mode 100644 index 0000000..29f3db9 --- /dev/null +++ b/src/imports/compatibility/Layers/SpriteLayer.qml @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 + +//! [SpriteLayer compatibility] +Item { + enum ColorDepth { + Bpp8, Bpp16, Bpp16Alpha, Bpp24, Bpp32, Bpp32Alpha + } + + property int depth: ColorDepth.Bpp32 + property int platformId: 0 +} +//! [SpriteLayer compatibility] diff --git a/src/imports/compatibility/Layers/designer/ApplicationSpecifics.qml b/src/imports/compatibility/Layers/designer/ApplicationSpecifics.qml new file mode 100644 index 0000000..58374ef --- /dev/null +++ b/src/imports/compatibility/Layers/designer/ApplicationSpecifics.qml @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 + +import HelperWidgets 2.0 +import QtQuick.Layouts 1.0 + +//! [Application compatibility] +Section { + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr("Application") + + //Application type has no properties +} +//! [Application compatibility] diff --git a/src/imports/compatibility/Layers/designer/CMakeLists.txt b/src/imports/compatibility/Layers/designer/CMakeLists.txt new file mode 100644 index 0000000..508a4ea --- /dev/null +++ b/src/imports/compatibility/Layers/designer/CMakeLists.txt @@ -0,0 +1,16 @@ +qt_path_join(installdesignerdir "${INSTALL_QMLDIR}" "QtQuickUltralite/Layers") +qt_path_join(targetdesignerdir "${CMAKE_BINARY_DIR}" "${installdesignerdir}/designer") + +file( + COPY . + DESTINATION ${targetdesignerdir} + FILES_MATCHING PATTERN "*qml" + PATTERN "*metainfo" + PATTERN "images/*png" + PATTERN "CMakeFiles" EXCLUDE +) + +qt_install( + DIRECTORY ${targetdesignerdir} + DESTINATION ${installdesignerdir} +) diff --git a/src/imports/compatibility/Layers/designer/ImageLayerSpecifics.qml b/src/imports/compatibility/Layers/designer/ImageLayerSpecifics.qml new file mode 100644 index 0000000..ac60034 --- /dev/null +++ b/src/imports/compatibility/Layers/designer/ImageLayerSpecifics.qml @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 +import QtQuick.Layouts 1.15 +import HelperWidgets 2.0 +import StudioTheme 1.0 as StudioTheme + +//! [ImageLayer compatibility] +Section { + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr("Image Layer") + + SectionLayout { + PropertyLabel { text: qsTr("Platform ID") } + + SecondColumnLayout { + SpinBox { + backendValue: backendValues.platformId + minimumValue: 0 + maximumValue: 2000 + decimals: 0 + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Rendering hints") } + + SecondColumnLayout { + ComboBox { + model: ["OptimizeForSpeed", "OptimizeForSize", "StaticContents"] + backendValue: backendValues.renderingHints + scope: "ImageLayer" + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Source") } + + SecondColumnLayout { + UrlChooser { + backendValue: backendValues.source + } + + ExpandingSpacer {} + } + } +} +//! [ImageLayer compatibility] diff --git a/src/imports/compatibility/Layers/designer/ItemLayerSpecifics.qml b/src/imports/compatibility/Layers/designer/ItemLayerSpecifics.qml new file mode 100644 index 0000000..d36486c --- /dev/null +++ b/src/imports/compatibility/Layers/designer/ItemLayerSpecifics.qml @@ -0,0 +1,101 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 +import QtQuick.Layouts 1.15 +import HelperWidgets 2.0 +import StudioTheme 1.0 as StudioTheme + +//! [ItemLayer compatibility] +Section { + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr("Item Layer") + + SectionLayout { + PropertyLabel { text: qsTr("Platform ID") } + + SecondColumnLayout { + SpinBox { + backendValue: backendValues.platformId + minimumValue: 0 + maximumValue: 2000 + decimals: 0 + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Rendering hints") } + + SecondColumnLayout { + ComboBox { + model: ["OptimizeForSpeed", "OptimizeForSize", "StaticContents"] + backendValue: backendValues.renderingHints + scope: "ItemLayer" + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Depth") } + + SecondColumnLayout { + ComboBox { + model: ["Bpp16", "Bpp16Alpha", "Bpp24", "Bpp32", "Bpp32Alpha"] + backendValue: backendValues.depth + scope: "ItemLayer" + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Refresh interval") } + + SecondColumnLayout { + SpinBox { + backendValue: backendValues.refreshInterval + minimumValue: 0 + maximumValue: 1000 + decimals: 0 + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + } +} +//! [ItemLayer compatibility] diff --git a/src/imports/compatibility/Layers/designer/QtQuickUltraliteLayers.metainfo b/src/imports/compatibility/Layers/designer/QtQuickUltraliteLayers.metainfo new file mode 100644 index 0000000..649154b --- /dev/null +++ b/src/imports/compatibility/Layers/designer/QtQuickUltraliteLayers.metainfo @@ -0,0 +1,87 @@ +MetaInfo { + Type { + name: "QtQuickUltralite.Layers.Application" + icon: "images/item-icon.png" + + ItemLibraryEntry { + name: "Application" + category: "QtQuickUltralite - Layers" + libraryIcon: "images/item-icon@2x.png" + version: "1.9" + requiredImport: "QtQuickUltralite.Layers" + } + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: true + } + } + Type { + name: "QtQuickUltralite.Layers.ImageLayer" + icon: "images/item-icon.png" + + ItemLibraryEntry { + name: "Image Layer" + category: "QtQuickUltralite - Layers" + libraryIcon: "images/item-icon@2x.png" + version: "1.9" + requiredImport: "QtQuickUltralite.Layers" + + Property { name: "renderingHints"; type: "enum"; value: "ImageLayer.OptimizeForSpeed"; } + Property { name: "platformId"; type: "int"; value: 0; } + } + } + Type { + name: "QtQuickUltralite.Layers.ItemLayer" + icon: "images/item-icon.png" + + ItemLibraryEntry { + name: "Item Layer" + category: "QtQuickUltralite - Layers" + libraryIcon: "images/item-icon@2x.png" + version: "1.9" + requiredImport: "QtQuickUltralite.Layers" + + Property { name: "depth"; type: "enum"; value: "ItemLayer.Bpp32"; } + Property { name: "renderingHints"; type: "enum"; value: "ItemLayer.OptimizeForSpeed"; } + Property { name: "refreshInterval"; type: "int"; value: 1; } + Property { name: "platformId"; type: "int"; value: 0; } + } + } + Type { + name: "QtQuickUltralite.Layers.Screen" + icon: "images/item-icon.png" + + ItemLibraryEntry { + name: "Screen" + category: "QtQuickUltralite - Layers" + libraryIcon: "images/item-icon@2x.png" + version: "1.9" + requiredImport: "QtQuickUltralite.Layers" + } + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: true + } + } + Type { + name: "QtQuickUltralite.Layers.SpriteLayer" + icon: "images/item-icon.png" + + ItemLibraryEntry { + name: "Sprite Layer" + category: "QtQuickUltralite - Layers" + libraryIcon: "images/item-icon@2x.png" + version: "1.9" + requiredImport: "QtQuickUltralite.Layers" + + Property { name: "depth"; type: "enum"; value: "SpriteLayer.Bpp32"; } + Property { name: "platformId"; type: "int"; value: 0; } + } + } +} diff --git a/src/imports/compatibility/Layers/designer/ScreenSpecifics.qml b/src/imports/compatibility/Layers/designer/ScreenSpecifics.qml new file mode 100644 index 0000000..80c7357 --- /dev/null +++ b/src/imports/compatibility/Layers/designer/ScreenSpecifics.qml @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 +import QtQuick.Layouts 1.15 +import HelperWidgets 2.0 +import StudioTheme 1.0 as StudioTheme + +//! [Screen compatibility] +Section { + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr("Screen") + + SectionLayout { + PropertyLabel { text: qsTr("Output Device") } + + SecondColumnLayout { + LineEdit { + backendValue: backendValues.outputDevice + showTranslateCheckBox: false + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + width: implicitWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Background color") } + + ColorEditor { + backendValue: backendValues.backgroundColor + supportGradient: false + } + + PropertyLabel { text: qsTr("Application size") } + + SecondColumnLayout { + SpinBox { + id: widthSpinBox + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: backendValues.defaultApplicationWidth + maximumValue: 0xffff + minimumValue: 0 + decimals: 0 + enabled: true + } + + Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } + + ControlLabel { + //: The width of the object + text: qsTr("W", "width") + tooltip: widthSpinBox.enabled ? qsTr("Width") : root.disbaledTooltip + enabled: widthSpinBox.enabled + } + + Spacer { implicitWidth: StudioTheme.Values.controlGap } + + SpinBox { + id: heightSpinBox + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: backendValues.defaultApplicationHeight + maximumValue: 0xffff + minimumValue: 0 + decimals: 0 + enabled: true + } + + Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } + + ControlLabel { + //: The height of the object + text: qsTr("H", "height") + tooltip: heightSpinBox.enabled ? qsTr("Height") : root.disbaledTooltip + enabled: heightSpinBox.enabled + } + + ExpandingSpacer {} + } + } +} +//! [Screen compatibility] diff --git a/src/imports/compatibility/Layers/designer/SpriteLayerSpecifics.qml b/src/imports/compatibility/Layers/designer/SpriteLayerSpecifics.qml new file mode 100644 index 0000000..c13054d --- /dev/null +++ b/src/imports/compatibility/Layers/designer/SpriteLayerSpecifics.qml @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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.15 +import QtQuick.Layouts 1.15 +import HelperWidgets 2.0 +import StudioTheme 1.0 as StudioTheme + +//! [SpriteLayer compatibility] +Section { + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr("Sprite Layer") + + SectionLayout { + PropertyLabel { text: qsTr("Platform ID") } + + SecondColumnLayout { + SpinBox { + backendValue: backendValues.platformId + minimumValue: 0 + maximumValue: 2000 + decimals: 0 + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Depth") } + + SecondColumnLayout { + ComboBox { + model: ["Bpp8", "Bpp16", "Bpp16Alpha", "Bpp24", "Bpp32", "Bpp32Alpha"] + backendValue: backendValues.depth + scope: "SpriteLayer" + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + width: implicitWidth + } + + ExpandingSpacer {} + } + } +} +//! [SpriteLayer compatibility] diff --git a/src/imports/compatibility/Layers/designer/images/item-icon.png b/src/imports/compatibility/Layers/designer/images/item-icon.png new file mode 100644 index 0000000..af81cdf Binary files /dev/null and b/src/imports/compatibility/Layers/designer/images/item-icon.png differ diff --git a/src/imports/compatibility/Layers/designer/images/item-icon@2x.png b/src/imports/compatibility/Layers/designer/images/item-icon@2x.png new file mode 100644 index 0000000..f05aa57 Binary files /dev/null and b/src/imports/compatibility/Layers/designer/images/item-icon@2x.png differ diff --git a/src/imports/compatibility/Layers/plugins.qmltypes b/src/imports/compatibility/Layers/plugins.qmltypes new file mode 100644 index 0000000..05873fb --- /dev/null +++ b/src/imports/compatibility/Layers/plugins.qmltypes @@ -0,0 +1,10 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. + +Module { + dependencies: [ + "QtQuick 2.15" + ] +} diff --git a/src/imports/compatibility/Layers/qmldir b/src/imports/compatibility/Layers/qmldir new file mode 100644 index 0000000..8d0a4b2 --- /dev/null +++ b/src/imports/compatibility/Layers/qmldir @@ -0,0 +1,12 @@ +module QtQuickUltralite.Layers +linktarget studioqtquickultralitelayersplugin +optional plugin studioqtquickultralitelayersplugin +classname QtQuickUltralite_LayersPlugin +typeinfo studioqtquickultralitelayers.qmltypes +prefer :/QtQuickUltralite/Layers/ +Application 1.0 Application.qml +ImageLayer 1.0 ImageLayer.qml +ItemLayer 1.0 ItemLayer.qml +Screen 1.0 Screen.qml +SpriteLayer 1.0 SpriteLayer.qml + diff --git a/src/imports/compatibility/Layers/studiocompatibilityqullayers.cpp b/src/imports/compatibility/Layers/studiocompatibilityqullayers.cpp new file mode 100644 index 0000000..762371a --- /dev/null +++ b/src/imports/compatibility/Layers/studiocompatibilityqullayers.cpp @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Quick Ultralite compatibility. +** +** $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$ +** +****************************************************************************/ + +#include + +QT_BEGIN_NAMESPACE + +class StudioCompatibilityQULLayers: public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) + +public: + StudioCompatibilityQULLayers(QObject *parent = nullptr); + void registerTypes(const char *uri) override; +}; + +StudioCompatibilityQULLayers::StudioCompatibilityQULLayers(QObject *parent) + : QQmlExtensionPlugin(parent) +{ +} + +void StudioCompatibilityQULLayers::registerTypes(const char *) +{ +} + +QT_END_NAMESPACE + +#include "studiocompatibilityqullayers.moc" diff --git a/src/imports/compatibility/QtQuickUltralite/CMakeLists.txt b/src/imports/compatibility/QtQuickUltralite/CMakeLists.txt deleted file mode 100644 index d35facf..0000000 --- a/src/imports/compatibility/QtQuickUltralite/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(Extras) -add_subdirectory(Layers) - diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/CMakeLists.txt b/src/imports/compatibility/QtQuickUltralite/Extras/CMakeLists.txt deleted file mode 100644 index 32b4306..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -qt_internal_add_qml_module(QuickUltraLiteStudioExtras - URI "QtQuickUltralite.Extras" - VERSION "${PROJECT_VERSION}" - DESIGNER_SUPPORTED - NO_SYNC_QT - PAST_MAJOR_VERSIONS 1 - QML_FILES - ColorizedImage.qml - StaticText.qml -) - -if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS) - add_subdirectory(designer) -endif() - - diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/ColorizedImage.qml b/src/imports/compatibility/QtQuickUltralite/Extras/ColorizedImage.qml deleted file mode 100644 index ee509d4..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/ColorizedImage.qml +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.12 -import Qt5Compat.GraphicalEffects -import QtQuickUltralite.Extras 1.9 - -Item { - id: colorizedRoot - property var color: "transparent" - property alias source: internalImg.source - property alias fillMode: internalImg.fillMode - property alias horizontalAlignment: internalImg.horizontalAlignment - property alias verticalAlignment: internalImg.verticalAlignment - - implicitWidth: internalImg.sourceSize.width - implicitHeight: internalImg.sourceSize.height - - Image { - id: internalImg - - layer.enabled: true - layer.effect: ColorOverlay { - anchors.fill: internalImg - source: internalImg - color: colorizedRoot.color - } - } -} diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/StaticText.qml b/src/imports/compatibility/QtQuickUltralite/Extras/StaticText.qml deleted file mode 100644 index 47483e3..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/StaticText.qml +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 -//! [StaticText compatibility] -Text { -} -//! [StaticText compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/CMakeLists.txt b/src/imports/compatibility/QtQuickUltralite/Extras/designer/CMakeLists.txt deleted file mode 100644 index 19ad43d..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -qt_path_join(installdesignerdir "${INSTALL_QMLDIR}" "QtQuickUltralite/Extras") -qt_path_join(targetdesignerdir "${CMAKE_BINARY_DIR}" "${installdesignerdir}/designer") - -file( - COPY . - DESTINATION ${targetdesignerdir} - FILES_MATCHING PATTERN "*qml" - PATTERN "*metainfo" - PATTERN "images/*png" - PATTERN "CMakeFiles" EXCLUDE -) - -qt_install( - DIRECTORY ${targetdesignerdir} - DESTINATION ${installdesignerdir} -) diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml deleted file mode 100644 index c0e9ce5..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml +++ /dev/null @@ -1,254 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 -import QtQuick.Layouts 1.15 -import HelperWidgets 2.0 -import StudioTheme 1.0 as StudioTheme - -//! [ColorizedImage compatibility] -Section { - anchors.left: parent.left - anchors.right: parent.right - caption: qsTr("Colorized Image") - - SectionLayout { - PropertyLabel { text: qsTr("Image color") } - - ColorEditor { - backendValue: backendValues.color - supportGradient: false - } - - PropertyLabel { text: qsTr("Source") } - - SecondColumnLayout { - UrlChooser { - backendValue: backendValues.source - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Fill mode") } - - SecondColumnLayout { - ComboBox { - scope: "Image" - model: ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally", "Pad"] - backendValue: backendValues.fillMode - implicitWidth: StudioTheme.Values.singleControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - width: implicitWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { - text: qsTr("Source size") - blockedByTemplate: !backendValues.sourceSize.isAvailable - } - - SecondColumnLayout { - SpinBox { - backendValue: backendValues.sourceSize_width - minimumValue: 0 - maximumValue: 8192 - decimals: 0 - enabled: backendValue.isAvailable - } - - Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } - - ControlLabel { - //: The width of the object - text: qsTr("W", "width") - enabled: backendValues.sourceSize_width.isAvailable - } - - SpinBox { - backendValue: backendValues.sourceSize_height - minimumValue: 0 - maximumValue: 8192 - decimals: 0 - enabled: backendValue.isAvailable - } - - Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } - - ControlLabel { - //: The height of the object - text: qsTr("H", "height") - enabled: backendValues.sourceSize_height.isAvailable - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Alignment H") } - - SecondColumnLayout { - ComboBox { - scope: "Image" - model: ["AlignLeft", "AlignRight", "AlignHCenter"] - backendValue: backendValues.horizontalAlignment - implicitWidth: StudioTheme.Values.singleControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - width: implicitWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Alignment V") } - - SecondColumnLayout { - ComboBox { - scope: "Image" - model: ["AlignTop", "AlignBottom", "AlignVCenter"] - backendValue: backendValues.verticalAlignment - implicitWidth: StudioTheme.Values.singleControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - width: implicitWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { - text: qsTr("Asynchronous") - tooltip: qsTr("Loads images on the local filesystem asynchronously in a separate thread.") - blockedByTemplate: !backendValues.asynchronous.isAvailable - } - - SecondColumnLayout { - CheckBox { - enabled: backendValues.asynchronous.isAvailable - text: backendValues.asynchronous.valueToString - backendValue: backendValues.asynchronous - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { - text: qsTr("Auto transform") - tooltip: qsTr("Automatically applies image transformation metadata such as EXIF orientation.") - blockedByTemplate: !backendValues.autoTransform.isAvailable - } - - SecondColumnLayout { - CheckBox { - enabled: backendValues.autoTransform.isAvailable - text: backendValues.autoTransform.valueToString - backendValue: backendValues.autoTransform - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { - text: qsTr("Cache") - tooltip: qsTr("Caches the image.") - blockedByTemplate: !backendValues.cache.isAvailable - } - - SecondColumnLayout { - CheckBox { - enabled: backendValues.cache.isAvailable - text: backendValues.cache.valueToString - backendValue: backendValues.cache - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { - text: qsTr("Mipmap") - tooltip: qsTr("Uses mipmap filtering when the image is scaled or transformed.") - blockedByTemplate: !backendValues.mipmap.isAvailable - } - - SecondColumnLayout { - CheckBox { - enabled: backendValues.mipmap.isAvailable - text: backendValues.mipmap.valueToString - backendValue: backendValues.mipmap - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { - text: qsTr("Mirror") - tooltip: qsTr("Inverts the image horizontally.") - blockedByTemplate: !backendValues.mirror.isAvailable - } - - SecondColumnLayout { - CheckBox { - enabled: backendValues.mirror.isAvailable - text: backendValues.mirror.valueToString - backendValue: backendValues.mirror - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { - text: qsTr("Smooth") - tooltip: qsTr("Smoothly filters the image when it is scaled or transformed.") - blockedByTemplate: !backendValues.smooth.isAvailable - } - - SecondColumnLayout { - CheckBox { - enabled: backendValues.smooth.isAvailable - text: backendValues.smooth.valueToString - backendValue: backendValues.smooth - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - } -} -//! [ColorizedImage compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo b/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo deleted file mode 100644 index ab5716c..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo +++ /dev/null @@ -1,28 +0,0 @@ -MetaInfo { - Type { - name: "QtQuickUltralite.Extras.ColorizedImage" - icon: "images/image-icon.png" - - ItemLibraryEntry { - name: "Colorized Image" - category: "QtQuickUltralite - Extras" - libraryIcon: "images/image-icon@2x.png" - version: "1.9" - requiredImport: "QtQuickUltralite.Extras" - Property { name: "source"; type: "binding"; value: "\"source/text\""; } - } - } - Type { - name: "QtQuickUltralite.Extras.StaticText" - icon: "images/text-icon.png" - - ItemLibraryEntry { - name: "Static Text" - category: "QtQuickUltralite - Extras" - libraryIcon: "images/text-icon@2x.png" - version: "1.9" - requiredImport: "QtQuickUltralite.Extras" - Property { name: "text"; type: "binding"; value: "qsTr(\"Static Text\")"; } - } - } -} diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/StaticTextSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Extras/designer/StaticTextSpecifics.qml deleted file mode 100644 index e75bbfa..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/StaticTextSpecifics.qml +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 -import QtQuick.Layouts 1.15 -import HelperWidgets 2.0 - -//! [StaticText compatibility] -Column { - anchors.left: parent.left - anchors.right: parent.right - - CharacterSection { - richTextEditorAvailable: true - showLineHeight: true - showVerticalAlignment: true - } - - TextExtrasSection { - showElide: true - showWrapMode: true - showFormatProperty: true - showFontSizeMode: true - showLineHeight: true - } - - FontExtrasSection { - showStyle: true - } - - PaddingSection {} -} - -//! [StaticText compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon.png b/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon.png deleted file mode 100644 index 318ce08..0000000 Binary files a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon.png and /dev/null differ diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon@2x.png b/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon@2x.png deleted file mode 100644 index cc84918..0000000 Binary files a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon@2x.png and /dev/null differ diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon.png b/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon.png deleted file mode 100644 index 29a81f5..0000000 Binary files a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon.png and /dev/null differ diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon@2x.png b/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon@2x.png deleted file mode 100644 index 1df8f76..0000000 Binary files a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon@2x.png and /dev/null differ diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes b/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes deleted file mode 100644 index 6a6c815..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick.tooling 1.2 - -// This file describes the plugin-supplied types contained in the library. -// It is used for QML tooling purposes only. -// -// This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls 2.15' - -Module { - dependencies: [ - "QtQuick 2.12" - ] -} diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/qmldir b/src/imports/compatibility/QtQuickUltralite/Extras/qmldir deleted file mode 100644 index fec69a2..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/qmldir +++ /dev/null @@ -1,9 +0,0 @@ -module QtQuickUltralite.Extras -linktarget studioqtquickultraliteextrasplugin -optional plugin studioqtquickultraliteextrasplugin -classname QtQuickUltralite_ExtrasPlugin -typeinfo studioqtquickultraliteextras.qmltypes -prefer :/QtQuickUltralite/Extras/ -ColorizedImage 1.0 ColorizedImage.qml -StaticText 1.0 StaticText.qml - diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/studiocompatibilityqulextras.cpp b/src/imports/compatibility/QtQuickUltralite/Extras/studiocompatibilityqulextras.cpp deleted file mode 100644 index 8b2804d..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Extras/studiocompatibilityqulextras.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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$ -** -****************************************************************************/ - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class StudioCompatibilityQULExtras: public QQmlExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) - -public: - StudioCompatibilityQULExtras(QObject *parent = nullptr); - void registerTypes(const char *uri) override; -}; - -StudioCompatibilityQULExtras::StudioCompatibilityQULExtras(QObject *parent) - : QQmlExtensionPlugin(parent) -{ -} - -void StudioCompatibilityQULExtras::registerTypes(const char *) -{ -} - -QT_END_NAMESPACE - -#include "studiocompatibilityqulextras.moc" diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml b/src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml deleted file mode 100644 index f86c272..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 - -//! [Screen compatibility] -Rectangle { - id: wnd - property var outputDevice: "device" - property alias backgroundColor: color - - property int defaultApplicationWidth: width - property int defaultApplicationHeight: height - - visible: true -} -//! [Screen compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/Application.qml b/src/imports/compatibility/QtQuickUltralite/Layers/Application.qml deleted file mode 100644 index f13f25e..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/Application.qml +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 - -//! [Application compatibility] -Item { -} -//! [Application compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/CMakeLists.txt b/src/imports/compatibility/QtQuickUltralite/Layers/CMakeLists.txt deleted file mode 100644 index 1903505..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -qt_internal_add_qml_module(QuickUltraLiteStudioLayers - URI "QtQuickUltralite.Layers" - VERSION "${PROJECT_VERSION}" - DESIGNER_SUPPORTED - NO_SYNC_QT - PAST_MAJOR_VERSIONS 1 - QML_FILES - Application.qml - ImageLayer.qml - ItemLayer.qml - Screen.qml - SpriteLayer.qml -) - -if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS) - add_subdirectory(designer) -endif() - diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml b/src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml deleted file mode 100644 index f4c0647..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 - -//! [ImageLayer compatibility] -Item { - enum RenderingHints { - OptimizeForSpeed, - OptimizeForSize, - StaticContents - } - - property int platformId: 0 - property int renderingHints: ImageLayer.RenderingHints.OptimizeForSpeed - property alias source: internalImage.source - - Image { - id: internalImage - anchors.fill: parent - } -} -//! [ImageLayer compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml b/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml deleted file mode 100644 index 231c3d3..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 - -//! [ItemLayer compatibility] -Item { - enum ColorDepth { - Bpp16, Bpp16Alpha, Bpp24, Bpp32, Bpp32Alpha - } - - enum RenderingHints { - OptimizeForSpeed, - OptimizeForSize, - StaticContents - } - - property int depth: ColorDepth.Bpp32 - property int refreshInterval: 1 - property int platformId: 0 - property int renderingHints: RenderingHints.OptimizeForSpeed -} -//! [ItemLayer compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml b/src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml deleted file mode 100644 index ad50a8d..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 -import QtQuick.Window 2.2 - -//! [Screen compatibility] -Item { - id: root - - property var outputDevice: "device" - property alias backgroundColor: wnd.color - - property alias defaultApplicationWidth: wnd.width - property alias defaultApplicationHeight: wnd.height - - Window { - id: wnd - visible: true - } -} -//! [Screen compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml b/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml deleted file mode 100644 index 29f3db9..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 - -//! [SpriteLayer compatibility] -Item { - enum ColorDepth { - Bpp8, Bpp16, Bpp16Alpha, Bpp24, Bpp32, Bpp32Alpha - } - - property int depth: ColorDepth.Bpp32 - property int platformId: 0 -} -//! [SpriteLayer compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ApplicationSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ApplicationSpecifics.qml deleted file mode 100644 index 58374ef..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ApplicationSpecifics.qml +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 - -import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 - -//! [Application compatibility] -Section { - anchors.left: parent.left - anchors.right: parent.right - caption: qsTr("Application") - - //Application type has no properties -} -//! [Application compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/CMakeLists.txt b/src/imports/compatibility/QtQuickUltralite/Layers/designer/CMakeLists.txt deleted file mode 100644 index 508a4ea..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -qt_path_join(installdesignerdir "${INSTALL_QMLDIR}" "QtQuickUltralite/Layers") -qt_path_join(targetdesignerdir "${CMAKE_BINARY_DIR}" "${installdesignerdir}/designer") - -file( - COPY . - DESTINATION ${targetdesignerdir} - FILES_MATCHING PATTERN "*qml" - PATTERN "*metainfo" - PATTERN "images/*png" - PATTERN "CMakeFiles" EXCLUDE -) - -qt_install( - DIRECTORY ${targetdesignerdir} - DESTINATION ${installdesignerdir} -) diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml deleted file mode 100644 index ac60034..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 -import QtQuick.Layouts 1.15 -import HelperWidgets 2.0 -import StudioTheme 1.0 as StudioTheme - -//! [ImageLayer compatibility] -Section { - anchors.left: parent.left - anchors.right: parent.right - caption: qsTr("Image Layer") - - SectionLayout { - PropertyLabel { text: qsTr("Platform ID") } - - SecondColumnLayout { - SpinBox { - backendValue: backendValues.platformId - minimumValue: 0 - maximumValue: 2000 - decimals: 0 - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Rendering hints") } - - SecondColumnLayout { - ComboBox { - model: ["OptimizeForSpeed", "OptimizeForSize", "StaticContents"] - backendValue: backendValues.renderingHints - scope: "ImageLayer" - implicitWidth: StudioTheme.Values.singleControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Source") } - - SecondColumnLayout { - UrlChooser { - backendValue: backendValues.source - } - - ExpandingSpacer {} - } - } -} -//! [ImageLayer compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml deleted file mode 100644 index d36486c..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 -import QtQuick.Layouts 1.15 -import HelperWidgets 2.0 -import StudioTheme 1.0 as StudioTheme - -//! [ItemLayer compatibility] -Section { - anchors.left: parent.left - anchors.right: parent.right - caption: qsTr("Item Layer") - - SectionLayout { - PropertyLabel { text: qsTr("Platform ID") } - - SecondColumnLayout { - SpinBox { - backendValue: backendValues.platformId - minimumValue: 0 - maximumValue: 2000 - decimals: 0 - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Rendering hints") } - - SecondColumnLayout { - ComboBox { - model: ["OptimizeForSpeed", "OptimizeForSize", "StaticContents"] - backendValue: backendValues.renderingHints - scope: "ItemLayer" - implicitWidth: StudioTheme.Values.singleControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Depth") } - - SecondColumnLayout { - ComboBox { - model: ["Bpp16", "Bpp16Alpha", "Bpp24", "Bpp32", "Bpp32Alpha"] - backendValue: backendValues.depth - scope: "ItemLayer" - implicitWidth: StudioTheme.Values.singleControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Refresh interval") } - - SecondColumnLayout { - SpinBox { - backendValue: backendValues.refreshInterval - minimumValue: 0 - maximumValue: 1000 - decimals: 0 - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - } -} -//! [ItemLayer compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo b/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo deleted file mode 100644 index 649154b..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo +++ /dev/null @@ -1,87 +0,0 @@ -MetaInfo { - Type { - name: "QtQuickUltralite.Layers.Application" - icon: "images/item-icon.png" - - ItemLibraryEntry { - name: "Application" - category: "QtQuickUltralite - Layers" - libraryIcon: "images/item-icon@2x.png" - version: "1.9" - requiredImport: "QtQuickUltralite.Layers" - } - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: true - } - } - Type { - name: "QtQuickUltralite.Layers.ImageLayer" - icon: "images/item-icon.png" - - ItemLibraryEntry { - name: "Image Layer" - category: "QtQuickUltralite - Layers" - libraryIcon: "images/item-icon@2x.png" - version: "1.9" - requiredImport: "QtQuickUltralite.Layers" - - Property { name: "renderingHints"; type: "enum"; value: "ImageLayer.OptimizeForSpeed"; } - Property { name: "platformId"; type: "int"; value: 0; } - } - } - Type { - name: "QtQuickUltralite.Layers.ItemLayer" - icon: "images/item-icon.png" - - ItemLibraryEntry { - name: "Item Layer" - category: "QtQuickUltralite - Layers" - libraryIcon: "images/item-icon@2x.png" - version: "1.9" - requiredImport: "QtQuickUltralite.Layers" - - Property { name: "depth"; type: "enum"; value: "ItemLayer.Bpp32"; } - Property { name: "renderingHints"; type: "enum"; value: "ItemLayer.OptimizeForSpeed"; } - Property { name: "refreshInterval"; type: "int"; value: 1; } - Property { name: "platformId"; type: "int"; value: 0; } - } - } - Type { - name: "QtQuickUltralite.Layers.Screen" - icon: "images/item-icon.png" - - ItemLibraryEntry { - name: "Screen" - category: "QtQuickUltralite - Layers" - libraryIcon: "images/item-icon@2x.png" - version: "1.9" - requiredImport: "QtQuickUltralite.Layers" - } - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: true - } - } - Type { - name: "QtQuickUltralite.Layers.SpriteLayer" - icon: "images/item-icon.png" - - ItemLibraryEntry { - name: "Sprite Layer" - category: "QtQuickUltralite - Layers" - libraryIcon: "images/item-icon@2x.png" - version: "1.9" - requiredImport: "QtQuickUltralite.Layers" - - Property { name: "depth"; type: "enum"; value: "SpriteLayer.Bpp32"; } - Property { name: "platformId"; type: "int"; value: 0; } - } - } -} diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ScreenSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ScreenSpecifics.qml deleted file mode 100644 index 80c7357..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ScreenSpecifics.qml +++ /dev/null @@ -1,112 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 -import QtQuick.Layouts 1.15 -import HelperWidgets 2.0 -import StudioTheme 1.0 as StudioTheme - -//! [Screen compatibility] -Section { - anchors.left: parent.left - anchors.right: parent.right - caption: qsTr("Screen") - - SectionLayout { - PropertyLabel { text: qsTr("Output Device") } - - SecondColumnLayout { - LineEdit { - backendValue: backendValues.outputDevice - showTranslateCheckBox: false - implicitWidth: StudioTheme.Values.singleControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - width: implicitWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Background color") } - - ColorEditor { - backendValue: backendValues.backgroundColor - supportGradient: false - } - - PropertyLabel { text: qsTr("Application size") } - - SecondColumnLayout { - SpinBox { - id: widthSpinBox - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - backendValue: backendValues.defaultApplicationWidth - maximumValue: 0xffff - minimumValue: 0 - decimals: 0 - enabled: true - } - - Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } - - ControlLabel { - //: The width of the object - text: qsTr("W", "width") - tooltip: widthSpinBox.enabled ? qsTr("Width") : root.disbaledTooltip - enabled: widthSpinBox.enabled - } - - Spacer { implicitWidth: StudioTheme.Values.controlGap } - - SpinBox { - id: heightSpinBox - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - backendValue: backendValues.defaultApplicationHeight - maximumValue: 0xffff - minimumValue: 0 - decimals: 0 - enabled: true - } - - Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } - - ControlLabel { - //: The height of the object - text: qsTr("H", "height") - tooltip: heightSpinBox.enabled ? qsTr("Height") : root.disbaledTooltip - enabled: heightSpinBox.enabled - } - - ExpandingSpacer {} - } - } -} -//! [Screen compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/SpriteLayerSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Layers/designer/SpriteLayerSpecifics.qml deleted file mode 100644 index c13054d..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/SpriteLayerSpecifics.qml +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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.15 -import QtQuick.Layouts 1.15 -import HelperWidgets 2.0 -import StudioTheme 1.0 as StudioTheme - -//! [SpriteLayer compatibility] -Section { - anchors.left: parent.left - anchors.right: parent.right - caption: qsTr("Sprite Layer") - - SectionLayout { - PropertyLabel { text: qsTr("Platform ID") } - - SecondColumnLayout { - SpinBox { - backendValue: backendValues.platformId - minimumValue: 0 - maximumValue: 2000 - decimals: 0 - implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - } - - ExpandingSpacer {} - } - - PropertyLabel { text: qsTr("Depth") } - - SecondColumnLayout { - ComboBox { - model: ["Bpp8", "Bpp16", "Bpp16Alpha", "Bpp24", "Bpp32", "Bpp32Alpha"] - backendValue: backendValues.depth - scope: "SpriteLayer" - implicitWidth: StudioTheme.Values.singleControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - width: implicitWidth - } - - ExpandingSpacer {} - } - } -} -//! [SpriteLayer compatibility] diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon.png b/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon.png deleted file mode 100644 index af81cdf..0000000 Binary files a/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon.png and /dev/null differ diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon@2x.png b/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon@2x.png deleted file mode 100644 index f05aa57..0000000 Binary files a/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon@2x.png and /dev/null differ diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes b/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes deleted file mode 100644 index 05873fb..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick.tooling 1.2 - -// This file describes the plugin-supplied types contained in the library. -// It is used for QML tooling purposes only. - -Module { - dependencies: [ - "QtQuick 2.15" - ] -} diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/qmldir b/src/imports/compatibility/QtQuickUltralite/Layers/qmldir deleted file mode 100644 index 8d0a4b2..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/qmldir +++ /dev/null @@ -1,12 +0,0 @@ -module QtQuickUltralite.Layers -linktarget studioqtquickultralitelayersplugin -optional plugin studioqtquickultralitelayersplugin -classname QtQuickUltralite_LayersPlugin -typeinfo studioqtquickultralitelayers.qmltypes -prefer :/QtQuickUltralite/Layers/ -Application 1.0 Application.qml -ImageLayer 1.0 ImageLayer.qml -ItemLayer 1.0 ItemLayer.qml -Screen 1.0 Screen.qml -SpriteLayer 1.0 SpriteLayer.qml - diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/studiocompatibilityqullayers.cpp b/src/imports/compatibility/QtQuickUltralite/Layers/studiocompatibilityqullayers.cpp deleted file mode 100644 index 762371a..0000000 --- a/src/imports/compatibility/QtQuickUltralite/Layers/studiocompatibilityqullayers.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Quick Ultralite compatibility. -** -** $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$ -** -****************************************************************************/ - -#include - -QT_BEGIN_NAMESPACE - -class StudioCompatibilityQULLayers: public QQmlExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) - -public: - StudioCompatibilityQULLayers(QObject *parent = nullptr); - void registerTypes(const char *uri) override; -}; - -StudioCompatibilityQULLayers::StudioCompatibilityQULLayers(QObject *parent) - : QQmlExtensionPlugin(parent) -{ -} - -void StudioCompatibilityQULLayers::registerTypes(const char *) -{ -} - -QT_END_NAMESPACE - -#include "studiocompatibilityqullayers.moc" -- cgit v1.2.3