diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-05-25 11:19:59 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-05-25 11:28:48 +0200 |
| commit | 2aefea55577f20b31f4753cab54b6dab0785d38c (patch) | |
| tree | b3125e52a184ad98141c9677fd233e84ac71cb5c /share | |
| parent | 1c401481f288d593947159560e462690b57da4f0 (diff) | |
| download | qt-creator-2aefea55577f20b31f4753cab54b6dab0785d38c.tar.gz | |
QmlDesigner.property: do not allow to enter ',' for margins.
If minimum/maximum < 1000 the validator does not allow ','.
Allowing ',' confuses users.
Change-Id: I5ce3b809ea03552e03f11461d677d6212edb3aa4
Reviewed-on: http://codereview.qt.nokia.com/105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml | 1 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml | 30 |
2 files changed, 19 insertions, 12 deletions
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml index 2fe97b5bdd..e7fbabf4fc 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml @@ -26,6 +26,7 @@ QWidget { backendValue: (intEditor.backendValue === undefined || intEditor.backendValue === null) ? null : intEditor.backendValue; + singleStep: step property variant backendValueValue: (intEditor.backendValue === undefined || intEditor.backendValue === null) diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml index 9f10d14f43..1475dd06ff 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml @@ -72,8 +72,9 @@ GroupBox { caption: qsTr("Margin") backendValue: backendValues.anchors_topMargin baseStateFlag: isInBaseState; - maximumValue: 1000 - minimumValue: -1000 + maximumValue: 999 + minimumValue: -999 + step: 1 } PlaceHolder { @@ -121,8 +122,9 @@ GroupBox { caption: qsTr("Margin") backendValue: backendValues.anchors_bottomMargin baseStateFlag: isInBaseState; - maximumValue: 1000 - minimumValue: -1000 + maximumValue: 999 + minimumValue: -999 + step: 1 } PlaceHolder { @@ -169,8 +171,9 @@ GroupBox { caption: qsTr("Margin") backendValue: backendValues.anchors_leftMargin baseStateFlag: isInBaseState; - maximumValue: 1000 - minimumValue: -1000 + maximumValue: 999 + minimumValue: -999 + step: 1 } PlaceHolder { @@ -217,8 +220,9 @@ GroupBox { caption: qsTr("Margin") backendValue: backendValues.anchors_rightMargin baseStateFlag: isInBaseState; - maximumValue: 1000 - minimumValue: -1000 + maximumValue: 999 + minimumValue: -999 + step: 1 } PlaceHolder { @@ -265,8 +269,9 @@ GroupBox { caption: qsTr("Margin") baseStateFlag: isInBaseState; backendValue: backendValues.anchors_horizontalCenterOffset - maximumValue: 1000 - minimumValue: -1000 + maximumValue: 999 + minimumValue: -999 + step: 1 } PlaceHolder { @@ -313,8 +318,9 @@ GroupBox { caption: qsTr("Margin") backendValue: backendValues.anchors_verticalCenterOffset baseStateFlag: isInBaseState; - maximumValue: 1000 - minimumValue: -1000 + maximumValue: 999 + minimumValue: -999 + step: 1 } PlaceHolder { |