mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-29 05:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(ui/modules/Linphone/Chat/OutgoingMessage): remove message status

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-15 09:40:38 +02:00
parent 0793a7ecc1
commit a0e92affcd
5 changed files with 19 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
linphone-desktop/assets/languages/en.ts
View file

@ -809,21 +809,6 @@ your friend&apos;s SIP address or username.</translation>
<translation>Select you active account</translation> <translation>Select you active account</translation>
</message> </message>
</context> </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> <context>
<name>Presence</name> <name>Presence</name>
<message> <message>

15
linphone-desktop/assets/languages/fr.ts
View file

@ -808,21 +808,6 @@ un chat ou ajouter un contact.</translation>
<translation>Sélectionner votre compte principal</translation> <translation>Sélectionner votre compte principal</translation>
</message> </message>
</context> </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> <context>
<name>Presence</name> <name>Presence</name>
<message> <message>

2
linphone-desktop/ui/modules/Common/Constants/Colors.qml
View file

@ -40,6 +40,4 @@ QtObject {
property color z: '#17A81A' property color z: '#17A81A'
property color error: '#FF0000' property color error: '#FF0000'
property color read: '#18A7AF'
property color delivered: '#A7A7A7'
} }

44
linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
View file

@ -32,7 +32,7 @@ Item {
Component { Component {
id: icon id: icon
RowLayout { Icon {
property bool isNotDelivered: Utils.includes([ property bool isNotDelivered: Utils.includes([
ChatModel.MessageStatusFileTransferError, ChatModel.MessageStatusFileTransferError,
ChatModel.MessageStatusIdle, ChatModel.MessageStatusIdle,
@ -40,33 +40,16 @@ Item {
ChatModel.MessageStatusNotDelivered ChatModel.MessageStatusNotDelivered
], $chatEntry.status) ], $chatEntry.status)
property bool isRead: Utils.includes([ property bool isRead: $chatEntry.status === ChatModel.MessageStatusDisplayed
ChatModel.MessageStatusDisplayed
], $chatEntry.status)
Text { icon: isNotDelivered
text: isNotDelivered ? qsTr("Error") : isRead ? qsTr("Read") : qsTr("Delivered") ? 'chat_error'
color: isNotDelivered ? Colors.error : isRead ? Colors.read : Colors.delivered : (isRead ? 'chat_read' : 'chat_delivered')
font.pointSize: ChatStyle.entry.message.outgoing.fontSize iconSize: ChatStyle.entry.message.outgoing.sendIconSize
}
Icon { MouseArea {
icon: isNotDelivered ? 'chat_error' : isRead ? 'chat_read' : 'chat_delivered' anchors.fill: parent
iconSize: ChatStyle.entry.message.outgoing.sendIconSize onClicked: isNotDelivered && proxyModel.resendMessage(index)
MouseArea {
anchors.fill: parent
onClicked: isNotDelivered && proxyModel.resendMessage(index)
}
}
ActionButton {
height: ChatStyle.entry.lineHeight
icon: 'delete'
iconSize: ChatStyle.entry.deleteIconSize
visible: isHoverEntry()
onClicked: removeEntry()
} }
} }
} }
@ -84,6 +67,15 @@ Item {
? indicator ? indicator
: icon : icon
} }
ActionButton {
height: ChatStyle.entry.lineHeight
icon: 'delete'
iconSize: ChatStyle.entry.deleteIconSize
visible: isHoverEntry()
onClicked: removeEntry()
}
} }
} }
} }

3
linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
View file

@ -96,8 +96,7 @@ QtObject {
property QtObject outgoing: QtObject { property QtObject outgoing: QtObject {
property color backgroundColor: Colors.e property color backgroundColor: Colors.e
property int sendIconSize: 10 property int sendIconSize: 12
property int fontSize: 8
property QtObject text: QtObject { property QtObject text: QtObject {
property color color: Colors.r property color color: Colors.r