X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1cdb64a12bf5e6f3b97d38992799ba6bfbb06ef5..397b9bd4502a5aeab7da54dfcce0e4faa4a59ee4:/src/treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 65b0687e8..4dddeae5c 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -108,12 +108,6 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
 {
     SidebarPage::contextMenuEvent(event);
 
-    // TODO: temporary deactivate the following code, as the wrong
-    // selection of cut/copy/paste actions is very confusing:
-    return;
-
-    KFileItem* item = 0;
-
     const QModelIndex index = m_treeView->indexAt(event->pos());
     if (!index.isValid()) {
         // only open a context menu above a directory item
@@ -122,35 +116,16 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
 
 #if defined(USE_PROXY_MODEL)
     const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
-    item = m_dirModel->itemForIndex(dirModelIndex);
-#else
-    item = m_dirModel->itemForIndex(index);
-#endif
-
-#if defined(USE_PROXY_MODEL)
-    const QItemSelection selection = m_proxyModel->mapSelectionToSource(
-                                                   m_treeView->selectionModel()->selection());
+    KFileItem* item = m_dirModel->itemForIndex(dirModelIndex);
 #else
-    const QItemSelection selection = m_treeView->selectionModel()->selection();
+    KFileItem* item = m_dirModel->itemForIndex(index);
 #endif
 
-    KFileItemList selectedItems;
-
-    const QModelIndexList indexList = selection.indexes();
-    QModelIndexList::const_iterator end = indexList.end();
-    for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
-        Q_ASSERT((*it).isValid());
-
-        KFileItem* item = m_dirModel->itemForIndex(*it);
-        if (item != 0) {
-            selectedItems.append(item);
-        }
-    }
-
+    mainWindow()->activeView()->clearSelection();
     DolphinContextMenu contextMenu(mainWindow(),
                                    item,
                                    m_dirLister->url(),
-                                   selectedItems);
+                                   DolphinContextMenu::SidebarView);
     contextMenu.open();
 }