#include "treeviewsidebarpage.h"
-#include "dolphinmainwindow.h"
+#include "dolphinmodel.h"
#include "dolphinsortfilterproxymodel.h"
#include "dolphinview.h"
#include "dolphinsettings.h"
#include <kfileplacesmodel.h>
#include <kdirlister.h>
-#include <kdirmodel.h>
#include <kfileitem.h>
-#include <QtGui/QHeaderView>
-#include <QtGui/QItemSelection>
-#include <QtGui/QTreeView>
-#include <QtGui/QBoxLayout>
+#include <QItemSelection>
+#include <QTreeView>
+#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()
{
}
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
+{
+ return QSize(200, 400);
}
void TreeViewSidebarPage::setUrl(const KUrl& url)
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_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);
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());
TreeViewContextMenu contextMenu(this, item);
contextMenu.open();
}
-void TreeViewSidebarPage::expandSelectionParent()
+void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
{
- 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;
+ const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
+ const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
+ if (!item.isNull()) {
+ emit changeUrl(item.url());
}
+}
- QModelIndex index = m_dirModel->indexForUrl(parentUrl);
+void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
+ const QModelIndex& index)
+{
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);
+ 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::updateActiveView(const QModelIndex& index)
+void TreeViewSidebarPage::triggerExpanding()
{
- 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);
- }
+ // the expanding of the folders may not be done in the context
+ // of this slot
+ QMetaObject::invokeMethod(this, "expandToLeafDir", Qt::QueuedConnection);
}
-void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
- const QModelIndex& index)
+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_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()
{
+ 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()) {
- 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());
- }
+ // 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()) {
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);
+ m_dirLister->openUrl(baseUrl, KDirLister::Reload);
} 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