From e8ec38c1a49fa202e7232f036d65b9daa3edcfa7 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 5 Feb 2010 15:42:31 +1000 Subject: [PATCH] Fix ids that start with uppercase letters that were missed previously. --- .../propertyeditor/Qt/AnchorBox.qml | 14 ++++---- .../propertyeditor/Qt/CheckBox.qml | 24 ++++++------- .../propertyeditor/Qt/ColorGroupBox.qml | 20 +++++------ .../propertyeditor/Qt/ColorLabel.qml | 4 +-- .../propertyeditor/Qt/ColorTypeButtons.qml | 2 +- .../propertyeditor/Qt/ColumnSpecifics.qml | 2 +- .../propertyeditor/Qt/ComboBox.qml | 6 ++-- .../propertyeditor/Qt/DoubleSpinBox.qml | 36 +++++++++---------- .../propertyeditor/Qt/ExpressionEditor.qml | 2 +- .../propertyeditor/Qt/Extended.qml | 6 ++-- .../Qt/ExtendedFunctionButton.qml | 14 ++++---- .../propertyeditor/Qt/ExtendedPane.qml | 6 ++-- .../propertyeditor/Qt/FlickableSpecifics.qml | 14 ++++---- .../propertyeditor/Qt/FontGroupBox.qml | 2 +- .../propertyeditor/Qt/Geometry.qml | 20 +++++------ .../propertyeditor/Qt/GridSpecifics.qml | 2 +- .../propertyeditor/Qt/GroupBox.qml | 18 +++++----- .../propertyeditor/Qt/GroupBoxOption.qml | 2 +- .../propertyeditor/Qt/HorizontalLayout.qml | 2 +- .../propertyeditor/Qt/IntEditor.qml | 18 +++++----- .../propertyeditor/Qt/ItemPane.qml | 4 +-- .../qmldesigner/propertyeditor/Qt/Label.qml | 2 +- .../qmldesigner/propertyeditor/Qt/Layout.qml | 6 ++-- .../propertyeditor/Qt/LayoutPane.qml | 6 ++-- .../propertyeditor/Qt/LineEdit.qml | 12 +++---- .../propertyeditor/Qt/ListView.qml | 8 ++--- .../propertyeditor/Qt/ListViewSpecifics.qml | 12 +++---- .../propertyeditor/Qt/Modifiers.qml | 16 ++++----- .../propertyeditor/Qt/PlaceHolder.qml | 4 +-- .../propertyeditor/Qt/PropertyFrame.qml | 2 +- .../Qt/RectangleColorGroupBox.qml | 4 +-- .../propertyeditor/Qt/ResetPane.qml | 8 ++--- .../propertyeditor/Qt/RowSpecifics.qml | 2 +- .../propertyeditor/Qt/SliderWidget.qml | 18 +++++----- .../qmldesigner/propertyeditor/Qt/SpinBox.qml | 22 ++++++------ .../Qt/StandardTextGroupBox.qml | 2 +- .../propertyeditor/Qt/TextInputGroupBox.qml | 2 +- .../qmldesigner/propertyeditor/Qt/Type.qml | 10 +++--- .../propertyeditor/Qt/VerticalLayout.qml | 2 +- .../propertyeditor/Qt/WebViewSpecifics.qml | 2 +- .../qmldesigner/standalone/templates/fx.qml | 2 +- .../auto/qml/qmldesigner/data/fx/bigtest.qml | 18 +++++----- .../qml/qmldesigner/data/fx/helloworld.qml | 12 +++---- .../qml/qmldesigner/data/fx/selectiontest.qml | 10 +++--- tests/auto/qml/qmldesigner/data/fx/states.qml | 8 ++--- 45 files changed, 204 insertions(+), 204 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml index e346ba58ad3..4614567c3ce 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml @@ -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; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml index 288500ffffd..3563f2d7538 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml @@ -1,15 +1,15 @@ 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; } } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml index 9ecbada0c7f..01dad4142ed 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml @@ -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; } } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml index 2a83441dfe5..32ca074d4ab 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml @@ -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 + } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml index 406f1512d03..c9c0a26a10e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 QGroupBox { - id: ColorTypeButtons + id: colorTypeButtons layout: HorizontalLayout { topMargin: 6 rightMargin: 10; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml index f95f56a101d..92bdab8e3f6 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml @@ -6,7 +6,7 @@ GroupBox { finished: finishedNotify; caption: "Grid"; - id: GridSpecifics; + id: gridSpecifics; layout: QVBoxLayout { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml index 1a09bfa22fa..07e6b1261bf 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml @@ -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 } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml index 6f7d3c7eab7..9f495a525d3 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml @@ -1,15 +1,15 @@ 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 } } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml index 4997c0c7f36..5e28ddb442e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml @@ -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 diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml index 286351f5804..d3fa043de52 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml @@ -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; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml index 92b3a9fb5b5..e1994b94670 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml @@ -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; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml index 1f26cffa496..1fe7128b31b 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml @@ -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; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml index 758fc1a3cab..9024bf85459 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml @@ -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; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml index 34f1ca8fef4..0eb114ba051 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 GroupBox { - id: FontGroupBox + id: fontGroupBox caption: "Font"; layout: VerticalLayout { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml index fa22cdd4120..1c66d12dbdd 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml @@ -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; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml index f2215d7632f..76faf930f75 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml @@ -6,7 +6,7 @@ GroupBox { finished: finishedNotify; caption: "Grid"; - id: GridSpecifics; + id: gridSpecifics; layout: QVBoxLayout { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml index e53b9ccba37..dd7eeaf370f 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml @@ -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: { if (checked) { - //GroupBox.maximumHeight = oldMaximumHeight; + //groupBox.maximumHeight = oldMaximumHeight; collapsed = false; //text = ""; //width = 12; @@ -44,10 +44,10 @@ QExtGroupBox { arrowType = "Qt::DownArrow"; visible = true; } else { - //GroupBox.maximumHeight = 20; + //groupBox.maximumHeight = 20; collapsed = true; - //text = GroupBox.caption; + //text = groupBox.caption; visible = true; //width = 120; arrowType = "Qt::RightArrow"; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml index 0e62cd036cd..d0f0075f1fc 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 QExtGroupBox { - id: GroupBoxOption; + id: groupBoxOption; property var finished; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml index d3205ef7cb0..f04c21881b4 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 QHBoxLayout { - id: HorizontalLayout + id: horizontalLayout spacing: 10 topMargin: 0 bottomMargin: 0 diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml index 4e386d120d1..b92ac0ac2fa 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 QWidget { - id: IntEditor; + id: intEditor; property var backendValue; property var baseStateFlag; @@ -22,26 +22,26 @@ QWidget { } SpinBox { - backendValue: (IntEditor.backendValue === undefined || - IntEditor.backendValue === null) - ? null : IntEditor.backendValue; + backendValue: (intEditor.backendValue === undefined || + intEditor.backendValue === null) + ? null : intEditor.backendValue; minimum: minimumValue maximum: maximumValue - baseStateFlag: (IntEditor.backendValue === undefined || - IntEditor.backendValue === null) - ? null : IntEditor.baseStateFlag; + baseStateFlag: (intEditor.backendValue === undefined || + intEditor.backendValue === null) + ? null : intEditor.baseStateFlag; } QWidget { - visible: IntEditor.slider + visible: intEditor.slider id: sliderWidget QSlider { y: sliderWidget.height / 2 - 12 width: sliderWidget.width height: 24 - property alias backendValue: IntEditor.backendValue + property alias backendValue: intEditor.backendValue orientation: "Qt::Horizontal" minimum: minimumValue maximum: maximumValue diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml index f3a9557e703..89e88e2ac85 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml @@ -37,10 +37,10 @@ PropertyFrame { id: standardPane; - content: ProperyEditorStandard; + content: properyEditorStandard; QFrame { //minimumHeight: 1100 - id: ProperyEditorStandard + id: properyEditorStandard layout: QVBoxLayout { topMargin: 0; bottomMargin: 0; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml index 502044ed3e2..ce7ad3ad707 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 QLabel { - id: Label + id: label font.bold: true; alignment: "Qt::AlignRight | Qt::AlignVCenter" fixedWidth: 90 diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml index 3f5b7003b05..f6f137ceaf8 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml @@ -3,8 +3,8 @@ import Bauhaus 1.0 GroupBox { finished: finishedNotify; - caption: "Layout"; -id: Layout; + caption: "layout"; +id: layout; minimumHeight: 280; enabled: anchorBackend.hasParent; @@ -15,7 +15,7 @@ id: Layout; rightMargin: 20; spacing: 20 QLabel { - text: "Layout" + text: "layout" } AnchorBox {} } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml index 8d6f9b726fd..838c19af121 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml @@ -5,12 +5,12 @@ QScrollArea { widgetResizable: true; styleSheetFile: ":/qmldesigner/scrollbar.css"; horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff"; - id: LayoutPane; + id: layoutPane; visible: false; - content: ProperyEditorLayout; + content: properyEditorLayout; QFrame { enabled: isBaseState; - id: ProperyEditorLayout; + id: properyEditorLayout; minimumHeight: 460; layout: QVBoxLayout { topMargin: 0; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml index 709b1c8d898..42a2544985e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml @@ -2,18 +2,18 @@ import Qt 4.6 import Bauhaus 1.0 QWidget { - id: LineEdit + id: lineEdit property var backendValue - property alias enabled: LineEdit.enabled + property alias enabled: lineEdit.enabled minimumHeight: 24; QLineEdit { id: lineEditWidget styleSheet: "padding-left: 16;" - width: LineEdit.width - height: LineEdit.height + width: lineEdit.width + height: lineEdit.height text: backendValue.value @@ -24,9 +24,9 @@ QWidget { } ExtendedFunctionButton { - backendValue: LineEdit.backendValue + backendValue: lineEdit.backendValue y: 4 x: 3 - visible: LineEdit.enabled + visible: lineEdit.enabled } } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListView.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListView.qml index b5a44435319..6a24c95bb25 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListView.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListView.qml @@ -15,10 +15,10 @@ PropertyFrame { QScrollArea { horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff"; id: standardPane; - content: ProperyEditorStandard; + content: properyEditorStandard; QFrame { minimumHeight: 400; - id: ProperyEditorStandard + id: properyEditorStandard layout: QVBoxLayout { topMargin: 2; bottomMargin: 2; @@ -49,10 +49,10 @@ PropertyFrame { id: specialPane; visible: false; visible: false; - content: ProperyEditorSpecial; + content: properyEditorSpecial; QFrame { minimumHeight: 200; - id: ProperyEditorSpecial + id: properyEditorSpecial layout: QVBoxLayout { topMargin: 2; bottomMargin: 2; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml index 28f7c4c8702..ff7ddf1b956 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml @@ -61,7 +61,7 @@ GroupBox { rightMargin: 0; CheckBox { - id: HighlightFollowsCurrentItemCheckBox; + id: highlightFollowsCurrentItemCheckBox; text: ""; backendValue: backendValues.highlightFollowsCurrentItem; baseStateFlag: isBaseState; @@ -69,7 +69,7 @@ GroupBox { } CheckBox { - id: WrapCheckBox; + id: wrapCheckBox; text: ""; backendValue: backendValues.wrap; baseStateFlag: isBaseState; @@ -77,8 +77,8 @@ GroupBox { } SpinBox { - id: SnapPositionSpinBox; - objectName: "SnapPositionSpinBox"; + id: snapPositionSpinBox; + objectName: "snapPositionSpinBox"; backendValue: backendValues.snapPosition; minimumWidth: 30; minimum: 0; @@ -88,8 +88,8 @@ GroupBox { } SpinBox { - id: SpacingSpinBox; - objectName: "SpacingSpinBox"; + id: spacingSpinBox; + objectName: "spacingSpinBox"; backendValue: backendValues.spacing; minimumWidth: 30; minimum: 0; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml index 95b08ebb720..51185f7e46f 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml @@ -6,7 +6,7 @@ GroupBox { caption: "Manipulation" maximumHeight: 200; minimumHeight: 180; - id: Mofifiers; + id: mofifiers; layout: VerticalLayout { @@ -17,14 +17,14 @@ GroupBox { } CheckBox { - id: VisibleCheckBox; + id: visibleCheckBox; text: "Is visible"; backendValue: backendValues.visible === undefined ? false : backendValues.visible; baseStateFlag: isBaseState; checkable: true; } CheckBox { - id: ClipCheckBox; + id: clipCheckBox; text: "Clip Content"; backendValue: backendValues.clip === undefined ? false : backendValues.clip; baseStateFlag: isBaseState; @@ -41,7 +41,7 @@ GroupBox { DoubleSpinBox { text: "" - id: OpacitySpinBox; + id: opacitySpinBox; backendValue: backendValues.opacity === undefined ? null : backendValues.opacity minimumWidth: 60; minimum: 0; @@ -95,8 +95,8 @@ GroupBox { DoubleSpinBox { text: "" - id: ScaleSpinBox; - objectName: "ScaleSpinBox"; + id: scaleSpinBox; + objectName: "scaleSpinBox"; backendValue: backendValues.scale; property var backendValueValue: backendValues.scale.value; minimumWidth: 60; @@ -105,11 +105,11 @@ GroupBox { singleStep: 0.1 baseStateFlag: isBaseState; onBackendValueValueChanged: { - ScaleSlider.value = backendValue.value * 10; + scaleSlider.value = backendValue.value * 10; } } SliderWidget { - id: ScaleSlider; + id: scaleSlider; minimum: 1; maximum: 100; singleStep: 1; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml index 39b72401435..61b961286fe 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml @@ -2,6 +2,6 @@ import Qt 4.6 import Bauhaus 1.0 QWidget { - id: PlaceHolder + id: placeHolder fixedWidth: 100 - } \ No newline at end of file + } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml index 220eed573cb..0f1c871240a 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 WidgetFrame { - id: PropertyFrame; + id: propertyFrame; minimumWidth: 340; styleSheetFile: "propertyEditor.css"; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml index 61348db2bc0..431fc65775a 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 GroupBox { - id: RectangleColorGroupBox + id: rectangleColorGroupBox finished: finishedNotify; caption: "Colors" @@ -37,4 +37,4 @@ layout: VerticalLayout { } - } \ No newline at end of file + } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ResetPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ResetPane.qml index aa164ddda42..9fe4b63b52a 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ResetPane.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ResetPane.qml @@ -3,12 +3,12 @@ import Bauhaus 1.0 QScrollArea { horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff"; - id: ResetPane; + id: resetPane; visible: false; - content: ProperyEditorReset; + content: properyEditorReset; QFrame { //minimumHeight: 1800; - id: ProperyEditorReset + id: properyEditorReset layout: QVBoxLayout { topMargin: 2; bottomMargin: 2; @@ -38,4 +38,4 @@ QScrollArea { } } -} \ No newline at end of file +} diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml index f95f56a101d..92bdab8e3f6 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml @@ -6,7 +6,7 @@ GroupBox { finished: finishedNotify; caption: "Grid"; - id: GridSpecifics; + id: gridSpecifics; layout: QVBoxLayout { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml index 10ef0a219e4..087b2df32fa 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml @@ -2,22 +2,22 @@ import Qt 4.6 import Bauhaus 1.0 QWidget { - id: SliderWidget + id: sliderWidget property var value - property alias singleStep: LocalSlider.singleStep - property alias minimum: LocalSlider.minimum - property alias maximum: LocalSlider.maximum + property alias singleStep: localSlider.singleStep + property alias minimum: localSlider.minimum + property alias maximum: localSlider.maximum QSlider { orientation: "Qt::Horizontal"; - id: LocalSlider - y: SliderWidget.height / 2 - 12 - width: SliderWidget.width + id: localSlider + y: sliderWidget.height / 2 - 12 + width: sliderWidget.width height: 24 - value: SliderWidget.value + value: sliderWidget.value onValueChanged: { - SliderWidget.value = value + sliderWidget.value = value } } } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml index 4dd6ed43dd8..5842c996286 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml @@ -1,15 +1,15 @@ import Qt 4.6 import Bauhaus 1.0 -QWidget { //This is a special SpinBox that does color coding for states - id: SpinBox; +QWidget { //This is a special spinBox that does color coding for states + id: spinBox; property var backendValue; property var baseStateFlag; property alias singleStep: box.singleStep; property alias minimum: box.minimum property alias maximum: box.maximum - property alias enabled: SpinBox.enabled + property alias enabled: spinBox.enabled minimumHeight: 22; @@ -41,14 +41,14 @@ QWidget { //This is a special SpinBox that does color coding for states layout: HorizontalLayout { QSpinBox { - property alias backendValue: SpinBox.backendValue + property alias backendValue: spinBox.backendValue keyboardTracking: false; id: box; enabled: backendValue === undefined || backendValue.isBound === undefined || backendValue.isBound === null ? false : !backendValue.isBound property bool readingFromBackend: false; - property int valueFromBackend: (SpinBox.backendValue === undefined || SpinBox.backendValue == null) - ? .0 : SpinBox.backendValue.value; + property int valueFromBackend: (spinBox.backendValue === undefined || spinBox.backendValue == null) + ? .0 : spinBox.backendValue.value; onValueFromBackendChanged: { readingFromBackend = true; @@ -58,7 +58,7 @@ QWidget { //This is a special SpinBox that does color coding for states } onValueChanged: { - if (SpinBox.backendValue != null && readingFromBackend == false) + if (spinBox.backendValue != null && readingFromBackend == false) backendValue.value = value; } onFocusChanged: { @@ -69,11 +69,11 @@ QWidget { //This is a special SpinBox that does color coding for states } ExtendedFunctionButton { - backendValue: (SpinBox.backendValue === undefined || - SpinBox.backendValue === null) - ? null : SpinBox.backendValue; + backendValue: (spinBox.backendValue === undefined || + spinBox.backendValue === null) + ? null : spinBox.backendValue; y: box.y + 4 x: box.x + 2 - visible: SpinBox.enabled + visible: spinBox.enabled } } diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml index 48aa7f828c2..48e7866f50f 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 GroupBox { - id: StandardTextGroupBox + id: standardTextGroupBox caption: "Text"; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml index ab790194fcb..a802edcf0fa 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml @@ -3,7 +3,7 @@ import Bauhaus 1.0 GroupBox { - id: TextInputGroupBox + id: textInputGroupBox caption: "Text Input"; layout: VerticalLayout { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml index 59492942488..e940d02920a 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml @@ -2,15 +2,15 @@ import Qt 4.6 import Bauhaus 1.0 GroupBox { - id: Type; + id: type; finished: finishedNotify; - caption: "Type"; + caption: "type"; layout: VerticalLayout { QWidget { layout: HorizontalLayout { Label { - text: "Type"; + text: "type"; windowTextColor: isBaseState ? "#000000" : "#FF0000"; } QLineEdit { @@ -27,8 +27,8 @@ GroupBox { } QLineEdit { - id: IdLineEdit; - objectName: "IdLineEdit"; + id: idLineEdit; + objectName: "idLineEdit"; readOnly: isBaseState != true; text: backendValues.id === undefined ? "" : backendValues.id.value; onEditingFinished: { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml index d0e5c0cc640..d086acbdb06 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml @@ -2,7 +2,7 @@ import Qt 4.6 import Bauhaus 1.0 QVBoxLayout { - id: VerticalLayout + id: verticalLayout topMargin: 20; bottomMargin: 4; leftMargin: 0; diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml index beb6393fc32..bccd6c5b3d0 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml @@ -53,7 +53,7 @@ GroupBox { text: "Zoom Factor" } DoubleSpinBox { - id: ZoomSpinBox; + id: zoomSpinBox; minimumWidth: 60; text: "" backendValue: backendValues.zoomFactor; diff --git a/src/tools/qmldesigner/standalone/templates/fx.qml b/src/tools/qmldesigner/standalone/templates/fx.qml index 0732fa811b3..69c50683cf4 100644 --- a/src/tools/qmldesigner/standalone/templates/fx.qml +++ b/src/tools/qmldesigner/standalone/templates/fx.qml @@ -1,7 +1,7 @@ import Qt 4.6 Item { - id: RootItem + id: rootItem width: 640 height: 480 } diff --git a/tests/auto/qml/qmldesigner/data/fx/bigtest.qml b/tests/auto/qml/qmldesigner/data/fx/bigtest.qml index 8f19af47d45..7f9cbb1871c 100644 --- a/tests/auto/qml/qmldesigner/data/fx/bigtest.qml +++ b/tests/auto/qml/qmldesigner/data/fx/bigtest.qml @@ -9,21 +9,21 @@ Item { color: "#009920"; x: 22; y: 31; - id: Rectangle_1; + id: rectangle_1; Rectangle { width: 299; color: "#009920"; x: 109; height: 334; y: 42; - id: Rectangle_3; + id: rectangle_3; Rectangle { color: "#009920"; height: 209; width: 288; x: 98; y: 152; - id: Rectangle_5; + id: rectangle_5; } @@ -33,14 +33,14 @@ Item { x: -154; width: 330; y: -31; - id: Image_1; + id: image_1; }Image { width: 293; x: 33; height: 172; y: 39; source: "qrc:/fxplugin/images/template_image.png"; - id: Image_2; + id: image_2; }} } @@ -50,14 +50,14 @@ Item { x: 360; y: 42; color: "#009920"; - id: Rectangle_2; + id: rectangle_2; Image { source: "qrc:/fxplugin/images/template_image.png"; x: -40; y: 12; width: 281; height: 280; - id: Image_3; + id: image_3; }} Rectangle { height: 206; @@ -65,7 +65,7 @@ Item { color: "#009920"; x: 4; y: 234; - id: Rectangle_4; + id: rectangle_4; } Text { text: "text"; @@ -73,6 +73,6 @@ Item { height: 20; x: 71; y: 15; - id: Text_1; + id: text_1; } } diff --git a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml index 0c1ea919398..f9001597647 100644 --- a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml +++ b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml @@ -3,7 +3,7 @@ import Qt 4.6 Rectangle { width: 300 height: 300 - id: Page + id: page color: "#ffff00" Rectangle { width: 183 @@ -22,7 +22,7 @@ Rectangle { x: 11 y: 10 height: 20 - id: HelloText2 + id: helloText2 text: "Hello QmlGraphics!" } Text { @@ -31,7 +31,7 @@ Rectangle { objectName: "xt5" y: 165 height: 18 - id: HelloText5 + id: helloText5 text: "blah!!!!!" } Image { @@ -53,7 +53,7 @@ Rectangle { y: 11.64 rotation: 90 height: 20 - id: HelloText11 + id: helloText11 text: "Hello QmlGraphics!" } } @@ -62,7 +62,7 @@ Rectangle { x: 10 y: 13 height: 20 - id: HelloText3 + id: helloText3 text: "Hello QmlGraphics!" } Text { @@ -70,7 +70,7 @@ Rectangle { x: 163 y: 184 height: 106 - id: HelloText4 + id: helloText4 text: "Hello QmlGraphics!" } } diff --git a/tests/auto/qml/qmldesigner/data/fx/selectiontest.qml b/tests/auto/qml/qmldesigner/data/fx/selectiontest.qml index 631a0b6999f..ec184df9d7c 100644 --- a/tests/auto/qml/qmldesigner/data/fx/selectiontest.qml +++ b/tests/auto/qml/qmldesigner/data/fx/selectiontest.qml @@ -1,7 +1,7 @@ import Qt 4.6 Item { - id: RootItem + id: rootItem width: 640 height: 480 Rectangle { @@ -10,7 +10,7 @@ Rectangle { y: 178; color: "#ffffff"; width: 100; - id: Rectangle_1; + id: rectangle_1; } Rectangle { x: 110; @@ -18,7 +18,7 @@ Rectangle { color: "#ffffff"; height: 100; width: 100; - id: Rectangle_2; + id: rectangle_2; } Rectangle { width: 100; @@ -26,7 +26,7 @@ Rectangle { height: 100; x: 323; y: 160; - id: Rectangle_3; + id: rectangle_3; } Rectangle { color: "#ffffff"; @@ -34,6 +34,6 @@ Rectangle { height: 100; x: 233; y: 293; - id: Rectangle_4; + id: rectangle_4; } } diff --git a/tests/auto/qml/qmldesigner/data/fx/states.qml b/tests/auto/qml/qmldesigner/data/fx/states.qml index 6c35f4ee2de..35d055df455 100644 --- a/tests/auto/qml/qmldesigner/data/fx/states.qml +++ b/tests/auto/qml/qmldesigner/data/fx/states.qml @@ -9,14 +9,14 @@ Item { height: 120; x: 145; y: 157; - id: Rectangle_1; + id: rectangle_1; } Rectangle { x: 49; y: 6; width: 100; - id: Rectangle_2; + id: rectangle_2; color: "#009920"; height: 100; } @@ -27,7 +27,7 @@ Item { when: destination === "one"; PropertyChanges { - target: Rectangle_2; + target: rectangle_2; height: 200 width: 300 } @@ -39,7 +39,7 @@ Item { State { name: "State3"; PropertyChanges { - target: Rectangle_2; + target: rectangle_2; x: 200 y: 300 }