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

QmlDesigner: Layout and source cleanup

Browse Source 
* Cleanup positioner specifics, mostly by adding ExpandingSpacer
 * Fix GridViewSpecifics SpinBox Label distance
 * Remove some semicolons
 * Add missing label (true/false) to CheckBoxes
 * Fix a few indentions

Change-Id: I2b86dde58ddfc1aa78ed3e11c41b0f4eedfc412b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Henning Gruendl
2019-08-21 16:37:15 +02:00
committed by Thomas Hartmann
parent 49cde7aca0
commit 4cd3b10069
7 changed files with 102 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/FlowSpecifics.qml
View File

@@ -43,13 +43,12 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "Flow"
model: ["LeftToRight", "TopToBottom"] model: ["LeftToRight", "TopToBottom"]
backendValue: backendValues.flow backendValue: backendValues.flow
scope: "Flow" Layout.fillWidth: true
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -59,12 +58,13 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "Qt"
model: ["LeftToRight", "RightToLeft"] model: ["LeftToRight", "RightToLeft"]
backendValue: backendValues.layoutDirection backendValue: backendValues.layoutDirection
Layout.fillWidth: true Layout.fillWidth: true
scope: "Qt"
} }
ExpandingSpacer {
}
} }
Label { Label {
@@ -78,7 +78,6 @@ Column {
maximumValue: 4000 maximumValue: 4000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }

74
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml
View File

@@ -51,13 +51,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.cacheBuffer backendValue: backendValues.cacheBuffer
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -66,47 +64,48 @@ Column {
} }
SecondColumnLayout { SecondColumnLayout {
Label { Label {
text: "W" text: "W"
width: 12 width: 12
} }
SpinBox { SpinBox {
backendValue: backendValues.cellWidth backendValue: backendValues.cellWidth
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
Item {
width: 4
height: 4
}
Label { Label {
text: "H" text: "H"
width: 12 width: 12
} }
SpinBox { SpinBox {
backendValue: backendValues.cellHeight backendValue: backendValues.cellHeight
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
Label { Label {
text: qsTr("Flow") text: qsTr("Flow")
} }
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "GridView"
model: ["FlowLeftToRight", "FlowTopToBottom"] model: ["FlowLeftToRight", "FlowTopToBottom"]
backendValue: backendValues.flow backendValue: backendValues.flow
Layout.fillWidth: true Layout.fillWidth: true
scope: "GridView" }
ExpandingSpacer {
} }
} }
@@ -117,11 +116,11 @@ Column {
SectionLayout { SectionLayout {
CheckBox { CheckBox {
Layout.fillWidth: true
backendValue: backendValues.keyNavigationWraps backendValue: backendValues.keyNavigationWraps
text: backendValues.keyNavigationWraps.valueToString
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -131,10 +130,12 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "Qt"
model: ["LeftToRight", "RightToLeft"] model: ["LeftToRight", "RightToLeft"]
backendValue: backendValues.layoutDirection backendValue: backendValues.layoutDirection
Layout.fillWidth: true Layout.fillWidth: true
scope: "Qt" }
ExpandingSpacer {
} }
} }
@@ -145,10 +146,12 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "GridView"
model: ["NoSnap", "SnapToRow", "SnapOneRow"] model: ["NoSnap", "SnapToRow", "SnapOneRow"]
backendValue: backendValues.snapMode backendValue: backendValues.snapMode
Layout.fillWidth: true Layout.fillWidth: true
scope: "GridView" }
ExpandingSpacer {
} }
} }
@@ -169,14 +172,15 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "GridView"
model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"] model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"]
backendValue: backendValues.highlightRangeMode backendValue: backendValues.highlightRangeMode
Layout.fillWidth: true Layout.fillWidth: true
scope: "GridView" }
ExpandingSpacer {
} }
} }
Label { Label {
text: qsTr("Move duration") text: qsTr("Move duration")
tooltip: qsTr("Move animation duration of the highlight delegate.") tooltip: qsTr("Move animation duration of the highlight delegate.")
@@ -185,13 +189,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.highlightMoveDuration backendValue: backendValues.highlightMoveDuration
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -203,13 +205,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.highlightMoveSpeed backendValue: backendValues.highlightMoveSpeed
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -221,13 +221,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.preferredHighlightBegin backendValue: backendValues.preferredHighlightBegin
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -239,13 +237,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.preferredHighlightEnd backendValue: backendValues.preferredHighlightEnd
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -256,11 +252,11 @@ Column {
SectionLayout { SectionLayout {
CheckBox { CheckBox {
Layout.fillWidth: true
backendValue: backendValues.highlightFollowsCurrentItem backendValue: backendValues.highlightFollowsCurrentItem
text: backendValues.highlightFollowsCurrentItem.valueToString
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }

14
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ImageSpecifics.qml
View File

@@ -43,12 +43,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
UrlChooser { UrlChooser {
Layout.fillWidth: true Layout.fillWidth: true
backendValue: backendValues.source backendValue: backendValues.source
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -58,15 +57,14 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "Image"
model: ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally"] model: ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally"]
backendValue: backendValues.fillMode backendValue: backendValues.fillMode
implicitWidth: 180 implicitWidth: 180
Layout.fillWidth: true Layout.fillWidth: true
scope: "Image"
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -87,6 +85,11 @@ Column {
decimals: 0 decimals: 0
} }
Item {
width: 4
height: 4
}
Label { Label {
text: "H" text: "H"
width: 12 width: 12
@@ -100,7 +103,6 @@ Column {
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
} }

66
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
View File

@@ -51,13 +51,12 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.cacheBuffer backendValue: backendValues.cacheBuffer
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -68,11 +67,11 @@ Column {
SectionLayout { SectionLayout {
CheckBox { CheckBox {
Layout.fillWidth: true
backendValue: backendValues.keyNavigationWraps backendValue: backendValues.keyNavigationWraps
text: backendValues.keyNavigationWraps.valueToString
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -83,12 +82,13 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "ListView"
model: ["Horizontal", "Vertical"] model: ["Horizontal", "Vertical"]
backendValue: backendValues.orientation backendValue: backendValues.orientation
Layout.fillWidth: true Layout.fillWidth: true
scope: "ListView"
} }
ExpandingSpacer {
}
} }
Label { Label {
@@ -97,14 +97,12 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "Qt"
model: ["LeftToRight", "RightToLeft"] model: ["LeftToRight", "RightToLeft"]
backendValue: backendValues.layoutDirection backendValue: backendValues.layoutDirection
scope: "Qt"
Layout.fillWidth: true Layout.fillWidth: true
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -115,14 +113,12 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "ListView"
model: ["NoSnap", "SnapToItem", "SnapOneItem"] model: ["NoSnap", "SnapToItem", "SnapOneItem"]
backendValue: backendValues.snapMode backendValue: backendValues.snapMode
scope: "ListView"
Layout.fillWidth: true Layout.fillWidth: true
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -134,13 +130,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.spacing backendValue: backendValues.spacing
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -161,14 +155,12 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "ListView"
model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"] model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"]
backendValue: backendValues.highlightRangeMode backendValue: backendValues.highlightRangeMode
Layout.fillWidth: true Layout.fillWidth: true
scope: "ListView"
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -181,13 +173,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.highlightMoveDuration backendValue: backendValues.highlightMoveDuration
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -199,13 +189,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.highlightMoveSpeed backendValue: backendValues.highlightMoveSpeed
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -217,13 +205,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.highlightResizeDuration backendValue: backendValues.highlightResizeDuration
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -235,13 +221,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.preferredHighlightBegin backendValue: backendValues.preferredHighlightBegin
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -253,13 +237,11 @@ Column {
SectionLayout { SectionLayout {
SpinBox { SpinBox {
backendValue: backendValues.preferredHighlightEnd backendValue: backendValues.preferredHighlightEnd
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -270,11 +252,11 @@ Column {
SectionLayout { SectionLayout {
CheckBox { CheckBox {
Layout.fillWidth: true
backendValue: backendValues.highlightFollowsCurrentItem backendValue: backendValues.highlightFollowsCurrentItem
text: backendValues.highlightFollowsCurrentItem.valueToString
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }

5
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml
View File

@@ -44,11 +44,12 @@ Column {
SecondColumnLayout { SecondColumnLayout {
CheckBox { CheckBox {
Layout.fillWidth: true
backendValue: backendValues.enabled backendValue: backendValues.enabled
text: backendValues.enabled.valueToString
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -59,7 +60,9 @@ Column {
SecondColumnLayout { SecondColumnLayout {
CheckBox { CheckBox {
Layout.fillWidth: true
backendValue: backendValues.hoverEnabled backendValue: backendValues.hoverEnabled
text: backendValues.hoverEnabled.valueToString
} }
ExpandingSpacer { ExpandingSpacer {

51
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/PathViewSpecifics.qml
View File

@@ -46,13 +46,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
SpinBox { SpinBox {
backendValue: backendValues.dragMargin backendValue: backendValues.dragMargin
minimumValue: 0; minimumValue: 0
maximumValue: 100; maximumValue: 100
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -63,13 +61,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
SpinBox { SpinBox {
backendValue: backendValues.flickDeceleration backendValue: backendValues.flickDeceleration
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -80,11 +76,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
CheckBox { CheckBox {
Layout.fillWidth: true
backendValue: backendValues.interactive backendValue: backendValues.interactive
text: backendValues.interactive.valueToString
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -96,13 +92,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
SpinBox { SpinBox {
backendValue: backendValues.offset backendValue: backendValues.offset
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -114,13 +108,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
SpinBox { SpinBox {
backendValue: backendValues.pathItemCount backendValue: backendValues.pathItemCount
minimumValue: -1; minimumValue: -1
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
} }
@@ -139,18 +131,15 @@ Column {
SecondColumnLayout { SecondColumnLayout {
ComboBox { ComboBox {
scope: "PathView"
model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"] model: ["NoHighlightRange", "ApplyRange", "StrictlyEnforceRange"]
backendValue: backendValues.highlightRangeMode backendValue: backendValues.highlightRangeMode
Layout.fillWidth: true Layout.fillWidth: true
scope: "PathView"
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
Label { Label {
text: qsTr("Move duration") text: qsTr("Move duration")
tooltip: qsTr("Move animation duration of the highlight delegate.") tooltip: qsTr("Move animation duration of the highlight delegate.")
@@ -159,13 +148,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
SpinBox { SpinBox {
backendValue: backendValues.highlightMoveDuration backendValue: backendValues.highlightMoveDuration
minimumValue: 0; minimumValue: 0
maximumValue: 1000; maximumValue: 1000
decimals: 0 decimals: 0
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -177,13 +164,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
SpinBox { SpinBox {
backendValue: backendValues.preferredHighlightBegin backendValue: backendValues.preferredHighlightBegin
minimumValue: 0; minimumValue: 0
maximumValue: 1; maximumValue: 1
decimals: 2 decimals: 2
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
@@ -195,13 +180,11 @@ Column {
SecondColumnLayout { SecondColumnLayout {
SpinBox { SpinBox {
backendValue: backendValues.preferredHighlightEnd backendValue: backendValues.preferredHighlightEnd
minimumValue: 0; minimumValue: 0
maximumValue: 1; maximumValue: 1
decimals: 2 decimals: 2
} }
ExpandingSpacer { ExpandingSpacer {
} }
} }
} }

17
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml
View File

@@ -27,7 +27,6 @@ import QtQuick 2.1
import HelperWidgets 2.0 import HelperWidgets 2.0
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
Section { Section {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@@ -40,7 +39,6 @@ Section {
rows: 4 rows: 4
columns: 2 columns: 2
Label { Label {
visible: textInputSection.isTextInput visible: textInputSection.isTextInput
text: qsTr("Input mask") text: qsTr("Input mask")
@@ -62,7 +60,7 @@ Section {
Layout.fillWidth: true Layout.fillWidth: true
backendValue: backendValues.echoMode backendValue: backendValues.echoMode
scope: "TextInput" scope: "TextInput"
model: ["Normal", "Password", "PasswordEchoOnEdit", "NoEcho"] model: ["Normal", "Password", "PasswordEchoOnEdit", "NoEcho"]
} }
Label { Label {
@@ -85,25 +83,28 @@ Section {
SecondColumnLayout { SecondColumnLayout {
ColumnLayout { ColumnLayout {
CheckBox { CheckBox {
Layout.fillWidth: true
text: qsTr("Read only") text: qsTr("Read only")
backendValue: backendValues.readOnly; backendValue: backendValues.readOnly
} }
CheckBox { CheckBox {
Layout.fillWidth: true
text: qsTr("Cursor visible") text: qsTr("Cursor visible")
backendValue: backendValues.cursorVisible; backendValue: backendValues.cursorVisible
} }
CheckBox { CheckBox {
Layout.fillWidth: true
text: qsTr("Active focus on press") text: qsTr("Active focus on press")
backendValue: backendValues.activeFocusOnPress; backendValue: backendValues.activeFocusOnPress
} }
CheckBox { CheckBox {
Layout.fillWidth: true
text: qsTr("Auto scroll") text: qsTr("Auto scroll")
backendValue: backendValues.autoScroll; backendValue: backendValues.autoScroll
} }
} }
} }
} }