diff options
| author | Claudio Cambra <claudio.cambra@gmail.com> | 2022-09-29 20:37:55 +0300 |
|---|---|---|
| committer | Matthieu Gallien <matthieu_gallien@yahoo.fr> | 2022-09-30 17:24:36 +0300 |
| commit | 652c0dcff71f905f626606043a23b14d501fed0d (patch) | |
| tree | bac9517e652b245e4651a06ed8d6a91152bd64f6 /src | |
| parent | d74057835c1ae62abb0719198161b4a7357cacba (diff) | |
Fix predefined status text formatting
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/PredefinedStatusButton.qml | 29 | ||||
| -rw-r--r-- | src/gui/UserStatusSelector.qml | 5 |
2 files changed, 27 insertions, 7 deletions
diff --git a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml index 929b246d3..416f7e752 100644 --- 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 index f7ec75027..e7c40e446 100644 --- a/src/gui/UserStatusSelector.qml +++ b/src/gui/UserStatusSelector.qml @@ -261,7 +261,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) } } @@ -303,7 +304,7 @@ ColumnLayout { width: parent.width visible: userStatusSelectorModel.errorMessage != "" - text: "<b>Error:</b> " + userStatusSelectorModel.errorMessage + text: "Error: " + userStatusSelectorModel.errorMessage } RowLayout { |