Merge branch 'master' into kf6

[dolphin.git] / src / panels / places / placespanel.cpp

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 38dc4dc3a65d53c3168fffa3fd2a811999a5f65e..2d508ba65f8198c7d263af1174d573609646cddf 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -11,17 +11,15 @@
 
 #include "placespanel.h"
 
-#include "dolphinplacesmodelsingleton.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_placespanelsettings.h"
-#include "global.h"
-#include "views/draganddrophelper.h"
+#include "dolphinplacesmodelsingleton.h"
 #include "settings/dolphinsettingsdialog.h"
+#include "views/draganddrophelper.h"
 
 #include <KFilePlacesModel>
 #include <KIO/DropJob>
 #include <KIO/Job>
-#include <KListOpenFilesJob>
 #include <KLocalizedString>
 #include <KProtocolManager>
 
@@ -29,16 +27,14 @@
 #include <QMenu>
 #include <QMimeData>
 #include <QShowEvent>
-#include <QTimer>
 
 #include <Solid/StorageAccess>
 
-PlacesPanel::PlacesPanel(QWidget* parent)
+PlacesPanel::PlacesPanel(QWidget *parent)
     : KFilePlacesView(parent)
 {
     setDropOnPlaceEnabled(true);
-    connect(this, &PlacesPanel::urlsDropped,
-            this, &PlacesPanel::slotUrlsDropped);
+    connect(this, &PlacesPanel::urlsDropped, this, &PlacesPanel::slotUrlsDropped);
 
     setAutoResizeItemsEnabled(false);
 
@@ -53,13 +49,13 @@ PlacesPanel::PlacesPanel(QWidget* parent)
 
     connect(this, &PlacesPanel::contextMenuAboutToShow, this, &PlacesPanel::slotContextMenuAboutToShow);
 
-    connect(this, &PlacesPanel::iconSizeChanged, this, [this](const QSize &newSize) {
+    connect(this, &PlacesPanel::iconSizeChanged, this, [](const QSize &newSize) {
         int iconSize = qMin(newSize.width(), newSize.height());
         if (iconSize == 0) {
             // Don't store 0 size, let's keep -1 for default/small/automatic
             iconSize = -1;
         }
-        PlacesPanelSettings* settings = PlacesPanelSettings::self();
+        PlacesPanelSettings *settings = PlacesPanelSettings::self();
         settings->setIconSize(iconSize);
         settings->save();
     });
@@ -75,7 +71,7 @@ void PlacesPanel::setUrl(const QUrl &url)
     KFilePlacesView::setUrl(url);
 }
 
-QList<QAction*> PlacesPanel::customContextMenuActions() const
+QList<QAction *> PlacesPanel::customContextMenuActions() const
 {
     return m_customContextMenuActions;
 }
@@ -87,11 +83,12 @@ void PlacesPanel::setCustomContextMenuActions(const QList<QAction *> &actions)
 
 void PlacesPanel::proceedWithTearDown()
 {
-    Q_ASSERT(m_deviceToTearDown);
-
-    connect(m_deviceToTearDown, &Solid::StorageAccess::teardownDone,
-            this, &PlacesPanel::slotTearDownDone);
-    m_deviceToTearDown->teardown();
+    if (m_indexToTearDown.isValid()) {
+        auto *placesModel = static_cast<KFilePlacesModel *>(model());
+        placesModel->requestTeardown(m_indexToTearDown);
+    } else {
+        qWarning() << "Places entry to tear down is no longer valid";
+    }
 }
 
 void PlacesPanel::readSettings()
@@ -106,7 +103,7 @@ void PlacesPanel::readSettings()
     setIconSize(QSize(iconSize, iconSize));
 }
 
-void PlacesPanel::showEvent(QShowEvent* event)
+void PlacesPanel::showEvent(QShowEvent *event)
 {
     if (!event->spontaneous() && !model()) {
         readSettings();
@@ -115,6 +112,7 @@ void PlacesPanel::showEvent(QShowEvent* event)
         setModel(placesModel);
 
         connect(placesModel, &KFilePlacesModel::errorMessage, this, &PlacesPanel::errorMessage);
+        connect(placesModel, &KFilePlacesModel::teardownDone, this, &PlacesPanel::slotTearDownDone);
 
         connect(placesModel, &QAbstractItemModel::rowsInserted, this, &PlacesPanel::slotRowsInserted);
         connect(placesModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PlacesPanel::slotRowsAboutToBeRemoved);
@@ -143,7 +141,7 @@ static bool isInternalDrag(const QMimeData *mimeData)
 
 void PlacesPanel::dragMoveEvent(QDragMoveEvent *event)
 {
-    const QModelIndex index = indexAt(event->pos());
+    const QModelIndex index = indexAt(event->position().toPoint());
     if (index.isValid()) {
         auto *placesModel = static_cast<KFilePlacesModel *>(model());
 
@@ -163,17 +161,21 @@ void PlacesPanel::slotConfigureTrash()
 {
     const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();
 
-    DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this);
+    DolphinSettingsDialog *settingsDialog = new DolphinSettingsDialog(url, this);
     settingsDialog->setCurrentPage(settingsDialog->trashSettings);
     settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
     settingsDialog->show();
 }
 
-void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* parent)
+void PlacesPanel::slotUrlsDropped(const QUrl &dest, QDropEvent *event, QWidget *parent)
 {
     KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent);
     if (job) {
-        connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) Q_EMIT errorMessage(job->errorString()); });
+        connect(job, &KIO::DropJob::result, this, [this](KJob *job) {
+            if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {
+                Q_EMIT errorMessage(job->errorString());
+            }
+        });
     }
 }
 
