#include "treeviewsidebarpage.h"
#include "dolphinmodel.h"
-#include "dolphinmainwindow.h"
#include "dolphinsortfilterproxymodel.h"
#include "dolphinview.h"
#include "dolphinsettings.h"
#include <QTreeView>
#include <QBoxLayout>
#include <QModelIndex>
+#include <QScrollBar>
+#include <QTimer>
TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
SidebarPage(parent),
+ m_setLeafVisible(false),
+ m_horizontalPos(0),
m_dirLister(0),
m_dolphinModel(0),
m_proxyModel(0),
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
{
- QSize size = SidebarPage::sizeHint();
- size.setWidth(200);
- return size;
+ return QSize(200, 400);
}
void TreeViewSidebarPage::setUrl(const KUrl& url)
SidebarPage::setUrl(url);
if (m_dirLister != 0) {
+ m_setLeafVisible = true;
loadTree(url);
}
}
m_dirLister->setDelayedMimeTypes(true);
m_dirLister->setAutoErrorHandlingEnabled(false, this);
+ 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(const QModelIndex&)));
+ this, SLOT(triggerExpanding()));
Q_ASSERT(m_proxyModel == 0);
m_proxyModel = new DolphinSortFilterProxyModel(this);
const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex);
- emit changeSelection(QList<KFileItem>());
+ emit changeSelection(KFileItemList());
TreeViewContextMenu contextMenu(this, item);
contextMenu.open();
}
-void TreeViewSidebarPage::expandSelectionParent()
-{
- 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;
- }
-
- 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_dolphinModel->indexForUrl(url());
- if (index.isValid()) {
- proxyIndex = m_proxyModel->mapFromSource(index);
- m_treeView->scrollTo(proxyIndex);
-
- QItemSelectionModel* selModel = m_treeView->selectionModel();
- selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
- }
- }
-}
-
void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
{
const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
}
}
-void TreeViewSidebarPage::triggerExpanding(const QModelIndex& index)
+void TreeViewSidebarPage::triggerExpanding()
{
- 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::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
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);
+ selectLeafDirectory();
}
+
void TreeViewSidebarPage::loadSubTree()
{
- disconnect(m_dirLister, SIGNAL(completed()),
- this, SLOT(loadSubTree()));
-
- QItemSelectionModel* selModel = m_treeView->selectionModel();
- selModel->clearSelection();
+ m_treeView->selectionModel()->clearSelection();
if (m_leafDir.isParentOf(m_dirLister->url())) {
// The leaf directory is not a child of the base URL, hence
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);
+ selectLeafDirectory();
} else {
// Load all sub directories that need to get expanded for making
// the leaf directory visible. The slot triggerExpanding() will
}
}
+void TreeViewSidebarPage::scrollToLeaf()
+{
+ const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
+ const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+ if (proxyIndex.isValid()) {
+ m_treeView->scrollTo(proxyIndex);
+ }
+}
+
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
+ m_horizontalPos = m_treeView->horizontalScrollBar()->value();
+
+ KUrl baseUrl = url;
+ if (url.isLocalFile()) {
+ // use the root directory as base for local URLs
+ baseUrl = KUrl("file:///");
+ } else {
+ // clear the path for non-local URLs and use it as base
baseUrl = url;
+ baseUrl.setPath(QString());
}
- connect(m_dirLister, SIGNAL(completed()),
- this, SLOT(loadSubTree()));
if (m_dirLister->url() != baseUrl) {
m_dirLister->stop();
- m_dirLister->openUrl(baseUrl);
+ m_dirLister->openUrl(baseUrl, KDirLister::Reload);
} else {
loadSubTree();
}
}
+void TreeViewSidebarPage::selectLeafDirectory()
+{
+ const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir);
+ const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+ if (!proxyIndex.isValid()) {
+ return;
+ }
+
+ if (m_setLeafVisible) {
+ // Invoke m_treeView->scrollTo(proxyIndex) asynchronously by
+ // scrollToLeaf(). This assures that the scrolling is done after
+ // the horizontal scrollbar gets visible (otherwise the scrollbar
+ // might hide the leaf).
+ QTimer::singleShot(100, this, SLOT(scrollToLeaf()));
+ m_setLeafVisible = false;
+ }
+
+ QItemSelectionModel* selModel = m_treeView->selectionModel();
+ selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
+
+ m_treeView->horizontalScrollBar()->setValue(m_horizontalPos);
+}
+
#include "treeviewsidebarpage.moc"
projects / dolphin.git / blobdiff