From decdf79401763670419c45cd33e38390d46d8db4 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Thu, 26 Aug 2021 18:07:36 +0200 Subject: QUL Compatibility: Fix for 1.9 and selectors - Fixes 3 puppet windows issue for Screen item - Updates enums and default values - Adds new properties to Screen - Caption fix for Sprite Layer - Deactivated rotation and scale for ImageLayer Task-numbers: QDS-3774, QDS-4710, QDS-4756 Change-Id: If606950a90aa360c0ff4afb2122edd7487092405 Reviewed-by: Thomas Hartmann --- .../Extras/designer/ColorizedImageSpecifics.qml | 2 +- .../designer/QtQuickUltraliteExtras.metainfo | 4 +- .../QtQuickUltralite/Extras/plugins.qmltypes | 2 +- .../compatibility/QtQuickUltralite/Extras/qmldir | 4 +- .../QtQuickUltralite/Layers/+DesignMode/Screen.qml | 43 +++++++++++++++++++ .../QtQuickUltralite/Layers/ImageLayer.qml | 10 ++++- .../QtQuickUltralite/Layers/Screen.qml | 17 +++++--- .../QtQuickUltralite/Layers/SpriteLayer.qml | 4 +- .../Layers/designer/ApplicationSpecifics.qml | 3 +- .../designer/QtQuickUltraliteLayers.metainfo | 32 ++++++++++++--- .../Layers/designer/ScreenSpecifics.qml | 48 ++++++++++++++++++++++ .../Layers/designer/SpriteLayerSpecifics.qml | 4 +- .../QtQuickUltralite/Layers/layers.pri | 1 + .../QtQuickUltralite/Layers/plugins.qmltypes | 5 +-- .../compatibility/QtQuickUltralite/Layers/qmldir | 10 ++--- 15 files changed, 156 insertions(+), 33 deletions(-) create mode 100644 src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml b/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml index 7110ed3..c0e9ce5 100644 --- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml +++ b/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml @@ -36,7 +36,7 @@ import StudioTheme 1.0 as StudioTheme Section { anchors.left: parent.left anchors.right: parent.right - caption: qsTr("Image") + caption: qsTr("Colorized Image") SectionLayout { PropertyLabel { text: qsTr("Image color") } diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo b/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo index ad1e6c9..ab5716c 100644 --- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo +++ b/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo @@ -7,7 +7,7 @@ MetaInfo { name: "Colorized Image" category: "QtQuickUltralite - Extras" libraryIcon: "images/image-icon@2x.png" - version: "1.7" + version: "1.9" requiredImport: "QtQuickUltralite.Extras" Property { name: "source"; type: "binding"; value: "\"source/text\""; } } @@ -20,7 +20,7 @@ MetaInfo { name: "Static Text" category: "QtQuickUltralite - Extras" libraryIcon: "images/text-icon@2x.png" - version: "1.7" + version: "1.9" requiredImport: "QtQuickUltralite.Extras" Property { name: "text"; type: "binding"; value: "qsTr(\"Static Text\")"; } } diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes b/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes index aac3a1a..6a6c815 100644 --- a/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes +++ b/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes @@ -8,6 +8,6 @@ import QtQuick.tooling 1.2 Module { dependencies: [ - "QtQuick 2.11" + "QtQuick 2.12" ] } diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/qmldir b/src/imports/compatibility/QtQuickUltralite/Extras/qmldir index cf1738a..afac6ae 100644 --- a/src/imports/compatibility/QtQuickUltralite/Extras/qmldir +++ b/src/imports/compatibility/QtQuickUltralite/Extras/qmldir @@ -1,5 +1,5 @@ module QtQuickUltralite.Extras -ColorizedImage 1.7 ColorizedImage.qml -StaticText 1.7 StaticText.qml +ColorizedImage 1.9 ColorizedImage.qml +StaticText 1.9 StaticText.qml plugin studioqtquickultraliteextras designersupported diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml b/src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml new file mode 100644 index 0000000..f86c272 --- /dev/null +++ b/src/imports/compatibility/QtQuickUltralite/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/QtQuickUltralite/Layers/ImageLayer.qml b/src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml index ab5dd05..f4c0647 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml +++ b/src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml @@ -30,7 +30,7 @@ import QtQuick 2.15 //! [ImageLayer compatibility] -Image { +Item { enum RenderingHints { OptimizeForSpeed, OptimizeForSize, @@ -38,6 +38,12 @@ Image { } property int platformId: 0 - property int renderingHints: RenderingHints.OptimizeForSpeed + 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/Screen.qml b/src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml index 2206f22..ad50a8d 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml +++ b/src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml @@ -27,15 +27,22 @@ ** ****************************************************************************/ +import QtQuick 2.15 import QtQuick.Window 2.2 //! [Screen compatibility] -Window { - id: wnd +Item { + id: root + property var outputDevice: "device" - property var backgroundColor: "black" + property alias backgroundColor: wnd.color + + property alias defaultApplicationWidth: wnd.width + property alias defaultApplicationHeight: wnd.height - color: wnd.backgroundColor - visible: true + 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 index 8a0248f..29f3db9 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml +++ b/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml @@ -32,10 +32,10 @@ import QtQuick 2.15 //! [SpriteLayer compatibility] Item { enum ColorDepth { - Bpp16, Bpp16Alpha, Bpp24, Bpp32, Bpp32Alpha + Bpp8, Bpp16, Bpp16Alpha, Bpp24, Bpp32, Bpp32Alpha } - property int depth: ColorDepth.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 index fe5dc89..58374ef 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ApplicationSpecifics.qml +++ b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ApplicationSpecifics.qml @@ -33,9 +33,10 @@ import HelperWidgets 2.0 import QtQuick.Layouts 1.0 //! [Application compatibility] -Column { +Section { anchors.left: parent.left anchors.right: parent.right + caption: qsTr("Application") //Application type has no properties } diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo b/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo index 51dc943..649154b 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo +++ b/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo @@ -7,9 +7,16 @@ MetaInfo { name: "Application" category: "QtQuickUltralite - Layers" libraryIcon: "images/item-icon@2x.png" - version: "1.7" + version: "1.9" requiredImport: "QtQuickUltralite.Layers" } + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: true + } } Type { name: "QtQuickUltralite.Layers.ImageLayer" @@ -19,9 +26,11 @@ MetaInfo { name: "Image Layer" category: "QtQuickUltralite - Layers" libraryIcon: "images/item-icon@2x.png" - version: "1.7" + version: "1.9" requiredImport: "QtQuickUltralite.Layers" + Property { name: "renderingHints"; type: "enum"; value: "ImageLayer.OptimizeForSpeed"; } + Property { name: "platformId"; type: "int"; value: 0; } } } Type { @@ -32,11 +41,13 @@ MetaInfo { name: "Item Layer" category: "QtQuickUltralite - Layers" libraryIcon: "images/item-icon@2x.png" - version: "1.7" + 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 { @@ -47,9 +58,16 @@ MetaInfo { name: "Screen" category: "QtQuickUltralite - Layers" libraryIcon: "images/item-icon@2x.png" - version: "1.7" + version: "1.9" requiredImport: "QtQuickUltralite.Layers" } + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: true + } } Type { name: "QtQuickUltralite.Layers.SpriteLayer" @@ -59,9 +77,11 @@ MetaInfo { name: "Sprite Layer" category: "QtQuickUltralite - Layers" libraryIcon: "images/item-icon@2x.png" - version: "1.7" + version: "1.9" requiredImport: "QtQuickUltralite.Layers" - Property { name: "depth"; type: "enum"; value: "SpriteLayer.Bpp32Alpha"; } + + 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 index f3e1416..80c7357 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ScreenSpecifics.qml +++ b/src/imports/compatibility/QtQuickUltralite/Layers/designer/ScreenSpecifics.qml @@ -59,6 +59,54 @@ Section { 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 index 2059d6e..c13054d 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/SpriteLayerSpecifics.qml +++ b/src/imports/compatibility/QtQuickUltralite/Layers/designer/SpriteLayerSpecifics.qml @@ -36,7 +36,7 @@ import StudioTheme 1.0 as StudioTheme Section { anchors.left: parent.left anchors.right: parent.right - caption: qsTr("Item Layer") + caption: qsTr("Sprite Layer") SectionLayout { PropertyLabel { text: qsTr("Platform ID") } @@ -58,7 +58,7 @@ Section { SecondColumnLayout { ComboBox { - model: ["Bpp16", "Bpp16Alpha", "Bpp24", "Bpp32", "Bpp32Alpha"] + model: ["Bpp8", "Bpp16", "Bpp16Alpha", "Bpp24", "Bpp32", "Bpp32Alpha"] backendValue: backendValues.depth scope: "SpriteLayer" implicitWidth: StudioTheme.Values.singleControlColumnWidth diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/layers.pri b/src/imports/compatibility/QtQuickUltralite/Layers/layers.pri index 658f1bb..3a87a1c 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/layers.pri +++ b/src/imports/compatibility/QtQuickUltralite/Layers/layers.pri @@ -3,4 +3,5 @@ QML_FILES += \ $$PWD/ImageLayer.qml \ $$PWD/ItemLayer.qml \ $$PWD/Screen.qml \ + $$PWD/+DesignMode/Screen.qml \ $$PWD/SpriteLayer.qml diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes b/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes index aac3a1a..05873fb 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes +++ b/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes @@ -2,12 +2,9 @@ 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.11" + "QtQuick 2.15" ] } diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/qmldir b/src/imports/compatibility/QtQuickUltralite/Layers/qmldir index 22a8eee..5b7426d 100644 --- a/src/imports/compatibility/QtQuickUltralite/Layers/qmldir +++ b/src/imports/compatibility/QtQuickUltralite/Layers/qmldir @@ -1,7 +1,7 @@ module QtQuickUltralite.Layers -Application 1.7 Application.qml -Screen 1.7 Screen.qml -ImageLayer 1.7 ImageLayer.qml -ItemLayer 1.7 ItemLayer.qml -SpriteLayer 1.7 SpriteLayer.qml +Application 1.9 Application.qml +Screen 1.9 Screen.qml +ImageLayer 1.9 ImageLayer.qml +ItemLayer 1.9 ItemLayer.qml +SpriteLayer 1.9 SpriteLayer.qml designersupported -- cgit v1.2.3