Merge pull request #5058 from nextcloud/backport/4987/stable-3.6

[stable-3.6] Fix predefined status text formatting
nextcloud · Oct 18, 2022 · 6a4b83e · 6a4b83e
2 parents e13b7fa + 426e6cd
commit 6a4b83e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml
@@ -31,6 +31,8 @@ AbstractButton {
     property int emojiWidth: -1
     property int internalSpacing: Style.standardSpacing
     property string emoji: ""
+    property string statusText: ""
+    property string clearAtText: ""
 
     background: Rectangle {
         color: root.hovered || root.checked ? Style.lightHover : "transparent"
@@ -48,11 +50,28 @@ AbstractButton {
             verticalAlignment: Image.AlignVCenter
         }
 
-        Label {
-            text: root.text
-            textFormat: Text.PlainText
-            color: Style.ncTextColor
-            verticalAlignment: Text.AlignVCenter
+        Row {
+            spacing: Style.smallSpacing
+            Label {
+                text: root.statusText
+                textFormat: Text.PlainText
+                color: Style.ncTextColor
+                verticalAlignment: Text.AlignVCenter
+                font.bold: true
+            }
+
+            Label {
+                text: "-"
+                color: Style.ncTextColor
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            Label {
+                text: root.clearAtText
+                textFormat: Text.PlainText
+                color: Style.ncTextColor
+                verticalAlignment: Text.AlignVCenter
+            }
         }
     }
 }
diff --git a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml
@@ -262,7 +262,8 @@ ColumnLayout {
                     internalSpacing: statusFieldLayout.spacing + userStatusMessageTextField.leftPadding
 
                     emoji: modelData.icon
-                    text: "<b>%1</b> – %2".arg(modelData.message).arg(userStatusSelectorModel.clearAtReadable(modelData))
+                    statusText: modelData.message
+                    clearAtText: userStatusSelectorModel.clearAtReadable(modelData)
                     onClicked: userStatusSelectorModel.setPredefinedStatus(modelData)
                 }
             }
@@ -304,7 +305,7 @@ ColumnLayout {
         width: parent.width
 
         visible: userStatusSelectorModel.errorMessage != ""
-        text: "<b>Error:</b> " + userStatusSelectorModel.errorMessage
+        text: "Error: " + userStatusSelectorModel.errorMessage
     }
 
     RowLayout {