Converted to the standard mimetype names

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 65b0687e8e619c7ad3da8f7d54f4efeb38dc34f7..42e07c38f6fbec56b481ea7374cc881d9eb59efc 100644 (file)
--- 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();
 }
 
@@ -173,9 +148,7 @@ void TreeViewSidebarPage::updateSelection(const KUrl& url)
     QItemSelectionModel* selModel = m_treeView->selectionModel();
     selModel->clearSelection();
 
-    const KFileItem item(S_IFDIR, KFileItem::Unknown, url);
-
-    const QModelIndex index = m_dirModel->indexForItem(item);
+    const QModelIndex index = m_dirModel->indexForUrl(url);
     if (index.isValid()) {
 #if defined(USE_PROXY_MODEL)
         // the item with the given URL is already part of the model
@@ -208,8 +181,12 @@ void TreeViewSidebarPage::expandSelectionParent()
                this, SLOT(expandSelectionParent()));
 
     // expand the parent folder of the selected item
-    const KFileItem parentItem(S_IFDIR, KFileItem::Unknown, m_selectedUrl.upUrl());
-    QModelIndex index = m_dirModel->indexForItem(parentItem);
+    KUrl parentUrl = m_selectedUrl.upUrl();
+    if (!m_dirLister->url().isParentOf(parentUrl)) {
+        return;
+    }
+
+    QModelIndex index = m_dirModel->indexForUrl(parentUrl);
     if (index.isValid()) {
 #if defined(USE_PROXY_MODEL)
         QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
@@ -219,8 +196,7 @@ void TreeViewSidebarPage::expandSelectionParent()
 #endif
 
         // select the item and assure that the item is visible
-        const KFileItem selectedItem(S_IFDIR, KFileItem::Unknown, m_selectedUrl);
-        index = m_dirModel->indexForItem(selectedItem);
+        index = m_dirModel->indexForUrl(m_selectedUrl);
         if (index.isValid()) {
 #if defined(USE_PROXY_MODEL)
             proxyIndex = m_proxyModel->mapFromSource(index);
@@ -234,7 +210,6 @@ void TreeViewSidebarPage::expandSelectionParent()
             QItemSelectionModel* selModel = m_treeView->selectionModel();
             selModel->setCurrentIndex(index, QItemSelectionModel::Select);
 #endif
-
         }
     }
 }