Commit 9a49ad00 authored by Thomas Hartmann's avatar Thomas Hartmann

QmlDesigner: using QtQuick 1.0 instead of Qt 4.7

huge renaming from Qt to QtQuick
propertyeditor qml files moved from Qt to QtQuick
auotests fixed
files used in tests fixed

autotests pass

Task-number: QTCREATORBUG-2556

Reviewed-by: Kai Koehne
parent b4af592d
import Qt 4.7
import Bauhaus 1.0
QWidget {
id: comboBox
property variant backendValue;
property variant baseStateFlag;
property alias enabled: box.enabled;
property alias items: box.items;
property alias currentText: box.currentText;
onBaseStateFlagChanged: {
evaluate();
}
property variant isEnabled: comboBox.enabled
onIsEnabledChanged: {
evaluate();
}
function evaluate() {
if (backendValue === undefined)
return;
if (!enabled) {
box.setStyleSheet("color: "+scheme.disabledColor);
} else {
if (baseStateFlag) {
if (backendValue.isInModel)
box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedBaseColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
else
box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
} else {
if (backendValue.isInSubState)
box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.changedStateColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
else
box.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
}
}
}
ColorScheme { id:scheme; }
layout: HorizontalLayout {
QComboBox {
id: box
property variant backendValue: comboBox.backendValue
onCurrentTextChanged: { backendValue.value = currentText; evaluate(); }
onItemsChanged: {
if (comboBox.backendValue.value == curentText)
return;
box.setCurrentTextSilent(comboBox.backendValue.value);
}
property variant backendValueValue: comboBox.backendValue.value
onBackendValueValueChanged: {
if (comboBox.backendValue.value == curentText)
return;
box.setCurrentTextSilent(comboBox.backendValue.value);
}
ExtendedFunctionButton {
backendValue: comboBox.backendValue;
y: 3
x: 3
}
}
}
}
......@@ -80,6 +80,8 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
decimals: 1;
keyboardTracking: false;
enabled: !backendValue.isBound && doubleSpinBox.enabled;
minimum: -1000
maximum: 1000
property bool readingFromBackend: false;
property real valueFromBackend: doubleSpinBox.backendValue.value;
......
......@@ -9,8 +9,8 @@ QWidget {
property variant caption;
property variant maximumValue: 99
property variant minimumValue: 0
property variant maximumValue: 1000
property variant minimumValue: -1000
property variant step: 1
property bool slider: true
property alias alignment: label.alignment
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment