Change HTextField borders, SignIn disable buttons
By default now, fields have a transparent border if not focused and accent-color border if focused. Set `bordered: false` for no border at all. The register and forgot buttons on the SignIn screen are now disabled, since their functions aren't implemented yet.
This commit is contained in:
parent
d597e1dda8
commit
519d3610ef
|
@ -52,6 +52,7 @@ HScalingBox {
|
||||||
id: button
|
id: button
|
||||||
text: modelData.text
|
text: modelData.text
|
||||||
iconName: modelData.iconName || ""
|
iconName: modelData.iconName || ""
|
||||||
|
enabled: modelData.enabled === false ? false : true
|
||||||
onClicked: buttonCallbacks[modelData.name](button)
|
onClicked: buttonCallbacks[modelData.name](button)
|
||||||
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
@ -16,7 +16,6 @@ Column {
|
||||||
|
|
||||||
HTextField {
|
HTextField {
|
||||||
id: textField
|
id: textField
|
||||||
bordered: true
|
|
||||||
radius: 2
|
radius: 2
|
||||||
width: parent.width
|
width: parent.width
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ TextField {
|
||||||
|
|
||||||
readonly property QtObject _tf: theme.controls.textField
|
readonly property QtObject _tf: theme.controls.textField
|
||||||
|
|
||||||
property bool bordered: false
|
property bool bordered: true
|
||||||
property color backgroundColor: _tf.background
|
property color backgroundColor: _tf.background
|
||||||
property color borderColor: _tf.border
|
property color borderColor: _tf.border
|
||||||
property color focusedBackgroundColor: _tf.focusedBackground
|
property color focusedBackgroundColor: _tf.focusedBackground
|
||||||
|
|
|
@ -43,6 +43,7 @@ HColumnLayout {
|
||||||
id: filterField
|
id: filterField
|
||||||
placeholderText: qsTr("Filter members")
|
placeholderText: qsTr("Filter members")
|
||||||
backgroundColor: theme.sidePane.filterRooms.background
|
backgroundColor: theme.sidePane.filterRooms.background
|
||||||
|
bordered: false
|
||||||
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: theme.baseElementsHeight
|
Layout.preferredHeight: theme.baseElementsHeight
|
||||||
|
|
|
@ -17,9 +17,9 @@ Item {
|
||||||
enterButtonTarget: "login"
|
enterButtonTarget: "login"
|
||||||
|
|
||||||
buttonModel: [
|
buttonModel: [
|
||||||
{ name: "register", text: qsTr("Register") },
|
{ name: "register", text: qsTr("Register"), enabled: false },
|
||||||
{ name: "login", text: qsTr("Login") },
|
{ name: "login", text: qsTr("Login"), enabled: true },
|
||||||
{ name: "forgot", text: qsTr("Forgot?") }
|
{ name: "forgot", text: qsTr("Forgot?"), enabled: false }
|
||||||
]
|
]
|
||||||
|
|
||||||
buttonCallbacks: ({
|
buttonCallbacks: ({
|
||||||
|
|
|
@ -54,6 +54,7 @@ Column {
|
||||||
placeholderText: qsTr("Set status message")
|
placeholderText: qsTr("Set status message")
|
||||||
font.pixelSize: theme.fontSize.small
|
font.pixelSize: theme.fontSize.small
|
||||||
background: null
|
background: null
|
||||||
|
bordered: false
|
||||||
|
|
||||||
padding: 0
|
padding: 0
|
||||||
leftPadding: accountLabel.leftPadding
|
leftPadding: accountLabel.leftPadding
|
||||||
|
|
|
@ -22,6 +22,7 @@ HRowLayout {
|
||||||
id: filterField
|
id: filterField
|
||||||
placeholderText: qsTr("Filter rooms")
|
placeholderText: qsTr("Filter rooms")
|
||||||
backgroundColor: theme.sidePane.filterRooms.background
|
backgroundColor: theme.sidePane.filterRooms.background
|
||||||
|
bordered: false
|
||||||
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: parent.height
|
Layout.preferredHeight: parent.height
|
||||||
|
|
|
@ -62,7 +62,7 @@ QtObject {
|
||||||
|
|
||||||
property QtObject textField: QtObject {
|
property QtObject textField: QtObject {
|
||||||
property color background: colors.background2
|
property color background: colors.background2
|
||||||
property color border: "black"
|
property color border: "transparent"
|
||||||
property color focusedBackground: background
|
property color focusedBackground: background
|
||||||
property color focusedBorder: colors.accent
|
property color focusedBorder: colors.accent
|
||||||
property int borderWidth: 1
|
property int borderWidth: 1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user