From 004049db3a0abd8c5aeb233f2b3d4069a79ee4d7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 24 Mar 2011 10:07:02 +0100 Subject: [PATCH] QmlDesigner.propertyEditor: add specifics for Flickable The Flickable item has to be be useable in the property editor. --- .../propertyeditor/Qt/FlickableSpecifics.qml | 138 ++++++++++++++++-- 1 file changed, 125 insertions(+), 13 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml index 7e7c33ffaeb..87e0a04eddf 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml @@ -1,15 +1,6 @@ import Qt 4.7 import Bauhaus 1.0 -//backendValue: backendValues.horizontalVelocity; -//backendValue: backendValues.verticalVelocity; -//backendValue: backendValues.maximumFlickVelocity; -//backendValue: backendValues.overShoot; - -//boundsBehavior : enumeration -//contentHeight : int -//contentWidth : int - QWidget { layout: QVBoxLayout { topMargin: 0 @@ -17,9 +8,130 @@ QWidget { leftMargin: 0 rightMargin: 0 spacing: 0 - GroupBox { - finished: finishedNotify; - caption: qsTr("Flickable") + GroupBox { + finished: finishedNotify; + caption: qsTr("Flickable") + layout: VerticalLayout { + QWidget { // 1 + layout: HorizontalLayout { + + Label { + text: qsTr("Content Size") + } + + DoubleSpinBox { + text: "W" + alignRight: false + spacing: 4 + singleStep: 1; + backendValue: backendValues.contentWidth + minimum: 0; + maximum: 8000; + baseStateFlag: isBaseState; + } + + DoubleSpinBox { + singleStep: 1; + text: "H" + alignRight: false + spacing: 4 + backendValue: backendValues.contentHeight + minimum: 0; + maximum: 8000; + baseStateFlag: isBaseState; + } + + + } + } //QWidget //1 + QWidget { + layout: HorizontalLayout { + Label { + text: qsTr("Flickable Direction") + } + + ComboBox { + baseStateFlag: isBaseState + items : { ["AutoFlickDirection", "HorizontalFlick", "VerticalFlick", "HorizontalAndVerticalFlick"] } + currentText: backendValues.flickableDirection.value; + onItemsChanged: { + currentText = backendValues.flickableDirection.value; + } + backendValue: backendValues.flickableDirection + } + } + } //QWidget + QWidget { + layout: HorizontalLayout { + Label { + text: qsTr("Bounds Behavior") + } + + ComboBox { + baseStateFlag: isBaseState + items : { ["StopAtBounds", "DragOverBounds", "DragAndOvershootBounds"] } + currentText: backendValues.boundsBehavior.value; + onItemsChanged: { + currentText = backendValues.boundsBehavior.value; + } + backendValue: backendValues.boundsBehavior + } + } + } //QWidget + QWidget { + layout: HorizontalLayout { + Label { + text:qsTr("Interactive") + } + CheckBox { + text: "" + backendValue: backendValues.interactive; + baseStateFlag: isBaseState; + checkable: true; + } + } + }// QWidget + QWidget { + layout: HorizontalLayout { + + Label { + text: qsTr("Max. Velocity") + toolTip: qsTr("Maximum Flick Velocity") + } + + DoubleSpinBox { + text: "" + alignRight: false + spacing: 4 + singleStep: 1; + backendValue: backendValues.maximumFlickVelocity + minimum: 0; + maximum: 8000; + baseStateFlag: isBaseState; + } + } + } //QWidget + QWidget { + layout: HorizontalLayout { + + Label { + text: qsTr("Deceleration") + toolTip: qsTr("Flick Deceleration") + } + + DoubleSpinBox { + text: "" + alignRight: false + spacing: 4 + singleStep: 1; + backendValue: backendValues.flickDeceleration + minimum: 0; + maximum: 8000; + baseStateFlag: isBaseState; + } + } + } //QWidget + } } } -} \ No newline at end of file +}