feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Expose state property for 3DObjects

Browse Source 
Task-number: QDS-5225
Change-Id: I08b5839ef70dd3e3ea9ebd615646494e3667a479
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2021-10-21 13:10:24 +02:00
committed by Henning Gründl
parent 92cb2427f8
commit 73fb9d7002
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
View File

@@ -33,7 +33,9 @@ import StudioTheme 1.0 as StudioTheme
PropertyEditorPane {
id: itemPane
ComponentSection {}
ComponentSection {
showState: true
}
GeometrySection {}
@@ -82,22 +84,6 @@ PropertyEditorPane {
ExpandingSpacer {}
}
PropertyLabel { text: qsTr("State") }
SecondColumnLayout {
ComboBox {
implicitWidth: StudioTheme.Values.singleControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
width: implicitWidth
editable: true
backendValue: backendValues.state
model: allStateNames
valueType: ComboBox.String
}
ExpandingSpacer {}
}
}
}

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/Object3DPane.qml
View File

@@ -32,7 +32,9 @@ import StudioTheme 1.0 as StudioTheme
PropertyEditorPane {
id: itemPane
ComponentSection {}
ComponentSection {
showState: majorVersion >= 6
}
Column {
anchors.left: parent.left

24
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
View File

@@ -32,11 +32,14 @@ import HelperWidgets 2.0
import StudioTheme 1.0 as StudioTheme
Section {
id: root
caption: qsTr("Component")
anchors.left: parent.left
anchors.right: parent.right
property bool showState: false
SectionLayout {
PropertyLabel { text: qsTr("Type") }
@@ -262,5 +265,26 @@ Section {
onCanceled: hideWidget()
}
}
PropertyLabel {
visible: root.showState
text: qsTr("State")
}
SecondColumnLayout {
visible: root.showState
ComboBox {
implicitWidth: StudioTheme.Values.singleControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
width: implicitWidth
editable: true
backendValue: backendValues.state
model: allStateNames
valueType: ComboBox.String
}
ExpandingSpacer {}
}
}
}