Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 379cd9f902d975c90ce32b791a0f3c03113bb6e8..5c961b47b594c18d0710a3f408dd78668b5a7a64 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1,167 +1,249 @@
-/***************************************************************************
- *   Copyright (C) 2006-2009 by Peter Penz <peter.penz19@gmail.com>        *
- *   Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net>          *
- *                                                                         *
- *   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: 2006-2009 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2006 Gregor Kališnik <gregor@podnapisi.net>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "dolphinview.h"
 
 
 #include "dolphinview.h"
 

-#include <QAbstractItemView>
-#include <QApplication>
-#include <QBoxLayout>
-#include <QClipboard>
-#include <QDropEvent>
-#include <QGraphicsSceneDragDropEvent>
-#include <QKeyEvent>
-#include <QItemSelection>
-#include <QTimer>
-#include <QScrollBar>
-
-#include <KActionCollection>
-#include <KColorScheme>
-#include <KDirLister>
-#include <KDirModel>
-#include <KIconEffect>
-#include <KFileItem>
-#include <KFileItemListProperties>
-#include <KLocale>
-#include <kitemviews/kfileitemmodel.h>
-#include <kitemviews/kfileitemlistview.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kitemlistview.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <KIO/DeleteJob>
-#include <KIO/NetAccess>
-#include <KIO/PreviewJob>
-#include <KJob>
-#include <KMenu>
-#include <KMessageBox>
-#include <konq_fileitemcapabilities.h>
-#include <konq_operations.h>
-#include <konqmimedata.h>
-#include <KToggleAction>
-#include <KUrl>
-
-#include "additionalinfoaccessor.h"
-#include "dolphindirlister.h"
-#include "dolphinnewfilemenuobserver.h"

 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"

-#include "dolphinitemlistcontainer.h"
+#include "dolphinitemlistview.h"
+#include "dolphinnewfilemenuobserver.h"

 #include "draganddrophelper.h"
 #include "draganddrophelper.h"

-#include "renamedialog.h"
+#ifndef QT_NO_ACCESSIBILITY
+#include "kitemviews/accessibility/kitemlistviewaccessible.h"
+#endif
+#include "kitemviews/kfileitemlistview.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#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 "versioncontrol/versioncontrolobserver.h"

-#include "viewmodecontroller.h"

 #include "viewproperties.h"
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
 
 #include "viewproperties.h"
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
 

-namespace {
-    const int MaxModeEnum = DolphinView::CompactView;
-    const int MaxSortingEnum = DolphinView::SortByPath;
-};
-
-DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
-    QWidget(parent),
-    m_active(true),
-    m_tabsForFiles(false),
-    m_assureVisibleCurrentIndex(false),
-    m_isFolderWritable(true),
-    m_url(url),
-    m_mode(DolphinView::IconsView),
-    m_additionalInfoList(),
-    m_topLayout(0),
-    m_dirLister(0),
-    m_container(0),
-    m_toolTipManager(0),
-    m_selectionChangedTimer(0),
-    m_currentItemUrl(),
-    m_restoredContentsPosition(),
-    m_createdItemUrl(),
-    m_selectedUrls(),
-    m_versionControlObserver(0)
+#if HAVE_BALOO
+#include <Baloo/IndexerConfig>
+#endif
+#include <KColorScheme>
+#include <KDesktopFile>
+#include <KDirModel>
+#include <KFileItemListProperties>
+#include <KFormat>
+#include <KIO/CopyJob>
+#include <KIO/DeleteOrTrashJob>
+#include <KIO/DropJob>
+#include <KIO/JobUiDelegate>
+#include <KIO/Paste>
+#include <KIO/PasteJob>
+#include <KIO/RenameFileDialog>
+#include <KJob>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KProtocolManager>
+#include <KUrlMimeData>
+
+#include <kwidgetsaddons_version.h>
+
+#include <QAbstractItemView>
+#ifndef QT_NO_ACCESSIBILITY
+#include <QAccessible>
+#endif
+#include <QActionGroup>
+#include <QApplication>
+#include <QClipboard>
+#include <QDropEvent>
+#include <QGraphicsOpacityEffect>
+#include <QGraphicsSceneDragDropEvent>
+#include <QLabel>
+#include <QMenu>
+#include <QMimeDatabase>
+#include <QPixmapCache>
+#include <QScrollBar>
+#include <QSize>
+#include <QTimer>
+#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_selectNextItem(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_controlWheelAccumulatedDelta(0)
+    , 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);
 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);

-    m_topLayout->setMargin(0);
+    m_topLayout->setContentsMargins(0, 0, 0, 0);

 
     // 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:
 
     // 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(), SIGNAL(itemCreated(KUrl)),
-            this, SLOT(observeCreatedItem(KUrl)));
+    connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::itemCreated, this, &DolphinView::observeCreatedItem);

 
     m_selectionChangedTimer = new QTimer(this);
     m_selectionChangedTimer->setSingleShot(true);
     m_selectionChangedTimer->setInterval(300);
 
     m_selectionChangedTimer = new QTimer(this);
     m_selectionChangedTimer->setSingleShot(true);
     m_selectionChangedTimer->setInterval(300);

-    connect(m_selectionChangedTimer, SIGNAL(timeout()),
-            this, SLOT(emitSelectionChangedSignal()));
-
-    m_dirLister = new DolphinDirLister(this);
-    m_dirLister->setAutoUpdate(true);
-    m_dirLister->setDelayedMimeTypes(true);
-
-    connect(m_dirLister, SIGNAL(redirection(KUrl,KUrl)), this, SLOT(slotRedirection(KUrl,KUrl)));
-    connect(m_dirLister, SIGNAL(started(KUrl)),          this, SLOT(slotDirListerStarted(KUrl)));
-    connect(m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)),
-            this, SLOT(slotRefreshItems()));
-
-    connect(m_dirLister, SIGNAL(clear()),                     this, SIGNAL(itemCountChanged()));
-    connect(m_dirLister, SIGNAL(newItems(KFileItemList)),     this, SIGNAL(itemCountChanged()));
-    connect(m_dirLister, SIGNAL(infoMessage(QString)),        this, SIGNAL(infoMessage(QString)));
-    connect(m_dirLister, SIGNAL(errorMessage(QString)),       this, SIGNAL(infoMessage(QString)));
-    connect(m_dirLister, SIGNAL(percent(int)),                this, SIGNAL(pathLoadingProgress(int)));
-    connect(m_dirLister, SIGNAL(urlIsFileError(KUrl)),        this, SIGNAL(urlIsFileError(KUrl)));
-    connect(m_dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SIGNAL(itemCountChanged()));
-
-    m_container = new DolphinItemListContainer(m_dirLister, this);
-    m_container->setVisibleRoles(QList<QByteArray>() << "name");
+    connect(m_selectionChangedTimer, &QTimer::timeout, this, &DolphinView::emitSelectionChangedSignal);
+
+    m_model = new KFileItemModel(this);
+    m_view = new DolphinItemListView();
+    m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::FollowSetting);
+    m_view->setVisibleRoles({"text"});
+    applyModeToView();
+
+    KItemListController *controller = new KItemListController(m_model, m_view, this);
+    controller->setAutoActivationEnabled(GeneralSettings::autoExpandFolders());
+    connect(controller, &KItemListController::doubleClickViewBackground, this, &DolphinView::doubleClickViewBackground);
+
+    // The EnlargeSmallPreviews setting can only be changed after the model
+    // has been set in the view by KItemListController.
+    m_view->setEnlargeSmallPreviews(GeneralSettings::enlargeSmallPreviews());
+
+    m_container = new KItemListContainer(controller, this);

     m_container->installEventFilter(this);
     m_container->installEventFilter(this);

+#ifndef QT_NO_ACCESSIBILITY
+    m_view->setAccessibleParentsObject(m_container);
+#endif

     setFocusProxy(m_container);
     setFocusProxy(m_container);

+    connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, [this] {
+        hideToolTip();
+    });
+    connect(m_container->verticalScrollBar(), &QScrollBar::valueChanged, this, [this] {
+        hideToolTip();
+    });
+
+    m_showLoadingPlaceholderTimer = new QTimer(this);
+    m_showLoadingPlaceholderTimer->setInterval(500);
+    m_showLoadingPlaceholderTimer->setSingleShot(true);
+    connect(m_showLoadingPlaceholderTimer, &QTimer::timeout, this, &DolphinView::showLoadingPlaceholder);
+
+    // Show some placeholder text for empty folders
+    // This is made using a heavily-modified QLabel rather than a KTitleWidget
+    // because KTitleWidget can't be told to turn off mouse-selectable text
+    m_placeholderLabel = new QLabel(this);
+    // Don't consume mouse events
+    m_placeholderLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+    QFont placeholderLabelFont;
+    // To match the size of a level 2 Heading/KTitleWidget
+    placeholderLabelFont.setPointSize(qRound(placeholderLabelFont.pointSize() * 1.3));
+    m_placeholderLabel->setFont(placeholderLabelFont);
+    m_placeholderLabel->setWordWrap(true);
+    m_placeholderLabel->setAlignment(Qt::AlignCenter);
+    // Match opacity of QML placeholder label component
+    auto *effect = new QGraphicsOpacityEffect(m_placeholderLabel);
+    effect->setOpacity(0.5);
+    m_placeholderLabel->setGraphicsEffect(effect);
+    // Set initial text and visibility
+    updatePlaceholderLabel();
+
+    auto *centeringLayout = new QVBoxLayout(m_container);
+    centeringLayout->addWidget(m_placeholderLabel);
+    centeringLayout->setAlignment(m_placeholderLabel, Qt::AlignCenter);

 
 

-    KItemListController* controller = m_container->controller();

     controller->setSelectionBehavior(KItemListController::MultiSelection);
     controller->setSelectionBehavior(KItemListController::MultiSelection);

-    connect(controller, SIGNAL(itemActivated(int)),
-            this, SLOT(slotItemActivated(int)));
-    connect(controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
-    connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
-    connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
-    connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF)));
-    connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int)));
-    connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int)));
-    connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
-    connect(controller, SIGNAL(modelChanged(KItemModelBase*,KItemModelBase*)), this, SLOT(slotModelChanged(KItemModelBase*,KItemModelBase*)));
-
-    KFileItemModel* model = fileItemModel();
-    if (model) {
-        connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
-    }
-
-    KItemListSelectionManager* selectionManager = controller->selectionManager();
-    connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
-            this, SLOT(slotSelectionChanged(QSet<int>,QSet<int>)));
-
+    connect(controller, &KItemListController::itemActivated, this, &DolphinView::slotItemActivated);
+    connect(controller, &KItemListController::itemsActivated, this, &DolphinView::slotItemsActivated);
+    connect(controller, &KItemListController::itemMiddleClicked, this, &DolphinView::slotItemMiddleClicked);
+    connect(controller, &KItemListController::itemContextMenuRequested, this, &DolphinView::slotItemContextMenuRequested);
+    connect(controller, &KItemListController::viewContextMenuRequested, this, &DolphinView::slotViewContextMenuRequested);
+    connect(controller, &KItemListController::headerContextMenuRequested, this, &DolphinView::slotHeaderContextMenuRequested);
+    connect(controller, &KItemListController::mouseButtonPressed, this, &DolphinView::slotMouseButtonPressed);
+    connect(controller, &KItemListController::itemHovered, this, &DolphinView::slotItemHovered);
+    connect(controller, &KItemListController::itemUnhovered, this, &DolphinView::slotItemUnhovered);
+    connect(controller, &KItemListController::itemDropEvent, this, &DolphinView::slotItemDropEvent);
+    connect(controller, &KItemListController::escapePressed, this, &DolphinView::stopLoading);
+    connect(controller, &KItemListController::modelChanged, this, &DolphinView::slotModelChanged);
+    connect(controller, &KItemListController::selectedItemTextPressed, this, &DolphinView::slotSelectedItemTextPressed);
+    connect(controller, &KItemListController::increaseZoom, this, &DolphinView::slotIncreaseZoom);
+    connect(controller, &KItemListController::decreaseZoom, this, &DolphinView::slotDecreaseZoom);
+    connect(controller, &KItemListController::swipeUp, this, &DolphinView::slotSwipeUp);
+    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::currentDirectoryRemoved, this, &DolphinView::currentDirectoryRemoved);
+
+    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, &DolphinItemListView::columnHovered, this, [this](int columnIndex) {
+        m_hoveredColumnHeaderIndex = columnIndex;
+    });
+    connect(m_view, &DolphinItemListView::columnUnHovered, this, [this](int /* columnIndex */) {
+        m_hoveredColumnHeaderIndex = std::nullopt;
+    });
+    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);
     m_toolTipManager = new ToolTipManager(this);

+    connect(m_toolTipManager, &ToolTipManager::urlActivated, this, &DolphinView::urlActivated);
+#endif

 
     m_versionControlObserver = new VersionControlObserver(this);
 
     m_versionControlObserver = new VersionControlObserver(this);

