diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts
index 895a4ff22..4b2a6ab18 100644
--- a/linphone-desktop/assets/languages/en.ts
+++ b/linphone-desktop/assets/languages/en.ts
@@ -809,21 +809,6 @@ your friend's SIP address or username.
Select you active account
-
- OutgoingMessage
-
- Error
- Error
-
-
- Read
- Read
-
-
- Delivered
- Delivered
-
-
Presence
diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts
index 659be65c2..61ca489a7 100644
--- a/linphone-desktop/assets/languages/fr.ts
+++ b/linphone-desktop/assets/languages/fr.ts
@@ -808,21 +808,6 @@ un chat ou ajouter un contact.
Sélectionner votre compte principal
-
- OutgoingMessage
-
- Error
- Erreur
-
-
- Read
- Lu
-
-
- Delivered
- Délivré
-
-
Presence
diff --git a/linphone-desktop/ui/modules/Common/Constants/Colors.qml b/linphone-desktop/ui/modules/Common/Constants/Colors.qml
index d4084a958..529c20a42 100644
--- a/linphone-desktop/ui/modules/Common/Constants/Colors.qml
+++ b/linphone-desktop/ui/modules/Common/Constants/Colors.qml
@@ -40,6 +40,4 @@ QtObject {
property color z: '#17A81A'
property color error: '#FF0000'
- property color read: '#18A7AF'
- property color delivered: '#A7A7A7'
}
diff --git a/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
index 4b983a828..ccab0c3a1 100644
--- a/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
+++ b/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
@@ -32,7 +32,7 @@ Item {
Component {
id: icon
- RowLayout {
+ Icon {
property bool isNotDelivered: Utils.includes([
ChatModel.MessageStatusFileTransferError,
ChatModel.MessageStatusIdle,
@@ -40,33 +40,16 @@ Item {
ChatModel.MessageStatusNotDelivered
], $chatEntry.status)
- property bool isRead: Utils.includes([
- ChatModel.MessageStatusDisplayed
- ], $chatEntry.status)
+ property bool isRead: $chatEntry.status === ChatModel.MessageStatusDisplayed
- Text {
- text: isNotDelivered ? qsTr("Error") : isRead ? qsTr("Read") : qsTr("Delivered")
- color: isNotDelivered ? Colors.error : isRead ? Colors.read : Colors.delivered
- font.pointSize: ChatStyle.entry.message.outgoing.fontSize
- }
+ icon: isNotDelivered
+ ? 'chat_error'
+ : (isRead ? 'chat_read' : 'chat_delivered')
+ iconSize: ChatStyle.entry.message.outgoing.sendIconSize
- Icon {
- icon: isNotDelivered ? 'chat_error' : isRead ? 'chat_read' : 'chat_delivered'
- iconSize: ChatStyle.entry.message.outgoing.sendIconSize
-
- MouseArea {
- anchors.fill: parent
- onClicked: isNotDelivered && proxyModel.resendMessage(index)
- }
- }
-
- ActionButton {
- height: ChatStyle.entry.lineHeight
- icon: 'delete'
- iconSize: ChatStyle.entry.deleteIconSize
- visible: isHoverEntry()
-
- onClicked: removeEntry()
+ MouseArea {
+ anchors.fill: parent
+ onClicked: isNotDelivered && proxyModel.resendMessage(index)
}
}
}
@@ -84,6 +67,15 @@ Item {
? indicator
: icon
}
+
+ ActionButton {
+ height: ChatStyle.entry.lineHeight
+ icon: 'delete'
+ iconSize: ChatStyle.entry.deleteIconSize
+ visible: isHoverEntry()
+
+ onClicked: removeEntry()
+ }
}
}
}
diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
index b2f1aac74..26cdbc253 100644
--- a/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
+++ b/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
@@ -96,8 +96,7 @@ QtObject {
property QtObject outgoing: QtObject {
property color backgroundColor: Colors.e
- property int sendIconSize: 10
- property int fontSize: 8
+ property int sendIconSize: 12
property QtObject text: QtObject {
property color color: Colors.r