Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Cambra <claudio.cambra@gmail.com>2022-09-15 15:56:02 +0300
committerClaudio Cambra <claudio.cambra@gmail.com>2022-09-15 15:57:03 +0300
commitbab91a94b8816117b46afa4163c70410a747a2d7 (patch)
tree5c53b63e5dd26e9638441da4e43feb31d5624ca6
parent1c5320af0c45d48a336011db3e698a51c517e842 (diff)
Do not format text in QML components as HTMLbugfix/html-enabled-text-qml
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
-rw-r--r--src/gui/BasicComboBox.qml2
-rw-r--r--src/gui/ErrorBox.qml1
-rw-r--r--src/gui/PredefinedStatusButton.qml2
-rw-r--r--src/gui/UserStatusSelectorButton.qml2
-rw-r--r--src/gui/tray/ActivityItemContent.qml4
-rw-r--r--src/gui/tray/CallNotificationDialog.qml1
-rw-r--r--src/gui/tray/CustomButton.qml1
-rw-r--r--src/gui/tray/CustomTextButton.qml1
-rw-r--r--src/gui/tray/NCToolTip.qml1
9 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml
index f24c04818..8917260d3 100644
--- a/src/gui/BasicComboBox.qml
+++ b/src/gui/BasicComboBox.qml
@@ -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
diff --git a/src/gui/ErrorBox.qml b/src/gui/ErrorBox.qml
index 750a4cb00..b4b9f3944 100644
--- a/src/gui/ErrorBox.qml
+++ b/src/gui/ErrorBox.qml
@@ -29,5 +29,6 @@ Item {
color: errorBox.color
wrapMode: Text.WordWrap
text: errorBox.text
+ textFormat: Text.PlainText
}
}
diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml
index dabef84ae..929b246d3 100644
--- a/src/gui/PredefinedStatusButton.qml
+++ b/src/gui/PredefinedStatusButton.qml
@@ -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
}
diff --git a/src/gui/UserStatusSelectorButton.qml b/src/gui/UserStatusSelectorButton.qml
index 8321232df..91310839d 100644
--- a/src/gui/UserStatusSelectorButton.qml
+++ b/src/gui/UserStatusSelectorButton.qml
@@ -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 !== ""
diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index 45971bbb1..4ba1b95e8 100644
--- a/src/gui/tray/ActivityItemContent.qml
+++ b/src/gui/tray/ActivityItemContent.qml
@@ -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 !== ""
}
diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml
index 37929e824..3d71c8451 100644
--- a/src/gui/tray/CallNotificationDialog.qml
+++ b/src/gui/tray/CallNotificationDialog.qml
@@ -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
diff --git a/src/gui/tray/CustomButton.qml b/src/gui/tray/CustomButton.qml
index 9a6ff17af..70693c7df 100644
--- a/src/gui/tray/CustomButton.qml
+++ b/src/gui/tray/CustomButton.qml
@@ -51,6 +51,7 @@ Button {
Layout.fillWidth: icon.status !== Image.Ready
text: root.text
+ textFormat: Text.PlainText
font.bold: root.bold
visible: root.text !== ""
diff --git a/src/gui/tray/CustomTextButton.qml b/src/gui/tray/CustomTextButton.qml
index 5c1199a92..9268b194d 100644
--- a/src/gui/tray/CustomTextButton.qml
+++ b/src/gui/tray/CustomTextButton.qml
@@ -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()
diff --git a/src/gui/tray/NCToolTip.qml b/src/gui/tray/NCToolTip.qml
index 3d9dbb0f5..2c1b85312 100644
--- a/src/gui/tray/NCToolTip.qml
+++ b/src/gui/tray/NCToolTip.qml
@@ -24,6 +24,7 @@ ToolTip {
delay: Qt.styleHints.mousePressAndHoldInterval
contentItem: Label {
text: toolTip.text
+ textFormat: Text.PlainText
color: Style.ncTextColor
wrapMode: Text.Wrap
}