Merge remote-tracking branch 'origin/master' into cross-signing
3 files changed, 8 insertions, 4 deletions
diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml
index 158daf45..7a2588f3 100644
--- a/resources/qml/delegates/FileMessage.qml
+++ b/resources/qml/delegates/FileMessage.qml
@@ -41,7 +41,7 @@ Item {
Text {
id: filename
Layout.fillWidth: true
- text: model.data.body
+ text: model.data.filename
textFormat: Text.PlainText
elide: Text.ElideRight
color: colors.text
diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index ff025730..a5cb2ae7 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -36,7 +36,7 @@ Item {
DelegateChoice {
roleValue: MtxEvent.EmoteMessage
NoticeMessage {
- formatted: chat.model.escapeEmoji(modelData.userName) + " " + model.data.formattedBody
+ formatted: TimelineManager.escapeEmoji(modelData.userName) + " " + model.data.formattedBody
color: TimelineManager.userColor(modelData.userId, colors.window)
}
}
@@ -99,7 +99,11 @@ Item {
DelegateChoice {
roleValue: MtxEvent.CallInvite
NoticeMessage {
- text: qsTr("%1 placed a %2 call.").arg(model.data.userName).arg(model.data.callType)
+ text: switch(model.data.callType) {
+ case "voice": return qsTr("%1 placed a voice call.").arg(model.data.userName)
+ case "video": return qsTr("%1 placed a video call.").arg(model.data.userName)
+ default: return qsTr("%1 placed a call.").arg(model.data.userName)
+ }
}
}
DelegateChoice {
diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
index d4fffb06..43fc2814 100644
--- a/resources/qml/delegates/Reply.qml
+++ b/resources/qml/delegates/Reply.qml
@@ -39,7 +39,7 @@ Item {
Text {
id: userName
- text: chat.model ? chat.model.escapeEmoji(reply.modelData.userName) : ""
+ text: TimelineManager.escapeEmoji(reply.modelData.userName)
color: replyComponent.userColor
textFormat: Text.RichText
|
