Skip to content
Snippets Groups Projects
Commit f822ae69 authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner: fixing indentation in qml

parent 1b428d3d
No related branches found
No related tags found
No related merge requests found
Showing
with 55 additions and 85 deletions
......@@ -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"
......
......@@ -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"
......
......@@ -36,8 +36,8 @@ QWidget {
}
}
}
QWidget { // 1
QWidget { // 1
layout: HorizontalLayout {
Label {
......
......@@ -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();
}
}
}
......
......@@ -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;
......
......@@ -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
......
......@@ -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")
}
......
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 {
......
......@@ -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;
}
}
}
......@@ -4,10 +4,9 @@ import Bauhaus 1.0
QScrollArea {
property variant finished;
onFinishedChanged: {
}
property variant finished;
onFinishedChanged: {
}
}
......@@ -47,6 +47,6 @@ GroupBox {
AlignmentHorizontalButtons {}
AlignmentVerticalButtons { visible: showVerticalAlignment }
}
}
}
}
}
......@@ -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;
}
}
}
}
......@@ -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;
}
......
......@@ -7,7 +7,7 @@ GroupBox {
maximumHeight: 200;
id: transformation;
layout: VerticalLayout {
layout: VerticalLayout {
QWidget {
layout: HorizontalLayout {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment