Two clicks on file/folder to rename

[dolphin.git] / src / panels / folders / treeviewcontextmenu.cpp

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index ff0801d1a9fe64a83ce904918a8f8d1c4c06e094..6381a88ff13993cfc8e254a00f55e24b15c32405 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -21,16 +21,20 @@
 #include "treeviewcontextmenu.h"
 
 #include <KFileItem>
 #include "treeviewcontextmenu.h"
 
 #include <KFileItem>

-#include <KIconLoader>
+#include <KIO/CopyJob>

 #include <KIO/DeleteJob>
 #include <KIO/DeleteJob>

-#include <KMenu>
-#include <KIcon>
+#include <KIO/JobUiDelegate>
+#include <QMenu>
+#include <QIcon>
+#include <KJobWidgets>

 #include <KSharedConfig>
 #include <KConfigGroup>
 #include <KSharedConfig>
 #include <KConfigGroup>

-#include <konqmimedata.h>
+#include <KUrlMimeData>

 #include <KFileItemListProperties>
 #include <KFileItemListProperties>

-#include <konq_operations.h>
-#include <KLocale>
+#include <KLocalizedString>
+#include <KIO/PasteJob>
+#include <KIO/Paste>
+#include <KIO/FileUndoManager>

 #include <KPropertiesDialog>
 
 #include "folderspanel.h"
 #include <KPropertiesDialog>
 
 #include "folderspanel.h"


@@ -38,6 +42,8 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>

+#include <QPointer>
+#include "global.h"

 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :


@@ -53,23 +59,25 @@ TreeViewContextMenu::~TreeViewContextMenu()
 
 void TreeViewContextMenu::open()
 {
 
 void TreeViewContextMenu::open()
 {

-    KMenu* popup = new KMenu(m_parent);
+    QMenu* popup = new QMenu(m_parent);

 
     if (!m_fileItem.isNull()) {
         KFileItemListProperties capabilities(KFileItemList() << m_fileItem);
 
         // insert 'Cut', 'Copy' and 'Paste'
 
     if (!m_fileItem.isNull()) {
         KFileItemListProperties capabilities(KFileItemList() << m_fileItem);
 
         // insert 'Cut', 'Copy' and 'Paste'

-        QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
+        QAction* cutAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-cut")), i18nc("@action:inmenu", "Cut"), this);

         cutAction->setEnabled(capabilities.supportsMoving());
         connect(cutAction, &QAction::triggered, this, &TreeViewContextMenu::cut);
 
         cutAction->setEnabled(capabilities.supportsMoving());
         connect(cutAction, &QAction::triggered, this, &TreeViewContextMenu::cut);
 

-        QAction* copyAction = new QAction(KIcon("edit-copy"), i18nc("@action:inmenu", "Copy"), this);
+        QAction* copyAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-copy")), i18nc("@action:inmenu", "Copy"), this);

         connect(copyAction, &QAction::triggered, this, &TreeViewContextMenu::copy);
 
         connect(copyAction, &QAction::triggered, this, &TreeViewContextMenu::copy);
 

-        const QPair<bool, QString> pasteInfo = KonqOperations::pasteInfo(m_fileItem.url());
-        QAction* pasteAction = new QAction(KIcon("edit-paste"), pasteInfo.second, this);
+        const QMimeData *mimeData = QApplication::clipboard()->mimeData();
+        bool canPaste;
+        const QString text = KIO::pasteActionText(mimeData, &canPaste, m_fileItem);
+        QAction* pasteAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-paste")), text, this);

         connect(pasteAction, &QAction::triggered, this, &TreeViewContextMenu::paste);
         connect(pasteAction, &QAction::triggered, this, &TreeViewContextMenu::paste);

-        pasteAction->setEnabled(pasteInfo.first);
+        pasteAction->setEnabled(canPaste);

 
         popup->addAction(cutAction);
         popup->addAction(copyAction);
 
         popup->addAction(cutAction);
         popup->addAction(copyAction);


@@ -79,18 +87,18 @@ void TreeViewContextMenu::open()
         // insert 'Rename'
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());
         // insert 'Rename'
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());

-        renameAction->setIcon(KIcon("edit-rename"));
+        renameAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));

         connect(renameAction, &QAction::triggered, this, &TreeViewContextMenu::rename);
         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'
         connect(renameAction, &QAction::triggered, this, &TreeViewContextMenu::rename);
         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'