-    m_versionControlObserver->setModel(model);
-    connect(m_versionControlObserver, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString)));
-    connect(m_versionControlObserver, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
-    connect(m_versionControlObserver, SIGNAL(operationCompletedMessage(QString)), this, SIGNAL(operationCompletedMessage(QString)));
+    m_versionControlObserver->setView(this);
+    m_versionControlObserver->setModel(m_model);
+    connect(m_versionControlObserver, &VersionControlObserver::infoMessage, this, &DolphinView::infoMessage);
+    connect(m_versionControlObserver, &VersionControlObserver::errorMessage, this, [this](const QString &message) {
+        Q_EMIT errorMessage(message, KIO::ERR_UNKNOWN);
+    });
+    connect(m_versionControlObserver, &VersionControlObserver::operationCompletedMessage, this, &DolphinView::operationCompletedMessage);
+
+    m_twoClicksRenamingTimer = new QTimer(this);
+    m_twoClicksRenamingTimer->setSingleShot(true);
+    connect(m_twoClicksRenamingTimer, &QTimer::timeout, this, &DolphinView::slotTwoClicksRenamingTimerTimeout);

 
     applyViewProperties();
     m_topLayout->addWidget(m_container);
 
     applyViewProperties();
     m_topLayout->addWidget(m_container);


@@ -171,9 +253,10 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
 
 DolphinView::~DolphinView()
 {
 
 DolphinView::~DolphinView()
 {

+    disconnect(m_container->controller(), &KItemListController::modelChanged, this, &DolphinView::slotModelChanged);

 }
 
 }
 

-KUrl DolphinView::url() const
+QUrl DolphinView::url() const

 {
     return m_url;
 }
 {
     return m_url;
 }


@@ -186,24 +269,11 @@ void DolphinView::setActive(bool active)
 
     m_active = active;
 
 
     m_active = active;
 

-    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
-    if (!active) {
-        color.setAlpha(150);
-    }
-
-    QWidget* viewport = m_container->viewport();
-    if (viewport) {
-        QPalette palette;
-        palette.setColor(viewport->backgroundRole(), color);
-        viewport->setPalette(palette);
-    }
-
-    update();
+    updatePalette();

 
     if (active) {
         m_container->setFocus();
 
     if (active) {
         m_container->setFocus();

-        emit activated();
-        emit writeStateChanged(m_isFolderWritable);
+        Q_EMIT activated();

     }
 }
 
     }
 }
 


@@ -212,43 +282,84 @@ bool DolphinView::isActive() const
     return m_active;
 }
 
     return m_active;
 }
 

-void DolphinView::setMode(Mode mode)
+void DolphinView::setViewMode(Mode mode)

 {
     if (mode != m_mode) {
 {
     if (mode != m_mode) {

-        ViewProperties props(url());
+        // Reset scrollbars before changing the view mode.
+        m_container->horizontalScrollBar()->setValue(0);
+        m_container->verticalScrollBar()->setValue(0);
+
+        ViewProperties props(viewPropertiesUrl());

         props.setViewMode(mode);
         props.setViewMode(mode);

-        props.save();

 
 

-        applyViewProperties();
+        // We pass the new ViewProperties to applyViewProperties, rather than
+        // storing them on disk and letting applyViewProperties() read them
+        // from there, to prevent that changing the view mode fails if the
+        // .directory file is not writable (see bug 318534).
+        applyViewProperties(props);

     }
 }
 
     }
 }
 

-DolphinView::Mode DolphinView::mode() const
+DolphinView::Mode DolphinView::viewMode() const

 {
     return m_mode;
 }
 
 {
     return m_mode;
 }
 

+void DolphinView::setSelectionModeEnabled(const bool enabled)
+{
+    if (enabled) {
+        if (!m_proxyStyle) {
+            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(nullptr);
+        m_view->setStyle(nullptr);
+        m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::FollowSetting);
+    }
+    m_container->controller()->setSelectionModeEnabled(enabled);
+#ifndef QT_NO_ACCESSIBILITY
+    if (QAccessible::isActive()) {
+        auto accessibleViewInterface = static_cast<KItemListViewAccessible *>(QAccessible::queryAccessibleInterface(m_view));
+        accessibleViewInterface->announceSelectionModeEnabled(enabled);
+    }
+#endif
+}
+
+bool DolphinView::selectionMode() const
+{
+    return m_container->controller()->selectionMode();
+}
+

 void DolphinView::setPreviewsShown(bool show)
 {
     if (previewsShown() == show) {
         return;
     }
 
 void DolphinView::setPreviewsShown(bool show)
 {
     if (previewsShown() == show) {
         return;
     }
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setPreviewsShown(show);
 
     props.setPreviewsShown(show);
 

-    m_container->setPreviewsShown(show);
-    emit previewsShownChanged(show);
+    const int oldZoomLevel = m_view->zoomLevel();
+    m_view->setPreviewsShown(show);
+    Q_EMIT previewsShownChanged(show);
+
+    const int newZoomLevel = m_view->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        Q_EMIT zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }

 }
 
 bool DolphinView::previewsShown() const
 {
 }
 
 bool DolphinView::previewsShown() const
 {

-    return m_container->previewsShown();
+    return m_view->previewsShown();

 }
 
 void DolphinView::setHiddenFilesShown(bool show)
 {
 }
 
 void DolphinView::setHiddenFilesShown(bool show)
 {

-    if (m_dirLister->showingDotFiles() == show) {
+    if (m_model->showHiddenFiles() == show) {

         return;
     }
 
         return;
     }
 


@@ -256,17 +367,16 @@ void DolphinView::setHiddenFilesShown(bool show)
     m_selectedUrls.clear();
     m_selectedUrls = itemList.urlList();
 
     m_selectedUrls.clear();
     m_selectedUrls = itemList.urlList();
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setHiddenFilesShown(show);
 
     props.setHiddenFilesShown(show);
 

-    m_dirLister->setShowingDotFiles(show);
-    m_dirLister->emitChanges();
-    emit hiddenFilesShownChanged(show);
+    m_model->setShowHiddenFiles(show);
+    Q_EMIT hiddenFilesShownChanged(show);

 }
 
 bool DolphinView::hiddenFilesShown() const
 {
 }
 
 bool DolphinView::hiddenFilesShown() const
 {

-    return m_dirLister->showingDotFiles();
+    return m_model->showHiddenFiles();

 }
 
 void DolphinView::setGroupedSorting(bool grouped)
 }
 
 void DolphinView::setGroupedSorting(bool grouped)


@@ -275,73 +385,79 @@ void DolphinView::setGroupedSorting(bool grouped)
         return;
     }
 
         return;
     }
 

-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());

     props.setGroupedSorting(grouped);
     props.setGroupedSorting(grouped);

-    props.save();

 
 

-    m_container->controller()->model()->setGroupedSorting(grouped);
+    m_model->setGroupedSorting(grouped);

 
 

-    emit groupedSortingChanged(grouped);
+    Q_EMIT groupedSortingChanged(grouped);

 }
 
 bool DolphinView::groupedSorting() const
 {
 }
 
 bool DolphinView::groupedSorting() const
 {

-    return fileItemModel()->groupedSorting();
+    return m_model->groupedSorting();

 }
 
 KFileItemList DolphinView::items() const
 {
 }
 
 KFileItemList DolphinView::items() const
 {

-    return m_dirLister->items();
+    KFileItemList list;
+    const int itemCount = m_model->count();
+    list.reserve(itemCount);
+
+    for (int i = 0; i < itemCount; ++i) {
+        list.append(m_model->fileItem(i));
+    }
+
+    return list;
+}
+
+int DolphinView::itemsCount() const
+{
+    return m_model->count();

 }
 
 KFileItemList DolphinView::selectedItems() const
 {
 }
 
 KFileItemList DolphinView::selectedItems() const
 {

-    const KFileItemModel* model = fileItemModel();
-    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-    const QSet<int> selectedIndexes = selectionManager->selectedItems();
-
-    QList<int> sortedIndexes = selectedIndexes.toList();
-    qSort(sortedIndexes);
+    const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();

 
     KFileItemList selectedItems;
 
     KFileItemList selectedItems;

-    QListIterator<int> it(sortedIndexes);
-    while (it.hasNext()) {
-        const int index = it.next();
-        selectedItems.append(model->fileItem(index));
+    const auto items = selectionManager->selectedItems();
+    selectedItems.reserve(items.count());
+    for (int index : items) {
+        selectedItems.append(m_model->fileItem(index));

     }
     return selectedItems;
 }
 
 int DolphinView::selectedItemsCount() const
 {
     }
     return selectedItems;
 }
 
 int DolphinView::selectedItemsCount() const
 {

-    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();

     return selectionManager->selectedItems().count();
 }
 
     return selectionManager->selectedItems().count();
 }
 

-void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)
+void DolphinView::markUrlsAsSelected(const QList<QUrl> &urls)

 {
     m_selectedUrls = urls;
 {
     m_selectedUrls = urls;

+    m_selectJobCreatedItems = false;

 }
 
 }
 

-void DolphinView::markUrlAsCurrent(const KUrl& url)
+void DolphinView::markUrlAsCurrent(const QUrl &url)

 {
     m_currentItemUrl = url;
 {
     m_currentItemUrl = url;

+    m_scrollToCurrentItem = true;

 }
 
 }
 

-void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
+void DolphinView::selectItems(const QRegularExpression &regexp, bool enabled)

 {
 {

-    const KItemListSelectionManager::SelectionMode mode = enabled
-                                                        ? KItemListSelectionManager::Select
-                                                        : KItemListSelectionManager::Deselect;
-    const KFileItemModel* model = fileItemModel();
-    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 < model->count(); index++) {
-        const KFileItem item = model->fileItem(index);
-        if (pattern.exactMatch(item.text())) {
-            // An alternative approach would be to store the matching items in a QSet<int> and
+    for (int index = 0; index < m_model->count(); index++) {
+        const KFileItem item = m_model->fileItem(index);
+        if (regexp.match(item.text()).hasMatch()) {
+            // An alternative approach would be to store the matching items in a KItemSet and

             // select them in one go after the loop, but we'd need a new function
             // select them in one go after the loop, but we'd need a new function

-            // KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)
+            // KItemListSelectionManager::setSelected(KItemSet, SelectionMode mode)

             // for that.
             selectionManager->setSelected(index, 1, mode);
         }
             // for that.
             selectionManager->setSelected(index, 1, mode);
         }


@@ -351,41 +467,88 @@ void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
 void DolphinView::setZoomLevel(int level)
 {
     const int oldZoomLevel = zoomLevel();
 void DolphinView::setZoomLevel(int level)
 {
     const int oldZoomLevel = zoomLevel();

-    m_container->setZoomLevel(level);
+    m_view->setZoomLevel(level);

     if (zoomLevel() != oldZoomLevel) {
     if (zoomLevel() != oldZoomLevel) {

-        emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
+        hideToolTip();
+        Q_EMIT zoomLevelChanged(zoomLevel(), oldZoomLevel);

     }
 }
 
 int DolphinView::zoomLevel() const
 {
     }
 }
 
 int DolphinView::zoomLevel() const
 {

-    return m_container->zoomLevel();
+    return m_view->zoomLevel();

 }
 
 }
 

-void DolphinView::setSorting(Sorting sorting)
+void DolphinView::setSortRole(const QByteArray &role)

 {
 {

-    if (sorting != this->sorting()) {
-        updateSorting(sorting);
+    if (role != sortRole()) {
+        ViewProperties props(viewPropertiesUrl());
+        props.setSortRole(role);
+
+        KItemModelBase *model = m_container->controller()->model();
+        model->setSortRole(role);
+
+        Q_EMIT sortRoleChanged(role);

     }
 }
 
     }
 }
 

-DolphinView::Sorting DolphinView::sorting() const
+QByteArray DolphinView::sortRole() const

 {
 {

-    KItemModelBase* model = m_container->controller()->model();
-    return sortingForSortRole(model->sortRole());
+    const KItemModelBase *model = m_container->controller()->model();
+    return model->sortRole();

 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)
 {
     if (sortOrder() != order) {
 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)
 {
     if (sortOrder() != order) {

-        updateSortOrder(order);
+        ViewProperties props(viewPropertiesUrl());
+        props.setSortOrder(order);
+
+        m_model->setSortOrder(order);
+
+        Q_EMIT sortOrderChanged(order);

     }
 }
 
 Qt::SortOrder DolphinView::sortOrder() const
 {
     }
 }
 
 Qt::SortOrder DolphinView::sortOrder() const
 {

-    KItemModelBase* model = fileItemModel();
-    return model->sortOrder();
+    return m_model->sortOrder();
+}
+
+void DolphinView::setGroupRole(const QByteArray &role)
+{
+    if (role != groupRole()) {
+        ViewProperties props(viewPropertiesUrl());
+        props.setGroupRole(role);
+
+        KItemModelBase *model = m_container->controller()->model();
+        model->setGroupRole(role);
+
+        Q_EMIT groupRoleChanged(role);
+    }
+}
+
+QByteArray DolphinView::groupRole() const
+{
+    const KItemModelBase *model = m_container->controller()->model();
+    return model->groupRole();
+}
+
+void DolphinView::setGroupOrder(Qt::SortOrder order)
+{
+    if (groupOrder() != order) {
+        ViewProperties props(viewPropertiesUrl());
+        props.setGroupOrder(order);
+
+        m_model->setGroupOrder(order);
+
+        Q_EMIT groupOrderChanged(order);
+    }
+}
+
+Qt::SortOrder DolphinView::groupOrder() const
+{
+    return m_model->groupOrder();

 }
 
 void DolphinView::setSortFoldersFirst(bool foldersFirst)
 }
 
 void DolphinView::setSortFoldersFirst(bool foldersFirst)


@@ -397,26 +560,37 @@ void DolphinView::setSortFoldersFirst(bool foldersFirst)
 
 bool DolphinView::sortFoldersFirst() const
 {
 
 bool DolphinView::sortFoldersFirst() const
 {

-    KFileItemModel* model = fileItemModel();
-    return model->sortFoldersFirst();
+    return m_model->sortDirectoriesFirst();
+}
+
+void DolphinView::setSortHiddenLast(bool hiddenLast)
+{
+    if (sortHiddenLast() != hiddenLast) {
+        updateSortHiddenLast(hiddenLast);
+    }
+}
+
+bool DolphinView::sortHiddenLast() const
+{
+    return m_model->sortHiddenLast();

 }
 
 }
 

-void DolphinView::setAdditionalInfoList(const QList<AdditionalInfo>& info)
+void DolphinView::setVisibleRoles(const QList<QByteArray> &roles)

 {
 {

-    const QList<AdditionalInfo> previousList = info;
+    const QList<QByteArray> previousRoles = roles;

 
 

-    ViewProperties props(url());
-    props.setAdditionalInfoList(info);
+    ViewProperties props(viewPropertiesUrl());
+    props.setVisibleRoles(roles);

 
 

-    m_additionalInfoList = info;
-    applyAdditionalInfoListToView();
+    m_visibleRoles = roles;
+    m_view->setVisibleRoles(roles);

 
 

-    emit additionalInfoListChanged(m_additionalInfoList, previousList);
+    Q_EMIT visibleRolesChanged(m_visibleRoles, previousRoles);

 }
 
 }
 

-QList<DolphinView::AdditionalInfo> DolphinView::additionalInfoList() const
+QList<QByteArray> DolphinView::visibleRoles() const

 {
 {

-    return m_additionalInfoList;
+    return m_visibleRoles;

 }
 
 void DolphinView::reload()
 }
 
 void DolphinView::reload()


@@ -425,10 +599,6 @@ void DolphinView::reload()
     QDataStream saveStream(&viewState, QIODevice::WriteOnly);
     saveState(saveStream);
 
     QDataStream saveStream(&viewState, QIODevice::WriteOnly);
     saveState(saveStream);
 

-    const KFileItemList itemList = selectedItems();
-    m_selectedUrls.clear();
-    m_selectedUrls = itemList.urlList();
-

     setUrl(url());
     loadDirectory(url(), true);
 
     setUrl(url());
     loadDirectory(url(), true);
 


@@ -436,63 +606,63 @@ void DolphinView::reload()
     restoreState(restoreStream);
 }
 
     restoreState(restoreStream);
 }
 

-void DolphinView::stopLoading()
-{
-    m_dirLister->stop();
-}
-
-void DolphinView::refresh()
+void DolphinView::readSettings()

 {
 {

-    const bool oldActivationState = m_active;
-    const int oldZoomLevel = zoomLevel();
-    m_active = true;
+    const int oldZoomLevel = m_view->zoomLevel();

 
 

+    GeneralSettings::self()->load();
+    m_view->readSettings();

     applyViewProperties();
     applyViewProperties();

-    reload();

 
 

-    setActive(oldActivationState);
-    updateZoomLevel(oldZoomLevel);
+    m_container->controller()->setAutoActivationEnabled(GeneralSettings::autoExpandFolders());
+
+    const int newZoomLevel = m_view->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        Q_EMIT zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }
+}
+
+void DolphinView::writeSettings()
+{
+    GeneralSettings::self()->save();
+    m_view->writeSettings();

 }
 
 }
 

