mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 21:35:47 +03:00
display icons for files when solving many conflicts
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
parent
789ca7230a
commit
779cc3a75b
1 changed files with 2 additions and 5 deletions
|
@ -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,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue