mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-27 16:59:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ContactDescription): do not display display name if exists

Browse source
This commit is contained in:
Ronan Abhamon 2017-08-09 11:50:13 +02:00
parent 7ae543dd93
commit dcfecffe66
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ui/modules/Linphone/Contact/ContactDescription.qml
View file

@ -1,12 +1,14 @@
import QtQuick 2.7
import Linphone.Styles 1.0
import LinphoneUtils 1.0
// =============================================================================
Column {
property alias sipAddress: sipAddress.text
property alias username: username.text
property string sipAddress
property color sipAddressColor: ContactDescriptionStyle.sipAddress.color
property color usernameColor: ContactDescriptionStyle.username.color
property int horizontalTextAlignment
@ -27,7 +29,7 @@ Column {
}
Text {
id: sipAddress
text: LinphoneUtils.cleanSipAddress(sipAddress)
color: sipAddressColor
elide: Text.ElideRight

7
ui/scripts/LinphoneUtils/linphone-utils.js
View file

@ -84,3 +84,10 @@ function getContactUsername (contact) {
name = _getUsername(object)
return name == null ? 'Bad EGG' : name
}
function cleanSipAddress (sipAddress) {
var index = sipAddress.indexOf('<')
return index === -1
? sipAddress
: sipAddress.substring(index + 1, sipAddress.lastIndexOf('>'))
}