diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
index 84a61b35cc72e6855011a7d08b388b28f3daf10e..f2759bf3d4ff8fdb03f6cbe2181b5af76684c80d 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
@@ -5,7 +5,6 @@ QGroupBox {
id: aligmentHorizontalButtons
layout: HorizontalLayout {
topMargin: 6
- rightMargin: 10;
QWidget {
fixedHeight: 32
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
index 90da27b60756d58bf64784dca1e44a3163d3c17f..9b13025585ee06e411a9de541d95a04e256be46b 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
@@ -5,7 +5,6 @@ QGroupBox {
id: alignmentVerticalButtons
layout: HorizontalLayout {
topMargin: 6
- rightMargin: 10;
QWidget {
fixedHeight: 32
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
index abac8f209c91b7cd4f2db01a02878404ad953407..d8dc5ad484f5978841bce3f27a6dceec864d10c7 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
@@ -21,8 +21,8 @@ QWidget {
QPushButton {
checkable: true
- fixedWidth: 32
- fixedHeight: 32
+ fixedWidth: 31
+ fixedHeight: 28
styleSheetFile: "anchortop.css";
checked: anchorBackend.topAnchored;
@@ -39,10 +39,10 @@ QWidget {
QPushButton {
- x: 32
+ x: 31
checkable: true
- fixedWidth: 32
- fixedHeight: 32
+ fixedWidth: 30
+ fixedHeight: 28
styleSheetFile: "anchorbottom.css";
@@ -59,10 +59,10 @@ QWidget {
}
QPushButton {
- x: 64
+ x: 61
checkable: true
- fixedWidth: 32
- fixedHeight: 32
+ fixedWidth: 30
+ fixedHeight: 28
styleSheetFile: "anchorleft.css";
@@ -79,10 +79,10 @@ QWidget {
QPushButton {
- x: 96
+ x: 91
checkable: true
- fixedWidth: 32
- fixedHeight: 32
+ fixedWidth: 30
+ fixedHeight: 28
styleSheetFile: "anchorright.css";
@@ -98,10 +98,10 @@ QWidget {
}
QPushButton {
- x: 128
+ x: 121
checkable: true
- fixedWidth: 32
- fixedHeight: 32
+ fixedWidth: 19
+ fixedHeight: 28
styleSheetFile: "anchorspacer.css";
@@ -109,9 +109,9 @@ QWidget {
}
QPushButton {
- x: 128 + 21
- fixedWidth: 32
- fixedHeight: 32
+ x: 140
+ fixedWidth: 30
+ fixedHeight: 28
styleSheetFile: "anchorfill.css";
@@ -119,51 +119,51 @@ QWidget {
}
QPushButton {
- x: 128 + 21 + 32
+ x: 170
checkable: true
- fixedWidth: 32
- fixedHeight: 32
+ fixedWidth: 19
+ fixedHeight: 28
styleSheetFile: "anchorspacer.css";
}
QPushButton {
- x: 128 + 42 + 64
+ x: 189
checkable: true
- fixedWidth: 32
- fixedHeight: 32
+ fixedWidth: 30
+ fixedHeight: 28
- styleSheetFile: "anchorhorizontal.css";
+ styleSheetFile: "anchorvertical.css";
- checked: anchorBackend.horizontalCentered;
+ checked: anchorBackend.verticalCentered;
onToggled: {
if (checked) {
anchorBackend.leftAnchored = false;
anchorBackend.rightAnchored = false;
- anchorBackend.horizontalCentered = true;
+ anchorBackend.verticalCentered = true;
} else {
- anchorBackend.horizontalCentered = false;
+ anchorBackend.verticalCentered = false;
}
}
}
QPushButton {
- x: 128 + 42 + 32
+ x: 219
checkable: true
- fixedWidth: 32
- fixedHeight: 32
-
- styleSheetFile: "anchorvertical.css";
+ fixedWidth: 31
+ fixedHeight: 28
+
+ styleSheetFile: "anchorhorizontal.css";
- checked: anchorBackend.verticalCentered;
+ checked: anchorBackend.horizontalCentered;
onToggled: {
if (checked) {
anchorBackend.topAnchored = false;
anchorBackend.bottomAnchored = false;
- anchorBackend.verticalCentered = true;
+ anchorBackend.horizontalCentered = true;
} else {
- anchorBackend.verticalCentered = false;
+ anchorBackend.horizontalCentered = false;
}
}
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
index 51b039f948ad49455ebb5b6cd1909dc0d5a7e986..c589511bf24820558d4be88c1176efd66f9ef03a 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
@@ -138,6 +138,8 @@ QExtGroupBox {
QWidget {
layout: HorizontalLayout {
+ leftMargin: 12
+ spacing: 0
ColorBox {
id: colorControl;
@@ -159,7 +161,8 @@ QExtGroupBox {
layout: VerticalLayout {
topMargin: 4
bottomMargin: 4
- rightMargin: 4
+ rightMargin: 0
+ leftMargin: 0
spacing: 2
QWidget {
layout: HorizontalLayout {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
index 9530811d7aab649bfb27b94b22ed07af263d38c9..5e1efa3e3c7a6eeb1bf1adbb6f70bde5f42a1220 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
@@ -65,6 +65,7 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
layout: HorizontalLayout {
id: layoutH;
+ spacing: 4
QLabel {
id: label;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
index 7b272359803fd509acc2d6669e2b326dae93ac0c..dfc62d76bc779940e8e0ec689eda4b12331cb949 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
@@ -10,6 +10,7 @@ GroupBox {
QWidget {
layout: HorizontalLayout {
+ rightMargin: 12
Label {
text: "Font"
}
@@ -58,6 +59,7 @@ GroupBox {
QWidget {
visible: showStyle
layout: HorizontalLayout {
+ rightMargin: 12
Label {
text: "Style"
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
index 08335b2739ba89eb2a7b36248e570093cf38a2ba..0b03bb1463af8f051024d74ad713ba6a7ae37a11 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
@@ -51,7 +51,7 @@ QWidget {
QWidget {
layout: HorizontalLayout {
Label {
- text: "Antialiasing:"
+ text: "Aliasing"
}
CheckBox {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
index 096efff72ea606a6d1fcb606be9115cac53f3870..a8299551f89fa4ae70ac2a1a5963b6e152df8dc7 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
@@ -9,7 +9,7 @@ GroupBox {
layout: VerticalLayout {
ColorGroupBox {
- caption: "Color"
+ caption: "Rectangle"
finished: finishedNotify
@@ -17,7 +17,7 @@ GroupBox {
}
ColorGroupBox {
- caption: "Border Color"
+ caption: "Border"
finished: finishedNotify
backendColor: backendValues.border_color
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
index cebed70b081b9d5665242e0ceba937e48d257594..197ee274c12ad0cd1cabbb272f0a3b3f7f409181 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
@@ -20,6 +20,7 @@ QWidget {
caption: "Rectangle"
layout: VerticalLayout {
+ rightMargin: 24
IntEditor {
backendValue: backendValues.radius
@@ -35,7 +36,7 @@ QWidget {
id: borderWidth;
backendValue: backendValues.border_width === undefined ? 0 : backendValues.border_width
- caption: "Border Width"
+ caption: "Border"
baseStateFlag: isBaseState;
step: 1;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
index 69f6f2d787074098d3eb65085687ba9b2d5c688c..38926cb8345e42e6b18caabf70a5829b465c668e 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
@@ -36,7 +36,7 @@ GroupBox {
ColorGroupBox {
visible: showSelectedTextColor
- caption: "Selected Text"
+ caption: "Selected"
finished: finishedNotify
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
index c97a73bd0c59fad83f8b5cb272aa5276303e471b..75e317155bcdb40b12c09d070b6db860f749f42c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
@@ -28,8 +28,9 @@ QWidget {
QWidget {
layout: HorizontalLayout {
+ rightMargin: 12
Label {
- text: "Text Format"
+ text: "Format"
}
ComboBox {
baseStateFlag: isBaseState
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
index 679d0f5a93640aa1b97e05e93526dc82163106bd..25d69558d992aae3163f3f588069f65d79a1412d 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
@@ -10,15 +10,25 @@ GroupBox {
QWidget {
layout: HorizontalLayout {
+ Label {text: "Flags"}
CheckBox {
-
text: "Read Only";
baseStateFlag: isBaseState;
checkable: true;
backendValue: backendValues.readOnly;
}
+
+
+
+ }
+ }
+
+ QWidget {
+ layout: HorizontalLayout {
+ Label {text: ""}
+
CheckBox {
text: "Cursor Visible";
@@ -28,6 +38,12 @@ GroupBox {
}
+ }
+ }
+
+ QWidget {
+ layout: HorizontalLayout {
+ Label {text: ""}
CheckBox {
text: "Focus On Press";
baseStateFlag: isBaseState;