From d9d37a22eaacd7c17dfbc2ccaf5dd1da5e03a689 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 2 Mar 2010 10:23:27 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: fixes TextInput and TextEdit
---
.../qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml | 7 +++++--
.../qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml | 2 --
.../qmldesigner/propertyeditor/Qt/TextSpecifics.qml | 2 ++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
index 0abb6e4b5b9..2564449f585 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
@@ -6,7 +6,9 @@ GroupBox {
caption: "Text";
- property bool showStyleColor: false;
+ property bool showStyleColor: false
+ property bool showIsWrapping: false
+ property bool showVerticalAlignment: false
layout: VerticalLayout {
QWidget {
@@ -23,6 +25,7 @@ GroupBox {
}
}
QWidget {
+ visible: showIsWrapping
layout: HorizontalLayout {
Label {
text: ""
@@ -43,7 +46,7 @@ GroupBox {
text: "Alignment"
}
AlignmentHorizontalButtons {}
- AlignmentVerticalButtons {}
+ AlignmentVerticalButtons { visible: showVerticalAlignment }
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
index 9ce932999b1..9bcfae1acc3 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
@@ -12,9 +12,7 @@ QWidget {
spacing: 0
StandardTextGroupBox {
- showStyleColor: true
finished: finishedNotify;
-
}
GroupBox {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml
index b087ccfdc49..9296e057c8c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml
@@ -13,6 +13,8 @@ QWidget {
StandardTextGroupBox {
showStyleColor: true
+ showIsWrapping: true
+ showVerticalAlignment: true
finished: finishedNotify;
}
--
GitLab