use QToolButton instead of QPushButton (patch submitted by Dominik Haumann)

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 32edef05e458e2d6e02e7b58e7dc89b3952070e4..3e4acdc435fb96d6bc66afc94b8ea7f3be0a28ef 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -26,6 +26,8 @@
 #include "kdirlister.h"
 #include "kdirmodel.h"
 
+#include <QHeaderView>
+#include <QItemSelectionModel>
 #include <QTreeView>
 #include <QVBoxLayout>
 
@@ -34,7 +36,8 @@ TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
     SidebarPage(mainWindow, parent),
     m_dirLister(0),
     m_dirModel(0),
-    m_treeView(0)
+    m_treeView(0),
+    m_selectedUrl()
 {
     Q_ASSERT(mainWindow != 0);
 
@@ -50,6 +53,8 @@ TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
 
     m_treeView = new QTreeView(this);
     m_treeView->setModel(m_dirModel);
+    m_treeView->setSelectionMode(QAbstractItemView::SingleSelection);
+    m_treeView->setEditTriggers(QAbstractItemView::NoEditTriggers);
 
     // hide all columns except of the 'Name' column
     m_treeView->hideColumn(KDirModel::Size);
@@ -57,11 +62,15 @@ TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
     m_treeView->hideColumn(KDirModel::Permissions);
     m_treeView->hideColumn(KDirModel::Owner);
     m_treeView->hideColumn(KDirModel::Group);
+    m_treeView->header()->hide();
+
+    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);
-
-    connectToActiveView();
 }
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
@@ -75,24 +84,99 @@ void TreeViewSidebarPage::activeViewChanged()
     connectToActiveView();
 }
 
-void TreeViewSidebarPage::updatePosition(const KUrl& url)
+void TreeViewSidebarPage::showEvent(QShowEvent* event)
+{
+    SidebarPage::showEvent(event);
+    connectToActiveView();
+}
+
+void TreeViewSidebarPage::updateSelection(const KUrl& url)
 {
-    KUrl baseUrl = BookmarkSelector::baseBookmark(url).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 KFileItem item(S_IFDIR, KFileItem::Unknown, url);
+    const QModelIndex index = m_dirModel->indexForItem(item);
+    if (index.isValid()) {
+        // the item with the given URL is already part of the model
+        m_treeView->scrollTo(index);
+        selModel->setCurrentIndex(index, 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 != 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()) {
+        m_treeView->setExpanded(index, true);
+
+        // 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()) {
+            m_treeView->scrollTo(index);
+
+            QItemSelectionModel* selModel = m_treeView->selectionModel();
+            selModel->setCurrentIndex(index, QItemSelectionModel::Select);
+        }
+    }
+}
+
+void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
+{
+    const KFileItem* item = m_dirModel->itemForIndex(index);
+    if (item != 0) {
+        const KUrl& url = item->url();
+        mainWindow()->activeView()->setUrl(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"