Two clicks on file/folder to rename

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 2eb16fe2dd0c28397358843fb82feff46cff41f9..4485c1707909aa5beb665fc22d470db907a43ecd 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -24,26 +24,22 @@
 
 #include <QAbstractItemView>
 #include <QApplication>
 
 #include <QAbstractItemView>
 #include <QApplication>

-#include <QBoxLayout>

 #include <QClipboard>
 #include <QDropEvent>
 #include <QGraphicsSceneDragDropEvent>
 #include <QClipboard>
 #include <QDropEvent>
 #include <QGraphicsSceneDragDropEvent>

-#include <QKeyEvent>
-#include <QItemSelection>

 #include <QTimer>
 #include <QScrollBar>
 #include <QTimer>
 #include <QScrollBar>

+#include <QPixmapCache>

 #include <QPointer>
 #include <QMenu>
 #include <QPointer>
 #include <QMenu>

-
+#include <QVBoxLayout>

 #include <KDesktopFile>
 #include <KProtocolManager>
 #include <KDesktopFile>
 #include <KProtocolManager>

-#include <KActionCollection>

 #include <KColorScheme>
 #include <KDirModel>
 #include <KColorScheme>
 #include <KDirModel>

-#include <KIconEffect>

 #include <KFileItem>
 #include <KFileItemListProperties>
 #include <KFileItem>
 #include <KFileItemListProperties>

-#include <KLocale>
+#include <KLocalizedString>

 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>
 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>
 #include <kitemviews/kitemlistcontainer.h>


@@ -54,17 +50,14 @@
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
 #include <KIO/JobUiDelegate>

-#include <KIO/NetAccess>

 #include <KIO/PreviewJob>
 #include <KIO/PreviewJob>

+#include <KIO/DropJob>
+#include <KIO/PasteJob>

 #include <KIO/Paste>
 #include <KJob>
 #include <KIO/Paste>
 #include <KJob>

-#include <KMenu>
-#include <KGlobal>

 #include <KMessageBox>
 #include <KJobWidgets>
 #include <KMessageBox>
 #include <KJobWidgets>

-#include <konq_operations.h>
-#include <KToggleAction>
-#include <KUrl>
+#include <QUrl>

 
 #include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"
 
 #include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"


@@ -81,12 +74,9 @@
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>
 #endif
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>
 #endif

+#include <KFormat>

 
 

-namespace {
-    const int MaxModeEnum = DolphinView::CompactView;
-};
-
-DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
+DolphinView::DolphinView(const QUrl& url, QWidget* parent) :

     QWidget(parent),
     m_active(true),
     m_tabsForFiles(false),
     QWidget(parent),
     m_active(true),
     m_tabsForFiles(false),


@@ -109,7 +99,8 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_selectedUrls(),
     m_clearSelectionBeforeSelectingNewItems(false),
     m_markFirstNewlySelectedItemAsCurrent(false),
     m_selectedUrls(),
     m_clearSelectionBeforeSelectingNewItems(false),
     m_markFirstNewlySelectedItemAsCurrent(false),

-    m_versionControlObserver(0)
+    m_versionControlObserver(0),
+    m_twoClicksRenamingTimer(nullptr)

 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);


@@ -130,7 +121,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();
     m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();
     m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());

-    m_view->setVisibleRoles(QList<QByteArray>() << "text");
+    m_view->setVisibleRoles({"text"});

     applyModeToView();
 
     KItemListController* controller = new KItemListController(m_model, m_view, this);
     applyModeToView();
 
     KItemListController* controller = new KItemListController(m_model, m_view, this);


@@ -160,6 +151,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     connect(controller, &KItemListController::itemDropEvent, this, &DolphinView::slotItemDropEvent);
     connect(controller, &KItemListController::escapePressed, this, &DolphinView::stopLoading);
     connect(controller, &KItemListController::modelChanged, this, &DolphinView::slotModelChanged);
     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(m_model, &KFileItemModel::directoryLoadingStarted,       this, &DolphinView::slotDirectoryLoadingStarted);
     connect(m_model, &KFileItemModel::directoryLoadingCompleted,     this, &DolphinView::slotDirectoryLoadingCompleted);
 
     connect(m_model, &KFileItemModel::directoryLoadingStarted,       this, &DolphinView::slotDirectoryLoadingStarted);
     connect(m_model, &KFileItemModel::directoryLoadingCompleted,     this, &DolphinView::slotDirectoryLoadingCompleted);


