diff options
Diffstat (limited to 'src/treeviewsidebarpage.cpp')
| -rw-r--r-- | src/treeviewsidebarpage.cpp | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 65b0687e8..b7c1f1f53 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,15 @@ 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); - } - } - DolphinContextMenu contextMenu(mainWindow(), item, m_dirLister->url(), - selectedItems); + DolphinContextMenu::SidebarView); contextMenu.open(); } |
