X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1c819fb0ed6871bb716ae8224270eb333a9a4cf5..846b21edf57e7aeb83e84ee68e9f61c5981fbacd:/src/treeviewsidebarpage.cpp diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 6b319b3e0..14c877728 100644 --- a/src/treeviewsidebarpage.cpp +++ b/src/treeviewsidebarpage.cpp @@ -20,7 +20,6 @@ #include "treeviewsidebarpage.h" #include "dolphinmodel.h" -#include "dolphinmainwindow.h" #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" #include "dolphinsettings.h" @@ -35,10 +34,13 @@ #include #include #include +#include +#include TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : SidebarPage(parent), - m_dirListerCompleted(false), + m_setLeafVisible(false), + m_horizontalPos(0), m_dirLister(0), m_dolphinModel(0), m_proxyModel(0), @@ -49,15 +51,16 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : TreeViewSidebarPage::~TreeViewSidebarPage() { - delete m_dirLister; - m_dirLister = 0; + delete m_proxyModel; + m_proxyModel = 0; + delete m_dolphinModel; + m_dolphinModel = 0; + m_dirLister = 0; // deleted by m_dolphinModel } QSize TreeViewSidebarPage::sizeHint() const { - QSize size = SidebarPage::sizeHint(); - size.setWidth(200); - return size; + return QSize(200, 400); } void TreeViewSidebarPage::setUrl(const KUrl& url) @@ -68,6 +71,7 @@ void TreeViewSidebarPage::setUrl(const KUrl& url) SidebarPage::setUrl(url); if (m_dirLister != 0) { + m_setLeafVisible = true; loadTree(url); } } @@ -90,18 +94,15 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event) m_dirLister->setDelayedMimeTypes(true); m_dirLister->setAutoErrorHandlingEnabled(false, this); - m_dirListerCompleted = true; - connect(m_dirLister, SIGNAL(started(const KUrl&)), - this, SLOT(slotDirListerStarted(const KUrl&))); connect(m_dirLister, SIGNAL(completed()), - this, SLOT(slotDirListerCompleted())); + this, SLOT(triggerLoadSubTree())); 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&))); + this, SLOT(triggerExpanding())); Q_ASSERT(m_proxyModel == 0); m_proxyModel = new DolphinSortFilterProxyModel(this); @@ -140,39 +141,11 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event) const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex); - emit changeSelection(QList()); + emit changeSelection(KFileItemList()); 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_dolphinModel->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_dolphinModel->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); @@ -195,14 +168,20 @@ void TreeViewSidebarPage::dropUrls(const KUrl::List& urls, } } -void TreeViewSidebarPage::triggerExpanding(const QModelIndex& index) +void TreeViewSidebarPage::triggerExpanding() { - 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::triggerLoadSubTree() +{ + // the loading of the sub tree may not be done in the context + // of this slot + QMetaObject::invokeMethod(this, "loadSubTree", Qt::QueuedConnection); +} + void TreeViewSidebarPage::expandToLeafDir() { // expand all directories until the parent directory of m_leafDir @@ -210,20 +189,13 @@ void TreeViewSidebarPage::expandToLeafDir() 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); + selectLeafDirectory(); } + void TreeViewSidebarPage::loadSubTree() { - QItemSelectionModel* selModel = m_treeView->selectionModel(); - selModel->clearSelection(); + m_treeView->selectionModel()->clearSelection(); if (m_leafDir.isParentOf(m_dirLister->url())) { // The leaf directory is not a child of the base URL, hence @@ -233,11 +205,8 @@ void TreeViewSidebarPage::loadSubTree() 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) { + selectLeafDirectory(); + } 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. @@ -245,16 +214,13 @@ void TreeViewSidebarPage::loadSubTree() } } -void TreeViewSidebarPage::slotDirListerStarted(const KUrl& url) -{ - Q_UNUSED(url); - m_dirListerCompleted = false; -} - -void TreeViewSidebarPage::slotDirListerCompleted() +void TreeViewSidebarPage::scrollToLeaf() { - m_dirListerCompleted = true; - QMetaObject::invokeMethod(this, "loadSubTree", Qt::QueuedConnection); + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + if (proxyIndex.isValid()) { + m_treeView->scrollTo(proxyIndex); + } } void TreeViewSidebarPage::loadTree(const KUrl& url) @@ -262,21 +228,47 @@ 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 + m_horizontalPos = m_treeView->horizontalScrollBar()->value(); + + KUrl baseUrl = url; + if (url.isLocalFile()) { + // use the root directory as base for local URLs + baseUrl = KUrl("file:///"); + } else { + // clear the path for non-local URLs and use it as base baseUrl = url; + baseUrl.setPath(QString()); } if (m_dirLister->url() != baseUrl) { m_dirLister->stop(); - m_dirLister->openUrl(baseUrl); + m_dirLister->openUrl(baseUrl, KDirLister::Reload); } else { loadSubTree(); } } +void TreeViewSidebarPage::selectLeafDirectory() +{ + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + if (!proxyIndex.isValid()) { + return; + } + + if (m_setLeafVisible) { + // Invoke m_treeView->scrollTo(proxyIndex) asynchronously by + // scrollToLeaf(). This assures that the scrolling is done after + // the horizontal scrollbar gets visible (otherwise the scrollbar + // might hide the leaf). + QTimer::singleShot(100, this, SLOT(scrollToLeaf())); + m_setLeafVisible = false; + } + + QItemSelectionModel* selModel = m_treeView->selectionModel(); + selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select); + + m_treeView->horizontalScrollBar()->setValue(m_horizontalPos); +} + #include "treeviewsidebarpage.moc"