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
a0e92aff
Commit
a0e92aff
authored
May 15, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/modules/Linphone/Chat/OutgoingMessage): remove message status
parent
0793a7ec
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
60 deletions
+19
-60
en.ts
linphone-desktop/assets/languages/en.ts
+0
-15
fr.ts
linphone-desktop/assets/languages/fr.ts
+0
-15
Colors.qml
linphone-desktop/ui/modules/Common/Constants/Colors.qml
+0
-2
OutgoingMessage.qml
...hone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
+18
-26
ChatStyle.qml
...one-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
+1
-2
No files found.
linphone-desktop/assets/languages/en.ts
View file @
a0e92aff
...
...
@@ -809,21 +809,6 @@ your friend'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
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
a0e92aff
...
...
@@ -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
>
...
...
linphone-desktop/ui/modules/Common/Constants/Colors.qml
View file @
a0e92aff
...
...
@@ -40,6 +40,4 @@ QtObject {
property
color
z
:
'
#17A81A
'
property
color
error
:
'
#FF0000
'
property
color
read
:
'
#18A7AF
'
property
color
delivered
:
'
#A7A7A7
'
}
linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
View file @
a0e92aff
...
...
@@ -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
)
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
{
icon
:
isNotDelivered
?
'
chat_error
'
:
isRead
?
'
chat_read
'
:
'
chat_delivered
'
iconSize
:
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
MouseArea
{
anchors.fill
:
parent
onClicked
:
isNotDelivered
&&
proxyModel
.
resendMessage
(
index
)
}
}
property
bool
isRead
:
$chatEntry
.
status
===
ChatModel
.
MessageStatusDisplayed
ActionButton
{
height
:
ChatStyle
.
entry
.
lineHeight
icon
:
'
delete
'
iconSize
:
ChatStyle
.
entry
.
deleteIconSize
visible
:
isHoverEntry
()
icon
:
isNotDelivered
?
'
chat_error
'
:
(
isRead
?
'
chat_read
'
:
'
chat_delivered
'
)
iconSize
:
ChatStyle
.
entry
.
message
.
outgoing
.
sendIconSize
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
()
}
}
}
}
linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
View file @
a0e92aff
...
...
@@ -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
...
...
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