Merge remote-tracking branch 'origin/master' into frameworks

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

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index b15badde1213333adfa3155969d608110994af6d..3f69ac22a3bd415880b9b0f04f6c5076703d83cb 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -61,16 +61,15 @@ void TreeViewContextMenu::open()
         // insert 'Cut', 'Copy' and 'Paste'
         QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
         cutAction->setEnabled(capabilities.supportsMoving());
         // insert 'Cut', 'Copy' and 'Paste'
         QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
         cutAction->setEnabled(capabilities.supportsMoving());

-        connect(cutAction, SIGNAL(triggered()), this, SLOT(cut()));
+        connect(cutAction, &QAction::triggered, this, &TreeViewContextMenu::cut);

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

-        connect(copyAction, SIGNAL(triggered()), this, SLOT(copy()));
+        connect(copyAction, &QAction::triggered, this, &TreeViewContextMenu::copy);

 
 

-        QAction* pasteAction = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste"), this);
-        const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-        const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData);
-        connect(pasteAction, SIGNAL(triggered()), this, SLOT(paste()));
-        pasteAction->setEnabled(!pasteData.isEmpty() && capabilities.supportsWriting());
+        const QPair<bool, QString> pasteInfo = KonqOperations::pasteInfo(m_fileItem.url());
+        QAction* pasteAction = new QAction(KIcon("edit-paste"), pasteInfo.second, this);
+        connect(pasteAction, &QAction::triggered, this, &TreeViewContextMenu::paste);
+        pasteAction->setEnabled(pasteInfo.first);

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


@@ -81,7 +80,7 @@ void TreeViewContextMenu::open()
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());
         renameAction->setIcon(KIcon("edit-rename"));
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());
         renameAction->setIcon(KIcon("edit-rename"));

-        connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
+        connect(renameAction, &QAction::triggered, this, &TreeViewContextMenu::rename);

         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'
         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'


@@ -95,7 +94,7 @@ void TreeViewContextMenu::open()
                                                     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);

-            connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
+            connect(moveToTrashAction, &QAction::triggered, this, &TreeViewContextMenu::moveToTrash);

             popup->addAction(moveToTrashAction);
         } else {
             showDeleteCommand = true;
             popup->addAction(moveToTrashAction);
         } else {
             showDeleteCommand = true;


@@ -104,7 +103,7 @@ void TreeViewContextMenu::open()
         if (showDeleteCommand) {
             QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
             deleteAction->setEnabled(capabilities.supportsDeleting());
         if (showDeleteCommand) {
             QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
             deleteAction->setEnabled(capabilities.supportsDeleting());

-            connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItem()));
+            connect(deleteAction, &QAction::triggered, this, &TreeViewContextMenu::deleteItem);

             popup->addAction(deleteAction);
         }
 
             popup->addAction(deleteAction);
         }
 


@@ -116,7 +115,7 @@ void TreeViewContextMenu::open()
     showHiddenFilesAction->setCheckable(true);
     showHiddenFilesAction->setChecked(m_parent->showHiddenFiles());
     popup->addAction(showHiddenFilesAction);
     showHiddenFilesAction->setCheckable(true);
     showHiddenFilesAction->setChecked(m_parent->showHiddenFiles());
     popup->addAction(showHiddenFilesAction);

-    connect(showHiddenFilesAction, SIGNAL(toggled(bool)), this, SLOT(setShowHiddenFiles(bool)));
+    connect(showHiddenFilesAction, &QAction::toggled, this, &TreeViewContextMenu::setShowHiddenFiles);

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


@@ -125,13 +124,13 @@ void TreeViewContextMenu::open()
     // TODO: Temporary disabled. Horizontal autoscrolling will be implemented later either
     // in KItemViews or manually as part of the FoldersPanel
     //popup->addAction(autoScrollingAction);
     // TODO: Temporary disabled. Horizontal autoscrolling will be implemented later either
     // in KItemViews or manually as part of the FoldersPanel
     //popup->addAction(autoScrollingAction);

-    connect(autoScrollingAction, SIGNAL(toggled(bool)), this, SLOT(setAutoScrolling(bool)));
+    connect(autoScrollingAction, &QAction::toggled, this, &TreeViewContextMenu::setAutoScrolling);

 
     if (!m_fileItem.isNull()) {
         // insert 'Properties' entry
         QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
         propertiesAction->setIcon(KIcon("document-properties"));
 
     if (!m_fileItem.isNull()) {
         // insert 'Properties' entry
         QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
         propertiesAction->setIcon(KIcon("document-properties"));

-        connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));
+        connect(propertiesAction, &QAction::triggered, this, &TreeViewContextMenu::showProperties);

         popup->addAction(propertiesAction);
     }
 
         popup->addAction(propertiesAction);
     }
 


@@ -176,17 +175,7 @@ void TreeViewContextMenu::copy()
 
 void TreeViewContextMenu::paste()
 {
 
 void TreeViewContextMenu::paste()
 {

-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    const KUrl::List source = KUrl::List::fromMimeData(mimeData);
-    const KUrl& dest = m_fileItem.url();
-    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
-        KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest);
-        clipboard->clear();
-    } else {
-        KonqOperations::copy(m_parent, KonqOperations::COPY, source, dest);
-    }
+    KonqOperations::doPaste(m_parent, m_fileItem.url());

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