Skip to content

GitLab

Commit 333abdbb authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

Merge branch 'refactoring'

parents 86c2367c 3b71f475
Hide whitespace changes
Inline Side-by-side
share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
View file @ 333abdbb
......@@ -5,7 +5,6 @@ QGroupBox {
id: aligmentHorizontalButtons
layout: HorizontalLayout {
topMargin: 6
rightMargin: 10;
QWidget {
fixedHeight: 32
......
share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
View file @ 333abdbb
......@@ -5,7 +5,6 @@ QGroupBox {
id: alignmentVerticalButtons
layout: HorizontalLayout {
topMargin: 6
rightMargin: 10;
QWidget {
fixedHeight: 32
......
share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
View file @ 333abdbb
......@@ -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;
}
}
}
......
share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
View file @ 333abdbb
......@@ -76,7 +76,7 @@ QWidget { //This is a special checkBox that does color coding for states
ExtendedFunctionButton {
backendValue: checkBox.backendValue
y: 4
y: 3
x: localCheckBox.x + 18;
}
}
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
View file @ 333abdbb
......@@ -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 {
......
share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
View file @ 333abdbb
......@@ -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;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
View file @ 333abdbb
......@@ -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"
}
......
share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
View file @ 333abdbb
......@@ -51,7 +51,7 @@ QWidget {
QWidget {
layout: HorizontalLayout {
Label {
text: "Antialiasing:"
text: "Aliasing"
}
CheckBox {
......
share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml
View file @ 333abdbb
......@@ -6,5 +6,5 @@ QLabel {
font.bold: true;
alignment: "Qt::AlignRight | Qt::AlignVCenter"
fixedWidth: 98
fixedWidth: 68
}
share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
View file @ 333abdbb
......@@ -10,7 +10,7 @@ GroupBox {
enabled: anchorBackend.hasParent;
property var targetLabelWidth: 90 - 20 - 26
property int leftMarginMargin: 0
property int leftMarginMargin: 16
layout: VerticalLayout {
Label {
......@@ -19,6 +19,7 @@ GroupBox {
QWidget {
layout: HorizontalLayout {
leftMargin: 10
topMargin: 8
AnchorButtons {
......@@ -39,8 +40,8 @@ GroupBox {
leftMargin: 10
QLabel {
//iconFromFile: "qrc:qmldesigner/images/icon-top.png"
fixedWidth: 32
fixedHeight: 32
fixedWidth: 16
fixedHeight: 16
styleSheet: "border-image: url(:/qmldesigner/images/icon-top.png)";
}
......@@ -88,8 +89,8 @@ GroupBox {
leftMargin: 10
QLabel {
//iconFromFile: "qrc:qmldesigner/images/icon-top.png"
fixedWidth: 32
fixedHeight: 32
fixedWidth: 16
fixedHeight: 16
styleSheet: "border-image: url(:/qmldesigner/images/icon-bottom.png)";
}
......@@ -136,8 +137,8 @@ GroupBox {
leftMargin: 10
QLabel {
//iconFromFile: "qrc:qmldesigner/images/icon-top.png"
fixedWidth: 32
fixedHeight: 32
fixedWidth: 16
fixedHeight: 16
styleSheet: "border-image: url(:/qmldesigner/images/icon-left.png)";
}
......@@ -183,8 +184,8 @@ GroupBox {
leftMargin: 10
QLabel {
//iconFromFile: "qrc:qmldesigner/images/icon-top.png"
fixedWidth: 32
fixedHeight: 32
fixedWidth: 16
fixedHeight: 16
styleSheet: "border-image: url(:/qmldesigner/images/icon-right.png)";
}
......@@ -230,8 +231,8 @@ GroupBox {
leftMargin: 10
QLabel {
//iconFromFile: "qrc:qmldesigner/images/icon-top.png"
fixedWidth: 32
fixedHeight: 32
fixedWidth: 16
fixedHeight: 16
styleSheet: "border-image: url(:/qmldesigner/images/icon-horizontal.png)";
}
......@@ -277,8 +278,8 @@ GroupBox {
leftMargin: 10
QLabel {
//iconFromFile: "qrc:qmldesigner/images/icon-top.png"
fixedWidth: 32
fixedHeight: 32
fixedWidth: 16
fixedHeight: 16
styleSheet: "border-image: url(:/qmldesigner/images/icon-vertical.png)";
}
......
share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
View file @ 333abdbb
......@@ -43,7 +43,7 @@ QWidget {
QLineEdit {
id: lineEditWidget
styleSheet: "padding-left: 16;"
styleSheet: "padding-left: 32;"
width: lineEdit.width
height: lineEdit.height
......@@ -66,7 +66,7 @@ QWidget {
ExtendedFunctionButton {
backendValue: lineEdit.backendValue
y: 4
x: 3
x: 0
visible: lineEdit.enabled
}
}
share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml
View file @ 333abdbb
......@@ -4,6 +4,6 @@ import Bauhaus 1.0
WidgetFrame {
id: propertyFrame;
minimumWidth: 360;
minimumWidth: 300;
styleSheetFile: "propertyEditor.css";
}
share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
View file @ 333abdbb
......@@ -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
......
share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
View file @ 333abdbb
......@@ -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;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
View file @ 333abdbb
......@@ -10,7 +10,7 @@ QWidget { //This is a special spinBox that does color coding for states
property alias singleStep: box.singleStep;
property alias minimum: box.minimum
property alias maximum: box.maximum
property alias enabled: box.enabled
property bool enabled: true
minimumHeight: 22;
......@@ -62,12 +62,14 @@ QWidget { //This is a special spinBox that does color coding for states
ColorScheme { id:scheme; }
layout: HorizontalLayout {
spacing: 4
QSpinBox {
property alias backendValue: spinBox.backendValue
enabled: !backendValue.isBound && spinBox.enabled;
keyboardTracking: false;
id: box;
enabled: backendValue.isBound
property bool readingFromBackend: false;
property int valueFromBackend: spinBox.backendValue.value;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
View file @ 333abdbb
......@@ -36,7 +36,7 @@ GroupBox {
ColorGroupBox {
visible: showSelectedTextColor
caption: "Selected Text"
caption: "Selected"
finished: finishedNotify
......
share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
View file @ 333abdbb
......@@ -35,8 +35,8 @@ QFrame {
id: layoutMode;
checkable: true;
checked: false;
toolTip: "layout and geometry";
text: "Geometry";
toolTip: qsTr("layout and geometry");
text: qsTr("Geometry");
onClicked: {
extendedMode.checked = false;
standardMode.checked = false;
......@@ -52,7 +52,7 @@ QFrame {
toolTip: "advanced properties";
checkable: true;
checked: false;
text: "Advanced"
text: qsTr("Advanced")
onClicked: {
standardMode.checked = false;
layoutMode.checked = false;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
View file @ 333abdbb
......@@ -28,8 +28,9 @@ QWidget {
QWidget {
layout: HorizontalLayout {
rightMargin: 12
Label {
text: "Text Format"
text: "Format"
}
ComboBox {
baseStateFlag: isBaseState
......
share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
View file @ 333abdbb
......@@ -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;
......
share/qtcreator/qmldesigner/propertyeditor/Qt/alignmenttopbutton.css
View file @ 333abdbb
QPushButton {
border-image: url(:/qmldesigner/images/button_alignment_top_normal.png) 3;
border-width: 3;
border-image: url(:/qmldesigner/images/button_alignment_top_normal.png);
}
QPushButton:pressed {
border-image: url(:/qmldesigner/images/button_alignment_top_pressed.png) 3;
border-image: url(:/qmldesigner/images/button_alignment_top_pressed.png);
}
QPushButton:checked {
border-image: url(:/qmldesigner/images/button_alignment_top_pressed.png) 3;
border-image: url(:/qmldesigner/images/button_alignment_top_pressed.png);
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment