#include "treeviewsidebarpage.h"
+#include "dolphinmodel.h"
#include "dolphinmainwindow.h"
#include "dolphinsortfilterproxymodel.h"
#include "dolphinview.h"
#include <kfileplacesmodel.h>
#include <kdirlister.h>
-#include <kdirmodel.h>
#include <kfileitem.h>
-#include <QHeaderView>
-#include <QItemSelectionModel>
+#include <QItemSelection>
#include <QTreeView>
-#include <QVBoxLayout>
+#include <QBoxLayout>
+#include <QModelIndex>
TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
SidebarPage(parent),
m_dirLister(0),
- m_dirModel(0),
+ m_dolphinModel(0),
m_proxyModel(0),
- m_treeView(0)
+ m_treeView(0),
+ m_leafDir()
{
}
m_dirLister = 0;
}
+QSize TreeViewSidebarPage::sizeHint() const
+{
+ QSize size = SidebarPage::sizeHint();
+ size.setWidth(200);
+ return size;
+}
+
void TreeViewSidebarPage::setUrl(const KUrl& url)
{
if (!url.isValid() || (url == SidebarPage::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
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_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_dirModel);
+ m_proxyModel->setSourceModel(m_dolphinModel);
Q_ASSERT(m_treeView == 0);
m_treeView = new SidebarTreeView(this);
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(KFileItemList());
+ emit changeSelection(QList<KFileItem>());
TreeViewContextMenu contextMenu(this, item);
contextMenu.open();
}
return;
}
- QModelIndex index = m_dirModel->indexForUrl(parentUrl);
+ 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_dirModel->indexForUrl(url());
+ index = m_dolphinModel->indexForUrl(url());
if (index.isValid()) {
proxyIndex = m_proxyModel->mapFromSource(index);
m_treeView->scrollTo(proxyIndex);
void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
{
const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
- const KFileItem* item = m_dirModel->itemForIndex(dirIndex);
- if (item != 0) {
- const KUrl& url = item->url();
- emit changeUrl(url);
+ const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
+ if (!item.isNull()) {
+ emit changeUrl(item.url());
}
}
{
if (index.isValid()) {
const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
- KFileItem* item = m_dirModel->itemForIndex(dirIndex);
- Q_ASSERT(item != 0);
- if (item->isDir()) {
- emit urlsDropped(urls, item->url());
+ KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
+ Q_ASSERT(!item.isNull());
+ if (item.isDir()) {
+ emit urlsDropped(urls, item.url());
}
}
}
+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()
+{
+ // 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 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);
+ }
+}
+
void TreeViewSidebarPage::loadTree(const KUrl& url)
{
Q_ASSERT(m_dirLister != 0);
+ m_leafDir = url;
- // adjust the root of the tree to the base bookmark
+ // 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()) {
baseUrl = url;
}
+ connect(m_dirLister, SIGNAL(completed()),
+ this, SLOT(loadSubTree()));
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);
- }
+ loadSubTree();
}
}
projects / dolphin.git / blobdiff