From 1ed3235e84a083240bb76bb545331fa27f7c8ae4 Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Thu, 14 Mar 2024 14:22:46 +0200 Subject: EffectComposer: Toggle "Assign to.." button based on component selection Task-number: QDS-12148 Change-Id: I1f44df7c6c027c36c09f7c4d74e4dd609542c5b8 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml index d5ac4461c48..1912592f2fc 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml @@ -58,7 +58,8 @@ Rectangle { style: StudioTheme.Values.viewBarButtonStyle buttonIcon: StudioTheme.Constants.assignTo_medium tooltip: qsTr("Assign current composition to selected item") - enabled: root.backendModel ? root.backendModel.isEnabled + enabled: root.backendModel ? root.backendModel.hasValidTarget + && root.backendModel.isEnabled && root.backendModel.currentComposition !== "" : false -- cgit v1.2.3 From 244752f6af93fa7cf317642270061e23309f3ade Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Fri, 15 Mar 2024 16:20:26 +0200 Subject: QmlDesigner: Hide Flags combobox's popup when opening the cog menu Otherwise the cog menu appears below the popup Change-Id: If3b541bd98b2d771687373c9259ad017349d4215 Reviewed-by: Miikka Heikkinen --- .../propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml index 46c98f25c50..edf17374e22 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlagsComboBox.qml @@ -132,6 +132,8 @@ StudioControls.CustomComboBox { ExtendedFunctionLogic { id: extFuncLogic backendValue: root.backendValue + + onMenuVisibleChanged: root.popup.visible = false } actionIndicator.icon.color: extFuncLogic.color -- cgit v1.2.3 From d72f55bbd03db0eadd5a22a5e487f70353e9e456 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 14 Mar 2024 20:55:51 +0100 Subject: QmlDesigner: Fix issues with dynamic vectors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The conversion from Qt.vectorxd was not strict enough and expressions like Qt.vector2d(7 / Constants.width, 7 / Constants.height) were read as [7, 7]. Reflection was not handled properly and the [7,7] was written on selection. Fixes: * Avoid reflection * Improve Qt.vector parsing; Move code to C++ * Handle "real" expression case and show binding indicator * Fix setting an expression. We allow the binding editor/expression indicator only on the first component of the vector Task-number: QDS-12242 Change-Id: I6707bdac860852d96d416adbe911d43fe9128e8a Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann Reviewed-by: Qt CI Patch Build Bot --- .../HelperWidgets/DynamicPropertiesSection.qml | 91 ++++++++++++++-------- .../imports/HelperWidgets/SpinBox.qml | 3 + 2 files changed, 60 insertions(+), 34 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml index 39176ca82a9..9b23842fe80 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml @@ -291,53 +291,64 @@ Section { property int vecSize: 0 property var proxyValues: [] property var spinBoxes: [boxX, boxY, boxZ, boxW] + property bool block: false signal remove - onVecSizeChanged: updateProxyValues() + onVecSizeChanged: layoutVector.updateProxyValues() - spacing: StudioTheme.Values.sectionRowSpacing / 2 + spacing: StudioTheme.Values.sectionRowSpacing function isValidValue(v) { return !(v === undefined || isNaN(v)) } - function updateExpression() { + function updateExpressionFromExpression() { + if (layoutVector.block) + return + + layoutVector.backendValue.expression = layoutVector.proxyValues[0].expression + // Only the first proxy value has an expression editor enabled + } + + function updateExpressionFromValue() { + if (layoutVector.block) + return + for (let i = 0; i < vecSize; ++i) { - if (!isValidValue(proxyValues[i].value)) + if (!layoutVector.isValidValue(layoutVector.proxyValues[i].value)) return } - let expStr = "Qt.vector" + vecSize + "d("+proxyValues[0].value - for (let j=1; j < vecSize; ++j) - expStr += ", " + proxyValues[j].value + let expStr = "Qt.vector" + layoutVector.vecSize + "d(" + layoutVector.proxyValues[0].value + for (let j=1; j < layoutVector.vecSize; ++j) + expStr += ", " + layoutVector.proxyValues[j].value expStr += ")" layoutVector.backendValue.expression = expStr } function updateProxyValues() { - if (!backendValue) + if (!layoutVector.backendValue) return; - const startIndex = backendValue.expression.indexOf('(') - const endIndex = backendValue.expression.indexOf(')') - if (startIndex === -1 || endIndex === -1 || endIndex < startIndex) - return - const numberStr = backendValue.expression.slice(startIndex + 1, endIndex) - const numbers = numberStr.split(",") - if (!Array.isArray(numbers) || numbers.length !== vecSize) - return + let vals = layoutVector.backendValue.getExpressionAsVector() - let vals = [] - for (let i = 0; i < vecSize; ++i) { - vals[i] = parseFloat(numbers[i]) - if (!isValidValue(vals[i])) - return + layoutVector.block = true + + if (layoutVector.vecSize === vals.length) { + for (let j = 0; j < layoutVector.vecSize; ++j) { + layoutVector.proxyValues[j].setForceBound(false) + layoutVector.proxyValues[j].value = vals[j] + } + } else { + for (let j = 0; j < layoutVector.vecSize; ++j) { + layoutVector.proxyValues[j].setForceBound(true) // Required since the backendValue is just proxied + layoutVector.proxyValues[j].expression = layoutVector.backendValue.expression + } } - for (let j = 0; j < vecSize; ++j) - proxyValues[j].value = vals[j] + layoutVector.block = false } SecondColumnLayout { @@ -357,15 +368,18 @@ Section { tooltip: "X" } - Spacer { implicitWidth: StudioTheme.Values.controlGap } + Spacer { + implicitWidth: StudioTheme.Values.controlGap + + StudioTheme.Values.actionIndicatorWidth + } SpinBox { id: boxY + actionIndicatorVisible: false minimumValue: -9999999 maximumValue: 9999999 decimals: 2 implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth } Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } @@ -386,14 +400,16 @@ Section { } SecondColumnLayout { - visible: vecSize > 2 + visible: layoutVector.vecSize > 2 + Spacer { implicitWidth: StudioTheme.Values.actionIndicatorWidth } + SpinBox { id: boxZ + actionIndicatorVisible: false minimumValue: -9999999 maximumValue: 9999999 decimals: 2 implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth } Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } @@ -401,19 +417,22 @@ Section { ControlLabel { text: "Z" tooltip: "Z" - visible: vecSize > 2 + visible: layoutVector.vecSize > 2 } - Spacer { implicitWidth: StudioTheme.Values.controlGap } + Spacer { + implicitWidth: StudioTheme.Values.controlGap + + StudioTheme.Values.actionIndicatorWidth + } SpinBox { id: boxW + actionIndicatorVisible: false minimumValue: -9999999 maximumValue: 9999999 decimals: 2 implicitWidth: StudioTheme.Values.twoControlColumnWidth - + StudioTheme.Values.actionIndicatorWidth - visible: vecSize > 3 + visible: layoutVector.vecSize > 3 } Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } @@ -421,7 +440,7 @@ Section { ControlLabel { text: "W" tooltip: "W" - visible: vecSize > 3 + visible: layoutVector.vecSize > 3 } Spacer { implicitWidth: StudioTheme.Values.controlGap } @@ -430,7 +449,7 @@ Section { height: 10 implicitWidth: StudioTheme.Values.twoControlColumnWidth + StudioTheme.Values.actionIndicatorWidth - visible: vecSize === 2 // Placeholder for last spinbox + visible: layoutVector.vecSize === 2 // Placeholder for last spinbox } Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap } @@ -486,9 +505,12 @@ Section { model: root.propertiesModel row: index } + PropertyLabel { text: propertyName tooltip: propertyType + Layout.alignment: Qt.AlignTop + Layout.topMargin: 6 } Loader { @@ -540,7 +562,8 @@ Section { for (let i = 0; i < vecSize; ++i) { var newProxyValue = propertyRow.createProxyBackendValue() loader.item.proxyValues.push(newProxyValue) - newProxyValue.valueChangedQml.connect(loader.item.updateExpression) + newProxyValue.valueChangedQml.connect(loader.item.updateExpressionFromValue) + newProxyValue.expressionChangedQml.connect(loader.item.updateExpressionFromExpression) loader.item.spinBoxes[i].backendValue = newProxyValue } propertyRow.backendValue.expressionChanged.connect(loader.item.updateProxyValues) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml index f125c459c51..04cbb78f356 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml @@ -22,6 +22,9 @@ Item { property alias realDragRange: spinBox.realDragRange property alias pixelsPerUnit: spinBox.pixelsPerUnit + property alias actionIndicatorEnabled: spinBox.actionIndicator.enabled + property alias actionIndicatorVisible: spinBox.actionIndicatorVisible + width: 96 implicitHeight: spinBox.height -- cgit v1.2.3 From 98d1339637d6e1418feecc9f83fa59767e65324d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 20 Mar 2024 16:13:18 +0100 Subject: QmlDesigner: Add default root id to templates Task-number: QDS-12248 Change-Id: I105ada4f4b3a2eb5b3f422de7426dfaf8dc0a34a Reviewed-by: Tim Jenssen --- .../qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl | 1 + .../qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl | 1 + 2 files changed, 2 insertions(+) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl index f77f7d99c99..996d474208d 100644 --- a/share/qtcreator/qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/files/qtquickfile/file.qml.tpl @@ -7,6 +7,7 @@ import %{ApplicationImport} @endif %{RootItem} { + id: root @if %{UseImport} width: Constants.width height: Constants.height diff --git a/share/qtcreator/qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl index 47ca3af2995..e7e86e9ffa5 100644 --- a/share/qtcreator/qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/files/qtuiquickfile/file.qml.tpl @@ -14,6 +14,7 @@ import %{ApplicationImport} @endif %{RootItem} { + id: root @if %{UseImport} width: Constants.width height: Constants.height -- cgit v1.2.3 From 9d451d54c83d578043c926f17faf8ca0bee10a53 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Thu, 21 Mar 2024 13:01:15 +0200 Subject: QmlDesigner: Add and update the fly camera speed config icon Change-Id: I3d956b04fb7f2e44a5d31c1561a2a341d27cc32b Reviewed-by: Miikka Heikkinen --- share/qtcreator/qmldesigner/designericons.json | 2 +- .../CameraSpeedConfigurationDialog.qml | 2 +- .../imports/StudioTheme/InternalConstants.qml | 607 +++++++++++---------- .../imports/StudioTheme/icons.ttf | Bin 66460 -> 66776 bytes 4 files changed, 306 insertions(+), 305 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/designericons.json b/share/qtcreator/qmldesigner/designericons.json index 157012b312a..005494b4715 100644 --- a/share/qtcreator/qmldesigner/designericons.json +++ b/share/qtcreator/qmldesigner/designericons.json @@ -219,7 +219,7 @@ } }, "CameraSpeedConfigIcon": { - "iconName": "camera_medium" + "iconName": "cameraSpeed_medium" }, "EditColorIcon": { "iconName": "colorSelection_medium" diff --git a/share/qtcreator/qmldesigner/edit3dQmlSource/CameraSpeedConfigurationDialog.qml b/share/qtcreator/qmldesigner/edit3dQmlSource/CameraSpeedConfigurationDialog.qml index 2e2ff547002..b51369ffa3f 100644 --- a/share/qtcreator/qmldesigner/edit3dQmlSource/CameraSpeedConfigurationDialog.qml +++ b/share/qtcreator/qmldesigner/edit3dQmlSource/CameraSpeedConfigurationDialog.qml @@ -57,7 +57,7 @@ Rectangle { HelperWidgets.IconIndicator { anchors.fill: parent - icon: StudioTheme.Constants.camera_medium + icon: StudioTheme.Constants.cameraSpeed_medium pixelSize: StudioTheme.Values.myIconFontSize * 1.4 iconColor: StudioTheme.Values.themeLinkIndicatorColorHover enabled: false diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml index ee2df02e04a..3c74243f684 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml @@ -75,309 +75,310 @@ QtObject { readonly property string binding_medium: "\u005C" readonly property string bounds_small: "\u005D" readonly property string branch_medium: "\u005E" - readonly property string camera_medium: "\u005F" - readonly property string camera_small: "\u0060" - readonly property string centerHorizontal: "\u0061" - readonly property string centerVertical: "\u0062" - readonly property string cleanLogs_medium: "\u0063" - readonly property string clearList_large: "\u0064" - readonly property string clearList_medium: "\u0065" - readonly property string closeCross: "\u0066" - readonly property string closeFile_large: "\u0067" - readonly property string closeLink: "\u0068" - readonly property string close_small: "\u0069" - readonly property string code: "\u006A" - readonly property string codeEditor_medium: "\u006B" - readonly property string codeview_medium: "\u006C" - readonly property string colorPopupClose: "\u006D" - readonly property string colorSelection_medium: "\u006E" - readonly property string columnsAndRows: "\u006F" - readonly property string comboBox_medium: "\u0070" - readonly property string cone_medium: "\u0071" - readonly property string cone_small: "\u0072" - readonly property string connection_small: "\u0073" - readonly property string connections_medium: "\u0074" - readonly property string copyLink: "\u0075" - readonly property string copyStyle: "\u0076" - readonly property string copy_small: "\u0077" - readonly property string cornerA: "\u0078" - readonly property string cornerB: "\u0079" - readonly property string cornersAll: "\u007A" - readonly property string createComponent_large: "\u007B" - readonly property string createComponent_small: "\u007C" - readonly property string createObject_medium: "\u007D" - readonly property string create_medium: "\u007E" - readonly property string create_small: "\u007F" - readonly property string cube_medium: "\u0080" - readonly property string cube_small: "\u0081" - readonly property string curveDesigner: "\u0082" - readonly property string curveDesigner_medium: "\u0083" - readonly property string curveEditor: "\u0084" - readonly property string customMaterialEditor: "\u0085" - readonly property string cylinder_medium: "\u0086" - readonly property string cylinder_small: "\u0087" - readonly property string decisionNode: "\u0088" - readonly property string deleteColumn: "\u0089" - readonly property string deleteMaterial: "\u008A" - readonly property string deleteRow: "\u008B" - readonly property string deleteTable: "\u008C" - readonly property string delete_medium: "\u008D" - readonly property string delete_small: "\u008E" - readonly property string deletecolumn_medium: "\u008F" - readonly property string deletepermanently_medium: "\u0090" - readonly property string deleterow_medium: "\u0091" - readonly property string designMode_large: "\u0092" - readonly property string detach: "\u0093" - readonly property string directionalLight_small: "\u0094" - readonly property string distributeBottom: "\u0095" - readonly property string distributeCenterHorizontal: "\u0096" - readonly property string distributeCenterVertical: "\u0097" - readonly property string distributeLeft: "\u0098" - readonly property string distributeOriginBottomRight: "\u0099" - readonly property string distributeOriginCenter: "\u009A" - readonly property string distributeOriginNone: "\u009B" - readonly property string distributeOriginTopLeft: "\u009D" - readonly property string distributeRight: "\u009E" - readonly property string distributeSpacingHorizontal: "\u009F" - readonly property string distributeSpacingVertical: "\u00A0" - readonly property string distributeTop: "\u00A1" - readonly property string download: "\u00A2" - readonly property string downloadUnavailable: "\u00A3" - readonly property string downloadUpdate: "\u00A4" - readonly property string downloaded: "\u00A5" - readonly property string dragmarks: "\u00A6" - readonly property string duplicate_small: "\u00A7" - readonly property string edit: "\u00A8" - readonly property string editComponent_large: "\u00A9" - readonly property string editComponent_small: "\u00AA" - readonly property string editLightOff_medium: "\u00AB" - readonly property string editLightOn_medium: "\u00AC" - readonly property string edit_medium: "\u00AE" - readonly property string edit_small: "\u00AF" - readonly property string effects: "\u00B0" - readonly property string events_small: "\u00B1" - readonly property string export_medium: "\u00B2" - readonly property string eyeDropper: "\u00B3" - readonly property string favorite: "\u00B4" - readonly property string fitAll_medium: "\u00B5" - readonly property string fitSelected_small: "\u00B6" - readonly property string fitSelection_medium: "\u00B7" - readonly property string fitToView_medium: "\u00B8" - readonly property string flowAction: "\u00B9" - readonly property string flowTransition: "\u00BA" - readonly property string fontStyleBold: "\u00BB" - readonly property string fontStyleItalic: "\u00BC" - readonly property string fontStyleStrikethrough: "\u00BD" - readonly property string fontStyleUnderline: "\u00BE" - readonly property string forward_medium: "\u00BF" - readonly property string globalOrient_medium: "\u00C0" - readonly property string gradient: "\u00C1" - readonly property string gridView: "\u00C2" - readonly property string grid_medium: "\u00C3" - readonly property string group_small: "\u00C4" - readonly property string help: "\u00C5" - readonly property string home_large: "\u00C6" - readonly property string idAliasOff: "\u00C7" - readonly property string idAliasOn: "\u00C8" - readonly property string import_medium: "\u00C9" - readonly property string imported: "\u00CA" - readonly property string importedModels_small: "\u00CB" - readonly property string infinity: "\u00CC" - readonly property string invisible_medium: "\u00CD" - readonly property string invisible_small: "\u00CE" - readonly property string jumpToCode_medium: "\u00CF" - readonly property string jumpToCode_small: "\u00D0" - readonly property string keyframe: "\u00D1" - readonly property string languageList_medium: "\u00D2" - readonly property string layouts_small: "\u00D3" - readonly property string lights_small: "\u00D4" - readonly property string linear_medium: "\u00D5" - readonly property string linkTriangle: "\u00D6" - readonly property string linked: "\u00D7" - readonly property string listView: "\u00D8" - readonly property string listView_medium: "\u00D9" - readonly property string list_medium: "\u00DA" - readonly property string localOrient_medium: "\u00DB" - readonly property string lockOff: "\u00DC" - readonly property string lockOn: "\u00DD" - readonly property string loopPlayback_medium: "\u00DE" - readonly property string materialBrowser_medium: "\u00DF" - readonly property string materialPreviewEnvironment: "\u00E0" - readonly property string materialPreviewModel: "\u00E1" - readonly property string material_medium: "\u00E2" - readonly property string maxBar_small: "\u00E3" - readonly property string mergeCells: "\u00E4" - readonly property string merge_small: "\u00E5" - readonly property string minus: "\u00E6" - readonly property string mirror: "\u00E7" - readonly property string more_medium: "\u00E8" - readonly property string mouseArea_small: "\u00E9" - readonly property string moveDown_medium: "\u00EA" - readonly property string moveInwards_medium: "\u00EB" - readonly property string moveUp_medium: "\u00EC" - readonly property string moveUpwards_medium: "\u00ED" - readonly property string move_medium: "\u00EE" - readonly property string newMaterial: "\u00EF" - readonly property string nextFile_large: "\u00F0" - readonly property string normalBar_small: "\u00F1" - readonly property string openLink: "\u00F2" - readonly property string openMaterialBrowser: "\u00F3" - readonly property string orientation: "\u00F4" - readonly property string orthCam_medium: "\u00F5" - readonly property string orthCam_small: "\u00F6" - readonly property string paddingEdge: "\u00F7" - readonly property string paddingFrame: "\u00F8" - readonly property string particleAnimation_medium: "\u00F9" - readonly property string pasteStyle: "\u00FA" - readonly property string paste_small: "\u00FB" - readonly property string pause: "\u00FC" - readonly property string pause_medium: "\u00FD" - readonly property string perspectiveCam_medium: "\u00FE" - readonly property string perspectiveCam_small: "\u00FF" - readonly property string pin: "\u0100" - readonly property string plane_medium: "\u0101" - readonly property string plane_small: "\u0102" - readonly property string play: "\u0103" - readonly property string playFill_medium: "\u0104" - readonly property string playOutline_medium: "\u0105" - readonly property string plus: "\u0106" - readonly property string pointLight_small: "\u0107" - readonly property string positioners_small: "\u0108" - readonly property string previewEnv_medium: "\u0109" - readonly property string previousFile_large: "\u010A" - readonly property string promote: "\u010B" - readonly property string properties_medium: "\u010C" - readonly property string readOnly: "\u010D" - readonly property string recent_medium: "\u010E" - readonly property string recordFill_medium: "\u010F" - readonly property string recordOutline_medium: "\u0110" - readonly property string redo: "\u0111" - readonly property string reload_medium: "\u0112" - readonly property string remove_medium: "\u0113" - readonly property string remove_small: "\u0114" - readonly property string rename_small: "\u0115" - readonly property string replace_small: "\u0116" - readonly property string resetView_small: "\u0117" - readonly property string restartParticles_medium: "\u0118" - readonly property string reverseOrder_medium: "\u0119" - readonly property string roatate_medium: "\u011A" - readonly property string rotationFill: "\u011B" - readonly property string rotationOutline: "\u011C" - readonly property string runProjFill_large: "\u011D" - readonly property string runProjOutline_large: "\u011E" - readonly property string s_anchors: "\u011F" - readonly property string s_annotations: "\u0120" - readonly property string s_arrange: "\u0121" - readonly property string s_boundingBox: "\u0122" - readonly property string s_component: "\u0123" - readonly property string s_connections: "\u0124" - readonly property string s_edit: "\u0125" - readonly property string s_enterComponent: "\u0126" - readonly property string s_eventList: "\u0127" - readonly property string s_group: "\u0128" - readonly property string s_layouts: "\u0129" - readonly property string s_merging: "\u012A" - readonly property string s_mouseArea: "\u012B" - readonly property string s_positioners: "\u012C" - readonly property string s_selection: "\u012D" - readonly property string s_snapping: "\u012E" - readonly property string s_timeline: "\u012F" - readonly property string s_visibility: "\u0130" - readonly property string saveAs_medium: "\u0131" - readonly property string saveLogs_medium: "\u0132" - readonly property string save_medium: "\u0133" - readonly property string scale_medium: "\u0134" - readonly property string search: "\u0135" - readonly property string search_small: "\u0136" - readonly property string sectionToggle: "\u0137" - readonly property string selectFill_medium: "\u0138" - readonly property string selectOutline_medium: "\u0139" - readonly property string selectParent_small: "\u013A" - readonly property string selection_small: "\u013B" - readonly property string settings_medium: "\u013C" - readonly property string signal_small: "\u013D" - readonly property string snapping_conf_medium: "\u013E" - readonly property string snapping_medium: "\u013F" - readonly property string snapping_small: "\u0140" - readonly property string sortascending_medium: "\u0141" - readonly property string sortdescending_medium: "\u0142" - readonly property string sphere_medium: "\u0143" - readonly property string sphere_small: "\u0144" - readonly property string splitColumns: "\u0145" - readonly property string splitRows: "\u0146" - readonly property string splitScreen_medium: "\u0147" - readonly property string spotLight_small: "\u0148" - readonly property string stackedContainer_small: "\u0149" - readonly property string startNode: "\u014A" - readonly property string step_medium: "\u014B" - readonly property string stop_medium: "\u014C" - readonly property string tableView_medium: "\u014D" - readonly property string testIcon: "\u014E" - readonly property string textAlignBottom: "\u014F" - readonly property string textAlignCenter: "\u0150" - readonly property string textAlignJustified: "\u0151" - readonly property string textAlignLeft: "\u0152" - readonly property string textAlignMiddle: "\u0153" - readonly property string textAlignRight: "\u0154" - readonly property string textAlignTop: "\u0155" - readonly property string textBulletList: "\u0156" - readonly property string textFullJustification: "\u0157" - readonly property string textNumberedList: "\u0158" - readonly property string textures_medium: "\u0159" - readonly property string tickIcon: "\u015A" - readonly property string tickMark_small: "\u015B" - readonly property string timeline_small: "\u015C" - readonly property string toEndFrame_medium: "\u015D" - readonly property string toNextFrame_medium: "\u015E" - readonly property string toPrevFrame_medium: "\u015F" - readonly property string toStartFrame_medium: "\u0160" - readonly property string topToolbar_annotations: "\u0161" - readonly property string topToolbar_closeFile: "\u0162" - readonly property string topToolbar_designMode: "\u0163" - readonly property string topToolbar_enterComponent: "\u0164" - readonly property string topToolbar_home: "\u0165" - readonly property string topToolbar_makeComponent: "\u0166" - readonly property string topToolbar_navFile: "\u0167" - readonly property string topToolbar_runProject: "\u0168" - readonly property string translationCreateFiles: "\u0169" - readonly property string translationCreateReport: "\u016A" - readonly property string translationExport: "\u016B" - readonly property string translationImport: "\u016C" - readonly property string translationSelectLanguages: "\u016D" - readonly property string translationTest: "\u016E" - readonly property string transparent: "\u016F" - readonly property string triState: "\u0170" - readonly property string triangleArcA: "\u0171" - readonly property string triangleArcB: "\u0172" - readonly property string triangleCornerA: "\u0173" - readonly property string triangleCornerB: "\u0174" - readonly property string unLinked: "\u0175" - readonly property string undo: "\u0176" - readonly property string unify_medium: "\u0177" - readonly property string unpin: "\u0178" - readonly property string upDownIcon: "\u0179" - readonly property string upDownSquare2: "\u017A" - readonly property string updateAvailable_medium: "\u017B" - readonly property string updateContent_medium: "\u017C" - readonly property string visibilityOff: "\u017D" - readonly property string visibilityOn: "\u017E" - readonly property string visible_medium: "\u017F" - readonly property string visible_small: "\u0180" - readonly property string warning_medium: "\u0181" - readonly property string wildcard: "\u0182" - readonly property string wizardsAutomotive: "\u0183" - readonly property string wizardsDesktop: "\u0184" - readonly property string wizardsGeneric: "\u0185" - readonly property string wizardsMcuEmpty: "\u0186" - readonly property string wizardsMcuGraph: "\u0187" - readonly property string wizardsMobile: "\u0188" - readonly property string wizardsUnknown: "\u0189" - readonly property string zoomAll: "\u018A" - readonly property string zoomIn: "\u018B" - readonly property string zoomIn_medium: "\u018C" - readonly property string zoomOut: "\u018D" - readonly property string zoomOut_medium: "\u018E" - readonly property string zoomSelection: "\u018F" + readonly property string cameraSpeed_medium: "\u005F" + readonly property string camera_medium: "\u0060" + readonly property string camera_small: "\u0061" + readonly property string centerHorizontal: "\u0062" + readonly property string centerVertical: "\u0063" + readonly property string cleanLogs_medium: "\u0064" + readonly property string clearList_large: "\u0065" + readonly property string clearList_medium: "\u0066" + readonly property string closeCross: "\u0067" + readonly property string closeFile_large: "\u0068" + readonly property string closeLink: "\u0069" + readonly property string close_small: "\u006A" + readonly property string code: "\u006B" + readonly property string codeEditor_medium: "\u006C" + readonly property string codeview_medium: "\u006D" + readonly property string colorPopupClose: "\u006E" + readonly property string colorSelection_medium: "\u006F" + readonly property string columnsAndRows: "\u0070" + readonly property string comboBox_medium: "\u0071" + readonly property string cone_medium: "\u0072" + readonly property string cone_small: "\u0073" + readonly property string connection_small: "\u0074" + readonly property string connections_medium: "\u0075" + readonly property string copyLink: "\u0076" + readonly property string copyStyle: "\u0077" + readonly property string copy_small: "\u0078" + readonly property string cornerA: "\u0079" + readonly property string cornerB: "\u007A" + readonly property string cornersAll: "\u007B" + readonly property string createComponent_large: "\u007C" + readonly property string createComponent_small: "\u007D" + readonly property string createObject_medium: "\u007E" + readonly property string create_medium: "\u007F" + readonly property string create_small: "\u0080" + readonly property string cube_medium: "\u0081" + readonly property string cube_small: "\u0082" + readonly property string curveDesigner: "\u0083" + readonly property string curveDesigner_medium: "\u0084" + readonly property string curveEditor: "\u0085" + readonly property string customMaterialEditor: "\u0086" + readonly property string cylinder_medium: "\u0087" + readonly property string cylinder_small: "\u0088" + readonly property string decisionNode: "\u0089" + readonly property string deleteColumn: "\u008A" + readonly property string deleteMaterial: "\u008B" + readonly property string deleteRow: "\u008C" + readonly property string deleteTable: "\u008D" + readonly property string delete_medium: "\u008E" + readonly property string delete_small: "\u008F" + readonly property string deletecolumn_medium: "\u0090" + readonly property string deletepermanently_medium: "\u0091" + readonly property string deleterow_medium: "\u0092" + readonly property string designMode_large: "\u0093" + readonly property string detach: "\u0094" + readonly property string directionalLight_small: "\u0095" + readonly property string distributeBottom: "\u0096" + readonly property string distributeCenterHorizontal: "\u0097" + readonly property string distributeCenterVertical: "\u0098" + readonly property string distributeLeft: "\u0099" + readonly property string distributeOriginBottomRight: "\u009A" + readonly property string distributeOriginCenter: "\u009B" + readonly property string distributeOriginNone: "\u009D" + readonly property string distributeOriginTopLeft: "\u009E" + readonly property string distributeRight: "\u009F" + readonly property string distributeSpacingHorizontal: "\u00A0" + readonly property string distributeSpacingVertical: "\u00A1" + readonly property string distributeTop: "\u00A2" + readonly property string download: "\u00A3" + readonly property string downloadUnavailable: "\u00A4" + readonly property string downloadUpdate: "\u00A5" + readonly property string downloaded: "\u00A6" + readonly property string dragmarks: "\u00A7" + readonly property string duplicate_small: "\u00A8" + readonly property string edit: "\u00A9" + readonly property string editComponent_large: "\u00AA" + readonly property string editComponent_small: "\u00AB" + readonly property string editLightOff_medium: "\u00AC" + readonly property string editLightOn_medium: "\u00AE" + readonly property string edit_medium: "\u00AF" + readonly property string edit_small: "\u00B0" + readonly property string effects: "\u00B1" + readonly property string events_small: "\u00B2" + readonly property string export_medium: "\u00B3" + readonly property string eyeDropper: "\u00B4" + readonly property string favorite: "\u00B5" + readonly property string fitAll_medium: "\u00B6" + readonly property string fitSelected_small: "\u00B7" + readonly property string fitSelection_medium: "\u00B8" + readonly property string fitToView_medium: "\u00B9" + readonly property string flowAction: "\u00BA" + readonly property string flowTransition: "\u00BB" + readonly property string fontStyleBold: "\u00BC" + readonly property string fontStyleItalic: "\u00BD" + readonly property string fontStyleStrikethrough: "\u00BE" + readonly property string fontStyleUnderline: "\u00BF" + readonly property string forward_medium: "\u00C0" + readonly property string globalOrient_medium: "\u00C1" + readonly property string gradient: "\u00C2" + readonly property string gridView: "\u00C3" + readonly property string grid_medium: "\u00C4" + readonly property string group_small: "\u00C5" + readonly property string help: "\u00C6" + readonly property string home_large: "\u00C7" + readonly property string idAliasOff: "\u00C8" + readonly property string idAliasOn: "\u00C9" + readonly property string import_medium: "\u00CA" + readonly property string imported: "\u00CB" + readonly property string importedModels_small: "\u00CC" + readonly property string infinity: "\u00CD" + readonly property string invisible_medium: "\u00CE" + readonly property string invisible_small: "\u00CF" + readonly property string jumpToCode_medium: "\u00D0" + readonly property string jumpToCode_small: "\u00D1" + readonly property string keyframe: "\u00D2" + readonly property string languageList_medium: "\u00D3" + readonly property string layouts_small: "\u00D4" + readonly property string lights_small: "\u00D5" + readonly property string linear_medium: "\u00D6" + readonly property string linkTriangle: "\u00D7" + readonly property string linked: "\u00D8" + readonly property string listView: "\u00D9" + readonly property string listView_medium: "\u00DA" + readonly property string list_medium: "\u00DB" + readonly property string localOrient_medium: "\u00DC" + readonly property string lockOff: "\u00DD" + readonly property string lockOn: "\u00DE" + readonly property string loopPlayback_medium: "\u00DF" + readonly property string materialBrowser_medium: "\u00E0" + readonly property string materialPreviewEnvironment: "\u00E1" + readonly property string materialPreviewModel: "\u00E2" + readonly property string material_medium: "\u00E3" + readonly property string maxBar_small: "\u00E4" + readonly property string mergeCells: "\u00E5" + readonly property string merge_small: "\u00E6" + readonly property string minus: "\u00E7" + readonly property string mirror: "\u00E8" + readonly property string more_medium: "\u00E9" + readonly property string mouseArea_small: "\u00EA" + readonly property string moveDown_medium: "\u00EB" + readonly property string moveInwards_medium: "\u00EC" + readonly property string moveUp_medium: "\u00ED" + readonly property string moveUpwards_medium: "\u00EE" + readonly property string move_medium: "\u00EF" + readonly property string newMaterial: "\u00F0" + readonly property string nextFile_large: "\u00F1" + readonly property string normalBar_small: "\u00F2" + readonly property string openLink: "\u00F3" + readonly property string openMaterialBrowser: "\u00F4" + readonly property string orientation: "\u00F5" + readonly property string orthCam_medium: "\u00F6" + readonly property string orthCam_small: "\u00F7" + readonly property string paddingEdge: "\u00F8" + readonly property string paddingFrame: "\u00F9" + readonly property string particleAnimation_medium: "\u00FA" + readonly property string pasteStyle: "\u00FB" + readonly property string paste_small: "\u00FC" + readonly property string pause: "\u00FD" + readonly property string pause_medium: "\u00FE" + readonly property string perspectiveCam_medium: "\u00FF" + readonly property string perspectiveCam_small: "\u0100" + readonly property string pin: "\u0101" + readonly property string plane_medium: "\u0102" + readonly property string plane_small: "\u0103" + readonly property string play: "\u0104" + readonly property string playFill_medium: "\u0105" + readonly property string playOutline_medium: "\u0106" + readonly property string plus: "\u0107" + readonly property string pointLight_small: "\u0108" + readonly property string positioners_small: "\u0109" + readonly property string previewEnv_medium: "\u010A" + readonly property string previousFile_large: "\u010B" + readonly property string promote: "\u010C" + readonly property string properties_medium: "\u010D" + readonly property string readOnly: "\u010E" + readonly property string recent_medium: "\u010F" + readonly property string recordFill_medium: "\u0110" + readonly property string recordOutline_medium: "\u0111" + readonly property string redo: "\u0112" + readonly property string reload_medium: "\u0113" + readonly property string remove_medium: "\u0114" + readonly property string remove_small: "\u0115" + readonly property string rename_small: "\u0116" + readonly property string replace_small: "\u0117" + readonly property string resetView_small: "\u0118" + readonly property string restartParticles_medium: "\u0119" + readonly property string reverseOrder_medium: "\u011A" + readonly property string roatate_medium: "\u011B" + readonly property string rotationFill: "\u011C" + readonly property string rotationOutline: "\u011D" + readonly property string runProjFill_large: "\u011E" + readonly property string runProjOutline_large: "\u011F" + readonly property string s_anchors: "\u0120" + readonly property string s_annotations: "\u0121" + readonly property string s_arrange: "\u0122" + readonly property string s_boundingBox: "\u0123" + readonly property string s_component: "\u0124" + readonly property string s_connections: "\u0125" + readonly property string s_edit: "\u0126" + readonly property string s_enterComponent: "\u0127" + readonly property string s_eventList: "\u0128" + readonly property string s_group: "\u0129" + readonly property string s_layouts: "\u012A" + readonly property string s_merging: "\u012B" + readonly property string s_mouseArea: "\u012C" + readonly property string s_positioners: "\u012D" + readonly property string s_selection: "\u012E" + readonly property string s_snapping: "\u012F" + readonly property string s_timeline: "\u0130" + readonly property string s_visibility: "\u0131" + readonly property string saveAs_medium: "\u0132" + readonly property string saveLogs_medium: "\u0133" + readonly property string save_medium: "\u0134" + readonly property string scale_medium: "\u0135" + readonly property string search: "\u0136" + readonly property string search_small: "\u0137" + readonly property string sectionToggle: "\u0138" + readonly property string selectFill_medium: "\u0139" + readonly property string selectOutline_medium: "\u013A" + readonly property string selectParent_small: "\u013B" + readonly property string selection_small: "\u013C" + readonly property string settings_medium: "\u013D" + readonly property string signal_small: "\u013E" + readonly property string snapping_conf_medium: "\u013F" + readonly property string snapping_medium: "\u0140" + readonly property string snapping_small: "\u0141" + readonly property string sortascending_medium: "\u0142" + readonly property string sortdescending_medium: "\u0143" + readonly property string sphere_medium: "\u0144" + readonly property string sphere_small: "\u0145" + readonly property string splitColumns: "\u0146" + readonly property string splitRows: "\u0147" + readonly property string splitScreen_medium: "\u0148" + readonly property string spotLight_small: "\u0149" + readonly property string stackedContainer_small: "\u014A" + readonly property string startNode: "\u014B" + readonly property string step_medium: "\u014C" + readonly property string stop_medium: "\u014D" + readonly property string tableView_medium: "\u014E" + readonly property string testIcon: "\u014F" + readonly property string textAlignBottom: "\u0150" + readonly property string textAlignCenter: "\u0151" + readonly property string textAlignJustified: "\u0152" + readonly property string textAlignLeft: "\u0153" + readonly property string textAlignMiddle: "\u0154" + readonly property string textAlignRight: "\u0155" + readonly property string textAlignTop: "\u0156" + readonly property string textBulletList: "\u0157" + readonly property string textFullJustification: "\u0158" + readonly property string textNumberedList: "\u0159" + readonly property string textures_medium: "\u015A" + readonly property string tickIcon: "\u015B" + readonly property string tickMark_small: "\u015C" + readonly property string timeline_small: "\u015D" + readonly property string toEndFrame_medium: "\u015E" + readonly property string toNextFrame_medium: "\u015F" + readonly property string toPrevFrame_medium: "\u0160" + readonly property string toStartFrame_medium: "\u0161" + readonly property string topToolbar_annotations: "\u0162" + readonly property string topToolbar_closeFile: "\u0163" + readonly property string topToolbar_designMode: "\u0164" + readonly property string topToolbar_enterComponent: "\u0165" + readonly property string topToolbar_home: "\u0166" + readonly property string topToolbar_makeComponent: "\u0167" + readonly property string topToolbar_navFile: "\u0168" + readonly property string topToolbar_runProject: "\u0169" + readonly property string translationCreateFiles: "\u016A" + readonly property string translationCreateReport: "\u016B" + readonly property string translationExport: "\u016C" + readonly property string translationImport: "\u016D" + readonly property string translationSelectLanguages: "\u016E" + readonly property string translationTest: "\u016F" + readonly property string transparent: "\u0170" + readonly property string triState: "\u0171" + readonly property string triangleArcA: "\u0172" + readonly property string triangleArcB: "\u0173" + readonly property string triangleCornerA: "\u0174" + readonly property string triangleCornerB: "\u0175" + readonly property string unLinked: "\u0176" + readonly property string undo: "\u0177" + readonly property string unify_medium: "\u0178" + readonly property string unpin: "\u0179" + readonly property string upDownIcon: "\u017A" + readonly property string upDownSquare2: "\u017B" + readonly property string updateAvailable_medium: "\u017C" + readonly property string updateContent_medium: "\u017D" + readonly property string visibilityOff: "\u017E" + readonly property string visibilityOn: "\u017F" + readonly property string visible_medium: "\u0180" + readonly property string visible_small: "\u0181" + readonly property string warning_medium: "\u0182" + readonly property string wildcard: "\u0183" + readonly property string wizardsAutomotive: "\u0184" + readonly property string wizardsDesktop: "\u0185" + readonly property string wizardsGeneric: "\u0186" + readonly property string wizardsMcuEmpty: "\u0187" + readonly property string wizardsMcuGraph: "\u0188" + readonly property string wizardsMobile: "\u0189" + readonly property string wizardsUnknown: "\u018A" + readonly property string zoomAll: "\u018B" + readonly property string zoomIn: "\u018C" + readonly property string zoomIn_medium: "\u018D" + readonly property string zoomOut: "\u018E" + readonly property string zoomOut_medium: "\u018F" + readonly property string zoomSelection: "\u0190" readonly property font iconFont: Qt.font({ "family": controlIcons.name, diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf index 714cd4b7535..cdce3eeefd9 100644 Binary files a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf and b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf differ -- cgit v1.2.3 From 7df7cc21a1b4736824701eaa71a47dfdae1767cd Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 21 Mar 2024 19:12:10 +0100 Subject: QmlDesigner: Add Qt 6.7 support to 3d wizard Change-Id: I54fc29b6934ca69fc07dc3aaea5fa9f37b69e76c Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Tim Jenssen --- .../studio_templates/projects/application-3d/wizard.json | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json index 42d0bf748c8..5b4d910b718 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json @@ -278,6 +278,14 @@ 'TargetQuickVersion': '6.6', 'TargetQuick3DVersion': '6.6' })" + }, + { + "trKey": "Qt 6.7", + "value": + "({ + 'TargetQuickVersion': '6.7', + 'TargetQuick3DVersion': '6.7' + })" } ] } -- cgit v1.2.3 From 002bfbf80f81d2d41a159442a927b22b6bff0534 Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Tue, 19 Mar 2024 14:52:20 +0200 Subject: EffectComposer: Add 'reset' button for values Task-number: QDS-11719 Change-Id: Ia03366bf109427fbcfe5cc1d4f68ae97fa8dc256 Reviewed-by: Miikka Heikkinen Reviewed-by: Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../EffectCompositionNode.qml | 2 ++ .../EffectCompositionNodeUniform.qml | 33 ++++++++++++++++++++-- .../effectComposerQmlSources/ValueColor.qml | 10 +++++-- .../effectComposerQmlSources/ValueFloat.qml | 6 +++- .../effectComposerQmlSources/ValueInt.qml | 6 +++- .../effectComposerQmlSources/ValueVec2.qml | 12 ++++++-- .../effectComposerQmlSources/ValueVec3.qml | 18 ++++++++++-- .../effectComposerQmlSources/ValueVec4.qml | 24 +++++++++++++--- .../imports/HelperWidgets/DoubleSpinBox.qml | 1 + 9 files changed, 97 insertions(+), 15 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml index 6defa3b0922..a606461b5c5 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml @@ -43,6 +43,8 @@ HelperWidgets.Section { EffectCompositionNodeUniform { width: root.width + + onReset: nodeUniformsModel.resetData(index) } } } diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml index 71cbf94f8bc..7c3214c5fa7 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml @@ -13,9 +13,10 @@ Item { id: root height: layout.implicitHeight - visible: !uniformUseCustomValue + signal reset() + Component.onCompleted: { if (uniformType === "int") { if (uniformControlType === "channel") @@ -49,10 +50,11 @@ Item { RowLayout { id: layout - spacing: 20 anchors.fill: parent Text { + id: textName + text: uniformDisplayName color: StudioTheme.Values.themeTextColor font.pixelSize: StudioTheme.Values.baseFontSize @@ -63,11 +65,38 @@ Item { elide: Text.ElideRight HelperWidgets.ToolTipArea { + id: tooltipArea + anchors.fill: parent tooltip: uniformDescription } } + Item { + Layout.preferredHeight: 30 + Layout.preferredWidth: 30 + + MouseArea { + id: mouseArea + + anchors.fill: parent + hoverEnabled: true + } + + HelperWidgets.IconButton { + id: iconButton + + buttonSize: 24 + icon: StudioTheme.Constants.reload_medium + iconSize: 16 + anchors.centerIn: parent + visible: mouseArea.containsMouse || iconButton.containsMouse + tooltip: qsTr("Reset value") + onClicked: root.reset() + } + + } + Loader { id: valueLoader Layout.fillWidth: true diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueColor.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueColor.qml index 4b00bd76135..f7482260b58 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueColor.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueColor.qml @@ -15,8 +15,14 @@ Row { StudioControls.ColorEditor { actionIndicatorVisible: false - Component.onCompleted: color = uniformValue + // color: uniformValue binding can get overwritten by normal operation of the control + property color resetValue: uniformValue - onColorChanged: uniformValue = color + onResetValueChanged: color = uniformValue + Component.onCompleted: color = uniformValue + onColorChanged: { + if (uniformValue !== color) + uniformValue = color + } } } diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml index 7348d6668be..969d7e29492 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueFloat.qml @@ -14,6 +14,10 @@ Row { HelperWidgets.DoubleSpinBox { id: spinBox + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue + onResetValueChanged: value = resetValue + width: 60 spinBoxIndicatorVisible: false inputHAlignment: Qt.AlignHCenter @@ -22,7 +26,7 @@ Row { value: uniformValue stepSize: .01 decimals: 2 - onValueChanged: uniformValue = value + onValueModified: uniformValue = value } StudioControls.Slider { diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml index 89f571c8cb7..d67929168a9 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueInt.qml @@ -14,6 +14,10 @@ Row { HelperWidgets.DoubleSpinBox { id: spinBox + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue + onResetValueChanged: value = resetValue + width: 60 spinBoxIndicatorVisible: false inputHAlignment: Qt.AlignHCenter @@ -22,7 +26,7 @@ Row { value: uniformValue stepSize: 1 decimals: 0 - onValueChanged: uniformValue = Math.round(value) + onValueModified: uniformValue = Math.round(value) } StudioControls.Slider { diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml index b703d5f184a..adb4fe99056 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec2.qml @@ -15,6 +15,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vX + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.x + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -26,7 +30,7 @@ RowLayout { value: uniformValue.x stepSize: .01 decimals: 2 - onValueChanged: uniformValue.x = value + onValueModified: uniformValue.x = value } Item { // spacer @@ -51,6 +55,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vY + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.y + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -62,7 +70,7 @@ RowLayout { value: uniformValue.y stepSize: .01 decimals: 2 - onValueChanged: uniformValue.y = value + onValueModified: uniformValue.y = value } Item { // spacer diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml index d59b63a514f..78573c48f67 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec3.qml @@ -15,6 +15,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vX + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.x + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -26,7 +30,7 @@ RowLayout { value: uniformValue.x stepSize: .01 decimals: 2 - onValueChanged: uniformValue.x = value + onValueModified: uniformValue.x = value } Item { // spacer @@ -51,6 +55,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vY + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.y + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -62,7 +70,7 @@ RowLayout { value: uniformValue.y stepSize: .01 decimals: 2 - onValueChanged: uniformValue.y = value + onValueModified: uniformValue.y = value } Item { // spacer @@ -87,6 +95,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vZ + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.z + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -98,7 +110,7 @@ RowLayout { value: uniformValue.z stepSize: .01 decimals: 2 - onValueChanged: uniformValue.z = value + onValueModified: uniformValue.z = value } Item { // spacer diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml index 7e930abf815..61ce8e63893 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/ValueVec4.qml @@ -15,6 +15,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vX + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.x + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -26,7 +30,7 @@ RowLayout { value: uniformValue.x stepSize: .01 decimals: 2 - onValueChanged: uniformValue.x = value + onValueModified: uniformValue.x = value } Item { // spacer @@ -51,6 +55,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vY + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.y + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -62,7 +70,7 @@ RowLayout { value: uniformValue.y stepSize: .01 decimals: 2 - onValueChanged: uniformValue.y = value + onValueModified: uniformValue.y = value } Item { // spacer @@ -87,6 +95,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vZ + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.z + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -98,7 +110,7 @@ RowLayout { value: uniformValue.z stepSize: .01 decimals: 2 - onValueChanged: uniformValue.z = value + onValueModified: uniformValue.z = value } Item { // spacer @@ -123,6 +135,10 @@ RowLayout { HelperWidgets.DoubleSpinBox { id: vW + // value: uniformValue binding can get overwritten by normal operation of the control + property double resetValue: uniformValue.w + onResetValueChanged: value = resetValue + Layout.fillWidth: true Layout.minimumWidth: 30 Layout.maximumWidth: 60 @@ -134,7 +150,7 @@ RowLayout { value: uniformValue.w stepSize: .01 decimals: 2 - onValueChanged: uniformValue.w = value + onValueModified: uniformValue.w = value } Item { // spacer diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml index a44e8c690be..11ce0e1e753 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml @@ -53,5 +53,6 @@ Item { decimals: 2 onRealValueModified: wrapper.valueModified() + onCompressedRealValueModified: wrapper.valueModified() } } -- cgit v1.2.3 From e4429401d51d0476fb5361f88245d43424f9702f Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 21 Mar 2024 15:14:57 +0200 Subject: EffectComposer: Add extraMargin property for generated effects Extra margin property is added to effects that can spill outside the source item. This property specifies the amount of space outside the item that the effect is allowed to use for rendering. Fixes: QDS-11607 Change-Id: I36d7392593faa6deb99726eaa02184aa87aa3571 Reviewed-by: Mahmoud Badri Reviewed-by: Qt CI Patch Build Bot --- .../qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml index c832b2f3708..aefffcc6bcc 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml @@ -21,6 +21,7 @@ Column { readonly property int updateDelay: 100 readonly property int previewMargin: 5 + readonly property int extraMargin: 200 property real previewScale: 1 @@ -246,6 +247,8 @@ Column { layer.enabled: true layer.mipmap: true layer.smooth: true + layer.sourceRect: Qt.rect(-root.extraMargin, -root.extraMargin, + width + root.extraMargin * 2, height + root.extraMargin * 2) visible: false Image { @@ -347,10 +350,6 @@ Column { width: source.width height: source.height anchors.centerIn: parent - // Cache the layer. This way heavy shaders rendering doesn't - // slow down code editing & rest of the UI. - layer.enabled: true - layer.smooth: true } } -- cgit v1.2.3 From 668c3cfb35ae5993a6343ef632566e7496b0b2de Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Fri, 22 Mar 2024 12:23:23 +0200 Subject: QmlDesigner: Modify tooltips and texts of the model editor Fixes: QDS-11758 Fixes: QDS-11895 Change-Id: I9d5f562b19fc9fff2a6a9d012ecdb6099c19409f Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../collectionEditorQmlSource/CollectionDetailsToolbar.qml | 10 +++++----- .../collectionEditorQmlSource/CollectionDetailsView.qml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml index 8b4c08f8458..9800a31f94b 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml @@ -49,7 +49,7 @@ Rectangle { id: addColumnLeftButton buttonIcon: StudioTheme.Constants.addcolumnleft_medium - tooltip: qsTr("Add property left") + tooltip: qsTr("Add column left") enabled: root.model.selectedColumn > -1 onClicked: addColumnDialog.popUp(root.model.selectedColumn) } @@ -58,7 +58,7 @@ Rectangle { id: addColumnRightButton buttonIcon: StudioTheme.Constants.addcolumnright_medium - tooltip: qsTr("Add property right") + tooltip: qsTr("Add column right") enabled: root.model.selectedColumn > -1 onClicked: addColumnDialog.popUp(root.model.selectedColumn + 1) } @@ -67,7 +67,7 @@ Rectangle { id: deleteColumnButton buttonIcon: StudioTheme.Constants.deletecolumn_medium - tooltip: qsTr("Delete selected property") + tooltip: qsTr("Delete selected column") enabled: root.model.selectedColumn > -1 onClicked: root.model.removeColumn(root.model.selectedColumn) } @@ -81,7 +81,7 @@ Rectangle { id: addRowBelowButton buttonIcon: StudioTheme.Constants.addrowbelow_medium - tooltip: qsTr("Insert row below") + tooltip: qsTr("Add row below") enabled: root.model.selectedRow > -1 onClicked: root.model.insertRow(root.model.selectedRow + 1) } @@ -90,7 +90,7 @@ Rectangle { id: addRowAboveButton buttonIcon: StudioTheme.Constants.addrowabove_medium - tooltip: qsTr("Insert row above") + tooltip: qsTr("Add row above") enabled: root.model.selectedRow > -1 onClicked: root.model.insertRow(root.model.selectedRow) } diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml index c9a6d2dbcbd..3cde00d0a48 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml @@ -369,7 +369,7 @@ Rectangle { Text { anchors.centerIn: parent - text: qsTr("Select a model to continue") + text: qsTr("There are no models in this project.\nAdd or import a model.") visible: !topRow.visible color: StudioTheme.Values.themeTextColor font.pixelSize: StudioTheme.Values.mediumFontSize -- cgit v1.2.3 From 130d7c69ecc13f698b35e5062afc484f585f03ab Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Fri, 22 Mar 2024 11:14:39 +0200 Subject: QmlDesigner: Improve selecting and viewing the added rows/columns Fixes: QDS-11762 Fixes: QDS-12058 Fixes: QDS-12066 Fixes: QDS-12159 Change-Id: I81efce31fd6f6e48d4109cb397435972f562ae14 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../CollectionDetailsView.qml | 138 +++++++++++++++++++-- 1 file changed, 126 insertions(+), 12 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml index 3cde00d0a48..fc8f92f9b77 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml @@ -26,6 +26,7 @@ Rectangle { Column { id: topRow + readonly property real maxAvailableHeight: root.height visible: root.model.collectionName !== "" width: parent.width @@ -39,6 +40,11 @@ Rectangle { } GridLayout { + id: gridLayout + readonly property real maxAvailableHeight: topRow.maxAvailableHeight + - topRow.spacing + - toolbar.height + columns: 3 rowSpacing: 1 columnSpacing: 1 @@ -184,18 +190,32 @@ Rectangle { TableView { id: tableView - model: root.sortedModel + model: root.model clip: true - property point tableStart: tableTopLeftCorner.mapToItem(root, Qt.point(x, y)); + readonly property real maxAvailableHeight: gridLayout.maxAvailableHeight + - addRowButton.height + - headerView.height + - (2 * gridLayout.rowSpacing) + readonly property real maxAvailableWidth: gridLayout.width + - StudioTheme.Values.collectionTableHorizontalMargin + - rowIdView.width + - addColumnButton.width + - gridLayout.columnSpacing + + property real childrenWidth: tableView.contentItem.childrenRect.width + property real childrenHeight: tableView.contentItem.childrenRect.height + + property int targetRow + property int targetColumn Layout.alignment: Qt.AlignTop + Qt.AlignLeft Layout.preferredWidth: tableView.contentWidth Layout.preferredHeight: tableView.contentHeight Layout.minimumWidth: 100 Layout.minimumHeight: 20 - Layout.maximumWidth: root.width - (tableStart.x + addColumnContainer.width) - Layout.maximumHeight: root.height - (tableStart.y + addRowContainer.height) + Layout.maximumWidth: maxAvailableWidth + Layout.maximumHeight: maxAvailableHeight columnWidthProvider: function(column) { if (!isColumnLoaded(column)) @@ -215,6 +235,47 @@ Rectangle { return Math.max(h, StudioTheme.Values.collectionCellMinimumHeight) } + function ensureRowIsVisible(row) { + let rows = tableView.model.rowCount() + if (row < 0 || row >= rows) { + tableView.targetRow = -1 + return + } + + if (tableView.isRowLoaded(row)) { + tableView.positionViewAtRow(row, Qt.AlignLeft | Qt.AlignTop) + tableView.targetRow = -1 + return + } + + tableView.targetRow = row + verticalScrollBar.position = row / rows + ensureTimer.start() + } + + function ensureColumnIsVisible(column) { + let columns = tableView.model.columnCount() + if (column < 0 || column >= columns) { + tableView.targetColumn = -1 + return + } + + if (tableView.isColumnLoaded(column)) { + tableView.positionViewAtColumn(column, Qt.AlignLeft | Qt.AlignTop) + tableView.targetColumn = -1 + return + } + + tableView.targetColumn = column + horizontalScrollBar.position = column / columns + ensureTimer.start() + } + + onMaxAvailableHeightChanged: resetSizeTimer.start() + onMaxAvailableWidthChanged: resetSizeTimer.start() + onChildrenWidthChanged: resetSizeTimer.start() + onChildrenHeightChanged: resetSizeTimer.start() + delegate: Rectangle { id: itemCell @@ -298,14 +359,67 @@ Rectangle { left: itemCell.left } } + } - Connections { - target: tableView.model + Timer { + id: resetSizeTimer - function onModelReset() { - tableView.clearColumnWidths() - tableView.clearRowHeights() - } + interval: 100 + repeat: false + onTriggered: { + let cWidth = Math.min(tableView.maxAvailableWidth, tableView.childrenWidth) + let cHeight = Math.min(tableView.maxAvailableHeight, tableView.childrenHeight) + + if (tableView.contentWidth != cWidth || tableView.contentHeight != cHeight) + tableView.returnToBounds() + } + } + + Timer { + id: ensureTimer + + interval: 100 + repeat: false + onTriggered: { + tableView.ensureRowIsVisible(tableView.targetRow) + tableView.ensureColumnIsVisible(tableView.targetColumn) + } + } + + Connections { + target: tableView.model + + function onModelReset() { + tableView.clearColumnWidths() + tableView.clearRowHeights() + } + + function onRowsInserted(parent, first, last) { + tableView.closeEditor() + tableView.model.selectRow(first) + tableView.ensureRowIsVisible(first) + } + + function onColumnsInserted(parent, first, last) { + tableView.closeEditor() + tableView.model.selectColumn(first) + tableView.ensureColumnIsVisible(first) + } + + function onRowsRemoved(parent, first, last) { + let nextRow = first - 1 + if (nextRow < 0 && tableView.model.rowCount(parent) > 0) + nextRow = 0 + + tableView.model.selectRow(nextRow) + } + + function onColumnsRemoved(parent, first, last) { + let nextColumn = first - 1 + if (nextColumn < 0 && tableView.model.columnCount(parent) > 0) + nextColumn = 0 + + tableView.model.selectColumn(nextColumn) } } @@ -331,7 +445,7 @@ Rectangle { } HelperWidgets.IconButton { - id: addColumnContainer + id: addColumnButton iconSize:16 Layout.preferredWidth: 24 @@ -346,7 +460,7 @@ Rectangle { } HelperWidgets.IconButton { - id: addRowContainer + id: addRowButton iconSize:16 Layout.preferredWidth: tableView.width -- cgit v1.2.3 From 536e78789154348061f84eedb3a826ca4c814f77 Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Fri, 22 Mar 2024 16:04:54 +0200 Subject: EffectComposer: Fix "Save comp with new name" button behavior Task-number: QDS-12023 Change-Id: Icc941c8c31738b06e6f898562236eca50fc82180 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml index 1912592f2fc..8f98ae25b25 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml @@ -48,7 +48,7 @@ Rectangle { style: StudioTheme.Values.viewBarButtonStyle buttonIcon: StudioTheme.Constants.saveAs_medium tooltip: qsTr("Save current composition with a new name") - enabled: root.backendModel ? root.backendModel.isEnabled && !root.backendModel.isEmpty + enabled: root.backendModel ? root.backendModel.isEnabled && root.backendModel.currentComposition !== "" : false onClicked: root.saveAsClicked() -- cgit v1.2.3 From ef1f4793e2582c8fd1a93c18704b1a981f1afc5a Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 25 Mar 2024 10:33:57 +0100 Subject: QmlDesigner: Make Qt 6.7 the default for 3D Change-Id: I8ef47e3457d0c55ef47a4a98389da4aa2b015634 Reviewed-by: Tim Jenssen --- .../qmldesigner/studio_templates/projects/application-3d/wizard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json index 5b4d910b718..cb885c55e33 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json @@ -236,7 +236,7 @@ "type": "ComboBox", "data": { - "index": 3, + "index": 5, "items": [ { -- cgit v1.2.3 From b008794156f449b2e15e419138144b1439f43fbe Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Mon, 25 Mar 2024 14:22:05 +0200 Subject: QmlDesigner: Change cell text color for better legibility - Cell text color now matches that of the column name. Task-number: QDS-12168 Change-Id: Ia3e53a448c57e2f76347e83076271944936f6c05 Reviewed-by: Mahmoud Badri Reviewed-by: Qt CI Patch Build Bot --- .../qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml index fc8f92f9b77..f5e062b7a1b 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml @@ -325,7 +325,7 @@ Rectangle { Text { text: display ?? "" color: itemSelected ? StudioTheme.Values.themeInteraction - : StudioTheme.Values.themePlaceholderTextColorInteraction + : StudioTheme.Values.themeTextColor leftPadding: 5 topPadding: 3 bottomPadding: 3 -- cgit v1.2.3 From 2894cea520c70199fa3d80555769fe267004f944 Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Fri, 22 Mar 2024 17:36:41 +0200 Subject: QmlDesigner: Improve Model editor dialogs * Dialogs will be closed after model changes * Some menus and dialogs moved for improving the performance issues Fixes: QDS-12057 Change-Id: Ie298732ec1d3c9e4623663cd539abfa1b119ff98 Reviewed-by: Mahmoud Badri --- .../CollectionDetailsToolbar.qml | 5 + .../CollectionDetailsView.qml | 7 +- .../collectionEditorQmlSource/CollectionItem.qml | 153 +--------------- .../CollectionListView.qml | 198 +++++++++++++++++++++ .../collectionEditorQmlSource/CollectionView.qml | 16 ++ 5 files changed, 233 insertions(+), 146 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml index 9800a31f94b..876e8456371 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml @@ -29,6 +29,11 @@ Rectangle { root.model.insertRow(root.model.rowCount()) } + function closeDialogs() { + addColumnDialog.reject() + fileDialog.reject() + } + RowLayout { id: container diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml index f5e062b7a1b..6420f197bd9 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml @@ -21,7 +21,9 @@ Rectangle { color: StudioTheme.Values.themeControlBackground function closeDialogs() { - editPropertyDialog.close() + editPropertyDialog.reject() + deleteColumnDialog.reject() + toolbar.closeDialogs() } Column { @@ -370,7 +372,7 @@ Rectangle { let cWidth = Math.min(tableView.maxAvailableWidth, tableView.childrenWidth) let cHeight = Math.min(tableView.maxAvailableHeight, tableView.childrenHeight) - if (tableView.contentWidth != cWidth || tableView.contentHeight != cHeight) + if (tableView.contentWidth !== cWidth || tableView.contentHeight !== cHeight) tableView.returnToBounds() } } @@ -390,6 +392,7 @@ Rectangle { target: tableView.model function onModelReset() { + root.closeDialogs() tableView.clearColumnWidths() tableView.clearRowHeights() } diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml index 31ced43c1dd..d963070536f 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml @@ -16,9 +16,17 @@ Item { implicitHeight: boundingRect.height + 3 property color textColor + readonly property string name: collectionName ?? "" + readonly property bool isSelected: collectionIsSelected + readonly property int id: index + + function rename(newName) { + collectionName = newName + } signal selectItem(int itemIndex) signal deleteItem() + signal contextMenuRequested() Item { id: boundingRect @@ -90,155 +98,12 @@ Item { MouseArea { anchors.fill: parent acceptedButtons: Qt.RightButton | Qt.LeftButton - onClicked: collectionMenu.popup() - } - } - } - } - - StudioControls.Menu { - id: collectionMenu - - closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside - - StudioControls.MenuItem { - text: qsTr("Delete") - shortcut: StandardKey.Delete - onTriggered: deleteDialog.open() - } - - StudioControls.MenuItem { - text: qsTr("Rename") - shortcut: StandardKey.Replace - onTriggered: renameDialog.open() - } - - StudioControls.MenuItem { - text: qsTr("Assign to the selected node") - enabled: CollectionEditorBackend.rootView.targetNodeSelected - onTriggered: rootView.assignCollectionToSelectedNode(collectionName) - } - } - - component Spacer: Item { - implicitWidth: 1 - implicitHeight: StudioTheme.Values.columnGap - } - - StudioControls.Dialog { - id: deleteDialog - - title: qsTr("Deleting the model") - clip: true - implicitWidth: 300 - - contentItem: ColumnLayout { - spacing: 2 - - Text { - Layout.fillWidth: true - - wrapMode: Text.WordWrap - color: StudioTheme.Values.themeTextColor - text: qsTr("Are you sure that you want to delete model \"%1\"?" - + "\nThe model will be deleted permanently.").arg(collectionName) - - } - - Spacer {} - - RowLayout { - spacing: StudioTheme.Values.sectionRowSpacing - Layout.alignment: Qt.AlignRight | Qt.AlignVCenter - - HelperWidgets.Button { - text: qsTr("Delete") - onClicked: root.deleteItem() - } - - HelperWidgets.Button { - text: qsTr("Cancel") - onClicked: deleteDialog.reject() - } - } - } - } - - StudioControls.Dialog { - id: renameDialog - - title: qsTr("Rename model") - - onAccepted: { - if (newNameField.text !== "") - collectionName = newNameField.text - } - - onOpened: { - newNameField.text = collectionName - } - - contentItem: ColumnLayout { - spacing: 2 - - Text { - text: qsTr("Previous name: " + collectionName) - color: StudioTheme.Values.themeTextColor - } - - Spacer {} - - Text { - Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter - text: qsTr("New name:") - color: StudioTheme.Values.themeTextColor - } - - StudioControls.TextField { - id: newNameField - - Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter - Layout.fillWidth: true - - actionIndicator.visible: false - translationIndicator.visible: false - validator: newNameValidator - - Keys.onEnterPressed: renameDialog.accept() - Keys.onReturnPressed: renameDialog.accept() - Keys.onEscapePressed: renameDialog.reject() - - onTextChanged: { - btnRename.enabled = newNameField.text !== "" - } - } - - Spacer {} - - RowLayout { - Layout.alignment: Qt.AlignRight | Qt.AlignVCenter - spacing: StudioTheme.Values.sectionRowSpacing - - HelperWidgets.Button { - id: btnRename - - text: qsTr("Rename") - onClicked: renameDialog.accept() - } - - HelperWidgets.Button { - text: qsTr("Cancel") - onClicked: renameDialog.reject() + onClicked: contextMenuRequested() } } } } - RegularExpressionValidator { - id: newNameValidator - regularExpression: /^\w+$/ - } - states: [ State { name: "default" diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionListView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionListView.qml index ef06a2e7a04..2b95abfc4f4 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionListView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionListView.qml @@ -2,6 +2,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import HelperWidgets 2.0 as HelperWidgets +import StudioControls 1.0 as StudioControls +import StudioTheme as StudioTheme import CollectionEditorBackend ListView { @@ -10,8 +15,201 @@ ListView { model: CollectionEditorBackend.model clip: true + function closeDialogs() { + currentCollection.dereference() + collectionMenu.close() + deleteDialog.reject() + renameDialog.reject() + } + delegate: CollectionItem { implicitWidth: root.width onDeleteItem: root.model.removeRow(index) + onContextMenuRequested: collectionMenu.openMenu(this) + } + + QtObject { + id: currentCollection + + property CollectionItem item + readonly property string name: item ? item.name : "" + readonly property bool selected: item ? item.isSelected : false + readonly property int index: item ? item.id : -1 + + function rename(newName) { + if (item) + item.rename(newName) + } + + function deleteItem() { + if (item) + item.deleteItem() + } + + function dereference() { + item = null + } + } + + StudioControls.Menu { + id: collectionMenu + + closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside + + function openMenu(item) { + currentCollection.item = item + popup() + } + + StudioControls.MenuItem { + text: qsTr("Delete") + shortcut: StandardKey.Delete + onTriggered: deleteDialog.open() + } + + StudioControls.MenuItem { + text: qsTr("Rename") + shortcut: StandardKey.Replace + onTriggered: renameDialog.open() + } + + StudioControls.MenuItem { + text: qsTr("Assign to the selected node") + enabled: CollectionEditorBackend.rootView.targetNodeSelected + onTriggered: rootView.assignCollectionToSelectedNode(currentCollection.name) + } + } + + StudioControls.Dialog { + id: deleteDialog + + title: qsTr("Deleting the model") + clip: true + + onAccepted: currentCollection.deleteItem() + + contentItem: ColumnLayout { + id: deleteDialogContent // Keep the id here even if it's not used, because the dialog might lose implicitSize + + width: 300 + spacing: 2 + + Text { + Layout.fillWidth: true + + wrapMode: Text.WordWrap + color: StudioTheme.Values.themeTextColor + text: qsTr("Are you sure that you want to delete model \"%1\"?" + + "\nThe model will be deleted permanently.").arg(currentCollection.name) + + } + + Spacer {} + + RowLayout { + spacing: StudioTheme.Values.sectionRowSpacing + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + Layout.fillWidth: true + Layout.preferredHeight: 40 + + HelperWidgets.Button { + text: qsTr("Delete") + onClicked: deleteDialog.accept() + } + + HelperWidgets.Button { + text: qsTr("Cancel") + onClicked: deleteDialog.reject() + } + } + } + } + + StudioControls.Dialog { + id: renameDialog + + title: qsTr("Rename model") + + onAccepted: { + if (newNameField.text !== "") + currentCollection.rename(newNameField.text) + } + + onOpened: { + newNameField.text = currentCollection.name + } + + contentItem: ColumnLayout { + spacing: 2 + + Text { + text: qsTr("Previous name: " + currentCollection.name) + color: StudioTheme.Values.themeTextColor + } + + Spacer {} + + Text { + Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter + text: qsTr("New name:") + color: StudioTheme.Values.themeTextColor + } + + StudioControls.TextField { + id: newNameField + + Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter + Layout.fillWidth: true + + actionIndicator.visible: false + translationIndicator.visible: false + validator: newNameValidator + + Keys.onEnterPressed: renameDialog.accept() + Keys.onReturnPressed: renameDialog.accept() + Keys.onEscapePressed: renameDialog.reject() + + onTextChanged: { + btnRename.enabled = newNameField.text !== "" + } + } + + Spacer {} + + RowLayout { + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + spacing: StudioTheme.Values.sectionRowSpacing + + HelperWidgets.Button { + id: btnRename + + text: qsTr("Rename") + onClicked: renameDialog.accept() + } + + HelperWidgets.Button { + text: qsTr("Cancel") + onClicked: renameDialog.reject() + } + } + } + } + + Connections { + target: root.model + + function onModelReset() { + root.closeDialogs() + } + } + + RegularExpressionValidator { + id: newNameValidator + regularExpression: /^\w+$/ + } + + component Spacer: Item { + implicitWidth: 1 + implicitHeight: StudioTheme.Values.columnGap } } diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml index acf82fe4527..9d483037ac8 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml @@ -28,6 +28,12 @@ Item { print("TODO: deleteSelectedCollection") } + function closeDialogs() { + importDialog.reject() + newCollection.reject() + warningDialog.reject() + } + ImportDialog { id: importDialog @@ -147,6 +153,8 @@ Item { } CollectionListView { // Model Groups + id: collectionListView + Layout.fillWidth: true Layout.minimumHeight: bottomSpacer.isExpanded ? 150 : 0 Layout.fillHeight: !bottomSpacer.isExpanded @@ -187,4 +195,12 @@ Item { SplitView.fillWidth: true } } + + Connections { + target: root.model + + function onModelReset() { + root.closeDialogs() + } + } } -- cgit v1.2.3 From aa64a62e2f28b466de9a8fff2fa02bb8fe3bb2b5 Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Mon, 25 Mar 2024 17:26:01 +0200 Subject: QmlDesigner: Prevent rounding real numbers in Model Editor Fixes: QDS-12021 Change-Id: I28215cc7a6ae9c388b3654799ef848a8002b0f13 Reviewed-by: Mahmoud Badri Reviewed-by: --- .../CollectionDetailsEditDelegate.qml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml index 90b3021c960..fd969382e63 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml @@ -96,6 +96,16 @@ Item { if (realField.activeFocus) realField.contentItem.focus = true } + + textFromValue: function (value, locale) { + locale.numberOptions = Locale.OmitGroupSeparator + var decimals = realField.trailingZeroes ? realField.decimals : decimalCounter(realField.realValue) + if (decimals > 0) { + var text = Number(realField.realValue).toLocaleString(locale, 'f', decimals + 1) + return text.substring(0, text.length - 1) + } + return Number(realField.realValue).toLocaleString(locale, 'f', decimals) + } } } } -- cgit v1.2.3 From 3bbe1c0452aae9cae4577a51a72f75965b6102ea Mon Sep 17 00:00:00 2001 From: Pranta Dastider Date: Mon, 25 Mar 2024 15:31:39 +0100 Subject: QmlDesigner: Update Tooltips for Qt Quick Layout components This patch update tooltips for Qt Quick Layout compoents. It also update tooltips of the relative properties. Fixes: QDS-12283 Change-Id: I6c4d76602668dc7258cce7ff4fab4b547d8f5d0f Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Reviewed-by: Thomas Hartmann Reviewed-by: Mats Honkamaa --- .../QtQuick/Layouts/ColumnLayoutSpecifics.qml | 6 +++++- .../QtQuick/Layouts/GridLayoutSpecifics.qml | 21 +++++++++++++++++---- .../QtQuick/Layouts/RowLayoutSpecifics.qml | 6 +++++- .../QtQuick/Layouts/StackLayoutSpecifics.qml | 5 ++++- 4 files changed, 31 insertions(+), 7 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/ColumnLayoutSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/ColumnLayoutSpecifics.qml index 2072f13a8e3..aeaeacbd4ec 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/ColumnLayoutSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/ColumnLayoutSpecifics.qml @@ -12,7 +12,10 @@ Section { caption: qsTr("Column Layout") SectionLayout { - PropertyLabel { text: qsTr("Column spacing") } + PropertyLabel { + text: qsTr("Column spacing") + tooltip: qsTr("Sets the space between the items in pixels in the Column Layout.") + } SecondColumnLayout { SpinBox { @@ -30,6 +33,7 @@ Section { PropertyLabel { text: qsTr("Layout direction") blockedByTemplate: !backendValues.layoutDirection.isAvailable + tooltip: qsTr("Sets the direction of the item flow in the Column Layout.") } SecondColumnLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/GridLayoutSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/GridLayoutSpecifics.qml index 8eea1435422..e6606ffe00f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/GridLayoutSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/GridLayoutSpecifics.qml @@ -12,7 +12,10 @@ Section { caption: qsTr("Grid Layout") SectionLayout { - PropertyLabel { text: qsTr("Columns & Rows") } + PropertyLabel { + text: qsTr("Columns & Rows") + tooltip: qsTr("Sets the number of columns and rows in the Grid Layout.") + } SecondColumnLayout { SpinBox { @@ -49,7 +52,10 @@ Section { ExpandingSpacer {} } - PropertyLabel { text: qsTr("Spacing") } + PropertyLabel { + text: qsTr("Spacing") + tooltip: qsTr("Sets the space between the items in pixels in the rows and columns in the Grid Layout.") + } SecondColumnLayout { SpinBox { @@ -86,7 +92,10 @@ Section { ExpandingSpacer {} } - PropertyLabel { text: qsTr("Flow") } + PropertyLabel { + text: qsTr("Flow") + tooltip: qsTr("Set the direction of dynamic items to flow in rows or columns in the Grid Layout.") + } SecondColumnLayout { ComboBox { @@ -100,7 +109,11 @@ Section { ExpandingSpacer {} } - PropertyLabel { text: qsTr("Layout direction") } + PropertyLabel { + text: qsTr("Layout direction") + tooltip: qsTr("Sets the direction of the dynamic items left to right or right to left in the Grid Layout.") + + } SecondColumnLayout { ComboBox { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml index b4a2ced1cdd..726b3783fbc 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/RowLayoutSpecifics.qml @@ -12,7 +12,10 @@ Section { caption: qsTr("Row Layout") SectionLayout { - PropertyLabel { text: qsTr("Row spacing") } + PropertyLabel { + text: qsTr("Row spacing") + tooltip: qsTr("Sets the space between the items in pixels in the Row Layout.") + } SecondColumnLayout { SpinBox { @@ -30,6 +33,7 @@ Section { PropertyLabel { text: qsTr("Layout direction") blockedByTemplate: !backendValues.layoutDirection.isAvailable + tooltip: qsTr("Sets the direction of the item flow in the Row Layout.") } SecondColumnLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml index 110a8cbf1a9..dc865bf1280 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/StackLayoutSpecifics.qml @@ -12,7 +12,10 @@ Section { caption: qsTr("Stack Layout") SectionLayout { - PropertyLabel { text: qsTr("Current index") } + PropertyLabel { + text: qsTr("Current index") + tooltip: qsTr("Sets the index of the child item currently visible in the Stack Layout.") + } SecondColumnLayout { SpinBox { -- cgit v1.2.3 From 0150302bbbddb6414b1656acdd4e47eb56a16dfb Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 27 Mar 2024 16:10:04 +0100 Subject: QmlDesigner: Add Qt 6.7 to all wizards and make it the default Change-Id: I67a1870486c4f87e86e135af7619843a36e591a6 Reviewed-by: Tim Jenssen Reviewed-by: Tanja Remes Reviewed-by: Qt CI Patch Build Bot --- .../projects/application-extended-3d/wizard.json | 10 +++++++++- .../studio_templates/projects/application/wizard.json | 9 ++++++++- .../studio_templates/projects/mobile-scroll/wizard.json | 9 ++++++++- .../studio_templates/projects/mobile-stack/wizard.json | 9 ++++++++- .../studio_templates/projects/mobile-swipe/wizard.json | 9 ++++++++- 5 files changed, 41 insertions(+), 5 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json index 101d5c69032..7a0333e1f1e 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json @@ -236,7 +236,7 @@ "type": "ComboBox", "data": { - "index": 3, + "index": 5, "items": [ { @@ -278,6 +278,14 @@ 'TargetQuickVersion': '6.6', 'TargetQuick3DVersion': '6.6' })" + }, + { + "trKey": "Qt 6.7", + "value": + "({ + 'TargetQuickVersion': '6.7', + 'TargetQuick3DVersion': '6.7' + })" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json index c8b74dec498..613770b646c 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json @@ -236,7 +236,7 @@ "type": "ComboBox", "data": { - "index": 4, + "index": 6, "items": [ { @@ -280,6 +280,13 @@ "({ 'TargetQuickVersion': '6.6' })" + }, + { + "trKey": "Qt 6.7", + "value": + "({ + 'TargetQuickVersion': '6.7' + })" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json index d521cc201e8..7ad8d1d9d43 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json @@ -193,7 +193,7 @@ "type": "ComboBox", "data": { - "index": 4, + "index": 6, "items": [ { @@ -237,6 +237,13 @@ "({ 'TargetQuickVersion': '6.6' })" + }, + { + "trKey": "Qt 6.7", + "value": + "({ + 'TargetQuickVersion': '6.7' + })" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json index 17cd30d507f..0a3aaf26b6e 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json @@ -191,7 +191,7 @@ "type": "ComboBox", "data": { - "index": 4, + "index": 6, "items": [ { @@ -235,6 +235,13 @@ "({ 'TargetQuickVersion': '6.6' })" + }, + { + "trKey": "Qt 6.7", + "value": + "({ + 'TargetQuickVersion': '6.7' + })" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json index 37710ae91dd..58c4783f097 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json @@ -191,7 +191,7 @@ "type": "ComboBox", "data": { - "index": 4, + "index": 6, "items": [ { @@ -235,6 +235,13 @@ "({ 'TargetQuickVersion': '6.6' })" + }, + { + "trKey": "Qt 6.7", + "value": + "({ + 'TargetQuickVersion': '6.7' + })" } ] } -- cgit v1.2.3 From c04eb4444d3e7990ed41896c0937d32b4e24c9fa Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Wed, 27 Mar 2024 19:02:50 +0200 Subject: QmlDesigner: Use ExamplesModelV2 V2 adds minQDSVersion property for model items Change-Id: I27d36428f73b27b1d52d429e23654d094d6ff86d Reviewed-by: Reviewed-by: Thomas Hartmann Reviewed-by: Qt CI Patch Build Bot --- share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml b/share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml index 73b023bddc0..555596223b9 100644 --- a/share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml +++ b/share/qtcreator/qmldesigner/welcomepage/MainGridStack.qml @@ -88,7 +88,17 @@ Item { Layout.fillWidth: true Layout.fillHeight: true hover: hoverHandler.hovered - model: ExamplesModel { id: examplesModel} + + Component.onCompleted: { + // remove items with old versions from the examples model + for (let i = examplesModel.count - 1; i >= 0; --i) { + if (!projectModel.exampleVersionOk(examplesModel.get(i).minQDSVersion)) + examplesModel.remove(i) + } + } + + model: ExamplesModelV2 { id: examplesModel } + delegate: ThumbnailDelegate { type: ThumbnailDelegate.Type.Example downloadable: showDownload -- cgit v1.2.3 From fd93290fbdf0064ccaf88a43e6a57d4a5d0150ad Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Mar 2024 10:03:42 +0100 Subject: QmlDesigner: Update branch of the components to qds-4.5. Change-Id: I13e763c8a0941ee9af3f63c657dbccd71fb8f010 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Thomas Hartmann --- .../qmldesigner/studio_templates/projects/common/qmlcomponents.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl index 2e940be0329..a9f20243a69 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl @@ -8,7 +8,7 @@ set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml") include(FetchContent) FetchContent_Declare( ds - GIT_TAG qds-4.4 + GIT_TAG qds-4.5 GIT_REPOSITORY https://code.qt.io/qt-labs/qtquickdesigner-components.git ) -- cgit v1.2.3 From beb9fc2fde620f43e1f4df4493f239f5301b5e45 Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Wed, 27 Mar 2024 14:28:18 +0200 Subject: QmlDesigner: Prevent data scramble after sorting Task-number: QDS-12160 Change-Id: I3a90583a097b3074d9502668e4b3670fa81f34a2 Reviewed-by: Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri Reviewed-by: Ali Kianian --- .../collectionEditorQmlSource/CollectionDetailsView.qml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml index 6420f197bd9..3bb48ef3a6a 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml @@ -155,12 +155,18 @@ Rectangle { StudioControls.MenuItem { text: qsTr("Sort Ascending") - onTriggered: sortedModel.sort(headerMenu.clickedHeaderIndex, Qt.AscendingOrder) + onTriggered: { + tableView.closeEditor() + tableView.model.sort(headerMenu.clickedHeaderIndex, Qt.AscendingOrder) + } } StudioControls.MenuItem { text: qsTr("Sort Descending") - onTriggered: sortedModel.sort(headerMenu.clickedHeaderIndex, Qt.DescendingOrder) + onTriggered: { + tableView.closeEditor() + tableView.model.sort(headerMenu.clickedHeaderIndex, Qt.DescendingOrder) + } } } } @@ -192,7 +198,7 @@ Rectangle { TableView { id: tableView - model: root.model + model: root.sortedModel clip: true readonly property real maxAvailableHeight: gridLayout.maxAvailableHeight -- cgit v1.2.3 From a60ae6a32c07dba52bd0ffb406d8a258ccc8f6ea Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Fri, 29 Mar 2024 06:08:20 +0200 Subject: QmlDesigner: Add "Unsaved Changes" indicator to Save button Task-number: QDS-12237 Change-Id: Ib210ca06e061e82824ff4398604a569af44c2f6d Reviewed-by: Ali Kianian Reviewed-by: Mahmoud Badri Reviewed-by: Qt CI Patch Build Bot --- .../CollectionDetailsToolbar.qml | 23 ++++++++++++++++++++-- .../imports/StudioTheme/Values.qml | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml index 876e8456371..852341b9d5d 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml @@ -17,6 +17,7 @@ Rectangle { required property var model required property var backend property int selectedRow: -1 + property bool hasUnsavedChanges: false implicitHeight: StudioTheme.Values.toolbarHeight color: StudioTheme.Values.themeToolbarBackground @@ -34,6 +35,14 @@ Rectangle { fileDialog.reject() } + Connections { + target: root.model + + function onDataChanged() { + hasUnsavedChanges = true + } + } + RowLayout { id: container @@ -122,8 +131,18 @@ Rectangle { buttonIcon: StudioTheme.Constants.save_medium tooltip: qsTr("Save changes") - enabled: root.model.collectionName !== "" - onClicked: root.model.saveDataStoreCollections() + enabled: root.model.collectionName !== "" && root.hasUnsavedChanges + onClicked: hasUnsavedChanges = !root.model.saveDataStoreCollections() + + Rectangle { + width: StudioTheme.Values.smallStatusIndicatorDiameter + height: StudioTheme.Values.smallStatusIndicatorDiameter + radius: StudioTheme.Values.smallStatusIndicatorDiameter / 2 + anchors.right: parent.right + anchors.top: parent.top + visible: hasUnsavedChanges + color: StudioTheme.Values.themeIconColorSelected + } } IconButton { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 59030cd1264..1a04c8ebc30 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -251,6 +251,7 @@ QtObject { property real collectionTableVerticalMargin: 10 property real collectionCellMinimumWidth: 60 property real collectionCellMinimumHeight: 20 + property real smallStatusIndicatorDiameter: 6 // NEW NEW NEW readonly property int flowMargin: 7 -- cgit v1.2.3 From 1376139ec61fd86ba41f4056bf409350b95bea3d Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Tue, 2 Apr 2024 13:13:53 +0300 Subject: EffectComposer: Check if effect name is duplicate before saving Task-number: QDS-12280 Change-Id: I42532ef8330ae518073a559edf7a41de834d98c9 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../qmldesigner/effectComposerQmlSources/SaveAsDialog.qml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml index d139ba92055..65b01be4573 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml @@ -50,11 +50,13 @@ StudioControls.Dialog { if (/[^A-Za-z0-9_]+/.test(text)) errMsg = qsTr("Name contains invalid characters.") else if (!/^[A-Z]/.test(text)) - errMsg = qsTr("Name must start with a capital letter") + errMsg = qsTr("Name must start with a capital letter.") else if (text.length < 3) - errMsg = qsTr("Name must have at least 3 characters") + errMsg = qsTr("Name must have at least 3 characters.") else if (/\s/.test(text)) - errMsg = qsTr("Name cannot contain white space") + errMsg = qsTr("Name cannot contain white space.") + else if (EffectComposerBackend.effectComposerModel.nameExists(text)) + errMsg = qsTr("Name is already taken.") emptyText.text = errMsg btnSave.enabled = errMsg.length === 0 -- cgit v1.2.3 From 22a5e4948ba9468fd0ff2ded5017634a271ec650 Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Thu, 4 Apr 2024 10:12:10 +0300 Subject: QmlDesigner: Deselect the model by editing a cell or clicking out Fixes: QDS-11760 Change-Id: I6a63b2f9589c69859beff79ad04502974c5d18af Reviewed-by: Shrief Gabr Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../collectionEditorQmlSource/CollectionDetailsView.qml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml index 3bb48ef3a6a..e3f1a589595 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml @@ -26,6 +26,11 @@ Rectangle { toolbar.closeDialogs() } + MouseArea { + anchors.fill: parent + onClicked: tableView.model.deselectAll() + } + Column { id: topRow readonly property real maxAvailableHeight: root.height @@ -100,7 +105,8 @@ Rectangle { id: topHeaderMouseArea anchors.fill: parent - anchors.margins: 5 + anchors.leftMargin: StudioTheme.Values.borderHover + anchors.rightMargin: StudioTheme.Values.borderHover acceptedButtons: Qt.LeftButton | Qt.RightButton hoverEnabled: true onClicked: (mouse) => { @@ -188,7 +194,8 @@ Rectangle { MouseArea { anchors.fill: parent - anchors.margins: 5 + anchors.topMargin: StudioTheme.Values.borderHover + anchors.bottomMargin: StudioTheme.Values.borderHover acceptedButtons: Qt.LeftButton onClicked: tableView.model.selectRow(index) } @@ -366,6 +373,7 @@ Rectangle { top: itemCell.top left: itemCell.left } + Component.onCompleted: tableView.model.deselectAll() } } -- cgit v1.2.3 From bc5628afca0c0716642cd69679d6b51acfa60316 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Thu, 21 Mar 2024 12:47:09 +0200 Subject: QmlDesigner: Add content library user materials bundle Fixes: QDS-12389 Change-Id: Icec1b06c57e0eaa4ff444e3143d3cba0803c8dd1 Reviewed-by: Miikka Heikkinen --- .../contentLibraryQmlSource/ContentLibrary.qml | 46 ++++++- .../ContentLibraryMaterial.qml | 13 +- .../ContentLibraryMaterialContextMenu.qml | 13 +- .../ContentLibraryMaterialsView.qml | 25 ++-- .../ContentLibraryTexturesView.qml | 3 - .../ContentLibraryUserView.qml | 151 +++++++++++++++++++++ .../UnimportBundleMaterialDialog.qml | 23 ++-- 7 files changed, 230 insertions(+), 44 deletions(-) create mode 100644 share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml index c6db8425ff2..2c98b58adc7 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml @@ -23,6 +23,7 @@ Item { texturesView.closeContextMenu() environmentsView.closeContextMenu() effectsView.closeContextMenu() + userView.closeContextMenu() HelperWidgets.Controller.closeContextMenu() } @@ -113,10 +114,18 @@ Item { id: tabBar width: parent.width height: StudioTheme.Values.toolbarHeight - tabsModel: [{name: qsTr("Materials"), icon: StudioTheme.Constants.material_medium}, - {name: qsTr("Textures"), icon: StudioTheme.Constants.textures_medium}, - {name: qsTr("Environments"), icon: StudioTheme.Constants.languageList_medium}, - {name: qsTr("Effects"), icon: StudioTheme.Constants.effects}] + + Component.onCompleted: { + var tabs = [ + { name: qsTr("Materials"), icon: StudioTheme.Constants.material_medium }, + { name: qsTr("Textures"), icon: StudioTheme.Constants.textures_medium }, + { name: qsTr("Environments"), icon: StudioTheme.Constants.languageList_medium }, + { name: qsTr("Effects"), icon: StudioTheme.Constants.effects } + ]; + if (ContentLibraryBackend.rootView.userBundleEnabled()) + tabs.push({ name: qsTr("User Assets"), icon: StudioTheme.Constants.effects }); + tabBar.tabsModel = tabs; + } } } } @@ -148,7 +157,8 @@ Item { onUnimport: (bundleMat) => { confirmUnimportDialog.targetBundleItem = bundleMat - confirmUnimportDialog.targetBundleType = "material" + confirmUnimportDialog.targetBundleLabel = "material" + confirmUnimportDialog.targetBundleModel = ContentLibraryBackend.materialsModel confirmUnimportDialog.open() } @@ -208,7 +218,31 @@ Item { onUnimport: (bundleItem) => { confirmUnimportDialog.targetBundleItem = bundleItem - confirmUnimportDialog.targetBundleType = "effect" + confirmUnimportDialog.targetBundleLabel = "effect" + confirmUnimportDialog.targetBundleModel = ContentLibraryBackend.effectsModel + confirmUnimportDialog.open() + } + + onCountChanged: root.responsiveResize(stackLayout.width, stackLayout.height) + } + + ContentLibraryUserView { + id: userView + + adsFocus: root.adsFocus + width: root.width + + cellWidth: root.thumbnailSize + cellHeight: root.thumbnailSize + 20 + numColumns: root.numColumns + hideHorizontalScrollBar: true + + searchBox: searchBox + + onUnimport: (bundleItem) => { + confirmUnimportDialog.targetBundleItem = bundleItem + confirmUnimportDialog.targetBundleLabel = "material" + confirmUnimportDialog.targetBundleModel = ContentLibraryBackend.userModel confirmUnimportDialog.open() } diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml index 93b226d6caf..0e9fc4903eb 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml @@ -12,12 +12,15 @@ import WebFetcher Item { id: root - signal showContextMenu() - // Download states: "" (ie default, not downloaded), "unavailable", "downloading", "downloaded", // "failed" property string downloadState: modelData.isDownloaded() ? "downloaded" : "" + property bool importerRunning: false + + signal showContextMenu() + signal addToProject() + visible: modelData.bundleMaterialVisible MouseArea { @@ -29,7 +32,7 @@ Item { acceptedButtons: Qt.LeftButton | Qt.RightButton onPressed: (mouse) => { - if (mouse.button === Qt.LeftButton && !materialsModel.importerRunning) { + if (mouse.button === Qt.LeftButton && !root.importerRunning) { if (root.downloadState === "downloaded") ContentLibraryBackend.rootView.startDragMaterial(modelData, mapToGlobal(mouse.x, mouse.y)) } else if (mouse.button === Qt.RightButton && root.downloadState === "downloaded") { @@ -96,12 +99,12 @@ Item { pressColor: Qt.hsla(c.hslHue, c.hslSaturation, c.hslLightness, .4) anchors.right: img.right anchors.bottom: img.bottom - enabled: !ContentLibraryBackend.materialsModel.importerRunning + enabled: !root.importerRunning visible: root.downloadState === "downloaded" && (containsMouse || mouseArea.containsMouse) onClicked: { - ContentLibraryBackend.materialsModel.addToProject(modelData) + root.addToProject() } } diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialContextMenu.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialContextMenu.qml index ca3a05bdd12..b67ec311ef0 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialContextMenu.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialContextMenu.qml @@ -15,8 +15,9 @@ StudioControls.Menu { readonly property bool targetAvailable: targetMaterial && !importerRunning - signal unimport(var bundleMat); - signal addToProject(var bundleMat) + signal unimport(); + signal addToProject() + signal applyToSelected(bool add) function popupMenu(targetMaterial = null) { @@ -29,13 +30,13 @@ StudioControls.Menu { StudioControls.MenuItem { text: qsTr("Apply to selected (replace)") enabled: root.targetAvailable && root.hasModelSelection - onTriggered: materialsModel.applyToSelected(root.targetMaterial, false) + onTriggered: root.applyToSelected(false) } StudioControls.MenuItem { text: qsTr("Apply to selected (add)") enabled: root.targetAvailable && root.hasModelSelection - onTriggered: materialsModel.applyToSelected(root.targetMaterial, true) + onTriggered: root.applyToSelected(true) } StudioControls.MenuSeparator {} @@ -45,7 +46,7 @@ StudioControls.Menu { text: qsTr("Add an instance to project") onTriggered: { - root.addToProject(root.targetMaterial) + root.addToProject() } } @@ -53,6 +54,6 @@ StudioControls.Menu { enabled: root.targetAvailable && root.targetMaterial.bundleMaterialImported text: qsTr("Remove from project") - onTriggered: root.unimport(root.targetMaterial) + onTriggered: root.unimport() } } diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml index c21baf4c580..9a0e33b8e5e 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterialsView.qml @@ -27,8 +27,6 @@ HelperWidgets.ScrollView { root.count = c } - property var currMaterialItem: null - property var rootItem: null property var materialsModel: ContentLibraryBackend.materialsModel required property var searchBox @@ -51,17 +49,19 @@ HelperWidgets.ScrollView { ContentLibraryMaterialContextMenu { id: ctxMenu - hasModelSelection: materialsModel.hasModelSelection - importerRunning: materialsModel.importerRunning + hasModelSelection: root.materialsModel.hasModelSelection + importerRunning: root.materialsModel.importerRunning - onUnimport: (bundleMat) => root.unimport(bundleMat) - onAddToProject: (bundleMat) => materialsModel.addToProject(bundleMat) + onApplyToSelected: (add) => root.materialsModel.applyToSelected(ctxMenu.targetMaterial, add) + + onUnimport: root.unimport(ctxMenu.targetMaterial) + onAddToProject: root.materialsModel.addToProject(ctxMenu.targetMaterial) } Repeater { id: categoryRepeater - model: materialsModel + model: root.materialsModel delegate: HelperWidgets.Section { id: section @@ -73,7 +73,7 @@ HelperWidgets.ScrollView { bottomPadding: StudioTheme.Values.sectionPadding caption: bundleCategoryName - visible: bundleCategoryVisible && !materialsModel.isEmpty + visible: bundleCategoryVisible && !root.materialsModel.isEmpty expanded: bundleCategoryExpanded expandOnClick: false category: "ContentLib_Mat" @@ -103,7 +103,10 @@ HelperWidgets.ScrollView { width: root.cellWidth height: root.cellHeight + importerRunning: root.materialsModel.importerRunning + onShowContextMenu: ctxMenu.popupMenu(modelData) + onAddToProject: root.materialsModel.addToProject(modelData) } onCountChanged: root.assignMaxCount() @@ -115,13 +118,13 @@ HelperWidgets.ScrollView { Text { id: infoText text: { - if (!materialsModel.matBundleExists) + if (!root.materialsModel.matBundleExists) qsTr("No materials available. Make sure you have internet connection.") else if (!ContentLibraryBackend.rootView.isQt6Project) qsTr("Content Library materials are not supported in Qt5 projects.") else if (!ContentLibraryBackend.rootView.hasQuick3DImport) qsTr("To use Content Library, first add the QtQuick3D module in the Components view.") - else if (!materialsModel.hasRequiredQuick3DImport) + else if (!root.materialsModel.hasRequiredQuick3DImport) qsTr("To use Content Library, version 6.3 or later of the QtQuick3D module is required.") else if (!ContentLibraryBackend.rootView.hasMaterialLibrary) qsTr("Content Library is disabled inside a non-visual component.") @@ -134,7 +137,7 @@ HelperWidgets.ScrollView { font.pixelSize: StudioTheme.Values.baseFontSize topPadding: 10 leftPadding: 10 - visible: materialsModel.isEmpty + visible: root.materialsModel.isEmpty } } } diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml index 1fac9f2234e..617b724e664 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexturesView.qml @@ -27,9 +27,6 @@ HelperWidgets.ScrollView { root.count = c } - property var currMaterialItem: null - property var rootItem: null - required property var searchBox required property var model required property string sectionCategory diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml new file mode 100644 index 00000000000..d3d1dbad92d --- /dev/null +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml @@ -0,0 +1,151 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +import QtQuick +import HelperWidgets as HelperWidgets +import StudioControls as StudioControls +import StudioTheme as StudioTheme +import ContentLibraryBackend + +HelperWidgets.ScrollView { + id: root + + clip: true + interactive: !ctxMenu.opened && !ContentLibraryBackend.rootView.isDragging + && !HelperWidgets.Controller.contextMenuOpened + + property real cellWidth: 100 + property real cellHeight: 120 + property int numColumns: 4 + + property int count: 0 + function assignMaxCount() { + let c = 0 + for (let i = 0; i < categoryRepeater.count; ++i) + c = Math.max(c, categoryRepeater.itemAt(i)?.count ?? 0) + + root.count = c + } + + required property var searchBox + + signal unimport(var bundleItem); + + function closeContextMenu() { + ctxMenu.close() + } + + function expandVisibleSections() { + for (let i = 0; i < categoryRepeater.count; ++i) { + let cat = categoryRepeater.itemAt(i) + if (cat.visible && !cat.expanded) + cat.expandSection() + } + } + + Column { + ContentLibraryMaterialContextMenu { + id: ctxMenu + + hasModelSelection: ContentLibraryBackend.userModel.hasModelSelection + importerRunning: ContentLibraryBackend.userModel.importerRunning + + onApplyToSelected: (add) => ContentLibraryBackend.userModel.applyToSelected(ctxMenu.targetMaterial, add) + + onUnimport: root.unimport(ctxMenu.targetMaterial) + onAddToProject: ContentLibraryBackend.userModel.addToProject(ctxMenu.targetMaterial) + } + + Repeater { + id: categoryRepeater + + model: ContentLibraryBackend.userModel + + delegate: HelperWidgets.Section { + id: section + + width: root.width + leftPadding: StudioTheme.Values.sectionPadding + rightPadding: StudioTheme.Values.sectionPadding + topPadding: StudioTheme.Values.sectionPadding + bottomPadding: StudioTheme.Values.sectionPadding + + caption: categoryName + visible: categoryVisible + expanded: categoryExpanded + expandOnClick: false + category: "ContentLib_User" + + onToggleExpand: categoryExpanded = !categoryExpanded + onExpand: categoryExpanded = true + onCollapse: categoryExpanded = false + + function expandSection() { + categoryExpanded = true + } + + property alias count: repeater.count + + onCountChanged: root.assignMaxCount() + + property int numVisibleItem: 1 // initially, the tab is invisible so this will be 0 + + Grid { + width: section.width - section.leftPadding - section.rightPadding + spacing: StudioTheme.Values.sectionGridSpacing + columns: root.numColumns + + Repeater { + id: repeater + model: categoryItems + + delegate: ContentLibraryMaterial { + width: root.cellWidth + height: root.cellHeight + + importerRunning: ContentLibraryBackend.userModel.importerRunning + + onShowContextMenu: ctxMenu.popupMenu(modelData) + onAddToProject: ContentLibraryBackend.userModel.addToProject(modelData) + + onVisibleChanged: { + section.numVisibleItem += visible ? 1 : -1 + } + } + + onCountChanged: root.assignMaxCount() + } + } + + Text { + text: qsTr("No match found."); + color: StudioTheme.Values.themeTextColor + font.pixelSize: StudioTheme.Values.baseFontSize + leftPadding: 10 + visible: !searchBox.isEmpty() && section.numVisibleItem === 0 + } + } + } + + Text { + id: infoText + text: { + if (!ContentLibraryBackend.effectsModel.bundleExists) + qsTr("User bundle couldn't be found.") + else if (!ContentLibraryBackend.rootView.isQt6Project) + qsTr("Content Library is not supported in Qt5 projects.") + else if (!ContentLibraryBackend.rootView.hasQuick3DImport) + qsTr("To use Content Library, first add the QtQuick3D module in the Components view.") + else if (!ContentLibraryBackend.rootView.hasMaterialLibrary) + qsTr("Content Library is disabled inside a non-visual component.") + else + "" + } + color: StudioTheme.Values.themeTextColor + font.pixelSize: StudioTheme.Values.baseFontSize + topPadding: 10 + leftPadding: 10 + visible: ContentLibraryBackend.effectsModel.isEmpty + } + } +} diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml index 48be045d8bd..4385e3bf82e 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml @@ -12,24 +12,27 @@ import ContentLibraryBackend StudioControls.Dialog { id: root - title: qsTr("Bundle material might be in use") + property var targetBundleItem + property var targetBundleLabel // "effect" or "material" + property var targetBundleModel + + title: qsTr("Bundle %1 might be in use").arg(root.targetBundleLabel) anchors.centerIn: parent closePolicy: Popup.CloseOnEscape implicitWidth: 300 modal: true - property var targetBundleType // "effect" or "material" - property var targetBundleItem + onOpened: warningText.forceActiveFocus() contentItem: Column { spacing: 20 width: parent.width Text { - id: folderNotEmpty + id: warningText - text: qsTr("If the %1 you are removing is in use, it might cause the project to malfunction.\n\nAre you sure you want to remove the %1?") - .arg(root.targetBundleType) + text: qsTr("If the %1 you are removing is in use, it might cause the project to malfunction.\n\nAre you sure you want to remove it?") + .arg(root.targetBundleLabel) color: StudioTheme.Values.themeTextColor wrapMode: Text.WordWrap anchors.right: parent.right @@ -49,11 +52,7 @@ StudioControls.Dialog { text: qsTr("Remove") onClicked: { - if (root.targetBundleType === "material") - ContentLibraryBackend.materialsModel.removeFromProject(root.targetBundleItem) - else if (root.targetBundleType === "effect") - ContentLibraryBackend.effectsModel.removeFromProject(root.targetBundleItem) - + root.targetBundleModel.removeFromProject(root.targetBundleItem) root.accept() } } @@ -64,6 +63,4 @@ StudioControls.Dialog { } } } - - onOpened: folderNotEmpty.forceActiveFocus() } -- cgit v1.2.3 From 3494f37b18be3ccb04db38c2c9c2ead6ec3da17e Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Mon, 8 Apr 2024 10:48:18 +0300 Subject: QmlDesigner: Set the color data by the first commit in Model Editor The color didn't use to be saved by the first commit. The problem was that the ColorEditorPopup uses a backendValue, which usually is provided by the property editor items. Here this backendValue is faked, to be used by the internal modules. Fixes: QDS-12018 Change-Id: I77bd0e2992f31f2fa4da7b1d7a5f0667f6923085 Reviewed-by: Mahmoud Badri Reviewed-by: Shrief Gabr Reviewed-by: Qt CI Patch Build Bot --- .../ColorViewDelegate.qml | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml index 6bb1b60159a..16e55acfb43 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml @@ -16,19 +16,33 @@ Row { property color color property bool supportGradient: false - readonly property color __editColor: edit + + property QtObject backendValue: QtObject { + property color value: edit + readonly property color editColor: edit + + function resetValue() { + if (value) + value = "" + } + + onValueChanged: { + if (editColor !== value) + edit = value + } + } property variant value: { - if (!edit) + if (!colorEditor.backendValue || !colorEditor.backendValue.value) return "white" // default color for Rectangle if (colorEditor.isVector3D) { - return Qt.rgba(__editColor.x, - __editColor.y, - __editColor.z, 1) + return Qt.rgba(colorEditor.backendValue.value.x, + colorEditor.backendValue.value.y, + colorEditor.backendValue.value.z, 1) } - return __editColor + return colorEditor.backendValue.value } property alias gradientPropertyName: popupDialog.gradientPropertyName @@ -42,31 +56,17 @@ Row { property bool __block: false - function getColorFromEditValue() { - if (!edit) - return "white" // default color for Rectangle - - if (colorEditor.isVector3D) { - return Qt.rgba(__editColor.x, - __editColor.y, - __editColor.z, 1) - } - - return __editColor - } - function resetShapeColor() { - if (edit) - edit = "" + colorEditor.backendValue.resetValue() } function writeColor() { if (colorEditor.isVector3D) { - edit = Qt.vector3d(colorEditor.color.r, + colorEditor.backendValue.value = Qt.vector3d(colorEditor.color.r, colorEditor.color.g, colorEditor.color.b) } else { - edit = colorEditor.color + colorEditor.backendValue.value = colorEditor.color } } @@ -77,7 +77,7 @@ Row { // Syncing color from backend to frontend and block reflection function syncColor() { colorEditor.__block = true - colorEditor.color = colorEditor.getColorFromEditValue() + colorEditor.color = colorEditor.value hexTextField.syncColor() colorEditor.__block = false } @@ -92,7 +92,7 @@ Row { colorEditor.syncColor() } - function on__EditColorChanged() { + function onBackendValueChanged() { if (popupDialog.isSolid()) colorEditor.syncColor() } @@ -208,7 +208,7 @@ Row { if (colorEditor.supportGradient && popupDialog.loaderItem.gradientModel.hasGradient) { var hexColor = convertColorToString(colorEditor.color) hexTextField.text = hexColor - edit = hexColor + colorEditor.backendValue.value = hexColor popupDialog.loaderItem.commitGradientColor() } } @@ -292,5 +292,5 @@ Row { Component.onCompleted: popupDialog.determineActiveColorMode() - on__EditColorChanged: popupDialog.determineActiveColorMode() + onBackendValueChanged: popupDialog.determineActiveColorMode() } -- cgit v1.2.3 From db04da3ba7ec8ae0549acf77f256aa272de4d1ce Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 28 Mar 2024 10:58:29 +0100 Subject: QmlDesigner: Remove Qt 6.2/6.3/6.4 from extended 3d wizard Change-Id: Ic79d7ccf4183aafd30953dc65ad1bae4661c8f11 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Miikka Heikkinen Reviewed-by: --- .../projects/application-extended-3d/wizard.json | 26 +--------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json index 7a0333e1f1e..e32ecb8a0bd 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json @@ -236,33 +236,9 @@ "type": "ComboBox", "data": { - "index": 5, + "index": 2, "items": [ - { - "trKey": "Qt 6.2", - "value": - "({ - 'TargetQuickVersion': '6.2', - 'TargetQuick3DVersion': '6.2' - })" - }, - { - "trKey": "Qt 6.3", - "value": - "({ - 'TargetQuickVersion': '6.3', - 'TargetQuick3DVersion': '6.3' - })" - }, - { - "trKey": "Qt 6.4", - "value": - "({ - 'TargetQuickVersion': '6.4', - 'TargetQuick3DVersion': '6.4' - })" - }, { "trKey": "Qt 6.5", "value": -- cgit v1.2.3 From 5a13304d728d48aa601f379b6048cfbfc8f6d565 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Thu, 21 Mar 2024 12:47:09 +0200 Subject: QmlDesigner: Save a project material to content library Fixes: QDS-12392 Change-Id: Ic84197bb1bcede6d3b06d1cff09f00617cc2a958 Reviewed-by: Miikka Heikkinen --- .../materialBrowserQmlSource/MaterialBrowserContextMenu.qml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml index f72d21b35b6..b01aa7d2a3c 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserContextMenu.qml @@ -127,4 +127,13 @@ StudioControls.Menu { onTriggered: materialBrowserModel.addNewMaterial() } + + Component.onCompleted: { + if (MaterialBrowserBackend.rootView.userBundleEnabled()) { + var menuItem = Qt.createQmlObject("import StudioControls as StudioControls; StudioControls.MenuItem {}", root) + menuItem.text = qsTr("Add to Content Library") + menuItem.onTriggered.connect(MaterialBrowserBackend.rootView.addMaterialToContentLibrary) + root.addItem(menuItem) + } + } } -- cgit v1.2.3 From eae76dedffc5be389f4cda09bee57eb74a789ed8 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 9 Apr 2024 15:27:42 +0300 Subject: QmlDesigner: Change asset import path The only import path should be project root, so change things that are generated under asset_imports to be generated in new folder GeneratedComponents under project root. GeneratedComponents is prefixed to the type names of generated items as well. If project already contains asset_imports folder, then old location is used. Fixes: QDS-12430 Change-Id: I7a419fe1c5411e3d39bf3c1e659df0043c60ba33 Reviewed-by: Mahmoud Badri Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Thomas Hartmann --- .../propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml index c73e736ef42..0e42515c76c 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml @@ -448,9 +448,10 @@ Row { for (var j = 0; j < myModel.length; ++j) { let item = myModel[j] if (root.hideDuplicates && nameMap.has(item.fileName)) { - // Prefer hiding imported asset files rather than other project files + // Prefer hiding generated component files rather than other project files let listIndex = nameMap.get(item.fileName) - if (comboBox.listModel.get(listIndex).absoluteFilePath.includes("/asset_imports/")) { + let absPath = comboBox.listModel.get(listIndex).absoluteFilePath + if (absPath.includes("/GeneratedComponents/") || absPath.includes("/asset_imports/")) { comboBox.listModel.set(listIndex, { absoluteFilePath: item.absoluteFilePath, relativeFilePath: item.relativeFilePath, -- cgit v1.2.3 From 476ea1404b0c8075c61a0335a7471ad0bb835a7b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 4 Apr 2024 17:22:51 +0200 Subject: QmlDesigner: Add Design Effects UI * Add EffectsSection * Make HelperWidgtes.Section able to have custom content * Cleanup on IconButton and Section Change-Id: I9aff4838ed9f2df9155161f36506f1514245ce6b Reviewed-by: Thomas Hartmann --- .../QtQuick/EffectsSection.qml | 475 +++++++++++++++++++++ .../propertyEditorQmlSources/QtQuick/ItemPane.qml | 4 + .../imports/HelperWidgets/IconButton.qml | 34 +- .../imports/HelperWidgets/Section.qml | 199 +++++---- 4 files changed, 613 insertions(+), 99 deletions(-) create mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml new file mode 100644 index 00000000000..37fca814423 --- /dev/null +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml @@ -0,0 +1,475 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +import QtQuick +import QtQuick.Layouts +import HelperWidgets +import StudioTheme as StudioTheme +import StudioControls as StudioControls + +Section { + id: root + + property bool hasDesignerEffect: false + property var model + property var effectNode + property var effectNodeWrapper + + // Draggging + property Item draggedSec: null + property var secsY: [] + property int moveFromIdx: 0 + property int moveToIdx: 0 + + function invalidate() { + root.effectNode = null + root.model = null + + var effect = modelNodeBackend.allChildrenOfType("DesignEffect") + root.effectNode = effect + root.effectNodeWrapper = modelNodeBackend.registerSubSelectionWrapper(effect) + root.hasDesignerEffect = effect.length === 1 + + if (!root.hasDesignerEffect) + return + + root.model = modelNodeBackend.allChildren(effect[0]) //ids for all effects + } + + leftPadding: 0 + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr('Effects [beta]').arg(StudioTheme.Values.themeInteraction) + visible: backendValues.layer_effect.isAvailable + + property Connections connection: Connections { + target: modelNodeBackend + + function onSelectionChanged() { root.invalidate() } + function onSelectionToBeChanged() { root.model = [] } + } + + SectionLayout { + PropertyLabel {} + + SecondColumnLayout { + Spacer { implicitWidth: StudioTheme.Values.actionIndicatorWidth } + + AbstractButton { + id: effectButton + implicitWidth: StudioTheme.Values.singleControlColumnWidth + width: StudioTheme.Values.singleControlColumnWidth + buttonIcon: root.hasDesignerEffect ? qsTr("Remove Effects") : qsTr("Add Effects") + iconFont: StudioTheme.Constants.font + tooltip: qsTr("Adds a note with a title to explain the component.") + onClicked: { + if (root.hasDesignerEffect) { + root.effectNodeWrapper.deleteModelNode() + } else { + modelNodeBackend.createModelNode(-1, "data", "DesignEffect") + var effectNode = modelNodeBackend.allChildrenOfType("DesignEffect") + modelNodeBackend.createModelNode(effectNode, "effects", "DesignDropShadow") + } + root.invalidate() + } + } + } + + PropertyLabel { text: qsTr("Visibility") } + + SecondColumnLayout { + CheckBox { + text: qsTr("Visible") + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: root.effectNodeWrapper.properties.visible + } + + ExpandingSpacer {} + } + } + + Item { + width: 1 + height: StudioTheme.Values.sectionHeadSpacerHeight + } + + function handleDragMove() { + root.dragTimer.stop() + if (root.secsY.length === 0) { + for (let i = 0; i < repeater.count; ++i) + root.secsY[i] = repeater.itemAt(i).y + } + + let scrollView = Controller.mainScrollView + + let oldContentY = scrollView.contentY + if (root.draggedSec.y < scrollView.dragScrollMargin + scrollView.contentY + && scrollView.contentY > 0) { + scrollView.contentY -= scrollView.dragScrollMargin / 2 + } else if (root.draggedSec.y > scrollView.contentY + scrollView.height - scrollView.dragScrollMargin + && scrollView.contentY < scrollView.contentHeight - scrollView.height) { + scrollView.contentY += scrollView.dragScrollMargin / 2 + if (scrollView.contentY > scrollView.contentHeight - scrollView.height) + scrollView.contentY = scrollView.contentHeight - scrollView.height + } + + if (scrollView.contentY < 0) + scrollView.contentY = 0 + + if (oldContentY !== scrollView.contentY) { + // Changing dragged section position in drag handler doesn't seem to stick + // when triggered by mouse move, so do it again async + root.dragTimer.targetY = root.draggedSec.y - oldContentY + scrollView.contentY + root.dragTimer.restart() + root.dragConnection.enabled = false + root.draggedSec.y = root.dragTimer.targetY + root.dragConnection.enabled = true + } + + root.moveToIdx = root.moveFromIdx + for (let i = 0; i < repeater.count; ++i) { + let currItem = repeater.itemAt(i) + if (i > root.moveFromIdx) { + if (root.draggedSec.y > currItem.y) { + currItem.y = root.secsY[i] - root.draggedSec.height - nodesCol.spacing + root.moveToIdx = i + } else { + currItem.y = root.secsY[i] + } + } else if (i < root.moveFromIdx) { + if (root.draggedSec.y < currItem.y) { + currItem.y = root.secsY[i] + root.draggedSec.height + nodesCol.spacing + root.moveToIdx = Math.min(root.moveToIdx, i) + } else { + currItem.y = root.secsY[i] + } + } + } + } + + property Connections dragConnection: Connections { + target: root.draggedSec + + function onYChanged() { root.handleDragMove() } + } + + property Timer dragTimer: Timer { + running: false + interval: 16 + repeat: false + + property real targetY: -1 + + onTriggered: { + // Ensure we get position change triggers even if user holds mouse still to + // make scrolling smooth + root.draggedSec.y = targetY + root.handleDragMove() + } + } + + Column { + id: nodesCol + anchors.left: parent.left + anchors.right: parent.right + spacing: 1 + + Section { + sectionHeight: 37 + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr("Layer Blur") + labelCapitalization: Font.MixedCase + visible: root.hasDesignerEffect + category: "DesignEffects" + expanded: false + + SectionLayout { + + PropertyLabel { text: qsTr("Visibility") } + + SecondColumnLayout { + CheckBox { + text: qsTr("Visible") + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: root.effectNodeWrapper.properties.layerBlurVisible + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Blur") } + + SecondColumnLayout { + SpinBox { + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: root.effectNodeWrapper.properties.layerBlurRadius + } + + ExpandingSpacer {} + } + } + } + + Section { + sectionHeight: 37 + anchors.left: parent.left + anchors.right: parent.right + caption: qsTr("Background Blur") + labelCapitalization: Font.MixedCase + visible: root.hasDesignerEffect + category: "DesignEffects" + expanded: false + + SectionLayout { + + PropertyLabel { text: qsTr("Visibility") } + + SecondColumnLayout { + CheckBox { + text: qsTr("Visible") + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: root.effectNodeWrapper.properties.backgroundBlurVisible + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Blur") } + + SecondColumnLayout { + SpinBox { + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: root.effectNodeWrapper.properties.backgroundBlurRadius + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Background") } + + SecondColumnLayout { + ItemFilterComboBox { + implicitWidth: StudioTheme.Values.singleControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + width: implicitWidth + typeFilter: "QtQuick.Item" + backendValue: root.effectNodeWrapper.properties.background + } + + ExpandingSpacer {} + } + } + } + + Repeater { + id: repeater + model: root.model + + Section { + id: delegate + + property QtObject wrapper: modelNodeBackend.registerSubSelectionWrapper(modelData) + property bool wasExpanded: false + + Behavior on y { + id: dragAnimation + + PropertyAnimation { + duration: 300 + easing.type: Easing.InOutQuad + } + } + + onStartDrag: function(section) { + root.draggedSec = section + root.moveFromIdx = index + // We only need to animate non-dragged sections + dragAnimation.enabled = false + delegate.wasExpanded = delegate.expanded + delegate.expanded = false + delegate.highlightBorder = true + root.secsY = [] + } + + onStopDrag: { + if (root.secsY.length !== 0) { + if (root.moveFromIdx === root.moveToIdx) + root.draggedSec.y = root.secsY[root.moveFromIdx] + else + modelNodeBackend.moveNode(root.effectNode, "effects", root.moveFromIdx, root.moveToIdx) + } + + delegate.highlightBorder = false + root.draggedSec = null + delegate.expanded = delegate.wasExpanded + dragAnimation.enabled = true + + Qt.callLater(root.invalidate) + } + + sectionHeight: 37 + anchors.left: parent.left + anchors.right: parent.right + category: "DesignEffects" + fillBackground: true + expanded: false + + draggable: true + showCloseButton: true + + content: StudioControls.ComboBox { + id: shadowComboBox + actionIndicatorVisible: false + width: 200 + textRole: "text" + valueRole: "value" + model: [ + { value: "DesignDropShadow", text: qsTr("Drop Shadow") }, + { value: "DesignInnerShadow", text: qsTr("Inner Shadow") } + ] + anchors.verticalCenter: parent.verticalCenter + + // When an item is selected, update the backend. + onActivated: modelNodeBackend.changeType(modelData, shadowComboBox.currentValue) + // Set the initial currentIndex to the value stored in the backend. + Component.onCompleted: { + shadowComboBox.currentIndex = shadowComboBox.indexOfValue(modelNodeBackend.simplifiedTypeName(modelData)) + } + } + + onCloseButtonClicked: { + delegate.wrapper.deleteModelNode() + Qt.callLater(root.invalidate) + } + + SectionLayout { + + PropertyLabel { text: qsTr("Visibility") } + + SecondColumnLayout { + CheckBox { + text: qsTr("Visible") + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: delegate.wrapper.properties.visible + } + + ExpandingSpacer {} + } + + PropertyLabel { text: qsTr("Blur") } + + SecondColumnLayout { + SpinBox { + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: delegate.wrapper.properties.blur + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Spread") + enabled: modelNodeBackend.isInstanceOf("Rectangle") + } + + SecondColumnLayout { + SpinBox { + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: delegate.wrapper.properties.spread + enabled: modelNodeBackend.isInstanceOf("Rectangle") + } + + ExpandingSpacer {} + } + + PropertyLabel { + text: qsTr("Color") + tooltip: qsTr("Sets the color.") + } + + ColorEditor { + backendValue: delegate.wrapper.properties.color + supportGradient: false + } + + PropertyLabel { text: qsTr("Offset") } + + SecondColumnLayout { + SpinBox { + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: delegate.wrapper.properties.offsetX + maximumValue: 0xffff + minimumValue: -0xffff + } + + Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } + + ControlLabel { + text: "X" + tooltip: qsTr("X-coordinate") + } + + Spacer { implicitWidth: StudioTheme.Values.controlGap } + + SpinBox { + implicitWidth: StudioTheme.Values.twoControlColumnWidth + + StudioTheme.Values.actionIndicatorWidth + backendValue: delegate.wrapper.properties.offsetY + maximumValue: 0xffff + minimumValue: -0xffff + } + + Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } + + ControlLabel { + text: "Y" + tooltip: qsTr("Y-coordinate") + } + + ExpandingSpacer {} + } + } + } + } + } + + Item { + width: 1 + height: StudioTheme.Values.sectionHeadSpacerHeight + } + + SectionLayout { + visible: root.hasDesignerEffect + + PropertyLabel {} + + SecondColumnLayout { + Spacer { implicitWidth: StudioTheme.Values.actionIndicatorWidth } + + AbstractButton { + id: addShadowEffectButton + implicitWidth: StudioTheme.Values.singleControlColumnWidth + width: StudioTheme.Values.singleControlColumnWidth + buttonIcon: qsTr("Add Shadow Effect") + iconFont: StudioTheme.Constants.font + tooltip: qsTr("Adds a Design Drop Shadow.") + onClicked: { + modelNodeBackend.createModelNode(root.effectNode, + "effects", + "DesignDropShadow") + root.invalidate() + } + } + } + } +} diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml index 60bd415a6af..aeef8a9598e 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml @@ -133,6 +133,10 @@ PropertyEditorPane { visible: specificsOne.source.toString() !== "" } + EffectsSection { + expanded: false + } + AdvancedSection { expanded: false } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml index 008320cb92a..4534d3fe7da 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml @@ -8,9 +8,9 @@ import StudioTheme as StudioTheme Rectangle { id: root - signal clicked() - signal pressed() - signal released() + signal clicked(mouse: var) + signal pressed(mouse: var) + signal released(mouse: var) property alias icon: icon.text property alias tooltip: toolTip.text @@ -30,18 +30,17 @@ Rectangle { property color hoverColor: root.transparentBg ? "transparent" : StudioTheme.Values.themeControlBackgroundHover property color pressColor: root.transparentBg ? "transparent" : StudioTheme.Values.themeControlBackgroundInteraction - width: buttonSize - height: buttonSize + width: root.buttonSize + height: root.buttonSize - color: !enabled ? normalColor - : mouseArea.pressed ? pressColor - : mouseArea.containsMouse ? hoverColor - : normalColor + color: !root.enabled ? root.normalColor + : mouseArea.pressed ? root.pressColor + : mouseArea.containsMouse ? root.hoverColor + : root.normalColor Text { id: icon anchors.centerIn: root - color: root.enabled ? StudioTheme.Values.themeTextColor : StudioTheme.Values.themeTextColorDisabled font.family: StudioTheme.Constants.iconFont.family font.pixelSize: StudioTheme.Values.baseIconFontSize @@ -49,30 +48,29 @@ Rectangle { MouseArea { id: mouseArea - anchors.fill: parent hoverEnabled: root.visible - onClicked: { + onClicked: function(mouse) { // We need to keep mouse area enabled even when button is disabled to make tooltip work if (root.enabled) - root.clicked() + root.clicked(mouse) } - onPressed: { + onPressed: function(mouse) { if (root.enabled) - root.pressed() + root.pressed(mouse) } - onReleased: { + onReleased: function(mouse) { if (root.enabled) - root.released() + root.released(mouse) } } ToolTip { id: toolTip - visible: mouseArea.containsMouse && text !== "" + visible: mouseArea.containsMouse && toolTip.text !== "" delay: 1000 } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml index dbbb200f738..245b8506a28 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml @@ -9,11 +9,13 @@ import StudioTheme as StudioTheme Item { id: section - property alias caption: label.text - property alias labelColor: label.color + + property string caption: "Title" + property color labelColor: StudioTheme.Values.themeTextColor + property int labelCapitalization: Font.AllUppercase property alias sectionHeight: header.height property alias sectionBackgroundColor: header.color - property alias sectionFontSize: label.font.pixelSize + property int sectionFontSize: StudioTheme.Values.myFontSize property alias showTopSeparator: topSeparator.visible property alias showArrow: arrow.visible property alias showLeftBorder: leftBorder.visible @@ -26,6 +28,17 @@ Item { property alias fillBackground: sectionBackground.visible property alias highlightBorder: sectionBorder.visible + property Item content: Controls.Label { + id: label + text: section.caption + color: section.labelColor + elide: Text.ElideRight + font.pixelSize: section.sectionFontSize + font.capitalization: section.labelCapitalization + anchors.verticalCenter: parent?.verticalCenter + textFormat: Text.RichText + } + property int leftPadding: StudioTheme.Values.sectionLeftPadding property int rightPadding: 0 property int topPadding: StudioTheme.Values.sectionHeadSpacerHeight @@ -59,7 +72,7 @@ Item { Connections { target: Controller function onCollapseAll(cat) { - if (collapsible && cat === section.category) { + if (section.collapsible && cat === section.category) { if (section.expandOnClick) section.expanded = false else @@ -106,6 +119,22 @@ Item { onExited: section.dropExit() } + StudioControls.Menu { + id: contextMenu + + StudioControls.MenuItem { + text: qsTr("Expand All") + onTriggered: Controller.expandAll(section.category) + } + + StudioControls.MenuItem { + text: qsTr("Collapse All") + onTriggered: Controller.collapseAll(section.category) + } + + onOpenedChanged: Controller.contextMenuOpened = contextMenu.opened + } + Rectangle { id: header height: section.hideHeader ? 0 : StudioTheme.Values.sectionHeadHeight @@ -116,43 +145,6 @@ Item { : Qt.lighter(StudioTheme.Values.themeSectionHeadBackground, 1.0 + (0.2 * section.level)) - Item { - StudioControls.Menu { - id: contextMenu - - StudioControls.MenuItem { - text: qsTr("Expand All") - onTriggered: Controller.expandAll(section.category) - } - - StudioControls.MenuItem { - text: qsTr("Collapse All") - onTriggered: Controller.collapseAll(section.category) - } - - onOpenedChanged: Controller.contextMenuOpened = contextMenu.opened - } - } - - Image { - id: arrow - width: 8 - height: 4 - source: "image://icons/down-arrow" - anchors.left: parent.left - anchors.leftMargin: 4 + (section.level * section.levelShift) + (section.draggable ? 20 : 0) + (section.showEyeButton ? 25 : 0) - anchors.verticalCenter: parent.verticalCenter - } - - Controls.Label { - id: label - anchors.verticalCenter: parent.verticalCenter - color: StudioTheme.Values.themeTextColor - x: arrow.x + 18 - font.pixelSize: StudioTheme.Values.myFontSize - font.capitalization: Font.AllUppercase - } - MouseArea { id: mouseArea anchors.fill: parent @@ -173,58 +165,102 @@ Item { } } - IconButton { - id: closeButton + RowLayout { + spacing: 1 + anchors.fill: parent - icon: StudioTheme.Constants.closeCross - buttonSize: 22 - iconScale: containsMouse ? 1.2 : 1 - transparentBg: true - anchors.right: parent.right - anchors.rightMargin: 10 - visible: false + IconButton { + id: dragButton + visible: false + icon: StudioTheme.Constants.dragmarks + buttonSize: 21 + iconScale: dragButton.enabled && dragButton.containsMouse ? 1.2 : 1 + transparentBg: true - onClicked: root.closeButtonClicked() - } + Layout.alignment: Qt.AlignVCenter + Layout.preferredWidth: dragButton.width + Layout.maximumWidth: dragButton.width + + drag.target: dragButton.enabled ? section : null + drag.axis: Drag.YAxis + + onPressed: { + section.startDrag(section) + section.z = ++section.parent.z // put the dragged section on top + } - IconButton { - id: dragButton + onReleased: { + section.stopDrag() + } + } - icon: StudioTheme.Constants.dragmarks - buttonSize: 22 - iconScale: dragButton.enabled && dragButton.containsMouse ? 1.2 : 1 - transparentBg: true + IconButton { + id: eyeButton - visible: false - drag.target: dragButton.enabled ? section : null - drag.axis: Drag.YAxis + visible: false + icon: section.eyeEnabled ? StudioTheme.Constants.visible_small + : StudioTheme.Constants.invisible_small + buttonSize: 21 + iconScale: eyeButton.containsMouse ? 1.2 : 1 + transparentBg: true - onPressed: { - section.startDrag(section) + Layout.alignment: Qt.AlignVCenter + Layout.preferredWidth: eyeButton.width + Layout.maximumWidth: eyeButton.width - section.z = ++section.parent.z // put the dragged section on top + onClicked: { + section.eyeEnabled = !section.eyeEnabled + section.eyeButtonClicked() + } } - onReleased: { - section.stopDrag() + IconButton { + id: arrow + icon: StudioTheme.Constants.sectionToggle + transparentBg: true + + buttonSize: 21 + iconSize: StudioTheme.Values.smallIconFontSize + iconColor: StudioTheme.Values.themeTextColor + + Layout.alignment: Qt.AlignVCenter + Layout.preferredWidth: arrow.width + Layout.maximumWidth: arrow.width + + onClicked: function(mouse) { + if (!section.collapsible && section.expanded) + return + + transition.enabled = true + if (section.expandOnClick) + section.expanded = !section.expanded + else + section.toggleExpand() + } } - } - IconButton { - id: eyeButton + Item { + id: headerContent + height: header.height + Layout.fillWidth: true + children: [ section.content ] + } - anchors.left: dragButton.right + IconButton { + id: closeButton - icon: section.eyeEnabled ? StudioTheme.Constants.visible_small : StudioTheme.Constants.invisible_small - buttonSize: 22 - iconScale: eyeButton.containsMouse ? 1.2 : 1 - transparentBg: true + visible: false + icon: StudioTheme.Constants.closeCross + buttonSize: 21 + iconScale: closeButton.containsMouse ? 1.2 : 1 + transparentBg: true - visible: false + Layout.alignment: Qt.AlignVCenter + Layout.preferredWidth: closeButton.width + Layout.maximumWidth: closeButton.width + Layout.rightMargin: 10 - onClicked: { - section.eyeEnabled = !section.eyeEnabled - root.eyeButtonClicked() + onClicked: section.closeButtonClicked() } } } @@ -266,6 +302,7 @@ Item { border.width: 1 visible: false } + Item { id: topSpacer height: section.addTopPadding && column.height > 0 ? section.topPadding : 0 @@ -285,7 +322,7 @@ Item { id: leftBorder visible: false width: 1 - height: parent.height - bottomPadding + height: parent.height - section.bottomPadding color: header.color } @@ -320,8 +357,8 @@ Item { } onRunningChanged: { - if (!running) - enabled = false + if (!transition.running) + transition.enabled = false } } } -- cgit v1.2.3 From df123a00800deca05e0e16d5ad83bf3703c430dd Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Thu, 11 Apr 2024 17:46:32 +0200 Subject: Fix syntax and remove warning Change-Id: Ifea0ebae64365792eefe47995d0ae6a1192590d1 Reviewed-by: Thomas Hartmann Reviewed-by: Qt CI Patch Build Bot --- share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml index dda1d93ff96..305bbc7925c 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposer.qml @@ -365,7 +365,7 @@ ColumnLayout { Connections { id: dragConnection target: root.draggedSec - onYChanged: root.handleDragMove() + function onYChanged() { root.handleDragMove() } } Timer { -- cgit v1.2.3 From 247d2dbf6d27800b3b95a1ae366ec742ebac045c Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Thu, 11 Apr 2024 18:27:02 +0300 Subject: QmlDesigner: Cleanups in the content library Change-Id: I4bbb6f6d89c3e35a265624365eb61664280e9151 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Miikka Heikkinen Reviewed-by: --- .../qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml index f74f1900405..4fbeb1b8b54 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml @@ -148,7 +148,7 @@ Item { visible: root.delegateVisible && root.downloadState != "downloading" cache: false - property string webUrl: modelData.textureWebUrl + property string textureUrl: modelData.textureUrl IconButton { id: downloadIcon @@ -279,7 +279,7 @@ Item { FileDownloader { id: textureDownloader - url: image.webUrl + url: image.textureUrl probeUrl: false downloadEnabled: true onDownloadStarting: { @@ -333,7 +333,7 @@ Item { FileDownloader { id: iconDownloader - url: modelData.textureWebIconUrl + url: modelData.textureIconUrl probeUrl: false downloadEnabled: true targetFilePath: modelData.textureIconPath -- cgit v1.2.3 From 36f666174fb2e02c60fe0794d39e3714deab477e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 12 Apr 2024 17:14:12 +0200 Subject: QmlDesigner: Add import for DesignEffects Change-Id: Ib6a2c8bd8e6d04fe532fe524225d501c40a7a042 Reviewed-by: Thomas Hartmann --- .../qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml index 37fca814423..769cb679d59 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml @@ -68,7 +68,7 @@ Section { } else { modelNodeBackend.createModelNode(-1, "data", "DesignEffect") var effectNode = modelNodeBackend.allChildrenOfType("DesignEffect") - modelNodeBackend.createModelNode(effectNode, "effects", "DesignDropShadow") + modelNodeBackend.createModelNode(effectNode, "effects", "DesignDropShadow", "QtQuick.Studio.DesignEffects") } root.invalidate() } -- cgit v1.2.3 From e5c50c6dea2605beeda330715241007070af89cd Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Mon, 15 Apr 2024 12:36:24 +0300 Subject: QmlDesigner: Change default view3D id in Extended 3D projects Task-number: QDS-12351 Change-Id: Ib3ecb8e2f6ca1561819f19001d851b0932e9583f Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../projects/application-extended-3d/Screen01.ui.qml.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/Screen01.ui.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/Screen01.ui.qml.tpl index 2b26fe3f0ce..41d562fb53e 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/Screen01.ui.qml.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/Screen01.ui.qml.tpl @@ -19,7 +19,7 @@ Rectangle { color: Constants.backgroundColor View3D { - id: view3D + id: extendedView3D anchors.fill: parent environment: sceneEnvironment -- cgit v1.2.3 From e8a47b1b8ac9aad17120675fc04a0e2deb7643fe Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Mon, 15 Apr 2024 18:09:42 +0200 Subject: QmlDesigner: Fix Properties Section for Effects Change-Id: I249723f45b83731232acc9e68a6c4e27b85d6d11 Reviewed-by: Thomas Hartmann --- .../qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml index 769cb679d59..2693fc3ef60 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml @@ -259,7 +259,7 @@ Section { + StudioTheme.Values.actionIndicatorWidth width: implicitWidth typeFilter: "QtQuick.Item" - backendValue: root.effectNodeWrapper.properties.background + backendValue: root.effectNodeWrapper.properties.backgroundLayer } ExpandingSpacer {} -- cgit v1.2.3 From 4ee7b297ced1feb4d93275cbeb2b941f974d313b Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Fri, 12 Apr 2024 15:36:28 +0200 Subject: QmlDesigner: Adapt wizards to the new project structure and removed some unused templates Change-Id: I7e3e4a94ef31cbf5c98a0c1ad26dcaaa340c1e97 Reviewed-by: Miikka Heikkinen --- .../projects/application-3d/wizard.json | 71 ++++--------------- .../projects/application-extended-3d/wizard.json | 71 ++++--------------- .../projects/application/wizard.json | 82 ++++------------------ .../projects/common/CMakeLists.content.txt.tpl | 14 ---- .../projects/common/CMakeLists.imports.txt.tpl | 4 -- .../projects/common/CMakeLists.main.txt.tpl | 56 --------------- .../projects/common/app.qmlproject.tpl | 35 +++++---- .../projects/common/app_environment.h.tpl | 19 ----- .../projects/common/contentmodule.main.qml.tpl | 17 ----- .../common/import_qml_components_plugins.h.tpl | 19 ----- .../projects/common/import_qml_plugins.h.tpl | 9 --- .../studio_templates/projects/common/insight.tpl | 19 ----- .../studio_templates/projects/common/main.cpp.tpl | 37 ---------- .../studio_templates/projects/common/main.qml | 8 --- .../projects/common/qmlcomponents.tpl | 34 --------- .../projects/common/qmlmodules.tpl | 18 ----- .../projects/common/qtquickcontrols2.conf | 23 ------ .../projects/desktop-launcher/wizard.json | 70 ++++-------------- .../projects/mobile-scroll/wizard.json | 70 ++++-------------- .../projects/mobile-stack/wizard.json | 72 ++++--------------- .../projects/mobile-swipe/wizard.json | 72 ++++--------------- .../projects/shared-plugin/name/Constants.qml.tpl | 2 +- .../shared-plugin/name/DirectoryFontLoader.qml.tpl | 2 +- 23 files changed, 105 insertions(+), 719 deletions(-) delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.content.txt.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.imports.txt.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/contentmodule.main.qml.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_components_plugins.h.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_plugins.h.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/insight.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/main.cpp.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/main.qml delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/qmlmodules.tpl delete mode 100644 share/qtcreator/qmldesigner/studio_templates/projects/common/qtquickcontrols2.conf (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json index cb885c55e33..a5d0d7539c0 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json @@ -18,6 +18,8 @@ { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" }, { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" }, { "key": "IsQt6Project", "value": "%{JS: value('QtQuickVersion') !== '2.15' }" }, + { "key": "AssetDir", "value": "GeneratedComponents" }, + { "key": "ContentDir", "value": "%{ProjectName}Content" }, { "key": "ImportModuleName", "value": "%{ProjectName}" }, { "key": "UIClassName", "value": "Screen01" }, { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" }, @@ -305,99 +307,50 @@ "target": "%{ProjectDirectory}/%{QmlProjectFileName}", "openAsProject": true }, - { - "source": "../common/CMakeLists.main.txt.tpl", - "target": "%{ProjectDirectory}/CMakeLists.txt" - }, - { - "source": "../common/qmlmodules.tpl", - "target": "%{ProjectDirectory}/qmlmodules" - }, - { - "source": "../common/qmlcomponents.tpl", - "target": "%{ProjectDirectory}/qmlcomponents" - }, - { - "source": "../common/insight.tpl", - "target": "%{ProjectDirectory}/insight" - }, - { - "source": "../common/main.qml", - "target": "%{ProjectDirectory}/main.qml" - }, { "source": "../common/qtquickcontrols2.conf.tpl", "target": "%{ProjectDirectory}/qtquickcontrols2.conf" }, - { - "source": "../common/main.cpp.tpl", - "target": "%{ProjectDirectory}/src/main.cpp" - }, - { - "source": "../common/app_environment.h.tpl", - "target": "%{ProjectDirectory}/src/app_environment.h" - }, - { - "source": "../common/import_qml_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_plugins.h" - }, - { - "source": "../common/import_qml_components_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h" - }, - - { - "source": "../common/CMakeLists.content.txt.tpl", - "target": "%{ProjectDirectory}/content/CMakeLists.txt" - }, { "source": "../common/App.qml.tpl", - "target": "%{ProjectDirectory}/content/App.qml" + "target": "%{ProjectDirectory}/%{ContentDir}/App.qml" }, { "source": "Screen01.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen01.ui.qml", + "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml", "openInEditor": true }, { "source": "../common/fonts.txt", - "target": "%{ProjectDirectory}/content/fonts/fonts.txt" + "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt" }, { "source": "../common/asset_imports.txt", - "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" - }, - { - "source": "../common/CMakeLists.imports.txt.tpl", - "target": "%{ProjectDirectory}/imports/CMakeLists.txt" - }, - { - "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt" + "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt" }, { "source": "../shared-plugin/name/importmodule.qmldir.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir" + "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir" }, { "source": "../shared-plugin/name/Constants.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml" }, { "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml" }, { "source": "../shared-plugin/name/EventListModel.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml" }, { "source": "../shared-plugin/name/EventListSimulator.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml" }, { "source": "../shared-plugin/name/designer/plugin.metainfo", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" + "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json index e32ecb8a0bd..5f2e5bfcafd 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-extended-3d/wizard.json @@ -18,6 +18,8 @@ { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" }, { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" }, { "key": "IsQt6Project", "value": "%{JS: value('QtQuickVersion') !== '2.15' }" }, + { "key": "AssetDir", "value": "GeneratedComponents" }, + { "key": "ContentDir", "value": "%{ProjectName}Content" }, { "key": "ImportModuleName", "value": "%{ProjectName}" }, { "key": "UIClassName", "value": "Screen01" }, { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" }, @@ -281,99 +283,50 @@ "target": "%{ProjectDirectory}/%{QmlProjectFileName}", "openAsProject": true }, - { - "source": "../common/CMakeLists.main.txt.tpl", - "target": "%{ProjectDirectory}/CMakeLists.txt" - }, - { - "source": "../common/qmlmodules.tpl", - "target": "%{ProjectDirectory}/qmlmodules" - }, - { - "source": "../common/qmlcomponents.tpl", - "target": "%{ProjectDirectory}/qmlcomponents" - }, - { - "source": "../common/insight.tpl", - "target": "%{ProjectDirectory}/insight" - }, - { - "source": "../common/main.qml", - "target": "%{ProjectDirectory}/main.qml" - }, { "source": "../common/qtquickcontrols2.conf.tpl", "target": "%{ProjectDirectory}/qtquickcontrols2.conf" }, - { - "source": "../common/main.cpp.tpl", - "target": "%{ProjectDirectory}/src/main.cpp" - }, - { - "source": "../common/app_environment.h.tpl", - "target": "%{ProjectDirectory}/src/app_environment.h" - }, - { - "source": "../common/import_qml_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_plugins.h" - }, - { - "source": "../common/import_qml_components_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h" - }, - - { - "source": "../common/CMakeLists.content.txt.tpl", - "target": "%{ProjectDirectory}/content/CMakeLists.txt" - }, { "source": "../common/App.qml.tpl", - "target": "%{ProjectDirectory}/content/App.qml" + "target": "%{ProjectDirectory}/%{ContentDir}/App.qml" }, { "source": "Screen01.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen01.ui.qml", + "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml", "openInEditor": true }, { "source": "../common/fonts.txt", - "target": "%{ProjectDirectory}/content/fonts/fonts.txt" + "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt" }, { "source": "../common/asset_imports.txt", - "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" - }, - { - "source": "../common/CMakeLists.imports.txt.tpl", - "target": "%{ProjectDirectory}/imports/CMakeLists.txt" - }, - { - "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt" + "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt" }, { "source": "../shared-plugin/name/importmodule.qmldir.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir" + "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir" }, { "source": "../shared-plugin/name/Constants.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml" }, { "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml" }, { "source": "../shared-plugin/name/EventListModel.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml" }, { "source": "../shared-plugin/name/EventListSimulator.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml" }, { "source": "../shared-plugin/name/designer/plugin.metainfo", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" + "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json index 613770b646c..41fe2df289a 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json @@ -17,6 +17,8 @@ { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" }, { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" }, { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" }, + { "key": "AssetDir", "value": "GeneratedComponents" }, + { "key": "ContentDir", "value": "%{ProjectName}Content" }, { "key": "ImportModuleName", "value": "%{ProjectName}" }, { "key": "UIClassName", "value": "Screen01" }, { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" }, @@ -306,109 +308,49 @@ "target": "%{ProjectDirectory}/%{QmlProjectFileName}", "openAsProject": true }, - { - "source": "../common/CMakeLists.main.txt.tpl", - "target": "%{ProjectDirectory}/CMakeLists.txt", - "condition": "%{IsQt6Project}" - }, - { - "source": "../common/qmlmodules.tpl", - "target": "%{ProjectDirectory}/qmlmodules", - "condition": "%{IsQt6Project}" - }, - { - "source": "../common/qmlcomponents.tpl", - "target": "%{ProjectDirectory}/qmlcomponents", - "condition": "%{IsQt6Project}" - }, - { - "source": "../common/insight.tpl", - "target": "%{ProjectDirectory}/insight", - "condition": "%{IsQt6Project}" - }, - { - "source": "../common/main.qml", - "target": "%{ProjectDirectory}/main.qml", - "condition": "%{IsQt6Project}" - }, { "source": "../common/qtquickcontrols2.conf.tpl", "target": "%{ProjectDirectory}/qtquickcontrols2.conf" }, - { - "source": "../common/main.cpp.tpl", - "target": "%{ProjectDirectory}/src/main.cpp", - "condition": "%{IsQt6Project}" - }, - { - "source": "../common/app_environment.h.tpl", - "target": "%{ProjectDirectory}/src/app_environment.h", - "condition": "%{IsQt6Project}" - }, - { - "source": "../common/import_qml_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_plugins.h", - "condition": "%{IsQt6Project}" - }, - { - "source": "../common/import_qml_components_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h", - "condition": "%{IsQt6Project}" - }, - { - "source": "../common/CMakeLists.content.txt.tpl", - "target": "%{ProjectDirectory}/content/CMakeLists.txt", - "condition": "%{IsQt6Project}" - }, { "source": "../common/App.qml.tpl", - "target": "%{ProjectDirectory}/content/App.qml" + "target": "%{ProjectDirectory}/%{ContentDir}/App.qml" }, { "source": "Screen01.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen01.ui.qml" + "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml" }, { "source": "../common/fonts.txt", - "target": "%{ProjectDirectory}/content/fonts/fonts.txt" + "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt" }, { "source": "../common/asset_imports.txt", - "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" - }, - { - "source": "../common/CMakeLists.imports.txt.tpl", - "target": "%{ProjectDirectory}/imports/CMakeLists.txt", - "condition": "%{IsQt6Project}" - }, - { - "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt", - "condition": "%{IsQt6Project}" + "target": "%{ProjectDirectory}/%{AssetDir}/Quick3DAssets.txt" }, { "source": "../shared-plugin/name/importmodule.qmldir.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir" + "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir" }, { "source": "../shared-plugin/name/Constants.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml" }, { "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml" }, { "source": "../shared-plugin/name/EventListModel.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml" }, { "source": "../shared-plugin/name/EventListSimulator.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml" }, { "source": "../shared-plugin/name/designer/plugin.metainfo", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" + "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.content.txt.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.content.txt.tpl deleted file mode 100644 index a5a4360e3f2..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.content.txt.tpl +++ /dev/null @@ -1,14 +0,0 @@ -### This file is automatically generated by Qt Design Studio. -### Do not change - -qt_add_library(content STATIC) -qt6_add_qml_module(content - URI "content" - VERSION 1.0 - RESOURCE_PREFIX "/qt/qml" - QML_FILES - App.qml - %{UIClassFileName} - RESOURCES - fonts/fonts.txt -) diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.imports.txt.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.imports.txt.tpl deleted file mode 100644 index 418f6d7719d..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.imports.txt.tpl +++ /dev/null @@ -1,4 +0,0 @@ -### This file is automatically generated by Qt Design Studio. -### Do not change - -add_subdirectory(%{ImportModuleName}) diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl deleted file mode 100644 index eb621ef2193..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl +++ /dev/null @@ -1,56 +0,0 @@ -cmake_minimum_required(VERSION 3.21.1) - -option(LINK_INSIGHT "Link Qt Insight Tracker library" ON) -option(BUILD_QDS_COMPONENTS "Build design studio components" ON) - -project(%{ProjectName}App LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -find_package(Qt6 6.2 REQUIRED COMPONENTS Core Gui Qml Quick) - -if (Qt6_VERSION VERSION_GREATER_EQUAL 6.3) - qt_standard_project_setup() -endif() - -qt_add_executable(%{ProjectName}App src/main.cpp) - -qt_add_resources(%{ProjectName}App "configuration" - PREFIX "/" - FILES - qtquickcontrols2.conf -) - -target_link_libraries(%{ProjectName}App PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Qml - Qt6::Quick -) - -set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/qml) -set(QML_IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY} - CACHE STRING "Import paths for Qt Creator's code model" - FORCE -) - -if (BUILD_QDS_COMPONENTS) - include(${CMAKE_CURRENT_SOURCE_DIR}/qmlcomponents) -endif() - -include(${CMAKE_CURRENT_SOURCE_DIR}/qmlmodules) - -if (LINK_INSIGHT) - include(${CMAKE_CURRENT_SOURCE_DIR}/insight) -endif () - -include(GNUInstallDirs) -install(TARGETS %{ProjectName}App - BUNDLE DESTINATION . - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -) - -# make IDEs aware of the QML import path -set(QML_IMPORT_PATH ${PROJECT_BINARY_DIR}/qml CACHE PATH - "Path to the custom QML components defined by the project") diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl index 75aeae67142..6d346818e41 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/common/app.qmlproject.tpl @@ -5,32 +5,36 @@ import QmlProject 1.1 @endif Project { - mainFile: "content/App.qml" - mainUiFile: "content/Screen01.ui.qml" + mainFile: "%{ContentDir}/App.qml" + mainUiFile: "%{ContentDir}/Screen01.ui.qml" /* Include .qml, .js, and image files from current directory and subdirectories */ QmlFiles { - directory: "content" + directory: "%{ProjectName}" } QmlFiles { - directory: "imports" + directory: "%{ContentDir}" + } + + QmlFiles { + directory: "%{AssetDir}" } JavaScriptFiles { - directory: "content" + directory: "%{ProjectName}" } JavaScriptFiles { - directory: "imports" + directory: "%{ProjectName}" } ImageFiles { - directory: "content" + directory: "%{ContentDir}" } ImageFiles { - directory: "asset_imports" + directory: "%{AssetDir}" } Files { @@ -69,17 +73,12 @@ Project { Files { filter: "*.mesh" - directory: "asset_imports" + directory: "%{AssetDir}" } Files { filter: "*.qad" - directory: "asset_imports" - } - - Files { - filter: "*.qml" - directory: "asset_imports" + directory: "%{AssetDir}" } Environment { @@ -109,7 +108,7 @@ Project { @endif /* List of plugin directories passed to QML runtime */ - importPaths: [ "imports", "asset_imports" ] + importPaths: [ "." ] /* Required for deployment */ targetDirectory: "/opt/%{ProjectName}" @@ -125,10 +124,10 @@ Project { /* args: Specifies command line arguments for qsb tool to generate shaders. files: Specifies target files for qsb tool. If path is included, it must be relative to this file. Wildcard '*' can be used in the file name part of the path. - e.g. files: [ "content/shaders/*.vert", "*.frag" ] */ + e.g. files: [ "%{ContentDir}/shaders/*.vert", "*.frag" ] */ ShaderTool { args: "-s --glsl \\\"100 es,120,150\\\" --hlsl 50 --msl 12" - files: [ "content/shaders/*" ] + files: [ "%{ContentDir}/shaders/*" ] } @endif diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl deleted file mode 100644 index e1f7ec2e23d..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/app_environment.h.tpl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file is automatically generated by Qt Design Studio. - * Do not change. -*/ - -#include - -void set_qt_environment() -{ -@if %{UseVirtualKeyboard} - qputenv("QT_IM_MODULE", "qtvirtualkeyboard"); - qputenv("QT_VIRTUALKEYBOARD_DESKTOP_DISABLE", "1"); -@endif - qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); - qputenv("QT_ENABLE_HIGHDPI_SCALING", "0"); - qputenv("QT_LOGGING_RULES", "qt.qml.connections=false"); - qputenv("QT_QUICK_CONTROLS_CONF", ":/qtquickcontrols2.conf"); - qputenv("QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT", "1"); -} diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/contentmodule.main.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/contentmodule.main.qml.tpl deleted file mode 100644 index ac0b0b28c02..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/contentmodule.main.qml.tpl +++ /dev/null @@ -1,17 +0,0 @@ -import QtQuick %{QtQuickVersion} -@if !%{IsQt6Project} -import QtQuick.Window %{QtQuickVersion} -@endif -import %{ApplicationImport} - -Window { - width: Constants.width - height: Constants.height - - visible: true - - Screen01 { - width: parent.width - height: parent.height - } -} diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_components_plugins.h.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_components_plugins.h.tpl deleted file mode 100644 index 167481d7c74..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_components_plugins.h.tpl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file is automatically generated by Qt Design Studio. - * Do not change. -*/ - -#include "qqmlextensionplugin.h" - -#ifdef BUILD_QDS_COMPONENTS - -Q_IMPORT_QML_PLUGIN(QtQuick_Studio_ComponentsPlugin) -Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EffectsPlugin) -Q_IMPORT_QML_PLUGIN(QtQuick_Studio_ApplicationPlugin) -Q_IMPORT_QML_PLUGIN(FlowViewPlugin) -Q_IMPORT_QML_PLUGIN(QtQuick_Studio_LogicHelperPlugin) -Q_IMPORT_QML_PLUGIN(QtQuick_Studio_MultiTextPlugin) -Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EventSimulatorPlugin) -Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EventSystemPlugin) - -#endif diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_plugins.h.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_plugins.h.tpl deleted file mode 100644 index f9700ff4528..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/import_qml_plugins.h.tpl +++ /dev/null @@ -1,9 +0,0 @@ -/* - * This file is automatically generated by Qt Design Studio. - * Do not change. -*/ - -#include - -Q_IMPORT_QML_PLUGIN(contentPlugin) -Q_IMPORT_QML_PLUGIN(%{ProjectPluginClassName}) diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/insight.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/insight.tpl deleted file mode 100644 index 8245e31f0d9..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/insight.tpl +++ /dev/null @@ -1,19 +0,0 @@ -### This file is automatically generated by Qt Design Studio. -### Do not change - -if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qtinsight.conf) - if (QT_VERSION GREATER_EQUAL 6.5.0) - find_package(Qt6 REQUIRED COMPONENTS InsightTracker) - - qt_add_resources(${CMAKE_PROJECT_NAME} "configuration" - PREFIX "/" - FILES - qtinsight.conf - ) - target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE - Qt6::InsightTracker - ) - else() - message(WARNING "You need Qt 6.5.0 or newer to build the application.") - endif() -endif() diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/main.cpp.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/main.cpp.tpl deleted file mode 100644 index 915d08462e2..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/main.cpp.tpl +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - -#include -#include - -#include "app_environment.h" -#include "import_qml_components_plugins.h" -#include "import_qml_plugins.h" - -int main(int argc, char *argv[]) -{ - set_qt_environment(); - - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - const QUrl url(u"qrc:/qt/qml/Main/main.qml"_qs); - QObject::connect( - &engine, &QQmlApplicationEngine::objectCreated, &app, - [url](QObject *obj, const QUrl &objUrl) { - if (!obj && url == objUrl) - QCoreApplication::exit(-1); - }, - Qt::QueuedConnection); - - engine.addImportPath(QCoreApplication::applicationDirPath() + "/qml"); - engine.addImportPath(":/"); - - engine.load(url); - - if (engine.rootObjects().isEmpty()) { - return -1; - } - - return app.exec(); -} diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/main.qml b/share/qtcreator/qmldesigner/studio_templates/projects/common/main.qml deleted file mode 100644 index 2c4f857df3b..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/main.qml +++ /dev/null @@ -1,8 +0,0 @@ -/* This file is generated and only relevant for integrating the project into a Qt 6 and cmake based -C++ project. */ - -import QtQuick -import content - -App { -} diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl deleted file mode 100644 index a9f20243a69..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlcomponents.tpl +++ /dev/null @@ -1,34 +0,0 @@ -### This file is automatically generated by Qt Design Studio. -### Do not change - -message("Building designer components.") - -set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml") - -include(FetchContent) -FetchContent_Declare( - ds - GIT_TAG qds-4.5 - GIT_REPOSITORY https://code.qt.io/qt-labs/qtquickdesigner-components.git -) - -FetchContent_GetProperties(ds) -FetchContent_Populate(ds) - -target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE - QuickStudioComponentsplugin - QuickStudioEffectsplugin - QuickStudioApplicationplugin - FlowViewplugin - QuickStudioLogicHelperplugin - QuickStudioMultiTextplugin - QuickStudioEventSimulatorplugin - QuickStudioEventSystemplugin - QuickStudioUtilsplugin -) - -add_subdirectory(${ds_SOURCE_DIR} ${ds_BINARY_DIR}) - -target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE - BULD_QDS_COMPONENTS=true -) diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlmodules.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlmodules.tpl deleted file mode 100644 index 5a22661b5a1..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/qmlmodules.tpl +++ /dev/null @@ -1,18 +0,0 @@ -### This file is automatically generated by Qt Design Studio. -### Do not change - -qt6_add_qml_module(${CMAKE_PROJECT_NAME} - URI "Main" - VERSION 1.0 - RESOURCE_PREFIX "/qt/qml" - NO_PLUGIN - QML_FILES main.qml -) - -add_subdirectory(content) -add_subdirectory(imports) - -target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE - contentplugin - %{ProjectPluginName} -) diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/common/qtquickcontrols2.conf b/share/qtcreator/qmldesigner/studio_templates/projects/common/qtquickcontrols2.conf deleted file mode 100644 index 9c7633fb0a6..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/common/qtquickcontrols2.conf +++ /dev/null @@ -1,23 +0,0 @@ -; This file can be edited to change the style of the application -; Read "Qt Quick Controls 2 Configuration File" for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html - -[Controls] -Style=%{QtQuickControlsStyle} -@if '%{QtQuickControlsStyle}' == 'Universal' - -[Universal] -Theme=%{QtQuickControlsStyleTheme} -;Accent=Steel -;Foreground=Brown -;Background=Steel -@endif -@if '%{QtQuickControlsStyle}' == 'Material' - -[Material] -Theme=%{QtQuickControlsStyleTheme} -;Accent=BlueGrey -;Primary=BlueGray -;Foreground=Brown -;Background=Grey -@endif diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json index 01a603eb9d8..ddaf5021543 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json @@ -17,6 +17,8 @@ { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" }, { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" }, { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" }, + { "key": "AssetDir", "value": "GeneratedComponents" }, + { "key": "ContentDir", "value": "%{ProjectName}Content" }, { "key": "ImportModuleName", "value": "%{ProjectName}" }, { "key": "UIClassName", "value": "Screen01" }, { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" }, @@ -297,98 +299,50 @@ "target": "%{ProjectDirectory}/%{QmlProjectFileName}", "openAsProject": true }, - { - "source": "../common/CMakeLists.main.txt.tpl", - "target": "%{ProjectDirectory}/CMakeLists.txt" - }, - { - "source": "../common/qmlmodules.tpl", - "target": "%{ProjectDirectory}/qmlmodules" - }, - { - "source": "../common/qmlcomponents.tpl", - "target": "%{ProjectDirectory}/qmlcomponents" - }, - { - "source": "../common/insight.tpl", - "target": "%{ProjectDirectory}/insight" - }, - { - "source": "../common/main.qml", - "target": "%{ProjectDirectory}/main.qml" - }, { "source": "../common/qtquickcontrols2.conf.tpl", "target": "%{ProjectDirectory}/qtquickcontrols2.conf" }, - { - "source": "../common/main.cpp.tpl", - "target": "%{ProjectDirectory}/src/main.cpp" - }, - { - "source": "../common/app_environment.h.tpl", - "target": "%{ProjectDirectory}/src/app_environment.h" - }, - { - "source": "../common/import_qml_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_plugins.h" - }, - { - "source": "../common/import_qml_components_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h" - }, - { - "source": "../common/CMakeLists.content.txt.tpl", - "target": "%{ProjectDirectory}/content/CMakeLists.txt" - }, { "source": "../common/App.qml.tpl", - "target": "%{ProjectDirectory}/content/App.qml" + "target": "%{ProjectDirectory}/%{ContentDir}/App.qml" }, { "source": "Screen01.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen01.ui.qml", + "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml", "openInEditor": true }, { "source": "../common/fonts.txt", - "target": "%{ProjectDirectory}/content/fonts/fonts.txt" + "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt" }, { "source": "../common/asset_imports.txt", - "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" - }, - { - "source": "../common/CMakeLists.imports.txt.tpl", - "target": "%{ProjectDirectory}/imports/CMakeLists.txt" - }, - { - "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt" + "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt" }, { "source": "../shared-plugin/name/importmodule.qmldir.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir" + "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir" }, { "source": "../shared-plugin/name/Constants.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml" }, { "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml" }, { "source": "../shared-plugin/name/EventListModel.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml" }, { "source": "../shared-plugin/name/EventListSimulator.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml" }, { "source": "../shared-plugin/name/designer/plugin.metainfo", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" + "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json index 7ad8d1d9d43..585a73aa907 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json @@ -17,6 +17,8 @@ { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" }, { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" }, { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" }, + { "key": "AssetDir", "value": "GeneratedComponents" }, + { "key": "ContentDir", "value": "%{ProjectName}Content" }, { "key": "ImportModuleName", "value": "%{ProjectName}" }, { "key": "UIClassName", "value": "Screen01" }, { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" }, @@ -263,98 +265,50 @@ "target": "%{ProjectDirectory}/%{QmlProjectFileName}", "openAsProject": true }, - { - "source": "../common/CMakeLists.main.txt.tpl", - "target": "%{ProjectDirectory}/CMakeLists.txt" - }, - { - "source": "../common/qmlmodules.tpl", - "target": "%{ProjectDirectory}/qmlmodules" - }, - { - "source": "../common/qmlcomponents.tpl", - "target": "%{ProjectDirectory}/qmlcomponents" - }, - { - "source": "../common/insight.tpl", - "target": "%{ProjectDirectory}/insight" - }, - { - "source": "../common/main.qml", - "target": "%{ProjectDirectory}/main.qml" - }, { "source": "../common/qtquickcontrols2.conf.tpl", "target": "%{ProjectDirectory}/qtquickcontrols2.conf" }, - { - "source": "../common/main.cpp.tpl", - "target": "%{ProjectDirectory}/src/main.cpp" - }, - { - "source": "../common/app_environment.h.tpl", - "target": "%{ProjectDirectory}/src/app_environment.h" - }, - { - "source": "../common/import_qml_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_plugins.h" - }, - { - "source": "../common/import_qml_components_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h" - }, - { - "source": "../common/CMakeLists.content.txt.tpl", - "target": "%{ProjectDirectory}/content/CMakeLists.txt" - }, { "source": "../common/App.qml.tpl", - "target": "%{ProjectDirectory}/content/App.qml" + "target": "%{ProjectDirectory}/%{ContentDir}/App.qml" }, { "source": "Screen01.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen01.ui.qml", + "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml", "openInEditor": true }, { "source": "../common/fonts.txt", - "target": "%{ProjectDirectory}/content/fonts/fonts.txt" + "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt" }, { "source": "../common/asset_imports.txt", - "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" - }, - { - "source": "../common/CMakeLists.imports.txt.tpl", - "target": "%{ProjectDirectory}/imports/CMakeLists.txt" - }, - { - "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt" + "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt" }, { "source": "../shared-plugin/name/importmodule.qmldir.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir" + "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir" }, { "source": "../shared-plugin/name/Constants.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml" }, { "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml" }, { "source": "../shared-plugin/name/EventListModel.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml" }, { "source": "../shared-plugin/name/EventListSimulator.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml" }, { "source": "../shared-plugin/name/designer/plugin.metainfo", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" + "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json index 0a3aaf26b6e..a44a1429bee 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json @@ -17,6 +17,8 @@ { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" }, { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" }, { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" }, + { "key": "AssetDir", "value": "GeneratedComponents" }, + { "key": "ContentDir", "value": "%{ProjectName}Content" }, { "key": "ImportModuleName", "value": "%{ProjectName}" }, { "key": "IsQt6Project", "value": "%{JS: value('QtQuickVersion') !== '2.15' }" }, { "key": "QtQuickVersion", "value": "%{JS: %{TargetQtVersion}.TargetQuickVersion}" }, @@ -260,103 +262,55 @@ "target": "%{ProjectDirectory}/%{QmlProjectFileName}", "openAsProject": true }, - { - "source": "../common/CMakeLists.main.txt.tpl", - "target": "%{ProjectDirectory}/CMakeLists.txt" - }, - { - "source": "../common/qmlmodules.tpl", - "target": "%{ProjectDirectory}/qmlmodules" - }, - { - "source": "../common/qmlcomponents.tpl", - "target": "%{ProjectDirectory}/qmlcomponents" - }, - { - "source": "../common/insight.tpl", - "target": "%{ProjectDirectory}/insight" - }, - { - "source": "../common/main.qml", - "target": "%{ProjectDirectory}/main.qml" - }, { "source": "../common/qtquickcontrols2.conf.tpl", "target": "%{ProjectDirectory}/qtquickcontrols2.conf" }, - { - "source": "../common/main.cpp.tpl", - "target": "%{ProjectDirectory}/src/main.cpp" - }, - { - "source": "../common/app_environment.h.tpl", - "target": "%{ProjectDirectory}/src/app_environment.h" - }, - { - "source": "../common/import_qml_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_plugins.h" - }, - { - "source": "../common/import_qml_components_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h" - }, - { - "source": "CMakeLists.content.txt.tpl", - "target": "%{ProjectDirectory}/content/CMakeLists.txt" - }, { "source": "App.qml.tpl", - "target": "%{ProjectDirectory}/content/App.qml" + "target": "%{ProjectDirectory}/%{ContentDir}/App.qml" }, { "source": "Screen01.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen01.ui.qml", + "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml", "openInEditor": true }, { "source": "Screen02.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen02.ui.qml", + "target": "%{ProjectDirectory}/%{ContentDir}/Screen02.ui.qml", "openInEditor": true }, { "source": "../common/fonts.txt", - "target": "%{ProjectDirectory}/content/fonts/fonts.txt" + "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt" }, { "source": "../common/asset_imports.txt", - "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" - }, - { - "source": "../common/CMakeLists.imports.txt.tpl", - "target": "%{ProjectDirectory}/imports/CMakeLists.txt" - }, - { - "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt" + "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt" }, { "source": "../shared-plugin/name/importmodule.qmldir.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir" + "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir" }, { "source": "../shared-plugin/name/Constants.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml" }, { "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml" }, { "source": "../shared-plugin/name/EventListModel.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml" }, { "source": "../shared-plugin/name/EventListSimulator.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml" }, { "source": "../shared-plugin/name/designer/plugin.metainfo", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" + "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json index 58c4783f097..b3f70a8b797 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json @@ -17,6 +17,8 @@ { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" }, { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" }, { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" }, + { "key": "AssetDir", "value": "GeneratedComponents" }, + { "key": "ContentDir", "value": "%{ProjectName}Content" }, { "key": "ImportModuleName", "value": "%{ProjectName}" }, { "key": "IsQt6Project", "value": "%{JS: value('QtQuickVersion') !== '2.15' }" }, { "key": "QtQuickVersion", "value": "%{JS: %{TargetQtVersion}.TargetQuickVersion}" }, @@ -260,103 +262,55 @@ "target": "%{ProjectDirectory}/%{QmlProjectFileName}", "openAsProject": true }, - { - "source": "../common/CMakeLists.main.txt.tpl", - "target": "%{ProjectDirectory}/CMakeLists.txt" - }, - { - "source": "../common/qmlmodules.tpl", - "target": "%{ProjectDirectory}/qmlmodules" - }, - { - "source": "../common/qmlcomponents.tpl", - "target": "%{ProjectDirectory}/qmlcomponents" - }, - { - "source": "../common/insight.tpl", - "target": "%{ProjectDirectory}/insight" - }, - { - "source": "../common/main.qml", - "target": "%{ProjectDirectory}/main.qml" - }, { "source": "../common/qtquickcontrols2.conf.tpl", "target": "%{ProjectDirectory}/qtquickcontrols2.conf" }, - { - "source": "../common/main.cpp.tpl", - "target": "%{ProjectDirectory}/src/main.cpp" - }, - { - "source": "../common/app_environment.h.tpl", - "target": "%{ProjectDirectory}/src/app_environment.h" - }, - { - "source": "../common/import_qml_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_plugins.h" - }, - { - "source": "../common/import_qml_components_plugins.h.tpl", - "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h" - }, - { - "source": "CMakeLists.content.txt.tpl", - "target": "%{ProjectDirectory}/content/CMakeLists.txt" - }, { "source": "App.qml.tpl", - "target": "%{ProjectDirectory}/content/App.qml" + "target": "%{ProjectDirectory}/%{ContentDir}/App.qml" }, { "source": "Screen01.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen01.ui.qml", + "target": "%{ProjectDirectory}/%{ContentDir}/Screen01.ui.qml", "openInEditor": true }, { "source": "Screen02.ui.qml.tpl", - "target": "%{ProjectDirectory}/content/Screen02.ui.qml", + "target": "%{ProjectDirectory}/%{ContentDir}/Screen02.ui.qml", "openInEditor": true }, { "source": "../common/fonts.txt", - "target": "%{ProjectDirectory}/content/fonts/fonts.txt" + "target": "%{ProjectDirectory}/%{ContentDir}/fonts/fonts.txt" }, { "source": "../common/asset_imports.txt", - "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt" - }, - { - "source": "../common/CMakeLists.imports.txt.tpl", - "target": "%{ProjectDirectory}/imports/CMakeLists.txt" - }, - { - "source": "../shared-plugin/name/CMakeLists.importmodule.txt.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt" + "target": "%{ProjectDirectory}/%{AssetDir}/%{AssetDir}.txt" }, { "source": "../shared-plugin/name/importmodule.qmldir.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir" + "target": "%{ProjectDirectory}/%{ImportModuleName}/qmldir" }, { "source": "../shared-plugin/name/Constants.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/Constants.qml" }, { "source": "../shared-plugin/name/DirectoryFontLoader.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/DirectoryFontLoader.qml" }, { "source": "../shared-plugin/name/EventListModel.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListModel.qml" }, { "source": "../shared-plugin/name/EventListSimulator.qml.tpl", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml" + "target": "%{ProjectDirectory}/%{ImportModuleName}/EventListSimulator.qml" }, { "source": "../shared-plugin/name/designer/plugin.metainfo", - "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo" + "target": "%{ProjectDirectory}/%{ImportModuleName}/designer/plugin.metainfo" } ] } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl index cc5da7be55a..35aa48896bd 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl @@ -26,7 +26,7 @@ QtObject { @if %{IsQt6Project} property StudioApplication application: StudioApplication { - fontPath: Qt.resolvedUrl("../../content/" + relativeFontDirectory) + fontPath: Qt.resolvedUrl("../../%{ContentDir}/" + relativeFontDirectory) } @else property DirectoryFontLoader directoryFontLoader: DirectoryFontLoader { diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl index 677fe054285..56ecc9f2f8f 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl @@ -7,7 +7,7 @@ import Qt.labs.folderlistmodel %{QtQuickVersion} QtObject { id: loader - property url fontDirectory: Qt.resolvedUrl("../../content/" + relativeFontDirectory) + property url fontDirectory: Qt.resolvedUrl("../../%{ContentDir}/" + relativeFontDirectory) property string relativeFontDirectory: "fonts" function loadFont(url) { -- cgit v1.2.3 From 1488548739f8521545d54a301ab1346d9a56a196 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 16 Apr 2024 11:23:19 +0200 Subject: QmlDesigner: Fix reflection for CheckBox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib0268e5a015fb74c6691e7b3c51ca03f1f90ba55 Reviewed-by: Henning Gründl --- .../propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml index 95788a9ec6a..7f1e6f5d461 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml @@ -22,17 +22,25 @@ StudioControls.CheckBox { labelColor: colorLogic.textColor + property bool __block: false + ColorLogic { id: colorLogic backendValue: checkBox.backendValue onValueFromBackendChanged: { + checkBox.__block = true if (colorLogic.valueFromBackend !== undefined && checkBox.checked !== colorLogic.valueFromBackend) checkBox.checked = colorLogic.valueFromBackend + checkBox.__block = false } + } onCheckedChanged: { + if (checkBox.__block) + return + if (backendValue.value !== checkBox.checked) backendValue.value = checkBox.checked } -- cgit v1.2.3 From b5aac705ea7aa68fce74dd452c2b7c1b5eb0b5f0 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 11 Apr 2024 16:00:51 +0200 Subject: QmlDesigner: Indicate if a file is modified MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QDS-12361 Change-Id: I7a6c5f112b0f193f5bb975a331e2f0d44d19ddc2 Reviewed-by: Henning Gründl --- share/qtcreator/qmldesigner/toolbar/Main.qml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/toolbar/Main.qml b/share/qtcreator/qmldesigner/toolbar/Main.qml index 7235028df68..88a9bd744a2 100644 --- a/share/qtcreator/qmldesigner/toolbar/Main.qml +++ b/share/qtcreator/qmldesigner/toolbar/Main.qml @@ -190,6 +190,26 @@ Rectangle { onActivated: backend.openFileByIndex(index) } + Text { + parent:currentFile.contentItem + visible: backend.isDocumentDirty + + anchors.right: parent.right + anchors.rightMargin: parent.width - metric.textWidth - 18 + color: StudioTheme.Values.themeTextColor + text: StudioTheme.Constants.wildcard + font.family: StudioTheme.Constants.iconFont.family + font.pixelSize: StudioTheme.Values.smallIconFont + anchors.verticalCenter: parent.verticalCenter + anchors.verticalCenterOffset: -4 + + FontMetrics { + id: metric + font: currentFile.font + property int textWidth: metric.boundingRect(currentFile.currentText).width + } + } + ToolbarButton { id: backButton anchors.verticalCenter: parent.verticalCenter -- cgit v1.2.3 From 4591293fd9103a57d611b64b9e2daa976cad594e Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Tue, 9 Apr 2024 17:50:11 +0300 Subject: QmlDesigner: Add user texture bundle Fixes: QDS-12390 Change-Id: I512a8748bbb6a282589f05293507c110162e7f1d Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Miikka Heikkinen --- .../ContentLibraryUserView.qml | 33 ++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml index d3d1dbad92d..47d3c6ce773 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick +import Qt.labs.qmlmodels import HelperWidgets as HelperWidgets import StudioControls as StudioControls import StudioTheme as StudioTheme @@ -99,17 +100,33 @@ HelperWidgets.ScrollView { id: repeater model: categoryItems - delegate: ContentLibraryMaterial { - width: root.cellWidth - height: root.cellHeight + delegate: DelegateChooser { + role: "itemType" - importerRunning: ContentLibraryBackend.userModel.importerRunning + DelegateChoice { + roleValue: "material" + ContentLibraryMaterial { + width: root.cellWidth + height: root.cellHeight - onShowContextMenu: ctxMenu.popupMenu(modelData) - onAddToProject: ContentLibraryBackend.userModel.addToProject(modelData) + importerRunning: ContentLibraryBackend.userModel.importerRunning - onVisibleChanged: { - section.numVisibleItem += visible ? 1 : -1 + onShowContextMenu: ctxMenu.popupMenu(modelData) + onAddToProject: ContentLibraryBackend.userModel.addToProject(modelData) + + onVisibleChanged: { + section.numVisibleItem += visible ? 1 : -1 + } + } + } + DelegateChoice { + roleValue: "texture" + delegate: ContentLibraryTexture { + width: root.cellWidth + height: root.cellHeight + + // onShowContextMenu: ctxMenu.popupMenu(modelData) // TODO + } } } -- cgit v1.2.3 From f006cfb233f03c85f32530ec287d3608764d2666 Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Thu, 11 Apr 2024 12:59:18 +0300 Subject: QmlDesigner: Warn the user if the project is not imported When the project is not importd in the design document, DataStore cannot be found by the project manager. User should add it to make the Model Editor work. So we will warn the user in the Model Editor view. Task-number: QDS-12119 Change-Id: I313e5553e8b0a0ef3b97c50d61db80c0a8d382f8 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Thomas Hartmann --- .../CollectionDetailsView.qml | 30 +++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml index e3f1a589595..e40a3c94577 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml @@ -498,10 +498,38 @@ Rectangle { } } + ColumnLayout { + id: importsProblem + + visible: !topRow.visible && rootView.dataStoreExists && !rootView.projectImportExists + width: parent.width + anchors.verticalCenter: parent.verticalCenter + clip: true + + Text { + text: qsTr("Import the project to your design document to make the Model Editor enabled.") + Layout.alignment: Qt.AlignCenter + Layout.maximumWidth: parent.width + leftPadding: StudioTheme.Values.collectionItemTextPadding + rightPadding: StudioTheme.Values.collectionItemTextPadding + color: StudioTheme.Values.themeTextColor + font.pixelSize: StudioTheme.Values.mediumFontSize + wrapMode: Text.Wrap + } + + HelperWidgets.Button { + text: qsTr("Enable DataStore (This will add the required import)") + Layout.alignment: Qt.AlignCenter + onClicked: rootView.addProjectImport() + leftPadding: StudioTheme.Values.collectionItemTextPadding + rightPadding: StudioTheme.Values.collectionItemTextPadding + } + } + Text { anchors.centerIn: parent text: qsTr("There are no models in this project.\nAdd or import a model.") - visible: !topRow.visible + visible: !topRow.visible && !importsProblem.visible color: StudioTheme.Values.themeTextColor font.pixelSize: StudioTheme.Values.mediumFontSize } -- cgit v1.2.3 From 90c4826c2937be4685a78349f76aaedfc33964dd Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 17 Apr 2024 15:20:56 +0200 Subject: QmlDesigner: remove annoying output Change-Id: I7f74ece071923208764b767a70436145888fbb54 Reviewed-by: Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml index aefffcc6bcc..c0c47f73661 100644 --- a/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml +++ b/share/qtcreator/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml @@ -382,7 +382,6 @@ Column { Connections { target: effectComposerModel function onShadersBaked() { - console.log("Shaders Baked!") updateTimer.restart() } } -- cgit v1.2.3 From ad408553af7d3e40dacb28298d9b4e7a74ea3761 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Wed, 17 Apr 2024 13:07:56 +0300 Subject: QmlDesigner: Enable expanding content library user categories Change-Id: Id3b49773b02e4922a06b71e6ed7a7098ed4d4062 Reviewed-by: Miikka Heikkinen Reviewed-by: Qt CI Patch Build Bot --- .../contentLibraryQmlSource/ContentLibraryUserView.qml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml index 47d3c6ce773..85123af3743 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryUserView.qml @@ -73,16 +73,10 @@ HelperWidgets.ScrollView { caption: categoryName visible: categoryVisible - expanded: categoryExpanded - expandOnClick: false category: "ContentLib_User" - onToggleExpand: categoryExpanded = !categoryExpanded - onExpand: categoryExpanded = true - onCollapse: categoryExpanded = false - function expandSection() { - categoryExpanded = true + section.expanded = true } property alias count: repeater.count @@ -123,7 +117,7 @@ HelperWidgets.ScrollView { roleValue: "texture" delegate: ContentLibraryTexture { width: root.cellWidth - height: root.cellHeight + height: root.cellWidth // for textures use a square size since there is no name row // onShowContextMenu: ctxMenu.popupMenu(modelData) // TODO } -- cgit v1.2.3 From 2618d1b54431319530f9b32ee59202a671fc1e77 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 18 Apr 2024 16:31:33 +0200 Subject: QmlDesigner: Create the import for the first node created Change-Id: Id0c251857a69844318fecd40923fcd6a7e1ef33a Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Thomas Hartmann --- .../qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml index 2693fc3ef60..060f65babee 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml @@ -66,9 +66,9 @@ Section { if (root.hasDesignerEffect) { root.effectNodeWrapper.deleteModelNode() } else { - modelNodeBackend.createModelNode(-1, "data", "DesignEffect") + modelNodeBackend.createModelNode(-1, "data", "DesignEffect", "QtQuick.Studio.DesignEffects") var effectNode = modelNodeBackend.allChildrenOfType("DesignEffect") - modelNodeBackend.createModelNode(effectNode, "effects", "DesignDropShadow", "QtQuick.Studio.DesignEffects") + modelNodeBackend.createModelNode(effectNode, "effects", "DesignDropShadow") } root.invalidate() } -- cgit v1.2.3 From cf05fa6846862caf45ed76d26653bf8001b3b4a2 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 18 Apr 2024 16:32:07 +0200 Subject: QmlDesgner: Fix whitespace Change-Id: Iaa0fd96bd553d1f0d081d30b2e8772e3db878b1e Reviewed-by: Thomas Hartmann --- .../qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml index 060f65babee..8b1d201c048 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml @@ -66,7 +66,7 @@ Section { if (root.hasDesignerEffect) { root.effectNodeWrapper.deleteModelNode() } else { - modelNodeBackend.createModelNode(-1, "data", "DesignEffect", "QtQuick.Studio.DesignEffects") + modelNodeBackend.createModelNode(-1, "data", "DesignEffect", "QtQuick.Studio.DesignEffects") var effectNode = modelNodeBackend.allChildrenOfType("DesignEffect") modelNodeBackend.createModelNode(effectNode, "effects", "DesignDropShadow") } -- cgit v1.2.3 From 0496c872a311d73bcbc611d3aab7f13df0543fc5 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 21 Dec 2023 15:25:24 +0100 Subject: QmlDesigner: Allow to add a signal Change-Id: Ib34cb19c9a046d8a404c5be06099280f29686662 Reviewed-by: Tim Jenssen Reviewed-by: Qt CI Patch Build Bot --- .../imports/HelperWidgets/DynamicPropertiesSection.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml index 9b23842fe80..88a0debae80 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml @@ -708,7 +708,7 @@ Section { StudioControls.ComboBox { id: comboBox actionIndicator.visible: false - model: ["int", "real", "color", "string", "bool", "url", "alias", + model: ["int", "real", "color", "string", "bool", "url", "alias", "signal", "TextureInput", "vector2d", "vector3d", "vector4d"] width: cePopup.itemWidth } -- cgit v1.2.3 From 778688154d55719b2b53ff8747003cd0fb18bf2e Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Fri, 19 Apr 2024 15:47:20 +0300 Subject: QmlDesigner: Fix model editor layout issues on adding rows/columns Task-number: QDS-12352 Change-Id: Ie37d1afe2a243d08a09a55778cf0bf00de8f327c Reviewed-by: Ali Kianian Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../CollectionDetailsView.qml | 26 ++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml index e40a3c94577..2193bd1763e 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml @@ -252,37 +252,35 @@ Rectangle { function ensureRowIsVisible(row) { let rows = tableView.model.rowCount() - if (row < 0 || row >= rows) { - tableView.targetRow = -1 - return - } + let rowIsLoaded = tableView.isRowLoaded(row) + + if (row < 0 || row >= rows || rowIsLoaded) { + if (rowIsLoaded) + tableView.positionViewAtRow(row, Qt.AlignLeft | Qt.AlignTop) - if (tableView.isRowLoaded(row)) { - tableView.positionViewAtRow(row, Qt.AlignLeft | Qt.AlignTop) tableView.targetRow = -1 return } tableView.targetRow = row - verticalScrollBar.position = row / rows + tableView.positionViewAtRow(row, Qt.AlignLeft | Qt.AlignTop) ensureTimer.start() } function ensureColumnIsVisible(column) { let columns = tableView.model.columnCount() - if (column < 0 || column >= columns) { - tableView.targetColumn = -1 - return - } + let columnIsLoaded = tableView.isColumnLoaded(column) + + if (column < 0 || column >= columns || columnIsLoaded) { + if (columnIsLoaded) + tableView.positionViewAtColumn(column, Qt.AlignLeft | Qt.AlignTop) - if (tableView.isColumnLoaded(column)) { - tableView.positionViewAtColumn(column, Qt.AlignLeft | Qt.AlignTop) tableView.targetColumn = -1 return } tableView.targetColumn = column - horizontalScrollBar.position = column / columns + tableView.positionViewAtColumn(column, Qt.AlignLeft | Qt.AlignTop) ensureTimer.start() } -- cgit v1.2.3 From dad555a088062f585e2c15370d8fe8963801358e Mon Sep 17 00:00:00 2001 From: Shrief Gabr Date: Wed, 17 Apr 2024 10:34:17 +0300 Subject: QmlDesigner: Fix save indicator behavior on selection change Task-number: QDS-12499 Change-Id: If91aab8d133a9269d9fc381ea0a130d3953aa69d Reviewed-by: Ali Kianian Reviewed-by: Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Mahmoud Badri --- .../CollectionDetailsToolbar.qml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml index 852341b9d5d..e7997f7eae6 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml @@ -17,7 +17,6 @@ Rectangle { required property var model required property var backend property int selectedRow: -1 - property bool hasUnsavedChanges: false implicitHeight: StudioTheme.Values.toolbarHeight color: StudioTheme.Values.themeToolbarBackground @@ -35,14 +34,6 @@ Rectangle { fileDialog.reject() } - Connections { - target: root.model - - function onDataChanged() { - hasUnsavedChanges = true - } - } - RowLayout { id: container @@ -131,8 +122,8 @@ Rectangle { buttonIcon: StudioTheme.Constants.save_medium tooltip: qsTr("Save changes") - enabled: root.model.collectionName !== "" && root.hasUnsavedChanges - onClicked: hasUnsavedChanges = !root.model.saveDataStoreCollections() + enabled: root.model.collectionName !== "" && root.model.hasUnsavedChanges + onClicked: root.model.saveDataStoreCollections() Rectangle { width: StudioTheme.Values.smallStatusIndicatorDiameter @@ -140,7 +131,7 @@ Rectangle { radius: StudioTheme.Values.smallStatusIndicatorDiameter / 2 anchors.right: parent.right anchors.top: parent.top - visible: hasUnsavedChanges + visible: root.model.hasUnsavedChanges color: StudioTheme.Values.themeIconColorSelected } } -- cgit v1.2.3 From bb6110082a51db2a0c9bea8ca9390840b6c4c431 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 22 Apr 2024 14:48:33 +0200 Subject: QmlDesigner: Hide visible CheckBox EffectsSection Hide the visible CheckBox in the EffectsSection when there is no effect currently added to the item. Change-Id: I68dede067a92bf5f733c582424ed5b2c2745e651 Reviewed-by: Thomas Hartmann --- .../propertyEditorQmlSources/QtQuick/EffectsSection.qml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml index 8b1d201c048..b640d82d0ba 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml @@ -75,9 +75,14 @@ Section { } } - PropertyLabel { text: qsTr("Visibility") } + PropertyLabel { + text: qsTr("Visibility") + visible: root.hasDesignerEffect + } SecondColumnLayout { + visible: root.hasDesignerEffect + CheckBox { text: qsTr("Visible") implicitWidth: StudioTheme.Values.twoControlColumnWidth @@ -90,6 +95,7 @@ Section { } Item { + visible: root.hasDesignerEffect width: 1 height: StudioTheme.Values.sectionHeadSpacerHeight } @@ -444,6 +450,7 @@ Section { } Item { + visible: root.hasDesignerEffect width: 1 height: StudioTheme.Values.sectionHeadSpacerHeight } -- cgit v1.2.3 From d83e7d3d3d6c4f436a774e217d42d5a0c275517b Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Mon, 22 Apr 2024 17:09:16 +0200 Subject: QmlDesigner: Add proper ranges in EffectsSection Change-Id: If3f8b395c9a63c535f43be84d7a855196c67769e Reviewed-by: Thomas Hartmann --- .../propertyEditorQmlSources/QtQuick/EffectsSection.qml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml index b640d82d0ba..056bd5fd602 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/EffectsSection.qml @@ -213,6 +213,8 @@ Section { implicitWidth: StudioTheme.Values.twoControlColumnWidth + StudioTheme.Values.actionIndicatorWidth backendValue: root.effectNodeWrapper.properties.layerBlurRadius + minimumValue: 0 + maximumValue: 250 } ExpandingSpacer {} @@ -252,6 +254,8 @@ Section { implicitWidth: StudioTheme.Values.twoControlColumnWidth + StudioTheme.Values.actionIndicatorWidth backendValue: root.effectNodeWrapper.properties.backgroundBlurRadius + minimumValue: 0 + maximumValue: 250 } ExpandingSpacer {} @@ -376,6 +380,8 @@ Section { implicitWidth: StudioTheme.Values.twoControlColumnWidth + StudioTheme.Values.actionIndicatorWidth backendValue: delegate.wrapper.properties.blur + minimumValue: 0 + maximumValue: 250 } ExpandingSpacer {} @@ -392,6 +398,8 @@ Section { + StudioTheme.Values.actionIndicatorWidth backendValue: delegate.wrapper.properties.spread enabled: modelNodeBackend.isInstanceOf("Rectangle") + minimumValue: -2048 + maximumValue: 2048 } ExpandingSpacer {} @@ -414,8 +422,8 @@ Section { implicitWidth: StudioTheme.Values.twoControlColumnWidth + StudioTheme.Values.actionIndicatorWidth backendValue: delegate.wrapper.properties.offsetX - maximumValue: 0xffff minimumValue: -0xffff + maximumValue: 0xffff } Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } @@ -431,8 +439,8 @@ Section { implicitWidth: StudioTheme.Values.twoControlColumnWidth + StudioTheme.Values.actionIndicatorWidth backendValue: delegate.wrapper.properties.offsetY - maximumValue: 0xffff minimumValue: -0xffff + maximumValue: 0xffff } Spacer { implicitWidth: StudioTheme.Values.controlLabelGap } -- cgit v1.2.3 From e262ec1ebbb51402fdd8583e51f131ee5f04e3a6 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 3 Apr 2024 16:38:23 +0200 Subject: QmlDesigner: Integrate item library entries from project storage Task-number: QDS-12102 Change-Id: Id6fbfcfb44d3b8c290f5e5d74addf33ef4d9a5e5 Reviewed-by: Thomas Hartmann Reviewed-by: Qt CI Patch Build Bot --- .../itemLibrary/images/ambient-sound-16.png | Bin 0 -> 315 bytes .../itemLibrary/images/ambient-sound-24.png | Bin 0 -> 514 bytes .../itemLibrary/images/ambient-sound-24@2x.png | Bin 0 -> 1846 bytes .../itemLibrary/images/animated-image-icon.png | Bin 0 -> 298 bytes .../itemLibrary/images/animated-image-icon16.png | Bin 0 -> 211 bytes .../itemLibrary/images/animated-image-icon@2x.png | Bin 0 -> 342 bytes .../itemLibrary/images/animatedsprite-loading.png | Bin 0 -> 118 bytes .../itemLibrary/images/audio-engine-16.png | Bin 0 -> 363 bytes .../itemLibrary/images/audio-engine-24.png | Bin 0 -> 472 bytes .../itemLibrary/images/audio-engine-24@2x.png | Bin 0 -> 803 bytes .../itemLibrary/images/audio-listener-16.png | Bin 0 -> 311 bytes .../itemLibrary/images/audio-listener-24.png | Bin 0 -> 924 bytes .../itemLibrary/images/audio-listener-24@2x.png | Bin 0 -> 1691 bytes .../itemLibrary/images/audio-output-16px.png | Bin 0 -> 359 bytes .../itemLibrary/images/audio-output-24px.png | Bin 0 -> 595 bytes .../itemLibrary/images/audio-output-24px@2x.png | Bin 0 -> 1129 bytes .../itemLibrary/images/audio-room-16.png | Bin 0 -> 276 bytes .../itemLibrary/images/audio-room-24.png | Bin 0 -> 419 bytes .../itemLibrary/images/audio-room-24@2x.png | Bin 0 -> 878 bytes .../itemLibrary/images/border-image-icon.png | Bin 0 -> 299 bytes .../itemLibrary/images/border-image-icon16.png | Bin 0 -> 228 bytes .../itemLibrary/images/border-image-icon@2x.png | Bin 0 -> 386 bytes .../itemLibrary/images/busyindicator-icon.png | Bin 0 -> 320 bytes .../itemLibrary/images/busyindicator-icon16.png | Bin 0 -> 229 bytes .../itemLibrary/images/busyindicator-icon@2x.png | Bin 0 -> 643 bytes .../qmldesigner/itemLibrary/images/button-icon.png | Bin 0 -> 162 bytes .../itemLibrary/images/button-icon16.png | Bin 0 -> 145 bytes .../itemLibrary/images/button-icon@2x.png | Bin 0 -> 259 bytes .../itemLibrary/images/checkbox-icon.png | Bin 0 -> 258 bytes .../itemLibrary/images/checkbox-icon16.png | Bin 0 -> 230 bytes .../itemLibrary/images/checkbox-icon@2x.png | Bin 0 -> 336 bytes .../images/column-positioner-icon-16px.png | Bin 0 -> 113 bytes .../itemLibrary/images/column-positioner-icon.png | Bin 0 -> 118 bytes .../images/column-positioner-icon@2x.png | Bin 0 -> 121 bytes .../itemLibrary/images/combobox-icon.png | Bin 0 -> 156 bytes .../itemLibrary/images/combobox-icon16.png | Bin 0 -> 155 bytes .../itemLibrary/images/combobox-icon@2x.png | Bin 0 -> 185 bytes .../itemLibrary/images/component-icon.png | Bin 0 -> 626 bytes .../itemLibrary/images/component-icon16.png | Bin 0 -> 438 bytes .../itemLibrary/images/component-icon@2x.png | Bin 0 -> 1107 bytes .../itemLibrary/images/control-icon.png | Bin 0 -> 293 bytes .../itemLibrary/images/control-icon16.png | Bin 0 -> 229 bytes .../itemLibrary/images/control-icon@2x.png | Bin 0 -> 509 bytes .../itemLibrary/images/default-icon.png | Bin 0 -> 813 bytes .../qmldesigner/itemLibrary/images/default3d.png | Bin 0 -> 375 bytes .../qmldesigner/itemLibrary/images/default3d16.png | Bin 0 -> 253 bytes .../itemLibrary/images/default3d@2x.png | Bin 0 -> 499 bytes .../itemLibrary/images/delaybutton-icon.png | Bin 0 -> 189 bytes .../itemLibrary/images/delaybutton-icon16.png | Bin 0 -> 160 bytes .../itemLibrary/images/delaybutton-icon@2x.png | Bin 0 -> 286 bytes .../qmldesigner/itemLibrary/images/dial-icon.png | Bin 0 -> 267 bytes .../qmldesigner/itemLibrary/images/dial-icon16.png | Bin 0 -> 243 bytes .../itemLibrary/images/dial-icon@2x.png | Bin 0 -> 505 bytes .../itemLibrary/images/drop-area-16px.png | Bin 0 -> 205 bytes .../itemLibrary/images/drop-area-24px.png | Bin 0 -> 490 bytes .../itemLibrary/images/drop-area-24px@2x.png | Bin 0 -> 638 bytes .../itemLibrary/images/extended-view3d-16px.png | Bin 0 -> 311 bytes .../itemLibrary/images/extended-view3d-24px.png | Bin 0 -> 384 bytes .../itemLibrary/images/extended-view3d-24px@2x.png | Bin 0 -> 674 bytes .../itemLibrary/images/flickable-icon.png | Bin 0 -> 246 bytes .../itemLibrary/images/flickable-icon16.png | Bin 0 -> 209 bytes .../itemLibrary/images/flickable-icon@2x.png | Bin 0 -> 322 bytes .../itemLibrary/images/flipable-icon.png | Bin 0 -> 678 bytes .../itemLibrary/images/flipable-icon16.png | Bin 0 -> 466 bytes .../images/flow-positioner-icon-16px.png | Bin 0 -> 98 bytes .../itemLibrary/images/flow-positioner-icon.png | Bin 0 -> 101 bytes .../itemLibrary/images/flow-positioner-icon@2x.png | Bin 0 -> 129 bytes .../itemLibrary/images/focusscope-icon.png | Bin 0 -> 143 bytes .../itemLibrary/images/focusscope-icon16.png | Bin 0 -> 161 bytes .../itemLibrary/images/focusscope-icon@2x.png | Bin 0 -> 182 bytes .../qmldesigner/itemLibrary/images/frame-icon.png | Bin 0 -> 121 bytes .../itemLibrary/images/frame-icon16.png | Bin 0 -> 117 bytes .../itemLibrary/images/frame-icon@2x.png | Bin 0 -> 125 bytes .../images/grid-positioner-icon-16px.png | Bin 0 -> 93 bytes .../itemLibrary/images/grid-positioner-icon.png | Bin 0 -> 97 bytes .../itemLibrary/images/grid-positioner-icon@2x.png | Bin 0 -> 125 bytes .../itemLibrary/images/gridview-icon.png | Bin 0 -> 127 bytes .../itemLibrary/images/gridview-icon16.png | Bin 0 -> 102 bytes .../itemLibrary/images/gridview-icon@2x.png | Bin 0 -> 137 bytes .../itemLibrary/images/groupbox-icon.png | Bin 0 -> 133 bytes .../itemLibrary/images/groupbox-icon16.png | Bin 0 -> 125 bytes .../itemLibrary/images/groupbox-icon@2x.png | Bin 0 -> 136 bytes .../qmldesigner/itemLibrary/images/image-icon.png | Bin 0 -> 434 bytes .../itemLibrary/images/image-icon16.png | Bin 0 -> 296 bytes .../itemLibrary/images/image-icon@2x.png | Bin 0 -> 596 bytes .../qmldesigner/itemLibrary/images/item-icon.png | Bin 0 -> 148 bytes .../qmldesigner/itemLibrary/images/item-icon16.png | Bin 0 -> 135 bytes .../itemLibrary/images/item-icon@2x.png | Bin 0 -> 167 bytes .../itemLibrary/images/itemdelegate-icon.png | Bin 0 -> 127 bytes .../itemLibrary/images/itemdelegate-icon16.png | Bin 0 -> 124 bytes .../itemLibrary/images/itemdelegate-icon@2x.png | Bin 0 -> 133 bytes .../itemLibrary/images/keyframe-16px.png | Bin 0 -> 190 bytes .../qmldesigner/itemLibrary/images/label-icon.png | Bin 0 -> 206 bytes .../itemLibrary/images/label-icon16.png | Bin 0 -> 182 bytes .../itemLibrary/images/label-icon@2x.png | Bin 0 -> 284 bytes .../itemLibrary/images/listview-icon.png | Bin 0 -> 148 bytes .../itemLibrary/images/listview-icon16.png | Bin 0 -> 136 bytes .../itemLibrary/images/listview-icon@2x.png | Bin 0 -> 158 bytes .../qmldesigner/itemLibrary/images/loader-icon.png | Bin 0 -> 321 bytes .../itemLibrary/images/loader-icon16.png | Bin 0 -> 222 bytes .../itemLibrary/images/loader-icon@2x.png | Bin 0 -> 483 bytes .../itemLibrary/images/media-player-16px.png | Bin 0 -> 148 bytes .../itemLibrary/images/media-player-24px.png | Bin 0 -> 179 bytes .../itemLibrary/images/media-player-24px@2x.png | Bin 0 -> 260 bytes .../itemLibrary/images/mouse-area-icon.png | Bin 0 -> 358 bytes .../itemLibrary/images/mouse-area-icon16.png | Bin 0 -> 263 bytes .../itemLibrary/images/mouse-area-icon@2x.png | Bin 0 -> 755 bytes .../qmldesigner/itemLibrary/images/page-icon.png | Bin 0 -> 190 bytes .../qmldesigner/itemLibrary/images/page-icon16.png | Bin 0 -> 148 bytes .../itemLibrary/images/page-icon@2x.png | Bin 0 -> 195 bytes .../itemLibrary/images/pageindicator-icon.png | Bin 0 -> 179 bytes .../itemLibrary/images/pageindicator-icon16.png | Bin 0 -> 158 bytes .../itemLibrary/images/pageindicator-icon@2x.png | Bin 0 -> 207 bytes .../qmldesigner/itemLibrary/images/pane-icon.png | Bin 0 -> 93 bytes .../qmldesigner/itemLibrary/images/pane-icon16.png | Bin 0 -> 92 bytes .../itemLibrary/images/pane-icon@2x.png | Bin 0 -> 96 bytes .../itemLibrary/images/pathview-icon.png | Bin 0 -> 457 bytes .../itemLibrary/images/pathview-icon16.png | Bin 0 -> 320 bytes .../itemLibrary/images/pathview-icon@2x.png | Bin 0 -> 864 bytes .../itemLibrary/images/progressbar-icon.png | Bin 0 -> 101 bytes .../itemLibrary/images/progressbar-icon16.png | Bin 0 -> 92 bytes .../itemLibrary/images/progressbar-icon@2x.png | Bin 0 -> 127 bytes .../itemLibrary/images/radiobutton-icon.png | Bin 0 -> 279 bytes .../itemLibrary/images/radiobutton-icon16.png | Bin 0 -> 218 bytes .../itemLibrary/images/radiobutton-icon@2x.png | Bin 0 -> 482 bytes .../itemLibrary/images/rangeslider-icon.png | Bin 0 -> 269 bytes .../itemLibrary/images/rangeslider-icon16.png | Bin 0 -> 231 bytes .../itemLibrary/images/rangeslider-icon@2x.png | Bin 0 -> 282 bytes .../qmldesigner/itemLibrary/images/rect-icon.png | Bin 0 -> 169 bytes .../qmldesigner/itemLibrary/images/rect-icon16.png | Bin 0 -> 135 bytes .../itemLibrary/images/rect-icon@2x.png | Bin 0 -> 237 bytes .../itemLibrary/images/repeater-icon.png | Bin 0 -> 191 bytes .../itemLibrary/images/repeater-icon16.png | Bin 0 -> 187 bytes .../itemLibrary/images/repeater-icon@2x.png | Bin 0 -> 196 bytes .../itemLibrary/images/roundbutton-icon.png | Bin 0 -> 229 bytes .../itemLibrary/images/roundbutton-icon16.png | Bin 0 -> 186 bytes .../itemLibrary/images/roundbutton-icon@2x.png | Bin 0 -> 381 bytes .../images/row-positioner-icon-16px.png | Bin 0 -> 115 bytes .../itemLibrary/images/row-positioner-icon.png | Bin 0 -> 120 bytes .../itemLibrary/images/row-positioner-icon@2x.png | Bin 0 -> 126 bytes .../itemLibrary/images/scrollview-icon.png | Bin 0 -> 110 bytes .../itemLibrary/images/scrollview-icon16.png | Bin 0 -> 116 bytes .../itemLibrary/images/scrollview-icon@2x.png | Bin 0 -> 145 bytes .../qmldesigner/itemLibrary/images/slider-icon.png | Bin 0 -> 190 bytes .../itemLibrary/images/slider-icon16.png | Bin 0 -> 156 bytes .../itemLibrary/images/slider-icon@2x.png | Bin 0 -> 227 bytes .../itemLibrary/images/spatial-audio-16.png | Bin 0 -> 319 bytes .../itemLibrary/images/spatial-audio-24.png | Bin 0 -> 664 bytes .../itemLibrary/images/spatial-audio-24@2x.png | Bin 0 -> 1536 bytes .../itemLibrary/images/spinbox-icon.png | Bin 0 -> 144 bytes .../itemLibrary/images/spinbox-icon16.png | Bin 0 -> 151 bytes .../itemLibrary/images/spinbox-icon@2x.png | Bin 0 -> 178 bytes .../itemLibrary/images/stackview-icon.png | Bin 0 -> 162 bytes .../itemLibrary/images/stackview-icon16.png | Bin 0 -> 151 bytes .../itemLibrary/images/stackview-icon@2x.png | Bin 0 -> 167 bytes .../itemLibrary/images/swipeview-icon.png | Bin 0 -> 163 bytes .../itemLibrary/images/swipeview-icon16.png | Bin 0 -> 152 bytes .../itemLibrary/images/swipeview-icon@2x.png | Bin 0 -> 184 bytes .../qmldesigner/itemLibrary/images/switch-icon.png | Bin 0 -> 205 bytes .../itemLibrary/images/switch-icon16.png | Bin 0 -> 160 bytes .../itemLibrary/images/switch-icon@2x.png | Bin 0 -> 314 bytes .../itemLibrary/images/text-edit-icon.png | Bin 0 -> 150 bytes .../itemLibrary/images/text-edit-icon16.png | Bin 0 -> 169 bytes .../itemLibrary/images/text-edit-icon@2x.png | Bin 0 -> 193 bytes .../qmldesigner/itemLibrary/images/text-icon.png | Bin 0 -> 126 bytes .../qmldesigner/itemLibrary/images/text-icon16.png | Bin 0 -> 141 bytes .../itemLibrary/images/text-icon@2x.png | Bin 0 -> 156 bytes .../itemLibrary/images/text-input-icon.png | Bin 0 -> 158 bytes .../itemLibrary/images/text-input-icon16.png | Bin 0 -> 140 bytes .../itemLibrary/images/text-input-icon@2x.png | Bin 0 -> 170 bytes .../itemLibrary/images/textarea-icon.png | Bin 0 -> 149 bytes .../itemLibrary/images/textarea-icon16.png | Bin 0 -> 133 bytes .../itemLibrary/images/textarea-icon@2x.png | Bin 0 -> 163 bytes .../itemLibrary/images/textfield-icon.png | Bin 0 -> 154 bytes .../itemLibrary/images/textfield-icon16.png | Bin 0 -> 147 bytes .../itemLibrary/images/textfield-icon@2x.png | Bin 0 -> 172 bytes .../itemLibrary/images/timeline-16px.png | Bin 0 -> 389 bytes .../itemLibrary/images/timeline-animation-16px.png | Bin 0 -> 296 bytes .../qmldesigner/itemLibrary/images/timer-16px.png | Bin 0 -> 339 bytes .../qmldesigner/itemLibrary/images/timer-24px.png | Bin 0 -> 712 bytes .../itemLibrary/images/timer-24px@2x.png | Bin 0 -> 1305 bytes .../itemLibrary/images/toolbar-icon.png | Bin 0 -> 131 bytes .../itemLibrary/images/toolbar-icon16.png | Bin 0 -> 114 bytes .../itemLibrary/images/toolbar-icon@2x.png | Bin 0 -> 140 bytes .../itemLibrary/images/toolbutton-icon.png | Bin 0 -> 141 bytes .../itemLibrary/images/toolbutton-icon16.png | Bin 0 -> 128 bytes .../itemLibrary/images/toolbutton-icon@2x.png | Bin 0 -> 158 bytes .../itemLibrary/images/toolseparator-icon.png | Bin 0 -> 111 bytes .../itemLibrary/images/toolseparator-icon16.png | Bin 0 -> 123 bytes .../itemLibrary/images/toolseparator-icon@2x.png | Bin 0 -> 131 bytes .../itemLibrary/images/tumbler-icon.png | Bin 0 -> 132 bytes .../itemLibrary/images/tumbler-icon16.png | Bin 0 -> 127 bytes .../itemLibrary/images/tumbler-icon@2x.png | Bin 0 -> 153 bytes .../qmldesigner/itemLibrary/images/video-16px.png | Bin 0 -> 216 bytes .../qmldesigner/itemLibrary/images/video-24px.png | Bin 0 -> 286 bytes .../itemLibrary/images/video-24px@2x.png | Bin 0 -> 399 bytes .../itemLibrary/images/video-output-16px.png | Bin 0 -> 289 bytes .../itemLibrary/images/video-output-24px.png | Bin 0 -> 387 bytes .../itemLibrary/images/video-output-24px@2x.png | Bin 0 -> 610 bytes .../itemLibrary/images/webview-icon.png | Bin 0 -> 804 bytes .../itemLibrary/images/webview-icon16.png | Bin 0 -> 519 bytes .../qmldesigner/itemLibrary/multimedia.metainfo | 84 +++ .../qtcreator/qmldesigner/itemLibrary/qml.metainfo | 53 ++ .../itemLibrary/qtquickcontrols2.metainfo | 575 ++++++++++++++ .../qmldesigner/itemLibrary/quick.metainfo | 569 ++++++++++++++ .../qmldesigner/itemLibrary/quick3d.metainfo | 125 +++ .../propertyEditorQmlSources/quick.metainfo | 837 --------------------- 207 files changed, 1406 insertions(+), 837 deletions(-) create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/animatedsprite-loading.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-output-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-room-16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/button-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/button-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/button-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/component-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/component-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/component-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/control-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/control-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/control-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/default-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/default3d.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/default3d16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/default3d@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/dial-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/dial-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/dial-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/drop-area-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/frame-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/frame-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/frame-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/image-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/image-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/image-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/item-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/item-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/item-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/keyframe-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/label-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/label-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/label-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/listview-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/listview-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/listview-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/loader-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/loader-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/loader-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/media-player-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/page-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/page-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/page-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pane-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pane-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pane-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/rect-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/rect-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/rect-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/slider-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/slider-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/slider-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/switch-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/switch-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/switch-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/timeline-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/timeline-animation-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/timer-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/timer-24px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/timer-24px@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/video-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/video-24px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/video-24px@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/video-output-16px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px@2x.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/webview-icon.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/images/webview-icon16.png create mode 100644 share/qtcreator/qmldesigner/itemLibrary/multimedia.metainfo create mode 100644 share/qtcreator/qmldesigner/itemLibrary/qml.metainfo create mode 100644 share/qtcreator/qmldesigner/itemLibrary/qtquickcontrols2.metainfo create mode 100644 share/qtcreator/qmldesigner/itemLibrary/quick.metainfo create mode 100644 share/qtcreator/qmldesigner/itemLibrary/quick3d.metainfo delete mode 100644 share/qtcreator/qmldesigner/propertyEditorQmlSources/quick.metainfo (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-16.png new file mode 100644 index 00000000000..6b16d813978 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24.png new file mode 100644 index 00000000000..0549a847587 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24@2x.png new file mode 100644 index 00000000000..8876f95ae6e Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/ambient-sound-24@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon.png new file mode 100644 index 00000000000..71371f97a35 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon16.png new file mode 100644 index 00000000000..86b80e95ab5 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon@2x.png new file mode 100644 index 00000000000..4ad2a9011b2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/animated-image-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/animatedsprite-loading.png b/share/qtcreator/qmldesigner/itemLibrary/images/animatedsprite-loading.png new file mode 100644 index 00000000000..ff2bbbd140f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/animatedsprite-loading.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-16.png new file mode 100644 index 00000000000..da40bc69a2b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24.png new file mode 100644 index 00000000000..b3ebdf745b7 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24@2x.png new file mode 100644 index 00000000000..476df8640fc Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-engine-24@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-16.png new file mode 100644 index 00000000000..ecc583b859a Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24.png new file mode 100644 index 00000000000..ee181f57cc8 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24@2x.png new file mode 100644 index 00000000000..2588277e531 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-listener-24@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-16px.png new file mode 100644 index 00000000000..6ae703de646 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px.png new file mode 100644 index 00000000000..f2133ca7167 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px@2x.png new file mode 100644 index 00000000000..9336b81b6e8 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-output-24px@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-16.png new file mode 100644 index 00000000000..98f245d6240 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24.png new file mode 100644 index 00000000000..294d1574ae6 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24@2x.png new file mode 100644 index 00000000000..bef7f80e3ec Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/audio-room-24@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon.png new file mode 100644 index 00000000000..5418a0f55ad Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon16.png new file mode 100644 index 00000000000..17f7ed0688a Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon@2x.png new file mode 100644 index 00000000000..fb4fb339103 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/border-image-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon.png new file mode 100644 index 00000000000..666d1ed93f7 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon16.png new file mode 100644 index 00000000000..5aa57d7f488 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon@2x.png new file mode 100644 index 00000000000..bb2278ff899 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/busyindicator-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/button-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon.png new file mode 100644 index 00000000000..c44909f6dde Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/button-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon16.png new file mode 100644 index 00000000000..5c921deb136 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/button-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon@2x.png new file mode 100644 index 00000000000..f90a1ba7dce Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/button-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon.png new file mode 100644 index 00000000000..ee669b3a888 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon16.png new file mode 100644 index 00000000000..8d89eab8413 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon@2x.png new file mode 100644 index 00000000000..51c5601de02 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/checkbox-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon-16px.png new file mode 100644 index 00000000000..8d963e2bab5 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon.png new file mode 100644 index 00000000000..0cd116d13cd Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon@2x.png new file mode 100644 index 00000000000..3247384285d Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/column-positioner-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon.png new file mode 100644 index 00000000000..2d31b17c65f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon16.png new file mode 100644 index 00000000000..15fc3505ba2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon@2x.png new file mode 100644 index 00000000000..5f82390596b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/combobox-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/component-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon.png new file mode 100644 index 00000000000..9c7df42bc70 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/component-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon16.png new file mode 100644 index 00000000000..99941541c6f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/component-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon@2x.png new file mode 100644 index 00000000000..f66349a63b2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/component-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/control-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon.png new file mode 100644 index 00000000000..fd9e4e8ff3f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/control-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon16.png new file mode 100644 index 00000000000..31c765483e2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/control-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon@2x.png new file mode 100644 index 00000000000..22604d24925 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/control-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/default-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/default-icon.png new file mode 100644 index 00000000000..564226e949b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/default-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/default3d.png b/share/qtcreator/qmldesigner/itemLibrary/images/default3d.png new file mode 100644 index 00000000000..a3b6c7f6f24 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/default3d.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/default3d16.png b/share/qtcreator/qmldesigner/itemLibrary/images/default3d16.png new file mode 100644 index 00000000000..de8906a724d Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/default3d16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/default3d@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/default3d@2x.png new file mode 100644 index 00000000000..7ca04a01eaa Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/default3d@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon.png new file mode 100644 index 00000000000..5a55bd9f77a Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon16.png new file mode 100644 index 00000000000..cd21394e465 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon@2x.png new file mode 100644 index 00000000000..7beee2fab0e Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/delaybutton-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon.png new file mode 100644 index 00000000000..b3b63e35235 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon16.png new file mode 100644 index 00000000000..8d8c7c09b05 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon@2x.png new file mode 100644 index 00000000000..22547a16b83 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/dial-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-16px.png new file mode 100644 index 00000000000..278690f07f2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px.png new file mode 100644 index 00000000000..a286efb0324 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px@2x.png new file mode 100644 index 00000000000..47abb7f9e3a Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/drop-area-24px@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-16px.png new file mode 100644 index 00000000000..d9027813d05 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px.png new file mode 100644 index 00000000000..a8a0bf65a46 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px@2x.png new file mode 100644 index 00000000000..a2f7bf93d37 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/extended-view3d-24px@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon.png new file mode 100644 index 00000000000..bdc22539596 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon16.png new file mode 100644 index 00000000000..d7ab9de8a7d Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon@2x.png new file mode 100644 index 00000000000..b28b0fa4d9b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/flickable-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon.png new file mode 100644 index 00000000000..1f5f6966c04 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon16.png new file mode 100644 index 00000000000..cf252f08b8c Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/flipable-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon-16px.png new file mode 100644 index 00000000000..67be7b474d6 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon.png new file mode 100644 index 00000000000..f8fa80970eb Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon@2x.png new file mode 100644 index 00000000000..fc3deff8499 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/flow-positioner-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon.png new file mode 100644 index 00000000000..0dff9a075d1 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon16.png new file mode 100644 index 00000000000..50c6f75cd81 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon@2x.png new file mode 100644 index 00000000000..b3ffdea6ebb Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/focusscope-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon.png new file mode 100644 index 00000000000..32abc8bf1e6 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon16.png new file mode 100644 index 00000000000..e5b65ad53bb Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon@2x.png new file mode 100644 index 00000000000..8b876f38ec8 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/frame-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon-16px.png new file mode 100644 index 00000000000..47b34f9d14b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon.png new file mode 100644 index 00000000000..10d0b69a7bc Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon@2x.png new file mode 100644 index 00000000000..4374b60e7a6 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/grid-positioner-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon.png new file mode 100644 index 00000000000..7457fbd7e19 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon16.png new file mode 100644 index 00000000000..038a02ed86b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon@2x.png new file mode 100644 index 00000000000..af233a0df3c Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/gridview-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon.png new file mode 100644 index 00000000000..5542ecf8bf7 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon16.png new file mode 100644 index 00000000000..9cf4324819f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon@2x.png new file mode 100644 index 00000000000..80dab3c716a Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/groupbox-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/image-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon.png new file mode 100644 index 00000000000..318ce0874a5 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/image-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon16.png new file mode 100644 index 00000000000..3aa46b61062 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/image-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon@2x.png new file mode 100644 index 00000000000..cc849189756 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/image-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/item-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon.png new file mode 100644 index 00000000000..af81cdfdb17 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/item-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon16.png new file mode 100644 index 00000000000..46d3ec1dbc1 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/item-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon@2x.png new file mode 100644 index 00000000000..f05aa57c2f5 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/item-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon.png new file mode 100644 index 00000000000..822cf3e7b8b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon16.png new file mode 100644 index 00000000000..b3ed007a0e3 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon@2x.png new file mode 100644 index 00000000000..cb81308ff8d Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/itemdelegate-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/keyframe-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/keyframe-16px.png new file mode 100644 index 00000000000..6e1c9f912a2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/keyframe-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/label-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon.png new file mode 100644 index 00000000000..788bef078ce Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/label-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon16.png new file mode 100644 index 00000000000..b68d3845685 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/label-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon@2x.png new file mode 100644 index 00000000000..7001413d3b0 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/label-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon.png new file mode 100644 index 00000000000..5a2f3c203b4 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon16.png new file mode 100644 index 00000000000..2657bf21814 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon@2x.png new file mode 100644 index 00000000000..b1d3fb67d27 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/listview-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon.png new file mode 100644 index 00000000000..29082eacf16 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon16.png new file mode 100644 index 00000000000..4a2b093259e Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon@2x.png new file mode 100644 index 00000000000..750b13bd02d Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/loader-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/media-player-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-16px.png new file mode 100644 index 00000000000..515287a8462 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px.png new file mode 100644 index 00000000000..1b31ddc8260 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px@2x.png new file mode 100644 index 00000000000..86ae5914aca Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/media-player-24px@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon.png new file mode 100644 index 00000000000..fe316caf8d8 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon16.png new file mode 100644 index 00000000000..bc8725fb5ff Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon@2x.png new file mode 100644 index 00000000000..04a25e13db3 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/mouse-area-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/page-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon.png new file mode 100644 index 00000000000..b5ac87e8991 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/page-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon16.png new file mode 100644 index 00000000000..bc6810b6053 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/page-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon@2x.png new file mode 100644 index 00000000000..23db032f4ab Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/page-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon.png new file mode 100644 index 00000000000..edb6b377bbd Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon16.png new file mode 100644 index 00000000000..0fb8967564c Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon@2x.png new file mode 100644 index 00000000000..7be0ee813ba Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pageindicator-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon.png new file mode 100644 index 00000000000..62ebe487ffe Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon16.png new file mode 100644 index 00000000000..2b8048441c3 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon@2x.png new file mode 100644 index 00000000000..55bb116a699 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pane-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon.png new file mode 100644 index 00000000000..8dc82b8196a Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon16.png new file mode 100644 index 00000000000..a6a61f61b21 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon@2x.png new file mode 100644 index 00000000000..d654a8e7e62 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/pathview-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon.png new file mode 100644 index 00000000000..a023f73c30f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon16.png new file mode 100644 index 00000000000..6fede21d8c2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon@2x.png new file mode 100644 index 00000000000..00694003356 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/progressbar-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon.png new file mode 100644 index 00000000000..d38170e22f7 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon16.png new file mode 100644 index 00000000000..07b46a8ab08 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon@2x.png new file mode 100644 index 00000000000..4bbddda4b25 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/radiobutton-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon.png new file mode 100644 index 00000000000..1c4c7b29487 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon16.png new file mode 100644 index 00000000000..3be4624ddd4 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon@2x.png new file mode 100644 index 00000000000..aee69b3302f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/rangeslider-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon.png new file mode 100644 index 00000000000..3997195f72c Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon16.png new file mode 100644 index 00000000000..72893106ae9 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon@2x.png new file mode 100644 index 00000000000..150fa50ea2f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/rect-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon.png new file mode 100644 index 00000000000..efe3ca80b46 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon16.png new file mode 100644 index 00000000000..775a57a38c3 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon@2x.png new file mode 100644 index 00000000000..bb541b67112 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/repeater-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon.png new file mode 100644 index 00000000000..d4b470dc25b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon16.png new file mode 100644 index 00000000000..f6f3666639e Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon@2x.png new file mode 100644 index 00000000000..4553e165e75 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/roundbutton-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon-16px.png new file mode 100644 index 00000000000..1c5be822459 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon.png new file mode 100644 index 00000000000..a7e654c9183 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon@2x.png new file mode 100644 index 00000000000..48c99f8c0e0 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/row-positioner-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon.png new file mode 100644 index 00000000000..5ef73ff19f5 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png new file mode 100644 index 00000000000..f8ca7a36853 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon@2x.png new file mode 100644 index 00000000000..0eb7f9665ec Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/scrollview-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon.png new file mode 100644 index 00000000000..bd0a9729bea Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon16.png new file mode 100644 index 00000000000..a08622df89c Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon@2x.png new file mode 100644 index 00000000000..93842e4cdde Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/slider-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-16.png b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-16.png new file mode 100644 index 00000000000..676fe134042 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24.png b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24.png new file mode 100644 index 00000000000..29f7f14db30 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24@2x.png new file mode 100644 index 00000000000..a518cada63b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/spatial-audio-24@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon.png new file mode 100644 index 00000000000..37277c5e43c Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon16.png new file mode 100644 index 00000000000..f88711dd25f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon@2x.png new file mode 100644 index 00000000000..b62a3bad512 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/spinbox-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon.png new file mode 100644 index 00000000000..a6ced34925b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon16.png new file mode 100644 index 00000000000..0f19d0efa3e Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon@2x.png new file mode 100644 index 00000000000..9b5ef9517bd Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/stackview-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon.png new file mode 100644 index 00000000000..031cb27c367 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon16.png new file mode 100644 index 00000000000..446c4696900 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon@2x.png new file mode 100644 index 00000000000..0ccb978c469 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/swipeview-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon.png new file mode 100644 index 00000000000..e0181592860 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon16.png new file mode 100644 index 00000000000..9abd2756592 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon@2x.png new file mode 100644 index 00000000000..787f54ca41f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/switch-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon.png new file mode 100644 index 00000000000..068ebeef0f1 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon16.png new file mode 100644 index 00000000000..b96ed468cbe Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon@2x.png new file mode 100644 index 00000000000..3b7cb6d5da2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-edit-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon.png new file mode 100644 index 00000000000..29a81f5d6c9 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon16.png new file mode 100644 index 00000000000..ee7cc512cb0 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon@2x.png new file mode 100644 index 00000000000..1df8f765de4 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon.png new file mode 100644 index 00000000000..c743c220744 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon16.png new file mode 100644 index 00000000000..3ceef6d0371 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon@2x.png new file mode 100644 index 00000000000..666644d2d30 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/text-input-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon.png new file mode 100644 index 00000000000..f1b2dc0f84d Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon16.png new file mode 100644 index 00000000000..4afc1fbab56 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon@2x.png new file mode 100644 index 00000000000..c32ecc71a9a Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/textarea-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon.png new file mode 100644 index 00000000000..ba5537acefe Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon16.png new file mode 100644 index 00000000000..c4a62a6582b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon@2x.png new file mode 100644 index 00000000000..e05fd41b9a4 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/textfield-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timeline-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/timeline-16px.png new file mode 100644 index 00000000000..d4ecf00031f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/timeline-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timeline-animation-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/timeline-animation-16px.png new file mode 100644 index 00000000000..31b8fed6668 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/timeline-animation-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timer-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/timer-16px.png new file mode 100644 index 00000000000..c675d5a7072 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/timer-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px.png new file mode 100644 index 00000000000..bd9419aaa0c Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px@2x.png new file mode 100644 index 00000000000..ff2d487cc95 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/timer-24px@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon.png new file mode 100644 index 00000000000..5cb5b2e1af1 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon16.png new file mode 100644 index 00000000000..569373afa13 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon@2x.png new file mode 100644 index 00000000000..fd9e6ceebcc Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolbar-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon.png new file mode 100644 index 00000000000..3298f695190 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon16.png new file mode 100644 index 00000000000..9ab7861c25f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon@2x.png new file mode 100644 index 00000000000..e5958cded3f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolbutton-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon.png new file mode 100644 index 00000000000..5e99f06f2ef Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon16.png new file mode 100644 index 00000000000..68f22c5df1b Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon@2x.png new file mode 100644 index 00000000000..549c11c67cf Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/toolseparator-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon.png new file mode 100644 index 00000000000..98eb8232a26 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon16.png new file mode 100644 index 00000000000..ff5f95cf327 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon@2x.png new file mode 100644 index 00000000000..236abf0cfe2 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/tumbler-icon@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-16px.png new file mode 100644 index 00000000000..caf9c16a61d Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/video-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-24px.png new file mode 100644 index 00000000000..df1b84e5c99 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/video-24px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-24px@2x.png new file mode 100644 index 00000000000..4b9f31faf39 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/video-24px@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-output-16px.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-16px.png new file mode 100644 index 00000000000..f00afc52e97 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-16px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px.png new file mode 100644 index 00000000000..fd3c89c0817 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px@2x.png b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px@2x.png new file mode 100644 index 00000000000..0f651a1013f Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/video-output-24px@2x.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon.png b/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon.png new file mode 100644 index 00000000000..22904f2f8b9 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon16.png b/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon16.png new file mode 100644 index 00000000000..ac7be01bb71 Binary files /dev/null and b/share/qtcreator/qmldesigner/itemLibrary/images/webview-icon16.png differ diff --git a/share/qtcreator/qmldesigner/itemLibrary/multimedia.metainfo b/share/qtcreator/qmldesigner/itemLibrary/multimedia.metainfo new file mode 100644 index 00000000000..2e3616aa4b5 --- /dev/null +++ b/share/qtcreator/qmldesigner/itemLibrary/multimedia.metainfo @@ -0,0 +1,84 @@ +MetaInfo { + Type { + name: "QtMultimedia.MediaPlayer" + icon: "images/media-player-16px.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Media Player" + category: "f.Qt Quick - Multimedia" + libraryIcon: "images/media-player-24px.png" + version: "6.0" + requiredImport: "QtMultimedia" + } + } + + Type { + name: "QtMultimedia.AudioOutput" + icon: "images/audio-output-16px.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Audio Output" + category: "f.Qt Quick - Multimedia" + libraryIcon: "images/audio-output-24px.png" + version: "6.0" + requiredImport: "QtMultimedia" + } + } + + Type { + name: "QtMultimedia.VideoOutput" + icon: "images/video-output-16px.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Video Output" + category: "f.Qt Quick - Multimedia" + libraryIcon: "images/video-output-24px.png" + version: "6.0" + requiredImport: "QtMultimedia" + } + } + + Type { + name: "QtMultimedia.Video" + icon: "images/video-16px.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: true + canBeContainer: false + } + + ItemLibraryEntry { + name: "Video" + category: "f.Qt Quick - Multimedia" + libraryIcon: "images/video-24px.png" + version: "6.0" + requiredImport: "QtMultimedia" + + Property { name: "width"; type: "int"; value: 200; } + Property { name: "height"; type: "int"; value: 200; } + } + } +} diff --git a/share/qtcreator/qmldesigner/itemLibrary/qml.metainfo b/share/qtcreator/qmldesigner/itemLibrary/qml.metainfo new file mode 100644 index 00000000000..4bef02ddd39 --- /dev/null +++ b/share/qtcreator/qmldesigner/itemLibrary/qml.metainfo @@ -0,0 +1,53 @@ +MetaInfo { + + Type { + name: "QML.Component" + icon: "images/component-icon16.png" + + Hints { + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + } + + ItemLibraryEntry { + name: "Component" + category: "e.Qt Quick - Instancers" + libraryIcon: "images/component-icon.png" + version: "1.0" + + QmlSource { source: "source/component.qml" } + toolTip: qsTr("Allows you to define components inline, within a QML document.") + } + + ItemLibraryEntry { + name: "Component 3D" + category: "Instancers" + libraryIcon: "images/component-icon.png" + version: "1.0" + requiredImport: "QtQuick3D" + + QmlSource { source: "source/component3d.qml" } + toolTip: qsTr("Allows you to define 3D components inline, within a QML document.") + } + } + +Type { + name: "QtQml.Base.Timer" + icon: "images/timer-16px.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Timer" + category: "d.Qt Quick - Animation" + libraryIcon: "images/timer-24px.png" + version: "2.0" + toolTip: qsTr(" Triggers an action at a given time.") + } +} +} diff --git a/share/qtcreator/qmldesigner/itemLibrary/qtquickcontrols2.metainfo b/share/qtcreator/qmldesigner/itemLibrary/qtquickcontrols2.metainfo new file mode 100644 index 00000000000..cd4165957d6 --- /dev/null +++ b/share/qtcreator/qmldesigner/itemLibrary/qtquickcontrols2.metainfo @@ -0,0 +1,575 @@ +MetaInfo { + Type { + name: "QtQuick.Controls.Basic.BusyIndicator" + icon: "images/busyindicator-icon16.png" + + ItemLibraryEntry { + name: "Busy Indicator" + category: "Qt Quick - Controls 2" + libraryIcon: "images/busyindicator-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Indicates activity while, for example, content is being loaded.") + } + } + + Type { + name: "QtQuick.Controls.Basic.Button" + icon: "images/button-icon16.png" + + ItemLibraryEntry { + name: "Button" + category: "Qt Quick - Controls 2" + libraryIcon: "images/button-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A button with text.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Button\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.CheckBox" + icon: "images/checkbox-icon16.png" + + ItemLibraryEntry { + name: "Check Box" + category: "Qt Quick - Controls 2" + libraryIcon: "images/checkbox-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A checkbox with a text label.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Check Box\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.CheckDelegate" + icon: "images/checkbox-icon16.png" + + ItemLibraryEntry { + name: "Check Delegate" + category: "Qt Quick - Controls 2" + libraryIcon: "images/checkbox-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Presents items from a model as checkboxes.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Check Delegate\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.ComboBox" + icon: "images/combobox-icon16.png" + + ItemLibraryEntry { + name: "Combo Box" + category: "Qt Quick - Controls 2" + libraryIcon: "images/combobox-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("An editable drop-down list.") + } + } + + Type { + name: "QtQuick.Controls.Basic.Control" + icon: "images/control-icon16.png" + + ItemLibraryEntry { + name: "Control" + category: "Qt Quick - Controls 2" + libraryIcon: "images/control-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("An abstract base type for UI controls.") + } + } + + Type { + name: "QtQuick.Controls.Basic.DelayButton" + icon: "images/button-icon16.png" + + ItemLibraryEntry { + name: "Delay Button" + category: "Qt Quick - Controls 2" + libraryIcon: "images/delaybutton-icon.png" + version: "2.2" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A button with a delay preventing accidental presses.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Delay Button\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.Dial" + icon: "images/dial-icon16.png" + + ItemLibraryEntry { + name: "Dial" + category: "Qt Quick - Controls 2" + libraryIcon: "images/dial-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + + toolTip: qsTr("A circular dial that is rotated to set a value.") + } + } + + Type { + name: "QtQuick.Controls.Basic.Frame" + icon: "images/frame-icon16.png" + + ItemLibraryEntry { + name: "Frame" + category: "Qt Quick - Controls 2" + libraryIcon: "images/frame-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("An untitled container for a group of controls.") + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "QtQuick.Controls.Basic.GroupBox" + icon: "images/groupbox-icon16.png" + + ItemLibraryEntry { + name: "Group Box" + category: "Qt Quick - Controls 2" + libraryIcon: "images/groupbox-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A titled container for a group of controls.") + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + Property { name: "title"; type: "binding"; value: "qsTr(\"Group Box\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.ItemDelegate" + icon: "images/itemdelegate-icon16.png" + + ItemLibraryEntry { + name: "Item Delegate" + category: "Qt Quick - Controls 2" + libraryIcon: "images/itemdelegate-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Presents a standard view item. It can be used as a delegate in various views and controls, such as ListView and ComboBox.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Item Delegate\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.Label" + icon: "images/label-icon16.png" + + ItemLibraryEntry { + name: "Label" + category: "Qt Quick - Controls 2" + libraryIcon: "images/label-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A text label.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Label\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.Page" + icon: "images/page-icon16.png" + + ItemLibraryEntry { + name: "Page" + category: "Qt Quick - Controls 2" + libraryIcon: "images/page-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A page with header and footer.") + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "QtQuick.Controls.Basic.PageIndicator" + icon: "images/pageindicator-icon16.png" + + ItemLibraryEntry { + name: "Page Indicator" + category: "Qt Quick - Controls 2" + libraryIcon: "images/pageindicator-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Indicates the currently active page.") + + Property { name: "count"; type: "int"; value: 3 } + } + } + + Type { + name: "QtQuick.Controls.Basic.Pane" + icon: "images/pane-icon16.png" + + ItemLibraryEntry { + name: "Pane" + category: "Qt Quick - Controls 2" + libraryIcon: "images/pane-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Provides a background matching the application style and theme.") + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "QtQuick.Controls.Basic.ProgressBar" + icon: "images/progressbar-icon16.png" + + ItemLibraryEntry { + name: "Progress Bar" + category: "Qt Quick - Controls 2" + libraryIcon: "images/progressbar-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A bar indicating the progress of an operation.") + + Property { name: "value"; type: "real"; value: 0.5 } + } + } + + Type { + name: "QtQuick.Controls.Basic.RadioButton" + icon: "images/radiobutton-icon16.png" + + ItemLibraryEntry { + name: "Radio Button" + category: "Qt Quick - Controls 2" + libraryIcon: "images/radiobutton-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("An option button that you can toggle on or off.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Button\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.RadioDelegate" + icon: "images/radiobutton-icon16.png" + + ItemLibraryEntry { + name: "Radio Delegate" + category: "Qt Quick - Controls 2" + libraryIcon: "images/radiobutton-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Presents items from a model as radio buttons.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Delegate\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.RangeSlider" + icon: "images/rangeslider-icon16.png" + + ItemLibraryEntry { + name: "Range Slider" + category: "Qt Quick - Controls 2" + libraryIcon: "images/rangeslider-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A bar with adjustable start and end points.") + + Property { name: "first.value"; type: "real"; value: 0.25 } + Property { name: "second.value"; type: "real"; value: 0.75 } + } + } + + Type { + name: "QtQuick.Controls.Basic.RoundButton" + icon: "images/roundbutton-icon16.png" + + ItemLibraryEntry { + name: "Round Button" + category: "Qt Quick - Controls 2" + libraryIcon: "images/roundbutton-icon.png" + version: "2.1" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A round button with text.") + + Property { name: "text"; type: "string"; value: "+" } + } + } + + Type { + name: "QtQuick.Controls.Basic.Slider" + icon: "images/slider-icon16.png" + + ItemLibraryEntry { + name: "Slider" + category: "Qt Quick - Controls 2" + libraryIcon: "images/slider-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("An adjustable slider.") + + Property { name: "value"; type: "real"; value: 0.5 } + } + } + + Type { + name: "QtQuick.Controls.Basic.SpinBox" + icon: "images/spinbox-icon16.png" + + ItemLibraryEntry { + name: "Spin Box" + category: "Qt Quick - Controls 2" + libraryIcon: "images/spinbox-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A box with an adjustable number.") + } + } + + Type { + name: "QtQuick.Controls.Basic.ScrollView" + icon: "images/scrollview-icon16.png" + + ItemLibraryEntry { + name: "Scroll View" + category: "Qt Quick - Controls 2" + libraryIcon: "images/scrollview-icon.png" + version: "2.2" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A scrollable area.") + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "QtQuick.Controls.Basic.StackView" + icon: "images/stackview-icon16.png" + + ItemLibraryEntry { + name: "Stack View" + category: "Qt Quick - Controls 2" + libraryIcon: "images/stackview-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Provides a stack-based navigation for a set of pages.") + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "QtQuick.Controls.Basic.SwipeDelegate" + icon: "images/itemdelegate-icon16.png" + + ItemLibraryEntry { + name: "Swipe Delegate" + category: "Qt Quick - Controls 2" + libraryIcon: "images/itemdelegate-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Presents items from a model as items that you can swipe to expose more options.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Swipe Delegate\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.SwipeView" + icon: "images/swipeview-icon16.png" + + ItemLibraryEntry { + name: "Swipe View" + category: "Qt Quick - Controls 2" + libraryIcon: "images/swipeview-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Provides a view where you can navigate pages by swiping.") + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "QtQuick.Controls.Basic.Switch" + icon: "images/switch-icon16.png" + + ItemLibraryEntry { + name: "Switch" + category: "Qt Quick - Controls 2" + libraryIcon: "images/switch-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A button that you can toggle on and off.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Switch\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.SwitchDelegate" + icon: "images/switch-icon16.png" + + ItemLibraryEntry { + name: "Switch Delegate" + category: "Qt Quick - Controls 2" + libraryIcon: "images/switch-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("Presents items from a model as toggle switches.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Switch Delegate\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.TabBar" + icon: "images/toolbar-icon16.png" + + ItemLibraryEntry { + name: "Tab Bar" + category: "Qt Quick - Controls 2" + libraryIcon: "images/toolbar-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A tab-based navigation model.") + + Property { name: "width"; type: "int"; value: 240 } + } + } + + Type { + name: "QtQuick.Controls.Basic.TabButton" + icon: "images/toolbutton-icon16.png" + + ItemLibraryEntry { + name: "Tab Button" + category: "Qt Quick - Controls 2" + libraryIcon: "images/toolbutton-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A button suitable for a tab bar.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Tab Button\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.TextArea" + icon: "images/textarea-icon16.png" + + ItemLibraryEntry { + name: "Text Area" + category: "Qt Quick - Controls 2" + libraryIcon: "images/textarea-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A multi-line text box.") + + Property { name: "placeholderText"; type: "binding"; value: "qsTr(\"Text Area\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.TextField" + icon: "images/textfield-icon16.png" + + ItemLibraryEntry { + name: "Text Field" + category: "Qt Quick - Controls 2" + libraryIcon: "images/textfield-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A single-line text box.") + + Property { name: "placeholderText"; type: "binding"; value: "qsTr(\"Text Field\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.ToolBar" + icon: "images/toolbar-icon16.png" + + ItemLibraryEntry { + name: "Tool Bar" + category: "Qt Quick - Controls 2" + libraryIcon: "images/toolbar-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A row that can hold actions and buttons.") + + Property { name: "width"; type: "int"; value: 360 } + } + } + + Type { + name: "QtQuick.Controls.Basic.ToolButton" + icon: "images/toolbutton-icon16.png" + + ItemLibraryEntry { + name: "Tool Button" + category: "Qt Quick - Controls 2" + libraryIcon: "images/toolbutton-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A button suitable for a tool bar.") + + Property { name: "text"; type: "binding"; value: "qsTr(\"Tool Button\")" } + } + } + + Type { + name: "QtQuick.Controls.Basic.ToolSeparator" + icon: "images/toolseparator-icon16.png" + + ItemLibraryEntry { + name: "Tool Separator" + category: "Qt Quick - Controls 2" + libraryIcon: "images/toolseparator-icon.png" + version: "2.1" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A line to separate sections in a tool bar.") + } + } + + Type { + name: "QtQuick.Controls.Basic.Tumbler" + icon: "images/tumbler-icon16.png" + + ItemLibraryEntry { + name: "Tumbler" + category: "Qt Quick - Controls 2" + libraryIcon: "images/tumbler-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + toolTip: qsTr("A spinnable wheel of selectable items.") + + Property { name: "model"; type: "int"; value: "10" } + } + } +} diff --git a/share/qtcreator/qmldesigner/itemLibrary/quick.metainfo b/share/qtcreator/qmldesigner/itemLibrary/quick.metainfo new file mode 100644 index 00000000000..98e5684bdc7 --- /dev/null +++ b/share/qtcreator/qmldesigner/itemLibrary/quick.metainfo @@ -0,0 +1,569 @@ +MetaInfo { + + Type { + name: "QtQuick.Item" + icon: "images/item-icon16.png" + + Hints { + visibleNonDefaultProperties: "layer.effect" + } + + ItemLibraryEntry { + name: "Item" + category: "a.Qt Quick - Basic" + libraryIcon: "images/item-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 200; } + Property { name: "height"; type: "int"; value: 200; } + toolTip: qsTr("Groups several visual items.") + } + } + + Type { + name: "QtQuick.Rectangle" + icon: "images/rect-icon16.png" + + ItemLibraryEntry { + name: "Rectangle" + category: "a.Qt Quick - Basic" + libraryIcon: "images/rect-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 200; } + Property { name: "height"; type: "int"; value: 200; } + Property { name: "color"; type: "QColor"; value: "#ffffff"; } + toolTip: qsTr("A rectangle with an optional border.") + } + } + + Type { + name: "QtQuick.Text" + icon: "images/text-icon16.png" + + ItemLibraryEntry { + name: "Text" + category: "a.Qt Quick - Basic" + libraryIcon: "images/text-icon.png" + version: "2.0" + + Property { name: "font.pixelSize"; type: "int"; value: 12; } + Property { name: "text"; type: "binding"; value: "qsTr(\"Text\")"; } + toolTip: qsTr("A read-only text label.") + } + } + + Type { + name: "QtQuick.TextEdit" + icon: "images/text-edit-icon16.png" + + ItemLibraryEntry { + name: "Text Edit" + category: "a.Qt Quick - Basic" + libraryIcon: "images/text-edit-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 80; } + Property { name: "height"; type: "int"; value: 20; } + Property { name: "font.pixelSize"; type: "int"; value: 12; } + Property { name: "text"; type: "binding"; value: "qsTr(\"Text Edit\")"; } + toolTip: qsTr("A multi-line block of editable text.") + } + } + + Type { + name: "QtQuick.TextInput" + icon: "images/text-input-icon16.png" + + ItemLibraryEntry { + name: "Text Input" + category: "a.Qt Quick - Basic" + libraryIcon: "images/text-input-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 80; } + Property { name: "height"; type: "int"; value: 20; } + Property { name: "font.pixelSize"; type: "int"; value: 12; } + Property { name: "text"; type: "binding"; value: "qsTr(\"Text Input\")"; } + toolTip: qsTr("An editable line of text.") + } + } + + Type { + name: "QtQuick.MouseArea" + icon: "images/mouse-area-icon16.png" + + ItemLibraryEntry { + name: "Mouse Area" + category: "a.Qt Quick - Basic" + libraryIcon: "images/mouse-area-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 100; } + Property { name: "height"; type: "int"; value: 100; } + toolTip: qsTr("An area with mouse functionality.") + } + } + + Type { + name: "QtQuick.Image" + icon: "images/image-icon16.png" + + ItemLibraryEntry { + name: "Image" + category: "a.Qt Quick - Basic" + libraryIcon: "images/image-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 100; } + Property { name: "height"; type: "int"; value: 100; } + Property { name: "source"; type: "QUrl"; value:"qrcimages/template_image.png"; } + Property { name: "fillMode"; type: "enum"; value: "Image.PreserveAspectFit"; } + toolTip: qsTr("Displays an image.") + } + } + + Type { + name: "QtQuick.AnimatedImage" + icon: "images/animated-image-icon16.png" + + ItemLibraryEntry { + name: "Animated Image" + category: "a.Qt Quick - Basic" + libraryIcon: "images/animated-image-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 100; } + Property { name: "height"; type: "int"; value: 100; } + Property { name: "source"; type: "QUrl"; value:"qrcimages/template_image.png"; } + toolTip: qsTr("Animates a series of images.") + } + } + + Type { + name: "QtQuick.AnimatedSprite" + icon: "images/animated-image-icon16.png" + + ItemLibraryEntry { + name: "Animated Sprite" + category: "a.Qt Quick - Basic" + libraryIcon: "images/animated-image-icon.png" + version: "2.0" + + Property { name: "frameWidth"; type: "int"; value: 64; } + Property { name: "frameHeight"; type: "int"; value: 64; } + Property { name: "frameCount"; type: "int"; value: 4; } + Property { name: "frameDuration"; type: "int"; value: 500; } + Property { name: "source"; type: "QUrl"; value:"animatedsprite-loading.png"; } + ExtraFile { source: "images/animatedsprite-loading.png" } + toolTip: qsTr("Draws a sprite animation.") + } + } + + Type { + name: "QtQuick.BorderImage" + icon: "images/border-image-icon16.png" + + ItemLibraryEntry { + name: "Border Image" + category: "a.Qt Quick - Basic" + libraryIcon: "images/border-image-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 100; } + Property { name: "height"; type: "int"; value: 100; } + Property { name: "source"; type: "QUrl"; value:"qrcimages/template_image.png"; } + toolTip: qsTr("A responsive border based on an image.") + } + } + + Type { + name: "QtQuick.Flickable" + icon: "images/flickable-icon16.png" + + ItemLibraryEntry { + name: "Flickable" + category: "a.Qt Quick - Basic" + libraryIcon: "images/flickable-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 300; } + Property { name: "height"; type: "int"; value: 300; } + toolTip: qsTr("An area for keeping dragable objects.") + } + } + + Type { + name: "QtQuick.GridView" + icon: "images/gridview-icon16.png" + + ItemLibraryEntry { + name: "Grid View" + category: "b.Qt Quick - Views" + libraryIcon: "images/gridview-icon.png" + version: "2.0" + + QmlSource { source: "source/gridviewv2.qml" } + toolTip: qsTr("Organizes dynamic data sets in a grid.") + } + } + + Type { + name: "QtQuick.ListView" + icon: "images/listview-icon16.png" + + ItemLibraryEntry { + name: "List View" + category: "b.Qt Quick - Views" + libraryIcon: "images/listview-icon.png" + version: "2.0" + + QmlSource { source: "source/listviewv2.qml" } + toolTip: qsTr("Organizes dynamic data sets in a list.") + } + } + + Type { + name: "QtQuick.PathView" + icon: "images/pathview-icon16.png" + + ItemLibraryEntry { + name: "Path View" + category: "b.Qt Quick - Views" + libraryIcon: "images/pathview-icon.png" + version: "2.0" + + QmlSource { source: "source/pathviewv2.qml" } + toolTip: qsTr("Organizes dynamic data sets along a path.") + } + } + + Type { + name: "QtQuick.FocusScope" + icon: "images/focusscope-icon16.png" + + ItemLibraryEntry { + name: "Focus Scope" + category: "a.Qt Quick - Basic" + libraryIcon: "images/focusscope-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 100; } + Property { name: "height"; type: "int"; value: 100; } + toolTip: qsTr("A scope to focus on a specific text element.") + } + } + + Type { + name: "QtQuick.Column" + icon: "images/column-positioner-icon-16px.png" + + ItemLibraryEntry { + name: "Column" + category: "c.Qt Quick - Positioner" + libraryIcon: "images/column-positioner-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 200; } + Property { name: "height"; type: "int"; value: 400; } + + toolTip: qsTr("Organizes items in a column.") + } + } + + Type { + name: "QtQuick.Row" + icon: "images/row-positioner-icon-16px.png" + + ItemLibraryEntry { + name: "Row" + category: "c.Qt Quick - Positioner" + libraryIcon: "images/row-positioner-icon.png" + version: "2.0" + toolTip: qsTr("Organizes items in a row.") + + Property { name: "width"; type: "int"; value: 200; } + Property { name: "height"; type: "int"; value: 400; } + } + } + + Type { + name: "QtQuick.Grid" + icon: "images/grid-positioner-icon-16px.png" + + ItemLibraryEntry { + name: "Grid" + category: "c.Qt Quick - Positioner" + libraryIcon: "images/grid-positioner-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 400; } + Property { name: "height"; type: "int"; value: 400; } + toolTip: qsTr("Organizes items in a fixed grid.") + } + } + + Type { + name: "QtQuick.Flow" + icon: "images/flow-positioner-icon-16px.png" + + ItemLibraryEntry { + name: "Flow" + category: "c.Qt Quick - Positioner" + libraryIcon: "images/flow-positioner-icon.png" + version: "2.0" + + Property { name: "width"; type: "int"; value: 400; } + Property { name: "height"; type: "int"; value: 400; } + toolTip: qsTr("Organizes items in free-flowing rows.") + } + } + + Type { + name: "QtQuick.Timeline.Timeline" + icon: "images/timeline-16px.png" + + Hints { + visibleNonDefaultProperties: "animations" + visibleInLibrary: false + visibleInNavigator: true + } + ItemLibraryEntry { + name: "Timeline" + category: "none" + version: "1.0" + } + } + + Type { + name: "QtQuick.Timeline.TimelineAnimation" + icon: "images/timeline-animation-16px.png" + + Hints { + visibleInLibrary: false + visibleInNavigator: true + } + ItemLibraryEntry { + name: "Animation" + category: "none" + version: "1.0" + } + } + + Type { + name: "QtQuick.Timeline.Keyframe" + icon: "images/keyframe-16px.png" + + ItemLibraryEntry { + name: "Keyframe" + category: "none" + version: "1.0" + requiredImport: "none" + } + } + + Type { + name: "QtQuick.Timeline.KeyframeGroup" + icon: "images/keyframe-16px.png" + + ItemLibraryEntry { + name: "KeyframeGroup" + category: "none" + version: "1.0" + requiredImport: "none" + } + } + + Type { + name: "QtQuick.PropertyAnimation" + icon: "images/item-icon16.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Property Animation" + category: "d.Qt Quick - Animation" + libraryIcon: "images/item-icon.png" + version: "2.0" + toolTip: qsTr("Animates changes in property values.") + } + } + + Type { + name: "QtQuick.PauseAnimation" + icon: "images/item-icon16.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Pause Animation" + category: "d.Qt Quick - Animation" + libraryIcon: "images/item-icon.png" + version: "2.0" + toolTip: qsTr("Provides a pause between animations.") + } + } + + Type { + name: "QtQuick.SequentialAnimation" + icon: "images/item-icon16.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + } + + ItemLibraryEntry { + name: "Sequential Animation" + category: "d.Qt Quick - Animation" + libraryIcon: "images/item-icon.png" + version: "2.0" + toolTip: qsTr("Runs animations one after the other.") + } + } + + Type { + name: "QtQuick.ParallelAnimation" + icon: "images/item-icon16.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + } + + ItemLibraryEntry { + name: "Parallel Animation" + category: "d.Qt Quick - Animation" + libraryIcon: "images/item-icon.png" + version: "2.0" + toolTip: qsTr("Runs animations together at the same time.") + } + } + + Type { + name: "QtQuick.PropertyAction" + icon: "images/item-icon16.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Property Action" + category: "d.Qt Quick - Animation" + libraryIcon: "images/item-icon.png" + version: "2.0" + toolTip: qsTr("Provides an immediate property change during animations.") + } + } + + Type { + name: "QtQuick.ScriptAction" + icon: "images/item-icon16.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Script Action" + category: "d.Qt Quick - Animation" + libraryIcon: "images/item-icon.png" + version: "2.0" + toolTip: qsTr("Runs a script during animation.") + } + } + + Type { + name: "QtQuick.ColorAnimation" + icon: "images/item-icon16.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Color Animation" + category: "d.Qt Quick - Animation" + libraryIcon: "images/item-icon.png" + version: "2.0" + toolTip: qsTr("Animates the color of an item.") + } + } + + Type { + name: "QtQuick.NumberAnimation" + icon: "images/item-icon16.png" + + Hints { + visibleInNavigator: true + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Number Animation" + category: "d.Qt Quick - Animation" + libraryIcon: "images/item-icon.png" + version: "2.0" + Property { name: "to"; type: "int"; value: 0; } + Property { name: "from"; type: "int"; value: 0; } + toolTip: qsTr("Animates a numerical property of an item.") + } + } + + Type { + name: "QtQuick.Loader" + icon: "images/loader-icon16.png" + + ItemLibraryEntry { + name: "Loader" + category: "e.Qt Quick - Instancers" + libraryIcon: "images/loader-icon.png" + version: "2.0" + Property { name: "width"; type: "int"; value: 200; } + Property { name: "height"; type: "int"; value: 200; } + toolTip: qsTr("Allows you to load components dynamically.") + } + } + + Type { + name: "QtQuick.Repeater" + icon: "images/repeater-icon16.png" + + Hints { + canBeDroppedInFormEditor: false + hasFormEditorItem: false + } + + ItemLibraryEntry { + name: "Repeater" + category: "e.Qt Quick - Instancers" + libraryIcon: "images/repeater-icon.png" + version: "2.0" + toolTip: qsTr("Creates a number of copies of the same item.") + } + } +} diff --git a/share/qtcreator/qmldesigner/itemLibrary/quick3d.metainfo b/share/qtcreator/qmldesigner/itemLibrary/quick3d.metainfo new file mode 100644 index 00000000000..8f006139660 --- /dev/null +++ b/share/qtcreator/qmldesigner/itemLibrary/quick3d.metainfo @@ -0,0 +1,125 @@ +MetaInfo { + Type { + name: "QtQuick3D.SpatialAudio.AmbientSound" + icon: "images/ambient-sound-16.png" + + Hints { + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeDroppedInView3D: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Ambient Sound" + category: "Spatial Audio" + libraryIcon: "images/ambient-sound-24.png" + version: "6.0" + requiredImport: "QtQuick3D.SpatialAudio" + toolTip: qsTr("An ambient background sound.") + } + } + + Type { + name: "QtQuick3D.SpatialAudio.AudioEngine" + icon: "images/audio-engine-16.png" + + Hints { + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeDroppedInView3D: false + canBeContainer: false + } + + ItemLibraryEntry { + name: "Audio Engine" + category: "Spatial Audio" + libraryIcon: "images/audio-engine-24.png" + version: "6.0" + requiredImport: "QtQuick3D.SpatialAudio" + toolTip: qsTr("Manages sound objects inside a 3D scene.") + } + } + + Type { + name: "QtQuick3D.SpatialAudio.AudioListener" + icon: "images/audio-listener-16.png" + + Hints { + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeDroppedInView3D: true + } + + ItemLibraryEntry { + name: "Audio Listener" + category: "Spatial Audio" + libraryIcon: "images/audio-listener-24.png" + version: "6.0" + requiredImport: "QtQuick3D.SpatialAudio" + toolTip: qsTr("Sets the position and orientation of listening.") + } + } + + Type { + name: "QtQuick3D.SpatialAudio.AudioRoom" + icon: "images/audio-room-16.png" + + Hints { + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeDroppedInView3D: true + } + + ItemLibraryEntry { + name: "Audio Room" + category: "Spatial Audio" + libraryIcon: "images/audio-room-24.png" + version: "6.0" + requiredImport: "QtQuick3D.SpatialAudio" + toolTip: qsTr("Sets up a room for the spatial audio engine.") + } + } + + Type { + name: "QtQuick3D.SpatialAudio.SpatialSound" + icon: "images/spatial-audio-16.png" + + Hints { + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeDroppedInView3D: true + } + + ItemLibraryEntry { + name: "Spatial Sound" + category: "Spatial Audio" + libraryIcon: "images/spatial-audio-24.png" + version: "6.0" + requiredImport: "QtQuick3D.SpatialAudio" + toolTip: qsTr("A sound object in 3D space.") + } + } + + Type { + name: "QtQuick3D.BakedLightmap" + icon: ":/ItemLibrary/images/item-default-icon.png" + + Hints { + canBeDroppedInNavigator: true + canBeDroppedInFormEditor: false + canBeDroppedInView3D: false + } + + ItemLibraryEntry { + name: "Baked Lightmap" + category: "Components" + libraryIcon: ":/ItemLibrary/images/item-default-icon.png" + version: "6.5" + requiredImport: "QtQuick3D" + toolTip: qsTr("An object to specify details about baked lightmap of a model.") + + Property { name: "loadPrefix"; type: "string"; value: "lightmaps"; } + } + } +} diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/quick.metainfo b/share/qtcreator/qmldesigner/propertyEditorQmlSources/quick.metainfo deleted file mode 100644 index f390f72260d..00000000000 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/quick.metainfo +++ /dev/null @@ -1,837 +0,0 @@ -MetaInfo { - - Type { - name: "QtQuick.Item" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleNonDefaultProperties: "layer.effect" - } - - ItemLibraryEntry { - name: "Item" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 200; } - Property { name: "height"; type: "int"; value: 200; } - toolTip: qsTr("Groups several visual items.") - } - } - - Type { - name: "QtQuick.Rectangle" - icon: ":/qtquickplugin/images/rect-icon16.png" - - ItemLibraryEntry { - name: "Rectangle" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/rect-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 200; } - Property { name: "height"; type: "int"; value: 200; } - Property { name: "color"; type: "QColor"; value: "#ffffff"; } - toolTip: qsTr("A rectangle with an optional border.") - } - } - - Type { - name: "QtQuick.Text" - icon: ":/qtquickplugin/images/text-icon16.png" - - ItemLibraryEntry { - name: "Text" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/text-icon.png" - version: "2.0" - - Property { name: "font.pixelSize"; type: "int"; value: 12; } - Property { name: "text"; type: "binding"; value: "qsTr(\"Text\")"; } - toolTip: qsTr("A read-only text label.") - } - } - - Type { - name: "QtQuick.TextEdit" - icon: ":/qtquickplugin/images/text-edit-icon16.png" - - ItemLibraryEntry { - name: "Text Edit" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/text-edit-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 80; } - Property { name: "height"; type: "int"; value: 20; } - Property { name: "font.pixelSize"; type: "int"; value: 12; } - Property { name: "text"; type: "binding"; value: "qsTr(\"Text Edit\")"; } - toolTip: qsTr("A multi-line block of editable text.") - } - } - - Type { - name: "QtQuick.TextInput" - icon: ":/qtquickplugin/images/text-input-icon16.png" - - ItemLibraryEntry { - name: "Text Input" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/text-input-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 80; } - Property { name: "height"; type: "int"; value: 20; } - Property { name: "font.pixelSize"; type: "int"; value: 12; } - Property { name: "text"; type: "binding"; value: "qsTr(\"Text Input\")"; } - toolTip: qsTr("An editable line of text.") - } - } - - Type { - name: "QtQuick.MouseArea" - icon: ":/qtquickplugin/images/mouse-area-icon16.png" - - ItemLibraryEntry { - name: "Mouse Area" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/mouse-area-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 100; } - Property { name: "height"; type: "int"; value: 100; } - toolTip: qsTr("An area with mouse functionality.") - } - } - - Type { - name: "QtQuick.Image" - icon: ":/qtquickplugin/images/image-icon16.png" - - ItemLibraryEntry { - name: "Image" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/image-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 100; } - Property { name: "height"; type: "int"; value: 100; } - Property { name: "source"; type: "QUrl"; value:"qrc:/qtquickplugin/images/template_image.png"; } - Property { name: "fillMode"; type: "enum"; value: "Image.PreserveAspectFit"; } - toolTip: qsTr("Displays an image.") - } - } - - Type { - name: "QtQuick.AnimatedImage" - icon: ":/qtquickplugin/images/animated-image-icon16.png" - - ItemLibraryEntry { - name: "Animated Image" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/animated-image-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 100; } - Property { name: "height"; type: "int"; value: 100; } - Property { name: "source"; type: "QUrl"; value:"qrc:/qtquickplugin/images/template_image.png"; } - toolTip: qsTr("Animates a series of images.") - } - } - - Type { - name: "QtQuick.AnimatedSprite" - icon: ":/qtquickplugin/images/animated-image-icon16.png" - - ItemLibraryEntry { - name: "Animated Sprite" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/animated-image-icon.png" - version: "2.0" - - Property { name: "frameWidth"; type: "int"; value: 64; } - Property { name: "frameHeight"; type: "int"; value: 64; } - Property { name: "frameCount"; type: "int"; value: 4; } - Property { name: "frameDuration"; type: "int"; value: 500; } - Property { name: "source"; type: "QUrl"; value:"animatedsprite-loading.png"; } - ExtraFile { source: ":/qtquickplugin/images/animatedsprite-loading.png" } - toolTip: qsTr("Draws a sprite animation.") - } - } - - Type { - name: "QtQuick.BorderImage" - icon: ":/qtquickplugin/images/border-image-icon16.png" - - ItemLibraryEntry { - name: "Border Image" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/border-image-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 100; } - Property { name: "height"; type: "int"; value: 100; } - Property { name: "source"; type: "QUrl"; value:"qrc:/qtquickplugin/images/template_image.png"; } - toolTip: qsTr("A responsive border based on an image.") - } - } - - Type { - name: "QtQuick.Flickable" - icon: ":/qtquickplugin/images/flickable-icon16.png" - - ItemLibraryEntry { - name: "Flickable" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/flickable-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 300; } - Property { name: "height"; type: "int"; value: 300; } - toolTip: qsTr("An area for keeping dragable objects.") - } - } - - Type { - name: "QtQuick.GridView" - icon: ":/qtquickplugin/images/gridview-icon16.png" - - ItemLibraryEntry { - name: "Grid View" - category: "b.Qt Quick - Views" - libraryIcon: ":/qtquickplugin/images/gridview-icon.png" - version: "2.0" - - QmlSource { source: ":/qtquickplugin/source/gridviewv2.qml" } - toolTip: qsTr("Organizes dynamic data sets in a grid.") - } - } - - Type { - name: "QtQuick.ListView" - icon: ":/qtquickplugin/images/listview-icon16.png" - - ItemLibraryEntry { - name: "List View" - category: "b.Qt Quick - Views" - libraryIcon: ":/qtquickplugin/images/listview-icon.png" - version: "2.0" - - QmlSource { source: ":/qtquickplugin/source/listviewv2.qml" } - toolTip: qsTr("Organizes dynamic data sets in a list.") - } - } - - Type { - name: "QtQuick.PathView" - icon: ":/qtquickplugin/images/pathview-icon16.png" - - ItemLibraryEntry { - name: "Path View" - category: "b.Qt Quick - Views" - libraryIcon: ":/qtquickplugin/images/pathview-icon.png" - version: "2.0" - - QmlSource { source: ":/qtquickplugin/source/pathviewv2.qml" } - toolTip: qsTr("Organizes dynamic data sets along a path.") - } - } - - Type { - name: "QtQuick.FocusScope" - icon: ":/qtquickplugin/images/focusscope-icon16.png" - - ItemLibraryEntry { - name: "Focus Scope" - category: "a.Qt Quick - Basic" - libraryIcon: ":/qtquickplugin/images/focusscope-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 100; } - Property { name: "height"; type: "int"; value: 100; } - toolTip: qsTr("A scope to focus on a specific text element.") - } - } - - Type { - name: "QtQuick.Column" - icon: ":/qtquickplugin/images/column-positioner-icon-16px.png" - - ItemLibraryEntry { - name: "Column" - category: "c.Qt Quick - Positioner" - libraryIcon: ":/qtquickplugin/images/column-positioner-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 200; } - Property { name: "height"; type: "int"; value: 400; } - - toolTip: qsTr("Organizes items in a column.") - } - } - - Type { - name: "QtQuick.Row" - icon: ":/qtquickplugin/images/row-positioner-icon-16px.png" - - ItemLibraryEntry { - name: "Row" - category: "c.Qt Quick - Positioner" - libraryIcon: ":/qtquickplugin/images/row-positioner-icon.png" - version: "2.0" - toolTip: qsTr("Organizes items in a row.") - - Property { name: "width"; type: "int"; value: 200; } - Property { name: "height"; type: "int"; value: 400; } - } - } - - Type { - name: "QtQuick.Grid" - icon: ":/qtquickplugin/images/grid-positioner-icon-16px.png" - - ItemLibraryEntry { - name: "Grid" - category: "c.Qt Quick - Positioner" - libraryIcon: ":/qtquickplugin/images/grid-positioner-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 400; } - Property { name: "height"; type: "int"; value: 400; } - toolTip: qsTr("Organizes items in a fixed grid.") - } - } - - Type { - name: "QtQuick.Flow" - icon: ":/qtquickplugin/images/flow-positioner-icon-16px.png" - - ItemLibraryEntry { - name: "Flow" - category: "c.Qt Quick - Positioner" - libraryIcon: ":/qtquickplugin/images/flow-positioner-icon.png" - version: "2.0" - - Property { name: "width"; type: "int"; value: 400; } - Property { name: "height"; type: "int"; value: 400; } - toolTip: qsTr("Organizes items in free-flowing rows.") - } - } - - Type { - name: "QtQuick.Timeline.Timeline" - icon: ":/qtquickplugin/images/timeline-16px.png" - - Hints { - visibleNonDefaultProperties: "animations" - visibleInLibrary: false - visibleInNavigator: true - } - ItemLibraryEntry { - name: "Timeline" - category: "none" - version: "1.0" - } - } - - Type { - name: "QtQuick.Timeline.TimelineAnimation" - icon: ":/qtquickplugin/images/timeline-animation-16px.png" - - Hints { - visibleInLibrary: false - visibleInNavigator: true - } - ItemLibraryEntry { - name: "Animation" - category: "none" - version: "1.0" - } - } - - Type { - name: "QtQuick.Timeline.Keyframe" - icon: ":/qtquickplugin/images/keyframe-16px.png" - - ItemLibraryEntry { - name: "Keyframe" - category: "none" - version: "1.0" - requiredImport: "none" - } - } - - Type { - name: "QtQuick.Timeline.KeyframeGroup" - icon: ":/qtquickplugin/images/keyframe-16px.png" - - ItemLibraryEntry { - name: "KeyframeGroup" - category: "none" - version: "1.0" - requiredImport: "none" - } - } - - Type { - name: "QtQuick.PropertyAnimation" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Property Animation" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - toolTip: qsTr("Animates changes in property values.") - } - } - - Type { - name: "QtQuick.PauseAnimation" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Pause Animation" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - toolTip: qsTr("Provides a pause between animations.") - } - } - - Type { - name: "QtQuick.SequentialAnimation" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - } - - ItemLibraryEntry { - name: "Sequential Animation" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - toolTip: qsTr("Runs animations one after the other.") - } - } - - Type { - name: "QtQuick.ParallelAnimation" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - } - - ItemLibraryEntry { - name: "Parallel Animation" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - toolTip: qsTr("Runs animations together at the same time.") - } - } - - Type { - name: "QtQuick.PropertyAction" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Property Action" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - toolTip: qsTr("Provides an immediate property change during animations.") - } - } - - Type { - name: "QtQuick.ScriptAction" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Script Action" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - toolTip: qsTr("Runs a script during animation.") - } - } - - Type { - name: "QtQuick.ColorAnimation" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Color Animation" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - toolTip: qsTr("Animates the color of an item.") - } - } - - Type { - name: "QtQuick.NumberAnimation" - icon: ":/qtquickplugin/images/item-icon16.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Number Animation" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/item-icon.png" - version: "2.0" - Property { name: "to"; type: "int"; value: 0; } - Property { name: "from"; type: "int"; value: 0; } - toolTip: qsTr("Animates a numerical property of an item.") - } - } - - Type { - name: "QtQml.Timer" - icon: ":/qtquickplugin/images/timer-16px.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Timer" - category: "d.Qt Quick - Animation" - libraryIcon: ":/qtquickplugin/images/timer-24px.png" - version: "2.0" - toolTip: qsTr(" Triggers an action at a given time.") - } - } - - Type { - name: "QML.Component" - icon: ":/qtquickplugin/images/component-icon16.png" - - Hints { - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - } - - ItemLibraryEntry { - name: "Component" - category: "e.Qt Quick - Instancers" - libraryIcon: ":/qtquickplugin/images/component-icon.png" - version: "1.0" - - QmlSource { source: ":/qtquickplugin/source/component.qml" } - toolTip: qsTr("Allows you to define components inline, within a QML document.") - } - } - - Type { - name: "QML.Component" - icon: ":/qtquickplugin/images/component-icon16.png" - - Hints { - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - } - - ItemLibraryEntry { - name: "Component 3D" - category: "Instancers" - libraryIcon: ":/qtquickplugin/images/component-icon.png" - version: "1.0" - requiredImport: "QtQuick3D" - - QmlSource { source: ":/qtquickplugin/source/component3d.qml" } - toolTip: qsTr("Allows you to define 3D components inline, within a QML document.") - } - } - - Type { - name: "QtQuick.Loader" - icon: ":/qtquickplugin/images/loader-icon16.png" - - ItemLibraryEntry { - name: "Loader" - category: "e.Qt Quick - Instancers" - libraryIcon: ":/qtquickplugin/images/loader-icon.png" - version: "2.0" - Property { name: "width"; type: "int"; value: 200; } - Property { name: "height"; type: "int"; value: 200; } - toolTip: qsTr("Allows you to load components dynamically.") - } - } - - Type { - name: "QtQuick.Repeater" - icon: ":/qtquickplugin/images/repeater-icon16.png" - - Hints { - canBeDroppedInFormEditor: false - hasFormEditorItem: false - } - - ItemLibraryEntry { - name: "Repeater" - category: "e.Qt Quick - Instancers" - libraryIcon: ":/qtquickplugin/images/repeater-icon.png" - version: "2.0" - toolTip: qsTr("Creates a number of copies of the same item.") - } - } - - Type { - name: "QtMultimedia.MediaPlayer" - icon: ":/qtquickplugin/images/media-player-16px.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Media Player" - category: "f.Qt Quick - Multimedia" - libraryIcon: ":/qtquickplugin/images/media-player-24px.png" - version: "6.0" - requiredImport: "QtMultimedia" - } - } - - Type { - name: "QtMultimedia.AudioOutput" - icon: ":/qtquickplugin/images/audio-output-16px.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Audio Output" - category: "f.Qt Quick - Multimedia" - libraryIcon: ":/qtquickplugin/images/audio-output-24px.png" - version: "6.0" - requiredImport: "QtMultimedia" - } - } - - Type { - name: "QtMultimedia.VideoOutput" - icon: ":/qtquickplugin/images/video-output-16px.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Video Output" - category: "f.Qt Quick - Multimedia" - libraryIcon: ":/qtquickplugin/images/video-output-24px.png" - version: "6.0" - requiredImport: "QtMultimedia" - } - } - - Type { - name: "QtMultimedia.Video" - icon: ":/qtquickplugin/images/video-16px.png" - - Hints { - visibleInNavigator: true - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: true - canBeContainer: false - } - - ItemLibraryEntry { - name: "Video" - category: "f.Qt Quick - Multimedia" - libraryIcon: ":/qtquickplugin/images/video-24px.png" - version: "6.0" - requiredImport: "QtMultimedia" - - Property { name: "width"; type: "int"; value: 200; } - Property { name: "height"; type: "int"; value: 200; } - } - } - - Type { - name: "QtQuick3D.SpatialAudio.AmbientSound" - icon: ":/qtquickplugin/images/ambient-sound-16.png" - - Hints { - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeDroppedInView3D: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Ambient Sound" - category: "Spatial Audio" - libraryIcon: ":/qtquickplugin/images/ambient-sound-24.png" - version: "6.0" - requiredImport: "QtQuick3D.SpatialAudio" - toolTip: qsTr("An ambient background sound.") - } - } - - Type { - name: "QtQuick3D.SpatialAudio.AudioEngine" - icon: ":/qtquickplugin/images/audio-engine-16.png" - - Hints { - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeDroppedInView3D: false - canBeContainer: false - } - - ItemLibraryEntry { - name: "Audio Engine" - category: "Spatial Audio" - libraryIcon: ":/qtquickplugin/images/audio-engine-24.png" - version: "6.0" - requiredImport: "QtQuick3D.SpatialAudio" - toolTip: qsTr("Manages sound objects inside a 3D scene.") - } - } - - Type { - name: "QtQuick3D.SpatialAudio.AudioListener" - icon: ":/qtquickplugin/images/audio-listener-16.png" - - Hints { - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeDroppedInView3D: true - } - - ItemLibraryEntry { - name: "Audio Listener" - category: "Spatial Audio" - libraryIcon: ":/qtquickplugin/images/audio-listener-24.png" - version: "6.0" - requiredImport: "QtQuick3D.SpatialAudio" - toolTip: qsTr("Sets the position and orientation of listening.") - } - } - - Type { - name: "QtQuick3D.SpatialAudio.AudioRoom" - icon: ":/qtquickplugin/images/audio-room-16.png" - - Hints { - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeDroppedInView3D: true - } - - ItemLibraryEntry { - name: "Audio Room" - category: "Spatial Audio" - libraryIcon: ":/qtquickplugin/images/audio-room-24.png" - version: "6.0" - requiredImport: "QtQuick3D.SpatialAudio" - toolTip: qsTr("Sets up a room for the spatial audio engine.") - } - } - - Type { - name: "QtQuick3D.SpatialAudio.SpatialSound" - icon: ":/qtquickplugin/images/spatial-audio-16.png" - - Hints { - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeDroppedInView3D: true - } - - ItemLibraryEntry { - name: "Spatial Sound" - category: "Spatial Audio" - libraryIcon: ":/qtquickplugin/images/spatial-audio-24.png" - version: "6.0" - requiredImport: "QtQuick3D.SpatialAudio" - toolTip: qsTr("A sound object in 3D space.") - } - } - - Type { - name: "QtQuick3D.BakedLightmap" - icon: ":/ItemLibrary/images/item-default-icon.png" - - Hints { - canBeDroppedInNavigator: true - canBeDroppedInFormEditor: false - canBeDroppedInView3D: false - } - - ItemLibraryEntry { - name: "Baked Lightmap" - category: "Components" - libraryIcon: ":/ItemLibrary/images/item-default-icon.png" - version: "6.5" - requiredImport: "QtQuick3D" - toolTip: qsTr("An object to specify details about baked lightmap of a model.") - - Property { name: "loadPrefix"; type: "string"; value: "lightmaps"; } - } - } -} -- cgit v1.2.3 From a369d075ad6f042823e5a3742162cd3858cc055a Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Sat, 20 Apr 2024 00:25:43 +0300 Subject: QmlDesigner: Implement adding an image to the content library Also some cleanups in same files. Fixes: QDS-12506 Change-Id: I0c211206b6b7c29857a30f18d6077c2ddd76849c Reviewed-by: Miikka Heikkinen Reviewed-by: Qt CI Patch Build Bot --- .../qmldesigner/assetsLibraryQmlSources/Assets.qml | 6 ++--- .../assetsLibraryQmlSources/AssetsContextMenu.qml | 31 +++++++++++++--------- .../assetsLibraryQmlSources/AssetsView.qml | 8 +++--- 3 files changed, 26 insertions(+), 19 deletions(-) (limited to 'share/qtcreator') diff --git a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/Assets.qml b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/Assets.qml index cfa40209950..26bef6f8e91 100644 --- a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/Assets.qml +++ b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/Assets.qml @@ -94,7 +94,7 @@ Item { anchors.fill: parent acceptedButtons: Qt.RightButton onClicked: { - if (assetsModel.haveFiles) { + if (assetsModel.hasFiles) { function onFolderCreated(path) { assetsView.addCreatedFolder(path) } @@ -182,13 +182,13 @@ Item { leftPadding: 10 color: StudioTheme.Values.themeTextColor font.pixelSize: StudioTheme.Values.baseFont - visible: !assetsModel.haveFiles && !root.__searchBoxEmpty + visible: !assetsModel.hasFiles && !root.__searchBoxEmpty } Item { // placeholder when the assets library is empty width: parent.width height: parent.height - toolbar.height - column.spacing - visible: !assetsModel.haveFiles && root.__searchBoxEmpty + visible: !assetsModel.hasFiles && root.__searchBoxEmpty clip: true MouseArea { // right clicking the empty area of the view diff --git a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsContextMenu.qml b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsContextMenu.qml index 391c6220481..a8eb5285f57 100644 --- a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsContextMenu.qml +++ b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsContextMenu.qml @@ -83,7 +83,7 @@ StudioControls.Menu { root.__selectedAssetPathsList = selectedAssetPathsList root.__fileIndex = fileIndex root.__dirIndex = dirModelIndex - root.__dirPath = AssetsLibraryBackend.assetsModel.filePath(dirModelIndex) + root.__dirPath = root.assetsModel.filePath(dirModelIndex) root.__isDirectory = false root.popup() } @@ -124,9 +124,9 @@ StudioControls.Menu { id: addTexturesItem text: qsTr("Add Texture") enabled: rootView.hasMaterialLibrary - visible: root.__fileIndex && AssetsLibraryBackend.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList) + visible: root.__fileIndex && root.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList) height: addTexturesItem.visible ? addTexturesItem.implicitHeight : 0 - onTriggered: AssetsLibraryBackend.rootView.addTextures(root.__selectedAssetPathsList) + onTriggered: root.rootView.addTextures(root.__selectedAssetPathsList) } StudioControls.MenuItem { @@ -134,7 +134,7 @@ StudioControls.Menu { text: qsTr("Add Light Probe") enabled: rootView.hasMaterialLibrary && rootView.hasSceneEnv visible: root.__fileIndex && root.__selectedAssetPathsList.length === 1 - && AssetsLibraryBackend.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList) + && root.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList) height: addLightProbes.visible ? addLightProbes.implicitHeight : 0 onTriggered: rootView.addLightProbe(root.__selectedAssetPathsList[0]) } @@ -145,7 +145,7 @@ StudioControls.Menu { visible: root.__fileIndex height: deleteFileItem.visible ? deleteFileItem.implicitHeight : 0 onTriggered: { - let deleted = AssetsLibraryBackend.assetsModel.requestDeleteFiles(root.__selectedAssetPathsList) + let deleted = root.assetsModel.requestDeleteFiles(root.__selectedAssetPathsList) if (!deleted) confirmDeleteFiles.open() } @@ -182,7 +182,7 @@ StudioControls.Menu { StudioControls.MenuItem { text: qsTr("New Folder") - visible: AssetsLibraryBackend.assetsModel.haveFiles + visible: root.assetsModel.hasFiles height: visible ? implicitHeight : 0 NewFolderDialog { @@ -209,11 +209,11 @@ StudioControls.Menu { } onTriggered: { - if (!AssetsLibraryBackend.assetsModel.hasChildren(root.__dirIndex)) { + if (!root.assetsModel.hasChildren(root.__dirIndex)) { // NOTE: the folder may still not be empty -- it doesn't have files visible to the // user, but that doesn't mean that there are no other files (e.g. files of unknown // types) on disk in this directory. - AssetsLibraryBackend.assetsModel.deleteFolderRecursively(root.__dirIndex) + root.assetsModel.deleteFolderRecursively(root.__dirIndex) } else { confirmDeleteFolderDialog.open() } @@ -222,7 +222,7 @@ StudioControls.Menu { StudioControls.MenuItem { text: qsTr("New Effect") - visible: rootView.canCreateEffects() + visible: root.rootView.canCreateEffects() height: visible ? implicitHeight : 0 NewEffectDialog { @@ -235,15 +235,22 @@ StudioControls.Menu { } StudioControls.MenuItem { - text: rootView.showInGraphicalShellMsg() + text: root.rootView.showInGraphicalShellMsg() enabled: root.__showInGraphicalShellEnabled onTriggered: { if (!root.__fileIndex || root.__selectedAssetPathsList.length > 1) - rootView.showInGraphicalShell(root.__dirPath) + root.rootView.showInGraphicalShell(root.__dirPath) else - rootView.showInGraphicalShell(root.__selectedAssetPathsList[0]) + root.rootView.showInGraphicalShell(root.__selectedAssetPathsList[0]) } } + + StudioControls.MenuItem { + text: qsTr("Add to Content Library") + visible: root.rootView.userBundleEnabled() && root.__fileIndex && root.assetsModel.allFilePathsAreTextures(root.__selectedAssetPathsList) + height: visible ? implicitHeight : 0 + onTriggered: root.rootView.addAssetsToContentLibrary(root.__selectedAssetPathsList) + } } diff --git a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml index 9326e6a5e35..aeabc92c6d4 100644 --- a/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml +++ b/share/qtcreator/qmldesigner/assetsLibraryQmlSources/AssetsView.qml @@ -70,9 +70,9 @@ TreeView { model: assetsModel onRowsChanged: { - if (root.rows > root.rootPathRow + 1 && !assetsModel.haveFiles || - root.rows <= root.rootPathRow + 1 && assetsModel.haveFiles) { - assetsModel.syncHaveFiles() + if (root.rows > root.rootPathRow + 1 && !assetsModel.hasFiles || + root.rows <= root.rootPathRow + 1 && assetsModel.hasFiles) { + assetsModel.syncHasFiles() } root.updateRows() @@ -366,7 +366,7 @@ TreeView { function moveSelection(amount) { - if (!assetsModel.haveFiles || !amount) + if (!assetsModel.hasFiles || !amount) return let index = root.currentFilePath ? assetsModel.indexForPath(root.currentFilePath) -- cgit v1.2.3