#include "treeviewsidebarpage.h"
#include "dolphinmodel.h"
-#include "dolphinmainwindow.h"
#include "dolphinsortfilterproxymodel.h"
#include "dolphinview.h"
#include "dolphinsettings.h"
+#include "dolphin_folderspanelsettings.h"
#include "sidebartreeview.h"
#include "treeviewcontextmenu.h"
#include <kdirlister.h>
#include <kfileitem.h>
+#include <QApplication>
#include <QItemSelection>
#include <QTreeView>
#include <QBoxLayout>
#include <QModelIndex>
+#include <QScrollBar>
+#include <QTimer>
TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
SidebarPage(parent),
+ m_setLeafVisible(false),
+ m_mouseButtons(Qt::NoButton),
m_dirLister(0),
m_dolphinModel(0),
m_proxyModel(0),
TreeViewSidebarPage::~TreeViewSidebarPage()
{
- delete m_dirLister;
- m_dirLister = 0;
+ FoldersPanelSettings::self()->writeConfig();
+
+ 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::setShowHiddenFiles(bool show)
+{
+ FoldersPanelSettings::setShowHiddenFiles(show);
+ if (m_dirLister != 0) {
+ m_dirLister->setShowingDotFiles(show);
+ m_dirLister->openUrl(m_dirLister->url(), KDirLister::Reload);
+ }
+}
+
+bool TreeViewSidebarPage::showHiddenFiles() const
+{
+ return FoldersPanelSettings::showHiddenFiles();
}
void TreeViewSidebarPage::setUrl(const KUrl& url)
SidebarPage::setUrl(url);
if (m_dirLister != 0) {
+ m_setLeafVisible = true;
loadTree(url);
}
}
m_dirLister = new KDirLister();
m_dirLister->setDirOnlyMode(true);
m_dirLister->setAutoUpdate(true);
- m_dirLister->setMainWindow(this);
+ m_dirLister->setMainWindow(window());
m_dirLister->setDelayedMimeTypes(true);
m_dirLister->setAutoErrorHandlingEnabled(false, this);
+ m_dirLister->setShowingDotFiles(FoldersPanelSettings::showHiddenFiles());
- connect(m_dirLister, SIGNAL(started(const KUrl&)),
- this, SLOT(slotDirListerStarted(const KUrl&)));
connect(m_dirLister, SIGNAL(completed()),
this, SLOT(triggerLoadSubTree()));
this, SLOT(updateActiveView(const QModelIndex&)));
connect(m_treeView, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&)),
this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&)));
+ connect(m_treeView, SIGNAL(pressed(const QModelIndex&)),
+ this, SLOT(updateMouseButtons()));
QVBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0);
{
SidebarPage::contextMenuEvent(event);
+ KFileItem item;
const QModelIndex index = m_treeView->indexAt(event->pos());
- if (!index.isValid()) {
- // only open a context menu above a directory item
- return;
+ if (index.isValid()) {
+ const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
+ item = m_dolphinModel->itemForIndex(dolphinModelIndex);
+ emit changeSelection(KFileItemList());
}
- const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
- KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex);
-
- emit changeSelection(KFileItemList());
TreeViewContextMenu contextMenu(this, item);
contextMenu.open();
}
const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
const KFileItem item = m_dolphinModel->itemForIndex(dirIndex);
if (!item.isNull()) {
- emit changeUrl(item.url());
+ emit changeUrl(item.url(), m_mouseButtons);
}
}
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()
{
- 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::updateMouseButtons()
+{
+ m_mouseButtons = QApplication::mouseButtons();
+}
+
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
+ KUrl baseUrl = url;
+ if (url.isLocalFile()) {
+ // use the root directory as base for local URLs
+ baseUrl = QDir::rootPath();
+ } else {
+ // clear the path for non-local URLs and use it as base
baseUrl = url;
+ baseUrl.setPath(QString());
}
if (m_dirLister->url() != baseUrl) {
m_dirLister->stop();
- m_dirLister->openUrl(baseUrl, false, true);
+ 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);
+}
+
#include "treeviewsidebarpage.moc"
projects / dolphin.git / blobdiff