-void DolphinView::setNameFilter(const QString& nameFilter)
+void DolphinView::setNameFilter(const QString &nameFilter)

 {
 {

-    Q_UNUSED(nameFilter);
-    //m_viewModeController->setNameFilter(nameFilter);
+    m_model->setNameFilter(nameFilter);

 }
 
 QString DolphinView::nameFilter() const
 {
 }
 
 QString DolphinView::nameFilter() const
 {

-    return QString(); //m_viewModeController->nameFilter();
+    return m_model->nameFilter();

 }
 
 }
 

-void DolphinView::calculateItemCount(int& fileCount,
-                                     int& folderCount,
-                                     KIO::filesize_t& totalFileSize) const
+void DolphinView::setMimeTypeFilters(const QStringList &filters)

 {
 {

-    foreach (const KFileItem& item, m_dirLister->items()) {
-        if (item.isDir()) {
-            ++folderCount;
-        } else {
-            ++fileCount;
-            totalFileSize += item.size();
-        }
-    }
+    return m_model->setMimeTypeFilters(filters);

 }
 
 }
 

-QString DolphinView::statusBarText() const
+QStringList DolphinView::mimeTypeFilters() const

 {
 {

-    QString summary;
-    QString foldersText;
-    QString filesText;
+    return m_model->mimeTypeFilters();
+}

 
 

-    int folderCount = 0;
-    int fileCount = 0;
-    KIO::filesize_t totalFileSize = 0;
+void DolphinView::requestStatusBarText()
+{
+    if (m_statJobForStatusBarText) {
+        // Kill the pending request.
+        m_statJobForStatusBarText->kill();
+    }
+
+    if (m_container->controller()->selectionManager()->hasSelection()) {
+        int folderCount = 0;
+        int fileCount = 0;
+        KIO::filesize_t totalFileSize = 0;

 
 

-    if (hasSelection()) {

         // Give a summary of the status of the selected files
         const KFileItemList list = selectedItems();
         // Give a summary of the status of the selected files
         const KFileItemList list = selectedItems();

-        foreach (const KFileItem& item, list) {
+        for (const KFileItem &item : list) {

             if (item.isDir()) {
                 ++folderCount;
             } else {
             if (item.isDir()) {
                 ++folderCount;
             } else {


@@ -502,38 +672,60 @@ QString DolphinView::statusBarText() const
         }
 
         if (folderCount + fileCount == 1) {
         }
 
         if (folderCount + fileCount == 1) {

-            // If only one item is selected, show the filename
-            filesText = i18nc("@info:status", "<filename>%1</filename> selected", list.first().text());
+            // If only one item is selected, show info about it
+            Q_EMIT statusBarTextChanged(list.first().getStatusBarInfo());

         } else {
             // At least 2 items are selected
         } else {
             // At least 2 items are selected

-            foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
-            filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount);
+            emitStatusBarText(folderCount, fileCount, totalFileSize, HasSelection);
+        }
+    } else { // has no selection
+        if (!m_model->rootItem().url().isValid()) {
+            return;

         }
         }

+
+        m_statJobForStatusBarText = KIO::stat(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)
+{
+    QString foldersText;
+    QString filesText;
+    QString summary;
+
+    if (selection == HasSelection) {
+        // At least 2 items are selected because the case of 1 selected item is handled in
+        // DolphinView::requestStatusBarText().
+        foldersText = i18ncp("@info:status", "1 folder selected", "%1 folders selected", folderCount);
+        filesText = i18ncp("@info:status", "1 file selected", "%1 files selected", fileCount);

     } else {
     } else {

-        calculateItemCount(fileCount, folderCount, totalFileSize);
-        foldersText = i18ncp("@info:status", "1 Folder", "%1 Folders", folderCount);
-        filesText = i18ncp("@info:status", "1 File", "%1 Files", fileCount);
+        foldersText = i18ncp("@info:status", "1 folder", "%1 folders", folderCount);
+        filesText = i18ncp("@info:status", "1 file", "%1 files", fileCount);

     }
 
     if (fileCount > 0 && folderCount > 0) {
     }
 
     if (fileCount > 0 && folderCount > 0) {

-        summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
-                        foldersText, filesText, fileSizeText(totalFileSize));
+        summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)", foldersText, filesText, KFormat().formatByteSize(totalFileSize));

     } else if (fileCount > 0) {
     } else if (fileCount > 0) {

-        summary = i18nc("@info:status files (size)", "%1 (%2)", filesText, fileSizeText(totalFileSize));
+        summary = i18nc("@info:status files (size)", "%1 (%2)", filesText, KFormat().formatByteSize(totalFileSize));

     } else if (folderCount > 0) {
         summary = foldersText;
     } else if (folderCount > 0) {
         summary = foldersText;

+    } else {
+        summary = i18nc("@info:status", "0 folders, 0 files");

     }
     }

-
-    return summary;
+    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()) {
 
     if (items.isEmpty()) {

-        const KFileItem item = fileItemModel()->rootItem();
-        actions = m_versionControlObserver->actions(KFileItemList() << item);
+        const KFileItem item = m_model->rootItem();
+        if (!item.isNull()) {
+            actions = m_versionControlObserver->actions(KFileItemList() << item);
+        }

     } else {
         actions = m_versionControlObserver->actions(items);
     }
     } else {
         actions = m_versionControlObserver->actions(items);
     }


@@ -541,108 +733,184 @@ QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) c
     return actions;
 }
 
     return actions;
 }
 

-void DolphinView::setUrl(const KUrl& url)
+void DolphinView::setUrl(const QUrl &url)

 {
     if (url == m_url) {
         return;
     }
 
 {
     if (url == m_url) {
         return;
     }
 

-    emit urlAboutToBeChanged(url);
+    clearSelection();
+

     m_url = url;
 
     m_url = url;
 

-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
-    }
+    hideToolTip();
+
+    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
     // might be done on the existing items although they get cleared
     // anyhow afterwards by loadDirectory().
 
     // It is important to clear the items from the model before
     // applying the view properties, otherwise expensive operations
     // might be done on the existing items although they get cleared
     // anyhow afterwards by loadDirectory().

-    fileItemModel()->clear();
+    m_model->clear();

     applyViewProperties();
     loadDirectory(url);
 
     applyViewProperties();
     loadDirectory(url);
 

-    emit urlChanged(url);
+    Q_EMIT urlChanged(url);

 }
 
 void DolphinView::selectAll()
 {
 }
 
 void DolphinView::selectAll()
 {

-    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-    selectionManager->setSelected(0, fileItemModel()->count());
+    KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
+    selectionManager->setSelected(0, m_model->count());

 }
 
 void DolphinView::invertSelection()
 {
 }
 
 void DolphinView::invertSelection()
 {

-    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-    selectionManager->setSelected(0, fileItemModel()->count(), KItemListSelectionManager::Toggle);
+    KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
+    selectionManager->setSelected(0, m_model->count(), KItemListSelectionManager::Toggle);

 }
 
 void DolphinView::clearSelection()
 {
 }
 
 void DolphinView::clearSelection()
 {

+    m_selectJobCreatedItems = false;
+    m_selectedUrls.clear();

     m_container->controller()->selectionManager()->clearSelection();
 }
 
 void DolphinView::renameSelectedItems()
 {
     m_container->controller()->selectionManager()->clearSelection();
 }
 
 void DolphinView::renameSelectedItems()
 {

-    KFileItemList items = selectedItems();
-    const int itemCount = items.count();
-    if (itemCount < 1) {
+    const KFileItemList items = selectedItems();
+    if (items.isEmpty()) {

         return;
     }
 
         return;
     }
 

-    // TODO: The new view-engine introduced with Dolphin 2.0 does not support inline
-    // renaming yet.
-    /*if ((itemCount == 1) && DolphinSettings::instance().generalSettings()->renameInline()) {
-        const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForItem(items.first());
-        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
-        m_viewAccessor.itemView()->edit(proxyIndex);
-    } else {*/
-        RenameDialog* dialog = new RenameDialog(this, items);
-        dialog->setAttribute(Qt::WA_DeleteOnClose);
-        dialog->show();
-        dialog->raise();
-        dialog->activateWindow();
-    //}
-
-    // assure that the current index remains visible when KDirLister
-    // will notify the view about changed items
+    if (items.count() == 1 && GeneralSettings::renameInline()) {
+        const int index = m_model->index(items.first());
+
+        connect(
+            m_view,
+            &KItemListView::scrollingStopped,
+            this,
+            [this, index]() {
+                m_view->editRole(index, "text");
+
+                hideToolTip();
+
+                connect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished);
+            },
+            Qt::SingleShotConnection);
+        m_view->scrollToItem(index);
+
+    } else {
+        KIO::RenameFileDialog *dialog = new KIO::RenameFileDialog(items, this);
+        connect(dialog, &KIO::RenameFileDialog::renamingFinished, this, [this, items](const QList<QUrl> &urls) {
+            // The model may have already been updated, so it's possible that we don't find the old items.
+            for (int i = 0; i < items.count(); ++i) {
+                const int index = m_model->index(items[i]);
+                if (index >= 0) {
+                    QHash<QByteArray, QVariant> data;
+                    data.insert("text", urls[i].fileName());
+                    m_model->setData(index, data);
+                }
+            }
+
+            forceUrlsSelection(urls.first(), urls);
+            updateSelectionState();
+        });
+        connect(dialog, &KIO::RenameFileDialog::error, this, [this](KJob *job) {
+            KMessageBox::error(this, job->errorString());
+        });
+
+        dialog->open();
+    }
+
+    // Assure that the current index remains visible when KFileItemModel
+    // will notify the view about changed items (which might result in
+    // a changed sorting).

     m_assureVisibleCurrentIndex = true;
 }
 
 void DolphinView::trashSelectedItems()
 {
     m_assureVisibleCurrentIndex = true;
 }
 
 void DolphinView::trashSelectedItems()
 {

-    const KUrl::List list = simplifiedSelectedUrls();
-    KonqOperations::del(this, KonqOperations::TRASH, list);
+    const QList<QUrl> list = simplifiedSelectedUrls();
+
+    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();

 }
 
 void DolphinView::deleteSelectedItems()
 {
 }
 
 void DolphinView::deleteSelectedItems()
 {

-    const KUrl::List list = simplifiedSelectedUrls();
-    const bool del = KonqOperations::askDeleteConfirmation(list,
-                     KonqOperations::DEL,
-                     KonqOperations::DEFAULT_CONFIRMATION,
-                     this);
+    const QList<QUrl> list = simplifiedSelectedUrls();

 
 

-    if (del) {
-        KIO::Job* job = KIO::del(list);
-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotDeleteFileFinished(KJob*)));
-    }
+    using Iface = KIO::AskUserActionInterface;
+    auto *trashJob = new KIO::DeleteOrTrashJob(list, Iface::Delete, Iface::DefaultConfirmation, this);
+    connect(trashJob, &KJob::result, this, &DolphinView::slotDeleteFileFinished);
+    m_selectNextItem = true;
+    trashJob->start();

 }
 
 }
 

-void DolphinView::cutSelectedItems()
+void DolphinView::cutSelectedItemsToClipboard()

 {
 {

-    QMimeData* mimeData = selectionMimeData();
-    KonqMimeData::addIsCutSelection(mimeData, true);
+    QMimeData *mimeData = selectionMimeData();
+    KIO::setClipboardDataCut(mimeData, true);
+    KUrlMimeData::exportUrlsToPortal(mimeData);

     QApplication::clipboard()->setMimeData(mimeData);
 }
 
     QApplication::clipboard()->setMimeData(mimeData);
 }
 

-void DolphinView::copySelectedItems()
+void DolphinView::copySelectedItemsToClipboard()

 {
 {

-    QMimeData* mimeData = selectionMimeData();
+    QMimeData *mimeData = selectionMimeData();
+    KUrlMimeData::exportUrlsToPortal(mimeData);

     QApplication::clipboard()->setMimeData(mimeData);
 }
 
     QApplication::clipboard()->setMimeData(mimeData);
 }
 

