aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2011-03-24 10:07:02 +0100
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2011-03-24 11:15:19 +0100
commit004049db3a0abd8c5aeb233f2b3d4069a79ee4d7 (patch)
tree0d3db2d696f88ace7a4ff44d211434f17aecbbc3
parentdb8f027a1eb0058d0d6d8c5625e5c1a86eee888f (diff)
QmlDesigner.propertyEditor: add specifics for Flickable
The Flickable item has to be be useable in the property editor.
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml138
1 files changed, 125 insertions, 13 deletions
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
index 7e7c33ffae..87e0a04edd 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
+}