diff --git a/linphone-app/assets/images/chat_room_light.svg b/linphone-app/assets/images/chat_room_light.svg new file mode 100644 index 000000000..4721e2f59 --- /dev/null +++ b/linphone-app/assets/images/chat_room_light.svg @@ -0,0 +1,45 @@ + + + + + + + + + diff --git a/linphone-app/assets/images/led_green.svg b/linphone-app/assets/images/led_green.svg index c1687919c..f99055fe5 100644 --- a/linphone-app/assets/images/led_green.svg +++ b/linphone-app/assets/images/led_green.svg @@ -1,18 +1,61 @@ - - - - statut_avatar_available_l - Created with Sketch. - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/linphone-app/assets/images/led_orange.svg b/linphone-app/assets/images/led_orange.svg index d82c4f6a1..bcb34f6b6 100644 --- a/linphone-app/assets/images/led_orange.svg +++ b/linphone-app/assets/images/led_orange.svg @@ -1,18 +1,61 @@ - - - - statut_avatar_absent_l - Created with Sketch. - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/linphone-app/assets/images/led_red.svg b/linphone-app/assets/images/led_red.svg index bc8597495..5c5e0163c 100644 --- a/linphone-app/assets/images/led_red.svg +++ b/linphone-app/assets/images/led_red.svg @@ -1,18 +1,46 @@ - - - - statut_avatar_busy_l - Created with Sketch. - - - - - - - - - - - - + + + + + + + + diff --git a/linphone-app/assets/images/led_white.svg b/linphone-app/assets/images/led_white.svg index b62f1fa1d..f556b0175 100644 --- a/linphone-app/assets/images/led_white.svg +++ b/linphone-app/assets/images/led_white.svg @@ -1,18 +1,61 @@ - - - - statut_avatar_disconnected_l - Created with Sketch. - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/linphone-app/assets/images/panel_hidden_hovered.svg b/linphone-app/assets/images/panel_hidden_hovered.svg index 99dd8189d..a50e96d6b 100644 --- a/linphone-app/assets/images/panel_hidden_hovered.svg +++ b/linphone-app/assets/images/panel_hidden_hovered.svg @@ -1,23 +1,17 @@ - - - + inkscape:current-layer="svg20" /> + + + + + + + + - + fill="none" + fill-rule="evenodd" + id="g18"> + + + + + + diff --git a/linphone-app/assets/images/panel_hidden_normal.svg b/linphone-app/assets/images/panel_hidden_normal.svg index 99dd8189d..a50e96d6b 100644 --- a/linphone-app/assets/images/panel_hidden_normal.svg +++ b/linphone-app/assets/images/panel_hidden_normal.svg @@ -1,23 +1,17 @@ - - - + inkscape:current-layer="svg20" /> + + + + + + + + - + fill="none" + fill-rule="evenodd" + id="g18"> + + + + + + diff --git a/linphone-app/assets/images/panel_hidden_pressed.svg b/linphone-app/assets/images/panel_hidden_pressed.svg index 99dd8189d..a50e96d6b 100644 --- a/linphone-app/assets/images/panel_hidden_pressed.svg +++ b/linphone-app/assets/images/panel_hidden_pressed.svg @@ -1,23 +1,17 @@ - - - + inkscape:current-layer="svg20" /> + + + + + + + + - + fill="none" + fill-rule="evenodd" + id="g18"> + + + + + + diff --git a/linphone-app/assets/images/panel_shown_hovered.svg b/linphone-app/assets/images/panel_shown_hovered.svg index a9d328703..9f02775f8 100644 --- a/linphone-app/assets/images/panel_shown_hovered.svg +++ b/linphone-app/assets/images/panel_shown_hovered.svg @@ -1,23 +1,19 @@ - - + id="defs14" /> + inkscape:current-layer="svg10" /> - + + + diff --git a/linphone-app/assets/images/panel_shown_normal.svg b/linphone-app/assets/images/panel_shown_normal.svg index a9d328703..9f02775f8 100644 --- a/linphone-app/assets/images/panel_shown_normal.svg +++ b/linphone-app/assets/images/panel_shown_normal.svg @@ -1,23 +1,19 @@ - - + id="defs14" /> + inkscape:current-layer="svg10" /> - + + + diff --git a/linphone-app/assets/images/panel_shown_pressed.svg b/linphone-app/assets/images/panel_shown_pressed.svg index a9d328703..9f02775f8 100644 --- a/linphone-app/assets/images/panel_shown_pressed.svg +++ b/linphone-app/assets/images/panel_shown_pressed.svg @@ -1,23 +1,19 @@ - - + id="defs14" /> + inkscape:current-layer="svg10" /> - + + + diff --git a/linphone-app/assets/images/timer_light.svg b/linphone-app/assets/images/timer_light.svg new file mode 100644 index 000000000..2b92e2f77 --- /dev/null +++ b/linphone-app/assets/images/timer_light.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/linphone-app/resources.qrc b/linphone-app/resources.qrc index 4a0d9ffe6..28aea58ae 100644 --- a/linphone-app/resources.qrc +++ b/linphone-app/resources.qrc @@ -78,6 +78,7 @@ assets/images/chat_pressed.svg assets/images/chat_read.svg assets/images/chat_room.svg + assets/images/chat_room_light.svg assets/images/close.svg assets/images/collapse.svg assets/images/collapsed.svg @@ -244,6 +245,7 @@ assets/images/speaker_on_pressed.svg assets/images/speaker.svg assets/images/timer.svg + assets/images/timer_light.svg assets/images/tel_keypad_hovered.svg assets/images/tel_keypad_normal.svg assets/images/tel_keypad_pressed.svg diff --git a/linphone-app/ui/modules/Linphone/Contact/Contact.qml b/linphone-app/ui/modules/Linphone/Contact/Contact.qml index 8e5bc2049..cc191efec 100644 --- a/linphone-app/ui/modules/Linphone/Contact/Contact.qml +++ b/linphone-app/ui/modules/Linphone/Contact/Contact.qml @@ -28,7 +28,10 @@ Rectangle { // entry should have these functions : presenceStatus, sipAddress, username, avatar (image) - //readonly property var _contact: entry.contact + property string username: (entry != undefined ?(entry.contactModel != undefined ? entry.contactModel.vcard.username + :entry.username != undefined ?entry.username: + LinphoneUtils.getContactUsername(entry.sipAddress || entry.fullPeerAddress || entry.peerAddress || '') + ):'') // --------------------------------------------------------------------------- @@ -60,12 +63,19 @@ Rectangle { //username: LinphoneUtils.getContactUsername(_contact || entry.sipAddress || entry.fullPeerAddress || entry.peerAddress || '') //username: UtilsCpp.getDisplayName(entry.sipAddress || entry.peerAddress ) - username : entry != undefined ?(entry.contactModel != undefined ? entry.contactModel.vcard.username - :entry.username != undefined ?entry.username: - LinphoneUtils.getContactUsername(entry.sipAddress || entry.fullPeerAddress || entry.peerAddress || '') - ):'' + username : entry!=undefined && entry.isOneToOne!=undefined && !entry.isOneToOne ? '' : item.username + visible:!groupChat.visible + Icon { + + anchors.fill: parent + + icon: 'chat_room_light' + iconSize: 20 + visible: entry!=undefined && entry.isOneToOne!=undefined && !entry.isOneToOne + } + Icon{ anchors.right: parent.right anchors.top:parent.top @@ -83,7 +93,7 @@ Rectangle { icon:'chat_room' iconSize: ContactStyle.contentHeight - visible: entry!=undefined && entry.isOneToOne!=undefined && !entry.isOneToOne + visible: false //entry!=undefined && entry.isOneToOne!=undefined && !entry.isOneToOne Icon{ anchors.right: parent.right @@ -107,7 +117,7 @@ Rectangle { ? entry.sipAddress || entry.fullPeerAddress || entry.peerAddress || '' : '') participants: entry && item.showContactAddress && sipAddress == '' && entry.isOneToOne && entry.participants ? entry.participants.addressesToString : '' - username: avatar.username + username: item.username } ContactMessageCounter { diff --git a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml index f1161b46c..6111799bf 100644 --- a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml +++ b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml @@ -252,7 +252,7 @@ Rectangle { } } Icon{ - icon:'timer' + icon: modelData.selected ? 'timer_light' : 'timer' iconSize: 15 anchors.right:parent.right anchors.bottom:parent.bottom