Move "Show in Groups" toggle action into Sort menu

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

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 720e07ce37e91067b319c108580847b24aaf30af..cb3f3183b1a40cc485f8199466cf53657c0998f9 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -1,546 +1,292 @@
-/***************************************************************************
- *   Copyright (C) 2008-2012 by Peter Penz <peter.penz19@gmail.com>        *
- *                                                                         *
- *   Based on KFilePlacesView from kdelibs:                                *
- *   Copyright (C) 2007 Kevin Ottens <ervin@kde.org>                       *
- *   Copyright (C) 2007 David Faure <faure@kde.org>                        *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2008-2012 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2021 Kai Uwe Broulik <kde@broulik.de>
+ *
+ * Based on KFilePlacesView from kdelibs:
+ * SPDX-FileCopyrightText: 2007 Kevin Ottens <ervin@kde.org>
+ * SPDX-FileCopyrightText: 2007 David Faure <faure@kde.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"
 
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"

+#include "dolphin_placespanelsettings.h"
+#include "dolphinplacesmodelsingleton.h"
+#include "settings/dolphinsettingsdialog.h"
+#include "views/draganddrophelper.h"

 
 

-#include <KDebug>
-#include <KDirNotify>
-#include <KIcon>
+#include <KFilePlacesModel>
+#include <KIO/DropJob>

 #include <KIO/Job>
 #include <KIO/Job>

-#include <KIO/JobUiDelegate>
-#include <KLocale>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kstandarditem.h>
-#include <KMenu>
-#include <KMessageBox>
-#include <KNotification>
-#include "placesitem.h"
-#include "placesitemeditdialog.h"
-#include "placesitemlistgroupheader.h"
-#include "placesitemlistwidget.h"
-#include "placesitemmodel.h"
-#include "placesview.h"
-#include <views/draganddrophelper.h>
-#include <QGraphicsSceneDragDropEvent>
-#include <QVBoxLayout>
+#include <KLocalizedString>
+#include <KProtocolManager>
+
+#include <QIcon>
+#include <QMenu>
+#include <QMimeData>

 #include <QShowEvent>
 
 #include <QShowEvent>
 

-PlacesPanel::PlacesPanel(QWidget* parent) :
-    Panel(parent),
-    m_controller(0),
-    m_model(0),
-    m_storageSetupFailedUrl(),
-    m_triggerStorageSetupButton(),
-    m_itemDropEventIndex(-1),
-    m_itemDropEventMimeData(0),
-    m_itemDropEvent(0)
-{
-}
+#include <Solid/StorageAccess>

 
 

-PlacesPanel::~PlacesPanel()
+PlacesPanel::PlacesPanel(QWidget *parent)
+    : KFilePlacesView(parent)

 {
 {

+    setDropOnPlaceEnabled(true);
+    connect(this, &PlacesPanel::urlsDropped, this, &PlacesPanel::slotUrlsDropped);
+
+    setAutoResizeItemsEnabled(false);
+
+    setTeardownFunction([this](const QModelIndex &index) {
+        slotTearDownRequested(index);
+    });
+
+    m_openInSplitView = new QAction(QIcon::fromTheme(QStringLiteral("view-split-left-right")), i18nc("@action:inmenu", "Open in Split View"));
+    m_openInSplitView->setPriority(QAction::HighPriority);
+    connect(m_openInSplitView, &QAction::triggered, this, [this]() {
+        const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();
+        Q_EMIT openInSplitViewRequested(url);
+    });
+    addAction(m_openInSplitView);
+
+    m_configureTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18nc("@action:inmenu", "Configure Trash…"));
+    m_configureTrashAction->setPriority(QAction::HighPriority);
+    connect(m_configureTrashAction, &QAction::triggered, this, &PlacesPanel::slotConfigureTrash);
+    addAction(m_configureTrashAction);
+
+    connect(this, &PlacesPanel::contextMenuAboutToShow, this, &PlacesPanel::slotContextMenuAboutToShow);
+
+    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();
+        settings->setIconSize(iconSize);
+        settings->save();
+    });

 }
 
 }
 

-bool PlacesPanel::urlChanged()
-{
-    if (!url().isValid() || url().protocol().contains("search")) {
-        // Skip results shown by a search, as possible identical
-        // directory names are useless without parent-path information.
-        return false;
-    }
+PlacesPanel::~PlacesPanel() = default;

 
 

-    if (m_controller) {
-        selectClosestItem();
-    }
-
-    return true;
-}
-
-void PlacesPanel::readSettings()
+void PlacesPanel::setUrl(const QUrl &url)

 {
 {

-    if (m_controller) {
-       const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
-       m_controller->setAutoActivationDelay(delay);
-    }
+    // KFilePlacesView::setUrl no-ops when no model is set but we only set it in showEvent()
+    // Remember the URL and set it in showEvent
+    m_url = url;
+    KFilePlacesView::setUrl(url);

 }
 
 }
 

-void PlacesPanel::showEvent(QShowEvent* event)
+QList<QAction *> PlacesPanel::customContextMenuActions() const

 {
 {

-    if (event->spontaneous()) {
-        Panel::showEvent(event);
-        return;
-    }
-
-    if (!m_controller) {
-        // Postpone the creating of the controller to the first show event.
-        // This assures that no performance and memory overhead is given when the folders panel is not
-        // used at all and stays invisible.
-        m_model = new PlacesItemModel(this);
-        m_model->setGroupedSorting(true);
-        connect(m_model, SIGNAL(errorMessage(QString)),
-                this, SIGNAL(errorMessage(QString)));
-
-        m_view = new PlacesView();
-        m_view->setWidgetCreator(new KItemListWidgetCreator<PlacesItemListWidget>());
-        m_view->setGroupHeaderCreator(new KItemListGroupHeaderCreator<PlacesItemListGroupHeader>());
-
-        m_controller = new KItemListController(m_model, m_view, this);
-        m_controller->setSelectionBehavior(KItemListController::SingleSelection);
-        m_controller->setSingleClickActivationEnforced(true);
-
-       readSettings();
-
-        connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
-        connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
-        connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
-        connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
-        connect(m_controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
-        connect(m_controller, SIGNAL(aboveItemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotAboveItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
-
-        KItemListContainer* container = new KItemListContainer(m_controller, this);
-        container->setEnabledFrame(false);
-
-        QVBoxLayout* layout = new QVBoxLayout(this);
-        layout->setMargin(0);
-        layout->addWidget(container);
-
-        selectClosestItem();
-    }
-
-    Panel::showEvent(event);
+    return m_customContextMenuActions;

 }
 
 }
 

-void PlacesPanel::slotItemActivated(int index)
+void PlacesPanel::setCustomContextMenuActions(const QList<QAction *> &actions)

 {
 {

-    triggerItem(index, Qt::LeftButton);
+    m_customContextMenuActions = actions;

 }
 
 }
 

-void PlacesPanel::slotItemMiddleClicked(int index)
+void PlacesPanel::proceedWithTearDown()

 {
 {

-    triggerItem(index, Qt::MiddleButton);
+    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::slotItemContextMenuRequested(int index, const QPointF& pos)
+void PlacesPanel::readSettings()

 {
 {

-    PlacesItem* item = m_model->placesItem(index);
-    if (!item) {
-        return;
+    if (GeneralSettings::autoExpandFolders()) {
+        setDragAutoActivationDelay(750);
+    } else {
+        setDragAutoActivationDelay(0);

     }
 
     }
 

-    KMenu menu(this);
+    const int iconSize = qMax(0, PlacesPanelSettings::iconSize());
+    setIconSize(QSize(iconSize, iconSize));
+}

 
 

-    QAction* emptyTrashAction = 0;
-    QAction* addAction = 0;
-    QAction* mainSeparator = 0;
-    QAction* editAction = 0;
-    QAction* teardownAction = 0;
-    QAction* ejectAction = 0;
+void PlacesPanel::showEvent(QShowEvent *event)
+{
+    if (!event->spontaneous() && !model()) {
+        readSettings();

 
 

-    const QString label = item->text();
+        auto *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
+        setModel(placesModel);

 
 

-    const bool isDevice = !item->udi().isEmpty();
-    if (isDevice) {
-        ejectAction = m_model->ejectAction(index);
-        if (ejectAction) {
-            ejectAction->setParent(&menu);
-            menu.addAction(ejectAction);
-        }
+        connect(placesModel, &KFilePlacesModel::errorMessage, this, &PlacesPanel::errorMessage);
+        connect(placesModel, &KFilePlacesModel::teardownDone, this, &PlacesPanel::slotTearDownDone);

 
 

-        teardownAction = m_model->teardownAction(index);
-        if (teardownAction) {
-            teardownAction->setParent(&menu);
-            menu.addAction(teardownAction);
-        }
+        connect(placesModel, &QAbstractItemModel::rowsInserted, this, &PlacesPanel::slotRowsInserted);
+        connect(placesModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, &PlacesPanel::slotRowsAboutToBeRemoved);

 
 

-        if (teardownAction || ejectAction) {
-            mainSeparator = menu.addSeparator();
+        for (int i = 0; i < model()->rowCount(); ++i) {
+            connectDeviceSignals(model()->index(i, 0, QModelIndex()));

         }
         }

-    } else {
-        if (item->url() == KUrl("trash:/")) {
-            emptyTrashAction = menu.addAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"));
-            emptyTrashAction->setEnabled(item->icon() == "user-trash-full");
-            menu.addSeparator();
-        }
-        addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry..."));
-        mainSeparator = menu.addSeparator();
-        editAction = menu.addAction(KIcon("document-properties"), i18nc("@item:inmenu", "Edit '%1'...", label));
-    }
-
-    if (!addAction) {
-        addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry..."));
-    }
-
-    QAction* openInNewTabAction = menu.addAction(i18nc("@item:inmenu", "Open '%1' in New Tab", label));
-    openInNewTabAction->setIcon(KIcon("tab-new"));

 
 

-    QAction* removeAction = 0;
-    if (!isDevice && !item->isSystemItem()) {
-        removeAction = menu.addAction(KIcon("edit-delete"), i18nc("@item:inmenu", "Remove '%1'", label));
+        setUrl(m_url);

     }
 
     }
 

-    QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide '%1'", label));
-    hideAction->setCheckable(true);
-    hideAction->setChecked(item->isHidden());
+    KFilePlacesView::showEvent(event);
+}

 
 

-    QAction* showAllAction = 0;
-    if (m_model->hiddenCount() > 0) {
-        if (!mainSeparator) {
-            mainSeparator = menu.addSeparator();
+static bool isInternalDrag(const QMimeData *mimeData)
+{
+    const auto formats = mimeData->formats();
+    for (const auto &format : formats) {
+        // from KFilePlacesModel::_k_internalMimetype
+        if (format.startsWith(QLatin1String("application/x-kfileplacesmodel-"))) {
+            return true;

         }
         }

-        showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
-        showAllAction->setCheckable(true);
-        showAllAction->setChecked(m_model->hiddenItemsShown());
-    }
-
-    menu.addSeparator();
-    KMenu* iconSizeSubMenu = new KMenu(i18nc("@item:inmenu", "Icon Size"), &menu);
-
-    struct IconSizeInfo
-    {
-        int size;
-        const char* context;
-        const char* text;
-    };
-
-    const int iconSizeCount = 4;
-    static const IconSizeInfo iconSizes[iconSizeCount] = {
-        {KIconLoader::SizeSmall,        I18N_NOOP2_NOSTRIP("Small icon size", "Small (%1x%2)")},
-        {KIconLoader::SizeSmallMedium,  I18N_NOOP2_NOSTRIP("Medium icon size", "Medium (%1x%2)")},
-        {KIconLoader::SizeMedium,       I18N_NOOP2_NOSTRIP("Large icon size", "Large (%1x%2)")},
-        {KIconLoader::SizeLarge,        I18N_NOOP2_NOSTRIP("Huge icon size", "Huge (%1x%2)")}
-    };
-
-    QMap<QAction*, int> iconSizeActionMap;
-    QActionGroup* iconSizeGroup = new QActionGroup(iconSizeSubMenu);
-
-    for (int i = 0; i < iconSizeCount; ++i) {
-        const int size = iconSizes[i].size;
-        const QString text = i18nc(iconSizes[i].context, iconSizes[i].text,
-                                   size, size);
-
-        QAction* action = iconSizeSubMenu->addAction(text);
-        iconSizeActionMap.insert(action, size);
-        action->setActionGroup(iconSizeGroup);
-        action->setCheckable(true);
-        action->setChecked(m_view->iconSize() == size);
-    }
-
-    menu.addMenu(iconSizeSubMenu);
-
-    menu.addSeparator();
-    foreach (QAction* action, customContextMenuActions()) {
-        menu.addAction(action);

     }
     }

+    return false;
+}

 
 

-    QAction* action = menu.exec(pos.toPoint());
-    if (action) {
-        if (action == emptyTrashAction) {
-            emptyTrash();
-        } else if (action == addAction) {
-            addEntry();
-        } else if (action == showAllAction) {
-            m_model->setHiddenItemsShown(showAllAction->isChecked());
-        } else if (iconSizeActionMap.contains(action)) {
-            m_view->setIconSize(iconSizeActionMap.value(action));
-        } else {
-            // The index might have changed if devices were added/removed while
-            // the context menu was open.
-            index = m_model->index(item);
-            if (index < 0) {
-                // The item is not in the model any more, probably because it was an
-                // external device that has been removed while the context menu was open.
-                return;
-            }
-
-            if (action == editAction) {
-                editEntry(index);
-            } else if (action == removeAction) {
-                m_model->removeItem(index);
-            } else if (action == hideAction) {
-                item->setHidden(hideAction->isChecked());
-            } else if (action == openInNewTabAction) {
-                // TriggerItem does set up the storage first and then it will
-                // emit the slotItemMiddleClicked signal, because of Qt::MiddleButton.
-                triggerItem(index, Qt::MiddleButton);
-            } else if (action == teardownAction) {
-                m_model->requestTeardown(index);
-            } else if (action == ejectAction) {
-                m_model->requestEject(index);
+void PlacesPanel::dragMoveEvent(QDragMoveEvent *event)
+{
+    const QModelIndex index = indexAt(event->position().toPoint());
+    if (index.isValid()) {
+        auto *placesModel = static_cast<KFilePlacesModel *>(model());
+
+        // Reject drag ontop of a non-writable protocol
+        // We don't know whether we're dropping inbetween or ontop of a place
+        // so still allow internal drag events so that re-arranging still works.
+        if (!isInternalDrag(event->mimeData())) {
+            const QUrl url = placesModel->url(index);
+            if (!url.isValid() || !KProtocolManager::supportsWriting(url)) {
+                event->setDropAction(Qt::IgnoreAction);
+            } else {
+                DragAndDropHelper::updateDropAction(event, url);

             }
         }
     }
 
             }
         }
     }
 

-    selectClosestItem();
+    KFilePlacesView::dragMoveEvent(event);

 }
 
 }
 

-void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
+void PlacesPanel::slotConfigureTrash()

 {
 {

-    KMenu menu(this);
-
-    QAction* addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry..."));
+    const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();

 
 

-    QAction* showAllAction = 0;
-    if (m_model->hiddenCount() > 0) {
-        showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
-        showAllAction->setCheckable(true);
-        showAllAction->setChecked(m_model->hiddenItemsShown());
-    }
-
-    menu.addSeparator();
-    foreach (QAction* action, customContextMenuActions()) {
-        menu.addAction(action);
-    }
-
-    QAction* action = menu.exec(pos.toPoint());
-    if (action) {
-        if (action == addAction) {
-            addEntry();
-        } else if (action == showAllAction) {
-            m_model->setHiddenItemsShown(showAllAction->isChecked());
-        }
-    }
-
-    selectClosestItem();
+    DolphinSettingsDialog *settingsDialog = new DolphinSettingsDialog(url, this);
+    settingsDialog->setCurrentPage(settingsDialog->trashSettings);
+    settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
+    settingsDialog->show();

 }
 
 }
 

-void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+void PlacesPanel::slotUrlsDropped(const QUrl &dest, QDropEvent *event, QWidget *parent)

 {
 {

-    if (index < 0) {
-        return;
-    }
-
-    const PlacesItem* destItem = m_model->placesItem(index);
-    const PlacesItem::GroupType group = destItem->groupType();
-    if (group == PlacesItem::SearchForType || group == PlacesItem::RecentlySavedType) {
-        return;
-    }
-
-    if (m_model->storageSetupNeeded(index)) {
-        connect(m_model, SIGNAL(storageSetupDone(int,bool)),
-                this, SLOT(slotItemDropEventStorageSetupDone(int,bool)));
-
-        m_itemDropEventIndex = index;
-
-        // Make a full copy of the Mime-Data
-        m_itemDropEventMimeData = new QMimeData;
-        m_itemDropEventMimeData->setText(event->mimeData()->text());
-        m_itemDropEventMimeData->setHtml(event->mimeData()->html());
-        m_itemDropEventMimeData->setUrls(event->mimeData()->urls());
-        m_itemDropEventMimeData->setImageData(event->mimeData()->imageData());
-        m_itemDropEventMimeData->setColorData(event->mimeData()->colorData());
-
-        m_itemDropEvent = new QDropEvent(event->pos().toPoint(),
-                                         event->possibleActions(),
-                                         m_itemDropEventMimeData,
-                                         event->buttons(),
-                                         event->modifiers());
-
-        m_model->requestStorageSetup(index);
-        return;
-    }
-
-    KUrl destUrl = destItem->url();
-    QDropEvent dropEvent(event->pos().toPoint(),
-                         event->possibleActions(),
-                         event->mimeData(),
-                         event->buttons(),
-                         event->modifiers());
-
-    QString error;
-    DragAndDropHelper::dropUrls(KFileItem(), destUrl, &dropEvent, error);
-    if (!error.isEmpty()) {
-        emit errorMessage(error);
+    KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent);
+    if (job) {
+        connect(job, &KIO::DropJob::result, this, [this](KJob *job) {
+            if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {
+                Q_EMIT errorMessage(job->errorString());
+            }
+        });

     }
 }
 
     }
 }
 

-void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
+void PlacesPanel::slotContextMenuAboutToShow(const QModelIndex &index, QMenu *menu)

 {
 {

-    disconnect(m_model, SIGNAL(storageSetupDone(int,bool)),
-               this, SLOT(slotItemDropEventStorageSetupDone(int,bool)));
+    Q_UNUSED(menu);
+
+    auto *placesModel = static_cast<KFilePlacesModel *>(model());
+    const QUrl url = placesModel->url(index);
+    const Solid::Device device = placesModel->deviceForIndex(index);

 
 

-    if ((index == m_itemDropEventIndex) && m_itemDropEvent && m_itemDropEventMimeData) {
-        if (success) {
-            KUrl destUrl = m_model->placesItem(index)->url();
+    m_configureTrashAction->setVisible(url.scheme() == QLatin1String("trash"));
+    m_openInSplitView->setVisible(url.isValid());

 
 

-            QString error;
-            DragAndDropHelper::dropUrls(KFileItem(), destUrl, m_itemDropEvent, error);
-            if (!error.isEmpty()) {
-                emit errorMessage(error);
+    // show customContextMenuActions only on the view's context menu
+    if (!url.isValid() && !device.isValid()) {
+        addActions(m_customContextMenuActions);
+    } else {
+        const auto actions = this->actions();
+        for (QAction *action : actions) {
+            if (m_customContextMenuActions.contains(action)) {
+                removeAction(action);

             }
         }
             }
         }

-
-        delete m_itemDropEventMimeData;
-        delete m_itemDropEvent;
-
-        m_itemDropEventIndex = -1;
-        m_itemDropEventMimeData = 0;
-        m_itemDropEvent = 0;

     }
 }
 
     }
 }
 

-void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+void PlacesPanel::slotTearDownRequested(const QModelIndex &index)

 {
 {

-    m_model->dropMimeDataBefore(index, event->mimeData());
-}
+    auto *placesModel = static_cast<KFilePlacesModel *>(model());

 
 

-void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
-{
-    Q_UNUSED(parent);
-    QString error;
-    DragAndDropHelper::dropUrls(KFileItem(), dest, event, error);
-    if (!error.isEmpty()) {
-        emit errorMessage(error);
+    Solid::StorageAccess *storageAccess = placesModel->deviceForIndex(index).as<Solid::StorageAccess>();
+    if (!storageAccess) {
+        return;

     }
 
     }
 

+    m_indexToTearDown = QPersistentModelIndex(index);
+
+    // disconnect the Solid::StorageAccess::teardownRequested
+    // to prevent emitting PlacesPanel::storageTearDownExternallyRequested
+    // after we have emitted PlacesPanel::storageTearDownRequested
+    disconnect(storageAccess, &Solid::StorageAccess::teardownRequested, this, &PlacesPanel::slotTearDownRequestedExternally);
+    Q_EMIT storageTearDownRequested(storageAccess->filePath());

 }
 
 }
 

-void PlacesPanel::slotTrashUpdated(KJob* job)
+void PlacesPanel::slotTearDownRequestedExternally(const QString &udi)

 {
 {

-    if (job->error()) {
-        emit errorMessage(job->errorString());
-    }
-    org::kde::KDirNotify::emitFilesAdded("trash:/");
+    Q_UNUSED(udi);
+    auto *storageAccess = static_cast<Solid::StorageAccess *>(sender());
+
+    Q_EMIT storageTearDownExternallyRequested(storageAccess->filePath());

 }
 
 }
 

-void PlacesPanel::slotStorageSetupDone(int index, bool success)
+void PlacesPanel::slotTearDownDone(const QModelIndex &index, Solid::ErrorType error, const QVariant &errorData)

 {
 {

-    disconnect(m_model, SIGNAL(storageSetupDone(int,bool)),
-               this, SLOT(slotStorageSetupDone(int,bool)));
+    Q_UNUSED(errorData); // All error handling is currently done in frameworks.

 
 

-    if (m_triggerStorageSetupButton == Qt::NoButton) {
-        return;
-    }
-
-    if (success) {
-        Q_ASSERT(!m_model->storageSetupNeeded(index));
-        triggerItem(index, m_triggerStorageSetupButton);
-        m_triggerStorageSetupButton = Qt::NoButton;
-    } else {
-        setUrl(m_storageSetupFailedUrl);
-        m_storageSetupFailedUrl = KUrl();
+    if (index == m_indexToTearDown) {
+        if (error == Solid::ErrorType::NoError) {
+            // No error; it must have been unmounted successfully
+            Q_EMIT storageTearDownSuccessful();
+        }
+        m_indexToTearDown = QPersistentModelIndex();

     }
 }
 
     }
 }
 

-void PlacesPanel::emptyTrash()
+void PlacesPanel::slotRowsInserted(const QModelIndex &parent, int first, int last)

 {
 {

-    const QString text = i18nc("@info", "Do you really want to empty the Trash? All items will be deleted.");
-    const bool del = KMessageBox::warningContinueCancel(window(),
-                                                        text,
-                                                        QString(),
-                                                        KGuiItem(i18nc("@action:button", "Empty Trash"),
-                                                                 KIcon("user-trash"))
-                                                       ) == KMessageBox::Continue;
-    if (del) {
-        QByteArray packedArgs;
-        QDataStream stream(&packedArgs, QIODevice::WriteOnly);
-        stream << int(1);
-        KIO::Job *job = KIO::special(KUrl("trash:/"), packedArgs);
-        KNotification::event("Trash: emptied", QString() , QPixmap() , 0, KNotification::DefaultEvent);
-        job->ui()->setWindow(parentWidget());
-        connect(job, SIGNAL(result(KJob*)), SLOT(slotTrashUpdated(KJob*)));
+    for (int i = first; i <= last; ++i) {
+        connectDeviceSignals(model()->index(i, 0, parent));

     }
 }
 
     }
 }
 

-void PlacesPanel::addEntry()
+void PlacesPanel::slotRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last)

 {
 {

-    const int index = m_controller->selectionManager()->currentItem();
-    const KUrl url = m_model->data(index).value("url").value<KUrl>();
-
-    QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);
-    dialog->setCaption(i18nc("@title:window", "Add Places Entry"));
-    dialog->setAllowGlobal(true);
-    dialog->setUrl(url);
-    if (dialog->exec() == QDialog::Accepted) {
-        PlacesItem* item = m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon());
-        m_model->appendItemToGroup(item);
-    }
+    auto *placesModel = static_cast<KFilePlacesModel *>(model());

 
 

-    delete dialog;
-}
+    for (int i = first; i <= last; ++i) {
+        const QModelIndex index = placesModel->index(i, 0, parent);

 
 

-void PlacesPanel::editEntry(int index)
-{
-    QHash<QByteArray, QVariant> data = m_model->data(index);
-
-    QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);
-    dialog->setCaption(i18nc("@title:window", "Edit Places Entry"));
-    dialog->setIcon(data.value("iconName").toString());
-    dialog->setText(data.value("text").toString());
-    dialog->setUrl(data.value("url").value<KUrl>());
-    dialog->setAllowGlobal(true);
-    if (dialog->exec() == QDialog::Accepted) {
-        PlacesItem* oldItem = m_model->placesItem(index);
-        if (oldItem) {
-            oldItem->setText(dialog->text());
-            oldItem->setUrl(dialog->url());
-            oldItem->setIcon(dialog->icon());
+        Solid::StorageAccess *storageAccess = placesModel->deviceForIndex(index).as<Solid::StorageAccess>();
+        if (!storageAccess) {
+            continue;

         }
         }

-    }

 
 

-    delete dialog;
+        disconnect(storageAccess, &Solid::StorageAccess::teardownRequested, this, nullptr);
+    }

 }
 
 }
 

-void PlacesPanel::selectClosestItem()
+void PlacesPanel::connectDeviceSignals(const QModelIndex &index)

 {
 {

-    const int index = m_model->closestItem(url());
-    KItemListSelectionManager* selectionManager = m_controller->selectionManager();
-    selectionManager->setCurrentItem(index);
-    selectionManager->clearSelection();
-    selectionManager->setSelected(index);
-}
+    auto *placesModel = static_cast<KFilePlacesModel *>(model());

 
 

-void PlacesPanel::triggerItem(int index, Qt::MouseButton button)
-{
-    const PlacesItem* item = m_model->placesItem(index);
-    if (!item) {
+    Solid::StorageAccess *storageAccess = placesModel->deviceForIndex(index).as<Solid::StorageAccess>();
+    if (!storageAccess) {

         return;
     }
 
         return;
     }
 

-    if (m_model->storageSetupNeeded(index)) {
-        m_triggerStorageSetupButton = button;
-        m_storageSetupFailedUrl = url();
-
-        connect(m_model, SIGNAL(storageSetupDone(int,bool)),
-                this, SLOT(slotStorageSetupDone(int,bool)));
-
-        m_model->requestStorageSetup(index);
-    } else {
-        m_triggerStorageSetupButton = Qt::NoButton;
-
-        const KUrl url = m_model->data(index).value("url").value<KUrl>();
-        if (!url.isEmpty()) {
-            if (button == Qt::MiddleButton) {
-                emit placeMiddleClicked(PlacesItemModel::convertedUrl(url));
-            } else {
-                emit placeActivated(PlacesItemModel::convertedUrl(url));
-            }
-        }
-    }
+    connect(storageAccess, &Solid::StorageAccess::teardownRequested, this, &PlacesPanel::slotTearDownRequestedExternally);

 }
 
 }
 

-
-#include "placespanel.moc"
+#include "moc_placespanel.cpp"