Create a SidebarTreeView which will include support for drag & drop in later releases...

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index f57146684e9a62448241f6c1977725449b2e1535..b1fcc8daa87655d9a055d68dde1f9d09a8bd6fa8 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -19,21 +19,34 @@
 
 #include "treeviewsidebarpage.h"
 
 
 #include "treeviewsidebarpage.h"
 

+#include "bookmarkselector.h"

 #include "dolphinmainwindow.h"
 #include "dolphinmainwindow.h"

+#include "dolphinsortfilterproxymodel.h"

 #include "dolphinview.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>
 
 #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),
 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);
 
 {
     Q_ASSERT(mainWindow != 0);
 


@@ -46,21 +59,30 @@ TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
 
     m_dirModel = new KDirModel();
     m_dirModel->setDirLister(m_dirLister);
 
     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);
     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(doubleClicked(const QModelIndex&)),
+            this, SLOT(slotDoubleClicked(const QModelIndex&)));

 
     QVBoxLayout* layout = new QVBoxLayout(this);
     layout->addWidget(m_treeView);
 
     QVBoxLayout* layout = new QVBoxLayout(this);
     layout->addWidget(m_treeView);

-
-    connectToActiveView();

 }
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 }
 
 TreeViewSidebarPage::~TreeViewSidebarPage()


@@ -74,16 +96,125 @@ void TreeViewSidebarPage::activeViewChanged()
     connectToActiveView();
 }
 
     connectToActiveView();
 }
 

-void TreeViewSidebarPage::updatePosition(const KUrl& url)
+void TreeViewSidebarPage::showEvent(QShowEvent* event)
+{
+    SidebarPage::showEvent(event);
+    connectToActiveView();
+}
+
+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);
+    }
+
+    // select the folder which contains the given URL
+    QItemSelectionModel* selModel = m_treeView->selectionModel();
+    selModel->clearSelection();
+
+    const KFileItem item(S_IFDIR, KFileItem::Unknown, url);
+
+    const QModelIndex index = m_dirModel->indexForItem(item);
+    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
+    const KFileItem parentItem(S_IFDIR, KFileItem::Unknown, m_selectedUrl.upUrl());
+    QModelIndex index = m_dirModel->indexForItem(parentItem);
+    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
+        const KFileItem selectedItem(S_IFDIR, KFileItem::Unknown, m_selectedUrl);
+        index = m_dirModel->indexForItem(selectedItem);
+        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::connectToActiveView()
 {
 }
 
 void TreeViewSidebarPage::connectToActiveView()
 {

-    DolphinView* view = mainWindow()->activeView();
-    m_dirLister->openUrl(view->url(), true);
+    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&)),
     connect(view, SIGNAL(urlChanged(const KUrl&)),

-            this, SLOT(updatePosition(const KUrl&)));
+            this, SLOT(updateSelection(const KUrl&)));
+
+    updateSelection(url);

 }
 
 #include "treeviewsidebarpage.moc"
 }
 
 #include "treeviewsidebarpage.moc"