aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2019-05-16 10:07:43 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2019-05-16 08:08:30 +0000
commit6929da39832d819c7a9ddc37674297c8e659fdcc (patch)
tree68920a596ec4b8f773d746f2b53b501ab740e951
parent0a08b041add4bfdb85a996eb28f47f0907e993c8 (diff)
QmlDesigner: Adjust gradient dialog
Change-Id: I21eea31024c6fc959dd27654711607f3ff8a4d49 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml33
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPropertySpinBox.qml2
3 files changed, 19 insertions, 18 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
index d10f302f6a..ad35898b9b 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
@@ -255,12 +255,12 @@ Column {
anchors.leftMargin: 12
anchors.rightMargin: 6
- anchors.topMargin: 24
+ anchors.topMargin: 28
anchors.bottomMargin: 6
Label {
text: "X1"
- width: 16
+ width: 18
tooltip: qsTr("Defines the start point for color interpolation.")
}
@@ -270,7 +270,7 @@ Column {
Label {
text: "X2"
- width: 16
+ width: 18
tooltip: qsTr("Defines the end point for color interpolation.")
}
@@ -280,7 +280,7 @@ Column {
Label {
text: "y1"
- width: 16
+ width: 18
tooltip: qsTr("Defines the start point for color interpolation.")
}
@@ -290,7 +290,7 @@ Column {
Label {
text: "Y2"
- width: 16
+ width: 18
tooltip: qsTr("Defines the end point for color interpolation.")
}
@@ -321,7 +321,6 @@ Column {
GradientDialogPopup {
id: gradientDialogPopupRadial
dialogHeight: 140
- dialogWidth: 340
content: GridLayout {
rowSpacing: 4
anchors.fill: parent
@@ -333,12 +332,12 @@ Column {
anchors.leftMargin: 12
anchors.rightMargin: 6
- anchors.topMargin: 24
+ anchors.topMargin: 28
anchors.bottomMargin: 6
Label {
text: "CenterX"
- width: 54
+ width: 64
tooltip: qsTr("Defines the center point.")
}
@@ -348,7 +347,7 @@ Column {
Label {
text: "CenterY"
- width: 54
+ width: 64
tooltip: qsTr("Defines the center point.")
}
@@ -358,7 +357,7 @@ Column {
Label {
text: "FocalX"
- width: 54
+ width: 64
tooltip: qsTr("Defines the focal point.")
}
@@ -368,7 +367,7 @@ Column {
Label {
text: "FocalY"
- width: 54
+ width: 64
tooltip: qsTr("Defines the focal point.")
}
@@ -378,7 +377,7 @@ Column {
Label {
text: "Center Radius"
- width: 54
+ width: 64
tooltip: qsTr("Defines the center point.")
}
@@ -388,7 +387,7 @@ Column {
Label {
text: "Focal Radius"
- width: 54
+ width: 64
tooltip: qsTr("Defines the focal radius. Set to 0 for simple radial gradients.")
}
@@ -431,12 +430,12 @@ Column {
anchors.leftMargin: 12
anchors.rightMargin: 6
- anchors.topMargin: 24
+ anchors.topMargin: 28
anchors.bottomMargin: 6
Label {
text: "CenterX"
- width: 32
+ width: 64
tooltip: qsTr("Defines the center point.")
}
@@ -446,7 +445,7 @@ Column {
Label {
text: "CenterY"
- width: 32
+ width: 64
tooltip: qsTr("Defines the center point.")
}
@@ -456,7 +455,7 @@ Column {
Label {
text: "Angle"
- width: 32
+ width: 64
tooltip: qsTr("Defines the start angle for the conical gradient. The value is in degrees (0-360).")
}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml
index e0a12de911..bbfc5525c7 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml
@@ -44,7 +44,7 @@ Loader {
property Component content
property int dialogHeight: 240
- property int dialogWidth: 280
+ property int dialogWidth: 440
sourceComponent: Component {
FocusScope {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPropertySpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPropertySpinBox.qml
index fc4f2db38f..4ca86b097d 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPropertySpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPropertySpinBox.qml
@@ -31,6 +31,8 @@ import QtQuick.Controls.Styles 1.1
DoubleSpinBox {
id: spinBox
+ width: 82
+ Layout.minimumWidth: 82
property string propertyName