use "Sort by" instead of "Sort By"

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index e60384bd904cc40c6831c7483cc18448e4ff3066..1bcee405dd508ee3f350a91e85445bb1037216d6 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -19,58 +19,31 @@
 
 #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 "dolphinsettings.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 <QItemSelection>

 #include <QTreeView>
 #include <QTreeView>

-#include <QVBoxLayout>
+#include <QBoxLayout>
+#include <QModelIndex>

 
 

-TreeViewSidebarPage::TreeViewSidebarPage(DolphinMainWindow* mainWindow,
-                                         QWidget* parent) :
-    SidebarPage(mainWindow, parent),
+TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
+    SidebarPage(parent),

     m_dirLister(0),
     m_dirModel(0),
     m_dirLister(0),
     m_dirModel(0),

+    m_proxyModel(0),

     m_treeView(0),
     m_treeView(0),

-    m_selectedUrl()
+    m_leafDir()

 {
 {

-    Q_ASSERT(mainWindow != 0);
-
-    m_dirLister = new KDirLister();
-    m_dirLister->setDirOnlyMode(true);
-    m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(this);
-    m_dirLister->setDelayedMimeTypes(true);
-    m_dirLister->setAutoErrorHandlingEnabled(false, this);
-
-    m_dirModel = new KDirModel();
-    m_dirModel->setDirLister(m_dirLister);
-
-    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);
-    m_treeView->hideColumn(KDirModel::ModifiedTime);
-    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);

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


@@ -79,56 +52,90 @@ TreeViewSidebarPage::~TreeViewSidebarPage()
     m_dirLister = 0;
 }
 
     m_dirLister = 0;
 }
 

-void TreeViewSidebarPage::activeViewChanged()
+QSize TreeViewSidebarPage::sizeHint() const

 {
 {

-    connectToActiveView();
+    QSize size = SidebarPage::sizeHint();
+    size.setWidth(200);
+    return size;

 }
 
 }
 

-void TreeViewSidebarPage::showEvent(QShowEvent* event)
+void TreeViewSidebarPage::setUrl(const KUrl& url)

 {
 {

-    SidebarPage::showEvent(event);
-    connectToActiveView();
+    if (!url.isValid() || (url == SidebarPage::url())) {
+        return;
+    }
+
+    SidebarPage::setUrl(url);
+    if (m_dirLister != 0) {
+        loadTree(url);
+    }

 }
 
 }
 

-void TreeViewSidebarPage::updateSelection(const KUrl& url)
+void TreeViewSidebarPage::showEvent(QShowEvent* event)

 {
 {

-    if (!url.isValid() || (url == m_selectedUrl)) {
+    if (event->spontaneous()) {
+        SidebarPage::showEvent(event);

         return;
     }
 
         return;
     }
 

-    m_selectedUrl = url;
+    if (m_dirLister == 0) {
+        // Postpone the creating of the dir lister to the first show event.
+        // This assures that no performance and memory overhead is given when the TreeView is not
+        // used at all (see TreeViewSidebarPage::setUrl()).
+        m_dirLister = new KDirLister();
+        m_dirLister->setDirOnlyMode(true);
+        m_dirLister->setAutoUpdate(true);
+        m_dirLister->setMainWindow(this);
+        m_dirLister->setDelayedMimeTypes(true);
+        m_dirLister->setAutoErrorHandlingEnabled(false, this);

 
 

-    // 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);
-    }
+        Q_ASSERT(m_dirModel == 0);
+        m_dirModel = new KDirModel(this);
+        m_dirModel->setDirLister(m_dirLister);
+        m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
+        connect(m_dirModel, SIGNAL(expand(const QModelIndex&)),
+                this, SLOT(triggerExpanding(const QModelIndex&)));

 
 

-    // select the folder which contains the given URL
-    QItemSelectionModel* selModel = m_treeView->selectionModel();
-    selModel->clearSelection();
+        Q_ASSERT(m_proxyModel == 0);
+        m_proxyModel = new DolphinSortFilterProxyModel(this);
+        m_proxyModel->setSourceModel(m_dirModel);

 
 

-    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);
+        Q_ASSERT(m_treeView == 0);
+        m_treeView = new SidebarTreeView(this);
+        m_treeView->setModel(m_proxyModel);
+        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);

     }
     }

-    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();
-        }
+
+    loadTree(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(QList<KFileItem>());
+    TreeViewContextMenu contextMenu(this, item);
+    contextMenu.open();

 }
 
 void TreeViewSidebarPage::expandSelectionParent()
 }
 
 void TreeViewSidebarPage::expandSelectionParent()


