X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/81fcd720a2cc095262e52b8a40dd1472d774a415..dbc8874c00c35aaefacdd03f8aef9e4ac4e2be01:/src/treeviewsidebarpage.cpp diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 7b434a495..680b2d379 100644 --- a/src/treeviewsidebarpage.cpp +++ b/src/treeviewsidebarpage.cpp @@ -19,6 +19,7 @@ #include "treeviewsidebarpage.h" +#include "dolphinmodel.h" #include "dolphinmainwindow.h" #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" @@ -28,20 +29,21 @@ #include #include -#include #include -#include -#include -#include -#include +#include +#include +#include +#include TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : SidebarPage(parent), + m_dirListerCompleted(false), m_dirLister(0), - m_dirModel(0), + m_dolphinModel(0), m_proxyModel(0), - m_treeView(0) + m_treeView(0), + m_leafDir() { } @@ -88,14 +90,22 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event) m_dirLister->setDelayedMimeTypes(true); m_dirLister->setAutoErrorHandlingEnabled(false, this); - Q_ASSERT(m_dirModel == 0); - m_dirModel = new KDirModel(this); - m_dirModel->setDirLister(m_dirLister); - m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory); + m_dirListerCompleted = true; + connect(m_dirLister, SIGNAL(started(const KUrl&)), + this, SLOT(slotDirListerStarted(const KUrl&))); + connect(m_dirLister, SIGNAL(completed()), + this, SLOT(slotDirListerCompleted())); + + Q_ASSERT(m_dolphinModel == 0); + m_dolphinModel = new DolphinModel(this); + m_dolphinModel->setDirLister(m_dirLister); + m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory); + connect(m_dolphinModel, SIGNAL(expand(const QModelIndex&)), + this, SLOT(triggerExpanding(const QModelIndex&))); Q_ASSERT(m_proxyModel == 0); m_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dirModel); + m_proxyModel->setSourceModel(m_dolphinModel); Q_ASSERT(m_treeView == 0); m_treeView = new SidebarTreeView(this); @@ -127,46 +137,18 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event) return; } - const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); - KFileItem item = m_dirModel->itemForIndex(dirModelIndex); + const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); + KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex); emit changeSelection(QList()); TreeViewContextMenu contextMenu(this, item); contextMenu.open(); } -void TreeViewSidebarPage::expandSelectionParent() -{ - disconnect(m_dirLister, SIGNAL(completed()), - this, SLOT(expandSelectionParent())); - - // expand the parent folder of the selected item - KUrl parentUrl = url().upUrl(); - if (!m_dirLister->url().isParentOf(parentUrl)) { - return; - } - - 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(url()); - if (index.isValid()) { - proxyIndex = m_proxyModel->mapFromSource(index); - m_treeView->scrollTo(proxyIndex); - - QItemSelectionModel* selModel = m_treeView->selectionModel(); - selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select); - } - } -} - void TreeViewSidebarPage::updateActiveView(const QModelIndex& index) { const QModelIndex dirIndex = m_proxyModel->mapToSource(index); - const KFileItem item = m_dirModel->itemForIndex(dirIndex); + const KFileItem item = m_dolphinModel->itemForIndex(dirIndex); if (!item.isNull()) { emit changeUrl(item.url()); } @@ -177,7 +159,7 @@ void TreeViewSidebarPage::dropUrls(const KUrl::List& urls, { if (index.isValid()) { const QModelIndex dirIndex = m_proxyModel->mapToSource(index); - KFileItem item = m_dirModel->itemForIndex(dirIndex); + KFileItem item = m_dolphinModel->itemForIndex(dirIndex); Q_ASSERT(!item.isNull()); if (item.isDir()) { emit urlsDropped(urls, item.url()); @@ -185,11 +167,74 @@ void TreeViewSidebarPage::dropUrls(const KUrl::List& urls, } } +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_dolphinModel->indexForUrl(parentUrl); + QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + m_treeView->setExpanded(proxyIndex, true); + + // assure that m_leafDir gets selected + dirIndex = m_dolphinModel->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() +{ + 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; + } + + const QModelIndex index = m_dolphinModel->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 if (m_dirListerCompleted) { + // 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_dolphinModel->expandToUrl(m_leafDir); + } +} + +void TreeViewSidebarPage::slotDirListerStarted(const KUrl& url) +{ + Q_UNUSED(url); + m_dirListerCompleted = false; +} + +void TreeViewSidebarPage::slotDirListerCompleted() +{ + m_dirListerCompleted = true; + QMetaObject::invokeMethod(this, "loadSubTree", Qt::QueuedConnection); +} + void TreeViewSidebarPage::loadTree(const KUrl& url) { Q_ASSERT(m_dirLister != 0); + m_leafDir = url; - // adjust the root of the tree to the base bookmark + // 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()) { @@ -200,40 +245,9 @@ void TreeViewSidebarPage::loadTree(const KUrl& 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 QModelIndex index = m_dirModel->indexForUrl(url); - 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); + m_dirLister->openUrl(baseUrl, false, true); } 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())); - - // Implementation note: It is important to remove the trailing slash from - // the parent URL, as the directories from the dir lister (KDirLister::directories()) - // don't have a trailing slash and hence KUrl::List::contains() would fail... - KUrl parentUrl = url.upUrl(); - parentUrl.adjustPath(KUrl::RemoveTrailingSlash); - while (!parentUrl.isParentOf(baseUrl)) { - if (m_dirLister->directories().contains(parentUrl)) { - m_dirLister->updateDirectory(parentUrl); - } else { - m_dirLister->openUrl(parentUrl, true, false); - } - parentUrl = parentUrl.upUrl(); - parentUrl.adjustPath(KUrl::RemoveTrailingSlash); - } + loadSubTree(); } }