From fa135a4228910e809f797d81ee5a4be154b32c43 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 4 May 2023 12:30:13 +0200 Subject: [PATCH] ensure the URL to mimetype icons are correct Signed-off-by: Matthieu Gallien --- src/gui/ResolveConflictsDialog.qml | 4 ++-- src/gui/syncconflictsmodel.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml index 6f8241c14..5e83d951a 100644 --- a/src/gui/ResolveConflictsDialog.qml +++ b/src/gui/ResolveConflictsDialog.qml @@ -147,12 +147,12 @@ QtWindow.Window { onAccepted: function() { console.log("Ok clicked") - Systray.destroyDialog(root) + Systray.destroyDialog(conflictsDialog) } onRejected: function() { console.log("Cancel clicked") - Systray.destroyDialog(root) + Systray.destroyDialog(conflictsDialog) } } } diff --git a/src/gui/syncconflictsmodel.cpp b/src/gui/syncconflictsmodel.cpp index 613a0bbbc..b03d35371 100644 --- a/src/gui/syncconflictsmodel.cpp +++ b/src/gui/syncconflictsmodel.cpp @@ -146,8 +146,6 @@ void SyncConflictsModel::updateConflictsData() const auto conflictedPath = dir.filePath(conflictedRelativePath); const auto basePath = dir.filePath(baseRelativePath); - qCInfo(lcSyncConflictsModel()) << "conflictedPath" << conflictedPath << "basePath" << basePath; - const auto existingFileInfo = QFileInfo(basePath); const auto conflictFileInfo = QFileInfo(conflictedPath); @@ -157,8 +155,8 @@ void SyncConflictsModel::updateConflictsData() mLocale.formattedDataSize(conflictFileInfo.size()), existingFileInfo.lastModified().toString(), conflictFileInfo.lastModified().toString(), - QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + existingFileInfo.fileName()}, - QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + conflictFileInfo.fileName()}, + QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + existingFileInfo.filePath()}, + QUrl{QStringLiteral("image://tray-image-provider/:/fileicon") + conflictFileInfo.filePath()}, false, false, }; -- 2.30.2