mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-23 21:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix paused avatar.

Browse source 
Fix getting old design on incoming call.
Fix  "alone conference" message on one-one.
Fix complex address display with tags in wiating room and incall.
This commit is contained in:
Julien Wadel 2022-09-20 19:00:56 +02:00
parent 1d745e439e
commit 4fcb0110d0
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
View file

@ -42,7 +42,7 @@ Avatar {
return null; return null;
} }
username: _username ? _username : '' username: !mainItem.isPaused && _username ? _username : ''
Text { Text {
anchors.fill: parent anchors.fill: parent
color: CallStyle.container.pause.text.color color: CallStyle.container.pause.text.color

4
linphone-app/ui/views/App/Calls/CallsWindow.js
View file

@ -86,8 +86,8 @@ function getContent (call, conferenceInfoModel) {
} }
var CallModel = Linphone.CallModel var CallModel = Linphone.CallModel
if (status === CallModel.CallStatusIncoming) { if (status === CallModel.CallStatusIncoming) {
console.log("incomingCall") console.log("waitingRoom")
return incomingCall return waitingRoom
} }
if( window.conferenceInfoModel != call.conferenceInfoModel) { if( window.conferenceInfoModel != call.conferenceInfoModel) {
Qt.callLater(function(){window.conferenceInfoModel = call.conferenceInfoModel}) Qt.callLater(function(){window.conferenceInfoModel = call.conferenceInfoModel})

7
linphone-app/ui/views/App/Calls/Incall.qml
View file

@ -48,7 +48,7 @@ Rectangle {
&& conferenceLayout.item && conferenceLayout.status == Loader.Ready && conferenceLayout.item && conferenceLayout.status == Loader.Ready
function updateMessageBanner(){ function updateMessageBanner(){
//: ''You are alone in this conference' : Text in message banner when the user is the only participant. //: ''You are alone in this conference' : Text in message banner when the user is the only participant.
if( isReady && participantCount <= 1) messageBanner.noticeBannerText = qsTr('aloneInConference') if( conferenceModel && isReady && participantCount <= 1) messageBanner.noticeBannerText = qsTr('aloneInConference')
} }
Timer{ Timer{
id: delayMessageBanner id: delayMessageBanner
@ -183,11 +183,12 @@ Rectangle {
// Title // Title
Item{ Item{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: title.contentHeight Layout.preferredHeight: title.contentHeight + address.contentHeight
ColumnLayout{ ColumnLayout{
anchors.fill: parent anchors.fill: parent
Text{ Text{
id: title id: title
Layout.alignment: Qt.AlignHCenter
Timer{ Timer{
id: elapsedTimeRefresher id: elapsedTimeRefresher
running: true running: true
@ -215,7 +216,7 @@ Rectangle {
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter
visible: !conferenceModel && callModel && !callModel.isConference visible: !conferenceModel && callModel && !callModel.isConference
text: !conferenceModel && callModel text: !conferenceModel && callModel
? callModel.peerAddress ? SipAddressesModel.cleanSipAddress(callModel.peerAddress)
: '' : ''
color: IncallStyle.title.color color: IncallStyle.title.color
font.pointSize: IncallStyle.title.addressPointSize font.pointSize: IncallStyle.title.addressPointSize

2
linphone-app/ui/views/App/Calls/WaitingRoom.qml
View file

@ -201,7 +201,7 @@ Rectangle {
} }
Text{ Text{
Layout.fillWidth: true Layout.fillWidth: true
text: mainItem.callModel && mainItem.callModel.peerAddress text: mainItem.callModel && SipAddressesModel.cleanSipAddress(mainItem.callModel.peerAddress)
color: WaitingRoomStyle.callee.color color: WaitingRoomStyle.callee.color
font.pointSize: WaitingRoomStyle.callee.addressPointSize font.pointSize: WaitingRoomStyle.callee.addressPointSize
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter