зеркало из https://github.com/nextcloud/desktop.git
Remove now redundant use of textFormat
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Родитель
6c4070e786
Коммит
2ec1da22ed
|
@ -37,7 +37,6 @@ ComboBox {
|
|||
rightPadding: clearComboBox.indicator.width + clearComboBox.spacing
|
||||
|
||||
text: clearComboBox.displayText
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
elide: Text.ElideRight
|
||||
|
@ -89,7 +88,6 @@ ComboBox {
|
|||
width: clearComboBox.width
|
||||
contentItem: EnforcedPlainTextLabel {
|
||||
text: modelData.display
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
elide: Text.ElideRight
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
|
|
@ -75,7 +75,6 @@ Item {
|
|||
color: Style.ncTextColor
|
||||
wrapMode: Text.WordWrap
|
||||
text: errorBox.text
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -46,7 +46,6 @@ AbstractButton {
|
|||
EnforcedPlainTextLabel {
|
||||
width: root.emojiWidth > 0 ? root.emojiWidth : implicitWidth
|
||||
text: emoji
|
||||
textFormat: Text.PlainText
|
||||
horizontalAlignment: Image.AlignHCenter
|
||||
verticalAlignment: Image.AlignVCenter
|
||||
}
|
||||
|
@ -55,7 +54,6 @@ AbstractButton {
|
|||
spacing: Style.smallSpacing
|
||||
EnforcedPlainTextLabel {
|
||||
text: root.statusText
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
font.bold: true
|
||||
|
@ -69,7 +67,6 @@ AbstractButton {
|
|||
|
||||
EnforcedPlainTextLabel {
|
||||
text: root.clearAtText
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
|
|
|
@ -71,7 +71,6 @@ AbstractButton {
|
|||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
text: root.text
|
||||
textFormat: Text.PlainText
|
||||
wrapMode: Text.Wrap
|
||||
color: root.colored ? Style.ncHeaderTextColor : Style.ncTextColor
|
||||
font.bold: root.primary
|
||||
|
@ -86,7 +85,6 @@ AbstractButton {
|
|||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
text: root.secondaryText
|
||||
textFormat: Text.PlainText
|
||||
wrapMode: Text.Wrap
|
||||
color: Style.ncSecondaryTextColor
|
||||
visible: root.secondaryText !== ""
|
||||
|
|
|
@ -129,7 +129,6 @@ RowLayout {
|
|||
wrapMode: Text.Wrap
|
||||
maximumLineCount: 2
|
||||
font.pixelSize: Style.topLinePixelSize
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
visible: text !== ""
|
||||
}
|
||||
|
@ -146,7 +145,6 @@ RowLayout {
|
|||
wrapMode: Text.Wrap
|
||||
maximumLineCount: 2
|
||||
font.pixelSize: Style.subLinePixelSize
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
visible: text !== ""
|
||||
}
|
||||
|
@ -160,7 +158,6 @@ RowLayout {
|
|||
wrapMode: Text.Wrap
|
||||
maximumLineCount: 2
|
||||
font.pixelSize: Style.subLinePixelSize
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncSecondaryTextColor
|
||||
visible: text !== ""
|
||||
}
|
||||
|
@ -174,7 +171,6 @@ RowLayout {
|
|||
wrapMode: Text.Wrap
|
||||
maximumLineCount: 2
|
||||
font.pixelSize: Style.topLinePixelSize
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncSecondaryTextColor
|
||||
visible: text !== ""
|
||||
}
|
||||
|
|
|
@ -195,7 +195,6 @@ Window {
|
|||
EnforcedPlainTextLabel {
|
||||
id: message
|
||||
text: root.subject
|
||||
textFormat: Text.PlainText
|
||||
color: root.usingUserAvatar ? "white" : Style.ncTextColor
|
||||
font.pixelSize: Style.topLinePixelSize
|
||||
wrapMode: Text.WordWrap
|
||||
|
|
|
@ -48,7 +48,6 @@ RowLayout {
|
|||
Layout.fillWidth: true
|
||||
|
||||
text: root.text
|
||||
textFormat: Text.PlainText
|
||||
|
||||
visible: root.text !== ""
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@ ToolTip {
|
|||
delay: Qt.styleHints.mousePressAndHoldInterval
|
||||
contentItem: EnforcedPlainTextLabel {
|
||||
text: toolTip.text
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
wrapMode: Text.Wrap
|
||||
}
|
||||
|
|
|
@ -24,7 +24,6 @@ EnforcedPlainTextLabel {
|
|||
property color textColorHovered: Style.ncSecondaryTextColor
|
||||
property bool bold: false
|
||||
|
||||
textFormat: Text.PlainText
|
||||
font.underline: true
|
||||
font.bold: bold
|
||||
color: hovered ? textColorHovered : textColor
|
||||
|
|
|
@ -90,7 +90,6 @@ 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
|
||||
|
@ -99,7 +98,6 @@ 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
|
||||
|
|
|
@ -35,7 +35,6 @@ ColumnLayout {
|
|||
EnforcedPlainTextLabel {
|
||||
id: unifiedSearchResultsNoResultsLabelDetails
|
||||
text: unifiedSearchResultNothingFoundContainer.text
|
||||
textFormat: Text.PlainText
|
||||
color: Style.ncTextColor
|
||||
font.pixelSize: Style.topLinePixelSize * 1.25
|
||||
wrapMode: Text.Wrap
|
||||
|
|
|
@ -13,7 +13,6 @@ EnforcedPlainTextLabel {
|
|||
leftPadding: Style.unifiedSearchResultSectionItemLeftPadding
|
||||
|
||||
text: section
|
||||
textFormat: Text.PlainText
|
||||
font.pixelSize: Style.unifiedSearchResultTitleFontSize
|
||||
color: UserModel.currentUser.accentColor
|
||||
|
||||
|
|
|
@ -77,7 +77,6 @@ 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
|
||||
|
@ -96,7 +95,6 @@ AbstractButton {
|
|||
id: emoji
|
||||
visible: model.statusEmoji !== ""
|
||||
text: statusEmoji
|
||||
textFormat: Text.PlainText
|
||||
topPadding: -Style.accountLabelsSpacing
|
||||
}
|
||||
|
||||
|
@ -105,7 +103,6 @@ AbstractButton {
|
|||
Layout.fillWidth: true
|
||||
visible: model.statusMessage !== ""
|
||||
text: statusMessage
|
||||
textFormat: Text.PlainText
|
||||
elide: Text.ElideRight
|
||||
color: Style.ncTextColor
|
||||
font.pixelSize: Style.subLinePixelSize
|
||||
|
@ -119,7 +116,6 @@ 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
|
||||
|
|
|
@ -451,7 +451,6 @@ ApplicationWindow {
|
|||
Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
|
||||
width: Style.currentAccountLabelWidth
|
||||
text: UserModel.currentUser.name
|
||||
textFormat: Text.PlainText
|
||||
elide: Text.ElideRight
|
||||
color: Style.currentUserHeaderTextColor
|
||||
|
||||
|
@ -471,7 +470,6 @@ ApplicationWindow {
|
|||
visible: UserModel.currentUser.statusEmoji !== ""
|
||||
width: Style.userStatusEmojiSize
|
||||
text: UserModel.currentUser.statusEmoji
|
||||
textFormat: Text.PlainText
|
||||
}
|
||||
EnforcedPlainTextLabel {
|
||||
id: message
|
||||
|
@ -482,7 +480,6 @@ ApplicationWindow {
|
|||
text: UserModel.currentUser.statusMessage !== ""
|
||||
? UserModel.currentUser.statusMessage
|
||||
: UserModel.currentUser.server
|
||||
textFormat: Text.PlainText
|
||||
elide: Text.ElideRight
|
||||
color: Style.currentUserHeaderTextColor
|
||||
font.pixelSize: Style.subLinePixelSize
|
||||
|
|
Загрузка…
Ссылка в новой задаче