+void DolphinView::copySelectedItems(const KFileItemList &selection, const QUrl &destinationUrl)
+{
+    if (selection.isEmpty() || !destinationUrl.isValid()) {
+        return;
+    }
+
+    m_clearSelectionBeforeSelectingNewItems = true;
+    m_markFirstNewlySelectedItemAsCurrent = true;
+    m_selectJobCreatedItems = true;
+
+    KIO::CopyJob *job = KIO::copy(selection.urlList(), destinationUrl, KIO::DefaultFlags);
+    KJobWidgets::setWindow(job, this);
+
+    connect(job, &KIO::CopyJob::result, this, &DolphinView::slotJobResult);
+    connect(job, &KIO::CopyJob::copying, this, &DolphinView::slotItemCreatedFromJob);
+    connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotItemCreatedFromJob);
+    connect(job, &KIO::CopyJob::warning, this, [this](KJob *job, const QString & /* warning */) {
+        Q_EMIT errorMessage(job->errorString(), job->error());
+    });
+    KIO::FileUndoManager::self()->recordCopyJob(job);
+}
+
+void DolphinView::moveSelectedItems(const KFileItemList &selection, const QUrl &destinationUrl)
+{
+    if (selection.isEmpty() || !destinationUrl.isValid()) {
+        return;
+    }
+
+    m_clearSelectionBeforeSelectingNewItems = true;
+    m_markFirstNewlySelectedItemAsCurrent = true;
+    m_selectJobCreatedItems = true;
+
+    KIO::CopyJob *job = KIO::move(selection.urlList(), destinationUrl, KIO::DefaultFlags);
+    KJobWidgets::setWindow(job, this);
+
+    connect(job, &KIO::CopyJob::result, this, &DolphinView::slotJobResult);
+    connect(job, &KIO::CopyJob::moving, this, &DolphinView::slotItemCreatedFromJob);
+    connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotItemCreatedFromJob);
+    connect(job, &KIO::CopyJob::warning, this, [this](KJob *job, const QString & /*warning */) {
+        Q_EMIT errorMessage(job->errorString(), job->error());
+    });
+    KIO::FileUndoManager::self()->recordCopyJob(job);
+}
+

 void DolphinView::paste()
 {
     pasteToUrl(url());
 void DolphinView::paste()
 {
     pasteToUrl(url());


@@ -656,15 +924,157 @@ void DolphinView::pasteIntoFolder()
     }
 }
 
     }
 }
 

-bool DolphinView::eventFilter(QObject* watched, QEvent* event)
+void DolphinView::duplicateSelectedItems()
+{
+    const KFileItemList itemList = selectedItems();
+    if (itemList.isEmpty()) {
+        return;
+    }
+
+    const QMimeDatabase db;
+
+    m_clearSelectionBeforeSelectingNewItems = true;
+    m_markFirstNewlySelectedItemAsCurrent = true;
+    m_selectJobCreatedItems = true;
+
+    // Duplicate all selected items and append "copy" to the end of the file name
+    // but before the filename extension, if present
+    for (const auto &item : itemList) {
+        const QUrl originalURL = item.url();
+        const QString originalDirectoryPath = originalURL.adjusted(QUrl::RemoveFilename).path();
+        const QString originalFileName = item.name();
+
+        QString extension = db.suffixForFileName(originalFileName);
+
+        QUrl duplicateURL = originalURL;
+
+        // 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>"
+        } else {
+            // Need to add a dot since QMimeDatabase::suffixForFileName() doesn't include it
+            extension = QLatin1String(".") + extension;
+            const QString originalFilenameWithoutExtension = originalFileName.chopped(extension.size());
+            // Preserve file's original filename extension in case the casing differs
+            // from what QMimeDatabase::suffixForFileName() returned
+            const QString originalExtension = originalFileName.right(extension.size());
+            duplicateURL.setPath(originalDirectoryPath + i18nc("<filename> copy", "%1 copy", originalFilenameWithoutExtension) + originalExtension);
+        }
+
+        KIO::CopyJob *job = KIO::copyAs(originalURL, duplicateURL);
+        job->setAutoRename(true);
+        KJobWidgets::setWindow(job, this);
+
+        connect(job, &KIO::CopyJob::result, this, &DolphinView::slotJobResult);
+        connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotItemCreatedFromJob);
+        connect(job, &KIO::CopyJob::copyingLinkDone, this, &DolphinView::slotItemLinkCreatedFromJob);
+        connect(job, &KIO::CopyJob::warning, this, [this](KJob *job, const QString & /*warning*/) {
+            Q_EMIT errorMessage(job->errorString(), job->error());
+        });
+        KIO::FileUndoManager::self()->recordCopyJob(job);
+    }
+}
+
+void DolphinView::stopLoading()
+{
+    m_model->cancelDirectoryLoading();
+}
+
+void DolphinView::updatePalette()
+{
+    QColor color = KColorScheme(isActiveWindow() ? QPalette::Active : QPalette::Inactive, KColorScheme::View).background().color();
+    if (!m_active) {
+        color.setAlpha(150);
+    }
+
+    QWidget *viewport = m_container->viewport();
+    if (viewport) {
+        QPalette palette;
+        palette.setColor(viewport->backgroundRole(), color);
+        viewport->setPalette(palette);
+    }
+
+    update();
+}
+
+void DolphinView::abortTwoClicksRenaming()
+{
+    m_twoClicksRenamingItemUrl.clear();
+    m_twoClicksRenamingTimer->stop();
+}
+
+bool DolphinView::eventFilter(QObject *watched, QEvent *event)

 {
     switch (event->type()) {
 {
     switch (event->type()) {

+    case QEvent::PaletteChange:
+        updatePalette();
+        QPixmapCache::clear();
+        break;
+
+    case QEvent::WindowActivate:
+    case QEvent::WindowDeactivate:
+        updatePalette();
+        break;
+
+    case QEvent::KeyPress:
+        hideToolTip(ToolTipManager::HideBehavior::Instantly);
+        if (GeneralSettings::useTabForSwitchingSplitView()) {
+            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);
         }
         break;
 
     case QEvent::FocusIn:
         if (watched == m_container) {
             setActive(true);
         }
         break;
 

+    case QEvent::GraphicsSceneDragEnter:
+        if (watched == m_view) {
+            m_dragging = true;
+            abortTwoClicksRenaming();
+        }
+        break;
+
+    case QEvent::GraphicsSceneDragLeave:
+        if (watched == m_view) {
+            m_dragging = false;
+        }
+        break;
+
+    case QEvent::GraphicsSceneDrop:
+        if (watched == m_view) {
+            m_dragging = false;
+        }
+        break;
+
+    case QEvent::ToolTip: {
+        const auto helpEvent = static_cast<QHelpEvent *>(event);
+        if (tryShowNameToolTip(helpEvent)) {
+            return true;
+
+        } else if (m_hoveredColumnHeaderIndex) {
+            const auto rolesInfo = KFileItemModel::rolesInformation();
+            const auto visibleRole = m_visibleRoles.value(*m_hoveredColumnHeaderIndex);
+
+            for (const KFileItemModel::RoleInfo &info : rolesInfo) {
+                if (visibleRole == info.role) {
+                    QToolTip::showText(helpEvent->globalPos(), info.tooltip, this);
+                    return true;
+                }
+            }
+        }
+        break;
+    }

     default:
         break;
     }
     default:
         break;
     }


@@ -672,177 +1082,486 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
     return QWidget::eventFilter(watched, event);
 }
 
     return QWidget::eventFilter(watched, event);
 }
 

-void DolphinView::wheelEvent(QWheelEvent* event)
+void DolphinView::wheelEvent(QWheelEvent *event)

 {
     if (event->modifiers().testFlag(Qt::ControlModifier)) {
 {
     if (event->modifiers().testFlag(Qt::ControlModifier)) {

-        const int numDegrees = event->delta() / 8;
-        const int 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);

         event->accept();
     } else {
         event->ignore();
     }
 }
 
         event->accept();
     } else {
         event->ignore();
     }
 }
 

-void DolphinView::activate()
+void DolphinView::hideEvent(QHideEvent *event)

 {
 {

-    setActive(true);
+    hideToolTip();
+    QWidget::hideEvent(event);

 }
 
 }
 

-void DolphinView::slotItemActivated(int index)
+bool DolphinView::event(QEvent *event)

 {
 {

-    Q_UNUSED(index);
-
-    const KFileItemList items = selectedItems();
-    if (items.isEmpty()) {
-        return;
+    if (event->type() == QEvent::WindowDeactivate) {
+        /* See Bug 297355
+         * Dolphin leaves file preview tooltips open even when is not visible.
+         *
+         * Hide tool-tip when Dolphin loses focus.
+         */
+        hideToolTip();
+        abortTwoClicksRenaming();

     }
 
     }
 

-    if (items.count() == 1) {
-        emit itemActivated(items.at(0)); // caught by DolphinViewContainer or DolphinPart
-    } else {
-        foreach (const KFileItem& item, items) {
-            if (item.isDir()) {
-                emit tabRequested(item.url());
-            } else {
-                emit itemActivated(item);
-            }
-        }
-    }
+    return QWidget::event(event);

 }
 
 }
 

-void DolphinView::slotItemMiddleClicked(int index)
+void DolphinView::activate()

 {
 {

-    const KFileItem item = fileItemModel()->fileItem(index);
-    if (item.isDir() || isTabsForFilesEnabled()) {
-        emit tabRequested(item.url());
-    }
+    setActive(true);

 }
 
 }
 

-void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
+void DolphinView::slotItemActivated(int index)

 {
 {

-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
+    abortTwoClicksRenaming();
+
+    const KFileItem item = m_model->fileItem(index);
+    if (!item.isNull()) {
+        Q_EMIT itemActivated(item);

     }
     }

-    const KFileItem item = fileItemModel()->fileItem(index);
-    emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());

 }
 
 }
 

-void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
+void DolphinView::slotItemsActivated(const KItemSet &indexes)

 {
 {

-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
-    }
-    emit requestContextMenu(pos.toPoint(), KFileItem(), url(), QList<QAction*>());
+    Q_ASSERT(indexes.count() >= 2);
+
+    abortTwoClicksRenaming();
+
+    const auto modifiers = QGuiApplication::keyboardModifiers();
+
+    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::warningContinueCancel(
+            this,
+            question,
+            {},
+            KGuiItem(i18ncp("@action:button", "Open %1 Item", "Open %1 Items", indexes.count()), QStringLiteral("document-open")),
+            KStandardGuiItem::cancel(),
+            QStringLiteral("ConfirmOpenManyFolders"));
+        if (answer != KMessageBox::PrimaryAction && answer != KMessageBox::Continue) {
+            return;
+        }
+    }
+
+    KFileItemList items;
+    items.reserve(indexes.count());
+
+    for (int index : indexes) {
+        KFileItem item = m_model->fileItem(index);
+        const QUrl &url = openItemAsFolderUrl(item);
+
+        if (!url.isEmpty()) {
+            // Open folders in new tabs or in new windows depending on the modifier
+            // The ctrl+shift behavior is ignored because we are handling multiple items
+            // keep in sync with KUrlNavigator::slotNavigatorButtonClicked
+            if (modifiers & Qt::ShiftModifier && !(modifiers & Qt::ControlModifier)) {
+                Q_EMIT windowRequested(url);
+            } else {
+                Q_EMIT tabRequested(url);
+            }
+        } else {
+            items.append(item);
+        }
+    }
+
+    if (items.count() == 1) {
+        Q_EMIT itemActivated(items.first());
+    } else if (items.count() > 1) {
+        Q_EMIT itemsActivated(items);
+    }
+}
+
+void DolphinView::slotItemMiddleClicked(int index)
+{
+    const KFileItem &item = m_model->fileItem(index);
+    const QUrl &url = openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives());
+    const auto modifiers = QGuiApplication::keyboardModifiers();
+    if (!url.isEmpty()) {
+        // keep in sync with KUrlNavigator::slotNavigatorButtonClicked
+        if (modifiers & Qt::ShiftModifier) {
+            Q_EMIT activeTabRequested(url);
+        } else {
+            Q_EMIT tabRequested(url);
+        }
+    } else if (isTabsForFilesEnabled()) {
+        // keep in sync with KUrlNavigator::slotNavigatorButtonClicked
+        if (modifiers & Qt::ShiftModifier) {
+            Q_EMIT activeTabRequested(item.url());
+        } else {
+            Q_EMIT tabRequested(item.url());
+        }
+    } else {
+        Q_EMIT fileMiddleClickActivated(item);
+    }

 }
 
 }
 

-void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
+void DolphinView::slotItemContextMenuRequested(int index, const QPointF &pos)

 {
 {

-    QWeakPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
+    // Force emit of a selection changed signal before we request the
+    // context menu, to update the edit-actions first. (See Bug 294013)
+    if (m_selectionChangedTimer->isActive()) {
+        emitSelectionChangedSignal();
+    }
+    if (m_twoClicksRenamingTimer->isActive()) {
+        abortTwoClicksRenaming();
+    }
+
+    const KFileItem item = m_model->fileItem(index);
+    Q_EMIT requestContextMenu(pos.toPoint(), item, selectedItems(), url());
+}

 
 

-    KItemListView* view = m_container->controller()->view();
-    const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
+void DolphinView::slotViewContextMenuRequested(const QPointF &pos)
+{
+    Q_EMIT requestContextMenu(pos.toPoint(), KFileItem(), selectedItems(), url());
+}
+
+void DolphinView::slotHeaderContextMenuRequested(const QPointF &pos)
+{
+    ViewProperties props(viewPropertiesUrl());
+
+    QPointer<QMenu> menu = new QMenu(this);
+
+    KItemListView *view = m_container->controller()->view();
+    const QList<QByteArray> visibleRolesSet = view->visibleRoles();
+
+    bool indexingEnabled = false;
+#if HAVE_BALOO
+    Baloo::IndexerConfig config;
+    indexingEnabled = config.fileIndexingEnabled();
+#endif
+
+    QString groupName;
+    QMenu *groupMenu = nullptr;

 
     // Add all roles to the menu that can be shown or hidden by the user
 
     // Add all roles to the menu that can be shown or hidden by the user

-    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-    const QList<DolphinView::AdditionalInfo> keys = infoAccessor.keys();
-    foreach (const DolphinView::AdditionalInfo info, keys) {
-        const QByteArray& role = infoAccessor.role(info);
-        if (role != "name") {
-            const QString text = fileItemModel()->roleDescription(role);
-
-            QAction* action = menu.data()->addAction(text);
-            action->setCheckable(true);
-            action->setChecked(visibleRolesSet.contains(role));
-            action->setData(info);
+    const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
+    for (const KFileItemModel::RoleInfo &info : rolesInfo) {
+        if (info.role == "text") {
+            // It should not be possible to hide the "text" role
+            continue;

         }
         }

-    }

 
 

-    QAction* action = menu.data()->exec(pos.toPoint());
-    if (action) {
-        // Show or hide the selected role
-        const DolphinView::AdditionalInfo info =
-            static_cast<DolphinView::AdditionalInfo>(action->data().toInt());
+        const QString text = m_model->roleDescription(info.role);
+        QAction *action = nullptr;
+        if (info.group.isEmpty()) {
+            action = menu->addAction(text);
+        } else {
+            if (!groupMenu || info.group != groupName) {
+                groupName = info.group;
+                groupMenu = menu->addMenu(groupName);
+            }

 
 

-        ViewProperties props(url());
-        QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
+            action = groupMenu->addAction(text);
+        }

 
 

-        const QByteArray selectedRole = infoAccessor.role(info);
-        QList<QByteArray> visibleRoles = view->visibleRoles();
+        action->setCheckable(true);
+        action->setChecked(visibleRolesSet.contains(info.role));
+        action->setData(info.role);
+        action->setToolTip(info.tooltip);

 
 

-        if (action->isChecked()) {
-            const int index = keys.indexOf(info) + 1;
-            visibleRoles.insert(index, selectedRole);
-            infoList.insert(index, info);
+        const bool enable = (!info.requiresBaloo && !info.requiresIndexer) || (info.requiresBaloo) || (info.requiresIndexer && indexingEnabled);
+        action->setEnabled(enable);
+    }
+
+    menu->addSeparator();
+
+    QActionGroup *widthsGroup = new QActionGroup(menu);
+    const bool autoColumnWidths = props.headerColumnWidths().isEmpty();
+
+    QAction *toggleSidePaddingAction = menu->addAction(i18nc("@action:inmenu", "Side Padding"));
+    toggleSidePaddingAction->setCheckable(true);
+    toggleSidePaddingAction->setChecked(layoutDirection() == Qt::LeftToRight ? view->header()->leftPadding() > 0 : view->header()->rightPadding() > 0);
+
+    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"));
+    customWidthsAction->setCheckable(true);
+    customWidthsAction->setChecked(!autoColumnWidths);
+    customWidthsAction->setActionGroup(widthsGroup);
+
+    QAction *action = menu->exec(pos.toPoint());
+    if (menu && action) {
+        KItemListHeader *header = view->header();
+
+        if (action == autoAdjustWidthsAction) {
+            // Clear the column-widths from the viewproperties and turn on
+            // the automatic resizing of the columns
+            props.setHeaderColumnWidths(QList<int>());
+            header->setAutomaticColumnResizing(true);
+        } else if (action == customWidthsAction) {
+            // Apply the current column-widths as custom column-widths and turn
+            // off the automatic resizing of the columns
+            QList<int> columnWidths;
+            const auto visibleRoles = view->visibleRoles();
+            columnWidths.reserve(visibleRoles.count());
+            for (const QByteArray &role : visibleRoles) {
+                columnWidths.append(header->columnWidth(role));
+            }
+            props.setHeaderColumnWidths(columnWidths);
+            header->setAutomaticColumnResizing(false);
+        } else if (action == toggleSidePaddingAction) {
+            if (toggleSidePaddingAction->isChecked()) {
+                header->setSidePadding(20, 20);
+            } else {
+                header->setSidePadding(0, 0);
+            }

         } else {
         } else {

-            visibleRoles.removeOne(selectedRole);
-            infoList.removeOne(info);
+            // Show or hide the selected role
+            const QByteArray selectedRole = action->data().toByteArray();
+
+            QList<QByteArray> visibleRoles = view->visibleRoles();
+            if (action->isChecked()) {
+                visibleRoles.append(selectedRole);
+            } else {
+                visibleRoles.removeOne(selectedRole);
+            }
+
+            view->setVisibleRoles(visibleRoles);
+            props.setVisibleRoles(visibleRoles);
+
+            QList<int> columnWidths;
+            if (!header->automaticColumnResizing()) {
+                const auto visibleRoles = view->visibleRoles();
+                columnWidths.reserve(visibleRoles.count());
+                for (const QByteArray &role : visibleRoles) {
+                    columnWidths.append(header->columnWidth(role));
+                }
+            }
+            props.setHeaderColumnWidths(columnWidths);

         }
         }

+    }
+
+    delete menu;
+}
+
+void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray &role, qreal current)
+{
+    const QList<QByteArray> visibleRoles = m_view->visibleRoles();

 
 

-        view->setVisibleRoles(visibleRoles);
-        props.setAdditionalInfoList(infoList);
+    ViewProperties props(viewPropertiesUrl());
+    QList<int> columnWidths = props.headerColumnWidths();
+    if (columnWidths.count() != visibleRoles.count()) {
+        columnWidths.clear();
+        columnWidths.reserve(visibleRoles.count());
+        const KItemListHeader *header = m_view->header();
+        for (const QByteArray &role : visibleRoles) {
+            const int width = header->columnWidth(role);
+            columnWidths.append(width);
+        }

     }
 
     }
 

-    delete menu.data();
+    const int roleIndex = visibleRoles.indexOf(role);
+    Q_ASSERT(roleIndex >= 0 && roleIndex < columnWidths.count());
+    columnWidths[roleIndex] = current;
+
+    props.setHeaderColumnWidths(columnWidths);
+}
+
+void DolphinView::slotSidePaddingWidthChanged(qreal leftPaddingWidth, qreal rightPaddingWidth)
+{
+    ViewProperties props(viewPropertiesUrl());
+    DetailsModeSettings::setLeftPadding(int(leftPaddingWidth));
+    DetailsModeSettings::setRightPadding(int(rightPaddingWidth));
+    m_view->writeSettings();

 }
 
 void DolphinView::slotItemHovered(int index)
 {
 }
 
 void DolphinView::slotItemHovered(int index)
 {

-    const KFileItem item = fileItemModel()->fileItem(index);
+    const KFileItem item = m_model->fileItem(index);

 
 

-    if (GeneralSettings::showToolTips()) {
-        QRectF itemRect = m_container->controller()->view()->itemRect(index);
+    if (GeneralSettings::showToolTips() && !m_dragging) {
+        QRectF itemRect = m_container->controller()->view()->itemContextRect(index);

         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 

-        m_toolTipManager->showToolTip(item, itemRect);
+#if HAVE_BALOO
+        auto nativeParent = nativeParentWidget();
+        if (nativeParent) {
+            m_toolTipManager->showToolTip(item, itemRect, nativeParent->windowHandle());
+        }
+#endif

     }
 
     }
 

-    emit requestItemInfo(item);
+    Q_EMIT requestItemInfo(item);

 }
 
 void DolphinView::slotItemUnhovered(int index)
 {
 }
 
 void DolphinView::slotItemUnhovered(int index)
 {

-    Q_UNUSED(index);
-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
+    Q_UNUSED(index)
+    hideToolTip();
+    Q_EMIT requestItemInfo(KFileItem());
+}
+
+void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent *event)
+{
+    QUrl destUrl;
+    KFileItem destItem = m_model->fileItem(index);
+    if (destItem.isNull() || (!destItem.isDir() && !destItem.isDesktopFile())) {
+        // Use the URL of the view as drop target if the item is no directory
+        // or desktop-file
+        destItem = m_model->rootItem();
+        destUrl = url();
+    } else {
+        // The item represents a directory or desktop-file
+        destUrl = destItem.mostLocalUrl();
+    }
+
+    QDropEvent dropEvent(event->pos().toPoint(), event->possibleActions(), event->mimeData(), event->buttons(), event->modifiers());
+    dropUrls(destUrl, &dropEvent, this);
+
+    setActive(true);
+}
+
+void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget)
+{
+    KIO::DropJob *job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);
+
+    if (job) {
+        connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult);
+
+        if (destUrl == url()) {
+            // Mark the dropped urls as selected.
+            m_clearSelectionBeforeSelectingNewItems = true;
+            m_markFirstNewlySelectedItemAsCurrent = true;
+            m_selectJobCreatedItems = true;
+            connect(job, &KIO::DropJob::itemCreated, this, &DolphinView::slotItemCreated);
+            connect(job, &KIO::DropJob::copyJobStarted, this, [this](const KIO::CopyJob *copyJob) {
+                connect(copyJob, &KIO::CopyJob::copying, this, &DolphinView::slotItemCreatedFromJob);
+                connect(copyJob, &KIO::CopyJob::moving, this, &DolphinView::slotItemCreatedFromJob);
+                connect(copyJob, &KIO::CopyJob::warning, this, [this](KJob *job, const QString & /*warning*/) {
+                    Q_EMIT errorMessage(job->errorString(), job->error());
+                });
+                connect(copyJob, &KIO::CopyJob::linking, this, [this](KIO::Job *job, const QString &src, const QUrl &dest) {
+                    Q_UNUSED(job)
+                    Q_UNUSED(src)
+                    slotItemCreated(dest);
+                });
+            });
+        }
+    }
+}
+
+void DolphinView::slotModelChanged(KItemModelBase *current, KItemModelBase *previous)
+{
+    if (previous != nullptr) {
+        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);
+        connect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
+        m_versionControlObserver->setModel(fileItemModel);

     }
     }

-    emit requestItemInfo(KFileItem());

 }
 
 }
 

-void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons)

 {
 {

-    const KFileItem destItem = fileItemModel()->fileItem(index);
+    Q_UNUSED(itemIndex)

 
 

-    QDropEvent dropEvent(event->pos().toPoint(),
-                         event->possibleActions(),
-                         event->mimeData(),
-                         event->buttons(),
-                         event->modifiers());
+    hideToolTip();

 
 

-    DragAndDropHelper::dropUrls(destItem, url(), &dropEvent, this);
+    if (buttons & Qt::BackButton) {
+        Q_EMIT goBackRequested();
+    } else if (buttons & Qt::ForwardButton) {
+        Q_EMIT goForwardRequested();
+    }

 }
 
 }
 

-void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
+void DolphinView::slotSelectedItemTextPressed(int index)

 {
 {

-    if (previous != 0) {
-        disconnect(previous, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+    if (GeneralSettings::renameInline() && !m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)) {
+        const KFileItem item = m_model->fileItem(index);
+        const KFileItemListProperties capabilities(KFileItemList() << item);
+        if (capabilities.supportsMoving()) {
+            m_twoClicksRenamingItemUrl = item.url();
+            m_twoClicksRenamingTimer->start(QApplication::doubleClickInterval());
+        }

     }
     }

+}
+
+void DolphinView::slotItemCreatedFromJob(KIO::Job *, const QUrl &, const QUrl &to)
+{
+    slotItemCreated(to);
+}

 
 

-    Q_ASSERT(qobject_cast<KFileItemModel*>(current));
-    connect(current, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+void DolphinView::slotItemLinkCreatedFromJob(KIO::Job *, const QUrl &, const QString &, const QUrl &to)
+{
+    slotItemCreated(to);
+}
+
+void DolphinView::slotItemCreated(const QUrl &url)
+{
+    if (m_markFirstNewlySelectedItemAsCurrent) {
+        markUrlAsCurrent(url);
+        m_markFirstNewlySelectedItemAsCurrent = false;
+    }
+    if (m_selectJobCreatedItems && !m_selectedUrls.contains(url)) {
+        m_selectedUrls << url;
+    }
+}
+
+void DolphinView::onDirectoryLoadingCompletedAfterJob()
+{
+    // the model should now contain all the items created by the job
+    m_selectJobCreatedItems = true; // to make sure we overwrite selection
+    // update the view: scroll into View and selection
+    updateViewState();
+    m_selectJobCreatedItems = false;
+    m_selectedUrls.clear();
+}
+
+void DolphinView::slotJobResult(KJob *job)
+{
+    if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {
+        Q_EMIT errorMessage(job->errorString(), job->error());
+    }
+    if (!m_selectJobCreatedItems) {
+        m_selectedUrls.clear();
+        return;
+    }
+    if (!m_selectedUrls.isEmpty()) {
+        m_selectedUrls = KDirModel::simplifiedUrlList(m_selectedUrls);

 
 

-    KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
-    m_versionControlObserver->setModel(fileItemModel);
+        updateSelectionState();
+        if (!m_selectedUrls.isEmpty()) {
+            // not all urls were found, the model may not be up to date
+            connect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::onDirectoryLoadingCompletedAfterJob, Qt::SingleShotConnection);
+        } else {
+            m_selectJobCreatedItems = false;
+            m_selectedUrls.clear();
+        }
+    }

 }
 
 }
 

-void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
+void DolphinView::slotSelectionChanged(const KItemSet &current, const KItemSet &previous)

 {
 {

+    m_selectNextItem = false;

     const int currentCount = current.count();
     const int previousCount = previous.count();
     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
 
     // If nothing has been selected before and something got selected (or if something
     // was selected before and now nothing is selected) the selectionChangedSignal must


@@ -854,55 +1573,64 @@ void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>
 void DolphinView::emitSelectionChangedSignal()
 {
     m_selectionChangedTimer->stop();
 void DolphinView::emitSelectionChangedSignal()
 {
     m_selectionChangedTimer->stop();

-    emit selectionChanged(selectedItems());
+    Q_EMIT selectionChanged(selectedItems());

 }
 
 }
 

-void DolphinView::dropUrls(const KFileItem& destItem,
-                           const KUrl& destPath,
-                           QDropEvent* event)
+void DolphinView::slotStatJobResult(KJob *job)

 {
 {

-    Q_UNUSED(destItem);
-    Q_UNUSED(destPath);
-    markPastedUrlsAsSelected(event->mimeData());
-    //DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
-}
-
-void DolphinView::updateSorting(DolphinView::Sorting sorting)
-{
-    ViewProperties props(url());
-    props.setSorting(sorting);
+    int folderCount = 0;
+    int fileCount = 0;
+    KIO::filesize_t totalFileSize = 0;
+    bool countFileSize = true;

 
 

-    KItemModelBase* model = m_container->controller()->model();
-    model->setSortRole(sortRoleForSorting(sorting));
+    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));
+        countFileSize = false;
+    }

 
 

-    emit sortingChanged(sorting);
+    const int itemCount = m_model->count();
+    for (int i = 0; i < itemCount; ++i) {
+        const KFileItem item = m_model->fileItem(i);
+        if (item.isDir()) {
+            ++folderCount;
+        } else {
+            ++fileCount;
+            if (countFileSize) {
+                totalFileSize += item.size();
+            }
+        }
+    }
+    emitStatusBarText(folderCount, fileCount, totalFileSize, NoSelection);

 }
 
 }
 

