From 2c57c2992ae16dddd293adf61584ec32d72086c7 Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Tue, 2 Mar 2010 17:43:15 +0100
Subject: [PATCH] Revert "QmlDesigner.PropertyEditor: changed layout combobox"
This reverts commit 622e7234b7d93fdb9b05c2c5f335242b857946f4.
---
.../qmldesigner/propertyeditor/Qt/Layout.qml | 12 +++----
.../propertyeditor/Qt/LayoutComboBox.qml | 35 -------------------
2 files changed, 6 insertions(+), 41 deletions(-)
delete mode 100644 share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutComboBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
index 68c90339107..868e6e6ac41 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
@@ -44,7 +44,7 @@ GroupBox {
text: "Target"
fixedWidth: targetLabelWidth
}
- LayoutComboBox {
+ SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.topTarget
onSelectedItemNodeChanged: { anchorBackend.topTarget = selectedItemNode; }
@@ -92,7 +92,7 @@ GroupBox {
text: "Target"
fixedWidth: targetLabelWidth
}
- LayoutComboBox {
+ SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.bottomTarget
onSelectedItemNodeChanged: { anchorBackend.bottomTarget = selectedItemNode; }
@@ -139,7 +139,7 @@ GroupBox {
text: "Target"
fixedWidth: targetLabelWidth
}
- LayoutComboBox {
+ SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.leftTarget
onSelectedItemNodeChanged: { anchorBackend.leftTarget = selectedItemNode; }
@@ -185,7 +185,7 @@ GroupBox {
text: "Target"
fixedWidth: targetLabelWidth
}
- LayoutComboBox {
+ SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.rightTarget
onSelectedItemNodeChanged: { anchorBackend.rightTarget = selectedItemNode; }
@@ -231,7 +231,7 @@ GroupBox {
text: "Target"
fixedWidth: targetLabelWidth
}
- LayoutComboBox {
+ SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.horizontalTarget
onSelectedItemNodeChanged: { anchorBackend.horizontalTarget = selectedItemNode; }
@@ -277,7 +277,7 @@ GroupBox {
text: "Target"
fixedWidth: targetLabelWidth
}
- LayoutComboBox {
+ SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.verticalTarget
onSelectedItemNodeChanged: { anchorBackend.verticalTarget = selectedItemNode; }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutComboBox.qml
deleted file mode 100644
index 076628536d7..00000000000
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutComboBox.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import Qt 4.6
-import Bauhaus 1.0
-
-QWidget {
- id: layoutComboBox
- property alias itemNode: comboBox.itemNode
- property alias selectedItemNode: comboBox.selectedItemNode
-
- property alias enabled: comboBox.enabled
-
- property var isEnabled: comboBox.enabled
- onIsEnabledChanged: {
- evaluate();
- }
-
- // special: will only be valid in base state
- Script {
- function evaluate() {
- if (!enabled) {
- comboBox.setStyleSheet("color: "+scheme.disabledColor);
- } else {
- comboBox.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
- }
- }
- }
-
- ColorScheme { id:scheme; }
-
-
- layout: HorizontalLayout {
- SiblingComboBox {
- id: comboBox
- }
- }
-}
--
GitLab