X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e26ba53471ea902d18e59a4a8fc52ccdf4c7b4ea..2060fa8d4676fb2d5116830c304db8fdb556d959:/src/treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 32edef05e..ef75baf95 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -19,25 +19,30 @@
 
 #include "treeviewsidebarpage.h"
 
-#include "bookmarkselector.h"
 #include "dolphinmainwindow.h"
+#include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
+#include "sidebartreeview.h"
+#include "treeviewcontextmenu.h"
 
-#include "kdirlister.h"
-#include "kdirmodel.h"
+#include <kfileplacesmodel.h>
+#include <kdirlister.h>
+#include <kdirmodel.h>
+#include <kfileitem.h>
 
+#include <QHeaderView>
+#include <QItemSelectionModel>
 #include <QTreeView>
 #include <QVBoxLayout>
-
-TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
-                                         QWidget* parent) :
-    SidebarPage(mainWindow, parent),
-    m_dirLister(0),
-    m_dirModel(0),
-    m_treeView(0)
+#include "dolphinsettings.h"
+
+TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
+        SidebarPage(parent),
+        m_dirLister(0),
+        m_dirModel(0),
+        m_proxyModel(0),
+        m_treeView(0)
 {
-    Q_ASSERT(mainWindow != 0);
-
     m_dirLister = new KDirLister();
     m_dirLister->setDirOnlyMode(true);
     m_dirLister->setAutoUpdate(true);
@@ -47,21 +52,25 @@ TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
 
     m_dirModel = new KDirModel();
     m_dirModel->setDirLister(m_dirLister);
+    m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
+
+    m_proxyModel = new DolphinSortFilterProxyModel(this);
+    m_proxyModel->setSourceModel(m_dirModel);
 
-    m_treeView = new QTreeView(this);
-    m_treeView->setModel(m_dirModel);
+    m_treeView = new SidebarTreeView(this);
+    m_treeView->setModel(m_proxyModel);
 
-    // hide all columns except of the 'Name' column
-    m_treeView->hideColumn(KDirModel::Size);
-    m_treeView->hideColumn(KDirModel::ModifiedTime);
-    m_treeView->hideColumn(KDirModel::Permissions);
-    m_treeView->hideColumn(KDirModel::Owner);
-    m_treeView->hideColumn(KDirModel::Group);
+    m_proxyModel->setSorting(DolphinView::SortByName);
+    m_proxyModel->setSortOrder(Qt::AscendingOrder);
+
+    connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
+            this, SLOT(updateActiveView(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);
-
-    connectToActiveView();
 }
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
@@ -70,29 +79,126 @@ TreeViewSidebarPage::~TreeViewSidebarPage()
     m_dirLister = 0;
 }
 
-void TreeViewSidebarPage::activeViewChanged()
+void TreeViewSidebarPage::setUrl(const KUrl& url)
 {
-    connectToActiveView();
-}
+    if (!url.isValid() || (url == m_url)) {
+        return;
+    }
+
+    m_url = url;
+
+    // adjust the root of the tree to the base bookmark
+    KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
+    KUrl baseUrl = placesModel->url(placesModel->closestItem(url));
+    if (!baseUrl.isValid()) {
+        // it's possible that no closest item is available and hence an
+        // empty URL is returned
+        baseUrl = url;
+    }
 
-void TreeViewSidebarPage::updatePosition(const KUrl& url)
-{
-    KUrl baseUrl = BookmarkSelector::baseBookmark(url).url();
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
         m_dirLister->openUrl(baseUrl);
     }
 
-    // TODO: open sub folders to be synchronous to 'url'
+    // select the folder which contains the given URL
+    QItemSelectionModel* selModel = m_treeView->selectionModel();
+    selModel->clearSelection();
+
+    const QModelIndex index = m_dirModel->indexForUrl(url);
+    if (index.isValid()) {
+        // the item with the given URL is already part of the model
+        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
+        m_treeView->scrollTo(proxyIndex);
+        selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
+    } else {
+        // The item with the given URL is not loaded by the model yet. Iterate
+        // backward to the base URL and trigger the loading of the items for
+        // each hierarchy level.
+        connect(m_dirLister, SIGNAL(completed()),
+                this, SLOT(expandSelectionParent()));
+
+        KUrl parentUrl = url.upUrl();
+        while (!parentUrl.isParentOf(baseUrl)) {
+            m_dirLister->openUrl(parentUrl, true, false);
+            parentUrl = parentUrl.upUrl();
+        }
+    }
+
 }
 
-void TreeViewSidebarPage::connectToActiveView()
+void TreeViewSidebarPage::showEvent(QShowEvent* event)
 {
-    DolphinView* view = mainWindow()->activeView();
-    m_dirLister->stop();
-    m_dirLister->openUrl(view->url());
-    connect(view, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updatePosition(const KUrl&)));
+    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;
+    }
+
+    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
+    KFileItem* item = m_dirModel->itemForIndex(dirModelIndex);
+
+    emit changeSelection(KFileItemList());
+    TreeViewContextMenu contextMenu(this, item);
+    contextMenu.open();
+}
+
+void TreeViewSidebarPage::expandSelectionParent()
+{
+    disconnect(m_dirLister, SIGNAL(completed()),
+               this, SLOT(expandSelectionParent()));
+
+    // expand the parent folder of the selected item
+    KUrl parentUrl = m_url.upUrl();
+    if (!m_dirLister->url().isParentOf(parentUrl)) {
+        return;
+    }
+
+    QModelIndex index = m_dirModel->indexForUrl(parentUrl);
+    if (index.isValid()) {
+        QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
+        m_treeView->setExpanded(proxyIndex, true);
+
+        // select the item and assure that the item is visible
+        index = m_dirModel->indexForUrl(m_url);
+        if (index.isValid()) {
+            proxyIndex = m_proxyModel->mapFromSource(index);
+            m_treeView->scrollTo(proxyIndex);
+
+            QItemSelectionModel* selModel = m_treeView->selectionModel();
+            selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
+        }
+    }
+}
+
+void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
+{
+    const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
+    const KFileItem* item = m_dirModel->itemForIndex(dirIndex);
+    if (item != 0) {
+        const KUrl& url = item->url();
+        emit changeUrl(url);
+    }
+}
+
+void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
+                                   const QModelIndex& index)
+{
+    if (index.isValid()) {
+        const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
+        KFileItem* item = m_dirModel->itemForIndex(dirIndex);
+        Q_ASSERT(item != 0);
+        if (item->isDir()) {
+            emit urlsDropped(urls, item->url());
+        }
+    }
 }
 
 #include "treeviewsidebarpage.moc"