-        KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
+        KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);

         KConfigGroup configGroup(globalConfig, "KDE");
         bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
 
         KConfigGroup configGroup(globalConfig, "KDE");
         bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
 

-        const KUrl url = m_fileItem.url();
+        const QUrl url = m_fileItem.url();

         if (url.isLocalFile()) {
         if (url.isLocalFile()) {

-            QAction* moveToTrashAction = new QAction(KIcon("user-trash"),
+            QAction* moveToTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("user-trash")),

                                                     i18nc("@action:inmenu", "Move to Trash"), this);
             const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
             moveToTrashAction->setEnabled(enableMoveToTrash);
                                                     i18nc("@action:inmenu", "Move to Trash"), this);
             const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
             moveToTrashAction->setEnabled(enableMoveToTrash);


@@ -101,7 +109,7 @@ void TreeViewContextMenu::open()
         }
 
         if (showDeleteCommand) {
         }
 
         if (showDeleteCommand) {

-            QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
+            QAction* deleteAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@action:inmenu", "Delete"), this);

             deleteAction->setEnabled(capabilities.supportsDeleting());
             connect(deleteAction, &QAction::triggered, this, &TreeViewContextMenu::deleteItem);
             popup->addAction(deleteAction);
             deleteAction->setEnabled(capabilities.supportsDeleting());
             connect(deleteAction, &QAction::triggered, this, &TreeViewContextMenu::deleteItem);
             popup->addAction(deleteAction);


@@ -117,6 +125,17 @@ void TreeViewContextMenu::open()
     popup->addAction(showHiddenFilesAction);
     connect(showHiddenFilesAction, &QAction::toggled, this, &TreeViewContextMenu::setShowHiddenFiles);
 
     popup->addAction(showHiddenFilesAction);
     connect(showHiddenFilesAction, &QAction::toggled, this, &TreeViewContextMenu::setShowHiddenFiles);
 

+    // insert 'Limit to Home Directory'
+    const QUrl url = m_fileItem.url();
+    const bool showLimitToHomeDirectory = url.isLocalFile() && (Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url));
+    if (showLimitToHomeDirectory) {
+        QAction* limitFoldersPanelToHomeAction = new QAction(i18nc("@action:inmenu", "Limit to Home Directory"), this);
+        limitFoldersPanelToHomeAction->setCheckable(true);
+        limitFoldersPanelToHomeAction->setChecked(m_parent->limitFoldersPanelToHome());
+        popup->addAction(limitFoldersPanelToHomeAction);
+        connect(limitFoldersPanelToHomeAction, &QAction::toggled, this, &TreeViewContextMenu::setLimitFoldersPanelToHome);
+    }
+

     // insert 'Automatic Scrolling'
     QAction* autoScrollingAction = new QAction(i18nc("@action:inmenu", "Automatic Scrolling"), this);
     autoScrollingAction->setCheckable(true);
     // insert 'Automatic Scrolling'
     QAction* autoScrollingAction = new QAction(i18nc("@action:inmenu", "Automatic Scrolling"), this);
     autoScrollingAction->setCheckable(true);


@@ -129,7 +148,7 @@ void TreeViewContextMenu::open()
     if (!m_fileItem.isNull()) {
         // insert 'Properties' entry
         QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
     if (!m_fileItem.isNull()) {
         // insert 'Properties' entry
         QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);

-        propertiesAction->setIcon(KIcon("document-properties"));
+        propertiesAction->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));

         connect(propertiesAction, &QAction::triggered, this, &TreeViewContextMenu::showProperties);
         popup->addAction(propertiesAction);
     }
         connect(propertiesAction, &QAction::triggered, this, &TreeViewContextMenu::showProperties);
         popup->addAction(propertiesAction);
     }