-void DolphinView::updateSortOrder(Qt::SortOrder order)
+void DolphinView::updateSortFoldersFirst(bool foldersFirst)

 {
 {

-    ViewProperties props(url());
-    props.setSortOrder(order);
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortFoldersFirst(foldersFirst);

 
 

-    KItemModelBase* model = fileItemModel();
-    model->setSortOrder(order);
+    m_model->setSortDirectoriesFirst(foldersFirst);

 
 

-    emit sortOrderChanged(order);
+    Q_EMIT sortFoldersFirstChanged(foldersFirst);

 }
 
 }
 

-void DolphinView::updateSortFoldersFirst(bool foldersFirst)
+void DolphinView::updateSortHiddenLast(bool hiddenLast)

 {
 {

-    ViewProperties props(url());
-    props.setSortFoldersFirst(foldersFirst);
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortHiddenLast(hiddenLast);

 
 

-    KFileItemModel* model = fileItemModel();
-    model->setSortFoldersFirst(foldersFirst);
+    m_model->setSortHiddenLast(hiddenLast);

 
 

-    emit sortFoldersFirstChanged(foldersFirst);
+    Q_EMIT sortHiddenLastChanged(hiddenLast);

 }
 
 QPair<bool, QString> DolphinView::pasteInfo() const
 {
 }
 
 QPair<bool, QString> DolphinView::pasteInfo() const
 {

-    return KonqOperations::pasteInfo(url());
+    const QMimeData *mimeData = QApplication::clipboard()->mimeData();
+    QPair<bool, QString> info;
+    info.second = KIO::pasteActionText(mimeData, &info.first, rootItem());
+    return info;

 }
 
 void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)
 }
 
 void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)


@@ -920,93 +1648,212 @@ bool DolphinView::itemsExpandable() const
     return m_mode == DetailsView;
 }
 
     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;
+    stream >> version;
+    if (version != 1) {
+        // The version of the view state isn't supported, we can't restore it.
+        return;
+    }
+

     // Restore the current item that had the keyboard focus
     stream >> m_currentItemUrl;
 
     // Restore the current item that had the keyboard focus
     stream >> m_currentItemUrl;
 

+    // Restore the previously selected items
+    stream >> m_selectedUrls;
+

     // Restore the view position
     stream >> m_restoredContentsPosition;
 
     // Restore expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
     // Restore the view position
     stream >> m_restoredContentsPosition;
 
     // Restore expanded folders (only relevant for the details view - will be ignored by the view in other view modes)

-    QSet<KUrl> urls;
+    QSet<QUrl> urls;

     stream >> urls;
     stream >> urls;

-    fileItemModel()->restoreExpandedUrls(urls);
+    m_model->restoreExpandedDirectories(urls);

 }
 
 }
 

-void DolphinView::saveState(QDataStream& stream)
+void DolphinView::saveState(QDataStream &stream)

 {
 {

+    stream << quint32(1); // View state version
+

     // Save the current item that has the keyboard focus
     const int currentIndex = m_container->controller()->selectionManager()->currentItem();
     if (currentIndex != -1) {
     // Save the current item that has the keyboard focus
     const int currentIndex = m_container->controller()->selectionManager()->currentItem();
     if (currentIndex != -1) {

-        KFileItem item = fileItemModel()->fileItem(currentIndex);
-        KUrl currentItemUrl = item.url();
+        KFileItem item = m_model->fileItem(currentIndex);
+        Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist
+        QUrl currentItemUrl = item.url();

         stream << currentItemUrl;
     } else {
         stream << currentItemUrl;
     } else {

-        stream << KUrl();
+        stream << QUrl();

     }
 
     }
 

+    // Save the selected urls
+    stream << selectedItems().urlList();
+

     // Save view position
     const qreal x = m_container->horizontalScrollBar()->value();
     const qreal y = m_container->verticalScrollBar()->value();
     stream << QPoint(x, y);
 
     // Save expanded folders (only relevant for the details view - the set will be empty in other view modes)
     // Save view position
     const qreal x = m_container->horizontalScrollBar()->value();
     const qreal y = m_container->verticalScrollBar()->value();
     stream << QPoint(x, y);
 
     // Save expanded folders (only relevant for the details view - the set will be empty in other view modes)

-    stream << fileItemModel()->expandedUrls();
+    stream << m_model->expandedDirectories();

 }
 
 }
 

-bool DolphinView::hasSelection() const
+KFileItem DolphinView::rootItem() const

 {
 {

-    return m_container->controller()->selectionManager()->hasSelection();
+    return m_model->rootItem();

 }
 
 }
 

-KFileItem DolphinView::rootItem() const
+void DolphinView::setViewPropertiesContext(const QString &context)

 {
 {

-    return m_dirLister->rootItem();
+    m_viewPropertiesContext = context;

 }
 
 }
 

-void DolphinView::observeCreatedItem(const KUrl& url)
+QString DolphinView::viewPropertiesContext() const

 {
 {

-    m_createdItemUrl = url;
-    //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
-    //        this, SLOT(selectAndScrollToCreatedItem()));
+    return m_viewPropertiesContext;

 }
 
 }
 

-void DolphinView::selectAndScrollToCreatedItem()
+QUrl DolphinView::openItemAsFolderUrl(const KFileItem &item, const bool browseThroughArchives)

 {
 {

-    /*const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
-    if (dirIndex.isValid()) {
-        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
-        QAbstractItemView* view = m_viewAccessor.itemView();
-        if (view) {
-            view->setCurrentIndex(proxyIndex);
+    if (item.isNull()) {
+        return QUrl();
+    }
+
+    QUrl url = item.targetUrl();
+
+    if (item.isDir()) {
+        return url;
+    }
+
+    if (item.isMimeTypeKnown()) {
+        const QString &mimetype = item.mimetype();
+
+        if (browseThroughArchives && item.isFile() && url.isLocalFile()) {
+            // Generic mechanism for redirecting to tar:/<path>/ when clicking on a tar file,
+            // zip:/<path>/ when clicking on a zip file, etc.
+            // 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);
+            if (!protocol.isEmpty()) {
+                url.setScheme(protocol);
+                return url;
+            }
+        }
+
+        if (mimetype == QLatin1String("application/x-desktop")) {
+            // Redirect to the URL in Type=Link desktop files, unless it is a http(s) URL.
+            KDesktopFile desktopFile(url.toLocalFile());
+            if (desktopFile.hasLinkType()) {
+                const QString linkUrl = desktopFile.readUrl();
+                if (!linkUrl.startsWith(QLatin1String("http"))) {
+                    return QUrl::fromUserInput(linkUrl);
+                }
+            }

         }
     }
 
         }
     }
 

-    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
-               this, SLOT(selectAndScrollToCreatedItem()));*/
-    m_createdItemUrl = KUrl();
+    return QUrl();
+}
+
+void DolphinView::resetZoomLevel()
+{
+    ViewModeSettings settings{m_mode};
+    settings.useDefaults(true);
+    const int defaultIconSize = settings.iconSize();
+    settings.useDefaults(false);
+
+    setZoomLevel(ZoomLevelInfo::zoomLevelForIconSize(QSize(defaultIconSize, defaultIconSize)));
+}
+
+void DolphinView::observeCreatedItem(const QUrl &url)
+{
+    if (m_active) {
+        forceUrlsSelection(url, {url});
+    }

 }
 
 }
 

-void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinView::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUrl)

 {
 {

-    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
-        emit redirection(oldUrl, newUrl);
+    if (oldUrl.matches(url(), QUrl::StripTrailingSlash)) {
+        Q_EMIT redirection(oldUrl, newUrl);

         m_url = newUrl; // #186947
     }
 }
 
         m_url = newUrl; // #186947
     }
 }
 

+void DolphinView::updateSelectionState()
+{
+    if (!m_selectedUrls.isEmpty()) {
+        KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
+
+        const bool shouldScrollToCurrentItem = m_clearSelectionBeforeSelectingNewItems;
+        // if there is a selection already, leave it that way
+        // unless some drop/paste job are in the process of creating items
+        if (!selectionManager->hasSelection() || m_selectJobCreatedItems) {
+            if (m_clearSelectionBeforeSelectingNewItems) {
+                selectionManager->clearSelection();
+                m_clearSelectionBeforeSelectingNewItems = false;
+            }
+
+            KItemSet selectedItems = selectionManager->selectedItems();
+
+            QList<QUrl>::iterator it = m_selectedUrls.begin();
+            while (it != m_selectedUrls.end()) {
+                const int index = m_model->index(*it);
+                if (index >= 0) {
+                    selectedItems.insert(index);
+                    it = m_selectedUrls.erase(it);
+                } else {
+                    ++it;
+                }
+            }
+
+            if (!selectedItems.isEmpty()) {
+                selectionManager->beginAnchoredSelection(selectionManager->currentItem());
+                selectionManager->setSelectedItems(selectedItems);
+                if (shouldScrollToCurrentItem) {
+                    m_view->scrollToItem(selectedItems.first());
+                }
+            }
+        }
+    }
+}
+

 void DolphinView::updateViewState()
 {
 void DolphinView::updateViewState()
 {

-    if (m_currentItemUrl != KUrl()) {
-        KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-        const int currentIndex = fileItemModel()->index(m_currentItemUrl);
-        if (currentIndex != -1) {
-            selectionManager->setCurrentItem(currentIndex);
+    if (m_currentItemUrl != QUrl()) {
+        KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
+
+        // if there is a selection already, leave it that way
+        if (!selectionManager->hasSelection()) {
+            const int currentIndex = m_model->index(m_currentItemUrl);
+            if (currentIndex != -1) {
+                selectionManager->setCurrentItem(currentIndex);
+
+                // scroll to current item and reset the state
+                if (m_scrollToCurrentItem) {
+                    m_view->scrollToItem(currentIndex, KItemListView::ViewItemPosition::Middle);
+                    m_scrollToCurrentItem = false;
+                }
+                m_currentItemUrl = QUrl();
+            } else {
+                selectionManager->setCurrentItem(0);
+            }

         } else {
         } else {

-            selectionManager->setCurrentItem(0);
+            m_currentItemUrl = QUrl();

         }
         }

-        m_currentItemUrl = KUrl();

     }
 
     if (!m_restoredContentsPosition.isNull()) {
     }
 
     if (!m_restoredContentsPosition.isNull()) {


@@ -1018,103 +1865,288 @@ void DolphinView::updateViewState()
         m_container->verticalScrollBar()->setValue(y);
     }
 
         m_container->verticalScrollBar()->setValue(y);
     }
 

-    if (!m_selectedUrls.isEmpty()) {
-        KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-        QSet<int> selectedItems = selectionManager->selectedItems();
-        const KFileItemModel* model = fileItemModel();
-
-        foreach (const KUrl& url, m_selectedUrls) {
-            const int index = model->index(url);
-            if (index >= 0) {
-                selectedItems.insert(index);
-            }
-        }
+    updateSelectionState();
+}

 
 

-        selectionManager->setSelectedItems(selectedItems);
-        m_selectedUrls.clear();
+void DolphinView::hideToolTip(const ToolTipManager::HideBehavior behavior)
+{
+    if (GeneralSettings::showToolTips()) {
+#if HAVE_BALOO
+        m_toolTipManager->hideToolTip(behavior);
+#else
+        Q_UNUSED(behavior)
+#endif
+    } else if (m_mode == DolphinView::IconsView) {
+        QToolTip::hideText();

     }
 }
 
     }
 }
 

-void DolphinView::showHoverInformation(const KFileItem& item)
+bool DolphinView::handleSpaceAsNormalKey() const

 {
 {

-    emit requestItemInfo(item);
+    return !m_container->hasFocus() || m_container->controller()->isSearchAsYouTypeActive();
+}
+
+void DolphinView::slotTwoClicksRenamingTimerTimeout()
+{
+    const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
+
+    // verify that only one item is selected
+    if (selectionManager->selectedItems().count() == 1) {
+        const int index = selectionManager->currentItem();
+        const QUrl fileItemUrl = m_model->fileItem(index).url();
+
+        // check if the selected item was the same item that started the twoClicksRenaming
+        if (fileItemUrl.isValid() && m_twoClicksRenamingItemUrl == fileItemUrl) {
+            renameSelectedItems();
+        }
+    }

 }
 
 }
 

-void DolphinView::clearHoverInformation()
+void DolphinView::slotTrashFileFinished(KJob *job)

 {
 {

-    emit requestItemInfo(KFileItem());
+    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(), job->error());
+    }

 }
 
 }
 

-void DolphinView::slotDeleteFileFinished(KJob* job)
+void DolphinView::slotDeleteFileFinished(KJob *job)

 {
     if (job->error() == 0) {
 {
     if (job->error() == 0) {

-        emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
+        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) {
     } else if (job->error() != KIO::ERR_USER_CANCELED) {

-        emit errorMessage(job->errorString());
+        Q_EMIT errorMessage(job->errorString(), job->error());

     }
 }
 
     }
 }
 

