Fixes:
fix wrong thread function call hide recordings button while not implemented display error message if cannot retrieve remote provisioning
This commit is contained in:
parent
c0a150f3e1
commit
b3135ea177
6 changed files with 57 additions and 12 deletions
|
|
@ -204,15 +204,15 @@ void CallCore::setSelf(QSharedPointer<CallCore> me) {
|
||||||
});
|
});
|
||||||
mCallModelConnection->makeConnectToModel(
|
mCallModelConnection->makeConnectToModel(
|
||||||
&CallModel::recordingChanged, [this](const std::shared_ptr<linphone::Call> &call, bool recording) {
|
&CallModel::recordingChanged, [this](const std::shared_ptr<linphone::Call> &call, bool recording) {
|
||||||
mCallModelConnection->invokeToCore([this, recording]() {
|
auto recordFile = QString::fromStdString(mCallModel->getRecordFile());
|
||||||
|
mCallModelConnection->invokeToCore([this, recording, recordFile]() {
|
||||||
setRecording(recording);
|
setRecording(recording);
|
||||||
if (recording == false) {
|
if (recording == false) {
|
||||||
//: "Enregistrement terminé"
|
//: "Enregistrement terminé"
|
||||||
Utils::showInformationPopup(tr("call_record_end_message"),
|
Utils::showInformationPopup(tr("call_record_end_message"),
|
||||||
//: "L'appel a été enregistré dans le fichier : %1"
|
//: "L'appel a été enregistré dans le fichier : %1"
|
||||||
tr("call_record_saved_in_file_message")
|
tr("call_record_saved_in_file_message").arg(recordFile), true,
|
||||||
.arg(QString::fromStdString(mCallModel->getRecordFile())),
|
App::getInstance()->getCallsWindow());
|
||||||
true, App::getInstance()->getCallsWindow());
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -773,13 +773,13 @@
|
||||||
<context>
|
<context>
|
||||||
<name>CallCore</name>
|
<name>CallCore</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/call/CallCore.cpp" line="211"/>
|
<location filename="../../core/call/CallCore.cpp" line="212"/>
|
||||||
<source>call_record_end_message</source>
|
<source>call_record_end_message</source>
|
||||||
<extracomment>"Enregistrement terminé"</extracomment>
|
<extracomment>"Enregistrement terminé"</extracomment>
|
||||||
<translation>Aufnahme beendet</translation>
|
<translation>Aufnahme beendet</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/call/CallCore.cpp" line="213"/>
|
<location filename="../../core/call/CallCore.cpp" line="214"/>
|
||||||
<source>call_record_saved_in_file_message</source>
|
<source>call_record_saved_in_file_message</source>
|
||||||
<extracomment>"L'appel a été enregistré dans le fichier : %1"</extracomment>
|
<extracomment>"L'appel a été enregistré dans le fichier : %1"</extracomment>
|
||||||
<translation>Die Aufnahme wurde in der folgenden Datei gespeichert: %1</translation>
|
<translation>Die Aufnahme wurde in der folgenden Datei gespeichert: %1</translation>
|
||||||
|
|
@ -3445,6 +3445,20 @@ Error</extracomment>
|
||||||
<translation type="unfinished">Alle Nachrichten werden aus dem Chat entfernt. Möchten Sie fortfahren?</translation>
|
<translation type="unfinished">Alle Nachrichten werden aus dem Chat entfernt. Möchten Sie fortfahren?</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
<context>
|
||||||
|
<name>CoreModel</name>
|
||||||
|
<message>
|
||||||
|
<location filename="../../model/core/CoreModel.cpp" line="220"/>
|
||||||
|
<source>info_popup_error_title</source>
|
||||||
|
<translation type="unfinished">Fehler</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../model/core/CoreModel.cpp" line="222"/>
|
||||||
|
<source>fetching_config_failed_error_message</source>
|
||||||
|
<extracomment>"Remote provisioning cannot be retrieved"</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>CreationFormLayout</name>
|
<name>CreationFormLayout</name>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
||||||
|
|
@ -768,13 +768,13 @@
|
||||||
<context>
|
<context>
|
||||||
<name>CallCore</name>
|
<name>CallCore</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/call/CallCore.cpp" line="211"/>
|
<location filename="../../core/call/CallCore.cpp" line="212"/>
|
||||||
<source>call_record_end_message</source>
|
<source>call_record_end_message</source>
|
||||||
<extracomment>"Enregistrement terminé"</extracomment>
|
<extracomment>"Enregistrement terminé"</extracomment>
|
||||||
<translation>Recording ended</translation>
|
<translation>Recording ended</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/call/CallCore.cpp" line="213"/>
|
<location filename="../../core/call/CallCore.cpp" line="214"/>
|
||||||
<source>call_record_saved_in_file_message</source>
|
<source>call_record_saved_in_file_message</source>
|
||||||
<extracomment>"L'appel a été enregistré dans le fichier : %1"</extracomment>
|
<extracomment>"L'appel a été enregistré dans le fichier : %1"</extracomment>
|
||||||
<translation>Recording has been saved in file : %1</translation>
|
<translation>Recording has been saved in file : %1</translation>
|
||||||
|
|
@ -3349,6 +3349,20 @@ Only your correspondent can decrypt them.</translation>
|
||||||
<translation>All the messages will be removed from the chat room. Do you want to continue ?</translation>
|
<translation>All the messages will be removed from the chat room. Do you want to continue ?</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
<context>
|
||||||
|
<name>CoreModel</name>
|
||||||
|
<message>
|
||||||
|
<location filename="../../model/core/CoreModel.cpp" line="220"/>
|
||||||
|
<source>info_popup_error_title</source>
|
||||||
|
<translation>Error</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../model/core/CoreModel.cpp" line="222"/>
|
||||||
|
<source>fetching_config_failed_error_message</source>
|
||||||
|
<extracomment>"Remote provisioning cannot be retrieved"</extracomment>
|
||||||
|
<translation>Remote provisioning cannot be retrieved</translation>
|
||||||
|
</message>
|
||||||
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>CreationFormLayout</name>
|
<name>CreationFormLayout</name>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
||||||
|
|
@ -768,13 +768,13 @@
|
||||||
<context>
|
<context>
|
||||||
<name>CallCore</name>
|
<name>CallCore</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/call/CallCore.cpp" line="211"/>
|
<location filename="../../core/call/CallCore.cpp" line="212"/>
|
||||||
<source>call_record_end_message</source>
|
<source>call_record_end_message</source>
|
||||||
<extracomment>"Enregistrement terminé"</extracomment>
|
<extracomment>"Enregistrement terminé"</extracomment>
|
||||||
<translation>Enregistrement terminé</translation>
|
<translation>Enregistrement terminé</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../core/call/CallCore.cpp" line="213"/>
|
<location filename="../../core/call/CallCore.cpp" line="214"/>
|
||||||
<source>call_record_saved_in_file_message</source>
|
<source>call_record_saved_in_file_message</source>
|
||||||
<extracomment>"L'appel a été enregistré dans le fichier : %1"</extracomment>
|
<extracomment>"L'appel a été enregistré dans le fichier : %1"</extracomment>
|
||||||
<translation>L'appel a été enregistré dans le fichier : %1</translation>
|
<translation>L'appel a été enregistré dans le fichier : %1</translation>
|
||||||
|
|
@ -3349,6 +3349,20 @@ en bout. Seul votre correspondant peut les déchiffrer.</translation>
|
||||||
<translation>Tous les messages seront supprimés. Souhaitez-vous continuer ?</translation>
|
<translation>Tous les messages seront supprimés. Souhaitez-vous continuer ?</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
<context>
|
||||||
|
<name>CoreModel</name>
|
||||||
|
<message>
|
||||||
|
<location filename="../../model/core/CoreModel.cpp" line="220"/>
|
||||||
|
<source>info_popup_error_title</source>
|
||||||
|
<translation>Erreur</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../../model/core/CoreModel.cpp" line="222"/>
|
||||||
|
<source>fetching_config_failed_error_message</source>
|
||||||
|
<extracomment>"Remote provisioning cannot be retrieved"</extracomment>
|
||||||
|
<translation>La configuration distante n'a pas pu être récupérée</translation>
|
||||||
|
</message>
|
||||||
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>CreationFormLayout</name>
|
<name>CreationFormLayout</name>
|
||||||
<message>
|
<message>
|
||||||
|
|
|
||||||
|
|
@ -216,7 +216,10 @@ QString CoreModel::getFetchConfig(QString filePath, bool *error) {
|
||||||
if (!filePath.isEmpty()) filePath = "file://" + filePath;
|
if (!filePath.isEmpty()) filePath = "file://" + filePath;
|
||||||
}
|
}
|
||||||
if (filePath.isEmpty()) {
|
if (filePath.isEmpty()) {
|
||||||
qWarning() << "Remote provisionning cannot be retrieved. Command have been cleaned";
|
qWarning() << "Remote provisioning cannot be retrieved. Command have been cleaned";
|
||||||
|
Utils::showInformationPopup(tr("info_popup_error_title"),
|
||||||
|
//: "Remote provisioning cannot be retrieved"
|
||||||
|
tr("fetching_config_failed_error_message"), false);
|
||||||
*error = true;
|
*error = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -494,7 +494,7 @@ Item {
|
||||||
IconLabelButton {
|
IconLabelButton {
|
||||||
id: recordsButton
|
id: recordsButton
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
visible: !SettingsCpp.disableCallRecordings
|
visible: false// !SettingsCpp.disableCallRecordings
|
||||||
icon.width: Utils.getSizeWithScreenRatio(32)
|
icon.width: Utils.getSizeWithScreenRatio(32)
|
||||||
icon.height: Utils.getSizeWithScreenRatio(32)
|
icon.height: Utils.getSizeWithScreenRatio(32)
|
||||||
//: "Enregistrements"
|
//: "Enregistrements"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue