X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/862c090bf3be00b3016adfa5c7c0bd40ba409ca3..30161a7b3fe76578f43a61381c98a5ae475ed52a:/src/treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 29213ebcd..095117119 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -19,27 +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>
+#include "dolphinsettings.h"
 
-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)
 {
-    Q_ASSERT(mainWindow != 0);
-
     m_dirLister = new KDirLister();
     m_dirLister->setDirOnlyMode(true);
     m_dirLister->setAutoUpdate(true);
@@ -49,23 +52,24 @@ 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->setSelectionMode(QAbstractItemView::SingleSelection);
+    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_treeView->header()->hide();
+    m_proxyModel->setSorting(DolphinView::SortByName);
+    m_proxyModel->setSortOrder(Qt::AscendingOrder);
 
     connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
-            this, SLOT(updateViewUrl(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);
 }
 
@@ -75,69 +79,121 @@ TreeViewSidebarPage::~TreeViewSidebarPage()
     m_dirLister = 0;
 }
 
-void TreeViewSidebarPage::activeViewChanged()
+void TreeViewSidebarPage::setUrl(const KUrl& url)
 {
-    connectToActiveView();
-}
+    if (!url.isValid() || (url == m_url)) {
+        return;
+    }
 
-void TreeViewSidebarPage::showEvent(QShowEvent* event)
-{
-    SidebarPage::showEvent(event);
-    connectToActiveView();
-}
+    m_url = url;
 
-void TreeViewSidebarPage::updateSelection(const KUrl& url)
-{
     // adjust the root of the tree to the base bookmark
-    KUrl baseUrl = BookmarkSelector::baseBookmark(url).url();
+    KFilePlacesModel *placesModel = DolphinSettings::instance().placesModel();
+    const KUrl baseUrl = placesModel->url(placesModel->closestItem(url));
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
         m_dirLister->openUrl(baseUrl);
     }
 
-    // select the folder which contains the given url
-
-    // TODO: check how Konqi does it before reinventing the wheel. The directory
-    // must already be loaded _before_ the index can be retrieved by
-    // KDirModel::indexForItem().
+    // select the folder which contains the given URL
     QItemSelectionModel* selModel = m_treeView->selectionModel();
     selModel->clearSelection();
 
-    KFileItem item(S_IFDIR, KFileItem::Unknown, url);
-    const QModelIndex index = m_dirModel->indexForItem(item);
+    const QModelIndex index = m_dirModel->indexForUrl(url);
     if (index.isValid()) {
-        m_treeView->scrollTo(index);
-        m_treeView->setExpanded(index, true);
-
-        selModel->setCurrentIndex(index, QItemSelectionModel::Select);
+        // 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::updateViewUrl(const QModelIndex& index)
+void TreeViewSidebarPage::showEvent(QShowEvent* event)
 {
-    KFileItem* item = m_dirModel->itemForIndex(index);
-    if (item != 0) {
-        const KUrl& url = item->url();
-        mainWindow()->activeView()->setUrl(url);
+    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::connectToActiveView()
+void TreeViewSidebarPage::expandSelectionParent()
 {
-    const QWidget* parent = parentWidget();
-    if ((parent == 0) || parent->isHidden()) {
+    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;
     }
 
-    DolphinView* view = mainWindow()->activeView();
-    const KUrl& url = view->url();
+    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);
+        }
+    }
+}
 
-    m_dirLister->stop();
-    m_dirLister->openUrl(url);
-    connect(view, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updateSelection(const KUrl&)));
+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);
+    }
+}
 
-    updateSelection(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"