data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
Gaelle Braud 2025-01-02 09:55:59 +01:00
parent f1fb447fa3
commit eb8c95f192
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/view/Control/Container/Call/CallHistoryLayout.qml
View file

@ -73,7 +73,7 @@ ColumnLayout {
width: 100 * DefaultStyle.dp width: 100 * DefaultStyle.dp
height: 100 * DefaultStyle.dp height: 100 * DefaultStyle.dp
contact: mainItem.contact || null contact: mainItem.contact || null
isConferenceInfo: mainItem.conferenceInfo isConference: !!mainItem.conferenceInfo
_address: mainItem.conferenceInfo _address: mainItem.conferenceInfo
? mainItem.conferenceInfo.core.subject ? mainItem.conferenceInfo.core.subject
: mainItem.contactAddress || mainItem.contactName : mainItem.contactAddress || mainItem.contactName

2
Linphone/view/Control/Container/Call/CallLayout.qml
View file

@ -16,7 +16,7 @@ Item {
property bool callTerminatedByUser: false property bool callTerminatedByUser: false
property bool callStarted: call?.core.isStarted property bool callStarted: call?.core.isStarted
readonly property var callState: call? call.core.state : undefined readonly property var callState: call? call.core.state : undefined
property int conferenceLayout: call && call.core.conferenceVideoLayout || LinphoneEnums.ConferenceLayout.ActiveSpeaker property int conferenceLayout: call ? call.core.conferenceVideoLayout : LinphoneEnums.ConferenceLayout.ActiveSpeaker
// property int participantDeviceCount: conference ? conference.core.participantDeviceCount : -1 // property int participantDeviceCount: conference ? conference.core.participantDeviceCount : -1
// onParticipantDeviceCountChanged: { // onParticipantDeviceCountChanged: {
// setConferenceLayout() // setConferenceLayout()

2
Linphone/view/Control/Display/Call/CallListView.qml
View file

@ -31,7 +31,7 @@ ListView {
Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredWidth: 45 * DefaultStyle.dp
Layout.preferredHeight: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * DefaultStyle.dp
_address: modelData.core.remoteAddress _address: modelData.core.remoteAddress
isConferenceInfo: modelData.core.isConference isConference: modelData.core.isConference
} }
ColumnLayout { ColumnLayout {
spacing: 0 spacing: 0

6
Linphone/view/Control/Display/Contact/Avatar.qml
View file

@ -15,7 +15,7 @@ Loader{
property AccountGui account: null property AccountGui account: null
property FriendGui contact: null property FriendGui contact: null
property CallGui call: null property CallGui call: null
property bool isConferenceInfo: false property bool isConference: false
property string _address: account property string _address: account
? account.core?.identityAddress || "" ? account.core?.identityAddress || ""
: call : call
@ -144,7 +144,7 @@ Loader{
width: height width: height
Rectangle { Rectangle {
id: initialItem id: initialItem
property string initials: mainItem.isConferenceInfo ? "" : UtilsCpp.getInitials(mainItem.displayNameVal) property string initials: mainItem.isConference ? "" : UtilsCpp.getInitials(mainItem.displayNameVal)
radius: width / 2 radius: width / 2
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
height: stackView.height height: stackView.height
@ -166,7 +166,7 @@ Loader{
visible: initialItem.initials == '' visible: initialItem.initials == ''
width: stackView.width/2 width: stackView.width/2
height: width height: width
source: mainItem.isConferenceInfo ? AppIcons.usersThree : AppIcons.profile source: mainItem.isConference ? AppIcons.usersThree : AppIcons.profile
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
anchors.centerIn: parent anchors.centerIn: parent

2
Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
View file

@ -64,7 +64,7 @@ Notification {
Layout.preferredHeight: 60 * DefaultStyle.dp Layout.preferredHeight: 60 * DefaultStyle.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
call: mainItem.call call: mainItem.call
isConferenceInfo: mainItem.call && mainItem.call.core.isConference isConference: mainItem.call && mainItem.call.core.isConference
} }
ColumnLayout { ColumnLayout {
spacing: 0 spacing: 0

2
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -305,7 +305,7 @@ AbstractMainPage {
_address: modelData.core.remoteAddress _address: modelData.core.remoteAddress
width: 45 * DefaultStyle.dp width: 45 * DefaultStyle.dp
height: 45 * DefaultStyle.dp height: 45 * DefaultStyle.dp
isConferenceInfo: modelData.core.isConference isConference: modelData.core.isConference
} }
ColumnLayout { ColumnLayout {
Layout.fillHeight: true Layout.fillHeight: true