diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-07-05 14:44:28 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-07-15 16:29:10 +0200 |
| commit | ba084e663fd09b4f67c093638168b544dfd18544 (patch) | |
| tree | 4ed88b6cd62e3351646c72a7829012fc48701432 | |
| parent | 87aa77fa651c24bff36bebbeaee36877082a027e (diff) | |
| download | qt-creator-ba084e663fd09b4f67c093638168b544dfd18544.tar.gz | |
QmlDesigner.PropertyEditor: enabling layout direction
This has been fixed in the rewriter and meta info system.
Change-Id: I4c78a915a05c01b33f779cf255c5b9c67d3e0001
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
3 files changed, 53 insertions, 51 deletions
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlowSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlowSpecifics.qml index a255b3d7bf..8bfc6aea3b 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlowSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlowSpecifics.qml @@ -59,24 +59,24 @@ QWidget { } } } //QWidget -// Qt namespace enums not supported by the rewriter -// QWidget { -// layout: HorizontalLayout { -// Label { -// text: qsTr("Layout direction") -// } -// ComboBox { -// baseStateFlag: isBaseState -// items : { ["LeftToRight", "RightToLeft"] } -// currentText: backendValues.layoutDirection.value; -// onItemsChanged: { -// currentText = backendValues.layoutDirection.value; -// } -// backendValue: backendValues.layoutDirection -// } -// } -// } //QWidget + QWidget { + layout: HorizontalLayout { + Label { + text: qsTr("Layout direction") + } + + ComboBox { + baseStateFlag: isBaseState + items : { ["LeftToRight", "RightToLeft"] } + currentText: backendValues.layoutDirection.value; + onItemsChanged: { + currentText = backendValues.layoutDirection.value; + } + backendValue: backendValues.layoutDirection + } + } + } //QWidget IntEditor { backendValue: backendValues.spacing caption: qsTr("Spacing") diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml index f4dede2c05..ec835f4b6a 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml @@ -75,24 +75,27 @@ QWidget { } } } //QWidget -// Qt namespace enums not supported by the rewriter -// QWidget { -// layout: HorizontalLayout { -// Label { -// text: qsTr("Layout direction") -// } + //Qt namespace enums not supported by the rewriter + QWidget { + layout: HorizontalLayout { + Label { + text: qsTr("Layout direction") + } -// ComboBox { -// baseStateFlag: isBaseState -// items : { ["LeftToRight", "RightToLeft"] } -// currentText: backendValues.layoutDirection.value; -// onItemsChanged: { -// currentText = backendValues.layoutDirection.value; -// } -// backendValue: backendValues.layoutDirection -// } -// } -// } //QWidget + ComboBox { + id: alignmentBox + baseStateFlag: isBaseState + items : { ["LeftToRight", "RightToLeft"] } + currentText: backendValues.layoutDirection.value; + onItemsChanged: { + alignmentBox.currentText = backendValues.layoutDirection.value; + print("blab"); + print(alignmentBox.currentText); + } + backendValue: backendValues.layoutDirection + } + } + } //QWidget IntEditor { backendValue: backendValues.spacing caption: qsTr("Spacing") diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml index 4fe8a643ea..8f53272999 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml @@ -42,24 +42,23 @@ QWidget { finished: finishedNotify; caption: qsTr("Row") layout: VerticalLayout { -// Qt namespace enums not supported by the rewriter -// QWidget { -// layout: HorizontalLayout { -// Label { -// text: qsTr("Layout direction") -// } + QWidget { + layout: HorizontalLayout { + Label { + text: qsTr("Layout direction") + } -// ComboBox { -// baseStateFlag: isBaseState -// items : { ["LeftToRight", "RightToLeft"] } -// currentText: backendValues.layoutDirection.value; -// onItemsChanged: { -// currentText = backendValues.layoutDirection.value; -// } -// backendValue: backendValues.layoutDirection -// } -// } -// } //QWidget + ComboBox { + baseStateFlag: isBaseState + items : { ["LeftToRight", "RightToLeft"] } + currentText: backendValues.layoutDirection.value; + onItemsChanged: { + currentText = backendValues.layoutDirection.value; + } + backendValue: backendValues.layoutDirection + } + } + } //QWidget IntEditor { backendValue: backendValues.spacing caption: qsTr("Spacing") |