#include "treeviewsidebarpage.h"
-#include "kbookmarkmanager.h"
#include "dolphinmainwindow.h"
#include "dolphinsortfilterproxymodel.h"
#include "dolphinview.h"
#include "sidebartreeview.h"
#include "treeviewcontextmenu.h"
+#include <kfileplacesmodel.h>
#include <kdirlister.h>
#include <kdirmodel.h>
#include <kfileitem.h>
#include <QVBoxLayout>
#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),
m_dirLister(0),
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->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
+ m_proxyModel->setSortOrder(Qt::AscendingOrder);
connect(m_treeView, SIGNAL(clicked(const QModelIndex&)),
this, SLOT(updateActiveView(const QModelIndex&)));
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);
- }
-
- // 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();
- }
- }
-
+ SidebarPage::setUrl(url);
+ // TODO: it makes only sense to load the tree if the TreeViewSidebarPage
+ // is visible, but currently an assertion is triggered in KDirModel when hiding
+ // the tree view, changing to a complete different hierarchy and showing it again.
+ //if (isVisible()) {
+ loadTree(url);
+ //}
}
void TreeViewSidebarPage::showEvent(QShowEvent* event)
{
SidebarPage::showEvent(event);
+ loadTree(url());
}
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);
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);
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());
}
}
+void TreeViewSidebarPage::loadTree(const KUrl& url)
+{
+ // 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()));
+
+ KUrl parentUrl = url.upUrl();
+ while (!parentUrl.isParentOf(baseUrl)) {
+ m_dirLister->openUrl(parentUrl, true, false);
+ parentUrl = parentUrl.upUrl();
+ }
+ }
+}
+
#include "treeviewsidebarpage.moc"
projects / dolphin.git / blobdiff