mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 21:35:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4944 from nextcloud/bugfix/html-enabled-text-qml

Browse source
This commit is contained in:
Claudio Cambra 2022-09-17 23:55:35 +02:00 committed by GitHub
commit 7397d990cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/BasicComboBox.qml
View file

@ -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

1
src/gui/ErrorBox.qml
View file

@ -29,5 +29,6 @@ Item {
color: errorBox.color
wrapMode: Text.WordWrap
text: errorBox.text
textFormat: Text.PlainText
}
}

2
src/gui/PredefinedStatusButton.qml
View file

@ -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
}

2
src/gui/UserStatusSelectorButton.qml
View file

@ -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 !== ""

4
src/gui/tray/ActivityItemContent.qml
View file

@ -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 !== ""
}

1
src/gui/tray/CallNotificationDialog.qml
View file

@ -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

1
src/gui/tray/CustomButton.qml
View file

@ -51,6 +51,7 @@ Button {
Layout.fillWidth: icon.status !== Image.Ready
text: root.text
textFormat: Text.PlainText
font.bold: root.bold
visible: root.text !== ""

1
src/gui/tray/CustomTextButton.qml
View file

@ -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()

1
src/gui/tray/NCToolTip.qml
View file

@ -24,6 +24,7 @@ ToolTip {
delay: Qt.styleHints.mousePressAndHoldInterval
contentItem: Label {
text: toolTip.text
textFormat: Text.PlainText
color: Style.ncTextColor
wrapMode: Text.Wrap
}