mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 06:25:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5231 from nextcloud/bugfix/more-plain-text

Browse source 
Ensure more QML text components are rendering things as plain text
This commit is contained in:
Matthieu Gallien 2022-12-01 15:22:07 +01:00 committed by GitHub
commit d2d7b45353
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/tray/UnifiedSearchResultItem.qml
View file

@ -90,6 +90,7 @@ RowLayout {
id: unifiedSearchResultTitleText
Layout.fillWidth: true
text: unifiedSearchResultItemDetails.title.replace(/[\r\n]+/g, " ")
textFormat: Text.PlainText
elide: Text.ElideRight
font.pixelSize: unifiedSearchResultItemDetails.titleFontSize
color: unifiedSearchResultItemDetails.titleColor
@ -98,6 +99,7 @@ RowLayout {
id: unifiedSearchResultTextSubline
Layout.fillWidth: true
text: unifiedSearchResultItemDetails.subline.replace(/[\r\n]+/g, " ")
textFormat: Text.PlainText
elide: Text.ElideRight
font.pixelSize: unifiedSearchResultItemDetails.sublineFontSize
color: unifiedSearchResultItemDetails.sublineColor

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

@ -35,6 +35,7 @@ ColumnLayout {
Label {
id: unifiedSearchResultsNoResultsLabelDetails
text: unifiedSearchResultNothingFoundContainer.text
textFormat: Text.PlainText
color: Style.ncTextColor
font.pixelSize: Style.topLinePixelSize * 1.25
wrapMode: Text.Wrap

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

@ -13,6 +13,7 @@ Label {
leftPadding: Style.unifiedSearchResultSectionItemLeftPadding
text: section
textFormat: Text.PlainText
font.pixelSize: Style.unifiedSearchResultTitleFontSize
color: UserModel.currentUser.accentColor

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

@ -77,6 +77,7 @@ AbstractButton {
Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
verticalAlignment: Text.AlignBottom
text: name
textFormat: Text.PlainText
elide: Text.ElideRight
color: Style.ncTextColor
font.pixelSize: Style.topLinePixelSize
@ -95,6 +96,7 @@ AbstractButton {
id: emoji
visible: model.statusEmoji !== ""
text: statusEmoji
textFormat: Text.PlainText
topPadding: -Style.accountLabelsSpacing
}
@ -103,6 +105,7 @@ AbstractButton {
Layout.fillWidth: true
visible: model.statusMessage !== ""
text: statusMessage
textFormat: Text.PlainText
elide: Text.ElideRight
color: Style.ncTextColor
font.pixelSize: Style.subLinePixelSize
@ -116,6 +119,7 @@ AbstractButton {
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
verticalAlignment: Text.AlignTop
text: server
textFormat: Text.PlainText
elide: Text.ElideRight
color: Style.ncTextColor
font.pixelSize: Style.subLinePixelSize