X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/954e8c47906c12edaaf6e6aebdd41516eceb0d44..2201018673467bf7a871082b1fd1e3f8c6f926e7:/src/panels/folders/folderspanel.cpp diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index 73c3137d3..e375f2ce5 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -15,15 +15,16 @@ #include "kitemviews/kitemlistcontainer.h" #include "kitemviews/kitemlistcontroller.h" #include "kitemviews/kitemlistselectionmanager.h" +#include "kitemviews/private/kitemlistroleeditor.h" #include "treeviewcontextmenu.h" #include "views/draganddrophelper.h" -#include -#include #include #include #include #include +#include +#include #include #include @@ -32,11 +33,11 @@ #include #include -FoldersPanel::FoldersPanel(QWidget* parent) : - Panel(parent), - m_updateCurrentItem(false), - m_controller(nullptr), - m_model(nullptr) +FoldersPanel::FoldersPanel(QWidget *parent) + : Panel(parent) + , m_updateCurrentItem(false) + , m_controller(nullptr) + , m_model(nullptr) { setLayoutDirection(Qt::LeftToRight); } @@ -46,7 +47,7 @@ FoldersPanel::~FoldersPanel() FoldersPanelSettings::self()->save(); if (m_controller) { - KItemListView* view = m_controller->view(); + KItemListView *view = m_controller->view(); m_controller->setView(nullptr); delete view; } @@ -85,13 +86,13 @@ bool FoldersPanel::autoScrolling() const return FoldersPanelSettings::autoScrolling(); } -void FoldersPanel::rename(const KFileItem& item) +void FoldersPanel::rename(const KFileItem &item) { if (GeneralSettings::renameInline()) { const int index = m_model->index(item); m_controller->view()->editRole(index, "text"); } else { - KIO::RenameFileDialog* dialog = new KIO::RenameFileDialog(KFileItemList({item}), this); + KIO::RenameFileDialog *dialog = new KIO::RenameFileDialog(KFileItemList({item}), this); dialog->open(); } } @@ -118,8 +119,7 @@ void FoldersPanel::reloadTree() } } - -void FoldersPanel::showEvent(QShowEvent* event) +void FoldersPanel::showEvent(QShowEvent *event) { if (event->spontaneous()) { Panel::showEvent(event); @@ -130,7 +130,7 @@ void FoldersPanel::showEvent(QShowEvent* event) // 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(); + KFileItemListView *view = new KFileItemListView(); 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 @@ -138,8 +138,7 @@ void FoldersPanel::showEvent(QShowEvent* event) // opening the folders panel. view->setOpacity(0); - connect(view, &KFileItemListView::roleEditingFinished, - this, &FoldersPanel::slotRoleEditingFinished); + connect(view, &KFileItemListView::roleEditingFinished, this, &FoldersPanel::slotRoleEditingFinished); m_model = new KFileItemModel(this); m_model->setShowDirectoriesOnly(true); @@ -152,7 +151,6 @@ void FoldersPanel::showEvent(QShowEvent* event) m_controller->setSelectionBehavior(KItemListController::SingleSelection); m_controller->setAutoActivationBehavior(KItemListController::ExpansionOnly); m_controller->setMouseDoubleClickAction(KItemListController::ActivateAndExpandItem); - m_controller->setAutoActivationDelay(750); m_controller->setSingleClickActivationEnforced(true); connect(m_controller, &KItemListController::itemActivated, this, &FoldersPanel::slotItemActivated); @@ -161,10 +159,13 @@ void FoldersPanel::showEvent(QShowEvent* event) connect(m_controller, &KItemListController::viewContextMenuRequested, this, &FoldersPanel::slotViewContextMenuRequested); connect(m_controller, &KItemListController::itemDropEvent, this, &FoldersPanel::slotItemDropEvent); - KItemListContainer* container = new KItemListContainer(m_controller, this); + KItemListContainer *container = new KItemListContainer(m_controller, this); +#ifndef QT_NO_ACCESSIBILITY + view->setAccessibleParentsObject(container); +#endif container->setEnabledFrame(false); - QVBoxLayout* layout = new QVBoxLayout(this); + QVBoxLayout *layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(container); } @@ -173,7 +174,7 @@ void FoldersPanel::showEvent(QShowEvent* event) Panel::showEvent(event); } -void FoldersPanel::keyPressEvent(QKeyEvent* event) +void FoldersPanel::keyPressEvent(QKeyEvent *event) { const int key = event->key(); if ((key == Qt::Key_Enter) || (key == Qt::Key_Return)) { @@ -187,7 +188,19 @@ void FoldersPanel::slotItemActivated(int index) { const KFileItem item = m_model->fileItem(index); if (!item.isNull()) { - emit folderActivated(item.url()); + const auto modifiers = QGuiApplication::keyboardModifiers(); + // keep in sync with KUrlNavigator::slotNavigatorButtonClicked + if (modifiers & Qt::ControlModifier && modifiers & Qt::ShiftModifier) { + Q_EMIT folderInNewActiveTab(item.url()); + } else if (modifiers & Qt::ControlModifier) { + Q_EMIT folderInNewTab(item.url()); + } else if (modifiers & Qt::ShiftModifier) { + // The shift modifier is not considered because it is used to expand the tree view without actually + // opening the folder + return; + } else { + Q_EMIT folderActivated(item.url()); + } } } @@ -195,11 +208,17 @@ void FoldersPanel::slotItemMiddleClicked(int index) { const KFileItem item = m_model->fileItem(index); if (!item.isNull()) { - emit folderMiddleClicked(item.url()); + const auto modifiers = QGuiApplication::keyboardModifiers(); + // keep in sync with KUrlNavigator::slotNavigatorButtonClicked + if (modifiers & Qt::ShiftModifier) { + Q_EMIT folderInNewActiveTab(item.url()); + } else { + Q_EMIT folderInNewTab(item.url()); + } } } -void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos) +void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF &pos) { const KFileItem fileItem = m_model->fileItem(index); @@ -210,7 +229,7 @@ void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos) } } -void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos) +void FoldersPanel::slotViewContextMenuRequested(const QPointF &pos) { QPointer contextMenu = new TreeViewContextMenu(this, KFileItem()); contextMenu.data()->open(pos.toPoint()); @@ -219,7 +238,7 @@ void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos) } } -void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) +void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent *event) { if (index >= 0) { KFileItem destItem = m_model->fileItem(index); @@ -227,30 +246,31 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve return; } - QDropEvent dropEvent(event->pos().toPoint(), - event->possibleActions(), - event->mimeData(), - event->buttons(), - event->modifiers()); + QDropEvent dropEvent(event->pos().toPoint(), event->possibleActions(), event->mimeData(), event->buttons(), event->modifiers()); KIO::DropJob *job = DragAndDropHelper::dropUrls(destItem.mostLocalUrl(), &dropEvent, this); if (job) { - connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) emit errorMessage(job->errorString()); }); + connect(job, &KIO::DropJob::result, this, [this](KJob *job) { + if (job->error() && job->error() != KIO::ERR_USER_CANCELED) { + Q_EMIT errorMessage(job->errorString()); + } + }); } } } -void FoldersPanel::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value) +void FoldersPanel::slotRoleEditingFinished(int index, const QByteArray &role, const QVariant &value) { if (role == "text") { const KFileItem item = m_model->fileItem(index); - const QString newName = value.toString(); + const EditResult retVal = value.value(); + const QString newName = retVal.newName; if (!newName.isEmpty() && newName != item.text() && newName != QLatin1Char('.') && newName != QLatin1String("..")) { const QUrl oldUrl = item.url(); QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename); newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName)); - KIO::Job* job = KIO::moveAs(oldUrl, newUrl); + KIO::Job *job = KIO::moveAs(oldUrl, newUrl); KJobWidgets::setWindow(job, this); KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job); job->uiDelegate()->setAutoErrorHandlingEnabled(true); @@ -281,7 +301,7 @@ void FoldersPanel::slotLoadingCompleted() void FoldersPanel::startFadeInAnimation() { - QPropertyAnimation* anim = new QPropertyAnimation(m_controller->view(), "opacity", this); + QPropertyAnimation *anim = new QPropertyAnimation(m_controller->view(), "opacity", this); anim->setStartValue(0); anim->setEndValue(1); anim->setEasingCurve(QEasingCurve::InOutQuad); @@ -289,7 +309,7 @@ void FoldersPanel::startFadeInAnimation() anim->setDuration(200); } -void FoldersPanel::loadTree(const QUrl& url, FoldersPanel::NavigationBehaviour navigationBehaviour) +void FoldersPanel::loadTree(const QUrl &url, FoldersPanel::NavigationBehaviour navigationBehaviour) { Q_ASSERT(m_controller); @@ -302,7 +322,7 @@ void FoldersPanel::loadTree(const QUrl& url, FoldersPanel::NavigationBehaviour n baseUrl = url; baseUrl.setPath(QStringLiteral("/")); } else if (Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url)) { - if (FoldersPanelSettings::limitFoldersPanelToHome() ) { + if (FoldersPanelSettings::limitFoldersPanelToHome()) { baseUrl = Dolphin::homeUrl(); } else { // Use the root directory as base for local URLs (#150941) @@ -323,7 +343,7 @@ void FoldersPanel::loadTree(const QUrl& url, FoldersPanel::NavigationBehaviour n const int index = m_model->index(url); if (jumpHome) { - emit folderActivated(baseUrl); + Q_EMIT folderActivated(baseUrl); } else if (index >= 0) { updateCurrentItem(index); } else if (url == baseUrl) { @@ -340,7 +360,7 @@ void FoldersPanel::loadTree(const QUrl& url, FoldersPanel::NavigationBehaviour n void FoldersPanel::updateCurrentItem(int index) { - KItemListSelectionManager* selectionManager = m_controller->selectionManager(); + KItemListSelectionManager *selectionManager = m_controller->selectionManager(); selectionManager->setCurrentItem(index); selectionManager->clearSelection(); selectionManager->setSelected(index); @@ -348,3 +368,4 @@ void FoldersPanel::updateCurrentItem(int index) m_controller->view()->scrollToItem(index); } +#include "moc_folderspanel.cpp"