-void DolphinView::slotDirListerStarted(const KUrl& url)
+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().constLast());
+        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);
+            selectionManager->beginAnchoredSelection(nextItem);
+        }
+        m_selectNextItem = false;
+    }
+}
+
+void DolphinView::slotRenamingResult(KJob *job)
+{
+    // Change model data after renaming has succeeded. On failure we do nothing.
+    // If there is already an item with the newUrl, the copyjob will open a dialog for it, and
+    // KFileItemModel will update the data when the dir lister signals that the file name has changed.
+    if (!job->error()) {
+        KIO::CopyJob *copyJob = qobject_cast<KIO::CopyJob *>(job);
+        Q_ASSERT(copyJob);
+        const QUrl newUrl = copyJob->destUrl();
+        const QUrl oldUrl = copyJob->srcUrls().at(0);
+        const int index = m_model->index(newUrl);
+        if (m_model->index(oldUrl) == index) {
+            QHash<QByteArray, QVariant> data;
+            data.insert("text", newUrl.fileName());
+            m_model->setData(index, data);
+        }
+    }
+}
+
+void DolphinView::slotDirectoryLoadingStarted()
+{
+    m_loadingState = LoadingState::Loading;
+    updatePlaceholderLabel();
+

     // Disable the writestate temporary until it can be determined in a fast way
     // Disable the writestate temporary until it can be determined in a fast way

-    // in DolphinView::slotLoadingCompleted()
+    // in DolphinView::slotDirectoryLoadingCompleted()

     if (m_isFolderWritable) {
         m_isFolderWritable = false;
     if (m_isFolderWritable) {
         m_isFolderWritable = false;

-        emit writeStateChanged(m_isFolderWritable);
+        Q_EMIT writeStateChanged(m_isFolderWritable);

     }
 
     }
 

-    emit startedPathLoading(url);
+    Q_EMIT directoryLoadingStarted();

 }
 
 }
 

-void DolphinView::slotLoadingCompleted()
+void DolphinView::slotDirectoryLoadingCompleted()

 {
 {

-    // Update the view-state. This has to be done using a Qt::QueuedConnection
-    // because the view might not be in its final state yet (the view also
-    // listens to the completed()-signal from KDirLister and the order of
-    // of slots is undefined).
-    QTimer::singleShot(0, this, SLOT(updateViewState()));
+    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.
+    QTimer::singleShot(0, this, &DolphinView::updateViewState);
+
+    // Update the placeholder label in case we found that the folder was empty
+    // after loading it

 
 

-    emit finishedPathLoading(url());
+    Q_EMIT directoryLoadingCompleted();

 
 

+    applyDynamicView();
+    updatePlaceholderLabel();

     updateWritableState();
 }
 
     updateWritableState();
 }
 

-void DolphinView::slotRefreshItems()
+void DolphinView::slotDirectoryLoadingCanceled()

 {
 {

-    if (m_assureVisibleCurrentIndex) {
-        m_assureVisibleCurrentIndex = false;
-        //QAbstractItemView* view = m_viewAccessor.itemView();
-        //if (view) {
-        //    m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
-        //}
-    }
+    m_loadingState = LoadingState::Canceled;
+
+    updatePlaceholderLabel();
+
+    Q_EMIT directoryLoadingCanceled();

 }
 
 }
 

-KFileItemModel* DolphinView::fileItemModel() const
+void DolphinView::slotItemsChanged()

 {
 {

-    return static_cast<KFileItemModel*>(m_container->controller()->model());
+    m_assureVisibleCurrentIndex = false;

 }
 
 }
 

-void DolphinView::loadDirectory(const KUrl& url, bool reload)
+void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous)
+{
+    Q_UNUSED(previous)
+    Q_ASSERT(m_model->sortOrder() == current);
+
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortOrder(current);
+
+    Q_EMIT sortOrderChanged(current);
+}
+
+void DolphinView::slotSortRoleChangedByHeader(const QByteArray &current, const QByteArray &previous)
+{
+    Q_UNUSED(previous)
+    Q_ASSERT(m_model->sortRole() == current);
+
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortRole(current);
+
+    Q_EMIT sortRoleChanged(current);
+}
+
+void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray> &current, const QList<QByteArray> &previous)
+{
+    Q_UNUSED(previous)
+    Q_ASSERT(m_container->controller()->view()->visibleRoles() == current);
+
+    const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+
+    m_visibleRoles = current;
+
+    ViewProperties props(viewPropertiesUrl());
+    props.setVisibleRoles(m_visibleRoles);
+
+    Q_EMIT visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
+}
+
+void DolphinView::slotRoleEditingCanceled()
+{
+    disconnect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished);
+}
+
+void DolphinView::slotRoleEditingFinished(int index, const QByteArray &role, const QVariant &value)
+{
+    disconnect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished);
+
+    const KFileItemList items = selectedItems();
+    if (items.count() != 1) {
+        return;
+    }
+
+    if (role == "text") {
+        const KFileItem oldItem = items.first();
+        const EditResult retVal = value.value<EditResult>();
+        const QString newName = retVal.newName;
+        if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1Char('.') && newName != QLatin1String("..")) {
+            const QUrl oldUrl = oldItem.url();
+
+            QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
+            newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));
+
+#ifndef Q_OS_WIN
+            // Confirm hiding file/directory by renaming inline
+            if (!hiddenFilesShown() && newName.startsWith(QLatin1Char('.')) && !oldItem.name().startsWith(QLatin1Char('.'))) {
+                KGuiItem yesGuiItem(i18nc("@action:button", "Rename and Hide"), QStringLiteral("view-hidden"));
+
+                const auto code =
+                    KMessageBox::questionTwoActions(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"));
+
+                if (code == KMessageBox::SecondaryAction) {
+                    return;
+                }
+            }
+#endif
+
+            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);
+
+            if (m_model->index(newUrl) < 0) {
+                forceUrlsSelection(newUrl, {newUrl});
+                updateSelectionState();
+
+                // Only connect the result signal if there is no item with the new name
+                // in the model yet, see bug 328262.
+                connect(job, &KJob::result, this, &DolphinView::slotRenamingResult);
+            }
+        }
+        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);
+            renameSelectedItems();
+        }
+    }
+}
+
+void DolphinView::loadDirectory(const QUrl &url, bool reload)

 {
     if (!url.isValid()) {
 {
     if (!url.isValid()) {

-        const QString location(url.pathOrUrl());
+        const QString location(url.toDisplayString(QUrl::PreferLocalFile));

         if (location.isEmpty()) {
         if (location.isEmpty()) {

-            emit errorMessage(i18nc("@info:status", "The location is empty."));
+            Q_EMIT errorMessage(i18nc("@info:status", "The location is empty."), KIO::ERR_UNKNOWN);

         } else {
         } else {

-            emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location));
+            Q_EMIT errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location), KIO::ERR_UNKNOWN);

         }
         return;
     }
 
         }
         return;
     }
 

-    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+    if (reload) {
+        m_model->refreshDirectory(url);
+    } else {
+        m_model->loadDirectory(url);
+    }

 }
 
 void DolphinView::applyViewProperties()
 {
 }
 
 void DolphinView::applyViewProperties()
 {

-    m_container->beginTransaction();
+    const ViewProperties props(viewPropertiesUrl());
+    applyViewProperties(props);
+}

 
 

-    const ViewProperties props(url());
+void DolphinView::applyViewProperties(const ViewProperties &props)
+{
+    m_view->beginTransaction();

 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {


@@ -1124,117 +2156,200 @@ void DolphinView::applyViewProperties()
         // Changing the mode might result in changing
         // the zoom level. Remember the old zoom level so
         // that zoomLevelChanged() can get emitted.
         // Changing the mode might result in changing
         // the zoom level. Remember the old zoom level so
         // that zoomLevelChanged() can get emitted.

-        const int oldZoomLevel = m_container->zoomLevel();
+        const int oldZoomLevel = m_view->zoomLevel();
+        applyModeToView();

 
 

-        switch (m_mode) {
-        case IconsView:   m_container->setItemLayout(KFileItemListView::IconsLayout); break;
-        case CompactView: m_container->setItemLayout(KFileItemListView::CompactLayout); break;
-        case DetailsView: m_container->setItemLayout(KFileItemListView::DetailsLayout); break;
-        default: Q_ASSERT(false); break;
-        }
+        Q_EMIT modeChanged(m_mode, previousMode);

 
 

-        emit modeChanged(m_mode, previousMode);
-
-        if (m_container->zoomLevel() != oldZoomLevel) {
-            emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
+        if (m_view->zoomLevel() != oldZoomLevel) {
+            Q_EMIT zoomLevelChanged(m_view->zoomLevel(), oldZoomLevel);

         }
     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();
         }
     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();

-    if (hiddenFilesShown != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(hiddenFilesShown);
-        m_dirLister->emitChanges();
-        emit hiddenFilesShownChanged(hiddenFilesShown);
+    if (hiddenFilesShown != m_model->showHiddenFiles()) {
+        m_model->setShowHiddenFiles(hiddenFilesShown);
+        Q_EMIT hiddenFilesShownChanged(hiddenFilesShown);

     }
 
     }
 

-    KFileItemModel* model = fileItemModel();
-

     const bool groupedSorting = props.groupedSorting();
     const bool groupedSorting = props.groupedSorting();

-    if (groupedSorting != model->groupedSorting()) {
-        model->setGroupedSorting(groupedSorting);
-        emit groupedSortingChanged(groupedSorting);
+    if (groupedSorting != m_model->groupedSorting()) {
+        m_model->setGroupedSorting(groupedSorting);
+        Q_EMIT groupedSortingChanged(groupedSorting);

     }
 
     }
 

-    const DolphinView::Sorting sorting = props.sorting();
-    const QByteArray newSortRole = sortRoleForSorting(sorting);
-    if (newSortRole != model->sortRole()) {
-        model->setSortRole(newSortRole);
-        emit sortingChanged(sorting);
+    const QByteArray sortRole = props.sortRole();
+    if (sortRole != m_model->sortRole()) {
+        m_model->setSortRole(sortRole);
+        Q_EMIT sortRoleChanged(sortRole);

     }
 
     const Qt::SortOrder sortOrder = props.sortOrder();
     }
 
     const Qt::SortOrder sortOrder = props.sortOrder();

-    if (sortOrder != model->sortOrder()) {
-        model->setSortOrder(sortOrder);
-        emit sortOrderChanged(sortOrder);
+    if (sortOrder != m_model->sortOrder()) {
+        m_model->setSortOrder(sortOrder);
+        Q_EMIT sortOrderChanged(sortOrder);
+    }
+
+    const QByteArray groupRole = props.groupRole();
+    if (groupRole != m_model->groupRole()) {
+        m_model->setGroupRole(groupRole);
+        Q_EMIT groupRoleChanged(groupRole);
+    }
+
+    const Qt::SortOrder groupOrder = props.groupOrder();
+    if (groupOrder != m_model->groupOrder()) {
+        m_model->setGroupOrder(groupOrder);
+        Q_EMIT groupOrderChanged(groupOrder);

     }
 
     const bool sortFoldersFirst = props.sortFoldersFirst();
     }
 
     const bool sortFoldersFirst = props.sortFoldersFirst();

-    if (sortFoldersFirst != model->sortFoldersFirst()) {
-        model->setSortFoldersFirst(sortFoldersFirst);
-        emit sortFoldersFirstChanged(sortFoldersFirst);
+    if (sortFoldersFirst != m_model->sortDirectoriesFirst()) {
+        m_model->setSortDirectoriesFirst(sortFoldersFirst);
+        Q_EMIT sortFoldersFirstChanged(sortFoldersFirst);
+    }
+
+    const bool sortHiddenLast = props.sortHiddenLast();
+    if (sortHiddenLast != m_model->sortHiddenLast()) {
+        m_model->setSortHiddenLast(sortHiddenLast);
+        Q_EMIT sortHiddenLastChanged(sortHiddenLast);

     }
 
     }
 

-    const QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
-    if (infoList != m_additionalInfoList) {
-        const QList<DolphinView::AdditionalInfo> previousList = m_additionalInfoList;
-        m_additionalInfoList = infoList;
-        applyAdditionalInfoListToView();
-        emit additionalInfoListChanged(m_additionalInfoList, previousList);
+    const QList<QByteArray> visibleRoles = props.visibleRoles();
+    if (visibleRoles != m_visibleRoles) {
+        const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+        m_visibleRoles = visibleRoles;
+        m_view->setVisibleRoles(visibleRoles);
+        Q_EMIT visibleRolesChanged(m_visibleRoles, previousVisibleRoles);

     }
 
     const bool previewsShown = props.previewsShown();
     }
 
     const bool previewsShown = props.previewsShown();

-    if (previewsShown != m_container->previewsShown()) {
+    if (previewsShown != m_view->previewsShown()) {

         const int oldZoomLevel = zoomLevel();
 
         const int oldZoomLevel = zoomLevel();
 

-        m_container->setPreviewsShown(previewsShown);
-        emit previewsShownChanged(previewsShown);
+        m_view->setPreviewsShown(previewsShown);
+        Q_EMIT previewsShownChanged(previewsShown);

 
         // Changing the preview-state might result in a changed zoom-level
         if (oldZoomLevel != zoomLevel()) {
 
         // Changing the preview-state might result in a changed zoom-level
         if (oldZoomLevel != zoomLevel()) {

-            emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
+            Q_EMIT zoomLevelChanged(zoomLevel(), oldZoomLevel);
+        }
+    }
+
+    KItemListView *itemListView = m_container->controller()->view();
+    if (itemListView->isHeaderVisible()) {
+        KItemListHeader *header = itemListView->header();
+        const QList<int> headerColumnWidths = props.headerColumnWidths();
+        const int rolesCount = m_visibleRoles.count();
+        if (headerColumnWidths.count() == rolesCount) {
+            header->setAutomaticColumnResizing(false);
+
+            QHash<QByteArray, qreal> columnWidths;
+            for (int i = 0; i < rolesCount; ++i) {
+                columnWidths.insert(m_visibleRoles[i], headerColumnWidths[i]);
+            }
+            header->setColumnWidths(columnWidths);
+        } else {
+            header->setAutomaticColumnResizing(true);

         }
         }

+        header->setSidePadding(DetailsModeSettings::leftPadding(), DetailsModeSettings::rightPadding());

     }
 
     }
 

-    m_container->endTransaction();
+    m_view->endTransaction();

 }
 
 }
 

