X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/52648c9634f60ce2fe84dd888daa9f20fb967f9e..bf768056294fa3ca471eee71aa2d013db5e25b7b:/src/treeviewsidebarpage.cpp diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 3793d1da8..14c877728 100644 --- a/src/treeviewsidebarpage.cpp +++ b/src/treeviewsidebarpage.cpp @@ -19,7 +19,7 @@ #include "treeviewsidebarpage.h" -#include "dolphinmainwindow.h" +#include "dolphinmodel.h" #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" #include "dolphinsettings.h" @@ -28,19 +28,21 @@ #include #include -#include #include #include #include #include #include +#include #include TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : SidebarPage(parent), + m_setLeafVisible(false), + m_horizontalPos(0), m_dirLister(0), - m_dirModel(0), + m_dolphinModel(0), m_proxyModel(0), m_treeView(0), m_leafDir() @@ -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,16 +94,19 @@ 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); - connect(m_dirModel, SIGNAL(expand(const QModelIndex&)), - this, SLOT(triggerExpanding(const QModelIndex&))); + connect(m_dirLister, SIGNAL(completed()), + 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())); 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); @@ -131,46 +138,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()); + 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_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()); } @@ -181,7 +160,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()); @@ -189,38 +168,34 @@ 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 - QTimer::singleShot(0, this, SLOT(expandToLeafDir())); + 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 const KUrl parentUrl = m_leafDir.upUrl(); - QModelIndex dirIndex = m_dirModel->indexForUrl(parentUrl); + 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_dirModel->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() { - disconnect(m_dirLister, SIGNAL(completed()), - this, SLOT(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 @@ -228,17 +203,23 @@ void TreeViewSidebarPage::loadSubTree() return; } - const QModelIndex index = m_dirModel->indexForUrl(m_leafDir); + 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); + 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. - m_dirModel->expandToUrl(m_leafDir); + m_dolphinModel->expandToUrl(m_leafDir); + } +} + +void TreeViewSidebarPage::scrollToLeaf() +{ + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + if (proxyIndex.isValid()) { + m_treeView->scrollTo(proxyIndex); } } @@ -247,23 +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()); } - connect(m_dirLister, SIGNAL(completed()), - this, SLOT(loadSubTree())); 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"