Remove now redundant use of textFormat

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml
index 03a7ed8ad7b46d9c82ef2ae23f72722e3cdad176..b844ad1f7ded56248c692985c8b49afdffdc6878 100644 (file)
--- 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 26ff0d4bce28c9f832857dc14add65681481f704..2a84c130e2341deb6ecb5cad300533120fb6b340 100644 (file)
--- 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 27fc634f05ad2f0afbc2604684989032f157a4ff..dcd52df370f4343ef6e6c13f3fb67fb0be90063f 100644 (file)
--- 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 286c89e587dbc59cf553df6ae06c0698ff562e7c..717774b9784f1a081b5f50132adbcca7719d2deb 100644 (file)
--- 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 c817be54b646c6ca5986fffb70717452977808bf..6a049ca9dc7e4eec13325b969bc69c19cb0d3280 100644 (file)
--- 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 6f54712c89d37c683a001e6c1fa3f4efc047957b..e9402c11cd680c050b3b546f5ba3adb7846234f0 100644 (file)
--- 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 5144d58b39d0c66ad68957967646970040417a02..c9148a17e55c13e7efbb0a6eb951c1a42d630724 100644 (file)
--- 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 af43d5727a4b542ecc7e9ded50ddb54615784b8d..efe51419667cd30a8fd657da6e3309d978f03a73 100644 (file)
--- 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 15b77b272593ce3323efa1d935eecc77cbe4e9b5..031da73c078ed46e3df2904de7797146f4a98384 100644 (file)
--- 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 3876a1c8bce4b4e4ef6d0c4fdd50904fa5bcb14e..8909a372d15c0188da959e296c44f456a923a981 100644 (file)
--- 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 d73e8d352a89daa52c9853842ba027c75cb32879..5ceb1e5e7af3b8d5670e1ce6fb42fadf2b5b78d5 100644 (file)
--- 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 4e7da57d65f00bfad3150c2a6d894aa3b11ef7b5..27ad780ed968fc003e4a3582079d64e07dacc6e7 100644 (file)
--- 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 9c290d36f79d907e01059e12d58a45bbe965b460..1292ea4a4c693ff79dd309a51ec562d8fd87ab6a 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -77,7 +77,6 @@ AbstractButton {
                 Layout.alignment: Qt.AlignLeft | Qt.AlignBottom\r
                 verticalAlignment: Text.AlignBottom\r
                 text: name\r
-                textFormat: Text.PlainText\r
                 elide: Text.ElideRight\r
                 color: Style.ncTextColor\r
                 font.pixelSize: Style.topLinePixelSize\r
@@ -96,7 +95,6 @@ AbstractButton {
                     id: emoji\r
                     visible: model.statusEmoji !== ""\r
                     text: statusEmoji\r
-                    textFormat: Text.PlainText\r
                     topPadding: -Style.accountLabelsSpacing\r
                 }\r
 \r
@@ -105,7 +103,6 @@ AbstractButton {
                     Layout.fillWidth: true\r
                     visible: model.statusMessage !== ""\r
                     text: statusMessage\r
-                    textFormat: Text.PlainText\r
                     elide: Text.ElideRight\r
                     color: Style.ncTextColor\r
                     font.pixelSize: Style.subLinePixelSize\r
@@ -119,7 +116,6 @@ AbstractButton {
                 Layout.alignment: Qt.AlignLeft | Qt.AlignTop\r
                 verticalAlignment: Text.AlignTop\r
                 text: server\r
-                textFormat: Text.PlainText\r
                 elide: Text.ElideRight\r
                 color: Style.ncTextColor\r
                 font.pixelSize: Style.subLinePixelSize\r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 885180e450cfee3999c3b81791c89af4b5e3654a..f363bc5c31b8bdbfe3c4bff67b7415c3505956a7 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -451,7 +451,6 @@ ApplicationWindow {
                                 Layout.alignment: Qt.AlignLeft | Qt.AlignBottom\r
                                 width: Style.currentAccountLabelWidth\r
                                 text: UserModel.currentUser.name\r
-                                textFormat: Text.PlainText\r
                                 elide: Text.ElideRight\r
                                 color: Style.currentUserHeaderTextColor\r
 \r
@@ -471,7 +470,6 @@ ApplicationWindow {
                                     visible: UserModel.currentUser.statusEmoji !== ""\r
                                     width: Style.userStatusEmojiSize\r
                                     text: UserModel.currentUser.statusEmoji\r
-                                    textFormat: Text.PlainText\r
                                 }\r
                                 EnforcedPlainTextLabel {\r
                                     id: message\r
@@ -482,7 +480,6 @@ ApplicationWindow {
                                     text: UserModel.currentUser.statusMessage !== ""\r
                                           ? UserModel.currentUser.statusMessage\r
                                           : UserModel.currentUser.server\r
-                                    textFormat: Text.PlainText\r
                                     elide: Text.ElideRight\r
                                     color: Style.currentUserHeaderTextColor\r
                                     font.pixelSize: Style.subLinePixelSize\r