X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6baba131b2e112c37015412b701bc3ea01a86c04..8ff20f651936ee19b20902b90b7d452450f4e2c3:/src/treeviewsidebarpage.cpp diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 4dddeae5c..eac1e6cf4 100644 --- a/src/treeviewsidebarpage.cpp +++ b/src/treeviewsidebarpage.cpp @@ -19,72 +19,31 @@ #include "treeviewsidebarpage.h" -#include "bookmarkselector.h" -#include "dolphincontextmenu.h" +#include "dolphinmodel.h" #include "dolphinmainwindow.h" #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" +#include "dolphinsettings.h" #include "sidebartreeview.h" +#include "treeviewcontextmenu.h" +#include #include -#include #include -#include -#include +#include #include -#include +#include +#include -// 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(DolphinMainWindow* mainWindow, - QWidget* parent) : - SidebarPage(mainWindow, parent), +TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : + SidebarPage(parent), m_dirLister(0), - m_dirModel(0), + m_dolphinModel(0), m_proxyModel(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_dirModel->setDropsAllowed(KDirModel::DropOnDirectory); - - -#if defined(USE_PROXY_MODEL) - m_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dirModel); - - m_treeView = new SidebarTreeView(mainWindow, this); - m_treeView->setModel(m_proxyModel); - - m_proxyModel->setSorting(DolphinView::SortByName); - m_proxyModel->setSortOrder(Qt::Ascending); -#else - m_treeView = new SidebarTreeView(mainWindow, 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() @@ -93,15 +52,72 @@ TreeViewSidebarPage::~TreeViewSidebarPage() m_dirLister = 0; } -void TreeViewSidebarPage::activeViewChanged() +QSize TreeViewSidebarPage::sizeHint() const { - connectToActiveView(); + QSize size = SidebarPage::sizeHint(); + size.setWidth(200); + return size; +} + +void TreeViewSidebarPage::setUrl(const KUrl& url) +{ + if (!url.isValid() || (url == SidebarPage::url())) { + return; + } + + SidebarPage::setUrl(url); + if (m_dirLister != 0) { + loadTree(url); + } } void TreeViewSidebarPage::showEvent(QShowEvent* event) { + if (event->spontaneous()) { + SidebarPage::showEvent(event); + return; + } + + 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_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_dolphinModel); + + 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); - connectToActiveView(); } void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event) @@ -114,67 +130,12 @@ 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 - - mainWindow()->activeView()->clearSelection(); - DolphinContextMenu contextMenu(mainWindow(), - item, - m_dirLister->url(), - DolphinContextMenu::SidebarView); - contextMenu.open(); -} - -void TreeViewSidebarPage::updateSelection(const KUrl& url) -{ - if (!url.isValid() || (url == m_selectedUrl)) { - return; - } - - m_selectedUrl = url; - - // 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); - } - - // select the folder which contains the given URL - QItemSelectionModel* selModel = m_treeView->selectionModel(); - selModel->clearSelection(); - - const KFileItem item(S_IFDIR, KFileItem::Unknown, url); + const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); + KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex); - const QModelIndex index = m_dirModel->indexForItem(item); - 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(); - } - } + emit changeSelection(QList()); + TreeViewContextMenu contextMenu(this, item); + contextMenu.open(); } void TreeViewSidebarPage::expandSelectionParent() @@ -183,48 +144,34 @@ void TreeViewSidebarPage::expandSelectionParent() 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_dolphinModel->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 - const KFileItem selectedItem(S_IFDIR, KFileItem::Unknown, m_selectedUrl); - index = m_dirModel->indexForItem(selectedItem); + index = m_dolphinModel->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 KFileItem* item = m_dirModel->itemForIndex(dirIndex); -#else - const KFileItem* item = m_dirModel->itemForIndex(index); -#endif - if (item != 0) { - const KUrl& url = item->url(); - mainWindow()->activeView()->setUrl(url); + const QModelIndex dirIndex = m_proxyModel->mapToSource(index); + const KFileItem item = m_dolphinModel->itemForIndex(dirIndex); + if (!item.isNull()) { + emit changeUrl(item.url()); } } @@ -232,33 +179,90 @@ 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); - KFileItem* item = m_dirModel->itemForIndex(dirIndex); -#else - KFileItem* item = m_dirModel->itemForIndex(index); -#endif - Q_ASSERT(item != 0); - if (item->isDir()) { - mainWindow()->dropUrls(urls, item->url()); + const QModelIndex dirIndex = m_proxyModel->mapToSource(index); + KFileItem item = m_dolphinModel->itemForIndex(dirIndex); + Q_ASSERT(!item.isNull()); + if (item.isDir()) { + emit urlsDropped(urls, item.url()); } } } -void TreeViewSidebarPage::connectToActiveView() +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() { - const QWidget* parent = parentWidget(); - if ((parent == 0) || parent->isHidden()) { + // 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() +{ + 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; } - const DolphinView* view = mainWindow()->activeView(); - const KUrl& url = view->url(); + 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 { + // 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); + } +} - 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"