Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
60dd37b6
Commit
60dd37b6
authored
Jun 12, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/modules/Linphone/Chat/FileMessage): use correct outgoing icons
parent
6aaf2124
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
16 deletions
+8
-16
chat_send.svg
linphone-desktop/assets/images/chat_send.svg
+0
-12
resources.qrc
linphone-desktop/resources.qrc
+0
-1
FileMessage.qml
linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml
+6
-1
OutgoingMessage.qml
...hone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
+2
-2
No files found.
linphone-desktop/assets/images/chat_send.svg
deleted
100644 → 0
View file @
6aaf2124
<?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>
\ No newline at end of file
linphone-desktop/resources.qrc
View file @
60dd37b6
...
...
@@ -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>
...
...
linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml
View file @
60dd37b6
...
...
@@ -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
{
...
...
linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
View file @
60dd37b6
...
...
@@ -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
'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment