X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ce7852fb2352155e4373f9a41f0a01549985bd45..b7fa85a33d6b5c1b2a5b60b64a78f7f208ea304c:/src/views/dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 5646fa982..18d2137e3 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -7,8 +7,8 @@
 
 #include "dolphinview.h"
 
-#include "dolphin_generalsettings.h"
 #include "dolphin_detailsmodesettings.h"
+#include "dolphin_generalsettings.h"
 #include "dolphinitemlistview.h"
 #include "dolphinnewfilemenuobserver.h"
 #include "draganddrophelper.h"
@@ -19,13 +19,14 @@
 #include "kitemviews/kitemlistheader.h"
 #include "kitemviews/kitemlistselectionmanager.h"
 #include "kitemviews/private/kitemlistroleeditor.h"
+#include "selectionmode/singleclickselectionproxystyle.h"
 #include "settings/viewmodes/viewmodesettings.h"
 #include "versioncontrol/versioncontrolobserver.h"
 #include "viewproperties.h"
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
 
-#ifdef HAVE_BALOO
+#if HAVE_BALOO
 #include <Baloo/IndexerConfig>
 #endif
 #include <KColorScheme>
@@ -39,12 +40,19 @@
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
 #include <KIO/PasteJob>
-#include <KIO/PreviewJob>
 #include <KIO/RenameFileDialog>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KProtocolManager>
+#include <KUrlMimeData>
+
+#include <kwidgetsaddons_version.h>
+
+#include <kio_version.h>
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+#include <KIO/DeleteOrTrashJob>
+#endif
 
 #include <QAbstractItemView>
 #include <QActionGroup>
@@ -63,34 +71,34 @@
 #include <QToolTip>
 #include <QVBoxLayout>
 
-DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
-    QWidget(parent),
-    m_active(true),
-    m_tabsForFiles(false),
-    m_assureVisibleCurrentIndex(false),
-    m_isFolderWritable(true),
-    m_dragging(false),
-    m_loading(false),
-    m_url(url),
-    m_viewPropertiesContext(),
-    m_mode(DolphinView::IconsView),
-    m_visibleRoles(),
-    m_topLayout(nullptr),
-    m_model(nullptr),
-    m_view(nullptr),
-    m_container(nullptr),
-    m_toolTipManager(nullptr),
-    m_selectionChangedTimer(nullptr),
-    m_currentItemUrl(),
-    m_scrollToCurrentItem(false),
-    m_restoredContentsPosition(),
-    m_selectedUrls(),
-    m_clearSelectionBeforeSelectingNewItems(false),
-    m_markFirstNewlySelectedItemAsCurrent(false),
-    m_versionControlObserver(nullptr),
-    m_twoClicksRenamingTimer(nullptr),
-    m_placeholderLabel(nullptr),
-    m_showLoadingPlaceholderTimer(nullptr)
+DolphinView::DolphinView(const QUrl &url, QWidget *parent)
+    : QWidget(parent)
+    , m_active(true)
+    , m_tabsForFiles(false)
+    , m_assureVisibleCurrentIndex(false)
+    , m_isFolderWritable(true)
+    , m_dragging(false)
+    , m_url(url)
+    , m_viewPropertiesContext()
+    , m_mode(DolphinView::IconsView)
+    , m_visibleRoles()
+    , m_topLayout(nullptr)
+    , m_model(nullptr)
+    , m_view(nullptr)
+    , m_container(nullptr)
+    , m_toolTipManager(nullptr)
+    , m_selectNextItem(false)
+    , m_selectionChangedTimer(nullptr)
+    , m_currentItemUrl()
+    , m_scrollToCurrentItem(false)
+    , m_restoredContentsPosition()
+    , m_selectedUrls()
+    , m_clearSelectionBeforeSelectingNewItems(false)
+    , m_markFirstNewlySelectedItemAsCurrent(false)
+    , m_versionControlObserver(nullptr)
+    , m_twoClicksRenamingTimer(nullptr)
+    , m_placeholderLabel(nullptr)
+    , m_showLoadingPlaceholderTimer(nullptr)
 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
@@ -99,22 +107,20 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     // When a new item has been created by the "Create New..." menu, the item should
     // get selected and it must be assured that the item will get visible. As the
     // creation is done asynchronously, several signals must be checked:
-    connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::itemCreated,
-            this, &DolphinView::observeCreatedItem);
+    connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::itemCreated, this, &DolphinView::observeCreatedItem);
 
     m_selectionChangedTimer = new QTimer(this);
     m_selectionChangedTimer->setSingleShot(true);
     m_selectionChangedTimer->setInterval(300);
-    connect(m_selectionChangedTimer, &QTimer::timeout,
-            this, &DolphinView::emitSelectionChangedSignal);
+    connect(m_selectionChangedTimer, &QTimer::timeout, this, &DolphinView::emitSelectionChangedSignal);
 
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();
-    m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
+    m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::FollowSetting);
     m_view->setVisibleRoles({"text"});
     applyModeToView();
 
-    KItemListController* controller = new KItemListController(m_model, m_view, this);
+    KItemListController *controller = new KItemListController(m_model, m_view, this);
     const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
     controller->setAutoActivationDelay(delay);
 
@@ -125,8 +131,12 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     m_container = new KItemListContainer(controller, this);
     m_container->installEventFilter(this);
     setFocusProxy(m_container);
-    connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, [=] { hideToolTip(); });
-    connect(m_container->verticalScrollBar(), &QScrollBar::valueChanged, this, [=] { hideToolTip(); });
+    connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, [=] {
+        hideToolTip();
+    });
+    connect(m_container->verticalScrollBar(), &QScrollBar::valueChanged, this, [=] {
+        hideToolTip();
+    });
 
     m_showLoadingPlaceholderTimer = new QTimer(this);
     m_showLoadingPlaceholderTimer->setInterval(500);
@@ -154,6 +164,10 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     auto *centeringLayout = new QVBoxLayout(m_container);
     centeringLayout->addWidget(m_placeholderLabel);
     centeringLayout->setAlignment(m_placeholderLabel, Qt::AlignCenter);
+    m_placeholderLabel->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(m_placeholderLabel, &QWidget::customContextMenuRequested, this, [this](const QPoint &pos) {
+        slotViewContextMenuRequested(m_placeholderLabel->mapToGlobal(pos));
+    });
 
     controller->setSelectionBehavior(KItemListController::MultiSelection);
     connect(controller, &KItemListController::itemActivated, this, &DolphinView::slotItemActivated);
@@ -172,44 +186,37 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     connect(controller, &KItemListController::increaseZoom, this, &DolphinView::slotIncreaseZoom);
     connect(controller, &KItemListController::decreaseZoom, this, &DolphinView::slotDecreaseZoom);
     connect(controller, &KItemListController::swipeUp, this, &DolphinView::slotSwipeUp);
-
-    connect(m_model, &KFileItemModel::directoryLoadingStarted,       this, &DolphinView::slotDirectoryLoadingStarted);
-    connect(m_model, &KFileItemModel::directoryLoadingCompleted,     this, &DolphinView::slotDirectoryLoadingCompleted);
-    connect(m_model, &KFileItemModel::directoryLoadingCanceled,      this, &DolphinView::slotDirectoryLoadingCanceled);
-    connect(m_model, &KFileItemModel::directoryLoadingProgress,   this, &DolphinView::directoryLoadingProgress);
-    connect(m_model, &KFileItemModel::directorySortingProgress,   this, &DolphinView::directorySortingProgress);
-    connect(m_model, &KFileItemModel::itemsChanged,
-            this, &DolphinView::slotItemsChanged);
-    connect(m_model, &KFileItemModel::itemsRemoved,    this, &DolphinView::itemCountChanged);
-    connect(m_model, &KFileItemModel::itemsInserted,   this, &DolphinView::itemCountChanged);
-    connect(m_model, &KFileItemModel::infoMessage,            this, &DolphinView::infoMessage);
-    connect(m_model, &KFileItemModel::errorMessage,           this, &DolphinView::errorMessage);
+    connect(controller, &KItemListController::selectionModeChangeRequested, this, &DolphinView::selectionModeChangeRequested);
+
+    connect(m_model, &KFileItemModel::directoryLoadingStarted, this, &DolphinView::slotDirectoryLoadingStarted);
+    connect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
+    connect(m_model, &KFileItemModel::directoryLoadingCanceled, this, &DolphinView::slotDirectoryLoadingCanceled);
+    connect(m_model, &KFileItemModel::directoryLoadingProgress, this, &DolphinView::directoryLoadingProgress);
+    connect(m_model, &KFileItemModel::directorySortingProgress, this, &DolphinView::directorySortingProgress);
+    connect(m_model, &KFileItemModel::itemsChanged, this, &DolphinView::slotItemsChanged);
+    connect(m_model, &KFileItemModel::itemsRemoved, this, &DolphinView::itemCountChanged);
+    connect(m_model, &KFileItemModel::itemsInserted, this, &DolphinView::itemCountChanged);
+    connect(m_model, &KFileItemModel::infoMessage, this, &DolphinView::infoMessage);
+    connect(m_model, &KFileItemModel::errorMessage, this, &DolphinView::errorMessage);
     connect(m_model, &KFileItemModel::directoryRedirection, this, &DolphinView::slotDirectoryRedirection);
-    connect(m_model, &KFileItemModel::urlIsFileError,            this, &DolphinView::urlIsFileError);
-    connect(m_model, &KFileItemModel::fileItemsChanged,            this, &DolphinView::fileItemsChanged);
+    connect(m_model, &KFileItemModel::urlIsFileError, this, &DolphinView::urlIsFileError);
+    connect(m_model, &KFileItemModel::fileItemsChanged, this, &DolphinView::fileItemsChanged);
+    connect(m_model, &KFileItemModel::currentDirectoryRemoved, this, &DolphinView::currentDirectoryRemoved);
 
-    connect(this, &DolphinView::itemCountChanged,
-            this, &DolphinView::updatePlaceholderLabel);
+    connect(this, &DolphinView::itemCountChanged, this, &DolphinView::updatePlaceholderLabel);
 
     m_view->installEventFilter(this);
-    connect(m_view, &DolphinItemListView::sortOrderChanged,
-            this, &DolphinView::slotSortOrderChangedByHeader);
-    connect(m_view, &DolphinItemListView::sortRoleChanged,
-            this, &DolphinView::slotSortRoleChangedByHeader);
-    connect(m_view, &DolphinItemListView::visibleRolesChanged,
-            this, &DolphinView::slotVisibleRolesChangedByHeader);
-    connect(m_view, &DolphinItemListView::roleEditingCanceled,
-            this, &DolphinView::slotRoleEditingCanceled);
-    connect(m_view->header(), &KItemListHeader::columnWidthChangeFinished,
-            this, &DolphinView::slotHeaderColumnWidthChangeFinished);
-    connect(m_view->header(), &KItemListHeader::leadingPaddingChanged,
-            this, &DolphinView::slotLeadingPaddingWidthChanged);
-
-    KItemListSelectionManager* selectionManager = controller->selectionManager();
-    connect(selectionManager, &KItemListSelectionManager::selectionChanged,
-            this, &DolphinView::slotSelectionChanged);
-
-#ifdef HAVE_BALOO
+    connect(m_view, &DolphinItemListView::sortOrderChanged, this, &DolphinView::slotSortOrderChangedByHeader);
+    connect(m_view, &DolphinItemListView::sortRoleChanged, this, &DolphinView::slotSortRoleChangedByHeader);
+    connect(m_view, &DolphinItemListView::visibleRolesChanged, this, &DolphinView::slotVisibleRolesChangedByHeader);
+    connect(m_view, &DolphinItemListView::roleEditingCanceled, this, &DolphinView::slotRoleEditingCanceled);
+    connect(m_view->header(), &KItemListHeader::columnWidthChangeFinished, this, &DolphinView::slotHeaderColumnWidthChangeFinished);
+    connect(m_view->header(), &KItemListHeader::sidePaddingChanged, this, &DolphinView::slotSidePaddingWidthChanged);
+
+    KItemListSelectionManager *selectionManager = controller->selectionManager();
+    connect(selectionManager, &KItemListSelectionManager::selectionChanged, this, &DolphinView::slotSelectionChanged);
+
+#if HAVE_BALOO
     m_toolTipManager = new ToolTipManager(this);
     connect(m_toolTipManager, &ToolTipManager::urlActivated, this, &DolphinView::urlActivated);
 #endif
@@ -233,6 +240,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
 
 DolphinView::~DolphinView()
 {
+    disconnect(m_container->controller(), &KItemListController::modelChanged, this, &DolphinView::slotModelChanged);
 }
 
 QUrl DolphinView::url() const
@@ -262,7 +270,7 @@ bool DolphinView::isActive() const
     return m_active;
 }
 
-void DolphinView::setMode(Mode mode)
+void DolphinView::setViewMode(Mode mode)
 {
     if (mode != m_mode) {
         ViewProperties props(viewPropertiesUrl());
@@ -276,11 +284,31 @@ void DolphinView::setMode(Mode mode)
     }
 }
 
-DolphinView::Mode DolphinView::mode() const
+DolphinView::Mode DolphinView::viewMode() const
 {
     return m_mode;
 }
 