@@ -184,14 +176,15 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
             this, &DolphinView::slotVisibleRolesChangedByHeader);
     connect(m_view, &DolphinItemListView::roleEditingCanceled,
             this, &DolphinView::slotRoleEditingCanceled);
             this, &DolphinView::slotVisibleRolesChangedByHeader);
     connect(m_view, &DolphinItemListView::roleEditingCanceled,
             this, &DolphinView::slotRoleEditingCanceled);

-    connect(m_view->header(), &KItemListHeader::columnWidthChanged,
-            this, &DolphinView::slotHeaderColumnWidthChanged);
+    connect(m_view->header(), &KItemListHeader::columnWidthChangeFinished,
+            this, &DolphinView::slotHeaderColumnWidthChangeFinished);

 
     KItemListSelectionManager* selectionManager = controller->selectionManager();
     connect(selectionManager, &KItemListSelectionManager::selectionChanged,
             this, &DolphinView::slotSelectionChanged);
 
     m_toolTipManager = new ToolTipManager(this);
 
     KItemListSelectionManager* selectionManager = controller->selectionManager();
     connect(selectionManager, &KItemListSelectionManager::selectionChanged,
             this, &DolphinView::slotSelectionChanged);
 
     m_toolTipManager = new ToolTipManager(this);

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

 
     m_versionControlObserver = new VersionControlObserver(this);
     m_versionControlObserver->setModel(m_model);
 
     m_versionControlObserver = new VersionControlObserver(this);
     m_versionControlObserver->setModel(m_model);


@@ -199,6 +192,10 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     connect(m_versionControlObserver, &VersionControlObserver::errorMessage, this, &DolphinView::errorMessage);
     connect(m_versionControlObserver, &VersionControlObserver::operationCompletedMessage, this, &DolphinView::operationCompletedMessage);
 
     connect(m_versionControlObserver, &VersionControlObserver::errorMessage, this, &DolphinView::errorMessage);
     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);
 


@@ -209,7 +206,7 @@ DolphinView::~DolphinView()
 {
 }
 
 {
 }
 

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

 {
     return m_url;
 }
 {
     return m_url;
 }


@@ -222,19 +219,7 @@ 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();


@@ -299,7 +284,7 @@ void DolphinView::setHiddenFilesShown(bool show)
 
     const KFileItemList itemList = selectedItems();
     m_selectedUrls.clear();
 
     const KFileItemList itemList = selectedItems();
     m_selectedUrls.clear();

-    m_selectedUrls = KUrl::List(itemList.urlList());
+    m_selectedUrls = itemList.urlList();

 
     ViewProperties props(viewPropertiesUrl());
     props.setHiddenFilesShown(show);
 
     ViewProperties props(viewPropertiesUrl());
     props.setHiddenFilesShown(show);


@@ -356,7 +341,9 @@ KFileItemList DolphinView::selectedItems() const
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 
     KFileItemList selectedItems;
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 
     KFileItemList selectedItems;

-    foreach (int index, selectionManager->selectedItems()) {
+    const auto items = selectionManager->selectedItems();
+    selectedItems.reserve(items.count());
+    for (int index : items) {

         selectedItems.append(m_model->fileItem(index));
     }
     return selectedItems;
         selectedItems.append(m_model->fileItem(index));
     }
     return selectedItems;


