mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 21:35:47 +03:00
Merge pull request #4944 from nextcloud/bugfix/html-enabled-text-qml
This commit is contained in:
commit
7397d990cc
9 changed files with 15 additions and 0 deletions
|
@ -36,6 +36,7 @@ ComboBox {
|
|||
rightPadding: clearComboBox.indicator.width + clearComboBox.spacing
|
||||
|
||||
text: clearComboBox.displayText
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
elide: Text.ElideRight
|
||||
|
@ -87,6 +88,7 @@ ComboBox {
|
|||
width: clearComboBox.width
|
||||
contentItem: Label {
|
||||
text: modelData.display
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
elide: Text.ElideRight
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
|
|
@ -29,5 +29,6 @@ Item {
|
|||
color: errorBox.color
|
||||
wrapMode: Text.WordWrap
|
||||
text: errorBox.text
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
}
|
||||
|
|
|
@ -43,12 +43,14 @@ AbstractButton {
|
|||
Label {
|
||||
width: root.emojiWidth > 0 ? root.emojiWidth : implicitWidth
|
||||
text: emoji
|
||||
textFormat: Text.PlainText
|
||||
horizontalAlignment: Image.AlignHCenter
|
||||
verticalAlignment: Image.AlignVCenter
|
||||
}
|
||||
|
||||
Label {
|
||||
text: root.text
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
|
|
|
@ -69,6 +69,7 @@ AbstractButton {
|
|||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
text: root.text
|
||||
textFormat: Text.PlainText
|
||||
wrapMode: Text.Wrap
|
||||
color: root.colored ? Style.ncHeaderTextColor : Style.ncTextColor
|
||||
font.bold: root.primary
|
||||
|
@ -83,6 +84,7 @@ AbstractButton {
|
|||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
text: root.secondaryText
|
||||
textFormat: Text.PlainText
|
||||
wrapMode: Text.Wrap
|
||||
color: Style.ncSecondaryTextColor
|
||||
visible: root.secondaryText !== ""
|
||||
|
|
|
@ -129,6 +129,7 @@ RowLayout {
|
|||
wrapMode: Text.Wrap
|
||||
maximumLineCount: 2
|
||||
font.pixelSize: Style.topLinePixelSize
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
visible: text !== ""
|
||||
}
|
||||
|
@ -145,6 +146,7 @@ RowLayout {
|
|||
wrapMode: Text.Wrap
|
||||
maximumLineCount: 2
|
||||
font.pixelSize: Style.subLinePixelSize
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
visible: text !== ""
|
||||
}
|
||||
|
@ -158,6 +160,7 @@ RowLayout {
|
|||
wrapMode: Text.Wrap
|
||||
maximumLineCount: 2
|
||||
font.pixelSize: Style.subLinePixelSize
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncSecondaryTextColor
|
||||
visible: text !== ""
|
||||
}
|
||||
|
@ -171,6 +174,7 @@ RowLayout {
|
|||
wrapMode: Text.Wrap
|
||||
maximumLineCount: 2
|
||||
font.pixelSize: Style.topLinePixelSize
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncSecondaryTextColor
|
||||
visible: text !== ""
|
||||
}
|
||||
|
|
|
@ -195,6 +195,7 @@ Window {
|
|||
Label {
|
||||
id: message
|
||||
text: root.subject
|
||||
textFormat: Text.PlainText
|
||||
color: root.usingUserAvatar ? "white" : Style.ncTextColor
|
||||
font.pixelSize: Style.topLinePixelSize
|
||||
wrapMode: Text.WordWrap
|
||||
|
|
|
@ -51,6 +51,7 @@ Button {
|
|||
Layout.fillWidth: icon.status !== Image.Ready
|
||||
|
||||
text: root.text
|
||||
textFormat: Text.PlainText
|
||||
font.bold: root.bold
|
||||
|
||||
visible: root.text !== ""
|
||||
|
|
|
@ -20,6 +20,7 @@ Label {
|
|||
Accessible.onPressAction: root.clicked(null)
|
||||
|
||||
text: action ? action.text : ""
|
||||
textFormat: Text.PlainText
|
||||
enabled: !action || action.enabled
|
||||
onClicked: if (action) action.trigger()
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ ToolTip {
|
|||
delay: Qt.styleHints.mousePressAndHoldInterval
|
||||
contentItem: Label {
|
||||
text: toolTip.text
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
wrapMode: Text.Wrap
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue