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

auto select current conference when model reset (conf scheduler send Ready signal then conferenceInfoReceived makes conf info list update)

Browse source 
fix crash
This commit is contained in:
Gaelle Braud 2025-12-12 15:27:18 +01:00
parent 2320cc7444
commit c31def74fe
5 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/core/participant/ParticipantDeviceProxy.cpp
View file

@ -63,8 +63,8 @@ void ParticipantDeviceProxy::setCurrentCall(CallGui *call) {
mCurrentCall = call; mCurrentCall = call;
if (mCurrentCall) callCore = mCurrentCall->getCore(); if (mCurrentCall) callCore = mCurrentCall->getCore();
if (callCore) { if (callCore) {
connect(callCore, &CallCore::conferenceChanged, mParticipants.get(), [this]() { connect(callCore, &CallCore::conferenceChanged, mParticipants.get(), [this, callCore]() {
auto conference = mCurrentCall->getCore()->getConferenceCore(); auto conference = callCore->getConferenceCore();
lDebug() << log().arg("Set conference") << this << " => " << conference; lDebug() << log().arg("Set conference") << this << " => " << conference;
mParticipants->setConferenceModel(conference ? conference->getModel() : nullptr); mParticipants->setConferenceModel(conference ? conference->getModel() : nullptr);
}); });

6
Linphone/data/languages/de.ts
View file

@ -4625,19 +4625,19 @@ Ablauf: %1</translation>
<context> <context>
<name>MeetingListView</name> <name>MeetingListView</name>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="274"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="277"/>
<source>meeting_info_cancelled</source> <source>meeting_info_cancelled</source>
<extracomment>&quot;Réunion annulée&quot;</extracomment> <extracomment>&quot;Réunion annulée&quot;</extracomment>
<translation>Besprechung abgesagt</translation> <translation>Besprechung abgesagt</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="298"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="301"/>
<source>meetings_list_no_meeting_for_today</source> <source>meetings_list_no_meeting_for_today</source>
<extracomment>&quot;Aucune réunion aujourd&apos;hui&quot;</extracomment> <extracomment>&quot;Aucune réunion aujourd&apos;hui&quot;</extracomment>
<translation>Heute keine Besprechungen</translation> <translation>Heute keine Besprechungen</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="332"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="335"/>
<source>meeting_info_delete</source> <source>meeting_info_delete</source>
<extracomment>&quot;Supprimer la réunion&quot;</extracomment> <extracomment>&quot;Supprimer la réunion&quot;</extracomment>
<translation>Besprechung löschen</translation> <translation>Besprechung löschen</translation>

6
Linphone/data/languages/en.ts
View file

@ -4523,19 +4523,19 @@ Expiration : %1</translation>
<context> <context>
<name>MeetingListView</name> <name>MeetingListView</name>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="274"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="277"/>
<source>meeting_info_cancelled</source> <source>meeting_info_cancelled</source>
<extracomment>&quot;Réunion annulée&quot;</extracomment> <extracomment>&quot;Réunion annulée&quot;</extracomment>
<translation>Meeting canceled</translation> <translation>Meeting canceled</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="298"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="301"/>
<source>meetings_list_no_meeting_for_today</source> <source>meetings_list_no_meeting_for_today</source>
<extracomment>&quot;Aucune réunion aujourd&apos;hui&quot;</extracomment> <extracomment>&quot;Aucune réunion aujourd&apos;hui&quot;</extracomment>
<translation>No meeting for today</translation> <translation>No meeting for today</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="332"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="335"/>
<source>meeting_info_delete</source> <source>meeting_info_delete</source>
<extracomment>&quot;Supprimer la réunion&quot;</extracomment> <extracomment>&quot;Supprimer la réunion&quot;</extracomment>
<translation>Delete meeting</translation> <translation>Delete meeting</translation>

6
Linphone/data/languages/fr.ts
View file

@ -4523,19 +4523,19 @@ Expiration : %1</translation>
<context> <context>
<name>MeetingListView</name> <name>MeetingListView</name>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="274"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="277"/>
<source>meeting_info_cancelled</source> <source>meeting_info_cancelled</source>
<extracomment>&quot;Réunion annulée&quot;</extracomment> <extracomment>&quot;Réunion annulée&quot;</extracomment>
<translation>Réunion annulée</translation> <translation>Réunion annulée</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="298"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="301"/>
<source>meetings_list_no_meeting_for_today</source> <source>meetings_list_no_meeting_for_today</source>
<extracomment>&quot;Aucune réunion aujourd&apos;hui&quot;</extracomment> <extracomment>&quot;Aucune réunion aujourd&apos;hui&quot;</extracomment>
<translation>Aucune réunion aujourd&apos;hui</translation> <translation>Aucune réunion aujourd&apos;hui</translation>
</message> </message>
<message> <message>
<location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="332"/> <location filename="../../view/Control/Display/Meeting/MeetingListView.qml" line="335"/>
<source>meeting_info_delete</source> <source>meeting_info_delete</source>
<extracomment>&quot;Supprimer la réunion&quot;</extracomment> <extracomment>&quot;Supprimer la réunion&quot;</extracomment>
<translation>Supprimer la réunion</translation> <translation>Supprimer la réunion</translation>

5
Linphone/view/Control/Display/Meeting/MeetingListView.qml
View file

@ -16,6 +16,7 @@ ListView {
property bool hoverEnabled: true property bool hoverEnabled: true
property var delegateButtons property var delegateButtons
property ConferenceInfoGui selectedConference property ConferenceInfoGui selectedConference
property ConferenceInfoGui confToBeSelected: null
property bool _moveToIndex: false property bool _moveToIndex: false
property bool loading: false property bool loading: false
property real busyIndicatorSize: Utils.getSizeWithScreenRatio(60) property real busyIndicatorSize: Utils.getSizeWithScreenRatio(60)
@ -102,11 +103,13 @@ ListView {
initialDisplayItems: Math.max(20, Math.round(2 * mainItem.height / Utils.getSizeWithScreenRatio(63))) initialDisplayItems: Math.max(20, Math.round(2 * mainItem.height / Utils.getSizeWithScreenRatio(63)))
displayItemsStep: initialDisplayItems/2 displayItemsStep: initialDisplayItems/2
onModelAboutToBeReset: { onModelAboutToBeReset: {
mainItem.confToBeSelected = mainItem.selectedConference
mainItem.loading = true mainItem.loading = true
} }
onModelReset: { onModelReset: {
mainItem.loading = false mainItem.loading = false
selectData(getCurrentDateConfInfo()) if (mainItem.confToBeSelected) selectData(mainItem.confToBeSelected)
else selectData(getCurrentDateConfInfo())
} }
function selectData(confInfoGui){ function selectData(confInfoGui){
mainItem.currentIndex = loadUntil(confInfoGui) mainItem.currentIndex = loadUntil(confInfoGui)