fix display name in call notification #LINQT-1928
This commit is contained in:
parent
13ef034516
commit
f974a78fb9
7 changed files with 77 additions and 67 deletions
|
|
@ -299,10 +299,14 @@ void Notifier::notifyReceivedCall(const shared_ptr<linphone::Call> &call) {
|
||||||
auto model = CallCore::create(call);
|
auto model = CallCore::create(call);
|
||||||
auto gui = new CallGui(model);
|
auto gui = new CallGui(model);
|
||||||
gui->moveToThread(App::getInstance()->thread());
|
gui->moveToThread(App::getInstance()->thread());
|
||||||
App::postCoreAsync([this, gui]() {
|
QString displayName = call->getCallLog() && call->getCallLog()->getConferenceInfo()
|
||||||
|
? Utils::coreStringToAppString(call->getCallLog()->getConferenceInfo()->getSubject())
|
||||||
|
: Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName());
|
||||||
|
App::postCoreAsync([this, gui, displayName]() {
|
||||||
mustBeInMainThread(getClassName());
|
mustBeInMainThread(getClassName());
|
||||||
QVariantMap map;
|
QVariantMap map;
|
||||||
|
|
||||||
|
map["displayName"].setValue(displayName);
|
||||||
map["call"].setValue(gui);
|
map["call"].setValue(gui);
|
||||||
CREATE_NOTIFICATION(Notifier::ReceivedCall, map)
|
CREATE_NOTIFICATION(Notifier::ReceivedCall, map)
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2143,79 +2143,79 @@ Error</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="70"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="69"/>
|
||||||
<source>chat_dialog_delete_chat_title</source>
|
<source>chat_dialog_delete_chat_title</source>
|
||||||
<extracomment>Supprimer la conversation ?</extracomment>
|
<extracomment>Supprimer la conversation ?</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="72"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="71"/>
|
||||||
<source>chat_dialog_delete_chat_message</source>
|
<source>chat_dialog_delete_chat_message</source>
|
||||||
<extracomment>"La conversation et tous ses messages seront supprimés."</extracomment>
|
<extracomment>"La conversation et tous ses messages seront supprimés."</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="101"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="100"/>
|
||||||
<source>chat_list_title</source>
|
<source>chat_list_title</source>
|
||||||
<extracomment>"Conversations"</extracomment>
|
<extracomment>"Conversations"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="122"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="121"/>
|
||||||
<source>menu_mark_all_as_read</source>
|
<source>menu_mark_all_as_read</source>
|
||||||
<extracomment>"mark all as read"</extracomment>
|
<extracomment>"mark all as read"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="153"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="152"/>
|
||||||
<source>chat_search_in_history</source>
|
<source>chat_search_in_history</source>
|
||||||
<extracomment>"Rechercher une conversation"</extracomment>
|
<extracomment>"Rechercher une conversation"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="176"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="175"/>
|
||||||
<source>list_filter_no_result_found</source>
|
<source>list_filter_no_result_found</source>
|
||||||
<extracomment>"Aucun résultat…"</extracomment>
|
<extracomment>"Aucun résultat…"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="178"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="177"/>
|
||||||
<source>chat_list_empty_history</source>
|
<source>chat_list_empty_history</source>
|
||||||
<extracomment>"Aucune conversation dans votre historique"</extracomment>
|
<extracomment>"Aucune conversation dans votre historique"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="247"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="246"/>
|
||||||
<source>chat_action_start_new_chat</source>
|
<source>chat_action_start_new_chat</source>
|
||||||
<extracomment>"New chat"</extracomment>
|
<extracomment>"New chat"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="283"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="282"/>
|
||||||
<source>chat_start_group_chat_title</source>
|
<source>chat_start_group_chat_title</source>
|
||||||
<extracomment>"Nouveau groupe"</extracomment>
|
<extracomment>"Nouveau groupe"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="285"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="284"/>
|
||||||
<source>chat_action_start_group_chat</source>
|
<source>chat_action_start_group_chat</source>
|
||||||
<extracomment>"Créer"</extracomment>
|
<extracomment>"Créer"</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="310"/>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="315"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="314"/>
|
||||||
<source>information_popup_error_title</source>
|
<source>information_popup_error_title</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="313"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="312"/>
|
||||||
<source>group_chat_error_must_have_name</source>
|
<source>group_chat_error_must_have_name</source>
|
||||||
<extracomment>"Un nom doit être donné au groupe</extracomment>
|
<extracomment>"Un nom doit être donné au groupe</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="317"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="316"/>
|
||||||
<source>group_call_error_not_connected</source>
|
<source>group_call_error_not_connected</source>
|
||||||
<extracomment>"Vous n'etes pas connecté"</extracomment>
|
<extracomment>"Vous n'etes pas connecté"</extracomment>
|
||||||
<translation type="unfinished">Sie sind nicht verbunden</translation>
|
<translation type="unfinished">Sie sind nicht verbunden</translation>
|
||||||
|
|
@ -4303,19 +4303,19 @@ Error</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>NotificationReceivedCall</name>
|
<name>NotificationReceivedCall</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="90"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="93"/>
|
||||||
<source>call_audio_incoming</source>
|
<source>call_audio_incoming</source>
|
||||||
<extracomment>"Appel entrant"</extracomment>
|
<extracomment>"Appel entrant"</extracomment>
|
||||||
<translation>Eingehender Anruf</translation>
|
<translation>Eingehender Anruf</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="113"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="116"/>
|
||||||
<source>dialog_accept</source>
|
<source>dialog_accept</source>
|
||||||
<extracomment>"Accepter"</extracomment>
|
<extracomment>"Accepter"</extracomment>
|
||||||
<translation>Akzeptieren</translation>
|
<translation>Akzeptieren</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="131"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="134"/>
|
||||||
<source>dialog_deny</source>
|
<source>dialog_deny</source>
|
||||||
<extracomment>"Refuser</extracomment>
|
<extracomment>"Refuser</extracomment>
|
||||||
<translation>Ablehnen</translation>
|
<translation>Ablehnen</translation>
|
||||||
|
|
@ -4324,24 +4324,24 @@ Error</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>Notifier</name>
|
<name>Notifier</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="351"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="355"/>
|
||||||
<source>new_voice_message</source>
|
<source>new_voice_message</source>
|
||||||
<extracomment>'Voice message received!' : message to warn the user in a notofication for voice messages.</extracomment>
|
<extracomment>'Voice message received!' : message to warn the user in a notofication for voice messages.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="352"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="356"/>
|
||||||
<source>new_file_message</source>
|
<source>new_file_message</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="355"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="359"/>
|
||||||
<source>new_conference_invitation</source>
|
<source>new_conference_invitation</source>
|
||||||
<extracomment>'Conference invitation received!' : Notification about receiving an invitation to a conference.</extracomment>
|
<extracomment>'Conference invitation received!' : Notification about receiving an invitation to a conference.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="371"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="375"/>
|
||||||
<source>new_chat_room_messages</source>
|
<source>new_chat_room_messages</source>
|
||||||
<extracomment>'New messages received!' Notification that warn the user of new messages.</extracomment>
|
<extracomment>'New messages received!' Notification that warn the user of new messages.</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
|
|
||||||
|
|
@ -2106,79 +2106,79 @@ Only your correspondent can decrypt them.</translation>
|
||||||
<translation>No conversation</translation>
|
<translation>No conversation</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="70"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="69"/>
|
||||||
<source>chat_dialog_delete_chat_title</source>
|
<source>chat_dialog_delete_chat_title</source>
|
||||||
<extracomment>Supprimer la conversation ?</extracomment>
|
<extracomment>Supprimer la conversation ?</extracomment>
|
||||||
<translation>Delete conversation ?</translation>
|
<translation>Delete conversation ?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="72"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="71"/>
|
||||||
<source>chat_dialog_delete_chat_message</source>
|
<source>chat_dialog_delete_chat_message</source>
|
||||||
<extracomment>"La conversation et tous ses messages seront supprimés."</extracomment>
|
<extracomment>"La conversation et tous ses messages seront supprimés."</extracomment>
|
||||||
<translation>This conversation and all its messages will be deleted.</translation>
|
<translation>This conversation and all its messages will be deleted.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="101"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="100"/>
|
||||||
<source>chat_list_title</source>
|
<source>chat_list_title</source>
|
||||||
<extracomment>"Conversations"</extracomment>
|
<extracomment>"Conversations"</extracomment>
|
||||||
<translation>Conversations</translation>
|
<translation>Conversations</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="122"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="121"/>
|
||||||
<source>menu_mark_all_as_read</source>
|
<source>menu_mark_all_as_read</source>
|
||||||
<extracomment>"mark all as read"</extracomment>
|
<extracomment>"mark all as read"</extracomment>
|
||||||
<translation>Mark all as read</translation>
|
<translation>Mark all as read</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="153"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="152"/>
|
||||||
<source>chat_search_in_history</source>
|
<source>chat_search_in_history</source>
|
||||||
<extracomment>"Rechercher une conversation"</extracomment>
|
<extracomment>"Rechercher une conversation"</extracomment>
|
||||||
<translation>Search for a chat</translation>
|
<translation>Search for a chat</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="176"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="175"/>
|
||||||
<source>list_filter_no_result_found</source>
|
<source>list_filter_no_result_found</source>
|
||||||
<extracomment>"Aucun résultat…"</extracomment>
|
<extracomment>"Aucun résultat…"</extracomment>
|
||||||
<translation>No result…</translation>
|
<translation>No result…</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="178"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="177"/>
|
||||||
<source>chat_list_empty_history</source>
|
<source>chat_list_empty_history</source>
|
||||||
<extracomment>"Aucune conversation dans votre historique"</extracomment>
|
<extracomment>"Aucune conversation dans votre historique"</extracomment>
|
||||||
<translation>No conversation in history</translation>
|
<translation>No conversation in history</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="247"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="246"/>
|
||||||
<source>chat_action_start_new_chat</source>
|
<source>chat_action_start_new_chat</source>
|
||||||
<extracomment>"New chat"</extracomment>
|
<extracomment>"New chat"</extracomment>
|
||||||
<translation>New conversation</translation>
|
<translation>New conversation</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="283"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="282"/>
|
||||||
<source>chat_start_group_chat_title</source>
|
<source>chat_start_group_chat_title</source>
|
||||||
<extracomment>"Nouveau groupe"</extracomment>
|
<extracomment>"Nouveau groupe"</extracomment>
|
||||||
<translation>New group</translation>
|
<translation>New group</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="285"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="284"/>
|
||||||
<source>chat_action_start_group_chat</source>
|
<source>chat_action_start_group_chat</source>
|
||||||
<extracomment>"Créer"</extracomment>
|
<extracomment>"Créer"</extracomment>
|
||||||
<translation>Create</translation>
|
<translation>Create</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="310"/>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="315"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="314"/>
|
||||||
<source>information_popup_error_title</source>
|
<source>information_popup_error_title</source>
|
||||||
<translation>Error</translation>
|
<translation>Error</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="313"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="312"/>
|
||||||
<source>group_chat_error_must_have_name</source>
|
<source>group_chat_error_must_have_name</source>
|
||||||
<extracomment>"Un nom doit être donné au groupe</extracomment>
|
<extracomment>"Un nom doit être donné au groupe</extracomment>
|
||||||
<translation>A name must be set for the group</translation>
|
<translation>A name must be set for the group</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="317"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="316"/>
|
||||||
<source>group_call_error_not_connected</source>
|
<source>group_call_error_not_connected</source>
|
||||||
<extracomment>"Vous n'etes pas connecté"</extracomment>
|
<extracomment>"Vous n'etes pas connecté"</extracomment>
|
||||||
<translation>You are not connected</translation>
|
<translation>You are not connected</translation>
|
||||||
|
|
@ -4204,19 +4204,19 @@ Expiration : %1</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>NotificationReceivedCall</name>
|
<name>NotificationReceivedCall</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="90"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="93"/>
|
||||||
<source>call_audio_incoming</source>
|
<source>call_audio_incoming</source>
|
||||||
<extracomment>"Appel entrant"</extracomment>
|
<extracomment>"Appel entrant"</extracomment>
|
||||||
<translation>Incoming call</translation>
|
<translation>Incoming call</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="113"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="116"/>
|
||||||
<source>dialog_accept</source>
|
<source>dialog_accept</source>
|
||||||
<extracomment>"Accepter"</extracomment>
|
<extracomment>"Accepter"</extracomment>
|
||||||
<translation>Accept</translation>
|
<translation>Accept</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="131"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="134"/>
|
||||||
<source>dialog_deny</source>
|
<source>dialog_deny</source>
|
||||||
<extracomment>"Refuser</extracomment>
|
<extracomment>"Refuser</extracomment>
|
||||||
<translation>Decline</translation>
|
<translation>Decline</translation>
|
||||||
|
|
@ -4225,24 +4225,24 @@ Expiration : %1</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>Notifier</name>
|
<name>Notifier</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="351"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="355"/>
|
||||||
<source>new_voice_message</source>
|
<source>new_voice_message</source>
|
||||||
<extracomment>'Voice message received!' : message to warn the user in a notofication for voice messages.</extracomment>
|
<extracomment>'Voice message received!' : message to warn the user in a notofication for voice messages.</extracomment>
|
||||||
<translation>Voice message received!</translation>
|
<translation>Voice message received!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="352"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="356"/>
|
||||||
<source>new_file_message</source>
|
<source>new_file_message</source>
|
||||||
<translation>File received!</translation>
|
<translation>File received!</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="355"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="359"/>
|
||||||
<source>new_conference_invitation</source>
|
<source>new_conference_invitation</source>
|
||||||
<extracomment>'Conference invitation received!' : Notification about receiving an invitation to a conference.</extracomment>
|
<extracomment>'Conference invitation received!' : Notification about receiving an invitation to a conference.</extracomment>
|
||||||
<translation>Conference invitation received !</translation>
|
<translation>Conference invitation received !</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="371"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="375"/>
|
||||||
<source>new_chat_room_messages</source>
|
<source>new_chat_room_messages</source>
|
||||||
<extracomment>'New messages received!' Notification that warn the user of new messages.</extracomment>
|
<extracomment>'New messages received!' Notification that warn the user of new messages.</extracomment>
|
||||||
<translation>New messages received !</translation>
|
<translation>New messages received !</translation>
|
||||||
|
|
|
||||||
|
|
@ -2106,79 +2106,79 @@ en bout. Seul votre correspondant peut les déchiffrer.</translation>
|
||||||
<translation>Aucune conversation</translation>
|
<translation>Aucune conversation</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="70"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="69"/>
|
||||||
<source>chat_dialog_delete_chat_title</source>
|
<source>chat_dialog_delete_chat_title</source>
|
||||||
<extracomment>Supprimer la conversation ?</extracomment>
|
<extracomment>Supprimer la conversation ?</extracomment>
|
||||||
<translation>Supprimer la conversation ?</translation>
|
<translation>Supprimer la conversation ?</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="72"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="71"/>
|
||||||
<source>chat_dialog_delete_chat_message</source>
|
<source>chat_dialog_delete_chat_message</source>
|
||||||
<extracomment>"La conversation et tous ses messages seront supprimés."</extracomment>
|
<extracomment>"La conversation et tous ses messages seront supprimés."</extracomment>
|
||||||
<translation>La conversation et tous ses messages seront supprimés.</translation>
|
<translation>La conversation et tous ses messages seront supprimés.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="101"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="100"/>
|
||||||
<source>chat_list_title</source>
|
<source>chat_list_title</source>
|
||||||
<extracomment>"Conversations"</extracomment>
|
<extracomment>"Conversations"</extracomment>
|
||||||
<translation>Conversations</translation>
|
<translation>Conversations</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="122"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="121"/>
|
||||||
<source>menu_mark_all_as_read</source>
|
<source>menu_mark_all_as_read</source>
|
||||||
<extracomment>"mark all as read"</extracomment>
|
<extracomment>"mark all as read"</extracomment>
|
||||||
<translation>Tout marquer comme lu</translation>
|
<translation>Tout marquer comme lu</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="153"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="152"/>
|
||||||
<source>chat_search_in_history</source>
|
<source>chat_search_in_history</source>
|
||||||
<extracomment>"Rechercher une conversation"</extracomment>
|
<extracomment>"Rechercher une conversation"</extracomment>
|
||||||
<translation>Rechercher une conversation</translation>
|
<translation>Rechercher une conversation</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="176"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="175"/>
|
||||||
<source>list_filter_no_result_found</source>
|
<source>list_filter_no_result_found</source>
|
||||||
<extracomment>"Aucun résultat…"</extracomment>
|
<extracomment>"Aucun résultat…"</extracomment>
|
||||||
<translation>Aucun résultat…</translation>
|
<translation>Aucun résultat…</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="178"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="177"/>
|
||||||
<source>chat_list_empty_history</source>
|
<source>chat_list_empty_history</source>
|
||||||
<extracomment>"Aucune conversation dans votre historique"</extracomment>
|
<extracomment>"Aucune conversation dans votre historique"</extracomment>
|
||||||
<translation>Aucune conversation dans votre historique</translation>
|
<translation>Aucune conversation dans votre historique</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="247"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="246"/>
|
||||||
<source>chat_action_start_new_chat</source>
|
<source>chat_action_start_new_chat</source>
|
||||||
<extracomment>"New chat"</extracomment>
|
<extracomment>"New chat"</extracomment>
|
||||||
<translation>Nouvelle conversation</translation>
|
<translation>Nouvelle conversation</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="283"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="282"/>
|
||||||
<source>chat_start_group_chat_title</source>
|
<source>chat_start_group_chat_title</source>
|
||||||
<extracomment>"Nouveau groupe"</extracomment>
|
<extracomment>"Nouveau groupe"</extracomment>
|
||||||
<translation>Nouveau groupe</translation>
|
<translation>Nouveau groupe</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="285"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="284"/>
|
||||||
<source>chat_action_start_group_chat</source>
|
<source>chat_action_start_group_chat</source>
|
||||||
<extracomment>"Créer"</extracomment>
|
<extracomment>"Créer"</extracomment>
|
||||||
<translation>Créer</translation>
|
<translation>Créer</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="311"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="310"/>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="315"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="314"/>
|
||||||
<source>information_popup_error_title</source>
|
<source>information_popup_error_title</source>
|
||||||
<translation>Erreur</translation>
|
<translation>Erreur</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="313"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="312"/>
|
||||||
<source>group_chat_error_must_have_name</source>
|
<source>group_chat_error_must_have_name</source>
|
||||||
<extracomment>"Un nom doit être donné au groupe</extracomment>
|
<extracomment>"Un nom doit être donné au groupe</extracomment>
|
||||||
<translation>Un nom doit être donné au groupe</translation>
|
<translation>Un nom doit être donné au groupe</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="317"/>
|
<location filename="../../view/Page/Main/Chat/ChatPage.qml" line="316"/>
|
||||||
<source>group_call_error_not_connected</source>
|
<source>group_call_error_not_connected</source>
|
||||||
<extracomment>"Vous n'etes pas connecté"</extracomment>
|
<extracomment>"Vous n'etes pas connecté"</extracomment>
|
||||||
<translation>Vous n'êtes pas connecté</translation>
|
<translation>Vous n'êtes pas connecté</translation>
|
||||||
|
|
@ -4204,19 +4204,19 @@ Expiration : %1</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>NotificationReceivedCall</name>
|
<name>NotificationReceivedCall</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="90"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="93"/>
|
||||||
<source>call_audio_incoming</source>
|
<source>call_audio_incoming</source>
|
||||||
<extracomment>"Appel entrant"</extracomment>
|
<extracomment>"Appel entrant"</extracomment>
|
||||||
<translation>Appel entrant</translation>
|
<translation>Appel entrant</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="113"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="116"/>
|
||||||
<source>dialog_accept</source>
|
<source>dialog_accept</source>
|
||||||
<extracomment>"Accepter"</extracomment>
|
<extracomment>"Accepter"</extracomment>
|
||||||
<translation>Accepter</translation>
|
<translation>Accepter</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="131"/>
|
<location filename="../../view/Control/Popup/Notification/NotificationReceivedCall.qml" line="134"/>
|
||||||
<source>dialog_deny</source>
|
<source>dialog_deny</source>
|
||||||
<extracomment>"Refuser</extracomment>
|
<extracomment>"Refuser</extracomment>
|
||||||
<translation>Refuser</translation>
|
<translation>Refuser</translation>
|
||||||
|
|
@ -4225,24 +4225,24 @@ Expiration : %1</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>Notifier</name>
|
<name>Notifier</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="351"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="355"/>
|
||||||
<source>new_voice_message</source>
|
<source>new_voice_message</source>
|
||||||
<extracomment>'Voice message received!' : message to warn the user in a notofication for voice messages.</extracomment>
|
<extracomment>'Voice message received!' : message to warn the user in a notofication for voice messages.</extracomment>
|
||||||
<translation>Message vocal reçu !</translation>
|
<translation>Message vocal reçu !</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="352"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="356"/>
|
||||||
<source>new_file_message</source>
|
<source>new_file_message</source>
|
||||||
<translation>Fichier reçu !</translation>
|
<translation>Fichier reçu !</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="355"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="359"/>
|
||||||
<source>new_conference_invitation</source>
|
<source>new_conference_invitation</source>
|
||||||
<extracomment>'Conference invitation received!' : Notification about receiving an invitation to a conference.</extracomment>
|
<extracomment>'Conference invitation received!' : Notification about receiving an invitation to a conference.</extracomment>
|
||||||
<translation>Nouvelle invitation à une conférence !</translation>
|
<translation>Nouvelle invitation à une conférence !</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/notifier/Notifier.cpp" line="371"/>
|
<location filename="../../core/notifier/Notifier.cpp" line="375"/>
|
||||||
<source>new_chat_room_messages</source>
|
<source>new_chat_room_messages</source>
|
||||||
<extracomment>'New messages received!' Notification that warn the user of new messages.</extracomment>
|
<extracomment>'New messages received!' Notification that warn the user of new messages.</extracomment>
|
||||||
<translation>Nouveaux messages reçus !</translation>
|
<translation>Nouveaux messages reçus !</translation>
|
||||||
|
|
|
||||||
|
|
@ -265,7 +265,7 @@ void ConferenceModel::onParticipantDeviceScreenSharingChanged(
|
||||||
|
|
||||||
void ConferenceModel::onStateChanged(const std::shared_ptr<linphone::Conference> &conference,
|
void ConferenceModel::onStateChanged(const std::shared_ptr<linphone::Conference> &conference,
|
||||||
linphone::Conference::State newState) {
|
linphone::Conference::State newState) {
|
||||||
lDebug() << "onStateChanged:" << (int)newState;
|
lDebug() << log().arg("onStateChanged:") << (int)newState;
|
||||||
if (newState == linphone::Conference::State::Created) {
|
if (newState == linphone::Conference::State::Created) {
|
||||||
emit participantDeviceCountChanged(conference, mMonitor->getParticipantDeviceList().size());
|
emit participantDeviceCountChanged(conference, mMonitor->getParticipantDeviceList().size());
|
||||||
if (mMonitor->getScreenSharingParticipant()) emit isScreenSharingEnabledChanged(true);
|
if (mMonitor->getScreenSharingParticipant()) emit isScreenSharingEnabledChanged(true);
|
||||||
|
|
|
||||||
|
|
@ -426,7 +426,10 @@ void CoreModel::onCallStateChanged(const std::shared_ptr<linphone::Core> &core,
|
||||||
QString command = Utils::coreStringToAppString(
|
QString command = Utils::coreStringToAppString(
|
||||||
core->getConfig()->getString(SettingsModel::UiSection, "command_line", ""));
|
core->getConfig()->getString(SettingsModel::UiSection, "command_line", ""));
|
||||||
QString userName = Utils::coreStringToAppString(call->getRemoteAddress()->getUsername());
|
QString userName = Utils::coreStringToAppString(call->getRemoteAddress()->getUsername());
|
||||||
QString displayName = Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName());
|
QString displayName =
|
||||||
|
call->getCallLog() && call->getCallLog()->getConferenceInfo()
|
||||||
|
? Utils::coreStringToAppString(call->getCallLog()->getConferenceInfo()->getSubject())
|
||||||
|
: Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName());
|
||||||
command = command.replace("$1", userName);
|
command = command.replace("$1", userName);
|
||||||
command = command.replace("$2", displayName);
|
command = command.replace("$2", displayName);
|
||||||
Utils::runCommandLine(command);
|
Utils::runCommandLine(command);
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,11 @@ Notification {
|
||||||
overriddenHeight: content.height
|
overriddenHeight: content.height
|
||||||
|
|
||||||
readonly property var call: notificationData && notificationData.call
|
readonly property var call: notificationData && notificationData.call
|
||||||
|
readonly property var displayName: notificationData && notificationData.displayName
|
||||||
property var state: call.core.state
|
property var state: call.core.state
|
||||||
property var status: call.core.status
|
property var status: call.core.status
|
||||||
|
property var conference: call.core.conference
|
||||||
|
|
||||||
onStateChanged:{
|
onStateChanged:{
|
||||||
if (state != LinphoneEnums.CallState.IncomingReceived){
|
if (state != LinphoneEnums.CallState.IncomingReceived){
|
||||||
close()
|
close()
|
||||||
|
|
@ -72,7 +75,7 @@ Notification {
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
spacing: 0
|
spacing: 0
|
||||||
Text {
|
Text {
|
||||||
text: call.core.remoteName
|
text: displayName
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.maximumWidth: mainItem.width - content.leftPadding - content.rightPadding
|
Layout.maximumWidth: mainItem.width - content.leftPadding - content.rightPadding
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue