wait for core to be started before initializing lists
This commit is contained in:
Gaelle Braud
parent
21312c99db
commit
44a3a90517
4 changed files with 74 additions and 67 deletions
|
|
@ -620,23 +620,30 @@ void App::initCore() {
|
|||
mNotifier = new Notifier(mEngine);
|
||||
mEngine->setObjectOwnership(settings.get(), QQmlEngine::CppOwnership);
|
||||
mEngine->setObjectOwnership(this, QQmlEngine::CppOwnership);
|
||||
if (!mAccountList) setAccountList(AccountList::create());
|
||||
else {
|
||||
mAccountList->setInitialized(false);
|
||||
mAccountList->lUpdate(true);
|
||||
}
|
||||
// Update global unread Notifications when an account updates his unread Notifications
|
||||
connect(mAccountList.get(), &AccountList::unreadNotificationsChanged, this, [this]() {
|
||||
lDebug() << "unreadNotificationsChanged of AccountList";
|
||||
mCoreModelConnection->invokeToModel([this] {
|
||||
int n = mEventCountNotifier->getCurrentEventCount();
|
||||
mCoreModelConnection->invokeToCore([this, n] { mEventCountNotifier->notifyEventCount(n); });
|
||||
});
|
||||
|
||||
connect(this, &App::coreStartedChanged, this, [this] {
|
||||
if (mCoreStarted) {
|
||||
if (!mAccountList) setAccountList(AccountList::create());
|
||||
else {
|
||||
mAccountList->setInitialized(false);
|
||||
mAccountList->lUpdate(true);
|
||||
}
|
||||
// Update global unread Notifications when an account updates his unread Notifications
|
||||
connect(mAccountList.get(), &AccountList::unreadNotificationsChanged, this, [this]() {
|
||||
lDebug() << "unreadNotificationsChanged of AccountList";
|
||||
mCoreModelConnection->invokeToModel([this] {
|
||||
int n = mEventCountNotifier->getCurrentEventCount();
|
||||
mCoreModelConnection->invokeToCore(
|
||||
[this, n] { mEventCountNotifier->notifyEventCount(n); });
|
||||
});
|
||||
});
|
||||
if (!mCallList) setCallList(CallList::create());
|
||||
else mCallList->lUpdate();
|
||||
if (!mChatList) setChatList(ChatList::create());
|
||||
else mChatList->lUpdate();
|
||||
disconnect(this, &App::coreStartedChanged, this, nullptr);
|
||||
}
|
||||
});
|
||||
if (!mCallList) setCallList(CallList::create());
|
||||
else mCallList->lUpdate();
|
||||
if (!mChatList) setChatList(ChatList::create());
|
||||
else mChatList->lUpdate();
|
||||
|
||||
if (!mSettings) {
|
||||
mSettings = settings;
|
||||
|
|
|
|||
|
|
@ -682,14 +682,14 @@
|
|||
<message>
|
||||
<location filename="../../core/App.cpp" line="392"/>
|
||||
<location filename="../../core/App.cpp" line="445"/>
|
||||
<location filename="../../core/App.cpp" line="701"/>
|
||||
<location filename="../../core/App.cpp" line="708"/>
|
||||
<source>info_popup_error_title</source>
|
||||
<extracomment>Error</extracomment>
|
||||
<translation>Fehler</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="393"/>
|
||||
<location filename="../../core/App.cpp" line="703"/>
|
||||
<location filename="../../core/App.cpp" line="710"/>
|
||||
<source>info_popup_configuration_failed_message</source>
|
||||
<extracomment>Remote provisioning failed : %1</extracomment>
|
||||
<translation>Remote-Provisionierung fehlgeschlagen: %1</translation>
|
||||
|
|
@ -729,86 +729,86 @@
|
|||
<translation>Ihre Version ist auf dem neuesten Stand</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="697"/>
|
||||
<location filename="../../core/App.cpp" line="704"/>
|
||||
<source>configuration_error_detail</source>
|
||||
<extracomment>not reachable</extracomment>
|
||||
<translation>nicht erreichbar</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="975"/>
|
||||
<location filename="../../core/App.cpp" line="982"/>
|
||||
<source>application_description</source>
|
||||
<extracomment>"A free and open source SIP video-phone."</extracomment>
|
||||
<translation>Ein kostenloses Open-Source SIP Video-Telefon.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="977"/>
|
||||
<location filename="../../core/App.cpp" line="984"/>
|
||||
<source>command_line_arg_order</source>
|
||||
<extracomment>"Send an order to the application towards a command line"</extracomment>
|
||||
<translation>Kommandozeilen-Befehl an die Anwendung schicken</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="981"/>
|
||||
<location filename="../../core/App.cpp" line="988"/>
|
||||
<source>command_line_option_show_help</source>
|
||||
<translation>Zeige Hilfe</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="986"/>
|
||||
<location filename="../../core/App.cpp" line="993"/>
|
||||
<source>command_line_option_show_app_version</source>
|
||||
<translation>App-Version anzeigen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="994"/>
|
||||
<location filename="../../core/App.cpp" line="1001"/>
|
||||
<source>command_line_option_config_to_fetch</source>
|
||||
<extracomment>"Specify the linphone configuration file to be fetched. It will be merged with the current configuration."</extracomment>
|
||||
<translation>Abzurufende Linphone-Konfigurationsdatei angeben. Sie wird mit der aktuellen Konfiguration zusammengeführt.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="996"/>
|
||||
<location filename="../../core/App.cpp" line="1003"/>
|
||||
<source>command_line_option_config_to_fetch_arg</source>
|
||||
<extracomment>"URL, path or file"</extracomment>
|
||||
<translation>URL, Pfad oder Datei</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1001"/>
|
||||
<location filename="../../core/App.cpp" line="1008"/>
|
||||
<source>command_line_option_minimized</source>
|
||||
<translation>Minimieren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1004"/>
|
||||
<location filename="../../core/App.cpp" line="1011"/>
|
||||
<source>command_line_option_log_to_stdout</source>
|
||||
<translation>Debug-Informationen auf der Standardausgabe ausgeben</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1007"/>
|
||||
<location filename="../../core/App.cpp" line="1014"/>
|
||||
<source>command_line_option_print_app_logs_only</source>
|
||||
<extracomment>"Print only logs from the application"</extracomment>
|
||||
<translation>Nur Anwendungs-Logs ausgeben</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1439"/>
|
||||
<location filename="../../core/App.cpp" line="1446"/>
|
||||
<source>hide_action</source>
|
||||
<extracomment>"Cacher" "Afficher"</extracomment>
|
||||
<translation>Ausblenden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1439"/>
|
||||
<location filename="../../core/App.cpp" line="1446"/>
|
||||
<source>show_action</source>
|
||||
<translation>Zeigen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1454"/>
|
||||
<location filename="../../core/App.cpp" line="1461"/>
|
||||
<source>quit_action</source>
|
||||
<extracomment>"Quitter"</extracomment>
|
||||
<translation>Beenden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1472"/>
|
||||
<location filename="../../core/App.cpp" line="1479"/>
|
||||
<source>check_for_update</source>
|
||||
<extracomment>Check for update</extracomment>
|
||||
<translation>Auf Updates prüfen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1595"/>
|
||||
<location filename="../../core/App.cpp" line="1602"/>
|
||||
<source>mark_all_read_action</source>
|
||||
<translation>Alle als gelesen markieren</translation>
|
||||
</message>
|
||||
|
|
|
|||
|
|
@ -663,14 +663,14 @@
|
|||
<message>
|
||||
<location filename="../../core/App.cpp" line="392"/>
|
||||
<location filename="../../core/App.cpp" line="445"/>
|
||||
<location filename="../../core/App.cpp" line="701"/>
|
||||
<location filename="../../core/App.cpp" line="708"/>
|
||||
<source>info_popup_error_title</source>
|
||||
<extracomment>Error</extracomment>
|
||||
<translation>Error</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="393"/>
|
||||
<location filename="../../core/App.cpp" line="703"/>
|
||||
<location filename="../../core/App.cpp" line="710"/>
|
||||
<source>info_popup_configuration_failed_message</source>
|
||||
<extracomment>Remote provisioning failed : %1</extracomment>
|
||||
<translation>Remote provisioning failed : %1</translation>
|
||||
|
|
@ -710,86 +710,86 @@
|
|||
<translation>Up to date Your version is up to date</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="697"/>
|
||||
<location filename="../../core/App.cpp" line="704"/>
|
||||
<source>configuration_error_detail</source>
|
||||
<extracomment>not reachable</extracomment>
|
||||
<translation>not reachable</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="975"/>
|
||||
<location filename="../../core/App.cpp" line="982"/>
|
||||
<source>application_description</source>
|
||||
<extracomment>"A free and open source SIP video-phone."</extracomment>
|
||||
<translation>A free and open source SIP video-phone.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="977"/>
|
||||
<location filename="../../core/App.cpp" line="984"/>
|
||||
<source>command_line_arg_order</source>
|
||||
<extracomment>"Send an order to the application towards a command line"</extracomment>
|
||||
<translation>Send an order to the application towards a command line</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="981"/>
|
||||
<location filename="../../core/App.cpp" line="988"/>
|
||||
<source>command_line_option_show_help</source>
|
||||
<translation>Show this help</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="986"/>
|
||||
<location filename="../../core/App.cpp" line="993"/>
|
||||
<source>command_line_option_show_app_version</source>
|
||||
<translation>Show app version</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="994"/>
|
||||
<location filename="../../core/App.cpp" line="1001"/>
|
||||
<source>command_line_option_config_to_fetch</source>
|
||||
<extracomment>"Specify the linphone configuration file to be fetched. It will be merged with the current configuration."</extracomment>
|
||||
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="996"/>
|
||||
<location filename="../../core/App.cpp" line="1003"/>
|
||||
<source>command_line_option_config_to_fetch_arg</source>
|
||||
<extracomment>"URL, path or file"</extracomment>
|
||||
<translation>URL, path or file</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1001"/>
|
||||
<location filename="../../core/App.cpp" line="1008"/>
|
||||
<source>command_line_option_minimized</source>
|
||||
<translation>Minimize</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1004"/>
|
||||
<location filename="../../core/App.cpp" line="1011"/>
|
||||
<source>command_line_option_log_to_stdout</source>
|
||||
<translation>Log to stdout some debug information while running</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1007"/>
|
||||
<location filename="../../core/App.cpp" line="1014"/>
|
||||
<source>command_line_option_print_app_logs_only</source>
|
||||
<extracomment>"Print only logs from the application"</extracomment>
|
||||
<translation>Print only logs from the application</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1439"/>
|
||||
<location filename="../../core/App.cpp" line="1446"/>
|
||||
<source>hide_action</source>
|
||||
<extracomment>"Cacher" "Afficher"</extracomment>
|
||||
<translation>Hide</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1439"/>
|
||||
<location filename="../../core/App.cpp" line="1446"/>
|
||||
<source>show_action</source>
|
||||
<translation>Show</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1454"/>
|
||||
<location filename="../../core/App.cpp" line="1461"/>
|
||||
<source>quit_action</source>
|
||||
<extracomment>"Quitter"</extracomment>
|
||||
<translation>Quit</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1472"/>
|
||||
<location filename="../../core/App.cpp" line="1479"/>
|
||||
<source>check_for_update</source>
|
||||
<extracomment>Check for update</extracomment>
|
||||
<translation>Check for update</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1595"/>
|
||||
<location filename="../../core/App.cpp" line="1602"/>
|
||||
<source>mark_all_read_action</source>
|
||||
<translation>Marquer tout comme lu</translation>
|
||||
</message>
|
||||
|
|
|
|||
|
|
@ -658,14 +658,14 @@
|
|||
<message>
|
||||
<location filename="../../core/App.cpp" line="392"/>
|
||||
<location filename="../../core/App.cpp" line="445"/>
|
||||
<location filename="../../core/App.cpp" line="701"/>
|
||||
<location filename="../../core/App.cpp" line="708"/>
|
||||
<source>info_popup_error_title</source>
|
||||
<extracomment>Error</extracomment>
|
||||
<translation>Erreur</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="393"/>
|
||||
<location filename="../../core/App.cpp" line="703"/>
|
||||
<location filename="../../core/App.cpp" line="710"/>
|
||||
<source>info_popup_configuration_failed_message</source>
|
||||
<extracomment>Remote provisioning failed : %1</extracomment>
|
||||
<translation>La configuration distante a échoué : %1</translation>
|
||||
|
|
@ -705,86 +705,86 @@
|
|||
<translation>Votre version est à jour</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="697"/>
|
||||
<location filename="../../core/App.cpp" line="704"/>
|
||||
<source>configuration_error_detail</source>
|
||||
<extracomment>not reachable</extracomment>
|
||||
<translation>indisponible</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="975"/>
|
||||
<location filename="../../core/App.cpp" line="982"/>
|
||||
<source>application_description</source>
|
||||
<extracomment>"A free and open source SIP video-phone."</extracomment>
|
||||
<translation>A free and open source SIP video-phone.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="977"/>
|
||||
<location filename="../../core/App.cpp" line="984"/>
|
||||
<source>command_line_arg_order</source>
|
||||
<extracomment>"Send an order to the application towards a command line"</extracomment>
|
||||
<translation>Send an order to the application towards a command line</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="981"/>
|
||||
<location filename="../../core/App.cpp" line="988"/>
|
||||
<source>command_line_option_show_help</source>
|
||||
<translation>Show this help</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="986"/>
|
||||
<location filename="../../core/App.cpp" line="993"/>
|
||||
<source>command_line_option_show_app_version</source>
|
||||
<translation>Afficher la version de l'application</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="994"/>
|
||||
<location filename="../../core/App.cpp" line="1001"/>
|
||||
<source>command_line_option_config_to_fetch</source>
|
||||
<extracomment>"Specify the linphone configuration file to be fetched. It will be merged with the current configuration."</extracomment>
|
||||
<translation>Specify the linphone configuration file to be fetched. It will be merged with the current configuration.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="996"/>
|
||||
<location filename="../../core/App.cpp" line="1003"/>
|
||||
<source>command_line_option_config_to_fetch_arg</source>
|
||||
<extracomment>"URL, path or file"</extracomment>
|
||||
<translation>URL, path or file</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1001"/>
|
||||
<location filename="../../core/App.cpp" line="1008"/>
|
||||
<source>command_line_option_minimized</source>
|
||||
<translation>Minimiser</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1004"/>
|
||||
<location filename="../../core/App.cpp" line="1011"/>
|
||||
<source>command_line_option_log_to_stdout</source>
|
||||
<translation>Log to stdout some debug information while running</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1007"/>
|
||||
<location filename="../../core/App.cpp" line="1014"/>
|
||||
<source>command_line_option_print_app_logs_only</source>
|
||||
<extracomment>"Print only logs from the application"</extracomment>
|
||||
<translation>Print only logs from the application</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1439"/>
|
||||
<location filename="../../core/App.cpp" line="1446"/>
|
||||
<source>hide_action</source>
|
||||
<extracomment>"Cacher" "Afficher"</extracomment>
|
||||
<translation>Cacher</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1439"/>
|
||||
<location filename="../../core/App.cpp" line="1446"/>
|
||||
<source>show_action</source>
|
||||
<translation>Afficher</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1454"/>
|
||||
<location filename="../../core/App.cpp" line="1461"/>
|
||||
<source>quit_action</source>
|
||||
<extracomment>"Quitter"</extracomment>
|
||||
<translation>Quitter</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1472"/>
|
||||
<location filename="../../core/App.cpp" line="1479"/>
|
||||
<source>check_for_update</source>
|
||||
<extracomment>Check for update</extracomment>
|
||||
<translation>Rechercher une mise à jour</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../core/App.cpp" line="1595"/>
|
||||
<location filename="../../core/App.cpp" line="1602"/>
|
||||
<source>mark_all_read_action</source>
|
||||
<translation>Marquer tout comme lu</translation>
|
||||
</message>
|
||||
|
|
|
|||
Loading…
Reference in a new issue