SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / trash / dolphintrash.cpp

diff --git a/src/trash/dolphintrash.cpp b/src/trash/dolphintrash.cpp
index dd71135a52b166cd980d904d2cde73b6cd1df188..8f57e6c00428ed3dd531a366146403fedbdb44ff 100644 (file)
--- a/src/trash/dolphintrash.cpp
+++ b/src/trash/dolphintrash.cpp
@@ -12,6 +12,9 @@
 #include <KIO/DeleteOrTrashJob>
 #include <KLocalizedString>
 #include <KNotification>
+#include <Solid/Device>
+#include <Solid/DeviceNotifier>
+#include <Solid/StorageAccess>
 
 #include <QList>
 
@@ -29,6 +32,26 @@ Trash::Trash()
     };
     connect(m_trashDirLister, &KCoreDirLister::completed, this, trashDirContentChanged);
     connect(m_trashDirLister, &KDirLister::itemsDeleted, this, trashDirContentChanged);
+
+    // Update trash directory when removable storage devices are changed to keep it in sync with the
+    // storage device .Trash-1000 folders
+    Solid::DeviceNotifier *notifier = Solid::DeviceNotifier::instance();
+    connect(notifier, &Solid::DeviceNotifier::deviceAdded, this, [this](const QString &device) {
+        const Solid::Device dev(device);
+        if (dev.isValid() && dev.is<Solid::StorageAccess>()) {
+            const Solid::StorageAccess *access = dev.as<Solid::StorageAccess>();
+            connect(access, &Solid::StorageAccess::accessibilityChanged, this, [this]() {
+                m_trashDirLister->updateDirectory(QUrl(QStringLiteral("trash:/")));
+            });
+        }
+    });
+    connect(notifier, &Solid::DeviceNotifier::deviceRemoved, this, [this](const QString &device) {
+        const Solid::Device dev(device);
+        if (dev.isValid() && dev.is<Solid::StorageAccess>()) {
+            m_trashDirLister->updateDirectory(QUrl(QStringLiteral("trash:/")));
+        }
+    });
+
     m_trashDirLister->openUrl(QUrl(QStringLiteral("trash:/")));
 }
 
@@ -64,7 +87,7 @@ void Trash::empty(QWidget *window)
 bool Trash::isEmpty()
 {
     KConfig trashConfig(QStringLiteral("trashrc"), KConfig::SimpleConfig);
-    return (trashConfig.group("Status").readEntry("Empty", true));
+    return (trashConfig.group(QStringLiteral("Status")).readEntry("Empty", true));
 }
 
 #include "moc_dolphintrash.cpp"