aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksei German <aleksei.german@qt.io>2020-09-02 17:51:50 +0200
committerAleksei German <aleksei.german@qt.io>2020-09-03 06:51:48 +0000
commitd6da7745faffe25b8261e96ae0875b25d9799a2b (patch)
treee99aec1013f731bd696f85a1c1f57851e66caf9a
parent5355aa7a3706790079f4681dd0f34bc77802f3b6 (diff)
QmlDesigner: Remove old properties
Removed and replaced old properties for ListView and GridView Change-Id: Ifbf2aae2958c5f67616d8f6a4acad6646b34c18c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--share/qtcreator/qml-type-descriptions/builtins.qmltypes8
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml16
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml28
3 files changed, 26 insertions, 26 deletions
diff --git a/share/qtcreator/qml-type-descriptions/builtins.qmltypes b/share/qtcreator/qml-type-descriptions/builtins.qmltypes
index a7c009027c..c0b5400318 100644
--- a/share/qtcreator/qml-type-descriptions/builtins.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/builtins.qmltypes
@@ -1425,9 +1425,9 @@ Module {
Property { name: "highlight"; type: "QDeclarativeComponent"; isPointer: true }
Property { name: "highlightItem"; type: "QDeclarativeItem"; isReadonly: true; isPointer: true }
Property { name: "highlightFollowsCurrentItem"; type: "bool" }
- Property { name: "highlightMoveSpeed"; type: "qreal" }
+ Property { name: "highlightMoveVelocity"; type: "qreal" }
Property { name: "highlightMoveDuration"; type: "int" }
- Property { name: "highlightResizeSpeed"; type: "qreal" }
+ Property { name: "highlightResizeVelocity"; type: "qreal" }
Property { name: "highlightResizeDuration"; type: "int" }
Property { name: "preferredHighlightBegin"; type: "qreal" }
Property { name: "preferredHighlightEnd"; type: "qreal" }
@@ -1448,9 +1448,9 @@ Module {
Signal { name: "layoutDirectionChanged"; revision: 1 }
Signal { name: "currentIndexChanged" }
Signal { name: "currentSectionChanged" }
- Signal { name: "highlightMoveSpeedChanged" }
+ Signal { name: "highlightMoveVelocityChanged" }
Signal { name: "highlightMoveDurationChanged" }
- Signal { name: "highlightResizeSpeedChanged" }
+ Signal { name: "highlightResizeVelocityChanged" }
Signal { name: "highlightResizeDurationChanged" }
Signal { name: "highlightChanged" }
Signal { name: "highlightItemChanged" }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml
index 4038097b42..dd032acc12 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml
@@ -198,22 +198,6 @@ Column {
}
Label {
- text: qsTr("Move speed")
- tooltip: qsTr("Move animation speed of the highlight delegate.")
- }
-
- SectionLayout {
- SpinBox {
- backendValue: backendValues.highlightMoveSpeed
- minimumValue: 0
- maximumValue: 1000
- decimals: 0
- }
- ExpandingSpacer {
- }
- }
-
- Label {
text: qsTr("Preferred begin")
tooltip: qsTr("Preferred highlight begin - must be smaller than Preferred end.")
}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
index 058cbb724a..d9df5e09b4 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
@@ -173,7 +173,7 @@ Column {
SectionLayout {
SpinBox {
backendValue: backendValues.highlightMoveDuration
- minimumValue: 0
+ minimumValue: -1
maximumValue: 1000
decimals: 0
}
@@ -182,14 +182,14 @@ Column {
}
Label {
- text: qsTr("Move speed")
- tooltip: qsTr("Move animation speed of the highlight delegate.")
+ text: qsTr("Move velocity")
+ tooltip: qsTr("Move animation velocity of the highlight delegate.")
}
SectionLayout {
SpinBox {
- backendValue: backendValues.highlightMoveSpeed
- minimumValue: 0
+ backendValue: backendValues.highlightMoveVelocity
+ minimumValue: -1
maximumValue: 1000
decimals: 0
}
@@ -205,7 +205,23 @@ Column {
SectionLayout {
SpinBox {
backendValue: backendValues.highlightResizeDuration
- minimumValue: 0
+ minimumValue: -1
+ maximumValue: 1000
+ decimals: 0
+ }
+ ExpandingSpacer {
+ }
+ }
+
+ Label {
+ text: qsTr("Resize velocity")
+ tooltip: qsTr("Resize animation velocity of the highlight delegate.")
+ }
+
+ SectionLayout {
+ SpinBox {
+ backendValue: backendValues.highlightResizeVelocity
+ minimumValue: -1
maximumValue: 1000
decimals: 0
}