From: Claudio Cambra Date: Fri, 2 Dec 2022 13:58:12 +0000 (+0100) Subject: Remove now redundant use of textFormat X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~93^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2ec1da22edd5891011950da6a8b4732abb6b4d89;p=nextcloud-desktop.git Remove now redundant use of textFormat Signed-off-by: Claudio Cambra --- diff --git a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml index 03a7ed8ad..b844ad1f7 100644 --- a/src/gui/BasicComboBox.qml +++ b/src/gui/BasicComboBox.qml @@ -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 diff --git a/src/gui/ErrorBox.qml b/src/gui/ErrorBox.qml index 26ff0d4bc..2a84c130e 100644 --- a/src/gui/ErrorBox.qml +++ b/src/gui/ErrorBox.qml @@ -75,7 +75,6 @@ Item { color: Style.ncTextColor wrapMode: Text.WordWrap text: errorBox.text - textFormat: Text.PlainText } } } diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml index 27fc634f0..dcd52df37 100644 --- a/src/gui/PredefinedStatusButton.qml +++ b/src/gui/PredefinedStatusButton.qml @@ -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 } diff --git a/src/gui/UserStatusSelectorButton.qml b/src/gui/UserStatusSelectorButton.qml index 286c89e58..717774b97 100644 --- a/src/gui/UserStatusSelectorButton.qml +++ b/src/gui/UserStatusSelectorButton.qml @@ -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 !== "" diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index c817be54b..6a049ca9d 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -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 !== "" } diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml index 6f54712c8..e9402c11c 100644 --- a/src/gui/tray/CallNotificationDialog.qml +++ b/src/gui/tray/CallNotificationDialog.qml @@ -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 diff --git a/src/gui/tray/NCButtonContents.qml b/src/gui/tray/NCButtonContents.qml index 5144d58b3..c9148a17e 100644 --- a/src/gui/tray/NCButtonContents.qml +++ b/src/gui/tray/NCButtonContents.qml @@ -48,7 +48,6 @@ RowLayout { Layout.fillWidth: true text: root.text - textFormat: Text.PlainText visible: root.text !== "" diff --git a/src/gui/tray/NCToolTip.qml b/src/gui/tray/NCToolTip.qml index af43d5727..efe514196 100644 --- a/src/gui/tray/NCToolTip.qml +++ b/src/gui/tray/NCToolTip.qml @@ -24,7 +24,6 @@ ToolTip { delay: Qt.styleHints.mousePressAndHoldInterval contentItem: EnforcedPlainTextLabel { text: toolTip.text - textFormat: Text.PlainText color: Style.ncTextColor wrapMode: Text.Wrap } diff --git a/src/gui/tray/TextButtonContents.qml b/src/gui/tray/TextButtonContents.qml index 15b77b272..031da73c0 100644 --- a/src/gui/tray/TextButtonContents.qml +++ b/src/gui/tray/TextButtonContents.qml @@ -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 diff --git a/src/gui/tray/UnifiedSearchResultItem.qml b/src/gui/tray/UnifiedSearchResultItem.qml index 3876a1c8b..8909a372d 100644 --- a/src/gui/tray/UnifiedSearchResultItem.qml +++ b/src/gui/tray/UnifiedSearchResultItem.qml @@ -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 diff --git a/src/gui/tray/UnifiedSearchResultNothingFound.qml b/src/gui/tray/UnifiedSearchResultNothingFound.qml index d73e8d352..5ceb1e5e7 100644 --- a/src/gui/tray/UnifiedSearchResultNothingFound.qml +++ b/src/gui/tray/UnifiedSearchResultNothingFound.qml @@ -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 diff --git a/src/gui/tray/UnifiedSearchResultSectionItem.qml b/src/gui/tray/UnifiedSearchResultSectionItem.qml index 4e7da57d6..27ad780ed 100644 --- a/src/gui/tray/UnifiedSearchResultSectionItem.qml +++ b/src/gui/tray/UnifiedSearchResultSectionItem.qml @@ -13,7 +13,6 @@ EnforcedPlainTextLabel { leftPadding: Style.unifiedSearchResultSectionItemLeftPadding text: section - textFormat: Text.PlainText font.pixelSize: Style.unifiedSearchResultTitleFontSize color: UserModel.currentUser.accentColor diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml index 9c290d36f..1292ea4a4 100644 --- a/src/gui/tray/UserLine.qml +++ b/src/gui/tray/UserLine.qml @@ -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 diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 885180e45..f363bc5c3 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -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