X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fa1b7e277f63ee4b0d998df070ec45a951a0e850..220d0d522dd3aca740c4c2d0c1f91f277f2405fd:/src/panels/folders/folderspanel.cpp diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index cf458e508..0760200b6 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -22,6 +22,7 @@ #include "dolphin_folderspanelsettings.h" #include "dolphin_generalsettings.h" #include "treeviewcontextmenu.h" +#include "foldersitemlistwidget.h" #include #include @@ -30,26 +31,26 @@ #include #include -#include #include #include #include #include +#include +#include #include +#include #include -#include +#include #include FoldersPanel::FoldersPanel(QWidget* parent) : Panel(parent), - m_setLeafVisible(false), - m_mouseButtons(Qt::NoButton), - m_dirLister(0), + m_updateCurrentItem(false), m_controller(0), - m_leafDir() + m_model(0) { setLayoutDirection(Qt::LeftToRight); } @@ -63,31 +64,22 @@ FoldersPanel::~FoldersPanel() m_controller->setView(0); delete view; } - - delete m_dirLister; - m_dirLister = 0; } -void FoldersPanel::setHiddenFilesShown(bool show) +void FoldersPanel::setShowHiddenFiles(bool show) { FoldersPanelSettings::setHiddenFilesShown(show); - if (m_dirLister) { - KFileItemModel* model = fileItemModel(); - const QSet expandedUrls = model->expandedUrls(); - m_dirLister->setShowingDotFiles(show); - m_dirLister->openUrl(m_dirLister->url(), KDirLister::Reload); - model->setExpanded(expandedUrls); - } + m_model->setShowHiddenFiles(show); } -bool FoldersPanel::hiddenFilesShown() const +bool FoldersPanel::showHiddenFiles() const { return FoldersPanelSettings::hiddenFilesShown(); } void FoldersPanel::setAutoScrolling(bool enable) { - //m_treeView->setAutoHorizontalScroll(enable); + // TODO: Not supported yet in Dolphin 2.0 FoldersPanelSettings::setAutoScrolling(enable); } @@ -98,18 +90,8 @@ bool FoldersPanel::autoScrolling() const void FoldersPanel::rename(const KFileItem& item) { - // TODO: Inline renaming is not supported anymore in Dolphin 2.0 - if (false /* GeneralSettings::renameInline() */) { - //const QModelIndex dirIndex = m_dolphinModel->indexForItem(item); - //const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); - //m_treeView->edit(proxyIndex); - } else { - RenameDialog* dialog = new RenameDialog(this, KFileItemList() << item); - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); - dialog->raise(); - dialog->activateWindow(); - } + const int index = m_model->index(item); + m_controller->view()->editRole(index, "text"); } bool FoldersPanel::urlChanged() @@ -120,8 +102,7 @@ bool FoldersPanel::urlChanged() return false; } - if (m_dirLister) { - m_setLeafVisible = true; + if (m_controller) { loadTree(url()); } @@ -135,55 +116,41 @@ void FoldersPanel::showEvent(QShowEvent* event) return; } - if (!m_dirLister) { - // 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 - // used at all (see FoldersPanel::setUrl()). - m_dirLister = new KDirLister(); - m_dirLister->setDirOnlyMode(true); - m_dirLister->setAutoUpdate(true); - m_dirLister->setMainWindow(window()); - m_dirLister->setDelayedMimeTypes(true); - m_dirLister->setAutoErrorHandlingEnabled(false, this); - m_dirLister->setShowingDotFiles(FoldersPanelSettings::hiddenFilesShown()); - + if (!m_controller) { + // Postpone the creating of the controller to the first show event. + // This assures that no performance and memory overhead is given when the folders panel is not + // used at all and stays invisible. KFileItemListView* view = new KFileItemListView(); - view->setWidgetCreator(new KItemListWidgetCreator()); + view->setWidgetCreator(new KItemListWidgetCreator()); + view->setSupportsItemExpanding(true); + // Set the opacity to 0 initially. The opacity will be increased after the loading of the initial tree + // has been finished in slotLoadingCompleted(). This prevents an unnecessary animation-mess when + // opening the folders panel. + view->setOpacity(0); + + connect(view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), + this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant))); + + m_model = new KFileItemModel(this); + m_model->setShowDirectoriesOnly(true); + m_model->setShowHiddenFiles(FoldersPanelSettings::hiddenFilesShown()); + // Use a QueuedConnection to give the view the possibility to react first on the + // finished loading. + connect(m_model, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection); - KItemListStyleOption styleOption = view->styleOption(); - styleOption.margin = 2; - styleOption.iconSize = KIconLoader::SizeSmall; - view->setStyleOption(styleOption); + m_controller = new KItemListController(m_model, view, this); + m_controller->setSelectionBehavior(KItemListController::SingleSelection); + m_controller->setAutoActivationDelay(750); + m_controller->setSingleClickActivation(true); - const qreal itemHeight = qMax(int(KIconLoader::SizeSmall), styleOption.fontMetrics.height()); - view->setItemSize(QSizeF(-1, itemHeight + 2 * styleOption.margin)); - view->setItemLayout(KFileItemListView::DetailsLayout); + connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int))); + connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int))); + connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF))); + connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF))); + connect(m_controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*))); - KFileItemModel* model = new KFileItemModel(m_dirLister, this); - // Use a QueuedConnection to give the view the possibility to react first on the - // finished loading. - connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection); - - KItemListContainer* container = new KItemListContainer(this); - m_controller = container->controller(); - m_controller->setView(view); - m_controller->setModel(model); - - // TODO: Check whether it makes sense to make an explicit API for KItemListContainer - // to make the background transparent. - container->setFrameShape(QFrame::NoFrame); - QGraphicsView* graphicsView = qobject_cast(container->viewport()); - if (graphicsView) { - // Make the background of the container transparent and apply the window-text color - // to the text color, so that enough contrast is given for all color - // schemes - QPalette p = graphicsView->palette(); - p.setColor(QPalette::Active, QPalette::Text, p.color(QPalette::Active, QPalette::WindowText)); - p.setColor(QPalette::Inactive, QPalette::Text, p.color(QPalette::Inactive, QPalette::WindowText)); - p.setColor(QPalette::Disabled, QPalette::Text, p.color(QPalette::Disabled, QPalette::WindowText)); - graphicsView->setPalette(p); - graphicsView->viewport()->setAutoFillBackground(false); - } + KItemListContainer* container = new KItemListContainer(m_controller, this); + container->setEnabledFrame(false); QVBoxLayout* layout = new QVBoxLayout(this); layout->setMargin(0); @@ -194,66 +161,124 @@ void FoldersPanel::showEvent(QShowEvent* event) Panel::showEvent(event); } -void FoldersPanel::contextMenuEvent(QContextMenuEvent* event) -{ - Panel::contextMenuEvent(event); - - KFileItem item; - /*const QModelIndex index = m_treeView->indexAt(event->pos()); - if (index.isValid()) { - const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); - item = m_dolphinModel->itemForIndex(dolphinModelIndex); - }*/ - - QPointer contextMenu = new TreeViewContextMenu(this, item); - contextMenu->open(); - delete contextMenu; -} - void FoldersPanel::keyPressEvent(QKeyEvent* event) { const int key = event->key(); if ((key == Qt::Key_Enter) || (key == Qt::Key_Return)) { event->accept(); - //updateActiveView(m_treeView->currentIndex()); } else { Panel::keyPressEvent(event); } } -void FoldersPanel::updateMouseButtons() +void FoldersPanel::slotItemActivated(int index) { - m_mouseButtons = QApplication::mouseButtons(); + const KFileItem item = m_model->fileItem(index); + if (!item.isNull()) { + emit folderActivated(item.url()); + } } -void FoldersPanel::slotLoadingCompleted() +void FoldersPanel::slotItemMiddleClicked(int index) +{ + const KFileItem item = m_model->fileItem(index); + if (!item.isNull()) { + emit folderMiddleClicked(item.url()); + } +} + +void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos) +{ + Q_UNUSED(pos); + + const KFileItem fileItem = m_model->fileItem(index); + + QWeakPointer contextMenu = new TreeViewContextMenu(this, fileItem); + contextMenu.data()->open(); + if (contextMenu.data()) { + delete contextMenu.data(); + } +} + +void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos) +{ + Q_UNUSED(pos); + + QWeakPointer contextMenu = new TreeViewContextMenu(this, KFileItem()); + contextMenu.data()->open(); + if (contextMenu.data()) { + delete contextMenu.data(); + } +} + +void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) { - const int index = fileItemModel()->index(url()); if (index >= 0) { - m_controller->selectionManager()->setCurrentItem(index); + KFileItem destItem = m_model->fileItem(index); + if (destItem.isNull()) { + return; + } + + QDropEvent dropEvent(event->pos().toPoint(), + event->possibleActions(), + event->mimeData(), + event->buttons(), + event->modifiers()); + + const QString error = DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent); + if (!error.isEmpty()) { + emit errorMessage(error); + } } } -void FoldersPanel::slotHorizontalScrollBarMoved(int value) +void FoldersPanel::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value) { - Q_UNUSED(value); - // Disable the auto-scrolling until the vertical scrollbar has - // been moved by the user. - //m_treeView->setAutoHorizontalScroll(false); + if (role == "text") { + const KFileItem item = m_model->fileItem(index); + const QString newName = value.toString(); + if (!newName.isEmpty() && newName != item.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) { + KonqOperations::rename(this, item.url(), newName); + } + } } -void FoldersPanel::slotVerticalScrollBarMoved(int value) +void FoldersPanel::slotLoadingCompleted() { - Q_UNUSED(value); - // Enable the auto-scrolling again (it might have been disabled by - // moving the horizontal scrollbar). - //m_treeView->setAutoHorizontalScroll(FoldersPanelSettings::autoScrolling()); + if (m_controller->view()->opacity() == 0) { + // The loading of the initial tree after opening the Folders panel + // has been finished. Trigger the increasing of the opacity after + // a short delay to give the view the chance to finish its internal + // animations. + // TODO: Check whether it makes sense to allow accessing the + // view-internal delay for usecases like this. + QTimer::singleShot(250, this, SLOT(startFadeInAnimation())); + } + + if (!m_updateCurrentItem) { + return; + } + + const int index = m_model->index(url()); + updateCurrentItem(index); + m_updateCurrentItem = false; +} + +void FoldersPanel::startFadeInAnimation() +{ + QPropertyAnimation* anim = new QPropertyAnimation(m_controller->view(), "opacity", this); + anim->setStartValue(0); + anim->setEndValue(1); + anim->setEasingCurve(QEasingCurve::InOutQuad); + anim->start(QAbstractAnimation::DeleteWhenStopped); + anim->setDuration(200); } void FoldersPanel::loadTree(const KUrl& url) { - Q_ASSERT(m_dirLister); - m_leafDir = url; + Q_ASSERT(m_controller); + + m_updateCurrentItem = false; KUrl baseUrl; if (url.isLocalFile()) { @@ -265,42 +290,30 @@ void FoldersPanel::loadTree(const KUrl& url) baseUrl.setPath(QString('/')); } - if (m_dirLister->url() != baseUrl) { - m_dirLister->stop(); - m_dirLister->openUrl(baseUrl, KDirLister::Reload); + if (m_model->directory() != baseUrl) { + m_updateCurrentItem = true; + m_model->refreshDirectory(baseUrl); } - KFileItemModel* model = fileItemModel(); - const int index = model->index(url); + const int index = m_model->index(url); if (index >= 0) { - m_controller->selectionManager()->setCurrentItem(index); + updateCurrentItem(index); } else { - model->setExpanded(QSet() << url); + m_updateCurrentItem = true; + m_model->expandParentDirectories(url); + // slotLoadingCompleted() will be invoked after the model has + // expanded the url } } -void FoldersPanel::selectLeafDirectory() +void FoldersPanel::updateCurrentItem(int index) { - /*const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_leafDir); - const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); - - if (proxyIndex.isValid()) { - QItemSelectionModel* selModel = m_treeView->selectionModel(); - selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect); - - if (m_setLeafVisible) { - // Invoke scrollToLeaf() asynchronously. This assures that - // the horizontal scrollbar is shown after resizing the column - // (otherwise the scrollbar might hide the leaf). - QTimer::singleShot(0, this, SLOT(scrollToLeaf())); - m_setLeafVisible = false; - } - }*/ -} + KItemListSelectionManager* selectionManager = m_controller->selectionManager(); + selectionManager->setCurrentItem(index); + selectionManager->clearSelection(); + selectionManager->setSelected(index); -KFileItemModel* FoldersPanel::fileItemModel() const -{ - return static_cast(m_controller->model()); + m_controller->view()->scrollToItem(index); } #include "folderspanel.moc"