-void DolphinView::applyAdditionalInfoListToView()
+void DolphinView::applyModeToView()

 {
 {

-    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+    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;
+    }
+}

 
 

-    QList<QByteArray> visibleRoles;
-    visibleRoles.reserve(m_additionalInfoList.count() + 1);
-    visibleRoles.append("name");
+void DolphinView::applyDynamicView()
+{
+    ViewProperties props(viewPropertiesUrl());
+    /* return early if:
+     * - dynamic view is not enabled
+     * - the current view mode is already Icon View
+     * - dynamic view has previously changed the view mode
+     */
+    if (!GeneralSettings::dynamicView() || m_mode == IconsView || props.dynamicViewPassed()) {
+        return;
+    }

 
 

-    foreach (AdditionalInfo info, m_additionalInfoList) {
-        visibleRoles.append(infoAccessor.role(info));
+    uint imageAndVideoCount = 0;
+    uint checkedItems = 0;
+    const uint totalItems = itemsCount();
+    const KFileItemList itemList = items();
+    bool applyDynamicView = false;
+
+    for (const auto &file : itemList) {
+        ++checkedItems;
+        const QString type = file.mimetype().slice(0, 5);
+
+        if (type == "image" || type == "video") {
+            ++imageAndVideoCount;
+            // if 2/3 or more of the items are images/videos, dynamic view should be applied
+            applyDynamicView = imageAndVideoCount >= (totalItems * 2 / 3);
+            if (applyDynamicView) {
+                break;
+            }
+        } else if (checkedItems - imageAndVideoCount > totalItems / 3) {
+            // if more than a third of the checked files are not media files, return
+            return;
+        }

     }
 
     }
 

-    m_container->setVisibleRoles(visibleRoles);
-}
+    if (!applyDynamicView) {
+        return;
+    }

 
 

-void DolphinView::pasteToUrl(const KUrl& url)
-{
-    markPastedUrlsAsSelected(QApplication::clipboard()->mimeData());
-    KonqOperations::doPaste(this, url);
+    props.setAutoSaveEnabled(!GeneralSettings::globalViewProps());
+    props.setDynamicViewPassed(true);
+    props.setViewMode(IconsView);
+    applyViewProperties(props);

 }
 
 }
 

-void DolphinView::updateZoomLevel(int oldZoomLevel)
+void DolphinView::pasteToUrl(const QUrl &url)

 {
 {

-    Q_UNUSED(oldZoomLevel);
- /*   const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
-    if (oldZoomLevel != newZoomLevel) {
-        m_viewModeController->setZoomLevel(newZoomLevel);
-        emit zoomLevelChanged(newZoomLevel);
-    }*/
+    KIO::PasteJob *job = KIO::paste(QApplication::clipboard()->mimeData(), url);
+    KJobWidgets::setWindow(job, this);
+    m_clearSelectionBeforeSelectingNewItems = true;
+    m_markFirstNewlySelectedItemAsCurrent = true;
+    m_selectJobCreatedItems = true;
+    connect(job, &KIO::PasteJob::itemCreated, this, &DolphinView::slotItemCreated);
+    connect(job, &KIO::PasteJob::copyJobStarted, this, [this](const KIO::CopyJob *copyJob) {
+        connect(copyJob, &KIO::CopyJob::copying, this, &DolphinView::slotItemCreatedFromJob);
+        connect(copyJob, &KIO::CopyJob::moving, this, &DolphinView::slotItemCreatedFromJob);
+        connect(copyJob, &KIO::CopyJob::warning, this, [this](KJob *job, const QString & /*warning*/) {
+            Q_EMIT errorMessage(job->errorString(), job->error());
+        });
+        connect(copyJob, &KIO::CopyJob::linking, this, [this](KIO::Job *job, const QString &src, const QUrl &dest) {
+            Q_UNUSED(job)
+            Q_UNUSED(src)
+            slotItemCreated(dest);
+        });
+    });
+    connect(job, &KIO::PasteJob::result, this, &DolphinView::slotJobResult);

 }
 
 }
 

-KUrl::List DolphinView::simplifiedSelectedUrls() const
+QList<QUrl> DolphinView::simplifiedSelectedUrls() const

 {
 {

-    KUrl::List urls;
+    QList<QUrl> urls;

 
     const KFileItemList items = selectedItems();
 
     const KFileItemList items = selectedItems();

-    foreach (const KFileItem &item, items) {
+    urls.reserve(items.count());
+    for (const KFileItem &item : items) {

         urls.append(item.url());
     }
 
         urls.append(item.url());
     }
 


@@ -1246,92 +2361,200 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
     return urls;
 }
 
     return urls;
 }
 

-QMimeData* DolphinView::selectionMimeData() const
+QMimeData *DolphinView::selectionMimeData() const

 {
 {

-    const KFileItemModel* model = fileItemModel();
-    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-    const QSet<int> selectedIndexes = selectionManager->selectedItems();
+    const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager();
+    const KItemSet selectedIndexes = selectionManager->selectedItems();

 
 

-    return model->createMimeData(selectedIndexes);
+    return m_model->createMimeData(selectedIndexes);

 }
 
 }
 

-void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
+void DolphinView::updateWritableState()

 {
 {

-    const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    markUrlsAsSelected(urls);
+    const bool wasFolderWritable = m_isFolderWritable;
+    m_isFolderWritable = false;
+
+    KFileItem item = m_model->rootItem();
+    if (item.isNull()) {
+        // Try to find out if the URL is writable even if the "root item" is
+        // null, see https://bugs.kde.org/show_bug.cgi?id=330001
+        item = KFileItem(url());
+        item.setDelayedMimeTypes(true);
+    }
+
+    KFileItemListProperties capabilities(KFileItemList() << item);
+    m_isFolderWritable = capabilities.supportsWriting();
+
+    if (m_isFolderWritable != wasFolderWritable) {
+        Q_EMIT writeStateChanged(m_isFolderWritable);
+    }

 }
 
 }
 

-void DolphinView::updateWritableState()
+bool DolphinView::isFolderWritable() const

 {
 {

-    const bool wasFolderWritable = m_isFolderWritable;
-    m_isFolderWritable = true;
+    return m_isFolderWritable;
+}

 
 

-    const KFileItem item = m_dirLister->rootItem();
-    if (!item.isNull()) {
-        KFileItemListProperties capabilities(KFileItemList() << item);
-        m_isFolderWritable = capabilities.supportsWriting();
+int DolphinView::horizontalScrollBarHeight() const
+{
+    if (m_container && m_container->horizontalScrollBar() && m_container->horizontalScrollBar()->isVisible()) {
+        return m_container->horizontalScrollBar()->height();

     }
     }

-    if (m_isFolderWritable != wasFolderWritable) {
-        emit writeStateChanged(m_isFolderWritable);
+    return 0;
+}
+
+void DolphinView::setStatusBarOffset(int offset)
+{
+    KItemListView *view = m_container->controller()->view();
+    if (view) {
+        view->setStatusBarOffset(offset);

     }
 }
 
     }
 }
 

-QByteArray DolphinView::sortRoleForSorting(Sorting sorting) const
+QUrl DolphinView::viewPropertiesUrl() const

 {
 {

-    switch (sorting) {
-    case SortByName:        return "name";
-    case SortBySize:        return "size";
-    case SortByDate:        return "date";
-    case SortByPermissions: return "permissions";
-    case SortByOwner:       return "owner";
-    case SortByGroup:       return "group";
-    case SortByType:        return "type";
-    case SortByDestination: return "destination";
-    case SortByPath:        return "path";
-    default: break;
+    if (m_viewPropertiesContext.isEmpty()) {
+        return m_url;

     }
 
     }
 

-    return QByteArray();
+    QUrl url;
+    url.setScheme(m_url.scheme());
+    url.setPath(m_viewPropertiesContext);
+    return url;
+}
+
+void DolphinView::forceUrlsSelection(const QUrl &current, const QList<QUrl> &selected)
+{
+    clearSelection();
+    m_clearSelectionBeforeSelectingNewItems = true;
+    markUrlAsCurrent(current);
+    markUrlsAsSelected(selected);

 }
 
 }
 

-DolphinView::Sorting DolphinView::sortingForSortRole(const QByteArray& sortRole) const
+void DolphinView::copyPathToClipboard()

 {
 {

-    static QHash<QByteArray, DolphinView::Sorting> sortHash;
-    if (sortHash.isEmpty()) {
-        sortHash.insert("name", SortByName);
-        sortHash.insert("size", SortBySize);
-        sortHash.insert("date", SortByDate);
-        sortHash.insert("permissions", SortByPermissions);
-        sortHash.insert("owner", SortByOwner);
-        sortHash.insert("group", SortByGroup);
-        sortHash.insert("type", SortByType);
-        sortHash.insert("destination", SortByDestination);
-        sortHash.insert("path", SortByPath);
+    const KFileItemList list = selectedItems();
+    if (list.isEmpty()) {
+        return;
+    }
+    const KFileItem &item = list.at(0);
+    QString path = item.localPath();
+    if (path.isEmpty()) {
+        path = item.url().toDisplayString();

     }
     }

-    return sortHash.value(sortRole);
+    QClipboard *clipboard = QApplication::clipboard();
+    if (clipboard == nullptr) {
+        return;
+    }
+    clipboard->setText(QDir::toNativeSeparators(path));

 }
 
 }
 

-QString DolphinView::fileSizeText(KIO::filesize_t fileSize)
+void DolphinView::slotIncreaseZoom()

 {
 {

-    const KLocale* locale = KGlobal::locale();
-    const unsigned int multiplier = (locale->binaryUnitDialect() == KLocale::MetricBinaryDialect)
-                                    ? 1000 : 1024;
+    setZoomLevel(zoomLevel() + 1);
+}

 
 

-    QString text;
-    if (fileSize < multiplier) {
-        // Show the size in bytes
-        text = locale->formatByteSize(fileSize, 0, KLocale::DefaultBinaryDialect, KLocale::UnitByte);
-    } else if (fileSize < multiplier * multiplier) {
-        // Show the size in kilobytes and always round up. This is done
-        // for consistency with the values shown e.g. in the "Size" column
-        // of the details-view.
-        fileSize += (multiplier / 2) - 1;
-        text = locale->formatByteSize(fileSize, 0, KLocale::DefaultBinaryDialect, KLocale::UnitKiloByte);
+void DolphinView::slotDecreaseZoom()
+{
+    setZoomLevel(zoomLevel() - 1);
+}
+
+void DolphinView::slotSwipeUp()
+{
+    Q_EMIT goUpRequested();
+}
+
+void DolphinView::showLoadingPlaceholder()
+{
+    m_placeholderLabel->setText(i18n("Loading…"));
+    m_placeholderLabel->setVisible(true);
+#ifndef QT_NO_ACCESSIBILITY
+    if (QAccessible::isActive()) {
+        static_cast<KItemListViewAccessible *>(QAccessible::queryAccessibleInterface(m_view))->announceNewlyLoadedLocation(m_placeholderLabel->text());
+    }
+#endif
+}
+
+void DolphinView::updatePlaceholderLabel()
+{
+    m_showLoadingPlaceholderTimer->stop();
+    if (itemsCount() > 0) {
+#ifndef QT_NO_ACCESSIBILITY
+        if (QAccessible::isActive()) {
+            static_cast<KItemListViewAccessible *>(QAccessible::queryAccessibleInterface(m_view))->announceNewlyLoadedLocation(QString());
+        }
+#endif
+        m_placeholderLabel->setVisible(false);
+        return;
+    }
+
+    if (m_loadingState == LoadingState::Loading) {
+        m_placeholderLabel->setVisible(false);
+        m_showLoadingPlaceholderTimer->start();
+        return;
+    }
+
+    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"));
+    } else if (m_url.scheme() == QLatin1String("trash") && m_url.path() == QLatin1String("/")) {
+        m_placeholderLabel->setText(i18n("Trash is empty"));
+    } else if (m_url.scheme() == QLatin1String("tags")) {
+        if (m_url.path() == QLatin1Char('/')) {
+            m_placeholderLabel->setText(i18n("No tags"));
+        } else {
+            const QString tagName = m_url.path().mid(1); // Remove leading /
+            m_placeholderLabel->setText(i18n("No files tagged with \"%1\"", tagName));
+        }
+
+    } else if (m_url.scheme() == QLatin1String("recentlyused")) {
+        m_placeholderLabel->setText(i18n("No recently used items"));
+    } else if (m_url.scheme() == QLatin1String("smb")) {
+        m_placeholderLabel->setText(i18n("No shared folders found"));
+    } else if (m_url.scheme() == QLatin1String("network")) {
+        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 {
     } else {

-        // Show the size in the best fitting unit having one decimal
-        text = locale->formatByteSize(fileSize, 1);
+        m_placeholderLabel->setText(i18n("Folder is empty"));
+    }
+
+    m_placeholderLabel->setVisible(true);
+#ifndef QT_NO_ACCESSIBILITY
+    if (QAccessible::isActive()) {
+        static_cast<KItemListViewAccessible *>(QAccessible::queryAccessibleInterface(m_view))->announceNewlyLoadedLocation(m_placeholderLabel->text());
+    }
+#endif
+}
+
+bool DolphinView::tryShowNameToolTip(QHelpEvent *event)
+{
+    if (!GeneralSettings::showToolTips() && m_mode == DolphinView::IconsView) {
+        const std::optional<int> index = m_view->itemAt(event->pos());
+
+        if (!index.has_value()) {
+            return false;
+        }
+
+        // Check whether the filename has been elided
+        const bool isElided = m_view->isElided(index.value());
+
+        if (isElided) {
+            const KFileItem item = m_model->fileItem(index.value());
+            const QString text = item.text();
+            const QPoint pos = mapToGlobal(event->pos());
+            QToolTip::showText(pos, text, this);
+            return true;
+        }

     }
     }

-    return text;
+    return false;

 }
 
 }
 

-#include "dolphinview.moc"
+#include "moc_dolphinview.cpp"