From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Wed, 3 May 2023 17:17:11 +0000 (+0200)
Subject: display icons for files when solving many conflicts
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=779cc3a75ba37f24efe54297ac80b1e7458f14e9;p=nextcloud-desktop.git

display icons for files when solving many conflicts

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/gui/syncconflictsmodel.cpp b/src/gui/syncconflictsmodel.cpp
index 872619b7a..613a0bbbc 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,
         };