feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "QmlDesigner.PropertyEditor: changed layout combobox"

Browse Source 
This reverts commit 622e7234b7.
This commit is contained in:
Christiaan Janssen
2010-03-02 17:43:15 +01:00
parent e58ee43ecc
commit 2c57c2992a
2 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
View File

@@ -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; }

35
share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutComboBox.qml
View File

@@ -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
}
}
}