@@ -142,7 +161,7 @@ void TreeViewContextMenu::open()
         }
     }
 
         }
     }
 

-    QWeakPointer<KMenu> popupPtr = popup;
+    QPointer<QMenu> popupPtr = popup;

     popup->exec(QCursor::pos());
     if (popupPtr.data()) {
         popupPtr.data()->deleteLater();
     popup->exec(QCursor::pos());
     if (popupPtr.data()) {
         popupPtr.data()->deleteLater();


@@ -151,12 +170,13 @@ void TreeViewContextMenu::open()
 
 void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
 {
 
 void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
 {

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

     kdeUrls.append(m_fileItem.url());
     kdeUrls.append(m_fileItem.url());

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

     bool dummy;
     mostLocalUrls.append(m_fileItem.mostLocalUrl(dummy));
     bool dummy;
     mostLocalUrls.append(m_fileItem.mostLocalUrl(dummy));

-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, cut);
+    KIO::setClipboardDataCut(mimeData, cut);
+    KUrlMimeData::setUrls(kdeUrls, mostLocalUrls, mimeData);

 }
 
 void TreeViewContextMenu::cut()
 }
 
 void TreeViewContextMenu::cut()


@@ -175,7 +195,8 @@ void TreeViewContextMenu::copy()
 
 void TreeViewContextMenu::paste()
 {
 
 void TreeViewContextMenu::paste()
 {

-    KonqOperations::doPaste(m_parent, m_fileItem.url());
+    KIO::PasteJob *job = KIO::paste(QApplication::clipboard()->mimeData(), m_fileItem.url());
+    KJobWidgets::setWindow(job, m_parent);

 }
 
 void TreeViewContextMenu::rename()
 }
 
 void TreeViewContextMenu::rename()


@@ -185,12 +206,27 @@ void TreeViewContextMenu::rename()
 
 void TreeViewContextMenu::moveToTrash()
 {
 
 void TreeViewContextMenu::moveToTrash()
 {

-    KonqOperations::del(m_parent, KonqOperations::TRASH, KUrl::List() << m_fileItem.url());
+    const QList<QUrl> list{m_fileItem.url()};
+    KIO::JobUiDelegate uiDelegate;
+    uiDelegate.setWindow(m_parent);
+    if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
+        KIO::Job* job = KIO::trash(list);
+        KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl(QStringLiteral("trash:/")), job);
+        KJobWidgets::setWindow(job, m_parent);
+        job->uiDelegate()->setAutoErrorHandlingEnabled(true);
+    }

 }
 
 void TreeViewContextMenu::deleteItem()
 {
 }
 
 void TreeViewContextMenu::deleteItem()
 {

-    KonqOperations::del(m_parent, KonqOperations::DEL, KUrl::List() << m_fileItem.url());
+    const QList<QUrl> list{m_fileItem.url()};
+    KIO::JobUiDelegate uiDelegate;
+    uiDelegate.setWindow(m_parent);
+    if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) {
+        KIO::Job* job = KIO::del(list);
+        KJobWidgets::setWindow(job, m_parent);
+        job->uiDelegate()->setAutoErrorHandlingEnabled(true);
+    }

 }
 
 void TreeViewContextMenu::showProperties()
 }
 
 void TreeViewContextMenu::showProperties()


@@ -205,6 +241,11 @@ void TreeViewContextMenu::setShowHiddenFiles(bool show)
     m_parent->setShowHiddenFiles(show);
 }
 
     m_parent->setShowHiddenFiles(show);
 }
 

+void TreeViewContextMenu::setLimitFoldersPanelToHome(bool enable)
+{
+    m_parent->setLimitFoldersPanelToHome(enable);
+}
+

 void TreeViewContextMenu::setAutoScrolling(bool enable)
 {
     m_parent->setAutoScrolling(enable);
 void TreeViewContextMenu::setAutoScrolling(bool enable)
 {
     m_parent->setAutoScrolling(enable);