display icons for files when solving many conflicts

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
nextcloud · May 4, 2023 · 430ac93 · 430ac93
1 parent 3f0c4c4
commit 430ac93
Showing 1 changed file with 2 additions and 5 deletions.
diff --git 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,
         };