Commit e8ec38c1 authored by Bea Lam's avatar Bea Lam

Fix ids that start with uppercase letters that were missed

previously.
parent e0e5d94b
......@@ -26,7 +26,7 @@ QWidget {
x: 0;
y: 0;
width:200;fixedWidth: width;
id: QPushButton1;
id: qPushButton1;
onReleased: fill();
}
......@@ -36,7 +36,7 @@ QWidget {
height:20;fixedHeight: height;
width:200;fixedWidth: width;
x: 0;
id: QPushButton3;
id: qPushButton3;
onReleased: breakLayout();
}
......@@ -48,7 +48,7 @@ QWidget {
y: 60;
//styleSheet: "border-radius:5px; background-color: #ffda82";
width:30;fixedWidth: width;
id: QPushButton5;
id: qPushButton5;
checkable: true;
checked: anchorBackend.leftAnchored;
onReleased: {
......@@ -69,7 +69,7 @@ QWidget {
width:100;fixedWidth: 100;
x: 49;
y: 30;
id: QPushButton6;
id: qPushButton6;
checkable: true;
checked: anchorBackend.topAnchored;
onReleased: {
......@@ -90,7 +90,7 @@ QWidget {
//styleSheet: "border-radius:5px; background-color: #ffda82";
width:30;fixedWidth: width;
height:100;fixedHeight: height;
id: QPushButton7;
id: qPushButton7;
checkable: true;
checked: anchorBackend.rightAnchored;
onReleased: {
......@@ -111,7 +111,7 @@ QWidget {
x: 49;
y: 164;
height:27;fixedHeight: height;
id: QPushButton8;
id: qPushButton8;
checkable: true;
checked: anchorBackend.bottomAnchored;
onReleased: {
......@@ -130,7 +130,7 @@ QWidget {
x: 49;
y: 60;
height:100;fixedHeight: height;
id: QPushButton9;
id: qPushButton9;
QPushButton {
width:24;fixedWidth: width;
......
import Qt 4.6
import Bauhaus 1.0
QWidget { //This is a special CheckBox that does color coding for states
QWidget { //This is a special checkBox that does color coding for states
id: CheckBox;
id: checkBox;
property var backendValue;
property var baseStateFlag;
property alias checkable: LocalCheckBox.checkable
property alias text: LocalLabel.text
property alias checkable: localCheckBox.checkable
property alias text: localLabel.text
onBaseStateFlagChanged: {
evaluate();
......@@ -36,14 +36,14 @@ QWidget { //This is a special CheckBox that does color coding for states
function evaluate() {
if (baseStateFlag) {
if (backendValue != null && backendValue.isInModel)
LocalLabel.setStyleSheet("color: white;");
localLabel.setStyleSheet("color: white;");
else
LocalLabel.setStyleSheet("color: gray;");
localLabel.setStyleSheet("color: gray;");
} else {
if (backendValue != null && backendValue.isInSubState)
LocalLabel.setStyleSheet("color: #7799FF;");
localLabel.setStyleSheet("color: #7799FF;");
else
LocalLabel.setStyleSheet("color: gray;");
localLabel.setStyleSheet("color: gray;");
}
}
}
......@@ -54,7 +54,7 @@ QWidget { //This is a special CheckBox that does color coding for states
spacing: 4
QCheckBox {
id: LocalCheckBox
id: localCheckBox
checkable: true;
checked: (backendValue === undefined || backendValue === null) ? false : backendValue.value;
onToggled: {
......@@ -63,7 +63,7 @@ QWidget { //This is a special CheckBox that does color coding for states
}
QLabel {
id: LocalLabel
id: localLabel
font.bold: true;
alignment: "Qt::AlignLeft | Qt::AlignVCenter"
}
......@@ -72,9 +72,9 @@ QWidget { //This is a special CheckBox that does color coding for states
ExtendedFunctionButton {
backendValue: CheckBox.backendValue
backendValue: checkBox.backendValue
y: 4
x: LocalCheckBox.x + 18;
x: localCheckBox.x + 18;
}
}
......@@ -2,7 +2,7 @@ import Qt 4.6
import Bauhaus 1.0
QExtGroupBox {
id: ColorGroupBox
id: colorGroupBox
property var finished;
......@@ -23,7 +23,7 @@ QExtGroupBox {
QWidget {
id: colorButtonWidget
height: 32
width: ColorGroupBox.width
width: colorGroupBox.width
layout: HorizontalLayout {
topMargin: 4
rightMargin: 10;
......@@ -33,11 +33,11 @@ QExtGroupBox {
}
LineEdit {
backendValue: ColorGroupBox.backendColor
backendValue: colorGroupBox.backendColor
}
ColorButton {
color: ColorGroupBox.backendColor.value;
color: colorGroupBox.backendColor.value;
checkable: true;
checked: false;
minimumHeight: 18;
......@@ -45,10 +45,10 @@ QExtGroupBox {
onClicked: {
if (checked) {
ColorGroupBox.collapsed = false;
colorGroupBox.collapsed = false;
colorButtonWidget.visible = true;
} else {
ColorGroupBox.collapsed = true;
colorGroupBox.collapsed = true;
colorButtonWidget.visible = true;
}
}
......@@ -69,18 +69,18 @@ QExtGroupBox {
layout: HorizontalLayout {
ColorBox {
color: ColorGroupBox.backendColor.value;
color: colorGroupBox.backendColor.value;
onColorChanged: {
ColorGroupBox.backendColor.value = color;
colorGroupBox.backendColor.value = color;
}
hue: hueControl.hue;
}
HueControl {
id: hueControl;
color: ColorGroupBox.backendColor.value;
color: colorGroupBox.backendColor.value;
onColorChanged: {
ColorGroupBox.backendColor.value = color;
colorGroupBox.backendColor.value = color;
}
}
......
......@@ -2,8 +2,8 @@ import Qt 4.6
import Bauhaus 1.0
Label {
id: ColorLabel
id: colorLabel
styleSheet: "color: #ffffff;"
alignment: "Qt::AlignLeft | Qt::AlignVCenter"
minimumHeight: 18
}
\ No newline at end of file
}
......@@ -2,7 +2,7 @@ import Qt 4.6
import Bauhaus 1.0
QGroupBox {
id: ColorTypeButtons
id: colorTypeButtons
layout: HorizontalLayout {
topMargin: 6
rightMargin: 10;
......
......@@ -6,7 +6,7 @@ GroupBox {
finished: finishedNotify;
caption: "Grid";
id: GridSpecifics;
id: gridSpecifics;
layout: QVBoxLayout {
......
......@@ -2,13 +2,13 @@ import Qt 4.6
import Bauhaus 1.0
QComboBox {
id: ComboBox
id: comboBox
property var backendValue
ExtendedFunctionButton {
backendValue: (ComboBox.backendValue === undefined || ComboBox.backendValue === null)
? null : ComboBox.backendValue;
backendValue: (comboBox.backendValue === undefined || comboBox.backendValue === null)
? null : comboBox.backendValue;
y: 3
x: 3
}
......
import Qt 4.6
import Bauhaus 1.0
QWidget { //This is a special DoubleSpinBox that does color coding for states
id: DoubleSpinBox;
QWidget { //This is a special doubleSpinBox that does color coding for states
id: doubleSpinBox;
property var backendValue;
property var baseStateFlag;
property alias singleStep: box.singleStep
property alias minimum: box.minimum
property alias maximum: box.maximum
property alias spacing: LayoutH.spacing
property alias spacing: layoutH.spacing
property alias text: label.text
property bool alignRight: true
property bool enabled: true
......@@ -53,28 +53,28 @@ QWidget { //This is a special DoubleSpinBox that does color coding for states
}
layout: HorizontalLayout {
id: LayoutH;
id: layoutH;
QLabel {
id: label;
font.bold: true;
alignment: DoubleSpinBox.alignRight ? "Qt::AlignRight | Qt::AlignVCenter" : "Qt::AlignLeft | Qt::AlignVCenter";
alignment: doubleSpinBox.alignRight ? "Qt::AlignRight | Qt::AlignVCenter" : "Qt::AlignLeft | Qt::AlignVCenter";
maximumWidth: 40
visible: DoubleSpinBox.text != "";
visible: doubleSpinBox.text != "";
}
QDoubleSpinBox {
id: box;
decimals: 1;
keyboardTracking: false;
enabled: (DoubleSpinBox.backendValue === undefined ||
DoubleSpinBox.backendValue === null)
? true : !backendValue.isBound && DoubleSpinBox.enabled;
enabled: (doubleSpinBox.backendValue === undefined ||
doubleSpinBox.backendValue === null)
? true : !backendValue.isBound && doubleSpinBox.enabled;
property bool readingFromBackend: false;
property real valueFromBackend: (DoubleSpinBox.backendValue === undefined ||
DoubleSpinBox.backendValue === null || DoubleSpinBox.backendValue.value === undefined)
? .0 : DoubleSpinBox.backendValue.value;
property real valueFromBackend: (doubleSpinBox.backendValue === undefined ||
doubleSpinBox.backendValue === null || doubleSpinBox.backendValue.value === undefined)
? .0 : doubleSpinBox.backendValue.value;
onValueFromBackendChanged: {
readingFromBackend = true;
......@@ -83,8 +83,8 @@ QWidget { //This is a special DoubleSpinBox that does color coding for states
}
onValueChanged: {
if (DoubleSpinBox.backendValue != null && readingFromBackend == false)
DoubleSpinBox.backendValue.value = value;
if (doubleSpinBox.backendValue != null && readingFromBackend == false)
doubleSpinBox.backendValue.value = value;
}
onMouseOverChanged: {
......@@ -94,11 +94,11 @@ QWidget { //This is a special DoubleSpinBox that does color coding for states
}
ExtendedFunctionButton {
backendValue: (DoubleSpinBox.backendValue === undefined ||
DoubleSpinBox.backendValue === null)
? null : DoubleSpinBox.backendValue;
backendValue: (doubleSpinBox.backendValue === undefined ||
doubleSpinBox.backendValue === null)
? null : doubleSpinBox.backendValue;
y: box.y + 4
x: box.x + 2
visible: DoubleSpinBox.enabled
visible: doubleSpinBox.enabled
}
}
......@@ -2,7 +2,7 @@ import Qt 4.6
import Bauhaus 1.0
QWidget {
id: ExpressionEditor;
id: expressionEditor;
x: 6
y: -400
width: frame.width - 22
......
......@@ -3,7 +3,7 @@ import Bauhaus 1.0
GroupBox {
caption: "Effect"
id: Extended;
id: extended;
maximumHeight: 260;
layout: VerticalLayout{
......@@ -89,8 +89,8 @@ GroupBox {
visible: effectComboBox.currentText == "Opacity";
layout: QVBoxLayout {
DoubleSpinBox {
id: OpcacityEffectSpinBox;
objectName: "OpcacityEffectSpinBox";
id: opcacityEffectSpinBox;
objectName: "opcacityEffectSpinBox";
backendValue: backendValues.effect.complexNode.exists ? backendValues.effect.complexNode.properties.opacity : null;
minimum: 0;
maximum: 1;
......
......@@ -2,21 +2,21 @@ import Qt 4.6
import Bauhaus 1.0
QToolButton {
id: ExtendedFunctionButton
id: extendedFunctionButton
property var backendValue
Script {
function setIcon() {
if (backendValue == null)
ExtendedFunctionButton.iconFromFile = "images/placeholder.png"
extendedFunctionButton.iconFromFile = "images/placeholder.png"
else if (backendValue.isBound) {
ExtendedFunctionButton.iconFromFile = "images/expression.png"
extendedFunctionButton.iconFromFile = "images/expression.png"
} else {
if (backendValue.complexNode != null && backendValue.complexNode.exists) {
ExtendedFunctionButton.iconFromFile = "images/behaivour.png"
extendedFunctionButton.iconFromFile = "images/behaivour.png"
} else {
ExtendedFunctionButton.iconFromFile = "images/placeholder.png"
extendedFunctionButton.iconFromFile = "images/placeholder.png"
}
}
}
......@@ -73,8 +73,8 @@ QToolButton {
QAction {
text: "Set Expression";
onTriggered: {
expressionEdit.globalY = ExtendedFunctionButton.globalY;
expressionEdit.backendValue = ExtendedFunctionButton.backendValue
expressionEdit.globalY = extendedFunctionButton.globalY;
expressionEdit.backendValue = extendedFunctionButton.backendValue
expressionEdit.show();
expressionEdit.raise();
expressionEdit.active = true;
......
......@@ -5,13 +5,13 @@ QScrollArea {
widgetResizable: true;
styleSheetFile: ":/qmldesigner/scrollbar.css";
horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff";
id: ExtendedPane;
id: extendedPane;
visible: false;
visible: false;
content: ProperyEditorExtended;
content: properyEditorExtended;
QFrame {
minimumHeight: 440;
id: ProperyEditorExtended
id: properyEditorExtended
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 0;
......
......@@ -63,8 +63,8 @@ GroupBox {
DoubleSpinBox {
id: HorizontalVelocitySpinBox;
objectName: "HorizontalVelocitySpinBox";
id: horizontalVelocitySpinBox;
objectName: "horizontalVelocitySpinBox";
backendValue: backendValues.horizontalVelocity;
minimumWidth: 30;
minimum: 0.1
......@@ -74,8 +74,8 @@ GroupBox {
}
DoubleSpinBox {
id: VerticalVelocitySpinBox;
objectName: "VerticalVelocitySpinBox";
id: verticalVelocitySpinBox;
objectName: "verticalVelocitySpinBox";
backendValue: backendValues.verticalVelocity;
minimumWidth: 30;
minimum: 0.1
......@@ -85,8 +85,8 @@ GroupBox {
}
DoubleSpinBox {
id: MaximumVelocitySpinBox;
objectName: "MaximumVelocitySpinBox";
id: maximumVelocitySpinBox;
objectName: "maximumVelocitySpinBox";
backendValue: backendValues.maximumFlickVelocity;
minimumWidth: 30;
minimum: 0.1
......@@ -96,7 +96,7 @@ GroupBox {
}
CheckBox {
id: OvershootCheckBox;
id: overshootCheckBox;
text: "overshoot";
backendValue: backendValues.overShoot;
baseStateFlag: isBaseState;
......
......@@ -2,7 +2,7 @@ import Qt 4.6
import Bauhaus 1.0
GroupBox {
id: FontGroupBox
id: fontGroupBox
caption: "Font";
layout: VerticalLayout {
......
......@@ -3,8 +3,8 @@ import Bauhaus 1.0
GroupBox {
finished: finishedNotify;
id: Geometry;
caption: "Geometry";
id: geometry;
caption: "geometry";
layout: VerticalLayout {
......@@ -16,12 +16,12 @@ GroupBox {
}
DoubleSpinBox {
id: XSpinBox;
id: xSpinBox;
text: "X"
alignRight: false
spacing: 4
singleStep: 1;
objectName: "XSpinBox";
objectName: "xSpinBox";
enabled: anchorBackend.hasParent;
backendValue: backendValues.x
minimum: -2000;
......@@ -30,12 +30,12 @@ GroupBox {
}
DoubleSpinBox {
id: YSpinBox;
id: ySpinBox;
singleStep: 1;
text: "Y"
alignRight: false
spacing: 4
objectName: "YSpinBox";
objectName: "ySpinBox";
backendValue: backendValues.y
enabled: anchorBackend.hasParent;
minimum: -2000;
......@@ -55,12 +55,12 @@ GroupBox {
}
DoubleSpinBox {
id: WidthSpinBox;
id: widthSpinBox;
text: "W"
alignRight: false
spacing: 4
singleStep: 1;
objectName: "WidthSpinBox";
objectName: "widthSpinBox";
backendValue: backendValues.width
minimum: -2000;
maximum: 2000;
......@@ -68,12 +68,12 @@ GroupBox {
}
DoubleSpinBox {
id: HeightSpinBox;
id: heightSpinBox;
text: "H"
alignRight: false
spacing: 4
singleStep: 1;
objectName: "HeightSpinBox";
objectName: "heightSpinBox";
backendValue: backendValues.height
minimum: -2000;
maximum: 2000;
......
......@@ -6,7 +6,7 @@ GroupBox {
finished: finishedNotify;
caption: "Grid";
id: GridSpecifics;
id: gridSpecifics;
layout: QVBoxLayout {
......
......@@ -2,7 +2,7 @@ import Qt 4.6
import Bauhaus 1.0
QExtGroupBox {
id: GroupBox;
id: groupBox;
property var finished;
......@@ -11,7 +11,7 @@ QExtGroupBox {
property var oldMaximumHeight;
onFinishedChanged: {
CheckBox.raise();
checkBox.raise();
maximumHeight = height;
oldMaximumHeight = maximumHeight;
visible = false;
......@@ -21,14 +21,14 @@ QExtGroupBox {
QToolButton {
//QCheckBox {
id: CheckBox;
text: GroupBox.caption;
id: checkBox;
text: groupBox.caption;
focusPolicy: "Qt::NoFocus";
styleSheetFile: "specialCheckBox.css";
styleSheetFile: "specialcheckBox.css";
y: 0;
x: 0;
fixedHeight: 17
fixedWidth: GroupBox.width;
fixedWidth: groupBox.width;
arrowType: "Qt::DownArrow";
toolButtonStyle: "Qt::ToolButtonTextBesideIcon";
checkable: true;
......@@ -36,7 +36,7 @@ QExtGroupBox {
font.bold: true;
onClicked: {