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

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 32edef05e..42e07c38f 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -20,21 +20,34 @@
 #include "treeviewsidebarpage.h"
 
 #include "bookmarkselector.h"
+#include "dolphincontextmenu.h"
 #include "dolphinmainwindow.h"
+#include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
+#include "sidebartreeview.h"
 
-#include "kdirlister.h"
-#include "kdirmodel.h"
+#include <kdirlister.h>
+#include <kdirmodel.h>
+#include <kfileitem.h>
 
+#include <QHeaderView>
+#include <QItemSelectionModel>
 #include <QTreeView>
 #include <QVBoxLayout>
 
+// 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),
     m_dirLister(0),
     m_dirModel(0),
-    m_treeView(0)
+    m_proxyModel(0),
+    m_treeView(0),
+    m_selectedUrl()
 {
     Q_ASSERT(mainWindow != 0);
 
@@ -47,21 +60,31 @@ TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
 
     m_dirModel = new KDirModel();
     m_dirModel->setDirLister(m_dirLister);
+    m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
+
+
+#if defined(USE_PROXY_MODEL)
+    m_proxyModel = new DolphinSortFilterProxyModel(this);
+    m_proxyModel->setSourceModel(m_dirModel);
 
-    m_treeView = new QTreeView(this);
+    m_treeView = new SidebarTreeView(mainWindow, 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->setModel(m_dirModel);
+#endif
 
-    // 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);
+    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()
@@ -75,24 +98,167 @@ void TreeViewSidebarPage::activeViewChanged()
     connectToActiveView();
 }
 
-void TreeViewSidebarPage::updatePosition(const KUrl& url)
+void TreeViewSidebarPage::showEvent(QShowEvent* event)
 {
-    KUrl baseUrl = BookmarkSelector::baseBookmark(url).url();
+    SidebarPage::showEvent(event);
+    connectToActiveView();
+}
+
+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
+
+    mainWindow()->activeView()->clearSelection();
+    DolphinContextMenu contextMenu(mainWindow(),
+                                   item,
+                                   m_dirLister->url(),
+                                   DolphinContextMenu::SidebarView);
+    contextMenu.open();
+}
+
+void TreeViewSidebarPage::updateSelection(const KUrl& url)
+{
+    if (!url.isValid() || (url == m_selectedUrl)) {
+        return;
+    }
+
+    m_selectedUrl = url;
+
+    // adjust the root of the tree to the base bookmark
+    const 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()) {
+#if defined(USE_PROXY_MODEL)
+        // 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
+        m_treeView->scrollTo(index);
+        selModel->setCurrentIndex(index, QItemSelectionModel::Select);
+#endif
+    }
+    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::expandSelectionParent()
+{
+    disconnect(m_dirLister, SIGNAL(completed()),
+               this, SLOT(expandSelectionParent()));
+
+    // expand the parent folder of the selected item
+    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);
+        m_treeView->setExpanded(proxyIndex, true);
+#else
+        m_treeView->setExpanded(index, true);
+#endif
+
+        // select the item and assure that the item is visible
+        index = m_dirModel->indexForUrl(m_selectedUrl);
+        if (index.isValid()) {
+#if defined(USE_PROXY_MODEL)
+            proxyIndex = m_proxyModel->mapFromSource(index);
+            m_treeView->scrollTo(proxyIndex);
+
+            QItemSelectionModel* selModel = m_treeView->selectionModel();
+            selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
+#else
+            m_treeView->scrollTo(index);
+
+            QItemSelectionModel* selModel = m_treeView->selectionModel();
+            selModel->setCurrentIndex(index, QItemSelectionModel::Select);
+#endif
+        }
+    }
+}
+
+void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
+{
+#if defined(USE_PROXY_MODEL)
+    const QModelIndex& dirIndex = m_proxyModel->mapToSource(index);
+    const KFileItem* item = m_dirModel->itemForIndex(dirIndex);
+#else
+    const KFileItem* item = m_dirModel->itemForIndex(index);
+#endif
+    if (item != 0) {
+        const KUrl& url = item->url();
+        mainWindow()->activeView()->setUrl(url);
+    }
+}
+
+void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
+                                   const QModelIndex& index)
+{
+    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()) {
+            mainWindow()->dropUrls(urls, item->url());
+        }
+    }
 }
 
 void TreeViewSidebarPage::connectToActiveView()
 {
-    DolphinView* view = mainWindow()->activeView();
-    m_dirLister->stop();
-    m_dirLister->openUrl(view->url());
+    const QWidget* parent = parentWidget();
+    if ((parent == 0) || parent->isHidden()) {
+        return;
+    }
+
+    const DolphinView* view = mainWindow()->activeView();
+    const KUrl& url = view->url();
+
     connect(view, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updatePosition(const KUrl&)));
+            this, SLOT(updateSelection(const KUrl&)));
+
+    updateSelection(url);
 }
 
 #include "treeviewsidebarpage.moc"