From a0e92affcdb5aa5c52e448632ca1e6b1b9551331 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 15 May 2017 09:40:38 +0200
Subject: [PATCH] fix(ui/modules/Linphone/Chat/OutgoingMessage): remove message
 status

---
 linphone-desktop/assets/languages/en.ts       | 15 -------
 linphone-desktop/assets/languages/fr.ts       | 15 -------
 .../ui/modules/Common/Constants/Colors.qml    |  2 -
 .../modules/Linphone/Chat/OutgoingMessage.qml | 44 ++++++++-----------
 .../Linphone/Styles/Chat/ChatStyle.qml        |  3 +-
 5 files changed, 19 insertions(+), 60 deletions(-)

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&apos;s SIP address or username.</translation>
         <translation>Select you active account</translation>
     </message>
 </context>
-<context>
-    <name>OutgoingMessage</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>Read</source>
-        <translation>Read</translation>
-    </message>
-    <message>
-        <source>Delivered</source>
-        <translation>Delivered</translation>
-    </message>
-</context>
 <context>
     <name>Presence</name>
     <message>
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.</translation>
         <translation>Sélectionner votre compte principal</translation>
     </message>
 </context>
-<context>
-    <name>OutgoingMessage</name>
-    <message>
-        <source>Error</source>
-        <translation>Erreur</translation>
-    </message>
-    <message>
-        <source>Read</source>
-        <translation>Lu</translation>
-    </message>
-    <message>
-        <source>Delivered</source>
-        <translation>Délivré</translation>
-    </message>
-</context>
 <context>
     <name>Presence</name>
     <message>
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