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 thumbnail download paths leading to wrong thumbnail path and thumbnail not displayed in message when multiple files sent

Browse source 
remove qt5compat dependency README
This commit is contained in:
gaelle 2025-11-19 14:35:00 +01:00
parent b802fec33c
commit d0cf951fe4
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Linphone/core/setting/SettingsCore.cpp
View file

@ -1038,7 +1038,8 @@ QString SettingsCore::getConfigLocale() const {
QString SettingsCore::getDownloadFolder() const { QString SettingsCore::getDownloadFolder() const {
auto path = mDownloadFolder; auto path = mDownloadFolder;
if (mDownloadFolder.isEmpty()) path = Paths::getDownloadDirPath(); if (mDownloadFolder.isEmpty()) path = Paths::getDownloadDirPath();
return QDir::cleanPath(path) + QDir::separator(); QString cleanPath = QDir::cleanPath(path);
return cleanPath;
} }
void SettingsCore::writeIntoModel(std::shared_ptr<SettingsModel> model) const { void SettingsCore::writeIntoModel(std::shared_ptr<SettingsModel> model) const {

4
Linphone/model/chat/message/content/ChatMessageContentModel.cpp
View file

@ -121,10 +121,10 @@ bool ChatMessageContentModel::downloadFile(const QString &name, QString *error)
} else { } else {
lDebug() << log().arg("download file : %1").arg(name); lDebug() << log().arg("download file : %1").arg(name);
auto downloaded = mChatMessageModel->getMonitor()->downloadContent(mContent); auto downloaded = mChatMessageModel->getMonitor()->downloadContent(mContent);
if (!downloaded && error) { if (!downloaded) {
lWarning() << QStringLiteral("Unable to download file of entry %1.").arg(name); lWarning() << QStringLiteral("Unable to download file of entry %1.").arg(name);
//: Unable to download file of entry %1 //: Unable to download file of entry %1
*error = tr("download_file_error_unable_to_download").arg(name); if (error) *error = tr("download_file_error_unable_to_download").arg(name);
} }
return downloaded; return downloaded;
} }

2
Linphone/view/Control/Display/Chat/FileView.qml
View file

@ -14,7 +14,7 @@ import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
Item { Item {
id: mainItem id: mainItem
property ChatMessageContentGui contentGui property ChatMessageContentGui contentGui
property string thumbnail: contentGui && contentGui.core.thumbnail property string thumbnail: contentGui && contentGui.core.thumbnail || ""
property string name: contentGui && contentGui.core.name property string name: contentGui && contentGui.core.name
property string filePath: contentGui && contentGui.core.filePath property string filePath: contentGui && contentGui.core.filePath
property bool wasDownloaded: contentGui && contentGui.core.wasDownloaded property bool wasDownloaded: contentGui && contentGui.core.wasDownloaded

2
README.md
View file

@ -32,7 +32,7 @@ For Desktop : you will need QT6 (_6.10.0 or newer_). `C++17` support is required
- Using the [official QT installer](https://www.qt.io/download-thank-you) - Using the [official QT installer](https://www.qt.io/download-thank-you)
- Using an alternative installer like [aqtinstall](https://github.com/miurahr/aqtinstall) - Using an alternative installer like [aqtinstall](https://github.com/miurahr/aqtinstall)
The following QT optional modules are required: qt5compat, qtmultimedia qtnetworkauth qtshadertools . The following QT optional modules are required: qtmultimedia qtnetworkauth qtshadertools .
### Set your environment ### Set your environment