@@ -137,46 +144,125 @@ void TreeViewSidebarPage::expandSelectionParent()
                this, SLOT(expandSelectionParent()));
 
     // expand the parent folder of the selected item
                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);
+    KUrl parentUrl = url().upUrl();
+    if (!m_dirLister->url().isParentOf(parentUrl)) {
+        return;
+    }
+
+    QModelIndex index = m_dirModel->indexForUrl(parentUrl);

     if (index.isValid()) {
     if (index.isValid()) {

-        m_treeView->setExpanded(index, true);
+        QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
+        m_treeView->setExpanded(proxyIndex, true);

 
         // select the item and assure that the item is visible
 
         // select the item and assure that the item is visible

-        const KFileItem selectedItem(S_IFDIR, KFileItem::Unknown, m_selectedUrl);
-        index = m_dirModel->indexForItem(selectedItem);
+        index = m_dirModel->indexForUrl(url());

         if (index.isValid()) {
         if (index.isValid()) {

-            m_treeView->scrollTo(index);
+            proxyIndex = m_proxyModel->mapFromSource(index);
+            m_treeView->scrollTo(proxyIndex);

 
             QItemSelectionModel* selModel = m_treeView->selectionModel();
 
             QItemSelectionModel* selModel = m_treeView->selectionModel();

-            selModel->setCurrentIndex(index, QItemSelectionModel::Select);
+            selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);

         }
     }
 }
 
 void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
 {
         }
     }
 }
 
 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);
+    const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
+    const KFileItem item = m_dirModel->itemForIndex(dirIndex);
+    if (!item.isNull()) {
+        emit changeUrl(item.url());

     }
 }
 
     }
 }
 

-void TreeViewSidebarPage::connectToActiveView()
+void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
+                                   const QModelIndex& index)

 {
 {

-    const QWidget* parent = parentWidget();
-    if ((parent == 0) || parent->isHidden()) {
+    if (index.isValid()) {
+        const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
+        KFileItem item = m_dirModel->itemForIndex(dirIndex);
+        Q_ASSERT(!item.isNull());
+        if (item.isDir()) {
+            emit urlsDropped(urls, item.url());
+        }
+    }
+}
+
+void TreeViewSidebarPage::triggerExpanding(const QModelIndex& index)
+{
+    Q_UNUSED(index);
+    // the expanding of the folders may not be done in the context
+    // of this slot
+    QMetaObject::invokeMethod(this, "expandToLeafDir", Qt::QueuedConnection);
+}
+
+void TreeViewSidebarPage::expandToLeafDir()
+{
+    // expand all directories until the parent directory of m_leafDir
+    const KUrl parentUrl = m_leafDir.upUrl();
+    QModelIndex dirIndex = m_dirModel->indexForUrl(parentUrl);
+    QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    m_treeView->setExpanded(proxyIndex, true);
+
+    // assure that m_leafDir gets selected
+    dirIndex = m_dirModel->indexForUrl(m_leafDir);
+    proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+    m_treeView->scrollTo(proxyIndex);
+
+    QItemSelectionModel* selModel = m_treeView->selectionModel();
+    selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
+}
+
+void TreeViewSidebarPage::loadSubTree()
+{
+    disconnect(m_dirLister, SIGNAL(completed()),
+               this, SLOT(loadSubTree()));
+
+    QItemSelectionModel* selModel = m_treeView->selectionModel();
+    selModel->clearSelection();
+
+    if (m_leafDir.isParentOf(m_dirLister->url())) {
+        // The leaf directory is not a child of the base URL, hence
+        // no sub directory must be loaded or selected.

         return;
     }
 
         return;
     }
 

-    const DolphinView* view = mainWindow()->activeView();
-    const KUrl& url = view->url();
+    const QModelIndex index = m_dirModel->indexForUrl(m_leafDir);
+    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 {
+        // Load all sub directories that need to get expanded for making
+        // the leaf directory visible. The slot triggerExpanding() will
+        // get invoked if the expanding has been finished.
+        m_dirModel->expandToUrl(m_leafDir);
+    }
+}

 
 

-    connect(view, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updateSelection(const KUrl&)));
+void TreeViewSidebarPage::loadTree(const KUrl& url)
+{
+    Q_ASSERT(m_dirLister != 0);
+    m_leafDir = url;
+
+    // adjust the root of the tree to the base place
+    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;
+    }

 
 

-    updateSelection(url);
+    connect(m_dirLister, SIGNAL(completed()),
+            this, SLOT(loadSubTree()));
+    if (m_dirLister->url() != baseUrl) {
+        m_dirLister->stop();
+        m_dirLister->openUrl(baseUrl);
+    } else {
+        loadSubTree();
+    }

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