@@ -209,7 +211,7 @@ void PlacesPanel::slotTearDownRequested(const QModelIndex &index)
         return;
     }
 
-    m_deviceToTearDown = storageAccess;
+    m_indexToTearDown = QPersistentModelIndex(index);
 
     // disconnect the Solid::StorageAccess::teardownRequested
     // to prevent emitting PlacesPanel::storageTearDownExternallyRequested
@@ -221,44 +223,22 @@ void PlacesPanel::slotTearDownRequested(const QModelIndex &index)
 void PlacesPanel::slotTearDownRequestedExternally(const QString &udi)
 {
     Q_UNUSED(udi);
-    auto *storageAccess = static_cast<Solid::StorageAccess*>(sender());
+    auto *storageAccess = static_cast<Solid::StorageAccess *>(sender());
 
     Q_EMIT storageTearDownExternallyRequested(storageAccess->filePath());
 }
 
-void PlacesPanel::slotTearDownDone(Solid::ErrorType error, const QVariant& errorData)
+void PlacesPanel::slotTearDownDone(const QModelIndex &index, Solid::ErrorType error, const QVariant &errorData)
 {
-    if (error && errorData.isValid()) {
-        if (error == Solid::ErrorType::DeviceBusy) {
-            KListOpenFilesJob* listOpenFilesJob = new KListOpenFilesJob(m_deviceToTearDown->filePath());
-            connect(listOpenFilesJob, &KIO::Job::result, this, [this, listOpenFilesJob](KJob*) {
-                const KProcessList::KProcessInfoList blockingProcesses = listOpenFilesJob->processInfoList();
-                QString errorString;
-                if (blockingProcesses.isEmpty()) {
-                    errorString = i18n("One or more files on this device are open within an application.");
-                } else {
-                    QStringList blockingApps;
-                    for (const auto& process : blockingProcesses) {
-                        blockingApps << process.name();
-                    }
-                    blockingApps.removeDuplicates();
-                    errorString = xi18np("One or more files on this device are opened in application <application>\"%2\"</application>.",
-                            "One or more files on this device are opened in following applications: <application>%2</application>.",
-                            blockingApps.count(), blockingApps.join(i18nc("separator in list of apps blocking device unmount", ", ")));
-                }
-                Q_EMIT errorMessage(errorString);
-            });
-            listOpenFilesJob->start();
-        } else {
-            Q_EMIT errorMessage(errorData.toString());
+    Q_UNUSED(errorData); // All error handling is currently done in frameworks.
+
+    if (index == m_indexToTearDown) {
+        if (error == Solid::ErrorType::NoError) {
+            // No error; it must have been unmounted successfully
+            Q_EMIT storageTearDownSuccessful();
         }
-    } else {
-        // No error; it must have been unmounted successfully
-        Q_EMIT storageTearDownSuccessful();
+        m_indexToTearDown = QPersistentModelIndex();
     }
-    disconnect(m_deviceToTearDown, &Solid::StorageAccess::teardownDone,
-               this, &PlacesPanel::slotTearDownDone);
-    m_deviceToTearDown = nullptr;
 }
 
 void PlacesPanel::slotRowsInserted(const QModelIndex &parent, int first, int last)