mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 03:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix binding loop on popup button closed

Browse source 
remove debug

do not force declining call when user in do not disturb status #LINQT-2129 #LINQT-2171

do not handle chat notifications when chat disabled

change transfer direction (transfer paused call to current) #LINQT-2211

fix chat message image size in call #LINQT-2142

update translations

fix crash

remove auto switch audio device to avoid binding loop
This commit is contained in:
Gaelle Braud 2025-11-25 11:00:43 +01:00
parent 37db390d5c
commit 7c2e9f6c12
13 changed files with 170 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Linphone/core/notifier/Notifier.cpp
View file

@ -288,9 +288,6 @@ void Notifier::notifyReceivedCall(const shared_ptr<linphone::Call> &call) {
auto voicemailAddress = linphone::Factory::get()->createAddress(
Utils::appStringToCoreString(accountModel->getVoicemailAddress()));
if (voicemailAddress) call->transferTo(voicemailAddress);
} else {
lInfo() << log().arg("Declining call.");
call->decline(linphone::Reason::Busy);
}
return;
}

2
Linphone/core/participant/ParticipantInfoList.cpp
View file

@ -48,7 +48,7 @@ ParticipantInfoList::~ParticipantInfoList() {
void ParticipantInfoList::setChatCore(const QSharedPointer<ChatCore> &chatCore) {
mustBeInMainThread(log().arg(Q_FUNC_INFO));
if (mChatCore) disconnect(mChatCore.get());
if (mChatCore) disconnect(mChatCore.get(), &ChatCore::participantsChanged, this, nullptr);
mChatCore = chatCore;
lDebug() << "[ParticipantInfoList] : set Chat " << mChatCore.get();
clearData();

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

@ -104,43 +104,43 @@
<context>
<name>AccountManager</name>
<message>
<location filename="../../model/account/AccountManager.cpp" line="101"/>
<location filename="../../model/account/AccountManager.cpp" line="93"/>
<source>assistant_account_login_already_connected_error</source>
<extracomment>&quot;The account is already connected&quot;</extracomment>
<translation>Das Konto ist bereits verbunden</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="123"/>
<location filename="../../model/account/AccountManager.cpp" line="115"/>
<source>assistant_account_login_proxy_address_error</source>
<extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment>
<translation>Proxy-Adresse konnte nicht erstellt werden. Bitte überprüfen Sie den Domänenname.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="136"/>
<location filename="../../model/account/AccountManager.cpp" line="128"/>
<source>assistant_account_login_address_configuration_error</source>
<extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment>
<translation>Folgende Adresse konnte nicht konfiguriert werden: `%1`.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="143"/>
<location filename="../../model/account/AccountManager.cpp" line="135"/>
<source>assistant_account_login_params_configuration_error</source>
<extracomment>&quot;Unable to configure account settings.&quot;</extracomment>
<translation>Kontoeinstellungen konnten nicht konfiguriert werden.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="167"/>
<location filename="../../model/account/AccountManager.cpp" line="159"/>
<source>assistant_account_login_forbidden_error</source>
<extracomment>&quot;Username and password do not match&quot;</extracomment>
<translation>Benutzername und Passwort stimmen nicht überein</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="169"/>
<location filename="../../model/account/AccountManager.cpp" line="161"/>
<source>assistant_account_login_error</source>
<extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment>
<translation>Fehler bei der Verbindung</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="183"/>
<location filename="../../model/account/AccountManager.cpp" line="175"/>
<source>assistant_account_add_error</source>
<extracomment>&quot;Unable to add account.&quot;</extracomment>
<translation>Konto konnte nicht hinzugefügt werden.</translation>
@ -1142,67 +1142,67 @@
<context>
<name>CallModel</name>
<message>
<location filename="../../model/call/CallModel.cpp" line="359"/>
<location filename="../../model/call/CallModel.cpp" line="361"/>
<source>call_error_no_response_toast</source>
<extracomment>&quot;No response&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="363"/>
<location filename="../../model/call/CallModel.cpp" line="365"/>
<source>call_error_forbidden_resource_toast</source>
<extracomment>&quot;403 : Forbidden resource&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="367"/>
<location filename="../../model/call/CallModel.cpp" line="369"/>
<source>call_error_not_answered_toast</source>
<extracomment>&quot;Request timeout&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="371"/>
<location filename="../../model/call/CallModel.cpp" line="373"/>
<source>call_error_user_declined_toast</source>
<extracomment>&quot;User declined the call&quot;</extracomment>
<translation>Der Benutzer hat den Anruf abgelehnt</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="375"/>
<location filename="../../model/call/CallModel.cpp" line="377"/>
<source>call_error_user_not_found_toast</source>
<extracomment>&quot;User was not found&quot;</extracomment>
<translation>Benutzer nicht gefunden</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="379"/>
<location filename="../../model/call/CallModel.cpp" line="381"/>
<source>call_error_user_busy_toast</source>
<extracomment>&quot;User is busy&quot;</extracomment>
<translation>Der Benutzer ist beschäftigt</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="383"/>
<location filename="../../model/call/CallModel.cpp" line="385"/>
<source>call_error_incompatible_media_params_toast</source>
<extracomment>&quot;User can&amp;apos;t accept your call&quot;</extracomment>
<translation>Der Benutzer kann Ihren Anruf nicht annehmen</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="387"/>
<location filename="../../model/call/CallModel.cpp" line="389"/>
<source>call_error_io_error_toast</source>
<extracomment>&quot;Unavailable service or network error&quot;</extracomment>
<translation>Dienst nicht verfügbar oder Netzwerkfehler</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="391"/>
<location filename="../../model/call/CallModel.cpp" line="393"/>
<source>call_error_do_not_disturb_toast</source>
<extracomment>&quot;Le correspondant ne peut être dérangé&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="395"/>
<location filename="../../model/call/CallModel.cpp" line="397"/>
<source>call_error_temporarily_unavailable_toast</source>
<extracomment>&quot;Temporarily unavailable&quot;</extracomment>
<translation>Vorübergehend nicht verfügbar</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="399"/>
<location filename="../../model/call/CallModel.cpp" line="401"/>
<source>call_error_server_timeout_toast</source>
<extracomment>&quot;Server tiemout&quot;</extracomment>
<translation>Server-Zeitüberschreitung</translation>
@ -2179,25 +2179,25 @@
<context>
<name>ChatMessage</name>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="431"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="432"/>
<source>chat_message_copy_selection</source>
<extracomment>&quot;Copy selection&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="433"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="434"/>
<source>chat_message_copy</source>
<extracomment>&quot;Copy&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="441"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="442"/>
<source>chat_message_copied_to_clipboard_title</source>
<extracomment>Copied</extracomment>
<translation>Kopiert</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="443"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<source>chat_message_copied_to_clipboard_toast</source>
<extracomment>&quot;to clipboard&quot;</extracomment>
<translation type="unfinished"></translation>
@ -2233,25 +2233,25 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="406"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="407"/>
<source>chat_message_reception_info</source>
<extracomment>&quot;Reception info&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="418"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<source>chat_message_reply</source>
<extracomment>Reply</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="450"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="451"/>
<source>chat_message_forward</source>
<extracomment>Forward</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="467"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="468"/>
<source>chat_message_delete</source>
<extracomment>&quot;Delete&quot;</extracomment>
<translation>Löschen</translation>
@ -2567,32 +2567,32 @@ Error</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="255"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="253"/>
<source>chat_action_start_new_chat</source>
<extracomment>&quot;New chat&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="293"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="291"/>
<source>chat_start_group_chat_title</source>
<extracomment>&quot;Nouveau groupe&quot;</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="295"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="293"/>
<source>chat_action_start_group_chat</source>
<extracomment>&quot;Créer&quot;</extracomment>
<translation>Erstellen</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="339"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="309"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="332"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="337"/>
<source>information_popup_error_title</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="313"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
<source>information_popup_chat_creation_failed_message</source>
<extracomment>&quot;La création a échoué&quot;</extracomment>
<translation type="unfinished"></translation>
@ -2603,25 +2603,25 @@ Error</extracomment>
<translation type="obsolete">Der Codec konnte nicht installiert werden.</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="331"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="329"/>
<source>group_chat_error_must_have_name</source>
<extracomment>&quot;Un nom doit être donné au groupe</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="336"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<source>group_chat_error_no_participant</source>
<extracomment>&quot;Please select at least one participant</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="341"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="339"/>
<source>group_call_error_not_connected</source>
<extracomment>&quot;Vous n&apos;etes pas connecté&quot;</extracomment>
<translation>Sie sind nicht verbunden</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="347"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="345"/>
<source>chat_creation_in_progress</source>
<extracomment>Creation de la conversation en cours …</extracomment>
<translation type="unfinished"></translation>
@ -5011,36 +5011,36 @@ Error</extracomment>
<context>
<name>Notifier</name>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="310"/>
<location filename="../../core/notifier/Notifier.cpp" line="307"/>
<source>new_call_alert_accessible_name</source>
<extracomment>New call from %1</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="364"/>
<location filename="../../core/notifier/Notifier.cpp" line="361"/>
<source>new_voice_message</source>
<extracomment>&apos;Voice message received!&apos; : message to warn the user in a notofication for voice messages.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="365"/>
<location filename="../../core/notifier/Notifier.cpp" line="362"/>
<source>new_file_message</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="368"/>
<location filename="../../core/notifier/Notifier.cpp" line="365"/>
<source>new_conference_invitation</source>
<extracomment>&apos;Conference invitation received!&apos; : Notification about receiving an invitation to a conference.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="389"/>
<location filename="../../core/notifier/Notifier.cpp" line="386"/>
<source>new_chat_room_messages</source>
<extracomment>&apos;New messages received!&apos; Notification that warn the user of new messages.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="417"/>
<location filename="../../core/notifier/Notifier.cpp" line="414"/>
<source>new_message_alert_accessible_name</source>
<extracomment>New message on chatroom %1</extracomment>
<translation type="unfinished"></translation>

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

@ -104,43 +104,43 @@
<context>
<name>AccountManager</name>
<message>
<location filename="../../model/account/AccountManager.cpp" line="101"/>
<location filename="../../model/account/AccountManager.cpp" line="93"/>
<source>assistant_account_login_already_connected_error</source>
<extracomment>&quot;The account is already connected&quot;</extracomment>
<translation>The account is already connected</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="123"/>
<location filename="../../model/account/AccountManager.cpp" line="115"/>
<source>assistant_account_login_proxy_address_error</source>
<extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment>
<translation>Unable to create proxy address. Please check the domain name.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="136"/>
<location filename="../../model/account/AccountManager.cpp" line="128"/>
<source>assistant_account_login_address_configuration_error</source>
<extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment>
<translation>Unable to configure address: `%1`.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="143"/>
<location filename="../../model/account/AccountManager.cpp" line="135"/>
<source>assistant_account_login_params_configuration_error</source>
<extracomment>&quot;Unable to configure account settings.&quot;</extracomment>
<translation>Unable to configure account settings.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="167"/>
<location filename="../../model/account/AccountManager.cpp" line="159"/>
<source>assistant_account_login_forbidden_error</source>
<extracomment>&quot;Username and password do not match&quot;</extracomment>
<translation>Username and password do not match</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="169"/>
<location filename="../../model/account/AccountManager.cpp" line="161"/>
<source>assistant_account_login_error</source>
<extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment>
<translation>Error during connection</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="183"/>
<location filename="../../model/account/AccountManager.cpp" line="175"/>
<source>assistant_account_add_error</source>
<extracomment>&quot;Unable to add account.&quot;</extracomment>
<translation>Unable to add account.</translation>
@ -1137,67 +1137,67 @@
<context>
<name>CallModel</name>
<message>
<location filename="../../model/call/CallModel.cpp" line="359"/>
<location filename="../../model/call/CallModel.cpp" line="361"/>
<source>call_error_no_response_toast</source>
<extracomment>&quot;No response&quot;</extracomment>
<translation>No response</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="363"/>
<location filename="../../model/call/CallModel.cpp" line="365"/>
<source>call_error_forbidden_resource_toast</source>
<extracomment>&quot;403 : Forbidden resource&quot;</extracomment>
<translation>403 : Forbidden resource</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="367"/>
<location filename="../../model/call/CallModel.cpp" line="369"/>
<source>call_error_not_answered_toast</source>
<extracomment>&quot;Request timeout&quot;</extracomment>
<translation>Request timeout</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="371"/>
<location filename="../../model/call/CallModel.cpp" line="373"/>
<source>call_error_user_declined_toast</source>
<extracomment>&quot;User declined the call&quot;</extracomment>
<translation>User declined the call</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="375"/>
<location filename="../../model/call/CallModel.cpp" line="377"/>
<source>call_error_user_not_found_toast</source>
<extracomment>&quot;User was not found&quot;</extracomment>
<translation>User was not found</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="379"/>
<location filename="../../model/call/CallModel.cpp" line="381"/>
<source>call_error_user_busy_toast</source>
<extracomment>&quot;User is busy&quot;</extracomment>
<translation>User is busy</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="383"/>
<location filename="../../model/call/CallModel.cpp" line="385"/>
<source>call_error_incompatible_media_params_toast</source>
<extracomment>&quot;User can&amp;apos;t accept your call&quot;</extracomment>
<translation>User can&apos;t accept your call</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="387"/>
<location filename="../../model/call/CallModel.cpp" line="389"/>
<source>call_error_io_error_toast</source>
<extracomment>&quot;Unavailable service or network error&quot;</extracomment>
<translation>Unavailable service or network error</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="391"/>
<location filename="../../model/call/CallModel.cpp" line="393"/>
<source>call_error_do_not_disturb_toast</source>
<extracomment>&quot;Le correspondant ne peut être dérangé&quot;</extracomment>
<translation>User cannot be disturbed</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="395"/>
<location filename="../../model/call/CallModel.cpp" line="397"/>
<source>call_error_temporarily_unavailable_toast</source>
<extracomment>&quot;Temporarily unavailable&quot;</extracomment>
<translation>Temporarily unavailable</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="399"/>
<location filename="../../model/call/CallModel.cpp" line="401"/>
<source>call_error_server_timeout_toast</source>
<extracomment>&quot;Server tiemout&quot;</extracomment>
<translation>Server tiemout</translation>
@ -2156,25 +2156,25 @@
<context>
<name>ChatMessage</name>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="431"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="432"/>
<source>chat_message_copy_selection</source>
<extracomment>&quot;Copy selection&quot;</extracomment>
<translation>Copy selection</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="433"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="434"/>
<source>chat_message_copy</source>
<extracomment>&quot;Copy&quot;</extracomment>
<translation>Copy</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="441"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="442"/>
<source>chat_message_copied_to_clipboard_title</source>
<extracomment>Copied</extracomment>
<translation>Copied</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="443"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<source>chat_message_copied_to_clipboard_toast</source>
<extracomment>&quot;to clipboard&quot;</extracomment>
<translation>in clipboard</translation>
@ -2210,25 +2210,25 @@
<translation>You replied</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="406"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="407"/>
<source>chat_message_reception_info</source>
<extracomment>&quot;Reception info&quot;</extracomment>
<translation>Reception info</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="418"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<source>chat_message_reply</source>
<extracomment>Reply</extracomment>
<translation>Reply</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="450"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="451"/>
<source>chat_message_forward</source>
<extracomment>Forward</extracomment>
<translation>Forward</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="467"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="468"/>
<source>chat_message_delete</source>
<extracomment>&quot;Delete&quot;</extracomment>
<translation>Delete</translation>
@ -2541,56 +2541,56 @@ Only your correspondent can decrypt them.</translation>
<translation>No conversation in history</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="255"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="253"/>
<source>chat_action_start_new_chat</source>
<extracomment>&quot;New chat&quot;</extracomment>
<translation>New conversation</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="293"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="291"/>
<source>chat_start_group_chat_title</source>
<extracomment>&quot;Nouveau groupe&quot;</extracomment>
<translation>New group</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="295"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="293"/>
<source>chat_action_start_group_chat</source>
<extracomment>&quot;Créer&quot;</extracomment>
<translation>Create</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="339"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="309"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="332"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="337"/>
<source>information_popup_error_title</source>
<translation>Error</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="313"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
<source>information_popup_chat_creation_failed_message</source>
<extracomment>&quot;La création a échoué&quot;</extracomment>
<translation>Creation failed</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="331"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="329"/>
<source>group_chat_error_must_have_name</source>
<extracomment>&quot;Un nom doit être donné au groupe</extracomment>
<translation>A name must be set for the group</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="336"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<source>group_chat_error_no_participant</source>
<extracomment>&quot;Please select at least one participant</extracomment>
<translation>Please select at least one participant</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="341"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="339"/>
<source>group_call_error_not_connected</source>
<extracomment>&quot;Vous n&apos;etes pas connecté&quot;</extracomment>
<translation>You are not connected</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="347"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="345"/>
<source>chat_creation_in_progress</source>
<extracomment>Creation de la conversation en cours …</extracomment>
<translation>Chat creation pending…</translation>
@ -4918,36 +4918,36 @@ Expiration : %1</translation>
<context>
<name>Notifier</name>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="310"/>
<location filename="../../core/notifier/Notifier.cpp" line="307"/>
<source>new_call_alert_accessible_name</source>
<extracomment>New call from %1</extracomment>
<translation>New call from %1</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="364"/>
<location filename="../../core/notifier/Notifier.cpp" line="361"/>
<source>new_voice_message</source>
<extracomment>&apos;Voice message received!&apos; : message to warn the user in a notofication for voice messages.</extracomment>
<translation>Voice message received!</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="365"/>
<location filename="../../core/notifier/Notifier.cpp" line="362"/>
<source>new_file_message</source>
<translation>File received!</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="368"/>
<location filename="../../core/notifier/Notifier.cpp" line="365"/>
<source>new_conference_invitation</source>
<extracomment>&apos;Conference invitation received!&apos; : Notification about receiving an invitation to a conference.</extracomment>
<translation>Conference invitation received !</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="389"/>
<location filename="../../core/notifier/Notifier.cpp" line="386"/>
<source>new_chat_room_messages</source>
<extracomment>&apos;New messages received!&apos; Notification that warn the user of new messages.</extracomment>
<translation>New messages received !</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="417"/>
<location filename="../../core/notifier/Notifier.cpp" line="414"/>
<source>new_message_alert_accessible_name</source>
<extracomment>New message on chatroom %1</extracomment>
<translation>New message on chatroom %1</translation>

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

@ -104,43 +104,43 @@
<context>
<name>AccountManager</name>
<message>
<location filename="../../model/account/AccountManager.cpp" line="101"/>
<location filename="../../model/account/AccountManager.cpp" line="93"/>
<source>assistant_account_login_already_connected_error</source>
<extracomment>&quot;The account is already connected&quot;</extracomment>
<translation>Le compte est déjà connecté</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="123"/>
<location filename="../../model/account/AccountManager.cpp" line="115"/>
<source>assistant_account_login_proxy_address_error</source>
<extracomment>&quot;Unable to create proxy address. Please check the domain name.&quot;</extracomment>
<translation>Impossible de créer l&apos;adresse proxy. Merci de vérifier le nom de domaine.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="136"/>
<location filename="../../model/account/AccountManager.cpp" line="128"/>
<source>assistant_account_login_address_configuration_error</source>
<extracomment>&quot;Unable to configure address: `%1`.&quot;</extracomment>
<translation>Impossible de configurer l&apos;adresse : `%1`.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="143"/>
<location filename="../../model/account/AccountManager.cpp" line="135"/>
<source>assistant_account_login_params_configuration_error</source>
<extracomment>&quot;Unable to configure account settings.&quot;</extracomment>
<translation>Impossible de configurer les paramètres du compte.</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="167"/>
<location filename="../../model/account/AccountManager.cpp" line="159"/>
<source>assistant_account_login_forbidden_error</source>
<extracomment>&quot;Username and password do not match&quot;</extracomment>
<translation>Le couple identifiant mot de passe ne correspond pas</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="169"/>
<location filename="../../model/account/AccountManager.cpp" line="161"/>
<source>assistant_account_login_error</source>
<extracomment>&quot;Error during connection, please verify your parameters&quot;</extracomment>
<translation>Erreur durant la connexion, veuillez vérifier vos paramètres</translation>
</message>
<message>
<location filename="../../model/account/AccountManager.cpp" line="183"/>
<location filename="../../model/account/AccountManager.cpp" line="175"/>
<source>assistant_account_add_error</source>
<extracomment>&quot;Unable to add account.&quot;</extracomment>
<translation>Impossible d&apos;ajouter le compte.</translation>
@ -1137,67 +1137,67 @@
<context>
<name>CallModel</name>
<message>
<location filename="../../model/call/CallModel.cpp" line="359"/>
<location filename="../../model/call/CallModel.cpp" line="361"/>
<source>call_error_no_response_toast</source>
<extracomment>&quot;No response&quot;</extracomment>
<translation>Pas de réponse</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="363"/>
<location filename="../../model/call/CallModel.cpp" line="365"/>
<source>call_error_forbidden_resource_toast</source>
<extracomment>&quot;403 : Forbidden resource&quot;</extracomment>
<translation>403 : Forbidden resource</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="367"/>
<location filename="../../model/call/CallModel.cpp" line="369"/>
<source>call_error_not_answered_toast</source>
<extracomment>&quot;Request timeout&quot;</extracomment>
<translation>La requête a expiré</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="371"/>
<location filename="../../model/call/CallModel.cpp" line="373"/>
<source>call_error_user_declined_toast</source>
<extracomment>&quot;User declined the call&quot;</extracomment>
<translation>Le correspondant a décliné l&apos;appel</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="375"/>
<location filename="../../model/call/CallModel.cpp" line="377"/>
<source>call_error_user_not_found_toast</source>
<extracomment>&quot;User was not found&quot;</extracomment>
<translation>Le correspondant n&apos;a pas été trouvé</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="379"/>
<location filename="../../model/call/CallModel.cpp" line="381"/>
<source>call_error_user_busy_toast</source>
<extracomment>&quot;User is busy&quot;</extracomment>
<translation>Le correspondant est occupé</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="383"/>
<location filename="../../model/call/CallModel.cpp" line="385"/>
<source>call_error_incompatible_media_params_toast</source>
<extracomment>&quot;User can&amp;apos;t accept your call&quot;</extracomment>
<translation>Le correspondant ne peut accepter votre appel</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="387"/>
<location filename="../../model/call/CallModel.cpp" line="389"/>
<source>call_error_io_error_toast</source>
<extracomment>&quot;Unavailable service or network error&quot;</extracomment>
<translation>Service indisponible ou erreur réseau</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="391"/>
<location filename="../../model/call/CallModel.cpp" line="393"/>
<source>call_error_do_not_disturb_toast</source>
<extracomment>&quot;Le correspondant ne peut être dérangé&quot;</extracomment>
<translation>Le correspondant ne peut être dérangé</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="395"/>
<location filename="../../model/call/CallModel.cpp" line="397"/>
<source>call_error_temporarily_unavailable_toast</source>
<extracomment>&quot;Temporarily unavailable&quot;</extracomment>
<translation>Temporairement indisponible</translation>
</message>
<message>
<location filename="../../model/call/CallModel.cpp" line="399"/>
<location filename="../../model/call/CallModel.cpp" line="401"/>
<source>call_error_server_timeout_toast</source>
<extracomment>&quot;Server tiemout&quot;</extracomment>
<translation>Délai d&apos;attente du serveur dépassé</translation>
@ -2156,25 +2156,25 @@
<context>
<name>ChatMessage</name>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="431"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="432"/>
<source>chat_message_copy_selection</source>
<extracomment>&quot;Copy selection&quot;</extracomment>
<translation>Copier la sélection</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="433"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="434"/>
<source>chat_message_copy</source>
<extracomment>&quot;Copy&quot;</extracomment>
<translation>Copier</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="441"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="442"/>
<source>chat_message_copied_to_clipboard_title</source>
<extracomment>Copied</extracomment>
<translation>Copié</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="443"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="444"/>
<source>chat_message_copied_to_clipboard_toast</source>
<extracomment>&quot;to clipboard&quot;</extracomment>
<translation>dans le presse-papiers</translation>
@ -2210,25 +2210,25 @@
<translation>Vous avez répondu</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="406"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="407"/>
<source>chat_message_reception_info</source>
<extracomment>&quot;Reception info&quot;</extracomment>
<translation>Info de réception</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="418"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="419"/>
<source>chat_message_reply</source>
<extracomment>Reply</extracomment>
<translation>Répondre</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="450"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="451"/>
<source>chat_message_forward</source>
<extracomment>Forward</extracomment>
<translation>Transférer</translation>
</message>
<message>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="467"/>
<location filename="../../view/Control/Display/Chat/ChatMessage.qml" line="468"/>
<source>chat_message_delete</source>
<extracomment>&quot;Delete&quot;</extracomment>
<translation>Supprimer</translation>
@ -2541,56 +2541,56 @@ en bout. Seul votre correspondant peut les déchiffrer.</translation>
<translation>Aucune conversation dans votre historique</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="255"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="253"/>
<source>chat_action_start_new_chat</source>
<extracomment>&quot;New chat&quot;</extracomment>
<translation>Nouvelle conversation</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="293"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="291"/>
<source>chat_start_group_chat_title</source>
<extracomment>&quot;Nouveau groupe&quot;</extracomment>
<translation>Nouveau groupe</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="295"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="293"/>
<source>chat_action_start_group_chat</source>
<extracomment>&quot;Créer&quot;</extracomment>
<translation>Créer</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="339"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="309"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="332"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="337"/>
<source>information_popup_error_title</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="313"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
<source>information_popup_chat_creation_failed_message</source>
<extracomment>&quot;La création a échoué&quot;</extracomment>
<translation>La création a échoué</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="331"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="329"/>
<source>group_chat_error_must_have_name</source>
<extracomment>&quot;Un nom doit être donné au groupe</extracomment>
<translation>Un nom doit être donné au groupe</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="336"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="334"/>
<source>group_chat_error_no_participant</source>
<extracomment>&quot;Please select at least one participant</extracomment>
<translation>Veuillez sélectionner au moins un participant</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="341"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="339"/>
<source>group_call_error_not_connected</source>
<extracomment>&quot;Vous n&apos;etes pas connecté&quot;</extracomment>
<translation>Vous n&apos;êtes pas connecté</translation>
</message>
<message>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="347"/>
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="345"/>
<source>chat_creation_in_progress</source>
<extracomment>Creation de la conversation en cours …</extracomment>
<translation>Création de la conversation en cours…</translation>
@ -4918,36 +4918,36 @@ Expiration : %1</translation>
<context>
<name>Notifier</name>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="310"/>
<location filename="../../core/notifier/Notifier.cpp" line="307"/>
<source>new_call_alert_accessible_name</source>
<extracomment>New call from %1</extracomment>
<translation>Nouvel appel de %1</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="364"/>
<location filename="../../core/notifier/Notifier.cpp" line="361"/>
<source>new_voice_message</source>
<extracomment>&apos;Voice message received!&apos; : message to warn the user in a notofication for voice messages.</extracomment>
<translation>Message vocal reçu !</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="365"/>
<location filename="../../core/notifier/Notifier.cpp" line="362"/>
<source>new_file_message</source>
<translation>Fichier reçu !</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="368"/>
<location filename="../../core/notifier/Notifier.cpp" line="365"/>
<source>new_conference_invitation</source>
<extracomment>&apos;Conference invitation received!&apos; : Notification about receiving an invitation to a conference.</extracomment>
<translation>Nouvelle invitation à une conférence !</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="389"/>
<location filename="../../core/notifier/Notifier.cpp" line="386"/>
<source>new_chat_room_messages</source>
<extracomment>&apos;New messages received!&apos; Notification that warn the user of new messages.</extracomment>
<translation>Nouveaux messages reçus !</translation>
</message>
<message>
<location filename="../../core/notifier/Notifier.cpp" line="417"/>
<location filename="../../core/notifier/Notifier.cpp" line="414"/>
<source>new_message_alert_accessible_name</source>
<extracomment>New message on chatroom %1</extracomment>
<translation>Nouveau message sur la conversation %1</translation>

8
Linphone/model/account/AccountManager.cpp
View file

@ -65,14 +65,6 @@ bool AccountManager::login(QString username,
QString outboundProxyAddress,
QString connectionId) {
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
qDebug() << "login with parameters :";
qDebug() << "username" << username;
qDebug() << "password" << password;
qDebug() << "displayName" << displayName;
qDebug() << "domain" << domain;
qDebug() << "registrarUri" << registrarUri;
qDebug() << "outboundProxyAddress" << outboundProxyAddress;
qDebug() << "connectionId" << connectionId;
auto core = CoreModel::getInstance()->getCore();
auto factory = linphone::Factory::get();
QString assistantFile = (!QString::compare(domain, "sip.linphone.org", Qt::CaseInsensitive) || domain.isEmpty())

4
Linphone/model/call/CallModel.cpp
View file

@ -104,7 +104,9 @@ void CallModel::transferTo(const std::shared_ptr<linphone::Address> &address) {
void CallModel::transferToAnother(const std::shared_ptr<linphone::Call> &call) {
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
if (mMonitor->transferToAnother(call) == -1)
if (!call) return;
// Transfer paused call to current call
if (call->transferToAnother(mMonitor) == -1)
lWarning() << log()
.arg(QStringLiteral("Unable to transfer: `%1`."))
.arg(Utils::coreStringToAppString(call->getRemoteAddress()->asStringUriOnly()));

4
Linphone/model/core/CoreModel.cpp
View file

@ -546,6 +546,7 @@ void CoreModel::onLogCollectionUploadProgressIndication(const std::shared_ptr<li
void CoreModel::onMessageReceived(const std::shared_ptr<linphone::Core> &core,
const std::shared_ptr<linphone::ChatRoom> &room,
const std::shared_ptr<linphone::ChatMessage> &message) {
if (SettingsModel::getInstance()->getDisableChatFeature()) return;
if (message->isOutgoing()) return;
emit unreadNotificationsChanged();
std::list<std::shared_ptr<linphone::ChatMessage>> messages;
@ -558,6 +559,7 @@ void CoreModel::onMessageReceived(const std::shared_ptr<linphone::Core> &core,
void CoreModel::onMessagesReceived(const std::shared_ptr<linphone::Core> &core,
const std::shared_ptr<linphone::ChatRoom> &room,
const std::list<std::shared_ptr<linphone::ChatMessage>> &messages) {
if (SettingsModel::getInstance()->getDisableChatFeature()) return;
std::list<std::shared_ptr<linphone::ChatMessage>> finalMessages;
for (auto &message : messages) {
if (message->isOutgoing()) continue;
@ -575,6 +577,7 @@ void CoreModel::onNewMessageReaction(const std::shared_ptr<linphone::Core> &core
const std::shared_ptr<linphone::ChatRoom> &chatRoom,
const std::shared_ptr<linphone::ChatMessage> &message,
const std::shared_ptr<const linphone::ChatMessageReaction> &reaction) {
if (SettingsModel::getInstance()->getDisableChatFeature()) return;
emit newMessageReaction(core, chatRoom, message, reaction);
}
void CoreModel::onNotifyPresenceReceivedForUriOrTel(
@ -595,6 +598,7 @@ void CoreModel::onReactionRemoved(const std::shared_ptr<linphone::Core> &core,
const std::shared_ptr<linphone::ChatRoom> &chatRoom,
const std::shared_ptr<linphone::ChatMessage> &message,
const std::shared_ptr<const linphone::Address> &address) {
if (SettingsModel::getInstance()->getDisableChatFeature()) return;
emit reactionRemoved(core, chatRoom, message, address);
}
void CoreModel::onTransferStateChanged(const std::shared_ptr<linphone::Core> &core,

6
Linphone/model/setting/SettingsModel.cpp
View file

@ -91,9 +91,9 @@ SettingsModel::SettingsModel() {
[this](const std::shared_ptr<linphone::Core> &core, const std::shared_ptr<linphone::AudioDevice> &device) {
lInfo() << log().arg("audio device changed");
if (device) lInfo() << "device :" << device->getDeviceName();
emit playbackDeviceChanged(getPlaybackDevice());
emit captureDeviceChanged(getCaptureDevice());
emit ringerDeviceChanged(getRingerDevice());
// emit playbackDeviceChanged(getPlaybackDevice());
// emit captureDeviceChanged(getCaptureDevice());
// emit ringerDeviceChanged(getRingerDevice());
});
}

1
Linphone/view/Control/Button/PopupButton.qml
View file

@ -55,6 +55,7 @@ Button {
}
function _getPreviousItem(content, index) {
if (!content.visible) return null
if (content.visibleChildren.length == 0 || !hasFocusableChild(content))
return null;
--index;

1
Linphone/view/Control/Display/Chat/ChatMessage.qml
View file

@ -254,6 +254,7 @@ Control.Control {
chatGui: mainItem.chat
searchedTextPart: mainItem.searchedTextPart
chatMessageGui: mainItem.chatMessage
maxWidth: mainItem.maxWidth
onMouseEvent: (event) => {
mainItem.handleDefaultMouseEvent(event)
}

11
Linphone/view/Control/Display/Chat/ChatMessageContent.qml
View file

@ -30,9 +30,9 @@ ColumnLayout {
property string searchedTextPart
property int fileBorderWidth : 0
property int maxWidth
spacing: Utils.getSizeWithScreenRatio(5)
property int padding: Utils.getSizeWithScreenRatio(10)
property ChatMessageContentProxy filescontentProxy: ChatMessageContentProxy {
filterType: ChatMessageContentProxy.FilterContentType.File
@ -86,7 +86,7 @@ ColumnLayout {
contentGui: mainItem.filescontentProxy.count === 1
? mainItem.filescontentProxy.getChatMessageContentAtIndex(0)
: null
width: Utils.getSizeWithScreenRatio(285)
Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
fillMode: Image.PreserveAspectFit
}
@ -96,7 +96,7 @@ ColumnLayout {
contentGui: mainItem.filescontentProxy.count === 1
? mainItem.filescontentProxy.getChatMessageContentAtIndex(0)
: null
Layout.preferredWidth: Utils.getSizeWithScreenRatio(285)
Layout.fillWidth: true
Layout.preferredHeight: paintedHeight
Layout.alignment: Qt.AlignHCenter
fillMode: Image.PreserveAspectFit
@ -107,8 +107,9 @@ ColumnLayout {
contentGui: mainItem.filescontentProxy.count === 1
? mainItem.filescontentProxy.getChatMessageContentAtIndex(0)
: null
width: Utils.getSizeWithScreenRatio(285)
height: Utils.getSizeWithScreenRatio(285)
Layout.fillWidth: true
width: Math.min(Utils.getSizeWithScreenRatio(285), mainItem.maxWidth)
height: Math.min(Utils.getSizeWithScreenRatio(285), mainItem.maxWidth)
Layout.preferredWidth: videoOutput.contentRect.width
Layout.preferredHeight: videoOutput.contentRect.height
Layout.alignment: Qt.AlignHCenter

44
Linphone/view/Page/Window/Call/CallsWindow.qml
View file

@ -786,29 +786,29 @@ AbstractWindow {
searchBarBorderColor: DefaultStyle.grey_200
searchBarRightMaring: 0
onContactClicked: contact => {
var callsWin = UtilsCpp.getCallsWindow()
if (contact)
//: "Confirmer le transfert"
callsWin.showConfirmationLambdaPopup(qsTr("call_transfer_confirm_dialog_tittle"),
//: "Vous allez transférer %1 à %2."
qsTr("call_transfer_confirm_dialog_message").arg(mainWindow.call.core.remoteName).arg(contact.core.fullName), "",
function (confirmed) {
if (confirmed) {
mainWindow.transferCallToContact(mainWindow.call,contact,newCallForm)
}
})
}
var callsWin = UtilsCpp.getCallsWindow()
if (contact)
//: "Confirmer le transfert"
callsWin.showConfirmationLambdaPopup(qsTr("call_transfer_confirm_dialog_tittle"),
//: "Vous allez transférer %1 à %2."
qsTr("call_transfer_confirm_dialog_message").arg(mainWindow.call.core.remoteName).arg(contact.core.fullName), "",
function (confirmed) {
if (confirmed) {
mainWindow.transferCallToContact(mainWindow.call,contact,newCallForm)
}
})
}
onTransferCallToAnotherRequested: dest => {
var callsWin = UtilsCpp.getCallsWindow()
console.log("transfer to",dest)
callsWin.showConfirmationLambdaPopup(qsTr("call_transfer_confirm_dialog_tittle"),
qsTr("call_transfer_confirm_dialog_message").arg(mainWindow.call.core.remoteName).arg(dest.core.remoteName),"",
function (confirmed) {
if (confirmed) {
mainWindow.call.core.lTransferCallToAnother(dest.core.remoteAddress)
}
})
}
var callsWin = UtilsCpp.getCallsWindow()
console.log("transfer to",dest)
callsWin.showConfirmationLambdaPopup(qsTr("call_transfer_confirm_dialog_tittle"),
qsTr("call_transfer_confirm_dialog_message").arg(mainWindow.call.core.remoteName).arg(dest.core.remoteName),"",
function (confirmed) {
if (confirmed) {
mainWindow.call.core.lTransferCallToAnother(dest.core.remoteAddress)
}
})
}
numPadPopup: numPadPopup
NumericPadPopup {