X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/81fcd720a2cc095262e52b8a40dd1472d774a415..fbd7cb02a511ff869d74aa4e758203a1cd340962:/src/treeviewsidebarpage.cpp diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp index 7b434a495..d8387aea2 100644 --- a/src/treeviewsidebarpage.cpp +++ b/src/treeviewsidebarpage.cpp @@ -19,43 +19,93 @@ #include "treeviewsidebarpage.h" -#include "dolphinmainwindow.h" +#include "dolphinmodel.h" #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" #include "dolphinsettings.h" +#include "dolphin_folderspanelsettings.h" +#include "dolphin_generalsettings.h" +#include "draganddrophelper.h" +#include "folderexpander.h" +#include "renamedialog.h" #include "sidebartreeview.h" #include "treeviewcontextmenu.h" #include #include -#include #include +#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) : SidebarPage(parent), + m_setLeafVisible(false), + m_mouseButtons(Qt::NoButton), m_dirLister(0), - m_dirModel(0), + m_dolphinModel(0), m_proxyModel(0), - m_treeView(0) + m_treeView(0), + m_leafDir() { + setLayoutDirection(Qt::LeftToRight); } 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::rename(const KFileItem& item) +{ + if (DolphinSettings::instance().generalSettings()->renameInline()) { + const QModelIndex dirIndex = m_dolphinModel->indexForItem(item); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + m_treeView->edit(proxyIndex); + } else { + KFileItemList items; + items.append(item); + RenameDialog dialog(this, items); + if (dialog.exec() == QDialog::Accepted) { + const QString& newName = dialog.newName(); + if (!newName.isEmpty()) { + KUrl newUrl = item.url(); + newUrl.setFileName(newName); + KonqOperations::rename(this, item.url(), newUrl); + } + } + } } void TreeViewSidebarPage::setUrl(const KUrl& url) @@ -66,6 +116,7 @@ void TreeViewSidebarPage::setUrl(const KUrl& url) SidebarPage::setUrl(url); if (m_dirLister != 0) { + m_setLeafVisible = true; loadTree(url); } } @@ -84,18 +135,21 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event) 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()); - Q_ASSERT(m_dirModel == 0); - m_dirModel = new KDirModel(this); - 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(expandToDir(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); @@ -103,10 +157,14 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event) m_proxyModel->setSorting(DolphinView::SortByName); m_proxyModel->setSortOrder(Qt::AscendingOrder); + new FolderExpander(m_treeView, m_proxyModel); + connect(m_treeView, SIGNAL(clicked(const QModelIndex&)), 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(urlsDropped(const QModelIndex&, QDropEvent*)), + this, SLOT(dropUrls(const QModelIndex&, QDropEvent*))); + connect(m_treeView, SIGNAL(pressed(const QModelIndex&)), + this, SLOT(updateMouseButtons())); QVBoxLayout* layout = new QVBoxLayout(this); layout->setMargin(0); @@ -121,120 +179,101 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event) { 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 dirModelIndex = m_proxyModel->mapToSource(index); - KFileItem item = m_dirModel->itemForIndex(dirModelIndex); - - emit changeSelection(QList()); 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_dirModel->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()); - 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); - const KFileItem item = m_dirModel->itemForIndex(dirIndex); + const KFileItem item = m_dolphinModel->itemForIndex(dirIndex); if (!item.isNull()) { - emit changeUrl(item.url()); + emit changeUrl(item.url(), m_mouseButtons); } } -void TreeViewSidebarPage::dropUrls(const KUrl::List& urls, - const QModelIndex& index) +void TreeViewSidebarPage::dropUrls(const QModelIndex& index, QDropEvent* event) { if (index.isValid()) { const QModelIndex dirIndex = m_proxyModel->mapToSource(index); - KFileItem item = m_dirModel->itemForIndex(dirIndex); + KFileItem item = m_dolphinModel->itemForIndex(dirIndex); Q_ASSERT(!item.isNull()); if (item.isDir()) { - emit urlsDropped(urls, item.url()); + DragAndDropHelper::instance().dropUrls(item, item.url(), event, this); } } } +void TreeViewSidebarPage::expandToDir(const QModelIndex& index) +{ + m_treeView->setExpanded(index, true); + selectLeafDirectory(); + m_treeView->resizeColumnToContents(DolphinModel::Name); +} + +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 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 + KUrl baseUrl; + if (url.isLocalFile()) { + // use the root directory as base for local URLs (#150941) + 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); + m_dirLister->openUrl(baseUrl, KDirLister::Reload); } + m_dolphinModel->expandToUrl(m_leafDir); +} - // select the folder which contains the given URL - QItemSelectionModel* selModel = m_treeView->selectionModel(); - selModel->clearSelection(); +void TreeViewSidebarPage::selectLeafDirectory() +{ + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + if (!proxyIndex.isValid()) { + return; + } - 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); - } + 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::ClearAndSelect); } #include "treeviewsidebarpage.moc"