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

QmllDesigner: Fix dynamic properties layout

Browse Source 
* Fix layout
* Add missing qsTr()
* Remove unnecessary alignment settings

Change-Id: Ie8d90e61d39933e573cb119e5ed3a15fcbca9674
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2022-09-14 15:13:00 +02:00
committed by Henning Gründl
parent 1b412a97ae
commit eeeea090cc
1 changed files with 27 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DynamicPropertiesSection.qml
View File

@@ -53,11 +53,10 @@ Section {
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: colorEditorControl.remove()
}
ExpandingSpacer {}
}
}
@@ -79,24 +78,17 @@ Section {
+ StudioTheme.Values.actionIndicatorWidth
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
Item {
height: 10
implicitWidth: {
return StudioTheme.Values.twoControlColumnWidth
implicitWidth: StudioTheme.Values.twoControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
}
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutInt.remove()
}
@@ -124,24 +116,17 @@ Section {
+ StudioTheme.Values.actionIndicatorWidth
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
Item {
height: 10
implicitWidth: {
return StudioTheme.Values.twoControlColumnWidth
implicitWidth: StudioTheme.Values.twoControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
}
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutReal.remove()
}
@@ -165,12 +150,9 @@ Section {
+ StudioTheme.Values.actionIndicatorWidth
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutString.remove()
}
@@ -195,24 +177,17 @@ Section {
backendValue: layoutBool.backendValue
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
Item {
height: 10
implicitWidth: {
return StudioTheme.Values.twoControlColumnWidth
implicitWidth: StudioTheme.Values.twoControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
}
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutBool.remove()
}
@@ -238,7 +213,6 @@ Section {
}
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutUrl.remove()
}
@@ -270,12 +244,9 @@ Section {
showTranslateCheckBox: false
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutAlias.remove()
}
@@ -301,12 +272,9 @@ Section {
+ StudioTheme.Values.actionIndicatorWidth
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutTextureInput.remove()
}
@@ -411,7 +379,6 @@ Section {
Spacer { implicitWidth: StudioTheme.Values.controlGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutVector.remove()
}
@@ -462,16 +429,12 @@ Section {
Item {
height: 10
implicitWidth: {
return StudioTheme.Values.twoControlColumnWidth
implicitWidth: StudioTheme.Values.twoControlColumnWidth
+ StudioTheme.Values.actionIndicatorWidth
}
visible: vecSize === 2 // Placeholder for last spinbox
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
ExpandingSpacer {}
}
@@ -497,11 +460,9 @@ Section {
+ StudioTheme.Values.actionIndicatorWidth
}
Spacer {
implicitWidth: StudioTheme.Values.twoControlColumnGap
}
Spacer { implicitWidth: StudioTheme.Values.twoControlColumnGap }
IconIndicator {
Layout.alignment: Qt.AlignLeft
icon: StudioTheme.Constants.closeCross
onClicked: layoutReadonly.remove()
}
@@ -541,6 +502,7 @@ Section {
active: repeater.loadActive
width: loader.item ? loader.item.width : 0
height: loader.item ? loader.item.height : 0
Layout.fillWidth: true
sourceComponent: {
if (propertyType == "color")
@@ -615,7 +577,6 @@ Section {
Spacer { implicitWidth: StudioTheme.Values.actionIndicatorWidth }
StudioControls.AbstractButton {
id: plusButton
buttonIcon: StudioTheme.Constants.plus
onClicked: {
@@ -691,7 +652,7 @@ Section {
RowLayout {
width: cePopup.width - 8
PropertyLabel {
text: "Add New Property"
text: qsTr("Add New Property")
horizontalAlignment: Text.AlignLeft
leftPadding: 8
width: cePopup.width - closeIndicator.width - 24
@@ -707,7 +668,7 @@ Section {
RowLayout {
PropertyLabel {
id: textLabel
text: "Name"
text: qsTr("Name")
width: cePopup.labelWidth
}
StudioControls.TextField {
@@ -720,7 +681,7 @@ Section {
}
RowLayout {
PropertyLabel {
text: "Type"
text: qsTr("Type")
width: cePopup.labelWidth
}
StudioControls.ComboBox {