From 430ac93e07b06bf53c57735cb738c338e49af26d Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 3 May 2023 19:17:11 +0200 Subject: [PATCH] display icons for files when solving many conflicts Signed-off-by: Matthieu Gallien --- src/gui/syncconflictsmodel.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gui/syncconflictsmodel.cpp b/src/gui/syncconflictsmodel.cpp index 872619b7ab635..613a0bbbc3ba2 100644 --- a/src/gui/syncconflictsmodel.cpp +++ b/src/gui/syncconflictsmodel.cpp @@ -151,17 +151,14 @@ void SyncConflictsModel::updateConflictsData() const auto existingFileInfo = QFileInfo(basePath); const auto conflictFileInfo = QFileInfo(conflictedPath); - const auto existingMimeType = mMimeDb.mimeTypeForFile(existingFileInfo.fileName()); - const auto conflictMimeType = mMimeDb.mimeTypeForFile(conflictFileInfo.fileName()); - auto newConflictData = ConflictInfo{ existingFileInfo.fileName(), mLocale.formattedDataSize(existingFileInfo.size()), mLocale.formattedDataSize(conflictFileInfo.size()), existingFileInfo.lastModified().toString(), conflictFileInfo.lastModified().toString(), - QIcon::hasThemeIcon(existingMimeType.iconName()) ? QUrl{} : QUrl{":/qt-project.org/styles/commonstyle/images/file-128.png"}, - QIcon::hasThemeIcon(conflictMimeType.iconName()) ? QUrl{} : QUrl{":/qt-project.org/styles/commonstyle/images/file-128.png"}, + QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + existingFileInfo.fileName()}, + QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + conflictFileInfo.fileName()}, false, false, };