differ between pasting one folder, pasting one file and pasting n items

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 070db08ef1e9fac04153e3375a7c6735b363570f..0ea761d2d1ede3e5758f1c90c0330d89dbcc6de6 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -273,7 +273,7 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
     } else {
         // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted]
         kDebug() << "LMB";
-        emit m_extension->openUrlRequest(item.url(), args, browserArgs);
+        emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs);
     }
 }
 
@@ -327,7 +327,10 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
             editActions.append(actionCollection()->action("delete"));
         actionGroups.insert("editactions", editActions);
 
-        KFileItemList items; items.append(item);
+        // TODO: We should change the signature of the slots (and signals) for being able
+        //       to tell for which items we want a popup.
+        KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()
+                                                               : KFileItemList() << item);
         emit m_extension->popupMenu(QCursor::pos(),
                                     items,
                                     KParts::OpenUrlArguments(),