+void DolphinView::setSelectionModeEnabled(const bool enabled)
+{
+    if (enabled) {
+        m_proxyStyle = std::make_unique<SelectionMode::SingleClickSelectionProxyStyle>();
+        setStyle(m_proxyStyle.get());
+        m_view->setStyle(m_proxyStyle.get());
+        m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::False);
+    } else {
+        setStyle(QApplication::style());
+        m_view->setStyle(QApplication::style());
+        m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::FollowSetting);
+    }
+    m_container->controller()->setSelectionModeEnabled(enabled);
+}
+
+bool DolphinView::selectionMode() const
+{
+    return m_container->controller()->selectionMode();
+}
+
 void DolphinView::setPreviewsShown(bool show)
 {
     if (previewsShown() == show) {
@@ -367,7 +395,7 @@ int DolphinView::itemsCount() const
 
 KFileItemList DolphinView::selectedItems() const
 {
-    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
 
     KFileItemList selectedItems;
     const auto items = selectionManager->selectedItems();
@@ -380,11 +408,11 @@ KFileItemList DolphinView::selectedItems() const
 
 int DolphinView::selectedItemsCount() const
 {
-    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
     return selectionManager->selectedItems().count();
 }
 
-void DolphinView::markUrlsAsSelected(const QList<QUrl>& urls)
+void DolphinView::markUrlsAsSelected(const QList<QUrl> &urls)
 {
     m_selectedUrls = urls;
 }
@@ -397,10 +425,8 @@ void DolphinView::markUrlAsCurrent(const QUrl &url)
 
 void DolphinView::selectItems(const QRegularExpression &regexp, bool enabled)
 {
-    const KItemListSelectionManager::SelectionMode mode = enabled
-                                                        ? KItemListSelectionManager::Select
-                                                        : KItemListSelectionManager::Deselect;
-    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    const KItemListSelectionManager::SelectionMode mode = enabled ? KItemListSelectionManager::Select : KItemListSelectionManager::Deselect;
+    KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
 
     for (int index = 0; index < m_model->count(); index++) {
         const KFileItem item = m_model->fileItem(index);
@@ -429,7 +455,7 @@ int DolphinView::zoomLevel() const
     return m_view->zoomLevel();
 }
 
-void DolphinView::setSortRole(const QByteArray& role)
+void DolphinView::setSortRole(const QByteArray &role)
 {
     if (role != sortRole()) {
         updateSortRole(role);
@@ -438,7 +464,7 @@ void DolphinView::setSortRole(const QByteArray& role)
 
 QByteArray DolphinView::sortRole() const
 {
-    const KItemModelBase* model = m_container->controller()->model();
+    const KItemModelBase *model = m_container->controller()->model();
     return model->sortRole();
 }
 
@@ -478,7 +504,7 @@ bool DolphinView::sortHiddenLast() const
     return m_model->sortHiddenLast();
 }
 
-void DolphinView::setVisibleRoles(const QList<QByteArray>& roles)
+void DolphinView::setVisibleRoles(const QList<QByteArray> &roles)
 {
     const QList<QByteArray> previousRoles = roles;
 
@@ -532,7 +558,7 @@ void DolphinView::writeSettings()
     m_view->writeSettings();
 }
 
-void DolphinView::setNameFilter(const QString& nameFilter)
+void DolphinView::setNameFilter(const QString &nameFilter)
 {
     m_model->setNameFilter(nameFilter);
 }
@@ -542,7 +568,7 @@ QString DolphinView::nameFilter() const
     return m_model->nameFilter();
 }
 
-void DolphinView::setMimeTypeFilters(const QStringList& filters)
+void DolphinView::setMimeTypeFilters(const QStringList &filters)
 {
     return m_model->setMimeTypeFilters(filters);
 }
@@ -566,7 +592,7 @@ void DolphinView::requestStatusBarText()
 
         // Give a summary of the status of the selected files
         const KFileItemList list = selectedItems();
-        for (const KFileItem& item : list) {
+        for (const KFileItem &item : list) {
             if (item.isDir()) {
                 ++folderCount;
             } else {
@@ -587,16 +613,13 @@ void DolphinView::requestStatusBarText()
             return;
         }
 
-        m_statJobForStatusBarText = KIO::statDetails(m_model->rootItem().url(),
-                        KIO::StatJob::SourceSide, KIO::StatRecursiveSize, KIO::HideProgressInfo);
-        connect(m_statJobForStatusBarText, &KJob::result,
-                this, &DolphinView::slotStatJobResult);
+        m_statJobForStatusBarText = KIO::statDetails(m_model->rootItem().url(), KIO::StatJob::SourceSide, KIO::StatRecursiveSize, KIO::HideProgressInfo);
+        connect(m_statJobForStatusBarText, &KJob::result, this, &DolphinView::slotStatJobResult);
         m_statJobForStatusBarText->start();
     }
 }
 
-void DolphinView::emitStatusBarText(const int folderCount, const int fileCount,
-                                    KIO::filesize_t totalFileSize, const Selection selection)
+void DolphinView::emitStatusBarText(const int folderCount, const int fileCount, KIO::filesize_t totalFileSize, const Selection selection)
 {
     QString foldersText;
     QString filesText;
@@ -613,13 +636,9 @@ void DolphinView::emitStatusBarText(const int folderCount, const int fileCount,
     }
 
     if (fileCount > 0 && folderCount > 0) {
-        summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
-                        foldersText, filesText,
-                        KFormat().formatByteSize(totalFileSize));
+        summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)", foldersText, filesText, KFormat().formatByteSize(totalFileSize));
     } else if (fileCount > 0) {
-        summary = i18nc("@info:status files (size)", "%1 (%2)",
-                        filesText,
-                        KFormat().formatByteSize(totalFileSize));
+        summary = i18nc("@info:status files (size)", "%1 (%2)", filesText, KFormat().formatByteSize(totalFileSize));
     } else if (folderCount > 0) {
         summary = foldersText;
     } else {
@@ -628,9 +647,9 @@ void DolphinView::emitStatusBarText(const int folderCount, const int fileCount,
     Q_EMIT statusBarTextChanged(summary);
 }
 
-QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
+QList<QAction *> DolphinView::versionControlActions(const KFileItemList &items) const
 {
-    QList<QAction*> actions;
+    QList<QAction *> actions;
 
     if (items.isEmpty()) {
         const KFileItem item = m_model->rootItem();
@@ -644,7 +663,7 @@ QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) c
     return actions;
 }
 
-void DolphinView::setUrl(const QUrl& url)
+void DolphinView::setUrl(const QUrl &url)
 {
     if (url == m_url) {
         return;
@@ -656,8 +675,7 @@ void DolphinView::setUrl(const QUrl& url)
 
     hideToolTip();
 
-    disconnect(m_view, &DolphinItemListView::roleEditingFinished,
-               this, &DolphinView::slotRoleEditingFinished);
+    disconnect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished);
 
     // It is important to clear the items from the model before
     // applying the view properties, otherwise expensive operations
@@ -672,13 +690,13 @@ void DolphinView::setUrl(const QUrl& url)
 
 void DolphinView::selectAll()
 {
-    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
     selectionManager->setSelected(0, m_model->count());
 }
 
 void DolphinView::invertSelection()
 {
-    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
     selectionManager->setSelected(0, m_model->count(), KItemListSelectionManager::Toggle);
 }
 
@@ -698,8 +716,8 @@ void DolphinView::renameSelectedItems()
     if (items.count() == 1 && GeneralSettings::renameInline()) {
         const int index = m_model->index(items.first());
 
-        QMetaObject::Connection * const connection = new QMetaObject::Connection;
-        *connection = connect(m_view, &KItemListView::scrollingStopped, this, [=](){
+        QMetaObject::Connection *const connection = new QMetaObject::Connection;
+        *connection = connect(m_view, &KItemListView::scrollingStopped, this, [=]() {
             QObject::disconnect(*connection);
             delete connection;
 
@@ -707,15 +725,13 @@ void DolphinView::renameSelectedItems()
 
             hideToolTip();
 
-            connect(m_view, &DolphinItemListView::roleEditingFinished,
-                    this, &DolphinView::slotRoleEditingFinished);
+            connect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished);
         });
         m_view->scrollToItem(index);
 
     } else {
-        KIO::RenameFileDialog* dialog = new KIO::RenameFileDialog(items, this);
-        connect(dialog, &KIO::RenameFileDialog::renamingFinished,
-                this, &DolphinView::slotRenameDialogRenamingFinished);
+        KIO::RenameFileDialog *dialog = new KIO::RenameFileDialog(items, this);
+        connect(dialog, &KIO::RenameFileDialog::renamingFinished, this, &DolphinView::slotRenameDialogRenamingFinished);
 
         dialog->open();
     }
@@ -729,47 +745,64 @@ void DolphinView::renameSelectedItems()
 void DolphinView::trashSelectedItems()
 {
     const QList<QUrl> list = simplifiedSelectedUrls();
+
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    using Iface = KIO::AskUserActionInterface;
+    auto *trashJob = new KIO::DeleteOrTrashJob(list, Iface::Trash, Iface::DefaultConfirmation, this);
+    connect(trashJob, &KJob::result, this, &DolphinView::slotTrashFileFinished);
+    m_selectNextItem = true;
+    trashJob->start();
+#else
     KIO::JobUiDelegate uiDelegate;
     uiDelegate.setWindow(window());
     if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
-        KIO::Job* job = KIO::trash(list);
+        KIO::Job *job = KIO::trash(list);
         KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl(QStringLiteral("trash:/")), job);
         KJobWidgets::setWindow(job, this);
-        connect(job, &KIO::Job::result,
-                this, &DolphinView::slotTrashFileFinished);
+        connect(job, &KIO::Job::result, this, &DolphinView::slotTrashFileFinished);
     }
+#endif
 }
 
 void DolphinView::deleteSelectedItems()
 {
     const QList<QUrl> list = simplifiedSelectedUrls();
 
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    using Iface = KIO::AskUserActionInterface;
+    auto *trashJob = new KIO::DeleteOrTrashJob(list, Iface::Delete, Iface::DefaultConfirmation, this);
+    connect(trashJob, &KJob::result, this, &DolphinView::slotTrashFileFinished);
+    m_selectNextItem = true;
+    trashJob->start();
+#else
     KIO::JobUiDelegate uiDelegate;
     uiDelegate.setWindow(window());
     if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) {
-        KIO::Job* job = KIO::del(list);
+        KIO::Job *job = KIO::del(list);
         KJobWidgets::setWindow(job, this);
-        connect(job, &KIO::Job::result,
-                this, &DolphinView::slotDeleteFileFinished);
+        connect(job, &KIO::Job::result, this, &DolphinView::slotDeleteFileFinished);
     }
+#endif
 }
 
 void DolphinView::cutSelectedItemsToClipboard()
 {
-    QMimeData* mimeData = selectionMimeData();
+    QMimeData *mimeData = selectionMimeData();
     KIO::setClipboardDataCut(mimeData, true);
+    KUrlMimeData::exportUrlsToPortal(mimeData);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
 void DolphinView::copySelectedItemsToClipboard()
 {
-    QMimeData* mimeData = selectionMimeData();
+    QMimeData *mimeData = selectionMimeData();
+    KUrlMimeData::exportUrlsToPortal(mimeData);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
 void DolphinView::copySelectedItems(const KFileItemList &selection, const QUrl &destinationUrl)
 {
-    KIO::CopyJob* job = KIO::copy(selection.urlList(), destinationUrl, KIO::DefaultFlags);
+    KIO::CopyJob *job = KIO::copy(selection.urlList(), destinationUrl, KIO::DefaultFlags);
     KJobWidgets::setWindow(job, this);
 
     connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult);
@@ -779,13 +812,12 @@ void DolphinView::copySelectedItems(const KFileItemList &selection, const QUrl &
 
 void DolphinView::moveSelectedItems(const KFileItemList &selection, const QUrl &destinationUrl)
 {
-    KIO::CopyJob* job = KIO::move(selection.urlList(), destinationUrl, KIO::DefaultFlags);
+    KIO::CopyJob *job = KIO::move(selection.urlList(), destinationUrl, KIO::DefaultFlags);
     KJobWidgets::setWindow(job, this);
 
     connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult);
     connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotCopyingDone);
     KIO::FileUndoManager::self()->recordCopyJob(job);
-
 }
 
 void DolphinView::paste()
@@ -814,7 +846,7 @@ void DolphinView::duplicateSelectedItems()
     // but before the filename extension, if present
     QList<QUrl> newSelection;
     for (const auto &item : itemList) {
-        const QUrl originalURL  = item.url();
+        const QUrl originalURL = item.url();
         const QString originalDirectoryPath = originalURL.adjusted(QUrl::RemoveFilename).path();
         const QString originalFileName = item.name();
 
@@ -825,7 +857,7 @@ void DolphinView::duplicateSelectedItems()
         // No extension; new filename is "<oldfilename> copy"
         if (extension.isEmpty()) {
             duplicateURL.setPath(originalDirectoryPath + i18nc("<filename> copy", "%1 copy", originalFileName));
-        // There's an extension; new filename is "<oldfilename> copy.<extension>"
+            // There's an extension; new filename is "<oldfilename> copy.<extension>"
         } else {
             // Need to add a dot since QMimeDatabase::suffixForFileName() doesn't include it
             extension = QLatin1String(".") + extension;
@@ -836,7 +868,7 @@ void DolphinView::duplicateSelectedItems()
             duplicateURL.setPath(originalDirectoryPath + i18nc("<filename> copy", "%1 copy", originalFilenameWithoutExtension) + originalExtension);
         }
 
-        KIO::CopyJob* job = KIO::copyAs(originalURL, duplicateURL);
+        KIO::CopyJob *job = KIO::copyAs(originalURL, duplicateURL);
         KJobWidgets::setWindow(job, this);
 
         if (job) {
@@ -860,7 +892,7 @@ void DolphinView::updatePalette()
         color.setAlpha(150);
     }
 
-    QWidget* viewport = m_container->viewport();
+    QWidget *viewport = m_container->viewport();
     if (viewport) {
         QPalette palette;
         palette.setColor(viewport->backgroundRole(), color);
@@ -876,7 +908,7 @@ void DolphinView::abortTwoClicksRenaming()
     m_twoClicksRenamingTimer->stop();
 }
 
-bool DolphinView::eventFilter(QObject* watched, QEvent* event)
+bool DolphinView::eventFilter(QObject *watched, QEvent *event)
 {
     switch (event->type()) {
     case QEvent::PaletteChange:
@@ -892,13 +924,18 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
     case QEvent::KeyPress:
         hideToolTip(ToolTipManager::HideBehavior::Instantly);
         if (GeneralSettings::useTabForSwitchingSplitView()) {
-            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
             if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier) {
                 Q_EMIT toggleActiveViewRequested();
                 return true;
             }
         }
         break;
+    case QEvent::KeyRelease:
+        if (static_cast<QKeyEvent *>(event)->key() == Qt::Key_Control) {
+            m_controlWheelAccumulatedDelta = 0;
+        }
+        break;
     case QEvent::FocusIn:
         if (watched == m_container) {
             setActive(true);
@@ -925,7 +962,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         break;
 
     case QEvent::ToolTip:
-        tryShowNameToolTip(event);
+        tryShowNameToolTip(static_cast<QHelpEvent *>(event));
 
     default:
         break;
@@ -934,26 +971,32 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
     return QWidget::eventFilter(watched, event);
 }
 
-void DolphinView::wheelEvent(QWheelEvent* event)
+void DolphinView::wheelEvent(QWheelEvent *event)
 {
     if (event->modifiers().testFlag(Qt::ControlModifier)) {
-        const QPoint numDegrees = event->angleDelta() / 8;
-        const QPoint numSteps = numDegrees / 15;
+        m_controlWheelAccumulatedDelta += event->angleDelta().y();
+
+        if (m_controlWheelAccumulatedDelta <= -QWheelEvent::DefaultDeltasPerStep) {
+            slotDecreaseZoom();
+            m_controlWheelAccumulatedDelta += QWheelEvent::DefaultDeltasPerStep;
+        } else if (m_controlWheelAccumulatedDelta >= QWheelEvent::DefaultDeltasPerStep) {
+            slotIncreaseZoom();
+            m_controlWheelAccumulatedDelta -= QWheelEvent::DefaultDeltasPerStep;
+        }
 
-        setZoomLevel(zoomLevel() + numSteps.y());
         event->accept();
     } else {
         event->ignore();
     }
 }
 
-void DolphinView::hideEvent(QHideEvent* event)
+void DolphinView::hideEvent(QHideEvent *event)
 {
     hideToolTip();
     QWidget::hideEvent(event);
 }
 
-bool DolphinView::event(QEvent* event)
+bool DolphinView::event(QEvent *event)
 {
     if (event->type() == QEvent::WindowDeactivate) {
         /* See Bug 297355
@@ -993,8 +1036,24 @@ void DolphinView::slotItemsActivated(const KItemSet &indexes)
 
     if (indexes.count() > 5) {
         QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count());
-        const int answer = KMessageBox::warningYesNo(this, question);
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+        const int answer = KMessageBox::warningTwoActions(
+            this,
+            question,
+            {},
+#else
+        const int answer =
+            KMessageBox::warningYesNo(this,
+                                      question,
+                                      {},
+#endif
+            KGuiItem(i18ncp("@action:button", "Open %1 Item", "Open %1 Items", indexes.count()), QStringLiteral("document-open")),
+            KStandardGuiItem::cancel());
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+        if (answer != KMessageBox::PrimaryAction) {
+#else
         if (answer != KMessageBox::Yes) {
+#endif
             return;
         }
     }
@@ -1004,7 +1063,7 @@ void DolphinView::slotItemsActivated(const KItemSet &indexes)
 
     for (int index : indexes) {
         KFileItem item = m_model->fileItem(index);
-        const QUrl& url = openItemAsFolderUrl(item);
+        const QUrl &url = openItemAsFolderUrl(item);
 
         if (!url.isEmpty()) {
             // Open folders in new tabs or in new windows depending on the modifier
@@ -1029,8 +1088,8 @@ void DolphinView::slotItemsActivated(const KItemSet &indexes)
 
 void DolphinView::slotItemMiddleClicked(int index)
 {
-    const KFileItem& item = m_model->fileItem(index);
-    const QUrl& url = openItemAsFolderUrl(item);
+    const KFileItem &item = m_model->fileItem(index);
+    const QUrl &url = openItemAsFolderUrl(item);
     const auto modifiers = QGuiApplication::keyboardModifiers();
     if (!url.isEmpty()) {
         // keep in sync with KUrlNavigator::slotNavigatorButtonClicked
@@ -1049,7 +1108,7 @@ void DolphinView::slotItemMiddleClicked(int index)
     }
 }
 
-void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
+void DolphinView::slotItemContextMenuRequested(int index, const QPointF &pos)
 {
     // Force emit of a selection changed signal before we request the
     // context menu, to update the edit-actions first. (See Bug 294013)
@@ -1058,42 +1117,42 @@ void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
     }
 
     const KFileItem item = m_model->fileItem(index);
-    Q_EMIT requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
+    Q_EMIT requestContextMenu(pos.toPoint(), item, selectedItems(), url());
 }
 
-void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
+void DolphinView::slotViewContextMenuRequested(const QPointF &pos)
 {
-    Q_EMIT requestContextMenu(pos.toPoint(), KFileItem(), url(), QList<QAction*>());
+    Q_EMIT requestContextMenu(pos.toPoint(), KFileItem(), selectedItems(), url());
 }
 
-void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
+void DolphinView::slotHeaderContextMenuRequested(const QPointF &pos)
 {
     ViewProperties props(viewPropertiesUrl());
 
     QPointer<QMenu> menu = new QMenu(QApplication::activeWindow());
 
-    KItemListView* view = m_container->controller()->view();
+    KItemListView *view = m_container->controller()->view();
     const QList<QByteArray> visibleRolesSet = view->visibleRoles();
 
     bool indexingEnabled = false;
-#ifdef HAVE_BALOO
+#if HAVE_BALOO
     Baloo::IndexerConfig config;
     indexingEnabled = config.fileIndexingEnabled();
 #endif
 
     QString groupName;
-    QMenu* groupMenu = nullptr;
+    QMenu *groupMenu = nullptr;
 
     // Add all roles to the menu that can be shown or hidden by the user
     const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
-    for (const KFileItemModel::RoleInfo& info : rolesInfo) {
+    for (const KFileItemModel::RoleInfo &info : rolesInfo) {
         if (info.role == "text") {
             // It should not be possible to hide the "text" role
             continue;
         }
 
         const QString text = m_model->roleDescription(info.role);
-        QAction* action = nullptr;
+        QAction *action = nullptr;
         if (info.group.isEmpty()) {
             action = menu->addAction(text);
         } else {
@@ -1108,35 +1167,34 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
         action->setCheckable(true);
         action->setChecked(visibleRolesSet.contains(info.role));
         action->setData(info.role);
+        action->setToolTip(info.tooltip);
 
-        const bool enable = (!info.requiresBaloo && !info.requiresIndexer) ||
-                            (info.requiresBaloo) ||
-                            (info.requiresIndexer && indexingEnabled);
+        const bool enable = (!info.requiresBaloo && !info.requiresIndexer) || (info.requiresBaloo) || (info.requiresIndexer && indexingEnabled);
         action->setEnabled(enable);
     }
 
     menu->addSeparator();
 
-    QActionGroup* widthsGroup = new QActionGroup(menu);
+    QActionGroup *widthsGroup = new QActionGroup(menu);
     const bool autoColumnWidths = props.headerColumnWidths().isEmpty();
 
-    QAction* toggleLeadingPaddingAction = menu->addAction(i18nc("@action:inmenu", "Leading Column Padding"));
-    toggleLeadingPaddingAction->setCheckable(true);
-    toggleLeadingPaddingAction->setChecked(view->header()->leadingPadding() > 0);
+    QAction *toggleSidePaddingAction = menu->addAction(i18nc("@action:inmenu", "Side Padding"));
+    toggleSidePaddingAction->setCheckable(true);
+    toggleSidePaddingAction->setChecked(view->header()->sidePadding() > 0);
 
-    QAction* autoAdjustWidthsAction = menu->addAction(i18nc("@action:inmenu", "Automatic Column Widths"));
+    QAction *autoAdjustWidthsAction = menu->addAction(i18nc("@action:inmenu", "Automatic Column Widths"));
     autoAdjustWidthsAction->setCheckable(true);
     autoAdjustWidthsAction->setChecked(autoColumnWidths);
     autoAdjustWidthsAction->setActionGroup(widthsGroup);
 
-    QAction* customWidthsAction = menu->addAction(i18nc("@action:inmenu", "Custom Column Widths"));
+    QAction *customWidthsAction = menu->addAction(i18nc("@action:inmenu", "Custom Column Widths"));
     customWidthsAction->setCheckable(true);
     customWidthsAction->setChecked(!autoColumnWidths);
     customWidthsAction->setActionGroup(widthsGroup);
 
-    QAction* action = menu->exec(pos.toPoint());
+    QAction *action = menu->exec(pos.toPoint());
     if (menu && action) {
-        KItemListHeader* header = view->header();
+        KItemListHeader *header = view->header();
 
         if (action == autoAdjustWidthsAction) {
             // Clear the column-widths from the viewproperties and turn on
@@ -1149,13 +1207,13 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
             QList<int> columnWidths;
             const auto visibleRoles = view->visibleRoles();
             columnWidths.reserve(visibleRoles.count());
-            for (const QByteArray& role : visibleRoles) {
+            for (const QByteArray &role : visibleRoles) {
                 columnWidths.append(header->columnWidth(role));
             }
             props.setHeaderColumnWidths(columnWidths);
             header->setAutomaticColumnResizing(false);
-        } else if (action == toggleLeadingPaddingAction) {
-            header->setLeadingPadding(toggleLeadingPaddingAction->isChecked() ? 20 : 0);
+        } else if (action == toggleSidePaddingAction) {
+            header->setSidePadding(toggleSidePaddingAction->isChecked() ? 20 : 0);
         } else {
             // Show or hide the selected role
             const QByteArray selectedRole = action->data().toByteArray();
@@ -1174,7 +1232,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
             if (!header->automaticColumnResizing()) {
                 const auto visibleRoles = view->visibleRoles();
                 columnWidths.reserve(visibleRoles.count());
-                for (const QByteArray& role : visibleRoles) {
+                for (const QByteArray &role : visibleRoles) {
                     columnWidths.append(header->columnWidth(role));
                 }
             }
@@ -1185,7 +1243,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
     delete menu;
 }
 
-void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current)
+void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray &role, qreal current)
 {
     const QList<QByteArray> visibleRoles = m_view->visibleRoles();
 
@@ -1194,8 +1252,8 @@ void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qr
     if (columnWidths.count() != visibleRoles.count()) {
         columnWidths.clear();
         columnWidths.reserve(visibleRoles.count());
-        const KItemListHeader* header = m_view->header();
-        for (const QByteArray& role : visibleRoles) {
+        const KItemListHeader *header = m_view->header();
+        for (const QByteArray &role : visibleRoles) {
             const int width = header->columnWidth(role);
             columnWidths.append(width);
         }
@@ -1208,10 +1266,10 @@ void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qr
     props.setHeaderColumnWidths(columnWidths);
 }
 
-void DolphinView::slotLeadingPaddingWidthChanged(qreal width)
+void DolphinView::slotSidePaddingWidthChanged(qreal width)
 {
     ViewProperties props(viewPropertiesUrl());
-    DetailsModeSettings::setLeadingPadding(int(width));
+    DetailsModeSettings::setSidePadding(int(width));
     m_view->writeSettings();
 }
 
@@ -1224,8 +1282,11 @@ void DolphinView::slotItemHovered(int index)
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 
-#ifdef HAVE_BALOO
-        m_toolTipManager->showToolTip(item, itemRect, nativeParentWidget()->windowHandle());
+#if HAVE_BALOO
+        auto nativeParent = nativeParentWidget();
+        if (nativeParent) {
+            m_toolTipManager->showToolTip(item, itemRect, nativeParent->windowHandle());
+        }
 #endif
     }
 
@@ -1239,7 +1300,7 @@ void DolphinView::slotItemUnhovered(int index)
     Q_EMIT requestItemInfo(KFileItem());
 }
 
-void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent *event)
 {
     QUrl destUrl;
     KFileItem destItem = m_model->fileItem(index);
@@ -1253,11 +1314,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
         destUrl = destItem.mostLocalUrl();
     }
 
-    QDropEvent dropEvent(event->pos().toPoint(),
-                         event->possibleActions(),
-                         event->mimeData(),
-                         event->buttons(),
-                         event->modifiers());
+    QDropEvent dropEvent(event->pos().toPoint(), event->possibleActions(), event->mimeData(), event->buttons(), event->modifiers());
     dropUrls(destUrl, &dropEvent, this);
 
     setActive(true);
@@ -1265,7 +1322,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
 
 void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget)
 {
-    KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);
+    KIO::DropJob *job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);
 
     if (job) {
         connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult);
@@ -1279,18 +1336,18 @@ void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *
     }
 }
 
-void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
+void DolphinView::slotModelChanged(KItemModelBase *current, KItemModelBase *previous)
 {
     if (previous != nullptr) {
-        Q_ASSERT(qobject_cast<KFileItemModel*>(previous));
-        KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(previous);
+        Q_ASSERT(qobject_cast<KFileItemModel *>(previous));
+        KFileItemModel *fileItemModel = static_cast<KFileItemModel *>(previous);
         disconnect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
         m_versionControlObserver->setModel(nullptr);
     }
 
     if (current) {
-        Q_ASSERT(qobject_cast<KFileItemModel*>(current));
-        KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
+        Q_ASSERT(qobject_cast<KFileItemModel *>(current));
+        KFileItemModel *fileItemModel = static_cast<KFileItemModel *>(current);
         connect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
         m_versionControlObserver->setModel(fileItemModel);
     }
@@ -1326,7 +1383,7 @@ void DolphinView::slotCopyingDone(KIO::Job *, const QUrl &, const QUrl &to)
     slotItemCreated(to);
 }
 
-void DolphinView::slotItemCreated(const QUrl& url)
+void DolphinView::slotItemCreated(const QUrl &url)
 {
     if (m_markFirstNewlySelectedItemAsCurrent) {
         markUrlAsCurrent(url);
@@ -1337,7 +1394,7 @@ void DolphinView::slotItemCreated(const QUrl& url)
 
 void DolphinView::slotJobResult(KJob *job)
 {
-    if (job->error()) {
+    if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {
         Q_EMIT errorMessage(job->errorString());
     }
     if (!m_selectedUrls.isEmpty()) {
@@ -1345,12 +1402,12 @@ void DolphinView::slotJobResult(KJob *job)
     }
 }
 
-void DolphinView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)
+void DolphinView::slotSelectionChanged(const KItemSet &current, const KItemSet &previous)
 {
+    m_selectNextItem = false;
     const int currentCount = current.count();
     const int previousCount = previous.count();
-    const bool selectionStateChanged = (currentCount == 0 && previousCount  > 0) ||
-                                       (currentCount >  0 && previousCount == 0);
+    const bool selectionStateChanged = (currentCount == 0 && previousCount > 0) || (currentCount > 0 && previousCount == 0);
 
     // If nothing has been selected before and something got selected (or if something
     // was selected before and now nothing is selected) the selectionChangedSignal must
@@ -1372,11 +1429,10 @@ void DolphinView::slotStatJobResult(KJob *job)
     KIO::filesize_t totalFileSize = 0;
     bool countFileSize = true;
 
-    const auto entry =  static_cast<KIO::StatJob *>(job)->statResult();
+    const auto entry = static_cast<KIO::StatJob *>(job)->statResult();
     if (entry.contains(KIO::UDSEntry::UDS_RECURSIVE_SIZE)) {
         // We have a precomputed value.
-        totalFileSize = static_cast<KIO::filesize_t>(
-                                entry.numberValue(KIO::UDSEntry::UDS_RECURSIVE_SIZE));
+        totalFileSize = static_cast<KIO::filesize_t>(entry.numberValue(KIO::UDSEntry::UDS_RECURSIVE_SIZE));
         countFileSize = false;
     }
 
@@ -1395,12 +1451,12 @@ void DolphinView::slotStatJobResult(KJob *job)
     emitStatusBarText(folderCount, fileCount, totalFileSize, NoSelection);
 }
 
-void DolphinView::updateSortRole(const QByteArray& role)
+void DolphinView::updateSortRole(const QByteArray &role)
 {
     ViewProperties props(viewPropertiesUrl());
     props.setSortRole(role);
 
-    KItemModelBase* model = m_container->controller()->model();
+    KItemModelBase *model = m_container->controller()->model();
     model->setSortRole(role);
 
     Q_EMIT sortRoleChanged(role);
@@ -1436,7 +1492,6 @@ void DolphinView::updateSortHiddenLast(bool hiddenLast)
     Q_EMIT sortHiddenLastChanged(hiddenLast);
 }
 
-
 QPair<bool, QString> DolphinView::pasteInfo() const
 {
     const QMimeData *mimeData = QApplication::clipboard()->mimeData();
@@ -1460,7 +1515,17 @@ bool DolphinView::itemsExpandable() const
     return m_mode == DetailsView;
 }
 
-void DolphinView::restoreState(QDataStream& stream)
+bool DolphinView::isExpanded(const KFileItem &item) const
+{
+    Q_ASSERT(item.isDir());
+    Q_ASSERT(items().contains(item));
+    if (!itemsExpandable()) {
+        return false;
+    }
+    return m_model->isExpanded(m_model->index(item));
+}
+
+void DolphinView::restoreState(QDataStream &stream)
 {
     // Read the version number of the view state and check if the version is supported.
     quint32 version = 0;
@@ -1485,7 +1550,7 @@ void DolphinView::restoreState(QDataStream& stream)
     m_model->restoreExpandedDirectories(urls);
 }
 
-void DolphinView::saveState(QDataStream& stream)
+void DolphinView::saveState(QDataStream &stream)
 {
     stream << quint32(1); // View state version
 
@@ -1517,7 +1582,7 @@ KFileItem DolphinView::rootItem() const
     return m_model->rootItem();
 }
 
-void DolphinView::setViewPropertiesContext(const QString& context)
+void DolphinView::setViewPropertiesContext(const QString &context)
 {
     m_viewPropertiesContext = context;
 }
@@ -1527,7 +1592,7 @@ QString DolphinView::viewPropertiesContext() const
     return m_viewPropertiesContext;
 }
 
-QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseThroughArchives)
+QUrl DolphinView::openItemAsFolderUrl(const KFileItem &item, const bool browseThroughArchives)
 {
     if (item.isNull()) {
         return QUrl();
@@ -1540,7 +1605,7 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
     }
 
     if (item.isMimeTypeKnown()) {
-        const QString& mimetype = item.mimetype();
+        const QString &mimetype = item.mimetype();
 
         if (browseThroughArchives && item.isFile() && url.isLocalFile()) {
             // Generic mechanism for redirecting to tar:/<path>/ when clicking on a tar file,
@@ -1548,7 +1613,7 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
             // The .protocol file specifies the mimetype that the kioslave handles.
             // Note that we don't use mimetype inheritance since we don't want to
             // open OpenDocument files as zip folders...
-            const QString& protocol = KProtocolManager::protocolForArchiveMimetype(mimetype);
+            const QString &protocol = KProtocolManager::protocolForArchiveMimetype(mimetype);
             if (!protocol.isEmpty()) {
                 url.setScheme(protocol);
                 return url;
@@ -1580,14 +1645,14 @@ void DolphinView::resetZoomLevel()
     setZoomLevel(ZoomLevelInfo::zoomLevelForIconSize(QSize(defaultIconSize, defaultIconSize)));
 }
 
-void DolphinView::observeCreatedItem(const QUrl& url)
+void DolphinView::observeCreatedItem(const QUrl &url)
 {
     if (m_active) {
         forceUrlsSelection(url, {url});
     }
 }
 
-void DolphinView::slotDirectoryRedirection(const QUrl& oldUrl, const QUrl& newUrl)
+void DolphinView::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUrl)
 {
     if (oldUrl.matches(url(), QUrl::StripTrailingSlash)) {
         Q_EMIT redirection(oldUrl, newUrl);
@@ -1598,7 +1663,7 @@ void DolphinView::slotDirectoryRedirection(const QUrl& oldUrl, const QUrl& newUr
 void DolphinView::updateViewState()
 {
     if (m_currentItemUrl != QUrl()) {
-        KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+        KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
 
         // if there is a selection already, leave it that way
         if (!selectionManager->hasSelection()) {
@@ -1611,12 +1676,13 @@ void DolphinView::updateViewState()
                     m_view->scrollToItem(currentIndex);
                     m_scrollToCurrentItem = false;
                 }
+                m_currentItemUrl = QUrl();
             } else {
                 selectionManager->setCurrentItem(0);
             }
+        } else {
+            m_currentItemUrl = QUrl();
         }
-
-        m_currentItemUrl = QUrl();
     }
 
     if (!m_restoredContentsPosition.isNull()) {
@@ -1629,7 +1695,7 @@ void DolphinView::updateViewState()
     }
 
     if (!m_selectedUrls.isEmpty()) {
-        KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+        KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
 
         // if there is a selection already, leave it that way
         if (!selectionManager->hasSelection()) {
@@ -1651,8 +1717,10 @@ void DolphinView::updateViewState()
                 }
             }
 
-            selectionManager->beginAnchoredSelection(selectionManager->currentItem());
-            selectionManager->setSelectedItems(selectedItems);
+            if (!selectedItems.isEmpty()) {
+                selectionManager->beginAnchoredSelection(selectionManager->currentItem());
+                selectionManager->setSelectedItems(selectedItems);
+            }
         }
     }
 }
@@ -1660,19 +1728,19 @@ void DolphinView::updateViewState()
 void DolphinView::hideToolTip(const ToolTipManager::HideBehavior behavior)
 {
     if (GeneralSettings::showToolTips()) {
-#ifdef HAVE_BALOO
+#if HAVE_BALOO
         m_toolTipManager->hideToolTip(behavior);
 #else
         Q_UNUSED(behavior)
 #endif
     } else if (m_mode == DolphinView::IconsView) {
-       QToolTip::hideText();
+        QToolTip::hideText();
     }
 }
 
 void DolphinView::slotTwoClicksRenamingTimerTimeout()
 {
-    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
 
     // verify that only one item is selected
     if (selectionManager->selectedItems().count() == 1) {
@@ -1686,25 +1754,51 @@ void DolphinView::slotTwoClicksRenamingTimerTimeout()
     }
 }
 
-void DolphinView::slotTrashFileFinished(KJob* job)
+void DolphinView::slotTrashFileFinished(KJob *job)
 {
     if (job->error() == 0) {
+        selectNextItem(); // Fixes BUG: 419914 via selecting next item
         Q_EMIT operationCompletedMessage(i18nc("@info:status", "Trash operation completed."));
     } else if (job->error() != KIO::ERR_USER_CANCELED) {
         Q_EMIT errorMessage(job->errorString());
     }
 }
 
-void DolphinView::slotDeleteFileFinished(KJob* job)
+void DolphinView::slotDeleteFileFinished(KJob *job)
 {
     if (job->error() == 0) {
+        selectNextItem(); // Fixes BUG: 419914 via selecting next item
         Q_EMIT operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
     } else if (job->error() != KIO::ERR_USER_CANCELED) {
         Q_EMIT errorMessage(job->errorString());
     }
 }
 
-void DolphinView::slotRenamingResult(KJob* job)
+void DolphinView::selectNextItem()
+{
+    if (m_active && m_selectNextItem) {
+        KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
+        if (selectedItems().isEmpty()) {
+            Q_ASSERT_X(false, "DolphinView", "Selecting the next item failed.");
+            return;
+        }
+        const auto lastSelectedIndex = m_model->index(selectedItems().last());
+        if (lastSelectedIndex < 0) {
+            Q_ASSERT_X(false, "DolphinView", "Selecting the next item failed.");
+            return;
+        }
+        auto nextItem = lastSelectedIndex + 1;
+        if (nextItem >= itemsCount()) {
+            nextItem = lastSelectedIndex - selectedItemsCount();
+        }
+        if (nextItem >= 0) {
+            selectionManager->setSelected(nextItem, 1);
+        }
+        m_selectNextItem = false;
+    }
+}
+
+void DolphinView::slotRenamingResult(KJob *job)
 {
     if (job->error()) {
         KIO::CopyJob *copyJob = qobject_cast<KIO::CopyJob *>(job);
@@ -1722,7 +1816,7 @@ void DolphinView::slotRenamingResult(KJob* job)
 
 void DolphinView::slotDirectoryLoadingStarted()
 {
-    m_loading = true;
+    m_loadingState = LoadingState::Loading;
     updatePlaceholderLabel();
 
     // Disable the writestate temporary until it can be determined in a fast way
@@ -1737,7 +1831,7 @@ void DolphinView::slotDirectoryLoadingStarted()
 
 void DolphinView::slotDirectoryLoadingCompleted()
 {
-    m_loading = false;
+    m_loadingState = LoadingState::Completed;
 
     // Update the view-state. This has to be done asynchronously
     // because the view might not be in its final state yet.
@@ -1754,7 +1848,7 @@ void DolphinView::slotDirectoryLoadingCompleted()
 
 void DolphinView::slotDirectoryLoadingCanceled()
 {
-    m_loading = false;
+    m_loadingState = LoadingState::Canceled;
 
     updatePlaceholderLabel();
 
@@ -1777,7 +1871,7 @@ void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOr
     Q_EMIT sortOrderChanged(current);
 }
 
-void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous)
+void DolphinView::slotSortRoleChangedByHeader(const QByteArray &current, const QByteArray &previous)
 {
     Q_UNUSED(previous)
     Q_ASSERT(m_model->sortRole() == current);
@@ -1788,8 +1882,7 @@ void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const Q
     Q_EMIT sortRoleChanged(current);
 }
 
-void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& current,
-                                                  const QList<QByteArray>& previous)
+void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray> &current, const QList<QByteArray> &previous)
 {
     Q_UNUSED(previous)
     Q_ASSERT(m_container->controller()->view()->visibleRoles() == current);
@@ -1806,14 +1899,12 @@ void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& curre
 
 void DolphinView::slotRoleEditingCanceled()
 {
-    disconnect(m_view, &DolphinItemListView::roleEditingFinished,
-               this, &DolphinView::slotRoleEditingFinished);
+    disconnect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished);
 }
 
-void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
+void DolphinView::slotRoleEditingFinished(int index, const QByteArray &role, const QVariant &value)
 {
-    disconnect(m_view, &DolphinItemListView::roleEditingFinished,
-               this, &DolphinView::slotRoleEditingFinished);
+    disconnect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished);
 
     const KFileItemList items = selectedItems();
     if (items.count() != 1) {
@@ -1831,24 +1922,32 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
             newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));
 
 #ifndef Q_OS_WIN
-            //Confirm hiding file/directory by renaming inline
+            // Confirm hiding file/directory by renaming inline
             if (!hiddenFilesShown() && newName.startsWith(QLatin1Char('.')) && !oldItem.name().startsWith(QLatin1Char('.'))) {
-                KGuiItem yesGuiItem(KStandardGuiItem::yes());
-                yesGuiItem.setText(i18nc("@action:button", "Rename and Hide"));
-
-                const auto code = KMessageBox::questionYesNo(this,
-                                                             oldItem.isFile() ? i18n("Adding a dot to the beginning of this file's name will hide it from view.\n"
-                                                                                     "Do you still want to rename it?")
-                                                                              : i18n("Adding a dot to the beginning of this folder's name will hide it from view.\n"
-                                                                                     "Do you still want to rename it?"),
-                                                             oldItem.isFile() ? i18n("Hide this File?") : i18n("Hide this Folder?"),
-                                                             yesGuiItem,
-                                                             KStandardGuiItem::cancel(),
-                                                             QStringLiteral("ConfirmHide")
-                                                            );
+                KGuiItem yesGuiItem(i18nc("@action:button", "Rename and Hide"), QStringLiteral("view-hidden"));
 
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+                const auto code =
+                    KMessageBox::questionTwoActions(this,
+#else
+                const auto code =
+                    KMessageBox::questionYesNo(this,
+#endif
+                                                    oldItem.isFile() ? i18n("Adding a dot to the beginning of this file's name will hide it from view.\n"
+                                                                            "Do you still want to rename it?")
+                                                                     : i18n("Adding a dot to the beginning of this folder's name will hide it from view.\n"
+                                                                            "Do you still want to rename it?"),
+                                                    oldItem.isFile() ? i18n("Hide this File?") : i18n("Hide this Folder?"),
+                                                    yesGuiItem,
+                                                    KStandardGuiItem::cancel(),
+                                                    QStringLiteral("ConfirmHide"));
+
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+                if (code == KMessageBox::SecondaryAction) {
+#else
                 if (code == KMessageBox::No) {
-                   return;
+#endif
+                    return;
                 }
             }
 #endif
@@ -1865,7 +1964,7 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
                 m_model->setData(index, data);
             }
 
-            KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
+            KIO::Job *job = KIO::moveAs(oldUrl, newUrl);
             KJobWidgets::setWindow(job, this);
             KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
             job->uiDelegate()->setAutoErrorHandlingEnabled(true);
@@ -1881,14 +1980,13 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
         if (retVal.direction != EditDone) {
             const short indexShift = retVal.direction == EditNext ? 1 : -1;
             m_container->controller()->selectionManager()->setSelected(index, 1, KItemListSelectionManager::Deselect);
-            m_container->controller()->selectionManager()->setSelected(index + indexShift, 1,
-                    KItemListSelectionManager::Select);
+            m_container->controller()->selectionManager()->setSelected(index + indexShift, 1, KItemListSelectionManager::Select);
             renameSelectedItems();
         }
     }
 }
 
-void DolphinView::loadDirectory(const QUrl& url, bool reload)
+void DolphinView::loadDirectory(const QUrl &url, bool reload)
 {
     if (!url.isValid()) {
         const QString location(url.toDisplayString(QUrl::PreferLocalFile));
@@ -1913,7 +2011,7 @@ void DolphinView::applyViewProperties()
     applyViewProperties(props);
 }
 
-void DolphinView::applyViewProperties(const ViewProperties& props)
+void DolphinView::applyViewProperties(const ViewProperties &props)
 {
     m_view->beginTransaction();
 
@@ -1992,9 +2090,9 @@ void DolphinView::applyViewProperties(const ViewProperties& props)
         }
     }
 
-    KItemListView* itemListView = m_container->controller()->view();
+    KItemListView *itemListView = m_container->controller()->view();
     if (itemListView->isHeaderVisible()) {
-        KItemListHeader* header = itemListView->header();
+        KItemListHeader *header = itemListView->header();
         const QList<int> headerColumnWidths = props.headerColumnWidths();
         const int rolesCount = m_visibleRoles.count();
         if (headerColumnWidths.count() == rolesCount) {
@@ -2008,7 +2106,7 @@ void DolphinView::applyViewProperties(const ViewProperties& props)
         } else {
             header->setAutomaticColumnResizing(true);
         }
-        header->setLeadingPadding(DetailsModeSettings::leadingPadding());
+        header->setSidePadding(DetailsModeSettings::sidePadding());
     }
 
     m_view->endTransaction();
@@ -2017,14 +2115,22 @@ void DolphinView::applyViewProperties(const ViewProperties& props)
 void DolphinView::applyModeToView()
 {
     switch (m_mode) {
-    case IconsView:   m_view->setItemLayout(KFileItemListView::IconsLayout); break;
-    case CompactView: m_view->setItemLayout(KFileItemListView::CompactLayout); break;
-    case DetailsView: m_view->setItemLayout(KFileItemListView::DetailsLayout); break;
-    default: Q_ASSERT(false); break;
+    case IconsView:
+        m_view->setItemLayout(KFileItemListView::IconsLayout);
+        break;
+    case CompactView:
+        m_view->setItemLayout(KFileItemListView::CompactLayout);
+        break;
+    case DetailsView:
+        m_view->setItemLayout(KFileItemListView::DetailsLayout);
+        break;
+    default:
+        Q_ASSERT(false);
+        break;
     }
 }
 
-void DolphinView::pasteToUrl(const QUrl& url)
+void DolphinView::pasteToUrl(const QUrl &url)
 {
     KIO::PasteJob *job = KIO::paste(QApplication::clipboard()->mimeData(), url);
     KJobWidgets::setWindow(job, this);
@@ -2040,7 +2146,7 @@ QList<QUrl> DolphinView::simplifiedSelectedUrls() const
 
     const KFileItemList items = selectedItems();
     urls.reserve(items.count());
-    for (const KFileItem& item : items) {
+    for (const KFileItem &item : items) {
         urls.append(item.url());
     }
 
@@ -2052,9 +2158,9 @@ QList<QUrl> DolphinView::simplifiedSelectedUrls() const
     return urls;
 }
 
-QMimeData* DolphinView::selectionMimeData() const
+QMimeData *DolphinView::selectionMimeData() const
 {
-    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
     const KItemSet selectedIndexes = selectionManager->selectedItems();
 
     return m_model->createMimeData(selectedIndexes);
@@ -2093,12 +2199,12 @@ QUrl DolphinView::viewPropertiesUrl() const
     return url;
 }
 
-void DolphinView::slotRenameDialogRenamingFinished(const QList<QUrl>& urls)
+void DolphinView::slotRenameDialogRenamingFinished(const QList<QUrl> &urls)
 {
     forceUrlsSelection(urls.first(), urls);
 }
 
-void DolphinView::forceUrlsSelection(const QUrl& current, const QList<QUrl>& selected)
+void DolphinView::forceUrlsSelection(const QUrl &current, const QList<QUrl> &selected)
 {
     clearSelection();
     m_clearSelectionBeforeSelectingNewItems = true;
@@ -2112,12 +2218,12 @@ void DolphinView::copyPathToClipboard()
     if (list.isEmpty()) {
         return;
     }
-    const KFileItem& item = list.at(0);
+    const KFileItem &item = list.at(0);
     QString path = item.localPath();
     if (path.isEmpty()) {
         path = item.url().toDisplayString();
     }
-    QClipboard* clipboard = QApplication::clipboard();
+    QClipboard *clipboard = QApplication::clipboard();
     if (clipboard == nullptr) {
         return;
     }
@@ -2153,13 +2259,15 @@ void DolphinView::updatePlaceholderLabel()
         return;
     }
 
-    if (m_loading) {
+    if (m_loadingState == LoadingState::Loading) {
         m_placeholderLabel->setVisible(false);
         m_showLoadingPlaceholderTimer->start();
         return;
     }
 
-    if (!nameFilter().isEmpty()) {
+    if (m_loadingState == LoadingState::Canceled) {
+        m_placeholderLabel->setText(i18n("Loading canceled"));
+    } else if (!nameFilter().isEmpty()) {
         m_placeholderLabel->setText(i18n("No items matching the filter"));
     } else if (m_url.scheme() == QLatin1String("baloosearch") || m_url.scheme() == QLatin1String("filenamesearch")) {
         m_placeholderLabel->setText(i18n("No items matching the search"));
@@ -2181,6 +2289,8 @@ void DolphinView::updatePlaceholderLabel()
         m_placeholderLabel->setText(i18n("No relevant network resources found"));
     } else if (m_url.scheme() == QLatin1String("mtp") && m_url.path() == QLatin1String("/")) {
         m_placeholderLabel->setText(i18n("No MTP-compatible devices found"));
+    } else if (m_url.scheme() == QLatin1String("afc") && m_url.path() == QLatin1String("/")) {
+        m_placeholderLabel->setText(i18n("No Apple devices found"));
     } else if (m_url.scheme() == QLatin1String("bluetooth")) {
         m_placeholderLabel->setText(i18n("No Bluetooth devices found"));
     } else {
@@ -2190,11 +2300,10 @@ void DolphinView::updatePlaceholderLabel()
     m_placeholderLabel->setVisible(true);
 }
 
-void DolphinView::tryShowNameToolTip(QEvent* event)
+void DolphinView::tryShowNameToolTip(QHelpEvent *event)
 {
     if (!GeneralSettings::showToolTips() && m_mode == DolphinView::IconsView) {
-        QHelpEvent *hoverEvent = reinterpret_cast<QHelpEvent *>(event);
-        const std::optional<int> index = m_view->itemAt(hoverEvent->pos());
+        const std::optional<int> index = m_view->itemAt(event->pos());
 
         if (!index.has_value()) {
             return;
@@ -2203,10 +2312,10 @@ void DolphinView::tryShowNameToolTip(QEvent* event)
         // Check whether the filename has been elided
         const bool isElided = m_view->isElided(index.value());
 
-        if(isElided) {
+        if (isElided) {
             const KFileItem item = m_model->fileItem(index.value());
             const QString text = item.text();
-            const QPoint pos = mapToGlobal(hoverEvent->pos());
+            const QPoint pos = mapToGlobal(event->pos());
             QToolTip::showText(pos, text);
         }
     }