mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 21:35:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

display icons for files when solving many conflicts

Browse source 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2023-05-03 19:17:11 +02:00 committed by Matthieu Gallien
parent 789ca7230a
commit 779cc3a75b
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gui/syncconflictsmodel.cpp
View file

@ -151,17 +151,14 @@ void SyncConflictsModel::updateConflictsData()
const auto existingFileInfo = QFileInfo(basePath); const auto existingFileInfo = QFileInfo(basePath);
const auto conflictFileInfo = QFileInfo(conflictedPath); const auto conflictFileInfo = QFileInfo(conflictedPath);
const auto existingMimeType = mMimeDb.mimeTypeForFile(existingFileInfo.fileName());
const auto conflictMimeType = mMimeDb.mimeTypeForFile(conflictFileInfo.fileName());
auto newConflictData = ConflictInfo{ auto newConflictData = ConflictInfo{
existingFileInfo.fileName(), existingFileInfo.fileName(),
mLocale.formattedDataSize(existingFileInfo.size()), mLocale.formattedDataSize(existingFileInfo.size()),
mLocale.formattedDataSize(conflictFileInfo.size()), mLocale.formattedDataSize(conflictFileInfo.size()),
existingFileInfo.lastModified().toString(), existingFileInfo.lastModified().toString(),
conflictFileInfo.lastModified().toString(), conflictFileInfo.lastModified().toString(),
QIcon::hasThemeIcon(existingMimeType.iconName()) ? QUrl{} : QUrl{":/qt-project.org/styles/commonstyle/images/file-128.png"}, QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + existingFileInfo.fileName()},
QIcon::hasThemeIcon(conflictMimeType.iconName()) ? QUrl{} : QUrl{":/qt-project.org/styles/commonstyle/images/file-128.png"}, QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + conflictFileInfo.fileName()},
false, false,
false, false,
}; };