From fb77bf0a5d2a882f877321c0817977a89e750a42 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 13 Jan 2010 14:49:28 +0100
Subject: [PATCH] QmlDesigner.PropertyEditor: fix .qml indentations
---
.../Qt/BorderImageSpecifics.qml | 34 ++---
.../propertyeditor/Qt/FlipableSpecifics.qml | 2 +-
.../propertyeditor/Qt/Geometry.qml | 37 +++---
.../propertyeditor/Qt/Modifiers.qml | 61 +++++----
.../qmldesigner/propertyeditor/Qt/SpinBox.qml | 12 +-
.../propertyeditor/Qt/TextInputSpecifics.qml | 10 +-
.../propertyeditor/Qt/WebViewSpecifics.qml | 122 +++++++++---------
7 files changed, 134 insertions(+), 144 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
index ed26dbc3741..a085c27cd62 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
@@ -44,26 +44,26 @@ GroupBox {
step: 1;
minimumValue: 0;
maximumValue: 2000;
- }
+ }
- IntEditor {
- backendValue: backendValues.border_top;
- caption: "Border Top: "
- baseStateFlag: isBaseState;
+ IntEditor {
+ backendValue: backendValues.border_top;
+ caption: "Border Top: "
+ baseStateFlag: isBaseState;
- step: 1;
- minimumValue: 0;
- maximumValue: 2000;
- }
+ step: 1;
+ minimumValue: 0;
+ maximumValue: 2000;
+ }
- IntEditor {
- backendValue: backendValues.border_bottom;
- caption: "Border Bottom:"
- baseStateFlag: isBaseState;
+ IntEditor {
+ backendValue: backendValues.border_bottom;
+ caption: "Border Bottom:"
+ baseStateFlag: isBaseState;
- step: 1;
- minimumValue: 0;
- maximumValue: 2000;
- }
+ step: 1;
+ minimumValue: 0;
+ maximumValue: 2000;
+ }
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
index a5efb0d3190..3bfe2c2d2b9 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
@@ -96,7 +96,7 @@ GroupBox {
onCurrentTextChanged: {
if (count == 3)
- print("set");
+ print("set");
print(currentText);
backendValues.horizontalAlignment.value = currentText;
print(currentText);
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
index d23246c4a37..d52035b8337 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
@@ -14,7 +14,6 @@ GroupBox {
rightMargin: 4;
QWidget {
-
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 60;
@@ -27,20 +26,20 @@ GroupBox {
font.bold: true;
}
QLabel {
- text: "Size:"
- font.bold: true
+ text: "Size:"
+ font.bold: true
}
}
}
- QWidget {
- layout: QVBoxLayout {
- topMargin: 0;
- bottomMargin: 0;
- QWidget {
- layout: QHBoxLayout {
- topMargin: 0;
- bottomMargin: 0;
+ QWidget {
+ layout: QVBoxLayout {
+ topMargin: 0;
+ bottomMargin: 0;
+ QWidget {
+ layout: QHBoxLayout {
+ topMargin: 0;
+ bottomMargin: 0;
//---
@@ -54,7 +53,7 @@ GroupBox {
bottomMargin: 0;
DoubleSpinBox {
id: XSpinBox;
- singleStep: 1;
+ singleStep: 1;
objectName: "XSpinBox";
enabled: anchorBackend.hasParent;
backendValue: backendValues.x == undefined ? 0 : backendValues.x
@@ -76,7 +75,7 @@ GroupBox {
DoubleSpinBox {
id: YSpinBox;
- singleStep: 1;
+ singleStep: 1;
objectName: "YSpinBox";
backendValue: backendValues.y == undefined ? 0 : backendValues.y
enabled: anchorBackend.hasParent;
@@ -94,7 +93,7 @@ GroupBox {
} //QHBoxLayout //7
} //QWidget //1
- //---
+ //---
} //QHBoxLayout
} //GroupBox
QWidget {
@@ -112,7 +111,7 @@ GroupBox {
bottomMargin: 0;
DoubleSpinBox {
id: WidthSpinBox;
- singleStep: 1;
+ singleStep: 1;
objectName: "WidthSpinBox";
backendValue: backendValues.width == undefined ? 0 : backendValues.width
minimum: -2000;
@@ -132,7 +131,7 @@ GroupBox {
bottomMargin: 0;
DoubleSpinBox {
id: HeightSpinBox;
- singleStep: 1;
+ singleStep: 1;
objectName: "HeightSpinBox";
backendValue: backendValues.height == undefined ? 0 : backendValues.height
minimum: -2000;
@@ -149,8 +148,6 @@ GroupBox {
} //QWidget
} //QHBoxLayout
} //QWidget
- //---
-
} // QHBoxLayout
} //Widget
@@ -164,10 +161,6 @@ GroupBox {
maximumValue: 100;
}
} //QVBoxLayout
-
} //QWidget
-
-
} //QHBoxLayout
-
} //QGroupBox
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
index 6d4a764514e..8bef65fbb95 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
@@ -38,14 +38,14 @@ GroupBox {
font.bold: true;
}
- QLabel {
- text: "Scale:"
+ QLabel {
+ text: "Scale:"
font.bold: true;
}
QLabel {
text: "Scale:"
- text: ""
+ text: ""
font.bold: true;
}
@@ -62,10 +62,10 @@ GroupBox {
QWidget {
layout: QVBoxLayout {
- topMargin: 02;
- bottomMargin: 2;
- leftMargin: 5;
- rightMargin: 0;
+ topMargin: 02;
+ bottomMargin: 2;
+ leftMargin: 5;
+ rightMargin: 0;
QWidget {
layout: QHBoxLayout {
@@ -103,10 +103,7 @@ GroupBox {
}
}
}
- }
-
-
-
+ }
QWidget {
layout: QHBoxLayout {
topMargin: 10;
@@ -123,7 +120,7 @@ GroupBox {
singleStep: 0.1
baseStateFlag: isBaseState;
onBackendValueChanged: {
- ScaleSlider.value = backendValue.value * 10;
+ ScaleSlider.value = backendValue.value * 10;
}
}
QSlider {
@@ -139,33 +136,33 @@ GroupBox {
}
}
- QWidget {
- layout: QHBoxLayout {
+ QWidget {
+ layout: QHBoxLayout {
topMargin: 5;
bottomMargin: 5;
leftMargin: 10;
rightMargin: 0;
QLabel {
- text: "Origin: ";
+ text: "Origin: ";
+ }
+ QComboBox {
+ items : { [
+ "TopLeft", "Top", "TopRight", "Left", "Center", "Right", "BottomLeft", "Bottom",
+ "BottomRight"
+ ] }
+
+ currentText: backendValues.transformOrigin.value;
+ onItemsChanged: {
+ currentText = backendValues.transformOrigin.value;
+ }
+ onCurrentTextChanged: {
+ backendValues.transformOrigin.value = currentText;
+ }
}
- QComboBox {
- items : { [
- "TopLeft", "Top", "TopRight", "Left", "Center", "Right", "BottomLeft", "Bottom",
- "BottomRight"
- ] }
-
- currentText: backendValues.transformOrigin.value;
- onItemsChanged: {
- currentText = backendValues.transformOrigin.value;
- }
- onCurrentTextChanged: {
- backendValues.transformOrigin.value = currentText;
- }
- }
-
- }
- }
+
+ }
+ }
QWidget {
layout: QHBoxLayout {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
index 5965a373c80..0ecf0180411 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
@@ -28,10 +28,10 @@ QWidget { //This is a special SpinBox that does color coding for states
else
SpinBox.setStyleSheet("color: gray;");
} else {
- if (backendValue != null && backendValue.isInSubState)
- SpinBox.setStyleSheet("color: #7799FF;");
- else
- SpinBox.setStyleSheet("color: gray;");
+ if (backendValue != null && backendValue.isInSubState)
+ SpinBox.setStyleSheet("color: #7799FF;");
+ else
+ SpinBox.setStyleSheet("color: gray;");
}
}
}
@@ -55,8 +55,8 @@ QWidget { //This is a special SpinBox that does color coding for states
onValueFromBackendChanged: {
readingFromBackend = true;
value = valueFromBackend
- readingFromBackend = false;
- }
+ readingFromBackend = false;
+ }
onValueChanged: {
if (SpinBox.backendValue != null && readingFromBackend == false)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
index 82a1cd21fc7..78091f5ee0c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
@@ -34,7 +34,7 @@ GroupBox {
}
}
- FontWidget {
+ FontWidget {
text: "Font:";
bold: backendValues.font_bold.value;
@@ -83,7 +83,7 @@ GroupBox {
onCurrentTextChanged: {
if (count == 3)
- backendValues.horizontalAlignment.value = currentText;
+ backendValues.horizontalAlignment.value = currentText;
}
}
@@ -137,7 +137,7 @@ GroupBox {
CheckBox {
text: "Read Only";
- baseStateFlag: isBaseState;
+ baseStateFlag: isBaseState;
checkable: true;
backendValue: backendValues.readOnly;
}
@@ -145,7 +145,7 @@ GroupBox {
CheckBox {
text: "Cursor Visible";
- baseStateFlag: isBaseState;
+ baseStateFlag: isBaseState;
checkable: true;
backendValue: backendValues.cursorVisible;
@@ -165,7 +165,7 @@ GroupBox {
CheckBox {
text: "Focus On Press";
- baseStateFlag: isBaseState;
+ baseStateFlag: isBaseState;
checkable: true;
backendValue: backendValues. focusOnPress;
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
index 925c2bd4f3b..e63b1b24032 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
@@ -22,75 +22,75 @@ GroupBox {
minimumHeight: 20;
text: "Url:"
font.bold: true;
- }
- QLineEdit {
- text: backendValues.url.value;
- onEditingFinished: {
- backendValues.url.value = text;
- }
+ }
+ QLineEdit {
+ text: backendValues.url.value;
+ onEditingFinished: {
+ backendValues.url.value = text;
}
}
}
+ }
- IntEditor {
- id: preferredWidth;
- backendValue: backendValues.preferredWidth;
- caption: "Prefered Width: "
- baseStateFlag: isBaseState;
- step: 1;
- minimumValue: 0;
- maximumValue: 2000;
- }
+ IntEditor {
+ id: preferredWidth;
+ backendValue: backendValues.preferredWidth;
+ caption: "Prefered Width: "
+ baseStateFlag: isBaseState;
+ step: 1;
+ minimumValue: 0;
+ maximumValue: 2000;
+ }
- IntEditor {
- id: webPageWidth;
- backendValue: backendValues.preferredHeight;
- caption: "Web Page Height:"
- baseStateFlag: isBaseState;
- step: 1;
- minimumValue: 0;
- maximumValue: 2000;
- }
+ IntEditor {
+ id: webPageWidth;
+ backendValue: backendValues.preferredHeight;
+ caption: "Web Page Height:"
+ baseStateFlag: isBaseState;
+ step: 1;
+ minimumValue: 0;
+ maximumValue: 2000;
+ }
- QWidget {
- layout: QHBoxLayout {
- topMargin: 10;
- bottomMargin: 0;
- leftMargin: 0;
- rightMargin: 0;
- spacing: 20;
+ QWidget {
+ layout: QHBoxLayout {
+ topMargin: 10;
+ bottomMargin: 0;
+ leftMargin: 0;
+ rightMargin: 0;
+ spacing: 20;
- QLabel {
- minimumHeight: 20;
- text: "ZommFactor:"
- font.bold: true;
- }
- DoubleSpinBox {
- id: ZoomSpinBox;
- objectName: "ZommSpinBox";
- backendValue: backendValues.zoomFactor;
- minimumWidth: 60;
- minimum: 0.01
- maximum: 10
- singleStep: 0.1
- baseStateFlag: isBaseState;
- onBackendValueChanged: {
- ZoomSlider.value = backendValue.value * 10;
- }
- }
- QSlider {
- id: ZoomSlider;
- orientation: "Qt::Horizontal";
- minimum: 1;
- maximum: 100;
- singleStep: 1;
- onValueChanged: {
- backendValues.zoomFactor.value = value / 10;
- }
- }
- }
- }
+ QLabel {
+ minimumHeight: 20;
+ text: "ZommFactor:"
+ font.bold: true;
+ }
+ DoubleSpinBox {
+ id: ZoomSpinBox;
+ objectName: "ZommSpinBox";
+ backendValue: backendValues.zoomFactor;
+ minimumWidth: 60;
+ minimum: 0.01
+ maximum: 10
+ singleStep: 0.1
+ baseStateFlag: isBaseState;
+ onBackendValueChanged: {
+ ZoomSlider.value = backendValue.value * 10;
+ }
+ }
+ QSlider {
+ id: ZoomSlider;
+ orientation: "Qt::Horizontal";
+ minimum: 1;
+ maximum: 100;
+ singleStep: 1;
+ onValueChanged: {
+ backendValues.zoomFactor.value = value / 10;
+ }
+ }
+ }
+ }
}
}
--
GitLab