Commit da41d5b8 authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner.propertyEditor: completing Text/TexEdit and TextInput panes

See BAUHAUS-581
This patch adds missing properties and implments the wrap mode
combobox
parent f7985a2e
......@@ -27,13 +27,18 @@ GroupBox {
visible: showIsWrapping
layout: HorizontalLayout {
Label {
text: ""
text: "Wrap Mode"
}
CheckBox {
baseStateFlag: isBaseState;
text: qsTr("Is Wrapping")
checkable: true;
backendValue: backendValues.wrap;
ComboBox {
baseStateFlag: isBaseState
minimumHeight: 22;
items : { ["NoWrap", "WordWrap", "WrapAnywhere", "WrapAtWordBoundaryOrAnywhere"] }
currentText: backendValues.wrapMode.value;
onItemsChanged: {
currentText = backendValues.wrapMode.value;
}
backendValue: backendValues.wrapMode
}
}
}
......
......@@ -13,6 +13,7 @@ QWidget {
StandardTextGroupBox {
finished: finishedNotify;
showIsWrapping: true
}
StandardTextColorGroupBox {
finished: finishedNotify;
......
......@@ -5,8 +5,22 @@ GroupBox {
id: textInputGroupBox
caption: qsTr("Text Input")
property bool isTextInput: false
layout: VerticalLayout {
layout: VerticalLayout {
QWidget {
visible: isTextInput
layout: HorizontalLayout {
Label {text: "Input Mask"}
LineEdit {
backendValue: backendValues.inputMask
baseStateFlag: isBaseState
}
}
}
QWidget {
layout: HorizontalLayout {
......@@ -18,13 +32,10 @@ GroupBox {
checkable: true;
backendValue: backendValues.readOnly;
}
}
}
QWidget {
layout: HorizontalLayout {
Label {text: ""}
......@@ -48,7 +59,20 @@ GroupBox {
text: qsTr("Focus On Press")
baseStateFlag: isBaseState;
checkable: true;
backendValue: backendValues. focusOnPress;
backendValue: backendValues.focusOnPress;
}
}
}
QWidget {
visible: isTextInput
layout: HorizontalLayout {
Label {text: ""}
CheckBox {
text: qsTr("Auto Scroll")
baseStateFlag: isBaseState;
checkable: true;
backendValue: backendValues.autoScroll;
}
}
}
......
......@@ -17,8 +17,8 @@ QWidget {
StandardTextColorGroupBox {
finished: finishedNotify;
showSelectionColor: true;
showSelectedTextColor: true;
showSelectionColor: true;
showSelectedTextColor: true;
}
FontGroupBox {
......@@ -27,7 +27,8 @@ QWidget {
}
TextInputGroupBox {
finished: finishedNotify;
finished: finishedNotify
isTextInput: true
}
QScrollArea {
}
......
Markdown is supported
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