diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-01-26 13:35:18 +0100 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-01-26 12:41:31 +0000 |
commit | 5d7345c937e795806ce12884026eee56bfadf19b (patch) | |
tree | 395bbae8da9b96e32ea39e0b1802c2d35657e516 /src/imports/compatibility/Layers/designer | |
parent | 4acb5214409d4bba4b58ffee7d8cf71c28c2693a (diff) |
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/imports/compatibility/Layers/designer')
-rw-r--r-- | src/imports/compatibility/Layers/designer/ApplicationSpecifics.qml | 43 | ||||
-rw-r--r-- | src/imports/compatibility/Layers/designer/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/imports/compatibility/Layers/designer/ImageLayerSpecifics.qml | 82 | ||||
-rw-r--r-- | src/imports/compatibility/Layers/designer/ItemLayerSpecifics.qml | 101 | ||||
-rw-r--r-- | src/imports/compatibility/Layers/designer/QtQuickUltraliteLayers.metainfo | 87 | ||||
-rw-r--r-- | src/imports/compatibility/Layers/designer/ScreenSpecifics.qml | 112 | ||||
-rw-r--r-- | src/imports/compatibility/Layers/designer/SpriteLayerSpecifics.qml | 73 | ||||
-rw-r--r-- | src/imports/compatibility/Layers/designer/images/item-icon.png | bin | 0 -> 148 bytes | |||
-rw-r--r-- | src/imports/compatibility/Layers/designer/images/item-icon@2x.png | bin | 0 -> 167 bytes |
9 files changed, 514 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 0000000..af81cdf --- /dev/null +++ b/src/imports/compatibility/Layers/designer/images/item-icon.png diff --git a/src/imports/compatibility/Layers/designer/images/item-icon@2x.png b/src/imports/compatibility/Layers/designer/images/item-icon@2x.png Binary files differnew file mode 100644 index 0000000..f05aa57 --- /dev/null +++ b/src/imports/compatibility/Layers/designer/images/item-icon@2x.png |