X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/85bc196887fbed01187e3830cd28c2500cb01cb2..1d3ccf2ada8f2d6f58b962eb19e49df647373477:/src/treeviewsidebarpage.cpp diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 523e21a78..0e6edff08 100644 --- a/src/treeviewsidebarpage.cpp +++ b/src/treeviewsidebarpage.cpp @@ -19,13 +19,14 @@ #include "treeviewsidebarpage.h" -#include "kbookmarkmanager.h" #include "dolphinmainwindow.h" #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" +#include "dolphinsettings.h" #include "sidebartreeview.h" #include "treeviewcontextmenu.h" +#include #include #include #include @@ -34,12 +35,6 @@ #include #include #include -#include "dolphinsettings.h" - -// TODO: currently when using a proxy model the strange effect occurs -// that items get duplicated. Activate the following define to have the proxy -// model: -//#define USE_PROXY_MODEL TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : SidebarPage(parent), @@ -48,40 +43,6 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : m_proxyModel(0), m_treeView(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_dirModel->setDropsAllowed(KDirModel::DropOnDirectory); - - -#if defined(USE_PROXY_MODEL) - m_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dirModel); - - m_treeView = new SidebarTreeView(this); - m_treeView->setModel(m_proxyModel); - - m_proxyModel->setSorting(DolphinView::SortByName); - m_proxyModel->setSortOrder(Qt::Ascending); -#else - m_treeView = new SidebarTreeView(this); - m_treeView->setModel(m_dirModel); -#endif - - 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); } TreeViewSidebarPage::~TreeViewSidebarPage() @@ -92,54 +53,55 @@ TreeViewSidebarPage::~TreeViewSidebarPage() void TreeViewSidebarPage::setUrl(const KUrl& url) { - if (!url.isValid() || (url == m_url)) { + if (!url.isValid() || (url == SidebarPage::url())) { return; } - m_url = url; - - // adjust the root of the tree to the base bookmark - KBookmarkManager* bookmarkManager = DolphinSettings::instance().bookmarkManager(); - const KUrl baseUrl = bookmarkManager->root().closestBookmark(url).url(); - if (m_dirLister->url() != baseUrl) { - m_dirLister->stop(); - m_dirLister->openUrl(baseUrl); + SidebarPage::setUrl(url); + if (m_dirLister != 0) { + loadTree(url); } - - // 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()) { -#if defined(USE_PROXY_MODEL) - // 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 - m_treeView->scrollTo(index); - selModel->setCurrentIndex(index, QItemSelectionModel::Select); -#endif - } - 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(); - } - } - } void TreeViewSidebarPage::showEvent(QShowEvent* event) { + 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); + + Q_ASSERT(m_dirModel == 0); + m_dirModel = new KDirModel(); + m_dirModel->setDirLister(m_dirLister); + m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory); + + Q_ASSERT(m_proxyModel == 0); + m_proxyModel = new DolphinSortFilterProxyModel(this); + m_proxyModel->setSourceModel(m_dirModel); + + 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); + } + + loadTree(url()); SidebarPage::showEvent(event); } @@ -153,12 +115,8 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event) return; } -#if defined(USE_PROXY_MODEL) const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); KFileItem* item = m_dirModel->itemForIndex(dirModelIndex); -#else - KFileItem* item = m_dirModel->itemForIndex(index); -#endif emit changeSelection(KFileItemList()); TreeViewContextMenu contextMenu(this, item); @@ -171,47 +129,32 @@ void TreeViewSidebarPage::expandSelectionParent() this, SLOT(expandSelectionParent())); // expand the parent folder of the selected item - KUrl parentUrl = m_url.upUrl(); + KUrl parentUrl = url().upUrl(); if (!m_dirLister->url().isParentOf(parentUrl)) { return; } QModelIndex index = m_dirModel->indexForUrl(parentUrl); if (index.isValid()) { -#if defined(USE_PROXY_MODEL) QModelIndex proxyIndex = m_proxyModel->mapFromSource(index); m_treeView->setExpanded(proxyIndex, true); -#else - m_treeView->setExpanded(index, true); -#endif // select the item and assure that the item is visible - index = m_dirModel->indexForUrl(m_url); + index = m_dirModel->indexForUrl(url()); if (index.isValid()) { -#if defined(USE_PROXY_MODEL) proxyIndex = m_proxyModel->mapFromSource(index); m_treeView->scrollTo(proxyIndex); QItemSelectionModel* selModel = m_treeView->selectionModel(); selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select); -#else - m_treeView->scrollTo(index); - - QItemSelectionModel* selModel = m_treeView->selectionModel(); - selModel->setCurrentIndex(index, QItemSelectionModel::Select); -#endif } } } void TreeViewSidebarPage::updateActiveView(const QModelIndex& index) { -#if defined(USE_PROXY_MODEL) - const QModelIndex& dirIndex = m_proxyModel->mapToSource(index); + const QModelIndex dirIndex = m_proxyModel->mapToSource(index); const KFileItem* item = m_dirModel->itemForIndex(dirIndex); -#else - const KFileItem* item = m_dirModel->itemForIndex(index); -#endif if (item != 0) { const KUrl& url = item->url(); emit changeUrl(url); @@ -222,12 +165,8 @@ void TreeViewSidebarPage::dropUrls(const KUrl::List& urls, const QModelIndex& index) { if (index.isValid()) { -#if defined(USE_PROXY_MODEL) - const QModelIndex& dirIndex = m_proxyModel->mapToSource(index); + const QModelIndex dirIndex = m_proxyModel->mapToSource(index); KFileItem* item = m_dirModel->itemForIndex(dirIndex); -#else - KFileItem* item = m_dirModel->itemForIndex(index); -#endif Q_ASSERT(item != 0); if (item->isDir()) { emit urlsDropped(urls, item->url()); @@ -235,4 +174,56 @@ void TreeViewSidebarPage::dropUrls(const KUrl::List& urls, } } +void TreeViewSidebarPage::loadTree(const KUrl& url) +{ + Q_ASSERT(m_dirLister != 0); + + // adjust the root of the tree to the base bookmark + 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; + } + + 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); + } 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); + } + } +} + #include "treeviewsidebarpage.moc"