@@ -368,12 +355,12 @@ int DolphinView::selectedItemsCount() const
     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;
 }
 

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

 {
     m_currentItemUrl = url;
     m_scrollToCurrentItem = true;
 {
     m_currentItemUrl = url;
     m_scrollToCurrentItem = true;


@@ -474,10 +461,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 = KUrl::List(itemList.urlList());
-

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


@@ -489,7 +472,7 @@ void DolphinView::readSettings()
 {
     const int oldZoomLevel = m_view->zoomLevel();
 
 {
     const int oldZoomLevel = m_view->zoomLevel();
 

-    GeneralSettings::self()->readConfig();
+    GeneralSettings::self()->load();

     m_view->readSettings();
     applyViewProperties();
 
     m_view->readSettings();
     applyViewProperties();
 


@@ -504,7 +487,7 @@ void DolphinView::readSettings()
 
 void DolphinView::writeSettings()
 {
 
 void DolphinView::writeSettings()
 {

-    GeneralSettings::self()->writeConfig();
+    GeneralSettings::self()->save();

     m_view->writeSettings();
 }
 
     m_view->writeSettings();
 }
 


@@ -567,11 +550,11 @@ QString DolphinView::statusBarText() const
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
                         foldersText, filesText,
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
                         foldersText, filesText,

-                        KGlobal::locale()->formatByteSize(totalFileSize));
+                        KFormat().formatByteSize(totalFileSize));

     } else if (fileCount > 0) {
         summary = i18nc("@info:status files (size)", "%1 (%2)",
                         filesText,
     } else if (fileCount > 0) {
         summary = i18nc("@info:status files (size)", "%1 (%2)",
                         filesText,

-                        KGlobal::locale()->formatByteSize(totalFileSize));
+                        KFormat().formatByteSize(totalFileSize));

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


@@ -597,7 +580,7 @@ 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;


@@ -605,7 +588,6 @@ void DolphinView::setUrl(const KUrl& url)
 
     clearSelection();
 
 
     clearSelection();
 

-    emit urlAboutToBeChanged(url);

     m_url = url;
 
     hideToolTip();
     m_url = url;
 
     hideToolTip();


@@ -659,6 +641,9 @@ void DolphinView::renameSelectedItems()
                 this, &DolphinView::slotRoleEditingFinished);
     } else {
         RenameDialog* dialog = new RenameDialog(this, items);
                 this, &DolphinView::slotRoleEditingFinished);
     } else {
         RenameDialog* dialog = new RenameDialog(this, items);

+
+        connect(dialog, &RenameDialog::renamingFinished, this, &DolphinView::slotRenameDialogRenamingFinished);
+

         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         dialog->raise();
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         dialog->raise();


@@ -673,12 +658,12 @@ void DolphinView::renameSelectedItems()
 
 void DolphinView::trashSelectedItems()
 {
 
 void DolphinView::trashSelectedItems()
 {

-    const KUrl::List list = simplifiedSelectedUrls();
+    const QList<QUrl> list = simplifiedSelectedUrls();

     KIO::JobUiDelegate uiDelegate;
     uiDelegate.setWindow(window());
     if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
         KIO::Job* job = KIO::trash(list);
     KIO::JobUiDelegate uiDelegate;
     uiDelegate.setWindow(window());
     if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
         KIO::Job* job = KIO::trash(list);

-        KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, KUrl("trash:/"), job);
+        KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl(QStringLiteral("trash:/")), job);

         KJobWidgets::setWindow(job, this);
         connect(job, &KIO::Job::result,
                 this, &DolphinView::slotTrashFileFinished);
         KJobWidgets::setWindow(job, this);
         connect(job, &KIO::Job::result,
                 this, &DolphinView::slotTrashFileFinished);


@@ -687,7 +672,7 @@ void DolphinView::trashSelectedItems()
 
 void DolphinView::deleteSelectedItems()
 {
 
 void DolphinView::deleteSelectedItems()
 {

-    const KUrl::List list = simplifiedSelectedUrls();
+    const QList<QUrl> list = simplifiedSelectedUrls();

 
     KIO::JobUiDelegate uiDelegate;
     uiDelegate.setWindow(window());
 
     KIO::JobUiDelegate uiDelegate;
     uiDelegate.setWindow(window());


@@ -730,9 +715,46 @@ void DolphinView::stopLoading()
     m_model->cancelDirectoryLoading();
 }
 
     m_model->cancelDirectoryLoading();
 }
 

+void DolphinView::updatePalette()
+{
+    QColor color = KColorScheme(QPalette::Active, 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()) {
 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {

+    case QEvent::PaletteChange:
+        updatePalette();
+        QPixmapCache::clear();
+        break;
+
+    case QEvent::KeyPress:
+        if (GeneralSettings::useTabForSwitchingSplitView()) {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier) {
+                emit toggleActiveViewRequested();
+                return true;
+            }
+        }
+        break;

     case QEvent::FocusIn:
         if (watched == m_container) {
             setActive(true);
     case QEvent::FocusIn:
         if (watched == m_container) {
             setActive(true);


@@ -783,13 +805,14 @@ void DolphinView::hideEvent(QHideEvent* event)
 
 bool DolphinView::event(QEvent* event)
 {
 
 bool DolphinView::event(QEvent* event)
 {

-    /* See Bug 297355
-     * Dolphin leaves file preview tooltips open even when is not visible.
-     *
-     * Hide tool-tip when Dolphin loses focus.
-     */

     if (event->type() == QEvent::WindowDeactivate) {
     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();
         hideToolTip();

+        abortTwoClicksRenaming();

     }
 
     return QWidget::event(event);
     }
 
     return QWidget::event(event);


@@ -802,6 +825,8 @@ void DolphinView::activate()
 
 void DolphinView::slotItemActivated(int index)
 {
 
 void DolphinView::slotItemActivated(int index)
 {

+    abortTwoClicksRenaming();
+

     const KFileItem item = m_model->fileItem(index);
     if (!item.isNull()) {
         emit itemActivated(item);
     const KFileItem item = m_model->fileItem(index);
     if (!item.isNull()) {
         emit itemActivated(item);


@@ -812,6 +837,8 @@ void DolphinView::slotItemsActivated(const KItemSet& indexes)
 {
     Q_ASSERT(indexes.count() >= 2);
 
 {
     Q_ASSERT(indexes.count() >= 2);
 

+    abortTwoClicksRenaming();
+

     if (indexes.count() > 5) {
         QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count());
         const int answer = KMessageBox::warningYesNo(this, question);
     if (indexes.count() > 5) {
         QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count());
         const int answer = KMessageBox::warningYesNo(this, question);


@@ -823,9 +850,9 @@ void DolphinView::slotItemsActivated(const KItemSet& indexes)
     KFileItemList items;
     items.reserve(indexes.count());
 
     KFileItemList items;
     items.reserve(indexes.count());
 

-    foreach (int index, indexes) {
+    for (int index : indexes) {

         KFileItem item = m_model->fileItem(index);
         KFileItem item = m_model->fileItem(index);

-        const KUrl& url = openItemAsFolderUrl(item);
+        const QUrl& url = openItemAsFolderUrl(item);

 
         if (!url.isEmpty()) { // Open folders in new tabs
             emit tabRequested(url);
 
         if (!url.isEmpty()) { // Open folders in new tabs
             emit tabRequested(url);


@@ -844,7 +871,7 @@ void DolphinView::slotItemsActivated(const KItemSet& indexes)
 void DolphinView::slotItemMiddleClicked(int index)
 {
     const KFileItem& item = m_model->fileItem(index);
 void DolphinView::slotItemMiddleClicked(int index)
 {
     const KFileItem& item = m_model->fileItem(index);

-    const KUrl& url = openItemAsFolderUrl(item);
+    const QUrl& url = openItemAsFolderUrl(item);

     if (!url.isEmpty()) {
         emit tabRequested(url);
     } else if (isTabsForFilesEnabled()) {
     if (!url.isEmpty()) {
         emit tabRequested(url);
     } else if (isTabsForFilesEnabled()) {


@@ -873,7 +900,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {
     ViewProperties props(viewPropertiesUrl());
 
 {
     ViewProperties props(viewPropertiesUrl());
 

-    QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
+    QPointer<QMenu> menu = new QMenu(QApplication::activeWindow());

 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();


@@ -946,6 +973,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
             // Apply the current column-widths as custom column-widths and turn
             // off the automatic resizing of the columns
             QList<int> columnWidths;
             // Apply the current column-widths as custom column-widths and turn
             // off the automatic resizing of the columns
             QList<int> columnWidths;

+            columnWidths.reserve(view->visibleRoles().count());

             foreach (const QByteArray& role, view->visibleRoles()) {
                 columnWidths.append(header->columnWidth(role));
             }
             foreach (const QByteArray& role, view->visibleRoles()) {
                 columnWidths.append(header->columnWidth(role));
             }


@@ -967,6 +995,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 
             QList<int> columnWidths;
             if (!header->automaticColumnResizing()) {
 
             QList<int> columnWidths;
             if (!header->automaticColumnResizing()) {

+                columnWidths.reserve(view->visibleRoles().count());

                 foreach (const QByteArray& role, view->visibleRoles()) {
                     columnWidths.append(header->columnWidth(role));
                 }
                 foreach (const QByteArray& role, view->visibleRoles()) {
                     columnWidths.append(header->columnWidth(role));
                 }


@@ -978,10 +1007,8 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
     delete menu;
 }
 
     delete menu;
 }
 

-void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal current, qreal previous)
+void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current)

 {
 {

-    Q_UNUSED(previous);
-

     const QList<QByteArray> visibleRoles = m_view->visibleRoles();
 
     ViewProperties props(viewPropertiesUrl());
     const QList<QByteArray> visibleRoles = m_view->visibleRoles();
 
     ViewProperties props(viewPropertiesUrl());


@@ -1012,7 +1039,7 @@ void DolphinView::slotItemHovered(int 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);
+        m_toolTipManager->showToolTip(item, itemRect, nativeParentWidget()->windowHandle());

     }
 
     emit requestItemInfo(item);
     }
 
     emit requestItemInfo(item);


@@ -1027,7 +1054,7 @@ void DolphinView::slotItemUnhovered(int index)
 
 void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
 
 void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {

-    KUrl destUrl;
+    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
     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


@@ -1036,7 +1063,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
         destUrl = url();
     } else {
         // The item represents a directory or desktop-file
         destUrl = url();
     } else {
         // The item represents a directory or desktop-file

-        destUrl = destItem.url();
+        destUrl = destItem.mostLocalUrl();

     }
 
     QDropEvent dropEvent(event->pos().toPoint(),
     }
 
     QDropEvent dropEvent(event->pos().toPoint(),


@@ -1044,21 +1071,25 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());

+    dropUrls(destUrl, &dropEvent, this);

 
 

-    QString error;
-    KonqOperations* op = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent, error);
-    if (!error.isEmpty()) {
-        emit infoMessage(error);
-    }
+    setActive(true);
+}

 
 

-    if (op && destUrl == url()) {
-        // Mark the dropped urls as selected.
-        m_clearSelectionBeforeSelectingNewItems = true;
-        m_markFirstNewlySelectedItemAsCurrent = true;
-        connect(op, static_cast<void(KonqOperations::*)(const KUrl::List&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
-    }
+void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget)
+{
+    KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);

 
 

-    setActive(true);
+    if (job) {
+        connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);
+
+        if (destUrl == url()) {
+            // Mark the dropped urls as selected.
+            m_clearSelectionBeforeSelectingNewItems = true;
+            m_markFirstNewlySelectedItemAsCurrent = true;
+            connect(job, &KIO::DropJob::itemCreated, this, &DolphinView::slotItemCreated);
+        }
+    }

 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)


@@ -1091,14 +1122,30 @@ void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons
     }
 }
 
     }
 }
 

-void DolphinView::slotAboutToCreate(const KUrl::List& urls)
+void DolphinView::slotSelectedItemTextPressed(int index)

 {
 {

-    if (!urls.isEmpty()) {
-        if (m_markFirstNewlySelectedItemAsCurrent) {
-            markUrlAsCurrent(urls.first());
-            m_markFirstNewlySelectedItemAsCurrent = false;
-        }
-        m_selectedUrls << KUrl::List(KDirModel::simplifiedUrlList(urls));
+    if (GeneralSettings::renameInline()) {
+        m_twoClicksRenamingItemUrl = m_model->fileItem(index).url();
+        m_twoClicksRenamingTimer->start(QApplication::doubleClickInterval());
+    }
+}
+
+void DolphinView::slotItemCreated(const QUrl& url)
+{
+    if (m_markFirstNewlySelectedItemAsCurrent) {
+        markUrlAsCurrent(url);
+        m_markFirstNewlySelectedItemAsCurrent = false;
+    }
+    m_selectedUrls << url;
+}
+
+void DolphinView::slotPasteJobResult(KJob *job)
+{
+    if (job->error()) {
+        emit errorMessage(job->errorString());
+    }
+    if (!m_selectedUrls.isEmpty()) {
+        m_selectedUrls << KDirModel::simplifiedUrlList(m_selectedUrls);

     }
 }
 
     }
 }
 


@@ -1155,7 +1202,10 @@ void DolphinView::updateSortFoldersFirst(bool foldersFirst)
 
 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)


@@ -1186,11 +1236,14 @@ void DolphinView::restoreState(QDataStream& stream)
     // 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;
     m_model->restoreExpandedDirectories(urls);
 }
     stream >> urls;
     m_model->restoreExpandedDirectories(urls);
 }


@@ -1204,12 +1257,15 @@ void DolphinView::saveState(QDataStream& stream)
     if (currentIndex != -1) {
         KFileItem item = m_model->fileItem(currentIndex);
         Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist
     if (currentIndex != -1) {
         KFileItem item = m_model->fileItem(currentIndex);
         Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist

-        KUrl currentItemUrl = item.url();
+        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();
     // Save view position
     const qreal x = m_container->horizontalScrollBar()->value();
     const qreal y = m_container->verticalScrollBar()->value();


@@ -1234,13 +1290,13 @@ QString DolphinView::viewPropertiesContext() const
     return m_viewPropertiesContext;
 }
 
     return m_viewPropertiesContext;
 }
 

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

 {
     if (item.isNull()) {
 {
     if (item.isNull()) {

-        return KUrl();
+        return QUrl();

     }
 
     }
 

-    KUrl url = item.targetUrl();
+    QUrl url = item.targetUrl();

 
     if (item.isDir()) {
         return url;
 
     if (item.isDir()) {
         return url;


@@ -1257,7 +1313,7 @@ KUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
             // open OpenDocument files as zip folders...
             const QString& protocol = KProtocolManager::protocolForArchiveMimetype(mimetype);
             if (!protocol.isEmpty()) {
             // open OpenDocument files as zip folders...
             const QString& protocol = KProtocolManager::protocolForArchiveMimetype(mimetype);
             if (!protocol.isEmpty()) {

-                url.setProtocol(protocol);
+                url.setScheme(protocol);

                 return url;
             }
         }
                 return url;
             }
         }


@@ -1268,27 +1324,25 @@ KUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
             if (desktopFile.hasLinkType()) {
                 const QString linkUrl = desktopFile.readUrl();
                 if (!linkUrl.startsWith(QLatin1String("http"))) {
             if (desktopFile.hasLinkType()) {
                 const QString linkUrl = desktopFile.readUrl();
                 if (!linkUrl.startsWith(QLatin1String("http"))) {

-                    return linkUrl;
+                    return QUrl::fromUserInput(linkUrl);

                 }
             }
         }
     }
 
                 }
             }
         }
     }
 

-    return KUrl();
+    return QUrl();

 }
 
 }
 

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

 {
     if (m_active) {
 {
     if (m_active) {

-        clearSelection();
-        markUrlAsCurrent(url);
-        markUrlsAsSelected(QList<KUrl>() << url);
+        forceUrlsSelection(url, {url});

     }
 }
 
     }
 }
 

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

 {
 {

-    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
+    if (oldUrl.matches(url(), QUrl::StripTrailingSlash)) {

         emit redirection(oldUrl, newUrl);
         m_url = newUrl; // #186947
     }
         emit redirection(oldUrl, newUrl);
         m_url = newUrl; // #186947
     }


@@ -1296,7 +1350,7 @@ void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUr
 
 void DolphinView::updateViewState()
 {
 
 void DolphinView::updateViewState()
 {

-    if (m_currentItemUrl != KUrl()) {
+    if (m_currentItemUrl != QUrl()) {

         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
         const int currentIndex = m_model->index(m_currentItemUrl);
         if (currentIndex != -1) {
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
         const int currentIndex = m_model->index(m_currentItemUrl);
         if (currentIndex != -1) {


@@ -1311,7 +1365,7 @@ void DolphinView::updateViewState()
             selectionManager->setCurrentItem(0);
         }
 
             selectionManager->setCurrentItem(0);
         }
 

-        m_currentItemUrl = KUrl();
+        m_currentItemUrl = QUrl();

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


@@ -1333,7 +1387,7 @@ void DolphinView::updateViewState()
 
         KItemSet selectedItems = selectionManager->selectedItems();
 
 
         KItemSet selectedItems = selectionManager->selectedItems();
 

-        QList<KUrl>::iterator it = m_selectedUrls.begin();
+        QList<QUrl>::iterator it = m_selectedUrls.begin();

         while (it != m_selectedUrls.end()) {
             const int index = m_model->index(*it);
             if (index >= 0) {
         while (it != m_selectedUrls.end()) {
             const int index = m_model->index(*it);
             if (index >= 0) {


@@ -1344,6 +1398,7 @@ void DolphinView::updateViewState()
             }
         }
 
             }
         }
 

+        selectionManager->beginAnchoredSelection(selectionManager->currentItem());

         selectionManager->setSelectedItems(selectedItems);
     }
 }
         selectionManager->setSelectedItems(selectedItems);
     }
 }


@@ -1371,6 +1426,22 @@ void DolphinView::calculateItemCount(int& fileCount,
     }
 }
 
     }
 }
 

+void DolphinView::slotTwoClicksRenamingTimerTimeout()
+{
+    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+
+    // verify that only one item is selected and that no item is dragged
+    if (selectionManager->selectedItems().count() == 1 && !m_dragging) {
+        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::slotTrashFileFinished(KJob* job)
 {
     if (job->error() == 0) {
 void DolphinView::slotTrashFileFinished(KJob* job)
 {
     if (job->error() == 0) {


@@ -1395,10 +1466,10 @@ void DolphinView::slotRenamingResult(KJob* job)
         KIO::CopyJob *copyJob = qobject_cast<KIO::CopyJob *>(job);
         Q_ASSERT(copyJob);
         const QUrl newUrl = copyJob->destUrl();
         KIO::CopyJob *copyJob = qobject_cast<KIO::CopyJob *>(job);
         Q_ASSERT(copyJob);
         const QUrl newUrl = copyJob->destUrl();

-        const int index = m_model->index(KUrl(newUrl));
+        const int index = m_model->index(newUrl);

         if (index >= 0) {
             QHash<QByteArray, QVariant> data;
         if (index >= 0) {
             QHash<QByteArray, QVariant> data;

-            const QUrl oldUrl = copyJob->srcUrls().first();
+            const QUrl oldUrl = copyJob->srcUrls().at(0);

             data.insert("text", oldUrl.fileName());
             m_model->setData(index, data);
         }
             data.insert("text", oldUrl.fileName());
             m_model->setData(index, data);
         }


@@ -1421,7 +1492,7 @@ void DolphinView::slotDirectoryLoadingCompleted()
 {
     // Update the view-state. This has to be done asynchronously
     // because the view might not be in its final state yet.
 {
     // 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, SLOT(updateViewState()));
+    QTimer::singleShot(0, this, &DolphinView::updateViewState);

 
     emit directoryLoadingCompleted();
 
 
     emit directoryLoadingCompleted();
 


@@ -1490,12 +1561,12 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
         const KFileItem oldItem = m_model->fileItem(index);
         const QString newName = value.toString();
         if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
         const KFileItem oldItem = m_model->fileItem(index);
         const QString newName = value.toString();
         if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {

-            const KUrl oldUrl = oldItem.url();
+            const QUrl oldUrl = oldItem.url();

 
             QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
             newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));
 
 
             QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
             newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));
 

-            const bool newNameExistsAlready = (m_model->index(KUrl(newUrl)) >= 0);
+            const bool newNameExistsAlready = (m_model->index(newUrl) >= 0);

             if (!newNameExistsAlready) {
                 // Only change the data in the model if no item with the new name
                 // is in the model yet. If there is an item with the new name
             if (!newNameExistsAlready) {
                 // Only change the data in the model if no item with the new name
                 // is in the model yet. If there is an item with the new name


@@ -1509,8 +1580,10 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
 
             KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
             KJobWidgets::setWindow(job, this);
 
             KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
             KJobWidgets::setWindow(job, this);

-            KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, QList<QUrl>() << oldUrl, newUrl, job);
-            job->ui()->setAutoErrorHandlingEnabled(true);
+            KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
+            job->uiDelegate()->setAutoErrorHandlingEnabled(true);
+
+            forceUrlsSelection(newUrl, {newUrl});

 
             if (!newNameExistsAlready) {
                 // Only connect the result signal if there is no item with the new name
 
             if (!newNameExistsAlready) {
                 // Only connect the result signal if there is no item with the new name


@@ -1521,10 +1594,10 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
     }
 }
 
     }
 }
 

-void DolphinView::loadDirectory(const KUrl& url, bool reload)
+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()) {
             emit errorMessage(i18nc("@info:status", "The location is empty."));
         } else {
         if (location.isEmpty()) {
             emit errorMessage(i18nc("@info:status", "The location is empty."));
         } else {


@@ -1650,21 +1723,22 @@ void DolphinView::applyModeToView()
     }
 }
 
     }
 }
 

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

 {
 {

-    KonqOperations* op = KonqOperations::doPasteV2(this, url);
-    if (op) {
-        m_clearSelectionBeforeSelectingNewItems = true;
-        m_markFirstNewlySelectedItemAsCurrent = true;
-        connect(op, static_cast<void(KonqOperations::*)(const KUrl::List&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
-    }
+    KIO::PasteJob *job = KIO::paste(QApplication::clipboard()->mimeData(), url);
+    KJobWidgets::setWindow(job, this);
+    m_clearSelectionBeforeSelectingNewItems = true;
+    m_markFirstNewlySelectedItemAsCurrent = true;
+    connect(job, &KIO::PasteJob::itemCreated, this, &DolphinView::slotItemCreated);
+    connect(job, &KIO::PasteJob::result, this, &DolphinView::slotPasteJobResult);

 }
 
 }
 

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

 {
 {

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

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

+    urls.reserve(items.count());

     foreach (const KFileItem& item, items) {
         urls.append(item.url());
     }
     foreach (const KFileItem& item, items) {
         urls.append(item.url());
     }


@@ -1694,7 +1768,8 @@ void DolphinView::updateWritableState()
     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
     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(KFileItem::Unknown, KFileItem::Unknown, url(), true);
+        item = KFileItem(url());
+        item.setDelayedMimeTypes(true);

     }
 
     KFileItemListProperties capabilities(KFileItemList() << item);
     }
 
     KFileItemListProperties capabilities(KFileItemList() << item);


@@ -1705,15 +1780,27 @@ void DolphinView::updateWritableState()
     }
 }
 
     }
 }
 

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

 {
     if (m_viewPropertiesContext.isEmpty()) {
         return m_url;
     }
 
 {
     if (m_viewPropertiesContext.isEmpty()) {
         return m_url;
     }
 

-    KUrl url;
-    url.setProtocol(m_url.protocol());
+    QUrl url;
+    url.setScheme(m_url.scheme());

     url.setPath(m_viewPropertiesContext);
     return url;
 }
 
     url.setPath(m_viewPropertiesContext);
     return url;
 }
 

+void DolphinView::slotRenameDialogRenamingFinished(const QList<QUrl>& urls)
+{
+    forceUrlsSelection(urls.first(), urls);
+}
+
+void DolphinView::forceUrlsSelection(const QUrl& current, const QList<QUrl>& selected)
+{
+    clearSelection();
+    m_clearSelectionBeforeSelectingNewItems = true;
+    markUrlAsCurrent(current);
+    markUrlsAsSelected(selected);
+}