mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ui/modules/Linphone/Chat/FileMessage): use correct outgoing icons

Browse source
This commit is contained in:
Ronan Abhamon 2017-06-12 16:25:47 +02:00
parent 6aaf2124e1
commit 60dd37b6bf
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
linphone-desktop/assets/images/chat_send.svg
View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="12px" height="10px" viewBox="0 0 12 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
<title>chat_send</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="chat_send" stroke-width="2" stroke="#96C11F">
<polyline id="chat_message_delivered" points="1 4.16033709 5.24416844 8.99280009 10.9266196 1"></polyline>
</g>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 691 B

1
linphone-desktop/resources.qrc
View file

@ -63,7 +63,6 @@
<file>assets/images/chat_normal.svg</file>
<file>assets/images/chat_pressed.svg</file>
<file>assets/images/chat_read.svg</file>
<file>assets/images/chat_send.svg</file>
<file>assets/images/collapse.svg</file>
<file>assets/images/contact_add_hovered.svg</file>
<file>assets/images/contact_add_normal.svg</file>

7
linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml
View file

@ -54,6 +54,8 @@ Row {
ChatModel.MessageStatusNotDelivered
], $chatEntry.status)
readonly property bool isRead: $chatEntry.status === ChatModel.MessageStatusDisplayed
color: $chatEntry.isOutgoing
? ChatStyle.entry.message.outgoing.backgroundColor
: ChatStyle.entry.message.incoming.backgroundColor
@ -200,7 +202,10 @@ Row {
id: icon
Icon {
icon: rectangle.isNotDelivered ? 'chat_error' : 'chat_send'
icon: rectangle.isNotDelivered
? 'chat_error'
: (rectangle.isRead ? 'chat_read' : 'chat_delivered')
iconSize: ChatStyle.entry.message.outgoing.sendIconSize
MouseArea {

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

@ -33,14 +33,14 @@ Item {
id: icon
Icon {
property bool isNotDelivered: Utils.includes([
readonly property bool isNotDelivered: Utils.includes([
ChatModel.MessageStatusFileTransferError,
ChatModel.MessageStatusIdle,
ChatModel.MessageStatusInProgress,
ChatModel.MessageStatusNotDelivered
], $chatEntry.status)
property bool isRead: $chatEntry.status === ChatModel.MessageStatusDisplayed
readonly property bool isRead: $chatEntry.status === ChatModel.MessageStatusDisplayed
icon: isNotDelivered
? 'chat_error'