diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
index a9ec3a09adb1f8a588f21cad208a823cd7b7458c..c5df4da92f0b5ab4addc33789c88d69b631a232f 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
@@ -13,9 +13,9 @@ QGroupBox {
id: leftButton
checkable: true
fixedWidth: 32
- width: fixedWidth
+ width: fixedWidth
fixedHeight: 32
- height: fixedHeight
+ height: fixedHeight
styleSheetFile: "alignmentleftbutton.css";
checked: backendValues.horizontalAlignment.value == "AlignLeft"
@@ -32,9 +32,9 @@ QGroupBox {
x: 32
checkable: true
fixedWidth: 32
- width: fixedWidth
+ width: fixedWidth
fixedHeight: 32
- height: fixedHeight
+ height: fixedHeight
styleSheetFile: "alignmentcenterhbutton.css";
checked: backendValues.horizontalAlignment.value == "AlignHCenter"
@@ -52,9 +52,9 @@ QGroupBox {
x: 64
checkable: true
fixedWidth: 32
- width: fixedWidth
+ width: fixedWidth
fixedHeight: 32
- height: fixedHeight
+ height: fixedHeight
styleSheetFile: "alignmentrightbutton.css";
checked: backendValues.horizontalAlignment.value == "AlignRight"
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
index e137e2261aec9a670d38a6e236d03c9b0294fefe..16543829ffa4c1d4d996d64c635f98837ce96aae 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
@@ -14,8 +14,8 @@ QGroupBox {
checkable: true
fixedWidth: 32
fixedHeight: 32
- width: fixedWidth
- height: fixedHeight
+ width: fixedWidth
+ height: fixedHeight
styleSheetFile: "alignmenttopbutton.css";
checked: backendValues.verticalAlignment.value == "AlignTop"
@@ -33,8 +33,8 @@ QGroupBox {
checkable: true
fixedWidth: 32
fixedHeight: 32
- width: fixedWidth
- height: fixedHeight
+ width: fixedWidth
+ height: fixedHeight
styleSheetFile: "alignmentcentervbutton.css";
checked: backendValues.verticalAlignment.value == "AlignVCenter"
@@ -53,8 +53,8 @@ QGroupBox {
checkable: true
fixedWidth: 32
fixedHeight: 32
- width: fixedWidth
- height: fixedHeight
+ width: fixedWidth
+ height: fixedHeight
styleSheetFile: "alignmentbottombutton.css";
checked: backendValues.verticalAlignment.value == "AlignBottom"
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
index c4689d98d95575d18c1b42218095036ac16ac183..bc0706d075bdf164396cf1e0ef52cddd32644ddd 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
@@ -36,8 +36,8 @@ QWidget {
}
}
}
-
- QWidget { // 1
+
+ QWidget { // 1
layout: HorizontalLayout {
Label {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
index 124e09f8beb312d0f9fd651d4f4a6ea13d936ed4..2bd89a133b330d6c0b7810a124ee55c18b435a15 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
@@ -65,7 +65,7 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
layout: HorizontalLayout {
id: layoutH;
- spacing: 4
+ spacing: 4
QLabel {
id: label;
@@ -100,9 +100,9 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
onFocusChanged: {
if (focus)
- transaction.start();
+ transaction.start();
else
- transaction.end();
+ transaction.end();
}
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
index 87affd5aa5a02816ec41c7c9dfc6954349fcd8a6..7ce9499ece2b58620e29ce12b1e8a38b94a2d8ac 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
@@ -26,7 +26,6 @@ QWidget {
height = 40;
}
}
-
opacity: 0
onOpacityChanged: {
if (opacity == 0)
@@ -37,14 +36,11 @@ QWidget {
duration: 100
}
}
-
Behavior on height {
NumberAnimation {
duration: 100
}
}
-
-
ExpressionEdit {
id: textEdit;
styleSheet: "QTextEdit {border-radius: 0px;}"
@@ -59,12 +55,11 @@ QWidget {
if (!focus)
expressionEdit.active = false;
}
- onReturnPressed: {
- expressionEdit.backendValue.expression = textEdit.plainText;
- expressionEdit.active = false;
- }
+ onReturnPressed: {
+ expressionEdit.backendValue.expression = textEdit.plainText;
+ expressionEdit.active = false;
+ }
}
-
QPushButton {
focusPolicy: "Qt::NoFocus";
y: expressionEdit.height - 22;
@@ -77,7 +72,6 @@ QWidget {
expressionEdit.active = false;
}
}
-
QPushButton {
focusPolicy: "Qt::NoFocus";
y: expressionEdit.height - 22;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
index b3cedfeca39237e7086f8b06550f2156dc5dc272..39f3d25afbf13dfeab02e231e5d60298e164f0d2 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
@@ -54,21 +54,21 @@ QWidget {
ColorScheme { id:scheme; }
- layout: HorizontalLayout {
+ layout: HorizontalLayout {
QFontComboBox {
- id: fontSelector
-
- currentFont.family: backendValue.value
- property variant fontFamily: currentFont.family
+ id: fontSelector
+
+ currentFont.family: backendValue.value
+ property variant fontFamily: currentFont.family
onFontFamilyChanged: {
- if (backendValue === undefined)
- return;
+ if (backendValue === undefined)
+ return;
if (backendValue.value != currentFont.family)
- backendValue.value = currentFont.family;
- }
+ backendValue.value = currentFont.family;
+ }
}
}
- ExtendedFunctionButton {
+ ExtendedFunctionButton {
backendValue: fontComboBox.backendValue
y: 4
x: 2
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
index 7437484e9627b4ba5871de2204c1e1464f56292c..8f5e5578e19949f1e62bdb1558116fbf2abc0ad6 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
@@ -10,11 +10,11 @@ GroupBox {
QWidget {
layout: HorizontalLayout {
- rightMargin: 12
+ rightMargin: 12
Label {
text: qsTr("Font")
}
-
+
FontComboBox {
backendValue: backendValues.font_family
baseStateFlag: isBaseState
@@ -55,7 +55,7 @@ GroupBox {
QWidget {
visible: showStyle
layout: HorizontalLayout {
- rightMargin: 12
+ rightMargin: 12
Label {
text: qsTr("Style")
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
index 1e1297796b3d628bb78eb90d7c5eba77d8fcbfea..24412718a47f532944608791317fb8b00d6e5704 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
@@ -1,11 +1,6 @@
import Qt 4.7
import Bauhaus 1.0
-
-import Qt 4.7
-import Bauhaus 1.0
-
-
QWidget {
layout: QVBoxLayout {
topMargin: 0
@@ -38,7 +33,7 @@ QWidget {
showComboBox: true
}
}
- }
+ }
QWidget {
layout: HorizontalLayout {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
index 6ee349c94cbe024e719a3217f6199c37aaf04ac7..70896d5284abc0afa94ca5bea730c50a0186fc63 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
@@ -7,22 +7,17 @@ PropertyFrame {
ExpressionEditor {
id: expressionEdit
}
-
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
spacing: 0;
-
Switches {
}
-
HorizontalWhiteLine {
}
-
ScrollArea {
-
styleSheetFile: ":/qmldesigner/scrollbar.css";
widgetResizable: true;
@@ -30,8 +25,6 @@ PropertyFrame {
horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff";
id: standardPane;
-
-
content: properyEditorStandard;
QFrame {
//minimumHeight: 1100
@@ -44,34 +37,27 @@ PropertyFrame {
spacing: 0;
Type {
}
-
- WidgetLoader {
+
+ WidgetLoader {
id: specificsOne;
- source: specificsUrl;
+ source: specificsUrl;
}
-
- WidgetLoader {
- id: specificsTwo;
- baseUrl: globalBaseUrl;
- qmlData: specificQmlData;
- }
-
-
+ WidgetLoader {
+ id: specificsTwo;
+ baseUrl: globalBaseUrl;
+ qmlData: specificQmlData;
+ }
QScrollArea {
}
-
} // layout
} //QWidget
} //QScrollArea
-
ExtendedPane {
id: extendedPane;
}
-
LayoutPane {
id: layoutPane;
}
-
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
index dd101ae655bb2d7d06b3f34884991a6fd921171c..85913dbd3a05db7315f49ed0e9e8e84068e9fa1e 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
@@ -4,10 +4,9 @@ import Bauhaus 1.0
QScrollArea {
- property variant finished;
-
- onFinishedChanged: {
- }
+ property variant finished;
+ onFinishedChanged: {
+ }
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
index 9917415caf1291ffae29d45b27ae23efd5311d7f..e5b0f87c237ca017fb39f77c578a5b112b46f183 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
@@ -47,6 +47,6 @@ GroupBox {
AlignmentHorizontalButtons {}
AlignmentVerticalButtons { visible: showVerticalAlignment }
}
- }
+ }
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
index 51d18003844fd6ade242f927aabfdd22fc7623cd..db167667c56b0adc2020e0accbc42ba0aec9696f 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
@@ -30,8 +30,8 @@ QFrame {
layoutPane.visible = false;
}
}
-
- QPushButton {
+
+ QPushButton {
id: layoutMode;
checkable: true;
checked: false;
@@ -46,7 +46,7 @@ QFrame {
layoutPane.visible = true;
}
}
-
+
QPushButton {
id: extendedMode;
toolTip: "advanced properties";
@@ -62,6 +62,6 @@ QFrame {
layoutPane.visible = false;
}
}
-
+
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
index 7b4a1d2241a3604b63135840dda2efa568e14596..c9e9a62fd532d5909994158c591d31355890b892 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
@@ -14,13 +14,11 @@ QWidget {
StandardTextGroupBox {
finished: finishedNotify;
}
-
StandardTextColorGroupBox {
finished: finishedNotify;
- showSelectionColor: true;
- showSelectedTextColor: true;
+ showSelectionColor: true;
+ showSelectedTextColor: true;
}
-
GroupBox {
caption: qsTr("Text Edit")
finished: finishedNotify;
@@ -28,7 +26,7 @@ QWidget {
QWidget {
layout: HorizontalLayout {
- rightMargin: 12
+ rightMargin: 12
Label {
text: qsTr("Format")
}
@@ -48,12 +46,10 @@ QWidget {
}
}
-
FontGroupBox {
finished: finishedNotify;
}
-
TextInputGroupBox {
finished: finishedNotify;
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
index 314afc2745d95970deedac4e18410432198a4831..80a9073d19e8cd4275942ec883e9fb646f74d398 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
@@ -7,7 +7,7 @@ GroupBox {
maximumHeight: 200;
id: transformation;
- layout: VerticalLayout {
+ layout: VerticalLayout {
QWidget {
layout: HorizontalLayout {