From a210978e9b02049beabdfb9da320c0c86faf4de1 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 29 Sep 2010 13:27:51 +0200
Subject: [PATCH] QmlDesigner.propertyEditor: re design panes
This patch makes the important properties more
accessible.
Reviewed-by: Marco Bubke
---
.../propertyeditor/Qt/ExtendedPane.qml | 5 ++---
.../propertyeditor/Qt/ItemPane.qml | 20 +++++++++++++++++--
.../propertyeditor/Qt/LayoutPane.qml | 5 +----
.../propertyeditor/Qt/Switches.qml | 4 ++--
4 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
index 3c0e9efe129..a764d9dcce0 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
@@ -16,9 +16,8 @@ QScrollArea {
leftMargin: 0;
rightMargin: 0;
spacing: 0;
-
- Visibility {}
- Transformation {}
+
+ Transformation {}
QScrollArea {
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
index 70896d5284a..b4247773de7 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
@@ -13,10 +13,28 @@ PropertyFrame {
leftMargin: 0;
rightMargin: 0;
spacing: 0;
+
+ Type {
+ }
+
+ Geometry {
+ }
+
+ Visibility {
+
+ }
+
+ HorizontalWhiteLine {
+ maximumHeight: 4;
+ styleSheet: "QLineEdit {border: 2px solid #707070; min-height: 0px; max-height: 0px;}";
+ }
+
Switches {
}
+
HorizontalWhiteLine {
}
+
ScrollArea {
styleSheetFile: ":/qmldesigner/scrollbar.css";
widgetResizable: true;
@@ -35,8 +53,6 @@ PropertyFrame {
leftMargin: 0;
rightMargin: 0;
spacing: 0;
- Type {
- }
WidgetLoader {
id: specificsOne;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
index f22c0c75e9c..2e4dd0dfb2a 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
@@ -15,10 +15,7 @@ QScrollArea {
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
- spacing: 0
-
- Geometry {
- }
+ spacing: 0;
Layout {
id: layoutBox;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
index 3c4b95f95e6..d507c5ada07 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
@@ -35,8 +35,8 @@ QFrame {
id: layoutMode;
checkable: true;
checked: false;
- toolTip: qsTr("layout and geometry");
- text: qsTr("Geometry");
+ toolTip: qsTr("layout");
+ text: qsTr("Layout");
onClicked: {
extendedMode.checked = false;
standardMode.checked = false;
--
GitLab