Skip to content

GitLab

Commit 13aa8131 authored by Christiaan Janssen's avatar Christiaan Janssen
Browse files
Options

QmlDesigner.PropertyEditor: Removed trailing whitespace

parent cecd7bbf
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 172 deletions
share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
View file @ 13aa8131
......@@ -5,7 +5,7 @@ QWidget {
width:220;fixedWidth: width
height:220;fixedHeight: height
styleSheetFile: "anchorbox.css"
Script {
function isBorderAnchored() {
return anchorBackend.leftAnchored || anchorBackend.topAnchored || anchorBackend.rightAnchored || anchorBackend.bottomAnchored;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
View file @ 13aa8131
......@@ -8,7 +8,7 @@ GroupBox {
caption: "Image";
layout: VerticalLayout {
FileWidget {
enabled: isBaseState || backendValues.id.value != "";
maximumWidth: 250;
......@@ -17,7 +17,7 @@ GroupBox {
onFileNameChanged: {
backendValues.source.value = fileName;
}
}
}
IntEditor {
......
share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
View file @ 13aa8131
......@@ -82,12 +82,12 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
property real valueFromBackend: (doubleSpinBox.backendValue === undefined ||
doubleSpinBox.backendValue === null || doubleSpinBox.backendValue.value === undefined)
? .0 : doubleSpinBox.backendValue.value;
onValueFromBackendChanged: {
readingFromBackend = true;
value = valueFromBackend
readingFromBackend = false;
}
}
onValueChanged: {
if (doubleSpinBox.backendValue != null && readingFromBackend == false)
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
View file @ 13aa8131
......@@ -19,7 +19,7 @@ QToolButton {
extendedFunctionButton.iconFromFile = "images/placeholder.png"
}
}
}
}
}
......@@ -79,6 +79,6 @@ QToolButton {
expressionEdit.raise();
expressionEdit.active = true;
}
}
}
]
}
share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
View file @ 13aa8131
......@@ -19,8 +19,8 @@ GroupBox {
DoubleSpinBox {
id: xSpinBox;
text: "X"
alignRight: false
spacing: 4
alignRight: false
spacing: 4
singleStep: 1;
objectName: "xSpinBox";
enabled: anchorBackend.hasParent;
......@@ -34,8 +34,8 @@ GroupBox {
id: ySpinBox;
singleStep: 1;
text: "Y"
alignRight: false
spacing: 4
alignRight: false
spacing: 4
objectName: "ySpinBox";
backendValue: backendValues.y
enabled: anchorBackend.hasParent;
......@@ -49,7 +49,7 @@ GroupBox {
} //QWidget //1
QWidget {
layout: HorizontalLayout {
layout: HorizontalLayout {
Label {
text: "Size"
......@@ -58,8 +58,8 @@ GroupBox {
DoubleSpinBox {
id: widthSpinBox;
text: "W"
alignRight: false
spacing: 4
alignRight: false
spacing: 4
singleStep: 1;
objectName: "widthSpinBox";
backendValue: backendValues.width
......@@ -71,8 +71,8 @@ GroupBox {
DoubleSpinBox {
id: heightSpinBox;
text: "H"
alignRight: false
spacing: 4
alignRight: false
spacing: 4
singleStep: 1;
objectName: "heightSpinBox";
backendValue: backendValues.height
......@@ -80,9 +80,7 @@ GroupBox {
maximum: 2000;
baseStateFlag: isBaseState;
}
} //QVBoxLayout
} //QWidget
} //QHBoxLayout
} //QGroupBox
share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
View file @ 13aa8131
......@@ -25,7 +25,7 @@ QExtGroupBox {
text: groupBox.caption;
focusPolicy: "Qt::NoFocus";
styleSheetFile: "specialCheckBox.css";
y: 0;
y: 0;
x: 0;
fixedHeight: 17
fixedWidth: groupBox.width;
......@@ -40,9 +40,9 @@ QExtGroupBox {
collapsed = false;
//text = "";
//width = 12;
//width = 120;
//width = 120;
arrowType = "Qt::DownArrow";
visible = true;
visible = true;
} else {
//groupBox.maximumHeight = 20;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml
View file @ 13aa8131
import Qt 4.6
import Bauhaus 1.0
QHBoxLayout {
QHBoxLayout {
id: horizontalLayout
spacing: 10
topMargin: 0
......
share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
View file @ 13aa8131
......@@ -25,14 +25,14 @@ QWidget {
backendValue: (intEditor.backendValue === undefined ||
intEditor.backendValue === null)
? null : intEditor.backendValue;
property var backendValueValue: (intEditor.backendValue === undefined ||
intEditor.backendValue === null)
property var backendValueValue: (intEditor.backendValue === undefined ||
intEditor.backendValue === null)
? null : intEditor.backendValue.value;
onBackendValueValueChanged: {
intSlider.value = intEditor.backendValue.value;
}
onBackendValueValueChanged: {
intSlider.value = intEditor.backendValue.value;
}
minimum: minimumValue
maximum: maximumValue
......@@ -44,7 +44,7 @@ QWidget {
visible: intEditor.slider
id: sliderWidget
QSlider {
id: intSlider
id: intSlider
y: sliderWidget.height / 2 - 12
width: sliderWidget.width
height: 24
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
View file @ 13aa8131
......@@ -49,7 +49,7 @@ PropertyFrame {
spacing: 0;
Type {
}
Geometry {
}
......@@ -71,7 +71,7 @@ PropertyFrame {
} // layout
} //QWidget
} //QScrollArea
} //QScrollArea
ExtendedPane {
id: extendedPane;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
View file @ 13aa8131
......@@ -43,16 +43,16 @@ GroupBox {
fixedWidth: 90 - 20 - 32
}
SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.topTarget
onSelectedItemNodeChanged: { anchorBackend.topTarget = selectedItemNode; }
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.topTarget
onSelectedItemNodeChanged: { anchorBackend.topTarget = selectedItemNode; }
}
}
}
QWidget {
layout : HorizontalLayout {
layout : HorizontalLayout {
IntEditor {
slider: false
caption: "Margin"
......@@ -90,9 +90,9 @@ GroupBox {
fixedWidth: 90 - 20 - 32
}
SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.bottomTarget
onSelectedItemNodeChanged: { anchorBackend.bottomTarget = selectedItemNode; }
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.bottomTarget
onSelectedItemNodeChanged: { anchorBackend.bottomTarget = selectedItemNode; }
}
}
......@@ -137,9 +137,9 @@ GroupBox {
fixedWidth: 90 - 20 - 32
}
SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.leftTarget
onSelectedItemNodeChanged: { anchorBackend.leftTarget = selectedItemNode; }
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.leftTarget
onSelectedItemNodeChanged: { anchorBackend.leftTarget = selectedItemNode; }
}
}
}
......@@ -183,9 +183,9 @@ GroupBox {
fixedWidth: 90 - 20 - 32
}
SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.rightTarget
onSelectedItemNodeChanged: { anchorBackend.rightTarget = selectedItemNode; }
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.rightTarget
onSelectedItemNodeChanged: { anchorBackend.rightTarget = selectedItemNode; }
}
}
}
......@@ -229,9 +229,9 @@ GroupBox {
fixedWidth: 90 - 20 - 32
}
SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.horizontalTarget
onSelectedItemNodeChanged: { anchorBackend.horizontalTarget = selectedItemNode; }
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.horizontalTarget
onSelectedItemNodeChanged: { anchorBackend.horizontalTarget = selectedItemNode; }
}
}
}
......@@ -242,7 +242,7 @@ GroupBox {
slider: false
caption: "Margin"
baseStateFlag: isBaseState;
backendValue: backendValues.anchors_horizontalCenterOffset
backendValue: backendValues.anchors_horizontalCenterOffset
maximumValue: 1000
minimumValue: -1000
}
......@@ -275,9 +275,9 @@ GroupBox {
fixedWidth: 90 - 20 - 32
}
SiblingComboBox {
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.verticalTarget
onSelectedItemNodeChanged: { anchorBackend.verticalTarget = selectedItemNode; }
itemNode: anchorBackend.itemNode
selectedItemNode: anchorBackend.verticalTarget
onSelectedItemNodeChanged: { anchorBackend.verticalTarget = selectedItemNode; }
}
}
}
......@@ -287,7 +287,7 @@ GroupBox {
IntEditor {
slider: false
caption: "Margin"
backendValue: backendValues.anchors_verticalCenterOffset
backendValue: backendValues.anchors_verticalCenterOffset
baseStateFlag: isBaseState;
maximumValue: 1000
minimumValue: -1000
......
share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
View file @ 13aa8131
......@@ -19,7 +19,7 @@ QScrollArea {
rightMargin: 0;
Layout {
id: layoutBox;
}
}
QScrollArea {
}
}
......
share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
View file @ 13aa8131
......@@ -63,7 +63,7 @@ QWidget {
}
}
}
ExtendedFunctionButton {
backendValue: lineEdit.backendValue
y: 4
......
share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
View file @ 13aa8131
......@@ -8,7 +8,7 @@ GroupBox {
minimumHeight: 180;
id: mofifiers;
layout: VerticalLayout {
layout: VerticalLayout {
QWidget {
layout: HorizontalLayout {
......@@ -43,25 +43,25 @@ GroupBox {
text: ""
id: opacitySpinBox;
backendValue: backendValues.opacity === undefined ? null : backendValues.opacity
property var backendValueValue: backendValues.opacity.value;
property var backendValueValue: backendValues.opacity.value;
minimumWidth: 60;
minimum: 0;
maximum: 1;
singleStep: 0.1
baseStateFlag: isBaseState;
onBackendValueValueChanged: {
onBackendValueValueChanged: {
opacitySlider.value = backendValue.value * 100;
}
}
SliderWidget {
id: opacitySlider
id: opacitySlider
minimum: 0
maximum: 100
singleStep: 5;
backendValue: backendValues.opacity === undefined ? null : backendValues.opacity
backendValue: backendValues.opacity === undefined ? null : backendValues.opacity
onValueChanged: {
if (backendValues.opacity !== undefined)
backendValues.opacity.value = value / 100;
backendValues.opacity.value = value / 100;
}
}
}
......@@ -78,14 +78,14 @@ GroupBox {
backendValue: backendValues.transformOrigin
items : { [
"TopLeft", "Top", "TopRight", "Left", "Center", "Right", "BottomLeft", "Bottom",
"BottomRight"
] }
"TopLeft", "Top", "TopRight", "Left", "Center", "Right", "BottomLeft", "Bottom",
"BottomRight"
] }
currentText: backendValues.transformOrigin.value;
onItemsChanged: {
currentText = backendValues.transformOrigin.value;
}
currentText: backendValues.transformOrigin.value;
onItemsChanged: {
currentText = backendValues.transformOrigin.value;
}
}
}
}
......@@ -101,7 +101,7 @@ GroupBox {
id: scaleSpinBox;
backendValue: backendValues.scale;
property var backendValueValue: backendValues.scale.value;
property var backendValueValue: backendValues.scale.value;
minimumWidth: 60;
minimum: 0.01
maximum: 10
......@@ -113,11 +113,11 @@ GroupBox {
}
SliderWidget {
id: scaleSlider;
backendValue: backendValues.scale;
backendValue: backendValues.scale;
minimum: 1;
maximum: 100;
singleStep: 1;
onValueChanged: {
onValueChanged: {
backendValues.scale.value = value / 10;
}
}
......
share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
View file @ 13aa8131
......@@ -9,7 +9,7 @@ GroupBox {
layout: VerticalLayout {
ColorLabel {
text: " Color"
text: " Color"
}
ColorGroupBox {
......@@ -20,7 +20,7 @@ GroupBox {
}
ColorLabel {
text: " Border Color"
text: " Border Color"
}
ColorGroupBox {
......
share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
View file @ 13aa8131
......@@ -8,7 +8,7 @@ QWidget {
property alias singleStep: localSlider.singleStep
property alias minimum: localSlider.minimum
property alias maximum: localSlider.maximum
property var backendValue
property var backendValue
QSlider {
orientation: "Qt::Horizontal";
......@@ -16,16 +16,16 @@ QWidget {
y: sliderWidget.height / 2 - 12
width: sliderWidget.width
height: 24
value: sliderWidget.value
onValueChanged: {
sliderWidget.value = value
}
onSliderPressed: {
backendValue.lock();
}
onSliderReleased: {
backendValue.unlock();
}
value: sliderWidget.value
onValueChanged: {
sliderWidget.value = value
}
onSliderPressed: {
backendValue.lock();
}
onSliderReleased: {
backendValue.unlock();
}
}
}
share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
View file @ 13aa8131
......@@ -29,26 +29,26 @@ QWidget { //This is a special spinBox that does color coding for states
Script {
function evaluate() {
if (!enabled) {
box.setStyleSheet("color: "+scheme.disabledColor);
} else {
if (baseStateFlag) {
if (backendValue != null && backendValue.isInModel)
box.setStyleSheet("color: "+scheme.changedBaseColor);
else
box.setStyleSheet("color: "+scheme.defaultColor);
} else {
if (backendValue != null && backendValue.isInSubState)
box.setStyleSheet("color: "+scheme.changedStateColor);
else
box.setStyleSheet("color: "+scheme.defaultColor);
function evaluate() {
if (!enabled) {
box.setStyleSheet("color: "+scheme.disabledColor);
} else {
if (baseStateFlag) {
if (backendValue != null && backendValue.isInModel)
box.setStyleSheet("color: "+scheme.changedBaseColor);
else
box.setStyleSheet("color: "+scheme.defaultColor);
} else {
if (backendValue != null && backendValue.isInSubState)
box.setStyleSheet("color: "+scheme.changedStateColor);
else
box.setStyleSheet("color: "+scheme.defaultColor);
}
}
}
}
}
property bool isInModel: (backendValue === undefined || backendValue === null) ? false: backendValue.isInModel;
property bool isInModel: (backendValue === undefined || backendValue === null) ? false: backendValue.isInModel;
onIsInModelChanged: {
evaluate();
......@@ -76,22 +76,22 @@ QWidget { //This is a special spinBox that does color coding for states
onValueFromBackendChanged: {
readingFromBackend = true;
if (!(valueFromBackend === undefined))
value = valueFromBackend;
if (!(valueFromBackend === undefined))
value = valueFromBackend;
readingFromBackend = false;
evaluate();
}
onValueChanged: {
if (spinBox.backendValue != null && readingFromBackend == false)
backendValue.value = value;
backendValue.value = value;
}
onFocusChanged: {
if (focus)
spinBox.backendValue.lock();
spinBox.backendValue.lock();
else
spinBox.backendValue.unlock();
spinBox.backendValue.unlock();
}
onEditingFinished: {
focus = false;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
View file @ 13aa8131
......@@ -29,12 +29,12 @@ QFrame {
extendedPane.visible = false;
layoutPane.visible = false;
}
}
}
QPushButton {
id: extendedMode;
toolTip: "extended properties";
checkable: true;
checked: false;
checked: false;
text: "Advanced"
onClicked: {
standardMode.checked = false;
......@@ -49,7 +49,7 @@ QFrame {
id: layoutMode;
checkable: true;
checked: false;
toolTip: "layout properties";
toolTip: "layout properties";
text: "Anchor";
onClicked: {
extendedMode.checked = false;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
View file @ 13aa8131
......@@ -7,9 +7,9 @@ GroupBox {
caption: "Text Input";
layout: VerticalLayout {
ColorLabel {
text: " Selection Color"
ColorLabel {
text: " Selection Color"
}
ColorGroupBox {
......@@ -18,9 +18,9 @@ GroupBox {
backendColor: backendValues.selectionColor
}
ColorLabel {
text: " Selected Text Color"
ColorLabel {
text: " Selected Text Color"
}