Ported to KBookmarkManager::closestBookmark - which even solves another TODO about...

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index b1fcc8daa87655d9a055d68dde1f9d09a8bd6fa8..523e21a7820206ec77024e6171973c60292b2944 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -19,11 +19,12 @@
 
 #include "treeviewsidebarpage.h"
 
-#include "bookmarkselector.h"
+#include "kbookmarkmanager.h"
 #include "dolphinmainwindow.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "sidebartreeview.h"
+#include "treeviewcontextmenu.h"
 
 #include <kdirlister.h>
 #include <kdirmodel.h>
@@ -33,23 +34,20 @@
 #include <QItemSelectionModel>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include "dolphinsettings.h"
 
 // TODO: currently when using a proxy model the strange effect occurs
 // that items get duplicated. Activate the following define to have the proxy
 // model:
 //#define USE_PROXY_MODEL
 
-TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
-                                         QWidget* parent) :
-    SidebarPage(mainWindow, parent),
+TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
+    SidebarPage(parent),
     m_dirLister(0),
     m_dirModel(0),
     m_proxyModel(0),
-    m_treeView(0),
-    m_selectedUrl()
+    m_treeView(0)
 {
-    Q_ASSERT(mainWindow != 0);
-
     m_dirLister = new KDirLister();
     m_dirLister->setDirOnlyMode(true);
     m_dirLister->setAutoUpdate(true);
@@ -66,22 +64,23 @@ TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dirModel);
 
-    m_treeView = new SidebarTreeView(mainWindow, this);
+    m_treeView = new SidebarTreeView(this);
     m_treeView->setModel(m_proxyModel);
 
     m_proxyModel->setSorting(DolphinView::SortByName);
     m_proxyModel->setSortOrder(Qt::Ascending);
 #else
-    m_treeView = new SidebarTreeView(mainWindow, this);
+    m_treeView = new SidebarTreeView(this);
     m_treeView->setModel(m_dirModel);
 #endif
 
     connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
             this, SLOT(updateActiveView(const QModelIndex&)));
-    connect(m_treeView, SIGNAL(doubleClicked(const QModelIndex&)),
-            this, SLOT(slotDoubleClicked(const QModelIndex&)));
+    connect(m_treeView, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&)),
+            this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&)));
 
     QVBoxLayout* layout = new QVBoxLayout(this);
+    layout->setMargin(0);
     layout->addWidget(m_treeView);
 }
 
@@ -91,27 +90,17 @@ TreeViewSidebarPage::~TreeViewSidebarPage()
     m_dirLister = 0;
 }
 
-void TreeViewSidebarPage::activeViewChanged()
-{
-    connectToActiveView();
-}
-
-void TreeViewSidebarPage::showEvent(QShowEvent* event)
-{
-    SidebarPage::showEvent(event);
-    connectToActiveView();
-}
-
-void TreeViewSidebarPage::updateSelection(const KUrl& url)
+void TreeViewSidebarPage::setUrl(const KUrl& url)
 {
-    if (!url.isValid() || (url == m_selectedUrl)) {
+    if (!url.isValid() || (url == m_url)) {
         return;
     }
 
-    m_selectedUrl = url;
+    m_url = url;
 
     // adjust the root of the tree to the base bookmark
-    const KUrl baseUrl = BookmarkSelector::baseBookmark(url).url();
+    KBookmarkManager* bookmarkManager = DolphinSettings::instance().bookmarkManager();
+    const KUrl baseUrl = bookmarkManager->root().closestBookmark(url).url();
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
         m_dirLister->openUrl(baseUrl);
@@ -121,9 +110,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
@@ -148,6 +135,34 @@ void TreeViewSidebarPage::updateSelection(const KUrl& url)
             parentUrl = parentUrl.upUrl();
         }
     }
+
+}
+
+void TreeViewSidebarPage::showEvent(QShowEvent* event)
+{
+    SidebarPage::showEvent(event);
+}
+
+void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
+{
+    SidebarPage::contextMenuEvent(event);
+
+    const QModelIndex index = m_treeView->indexAt(event->pos());
+    if (!index.isValid()) {
+        // only open a context menu above a directory item
+        return;
+    }
+
+#if defined(USE_PROXY_MODEL)
+    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
+    KFileItem* item = m_dirModel->itemForIndex(dirModelIndex);
+#else
+    KFileItem* item = m_dirModel->itemForIndex(index);
+#endif
+
+    emit changeSelection(KFileItemList());
+    TreeViewContextMenu contextMenu(this, item);
+    contextMenu.open();
 }
 
 void TreeViewSidebarPage::expandSelectionParent()
@@ -156,8 +171,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_url.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);
@@ -167,8 +186,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_url);
         if (index.isValid()) {
 #if defined(USE_PROXY_MODEL)
             proxyIndex = m_proxyModel->mapFromSource(index);
@@ -182,7 +200,6 @@ void TreeViewSidebarPage::expandSelectionParent()
             QItemSelectionModel* selModel = m_treeView->selectionModel();
             selModel->setCurrentIndex(index, QItemSelectionModel::Select);
 #endif
-
         }
     }
 }
@@ -197,24 +214,25 @@ void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
 #endif
     if (item != 0) {
         const KUrl& url = item->url();
-        mainWindow()->activeView()->setUrl(url);
+        emit changeUrl(url);
     }
 }
 
-void TreeViewSidebarPage::connectToActiveView()
+void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
+                                   const QModelIndex& index)
 {
-    const QWidget* parent = parentWidget();
-    if ((parent == 0) || parent->isHidden()) {
-        return;
+    if (index.isValid()) {
+#if defined(USE_PROXY_MODEL)
+        const QModelIndex& dirIndex = m_proxyModel->mapToSource(index);
+        KFileItem* item = m_dirModel->itemForIndex(dirIndex);
+#else
+        KFileItem* item = m_dirModel->itemForIndex(index);
+#endif
+        Q_ASSERT(item != 0);
+        if (item->isDir()) {
+            emit urlsDropped(urls, item->url());
+        }
     }
-
-    const DolphinView* view = mainWindow()->activeView();
-    const KUrl& url = view->url();
-
-    connect(view, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updateSelection(const KUrl&)));
-
-    updateSelection(url);
 }
 
 #include "treeviewsidebarpage.moc"