X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a058c64eba30f11bfa87ac097371c04437d0471e..6dd5525131e13d42f515eba982a6e7cd1153effe:/src/views/dolphinview.cpp diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index aef0e85d6..e8577e066 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -1,22 +1,9 @@ -/*************************************************************************** - * Copyright (C) 2006-2009 by Peter Penz * - * Copyright (C) 2006 by Gregor KaliÅ¡nik * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2006-2009 Peter Penz + * SPDX-FileCopyrightText: 2006 Gregor KaliÅ¡nik + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphinview.h" @@ -25,18 +12,24 @@ #include "dolphinitemlistview.h" #include "dolphinnewfilemenuobserver.h" #include "draganddrophelper.h" +#ifndef QT_NO_ACCESSIBILITY +#include "kitemviews/accessibility/kitemlistviewaccessible.h" +#endif #include "kitemviews/kfileitemlistview.h" #include "kitemviews/kfileitemmodel.h" #include "kitemviews/kitemlistcontainer.h" #include "kitemviews/kitemlistcontroller.h" #include "kitemviews/kitemlistheader.h" #include "kitemviews/kitemlistselectionmanager.h" +#include "kitemviews/private/kitemlistroleeditor.h" +#include "selectionmode/singleclickselectionproxystyle.h" +#include "settings/viewmodes/viewmodesettings.h" #include "versioncontrol/versioncontrolobserver.h" #include "viewproperties.h" #include "views/tooltips/tooltipmanager.h" #include "zoomlevelinfo.h" -#ifdef HAVE_BALOO +#if HAVE_BALOO #include #endif #include @@ -45,57 +38,69 @@ #include #include #include -#include +#include #include #include #include #include -#include #include #include #include #include #include +#include + +#include #include +#ifndef QT_NO_ACCESSIBILITY +#include +#endif +#include #include #include #include +#include #include +#include #include #include #include -#include #include #include #include +#include #include -DolphinView::DolphinView(const QUrl& url, QWidget* parent) : - QWidget(parent), - m_active(true), - m_tabsForFiles(false), - m_assureVisibleCurrentIndex(false), - m_isFolderWritable(true), - m_dragging(false), - m_url(url), - m_viewPropertiesContext(), - m_mode(DolphinView::IconsView), - m_visibleRoles(), - m_topLayout(nullptr), - m_model(nullptr), - m_view(nullptr), - m_container(nullptr), - m_toolTipManager(nullptr), - m_selectionChangedTimer(nullptr), - m_currentItemUrl(), - m_scrollToCurrentItem(false), - m_restoredContentsPosition(), - m_selectedUrls(), - m_clearSelectionBeforeSelectingNewItems(false), - m_markFirstNewlySelectedItemAsCurrent(false), - m_versionControlObserver(nullptr), - m_twoClicksRenamingTimer(nullptr) +DolphinView::DolphinView(const QUrl &url, QWidget *parent) + : QWidget(parent) + , m_active(true) + , m_tabsForFiles(false) + , m_assureVisibleCurrentIndex(false) + , m_isFolderWritable(true) + , m_dragging(false) + , m_selectNextItem(false) + , m_url(url) + , m_viewPropertiesContext() + , m_mode(DolphinView::IconsView) + , m_visibleRoles() + , m_topLayout(nullptr) + , m_model(nullptr) + , m_view(nullptr) + , m_container(nullptr) + , m_toolTipManager(nullptr) + , m_selectionChangedTimer(nullptr) + , m_currentItemUrl() + , m_scrollToCurrentItem(false) + , m_restoredContentsPosition() + , m_controlWheelAccumulatedDelta(0) + , m_selectedUrls() + , m_clearSelectionBeforeSelectingNewItems(false) + , m_markFirstNewlySelectedItemAsCurrent(false) + , m_versionControlObserver(nullptr) + , m_twoClicksRenamingTimer(nullptr) + , m_placeholderLabel(nullptr) + , m_showLoadingPlaceholderTimer(nullptr) { m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); @@ -104,24 +109,22 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) : // When a new item has been created by the "Create New..." menu, the item should // get selected and it must be assured that the item will get visible. As the // creation is done asynchronously, several signals must be checked: - connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::itemCreated, - this, &DolphinView::observeCreatedItem); + connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::itemCreated, this, &DolphinView::observeCreatedItem); m_selectionChangedTimer = new QTimer(this); m_selectionChangedTimer->setSingleShot(true); m_selectionChangedTimer->setInterval(300); - connect(m_selectionChangedTimer, &QTimer::timeout, - this, &DolphinView::emitSelectionChangedSignal); + connect(m_selectionChangedTimer, &QTimer::timeout, this, &DolphinView::emitSelectionChangedSignal); m_model = new KFileItemModel(this); m_view = new DolphinItemListView(); - m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); + m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::FollowSetting); m_view->setVisibleRoles({"text"}); applyModeToView(); - KItemListController* controller = new KItemListController(m_model, m_view, this); - const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1; - controller->setAutoActivationDelay(delay); + KItemListController *controller = new KItemListController(m_model, m_view, this); + controller->setAutoActivationEnabled(GeneralSettings::autoExpandFolders()); + connect(controller, &KItemListController::doubleClickViewBackground, this, &DolphinView::doubleClickViewBackground); // The EnlargeSmallPreviews setting can only be changed after the model // has been set in the view by KItemListController. @@ -129,9 +132,45 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) : m_container = new KItemListContainer(controller, this); m_container->installEventFilter(this); +#ifndef QT_NO_ACCESSIBILITY + m_view->setAccessibleParentsObject(m_container); +#endif setFocusProxy(m_container); - connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, [=] { hideToolTip(); }); - connect(m_container->verticalScrollBar(), &QScrollBar::valueChanged, this, [=] { hideToolTip(); }); + connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, [this] { + hideToolTip(); + }); + connect(m_container->verticalScrollBar(), &QScrollBar::valueChanged, this, [this] { + hideToolTip(); + }); + + m_showLoadingPlaceholderTimer = new QTimer(this); + m_showLoadingPlaceholderTimer->setInterval(500); + m_showLoadingPlaceholderTimer->setSingleShot(true); + connect(m_showLoadingPlaceholderTimer, &QTimer::timeout, this, &DolphinView::showLoadingPlaceholder); + + // Show some placeholder text for empty folders + // This is made using a heavily-modified QLabel rather than a KTitleWidget + // because KTitleWidget can't be told to turn off mouse-selectable text + m_placeholderLabel = new QLabel(this); + // Don't consume mouse events + m_placeholderLabel->setAttribute(Qt::WA_TransparentForMouseEvents); + + QFont placeholderLabelFont; + // To match the size of a level 2 Heading/KTitleWidget + placeholderLabelFont.setPointSize(qRound(placeholderLabelFont.pointSize() * 1.3)); + m_placeholderLabel->setFont(placeholderLabelFont); + m_placeholderLabel->setWordWrap(true); + m_placeholderLabel->setAlignment(Qt::AlignCenter); + // Match opacity of QML placeholder label component + auto *effect = new QGraphicsOpacityEffect(m_placeholderLabel); + effect->setOpacity(0.5); + m_placeholderLabel->setGraphicsEffect(effect); + // Set initial text and visibility + updatePlaceholderLabel(); + + auto *centeringLayout = new QVBoxLayout(m_container); + centeringLayout->addWidget(m_placeholderLabel); + centeringLayout->setAlignment(m_placeholderLabel, Qt::AlignCenter); controller->setSelectionBehavior(KItemListController::MultiSelection); connect(controller, &KItemListController::itemActivated, this, &DolphinView::slotItemActivated); @@ -147,38 +186,47 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) : connect(controller, &KItemListController::escapePressed, this, &DolphinView::stopLoading); connect(controller, &KItemListController::modelChanged, this, &DolphinView::slotModelChanged); connect(controller, &KItemListController::selectedItemTextPressed, this, &DolphinView::slotSelectedItemTextPressed); - - connect(m_model, &KFileItemModel::directoryLoadingStarted, this, &DolphinView::slotDirectoryLoadingStarted); - connect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted); - connect(m_model, &KFileItemModel::directoryLoadingCanceled, this, &DolphinView::directoryLoadingCanceled); - connect(m_model, &KFileItemModel::directoryLoadingProgress, this, &DolphinView::directoryLoadingProgress); - connect(m_model, &KFileItemModel::directorySortingProgress, this, &DolphinView::directorySortingProgress); - connect(m_model, &KFileItemModel::itemsChanged, - this, &DolphinView::slotItemsChanged); - connect(m_model, &KFileItemModel::itemsRemoved, this, &DolphinView::itemCountChanged); - connect(m_model, &KFileItemModel::itemsInserted, this, &DolphinView::itemCountChanged); - connect(m_model, &KFileItemModel::infoMessage, this, &DolphinView::infoMessage); - connect(m_model, &KFileItemModel::errorMessage, this, &DolphinView::errorMessage); + connect(controller, &KItemListController::increaseZoom, this, &DolphinView::slotIncreaseZoom); + connect(controller, &KItemListController::decreaseZoom, this, &DolphinView::slotDecreaseZoom); + connect(controller, &KItemListController::swipeUp, this, &DolphinView::slotSwipeUp); + connect(controller, &KItemListController::selectionModeChangeRequested, this, &DolphinView::selectionModeChangeRequested); + + connect(m_model, &KFileItemModel::directoryLoadingStarted, this, &DolphinView::slotDirectoryLoadingStarted); + connect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted); + connect(m_model, &KFileItemModel::directoryLoadingCanceled, this, &DolphinView::slotDirectoryLoadingCanceled); + connect(m_model, &KFileItemModel::directoryLoadingProgress, this, &DolphinView::directoryLoadingProgress); + connect(m_model, &KFileItemModel::directorySortingProgress, this, &DolphinView::directorySortingProgress); + connect(m_model, &KFileItemModel::itemsChanged, this, &DolphinView::slotItemsChanged); + connect(m_model, &KFileItemModel::itemsRemoved, this, &DolphinView::itemCountChanged); + connect(m_model, &KFileItemModel::itemsInserted, this, &DolphinView::itemCountChanged); + connect(m_model, &KFileItemModel::infoMessage, this, &DolphinView::infoMessage); + connect(m_model, &KFileItemModel::errorMessage, this, &DolphinView::errorMessage); connect(m_model, &KFileItemModel::directoryRedirection, this, &DolphinView::slotDirectoryRedirection); - connect(m_model, &KFileItemModel::urlIsFileError, this, &DolphinView::urlIsFileError); + connect(m_model, &KFileItemModel::urlIsFileError, this, &DolphinView::urlIsFileError); + connect(m_model, &KFileItemModel::fileItemsChanged, this, &DolphinView::fileItemsChanged); + connect(m_model, &KFileItemModel::currentDirectoryRemoved, this, &DolphinView::currentDirectoryRemoved); + + connect(this, &DolphinView::itemCountChanged, this, &DolphinView::updatePlaceholderLabel); m_view->installEventFilter(this); - connect(m_view, &DolphinItemListView::sortOrderChanged, - this, &DolphinView::slotSortOrderChangedByHeader); - connect(m_view, &DolphinItemListView::sortRoleChanged, - this, &DolphinView::slotSortRoleChangedByHeader); - connect(m_view, &DolphinItemListView::visibleRolesChanged, - this, &DolphinView::slotVisibleRolesChangedByHeader); - connect(m_view, &DolphinItemListView::roleEditingCanceled, - this, &DolphinView::slotRoleEditingCanceled); - connect(m_view->header(), &KItemListHeader::columnWidthChangeFinished, - this, &DolphinView::slotHeaderColumnWidthChangeFinished); - - KItemListSelectionManager* selectionManager = controller->selectionManager(); - connect(selectionManager, &KItemListSelectionManager::selectionChanged, - this, &DolphinView::slotSelectionChanged); - -#ifdef HAVE_BALOO + connect(m_view, &DolphinItemListView::sortOrderChanged, this, &DolphinView::slotSortOrderChangedByHeader); + connect(m_view, &DolphinItemListView::sortRoleChanged, this, &DolphinView::slotSortRoleChangedByHeader); + connect(m_view, &DolphinItemListView::visibleRolesChanged, this, &DolphinView::slotVisibleRolesChangedByHeader); + connect(m_view, &DolphinItemListView::roleEditingCanceled, this, &DolphinView::slotRoleEditingCanceled); + + connect(m_view, &DolphinItemListView::columnHovered, this, [this](int columnIndex) { + m_hoveredColumnHeaderIndex = columnIndex; + }); + connect(m_view, &DolphinItemListView::columnUnHovered, this, [this](int /* columnIndex */) { + m_hoveredColumnHeaderIndex = std::nullopt; + }); + connect(m_view->header(), &KItemListHeader::columnWidthChangeFinished, this, &DolphinView::slotHeaderColumnWidthChangeFinished); + connect(m_view->header(), &KItemListHeader::sidePaddingChanged, this, &DolphinView::slotSidePaddingWidthChanged); + + KItemListSelectionManager *selectionManager = controller->selectionManager(); + connect(selectionManager, &KItemListSelectionManager::selectionChanged, this, &DolphinView::slotSelectionChanged); + +#if HAVE_BALOO m_toolTipManager = new ToolTipManager(this); connect(m_toolTipManager, &ToolTipManager::urlActivated, this, &DolphinView::urlActivated); #endif @@ -187,7 +235,9 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) : m_versionControlObserver->setView(this); m_versionControlObserver->setModel(m_model); connect(m_versionControlObserver, &VersionControlObserver::infoMessage, this, &DolphinView::infoMessage); - connect(m_versionControlObserver, &VersionControlObserver::errorMessage, this, &DolphinView::errorMessage); + connect(m_versionControlObserver, &VersionControlObserver::errorMessage, this, [this](const QString &message) { + Q_EMIT errorMessage(message, KIO::ERR_UNKNOWN); + }); connect(m_versionControlObserver, &VersionControlObserver::operationCompletedMessage, this, &DolphinView::operationCompletedMessage); m_twoClicksRenamingTimer = new QTimer(this); @@ -202,6 +252,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) : DolphinView::~DolphinView() { + disconnect(m_container->controller(), &KItemListController::modelChanged, this, &DolphinView::slotModelChanged); } QUrl DolphinView::url() const @@ -221,8 +272,7 @@ void DolphinView::setActive(bool active) if (active) { m_container->setFocus(); - emit activated(); - emit writeStateChanged(m_isFolderWritable); + Q_EMIT activated(); } } @@ -231,9 +281,13 @@ bool DolphinView::isActive() const return m_active; } -void DolphinView::setMode(Mode mode) +void DolphinView::setViewMode(Mode mode) { if (mode != m_mode) { + // Reset scrollbars before changing the view mode. + m_container->horizontalScrollBar()->setValue(0); + m_container->verticalScrollBar()->setValue(0); + ViewProperties props(viewPropertiesUrl()); props.setViewMode(mode); @@ -245,11 +299,39 @@ void DolphinView::setMode(Mode mode) } } -DolphinView::Mode DolphinView::mode() const +DolphinView::Mode DolphinView::viewMode() const { return m_mode; } +void DolphinView::setSelectionModeEnabled(const bool enabled) +{ + if (enabled) { + if (!m_proxyStyle) { + m_proxyStyle = std::make_unique(); + } + setStyle(m_proxyStyle.get()); + m_view->setStyle(m_proxyStyle.get()); + m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::False); + } else { + setStyle(nullptr); + m_view->setStyle(nullptr); + m_view->setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled::FollowSetting); + } + m_container->controller()->setSelectionModeEnabled(enabled); +#ifndef QT_NO_ACCESSIBILITY + if (QAccessible::isActive()) { + auto accessibleViewInterface = static_cast(QAccessible::queryAccessibleInterface(m_view)); + accessibleViewInterface->announceSelectionModeEnabled(enabled); + } +#endif +} + +bool DolphinView::selectionMode() const +{ + return m_container->controller()->selectionMode(); +} + void DolphinView::setPreviewsShown(bool show) { if (previewsShown() == show) { @@ -261,11 +343,11 @@ void DolphinView::setPreviewsShown(bool show) const int oldZoomLevel = m_view->zoomLevel(); m_view->setPreviewsShown(show); - emit previewsShownChanged(show); + Q_EMIT previewsShownChanged(show); const int newZoomLevel = m_view->zoomLevel(); if (newZoomLevel != oldZoomLevel) { - emit zoomLevelChanged(newZoomLevel, oldZoomLevel); + Q_EMIT zoomLevelChanged(newZoomLevel, oldZoomLevel); } } @@ -288,7 +370,7 @@ void DolphinView::setHiddenFilesShown(bool show) props.setHiddenFilesShown(show); m_model->setShowHiddenFiles(show); - emit hiddenFilesShownChanged(show); + Q_EMIT hiddenFilesShownChanged(show); } bool DolphinView::hiddenFilesShown() const @@ -304,11 +386,10 @@ void DolphinView::setGroupedSorting(bool grouped) ViewProperties props(viewPropertiesUrl()); props.setGroupedSorting(grouped); - props.save(); - m_container->controller()->model()->setGroupedSorting(grouped); + m_model->setGroupedSorting(grouped); - emit groupedSortingChanged(grouped); + Q_EMIT groupedSortingChanged(grouped); } bool DolphinView::groupedSorting() const @@ -336,7 +417,7 @@ int DolphinView::itemsCount() const KFileItemList DolphinView::selectedItems() const { - const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); KFileItemList selectedItems; const auto items = selectionManager->selectedItems(); @@ -349,13 +430,14 @@ KFileItemList DolphinView::selectedItems() const int DolphinView::selectedItemsCount() const { - const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); return selectionManager->selectedItems().count(); } -void DolphinView::markUrlsAsSelected(const QList& urls) +void DolphinView::markUrlsAsSelected(const QList &urls) { m_selectedUrls = urls; + m_selectJobCreatedItems = false; } void DolphinView::markUrlAsCurrent(const QUrl &url) @@ -366,10 +448,8 @@ void DolphinView::markUrlAsCurrent(const QUrl &url) void DolphinView::selectItems(const QRegularExpression ®exp, bool enabled) { - const KItemListSelectionManager::SelectionMode mode = enabled - ? KItemListSelectionManager::Select - : KItemListSelectionManager::Deselect; - KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + const KItemListSelectionManager::SelectionMode mode = enabled ? KItemListSelectionManager::Select : KItemListSelectionManager::Deselect; + KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); for (int index = 0; index < m_model->count(); index++) { const KFileItem item = m_model->fileItem(index); @@ -389,7 +469,7 @@ void DolphinView::setZoomLevel(int level) m_view->setZoomLevel(level); if (zoomLevel() != oldZoomLevel) { hideToolTip(); - emit zoomLevelChanged(zoomLevel(), oldZoomLevel); + Q_EMIT zoomLevelChanged(zoomLevel(), oldZoomLevel); } } @@ -398,23 +478,34 @@ int DolphinView::zoomLevel() const return m_view->zoomLevel(); } -void DolphinView::setSortRole(const QByteArray& role) +void DolphinView::setSortRole(const QByteArray &role) { if (role != sortRole()) { - updateSortRole(role); + ViewProperties props(viewPropertiesUrl()); + props.setSortRole(role); + + KItemModelBase *model = m_container->controller()->model(); + model->setSortRole(role); + + Q_EMIT sortRoleChanged(role); } } QByteArray DolphinView::sortRole() const { - const KItemModelBase* model = m_container->controller()->model(); + const KItemModelBase *model = m_container->controller()->model(); return model->sortRole(); } void DolphinView::setSortOrder(Qt::SortOrder order) { if (sortOrder() != order) { - updateSortOrder(order); + ViewProperties props(viewPropertiesUrl()); + props.setSortOrder(order); + + m_model->setSortOrder(order); + + Q_EMIT sortOrderChanged(order); } } @@ -435,7 +526,19 @@ bool DolphinView::sortFoldersFirst() const return m_model->sortDirectoriesFirst(); } -void DolphinView::setVisibleRoles(const QList& roles) +void DolphinView::setSortHiddenLast(bool hiddenLast) +{ + if (sortHiddenLast() != hiddenLast) { + updateSortHiddenLast(hiddenLast); + } +} + +bool DolphinView::sortHiddenLast() const +{ + return m_model->sortHiddenLast(); +} + +void DolphinView::setVisibleRoles(const QList &roles) { const QList previousRoles = roles; @@ -445,7 +548,7 @@ void DolphinView::setVisibleRoles(const QList& roles) m_visibleRoles = roles; m_view->setVisibleRoles(roles); - emit visibleRolesChanged(m_visibleRoles, previousRoles); + Q_EMIT visibleRolesChanged(m_visibleRoles, previousRoles); } QList DolphinView::visibleRoles() const @@ -474,12 +577,11 @@ void DolphinView::readSettings() m_view->readSettings(); applyViewProperties(); - const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1; - m_container->controller()->setAutoActivationDelay(delay); + m_container->controller()->setAutoActivationEnabled(GeneralSettings::autoExpandFolders()); const int newZoomLevel = m_view->zoomLevel(); if (newZoomLevel != oldZoomLevel) { - emit zoomLevelChanged(newZoomLevel, oldZoomLevel); + Q_EMIT zoomLevelChanged(newZoomLevel, oldZoomLevel); } } @@ -489,7 +591,7 @@ void DolphinView::writeSettings() m_view->writeSettings(); } -void DolphinView::setNameFilter(const QString& nameFilter) +void DolphinView::setNameFilter(const QString &nameFilter) { m_model->setNameFilter(nameFilter); } @@ -499,7 +601,7 @@ QString DolphinView::nameFilter() const return m_model->nameFilter(); } -void DolphinView::setMimeTypeFilters(const QStringList& filters) +void DolphinView::setMimeTypeFilters(const QStringList &filters) { return m_model->setMimeTypeFilters(filters); } @@ -509,20 +611,21 @@ QStringList DolphinView::mimeTypeFilters() const return m_model->mimeTypeFilters(); } -QString DolphinView::statusBarText() const +void DolphinView::requestStatusBarText() { - QString summary; - QString foldersText; - QString filesText; - - int folderCount = 0; - int fileCount = 0; - KIO::filesize_t totalFileSize = 0; + if (m_statJobForStatusBarText) { + // Kill the pending request. + m_statJobForStatusBarText->kill(); + } if (m_container->controller()->selectionManager()->hasSelection()) { + int folderCount = 0; + int fileCount = 0; + KIO::filesize_t totalFileSize = 0; + // Give a summary of the status of the selected files const KFileItemList list = selectedItems(); - foreach (const KFileItem& item, list) { + for (const KFileItem &item : list) { if (item.isDir()) { ++folderCount; } else { @@ -533,38 +636,53 @@ QString DolphinView::statusBarText() const if (folderCount + fileCount == 1) { // If only one item is selected, show info about it - return list.first().getStatusBarInfo(); + Q_EMIT statusBarTextChanged(list.first().getStatusBarInfo()); } else { // At least 2 items are selected - foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount); - filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount); + emitStatusBarText(folderCount, fileCount, totalFileSize, HasSelection); + } + } else { // has no selection + if (!m_model->rootItem().url().isValid()) { + return; } + + m_statJobForStatusBarText = KIO::stat(m_model->rootItem().url(), KIO::StatJob::SourceSide, KIO::StatRecursiveSize, KIO::HideProgressInfo); + connect(m_statJobForStatusBarText, &KJob::result, this, &DolphinView::slotStatJobResult); + m_statJobForStatusBarText->start(); + } +} + +void DolphinView::emitStatusBarText(const int folderCount, const int fileCount, KIO::filesize_t totalFileSize, const Selection selection) +{ + QString foldersText; + QString filesText; + QString summary; + + if (selection == HasSelection) { + // At least 2 items are selected because the case of 1 selected item is handled in + // DolphinView::requestStatusBarText(). + foldersText = i18ncp("@info:status", "1 folder selected", "%1 folders selected", folderCount); + filesText = i18ncp("@info:status", "1 file selected", "%1 files selected", fileCount); } else { - calculateItemCount(fileCount, folderCount, totalFileSize); - foldersText = i18ncp("@info:status", "1 Folder", "%1 Folders", folderCount); - filesText = i18ncp("@info:status", "1 File", "%1 Files", fileCount); + foldersText = i18ncp("@info:status", "1 folder", "%1 folders", folderCount); + filesText = i18ncp("@info:status", "1 file", "%1 files", fileCount); } if (fileCount > 0 && folderCount > 0) { - summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)", - foldersText, filesText, - KFormat().formatByteSize(totalFileSize)); + summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)", foldersText, filesText, KFormat().formatByteSize(totalFileSize)); } else if (fileCount > 0) { - summary = i18nc("@info:status files (size)", "%1 (%2)", - filesText, - KFormat().formatByteSize(totalFileSize)); + summary = i18nc("@info:status files (size)", "%1 (%2)", filesText, KFormat().formatByteSize(totalFileSize)); } else if (folderCount > 0) { summary = foldersText; } else { - summary = i18nc("@info:status", "0 Folders, 0 Files"); + summary = i18nc("@info:status", "0 folders, 0 files"); } - - return summary; + Q_EMIT statusBarTextChanged(summary); } -QList DolphinView::versionControlActions(const KFileItemList& items) const +QList DolphinView::versionControlActions(const KFileItemList &items) const { - QList actions; + QList actions; if (items.isEmpty()) { const KFileItem item = m_model->rootItem(); @@ -578,7 +696,7 @@ QList DolphinView::versionControlActions(const KFileItemList& items) c return actions; } -void DolphinView::setUrl(const QUrl& url) +void DolphinView::setUrl(const QUrl &url) { if (url == m_url) { return; @@ -590,8 +708,7 @@ void DolphinView::setUrl(const QUrl& url) hideToolTip(); - disconnect(m_view, &DolphinItemListView::roleEditingFinished, - this, &DolphinView::slotRoleEditingFinished); + disconnect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished); // It is important to clear the items from the model before // applying the view properties, otherwise expensive operations @@ -601,23 +718,24 @@ void DolphinView::setUrl(const QUrl& url) applyViewProperties(); loadDirectory(url); - emit urlChanged(url); + Q_EMIT urlChanged(url); } void DolphinView::selectAll() { - KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); selectionManager->setSelected(0, m_model->count()); } void DolphinView::invertSelection() { - KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); selectionManager->setSelected(0, m_model->count(), KItemListSelectionManager::Toggle); } void DolphinView::clearSelection() { + m_selectJobCreatedItems = false; m_selectedUrls.clear(); m_container->controller()->selectionManager()->clearSelection(); } @@ -631,16 +749,40 @@ void DolphinView::renameSelectedItems() if (items.count() == 1 && GeneralSettings::renameInline()) { const int index = m_model->index(items.first()); - m_view->editRole(index, "text"); - hideToolTip(); + connect( + m_view, + &KItemListView::scrollingStopped, + this, + [this, index]() { + m_view->editRole(index, "text"); + + hideToolTip(); + + connect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished); + }, + Qt::SingleShotConnection); + m_view->scrollToItem(index); - connect(m_view, &DolphinItemListView::roleEditingFinished, - this, &DolphinView::slotRoleEditingFinished); } else { - KIO::RenameFileDialog* dialog = new KIO::RenameFileDialog(items, this); - connect(dialog, &KIO::RenameFileDialog::renamingFinished, - this, &DolphinView::slotRenameDialogRenamingFinished); + KIO::RenameFileDialog *dialog = new KIO::RenameFileDialog(items, this); + connect(dialog, &KIO::RenameFileDialog::renamingFinished, this, [this, items](const QList &urls) { + // The model may have already been updated, so it's possible that we don't find the old items. + for (int i = 0; i < items.count(); ++i) { + const int index = m_model->index(items[i]); + if (index >= 0) { + QHash data; + data.insert("text", urls[i].fileName()); + m_model->setData(index, data); + } + } + + forceUrlsSelection(urls.first(), urls); + updateSelectionState(); + }); + connect(dialog, &KIO::RenameFileDialog::error, this, [this](KJob *job) { + KMessageBox::error(this, job->errorString()); + }); dialog->open(); } @@ -654,63 +796,82 @@ void DolphinView::renameSelectedItems() void DolphinView::trashSelectedItems() { const QList list = simplifiedSelectedUrls(); - KIO::JobUiDelegate uiDelegate; - uiDelegate.setWindow(window()); - if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) { - KIO::Job* job = KIO::trash(list); - KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, QUrl(QStringLiteral("trash:/")), job); - KJobWidgets::setWindow(job, this); - connect(job, &KIO::Job::result, - this, &DolphinView::slotTrashFileFinished); - } + + using Iface = KIO::AskUserActionInterface; + auto *trashJob = new KIO::DeleteOrTrashJob(list, Iface::Trash, Iface::DefaultConfirmation, this); + connect(trashJob, &KJob::result, this, &DolphinView::slotTrashFileFinished); + m_selectNextItem = true; + trashJob->start(); } void DolphinView::deleteSelectedItems() { const QList list = simplifiedSelectedUrls(); - KIO::JobUiDelegate uiDelegate; - uiDelegate.setWindow(window()); - if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) { - KIO::Job* job = KIO::del(list); - KJobWidgets::setWindow(job, this); - connect(job, &KIO::Job::result, - this, &DolphinView::slotDeleteFileFinished); - } + using Iface = KIO::AskUserActionInterface; + auto *trashJob = new KIO::DeleteOrTrashJob(list, Iface::Delete, Iface::DefaultConfirmation, this); + connect(trashJob, &KJob::result, this, &DolphinView::slotDeleteFileFinished); + m_selectNextItem = true; + trashJob->start(); } void DolphinView::cutSelectedItemsToClipboard() { - QMimeData* mimeData = selectionMimeData(); + QMimeData *mimeData = selectionMimeData(); KIO::setClipboardDataCut(mimeData, true); + KUrlMimeData::exportUrlsToPortal(mimeData); QApplication::clipboard()->setMimeData(mimeData); } void DolphinView::copySelectedItemsToClipboard() { - QMimeData* mimeData = selectionMimeData(); + QMimeData *mimeData = selectionMimeData(); + KUrlMimeData::exportUrlsToPortal(mimeData); QApplication::clipboard()->setMimeData(mimeData); } -void DolphinView::copySelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl) +void DolphinView::copySelectedItems(const KFileItemList &selection, const QUrl &destinationUrl) { - KIO::CopyJob* job = KIO::copy(selection.urlList(), destinationUrl, KIO::DefaultFlags); + if (selection.isEmpty() || !destinationUrl.isValid()) { + return; + } + + m_clearSelectionBeforeSelectingNewItems = true; + m_markFirstNewlySelectedItemAsCurrent = true; + m_selectJobCreatedItems = true; + + KIO::CopyJob *job = KIO::copy(selection.urlList(), destinationUrl, KIO::DefaultFlags); KJobWidgets::setWindow(job, this); - connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult); - connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotCopyingDone); + connect(job, &KIO::CopyJob::result, this, &DolphinView::slotJobResult); + connect(job, &KIO::CopyJob::copying, this, &DolphinView::slotItemCreatedFromJob); + connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotItemCreatedFromJob); + connect(job, &KIO::CopyJob::warning, this, [](KJob *job, const QString &warning) { + Q_EMIT errorMessage(job->errorString(), job->error()); + }); KIO::FileUndoManager::self()->recordCopyJob(job); } -void DolphinView::moveSelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl) +void DolphinView::moveSelectedItems(const KFileItemList &selection, const QUrl &destinationUrl) { - KIO::CopyJob* job = KIO::move(selection.urlList(), destinationUrl, KIO::DefaultFlags); + if (selection.isEmpty() || !destinationUrl.isValid()) { + return; + } + + m_clearSelectionBeforeSelectingNewItems = true; + m_markFirstNewlySelectedItemAsCurrent = true; + m_selectJobCreatedItems = true; + + KIO::CopyJob *job = KIO::move(selection.urlList(), destinationUrl, KIO::DefaultFlags); KJobWidgets::setWindow(job, this); - connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult); - connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotCopyingDone); + connect(job, &KIO::CopyJob::result, this, &DolphinView::slotJobResult); + connect(job, &KIO::CopyJob::moving, this, &DolphinView::slotItemCreatedFromJob); + connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotItemCreatedFromJob); + connect(job, &KIO::CopyJob::warning, this, [](KJob *job, const QString &warning) { + Q_EMIT errorMessage(job->errorString(), job->error()); + }); KIO::FileUndoManager::self()->recordCopyJob(job); - } void DolphinView::paste() @@ -735,11 +896,14 @@ void DolphinView::duplicateSelectedItems() const QMimeDatabase db; + m_clearSelectionBeforeSelectingNewItems = true; + m_markFirstNewlySelectedItemAsCurrent = true; + m_selectJobCreatedItems = true; + // Duplicate all selected items and append "copy" to the end of the file name // but before the filename extension, if present - QList newSelection; for (const auto &item : itemList) { - const QUrl originalURL = item.url(); + const QUrl originalURL = item.url(); const QString originalDirectoryPath = originalURL.adjusted(QUrl::RemoveFilename).path(); const QString originalFileName = item.name(); @@ -750,7 +914,7 @@ void DolphinView::duplicateSelectedItems() // No extension; new filename is " copy" if (extension.isEmpty()) { duplicateURL.setPath(originalDirectoryPath + i18nc(" copy", "%1 copy", originalFileName)); - // There's an extension; new filename is " copy." + // There's an extension; new filename is " copy." } else { // Need to add a dot since QMimeDatabase::suffixForFileName() doesn't include it extension = QLatin1String(".") + extension; @@ -761,16 +925,15 @@ void DolphinView::duplicateSelectedItems() duplicateURL.setPath(originalDirectoryPath + i18nc(" copy", "%1 copy", originalFilenameWithoutExtension) + originalExtension); } - KIO::CopyJob* job = KIO::copyAs(originalURL, duplicateURL, KIO::HideProgressInfo); + KIO::CopyJob *job = KIO::copyAs(originalURL, duplicateURL); + job->setAutoRename(true); KJobWidgets::setWindow(job, this); - if (job) { - newSelection << duplicateURL; - KIO::FileUndoManager::self()->recordCopyJob(job); - } + connect(job, &KIO::CopyJob::result, this, &DolphinView::slotJobResult); + connect(job, &KIO::CopyJob::copyingDone, this, &DolphinView::slotItemCreatedFromJob); + connect(job, &KIO::CopyJob::copyingLinkDone, this, &DolphinView::slotItemLinkCreatedFromJob); + KIO::FileUndoManager::self()->recordCopyJob(job); } - - forceUrlsSelection(newSelection.first(), newSelection); } void DolphinView::stopLoading() @@ -785,7 +948,7 @@ void DolphinView::updatePalette() color.setAlpha(150); } - QWidget* viewport = m_container->viewport(); + QWidget *viewport = m_container->viewport(); if (viewport) { QPalette palette; palette.setColor(viewport->backgroundRole(), color); @@ -801,7 +964,7 @@ void DolphinView::abortTwoClicksRenaming() m_twoClicksRenamingTimer->stop(); } -bool DolphinView::eventFilter(QObject* watched, QEvent* event) +bool DolphinView::eventFilter(QObject *watched, QEvent *event) { switch (event->type()) { case QEvent::PaletteChange: @@ -817,13 +980,18 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) case QEvent::KeyPress: hideToolTip(ToolTipManager::HideBehavior::Instantly); if (GeneralSettings::useTabForSwitchingSplitView()) { - QKeyEvent* keyEvent = static_cast(event); + QKeyEvent *keyEvent = static_cast(event); if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier) { - emit toggleActiveViewRequested(); + Q_EMIT toggleActiveViewRequested(); return true; } } break; + case QEvent::KeyRelease: + if (static_cast(event)->key() == Qt::Key_Control) { + m_controlWheelAccumulatedDelta = 0; + } + break; case QEvent::FocusIn: if (watched == m_container) { setActive(true); @@ -847,6 +1015,26 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) if (watched == m_view) { m_dragging = false; } + break; + + case QEvent::ToolTip: { + const auto helpEvent = static_cast(event); + if (tryShowNameToolTip(helpEvent)) { + return true; + + } else if (m_hoveredColumnHeaderIndex) { + const auto rolesInfo = KFileItemModel::rolesInformation(); + const auto visibleRole = m_visibleRoles.value(*m_hoveredColumnHeaderIndex); + + for (const KFileItemModel::RoleInfo &info : rolesInfo) { + if (visibleRole == info.role) { + QToolTip::showText(helpEvent->globalPos(), info.tooltip, this); + return true; + } + } + } + break; + } default: break; } @@ -854,26 +1042,32 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) return QWidget::eventFilter(watched, event); } -void DolphinView::wheelEvent(QWheelEvent* event) +void DolphinView::wheelEvent(QWheelEvent *event) { if (event->modifiers().testFlag(Qt::ControlModifier)) { - const int numDegrees = event->delta() / 8; - const int numSteps = numDegrees / 15; + m_controlWheelAccumulatedDelta += event->angleDelta().y(); + + if (m_controlWheelAccumulatedDelta <= -QWheelEvent::DefaultDeltasPerStep) { + slotDecreaseZoom(); + m_controlWheelAccumulatedDelta += QWheelEvent::DefaultDeltasPerStep; + } else if (m_controlWheelAccumulatedDelta >= QWheelEvent::DefaultDeltasPerStep) { + slotIncreaseZoom(); + m_controlWheelAccumulatedDelta -= QWheelEvent::DefaultDeltasPerStep; + } - setZoomLevel(zoomLevel() + numSteps); event->accept(); } else { event->ignore(); } } -void DolphinView::hideEvent(QHideEvent* event) +void DolphinView::hideEvent(QHideEvent *event) { hideToolTip(); QWidget::hideEvent(event); } -bool DolphinView::event(QEvent* event) +bool DolphinView::event(QEvent *event) { if (event->type() == QEvent::WindowDeactivate) { /* See Bug 297355 @@ -899,20 +1093,28 @@ void DolphinView::slotItemActivated(int index) const KFileItem item = m_model->fileItem(index); if (!item.isNull()) { - emit itemActivated(item); + Q_EMIT itemActivated(item); } } -void DolphinView::slotItemsActivated(const KItemSet& indexes) +void DolphinView::slotItemsActivated(const KItemSet &indexes) { Q_ASSERT(indexes.count() >= 2); abortTwoClicksRenaming(); + const auto modifiers = QGuiApplication::keyboardModifiers(); + if (indexes.count() > 5) { QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count()); - const int answer = KMessageBox::warningYesNo(this, question); - if (answer != KMessageBox::Yes) { + const int answer = KMessageBox::warningContinueCancel( + this, + question, + {}, + KGuiItem(i18ncp("@action:button", "Open %1 Item", "Open %1 Items", indexes.count()), QStringLiteral("document-open")), + KStandardGuiItem::cancel(), + QStringLiteral("ConfirmOpenManyFolders")); + if (answer != KMessageBox::PrimaryAction && answer != KMessageBox::Continue) { return; } } @@ -922,78 +1124,101 @@ void DolphinView::slotItemsActivated(const KItemSet& indexes) for (int index : indexes) { KFileItem item = m_model->fileItem(index); - const QUrl& url = openItemAsFolderUrl(item); - - if (!url.isEmpty()) { // Open folders in new tabs - emit tabRequested(url, DolphinTabWidget::AfterLastTab); + const QUrl &url = openItemAsFolderUrl(item); + + if (!url.isEmpty()) { + // Open folders in new tabs or in new windows depending on the modifier + // The ctrl+shift behavior is ignored because we are handling multiple items + // keep in sync with KUrlNavigator::slotNavigatorButtonClicked + if (modifiers & Qt::ShiftModifier && !(modifiers & Qt::ControlModifier)) { + Q_EMIT windowRequested(url); + } else { + Q_EMIT tabRequested(url); + } } else { items.append(item); } } if (items.count() == 1) { - emit itemActivated(items.first()); + Q_EMIT itemActivated(items.first()); } else if (items.count() > 1) { - emit itemsActivated(items); + Q_EMIT itemsActivated(items); } } void DolphinView::slotItemMiddleClicked(int index) { - const KFileItem& item = m_model->fileItem(index); - const QUrl& url = openItemAsFolderUrl(item); + const KFileItem &item = m_model->fileItem(index); + const QUrl &url = openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives()); + const auto modifiers = QGuiApplication::keyboardModifiers(); if (!url.isEmpty()) { - emit tabRequested(url, DolphinTabWidget::AfterCurrentTab); + // keep in sync with KUrlNavigator::slotNavigatorButtonClicked + if (modifiers & Qt::ShiftModifier) { + Q_EMIT activeTabRequested(url); + } else { + Q_EMIT tabRequested(url); + } } else if (isTabsForFilesEnabled()) { - emit tabRequested(item.url(), DolphinTabWidget::AfterCurrentTab); + // keep in sync with KUrlNavigator::slotNavigatorButtonClicked + if (modifiers & Qt::ShiftModifier) { + Q_EMIT activeTabRequested(item.url()); + } else { + Q_EMIT tabRequested(item.url()); + } + } else { + Q_EMIT fileMiddleClickActivated(item); } } -void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos) +void DolphinView::slotItemContextMenuRequested(int index, const QPointF &pos) { // Force emit of a selection changed signal before we request the // context menu, to update the edit-actions first. (See Bug 294013) if (m_selectionChangedTimer->isActive()) { emitSelectionChangedSignal(); } + if (m_twoClicksRenamingTimer->isActive()) { + abortTwoClicksRenaming(); + } const KFileItem item = m_model->fileItem(index); - emit requestContextMenu(pos.toPoint(), item, url(), QList()); + Q_EMIT requestContextMenu(pos.toPoint(), item, selectedItems(), url()); } -void DolphinView::slotViewContextMenuRequested(const QPointF& pos) +void DolphinView::slotViewContextMenuRequested(const QPointF &pos) { - emit requestContextMenu(pos.toPoint(), KFileItem(), url(), QList()); + Q_EMIT requestContextMenu(pos.toPoint(), KFileItem(), selectedItems(), url()); } -void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) +void DolphinView::slotHeaderContextMenuRequested(const QPointF &pos) { ViewProperties props(viewPropertiesUrl()); - QPointer menu = new QMenu(QApplication::activeWindow()); + QPointer menu = new QMenu(this); - KItemListView* view = m_container->controller()->view(); - const QSet visibleRolesSet = view->visibleRoles().toSet(); + KItemListView *view = m_container->controller()->view(); + const QList visibleRolesSet = view->visibleRoles(); bool indexingEnabled = false; -#ifdef HAVE_BALOO +#if HAVE_BALOO Baloo::IndexerConfig config; indexingEnabled = config.fileIndexingEnabled(); #endif QString groupName; - QMenu* groupMenu = nullptr; + QMenu *groupMenu = nullptr; // Add all roles to the menu that can be shown or hidden by the user const QList rolesInfo = KFileItemModel::rolesInformation(); - foreach (const KFileItemModel::RoleInfo& info, rolesInfo) { + for (const KFileItemModel::RoleInfo &info : rolesInfo) { if (info.role == "text") { // It should not be possible to hide the "text" role continue; } const QString text = m_model->roleDescription(info.role); - QAction* action = nullptr; + QAction *action = nullptr; if (info.group.isEmpty()) { action = menu->addAction(text); } else { @@ -1008,31 +1233,34 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) action->setCheckable(true); action->setChecked(visibleRolesSet.contains(info.role)); action->setData(info.role); + action->setToolTip(info.tooltip); - const bool enable = (!info.requiresBaloo && !info.requiresIndexer) || - (info.requiresBaloo) || - (info.requiresIndexer && indexingEnabled); + const bool enable = (!info.requiresBaloo && !info.requiresIndexer) || (info.requiresBaloo) || (info.requiresIndexer && indexingEnabled); action->setEnabled(enable); } menu->addSeparator(); - QActionGroup* widthsGroup = new QActionGroup(menu); + QActionGroup *widthsGroup = new QActionGroup(menu); const bool autoColumnWidths = props.headerColumnWidths().isEmpty(); - QAction* autoAdjustWidthsAction = menu->addAction(i18nc("@action:inmenu", "Automatic Column Widths")); + QAction *toggleSidePaddingAction = menu->addAction(i18nc("@action:inmenu", "Side Padding")); + toggleSidePaddingAction->setCheckable(true); + toggleSidePaddingAction->setChecked(layoutDirection() == Qt::LeftToRight ? view->header()->leftPadding() > 0 : view->header()->rightPadding() > 0); + + QAction *autoAdjustWidthsAction = menu->addAction(i18nc("@action:inmenu", "Automatic Column Widths")); autoAdjustWidthsAction->setCheckable(true); autoAdjustWidthsAction->setChecked(autoColumnWidths); autoAdjustWidthsAction->setActionGroup(widthsGroup); - QAction* customWidthsAction = menu->addAction(i18nc("@action:inmenu", "Custom Column Widths")); + QAction *customWidthsAction = menu->addAction(i18nc("@action:inmenu", "Custom Column Widths")); customWidthsAction->setCheckable(true); customWidthsAction->setChecked(!autoColumnWidths); customWidthsAction->setActionGroup(widthsGroup); - QAction* action = menu->exec(pos.toPoint()); + QAction *action = menu->exec(pos.toPoint()); if (menu && action) { - KItemListHeader* header = view->header(); + KItemListHeader *header = view->header(); if (action == autoAdjustWidthsAction) { // Clear the column-widths from the viewproperties and turn on @@ -1043,12 +1271,19 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) // Apply the current column-widths as custom column-widths and turn // off the automatic resizing of the columns QList columnWidths; - columnWidths.reserve(view->visibleRoles().count()); - foreach (const QByteArray& role, view->visibleRoles()) { + const auto visibleRoles = view->visibleRoles(); + columnWidths.reserve(visibleRoles.count()); + for (const QByteArray &role : visibleRoles) { columnWidths.append(header->columnWidth(role)); } props.setHeaderColumnWidths(columnWidths); header->setAutomaticColumnResizing(false); + } else if (action == toggleSidePaddingAction) { + if (toggleSidePaddingAction->isChecked()) { + header->setSidePadding(20, 20); + } else { + header->setSidePadding(0, 0); + } } else { // Show or hide the selected role const QByteArray selectedRole = action->data().toByteArray(); @@ -1065,8 +1300,9 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) QList columnWidths; if (!header->automaticColumnResizing()) { - columnWidths.reserve(view->visibleRoles().count()); - foreach (const QByteArray& role, view->visibleRoles()) { + const auto visibleRoles = view->visibleRoles(); + columnWidths.reserve(visibleRoles.count()); + for (const QByteArray &role : visibleRoles) { columnWidths.append(header->columnWidth(role)); } } @@ -1077,7 +1313,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) delete menu; } -void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current) +void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray &role, qreal current) { const QList visibleRoles = m_view->visibleRoles(); @@ -1086,8 +1322,8 @@ void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qr if (columnWidths.count() != visibleRoles.count()) { columnWidths.clear(); columnWidths.reserve(visibleRoles.count()); - const KItemListHeader* header = m_view->header(); - foreach (const QByteArray& role, visibleRoles) { + const KItemListHeader *header = m_view->header(); + for (const QByteArray &role : visibleRoles) { const int width = header->columnWidth(role); columnWidths.append(width); } @@ -1100,6 +1336,14 @@ void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qr props.setHeaderColumnWidths(columnWidths); } +void DolphinView::slotSidePaddingWidthChanged(qreal leftPaddingWidth, qreal rightPaddingWidth) +{ + ViewProperties props(viewPropertiesUrl()); + DetailsModeSettings::setLeftPadding(int(leftPaddingWidth)); + DetailsModeSettings::setRightPadding(int(rightPaddingWidth)); + m_view->writeSettings(); +} + void DolphinView::slotItemHovered(int index) { const KFileItem item = m_model->fileItem(index); @@ -1109,22 +1353,25 @@ void DolphinView::slotItemHovered(int index) const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint()); itemRect.moveTo(pos); -#ifdef HAVE_BALOO - m_toolTipManager->showToolTip(item, itemRect, nativeParentWidget()->windowHandle()); +#if HAVE_BALOO + auto nativeParent = nativeParentWidget(); + if (nativeParent) { + m_toolTipManager->showToolTip(item, itemRect, nativeParent->windowHandle()); + } #endif } - emit requestItemInfo(item); + Q_EMIT requestItemInfo(item); } void DolphinView::slotItemUnhovered(int index) { Q_UNUSED(index) hideToolTip(); - emit requestItemInfo(KFileItem()); + Q_EMIT requestItemInfo(KFileItem()); } -void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) +void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent *event) { QUrl destUrl; KFileItem destItem = m_model->fileItem(index); @@ -1138,11 +1385,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even destUrl = destItem.mostLocalUrl(); } - 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()); dropUrls(destUrl, &dropEvent, this); setActive(true); @@ -1150,7 +1393,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget) { - KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget); + KIO::DropJob *job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget); if (job) { connect(job, &KIO::DropJob::result, this, &DolphinView::slotJobResult); @@ -1159,23 +1402,33 @@ void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget * // Mark the dropped urls as selected. m_clearSelectionBeforeSelectingNewItems = true; m_markFirstNewlySelectedItemAsCurrent = true; + m_selectJobCreatedItems = true; connect(job, &KIO::DropJob::itemCreated, this, &DolphinView::slotItemCreated); + connect(job, &KIO::DropJob::copyJobStarted, this, [this](const KIO::CopyJob *copyJob) { + connect(copyJob, &KIO::CopyJob::copying, this, &DolphinView::slotItemCreatedFromJob); + connect(copyJob, &KIO::CopyJob::moving, this, &DolphinView::slotItemCreatedFromJob); + connect(copyJob, &KIO::CopyJob::linking, this, [this](KIO::Job *job, const QString &src, const QUrl &dest) { + Q_UNUSED(job) + Q_UNUSED(src) + slotItemCreated(dest); + }); + }); } } } -void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous) +void DolphinView::slotModelChanged(KItemModelBase *current, KItemModelBase *previous) { if (previous != nullptr) { - Q_ASSERT(qobject_cast(previous)); - KFileItemModel* fileItemModel = static_cast(previous); + Q_ASSERT(qobject_cast(previous)); + KFileItemModel *fileItemModel = static_cast(previous); disconnect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted); m_versionControlObserver->setModel(nullptr); } if (current) { - Q_ASSERT(qobject_cast(current)); - KFileItemModel* fileItemModel = static_cast(current); + Q_ASSERT(qobject_cast(current)); + KFileItemModel *fileItemModel = static_cast(current); connect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted); m_versionControlObserver->setModel(fileItemModel); } @@ -1188,9 +1441,9 @@ void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons hideToolTip(); if (buttons & Qt::BackButton) { - emit goBackRequested(); + Q_EMIT goBackRequested(); } else if (buttons & Qt::ForwardButton) { - emit goForwardRequested(); + Q_EMIT goForwardRequested(); } } @@ -1206,36 +1459,66 @@ void DolphinView::slotSelectedItemTextPressed(int index) } } -void DolphinView::slotCopyingDone(KIO::Job *, const QUrl &, const QUrl &to) +void DolphinView::slotItemCreatedFromJob(KIO::Job *, const QUrl &, const QUrl &to) { slotItemCreated(to); } -void DolphinView::slotItemCreated(const QUrl& url) +void DolphinView::slotItemLinkCreatedFromJob(KIO::Job *, const QUrl &, const QString &, const QUrl &to) +{ + slotItemCreated(to); +} + +void DolphinView::slotItemCreated(const QUrl &url) { if (m_markFirstNewlySelectedItemAsCurrent) { markUrlAsCurrent(url); m_markFirstNewlySelectedItemAsCurrent = false; } - m_selectedUrls << url; + if (m_selectJobCreatedItems && !m_selectedUrls.contains(url)) { + m_selectedUrls << url; + } +} + +void DolphinView::onDirectoryLoadingCompletedAfterJob() +{ + // the model should now contain all the items created by the job + m_selectJobCreatedItems = true; // to make sure we overwrite selection + // update the view: scroll into View and selection + updateViewState(); + m_selectJobCreatedItems = false; + m_selectedUrls.clear(); } void DolphinView::slotJobResult(KJob *job) { - if (job->error()) { - emit errorMessage(job->errorString()); + if (job->error() && job->error() != KIO::ERR_USER_CANCELED) { + Q_EMIT errorMessage(job->errorString(), job->error()); + } + if (!m_selectJobCreatedItems) { + m_selectedUrls.clear(); + return; } if (!m_selectedUrls.isEmpty()) { m_selectedUrls = KDirModel::simplifiedUrlList(m_selectedUrls); + + updateSelectionState(); + if (!m_selectedUrls.isEmpty()) { + // not all urls were found, the model may not be up to date + connect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::onDirectoryLoadingCompletedAfterJob, Qt::SingleShotConnection); + } else { + m_selectJobCreatedItems = false; + m_selectedUrls.clear(); + } } } -void DolphinView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous) +void DolphinView::slotSelectionChanged(const KItemSet ¤t, const KItemSet &previous) { + m_selectNextItem = false; const int currentCount = current.count(); const int previousCount = previous.count(); - const bool selectionStateChanged = (currentCount == 0 && previousCount > 0) || - (currentCount > 0 && previousCount == 0); + const bool selectionStateChanged = (currentCount == 0 && previousCount > 0) || (currentCount > 0 && previousCount == 0); // If nothing has been selected before and something got selected (or if something // was selected before and now nothing is selected) the selectionChangedSignal must @@ -1247,38 +1530,56 @@ void DolphinView::slotSelectionChanged(const KItemSet& current, const KItemSet& void DolphinView::emitSelectionChangedSignal() { m_selectionChangedTimer->stop(); - emit selectionChanged(selectedItems()); + Q_EMIT selectionChanged(selectedItems()); } -void DolphinView::updateSortRole(const QByteArray& role) +void DolphinView::slotStatJobResult(KJob *job) { - ViewProperties props(viewPropertiesUrl()); - props.setSortRole(role); + int folderCount = 0; + int fileCount = 0; + KIO::filesize_t totalFileSize = 0; + bool countFileSize = true; - KItemModelBase* model = m_container->controller()->model(); - model->setSortRole(role); + const auto entry = static_cast(job)->statResult(); + if (entry.contains(KIO::UDSEntry::UDS_RECURSIVE_SIZE)) { + // We have a precomputed value. + totalFileSize = static_cast(entry.numberValue(KIO::UDSEntry::UDS_RECURSIVE_SIZE)); + countFileSize = false; + } - emit sortRoleChanged(role); + const int itemCount = m_model->count(); + for (int i = 0; i < itemCount; ++i) { + const KFileItem item = m_model->fileItem(i); + if (item.isDir()) { + ++folderCount; + } else { + ++fileCount; + if (countFileSize) { + totalFileSize += item.size(); + } + } + } + emitStatusBarText(folderCount, fileCount, totalFileSize, NoSelection); } -void DolphinView::updateSortOrder(Qt::SortOrder order) +void DolphinView::updateSortFoldersFirst(bool foldersFirst) { ViewProperties props(viewPropertiesUrl()); - props.setSortOrder(order); + props.setSortFoldersFirst(foldersFirst); - m_model->setSortOrder(order); + m_model->setSortDirectoriesFirst(foldersFirst); - emit sortOrderChanged(order); + Q_EMIT sortFoldersFirstChanged(foldersFirst); } -void DolphinView::updateSortFoldersFirst(bool foldersFirst) +void DolphinView::updateSortHiddenLast(bool hiddenLast) { ViewProperties props(viewPropertiesUrl()); - props.setSortFoldersFirst(foldersFirst); + props.setSortHiddenLast(hiddenLast); - m_model->setSortDirectoriesFirst(foldersFirst); + m_model->setSortHiddenLast(hiddenLast); - emit sortFoldersFirstChanged(foldersFirst); + Q_EMIT sortHiddenLastChanged(hiddenLast); } QPair DolphinView::pasteInfo() const @@ -1304,7 +1605,17 @@ bool DolphinView::itemsExpandable() const return m_mode == DetailsView; } -void DolphinView::restoreState(QDataStream& stream) +bool DolphinView::isExpanded(const KFileItem &item) const +{ + Q_ASSERT(item.isDir()); + Q_ASSERT(items().contains(item)); + if (!itemsExpandable()) { + return false; + } + return m_model->isExpanded(m_model->index(item)); +} + +void DolphinView::restoreState(QDataStream &stream) { // Read the version number of the view state and check if the version is supported. quint32 version = 0; @@ -1329,7 +1640,7 @@ void DolphinView::restoreState(QDataStream& stream) m_model->restoreExpandedDirectories(urls); } -void DolphinView::saveState(QDataStream& stream) +void DolphinView::saveState(QDataStream &stream) { stream << quint32(1); // View state version @@ -1361,7 +1672,7 @@ KFileItem DolphinView::rootItem() const return m_model->rootItem(); } -void DolphinView::setViewPropertiesContext(const QString& context) +void DolphinView::setViewPropertiesContext(const QString &context) { m_viewPropertiesContext = context; } @@ -1371,7 +1682,7 @@ QString DolphinView::viewPropertiesContext() const return m_viewPropertiesContext; } -QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseThroughArchives) +QUrl DolphinView::openItemAsFolderUrl(const KFileItem &item, const bool browseThroughArchives) { if (item.isNull()) { return QUrl(); @@ -1384,7 +1695,7 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh } if (item.isMimeTypeKnown()) { - const QString& mimetype = item.mimetype(); + const QString &mimetype = item.mimetype(); if (browseThroughArchives && item.isFile() && url.isLocalFile()) { // Generic mechanism for redirecting to tar:// when clicking on a tar file, @@ -1392,7 +1703,7 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh // The .protocol file specifies the mimetype that the kioslave handles. // Note that we don't use mimetype inheritance since we don't want to // open OpenDocument files as zip folders... - const QString& protocol = KProtocolManager::protocolForArchiveMimetype(mimetype); + const QString &protocol = KProtocolManager::protocolForArchiveMimetype(mimetype); if (!protocol.isEmpty()) { url.setScheme(protocol); return url; @@ -1416,37 +1727,71 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh void DolphinView::resetZoomLevel() { - ViewModeSettings::ViewMode mode; + ViewModeSettings settings{m_mode}; + settings.useDefaults(true); + const int defaultIconSize = settings.iconSize(); + settings.useDefaults(false); - switch (m_mode) { - case IconsView: mode = ViewModeSettings::IconsMode; break; - case CompactView: mode = ViewModeSettings::CompactMode; break; - case DetailsView: mode = ViewModeSettings::DetailsMode; break; - } - const ViewModeSettings settings(mode); - const QSize iconSize = QSize(settings.iconSize(), settings.iconSize()); - setZoomLevel(ZoomLevelInfo::zoomLevelForIconSize(iconSize)); + setZoomLevel(ZoomLevelInfo::zoomLevelForIconSize(QSize(defaultIconSize, defaultIconSize))); } -void DolphinView::observeCreatedItem(const QUrl& url) +void DolphinView::observeCreatedItem(const QUrl &url) { if (m_active) { forceUrlsSelection(url, {url}); } } -void DolphinView::slotDirectoryRedirection(const QUrl& oldUrl, const QUrl& newUrl) +void DolphinView::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUrl) { if (oldUrl.matches(url(), QUrl::StripTrailingSlash)) { - emit redirection(oldUrl, newUrl); + Q_EMIT redirection(oldUrl, newUrl); m_url = newUrl; // #186947 } } +void DolphinView::updateSelectionState() +{ + if (!m_selectedUrls.isEmpty()) { + KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); + + const bool shouldScrollToCurrentItem = m_clearSelectionBeforeSelectingNewItems; + // if there is a selection already, leave it that way + // unless some drop/paste job are in the process of creating items + if (!selectionManager->hasSelection() || m_selectJobCreatedItems) { + if (m_clearSelectionBeforeSelectingNewItems) { + selectionManager->clearSelection(); + m_clearSelectionBeforeSelectingNewItems = false; + } + + KItemSet selectedItems = selectionManager->selectedItems(); + + QList::iterator it = m_selectedUrls.begin(); + while (it != m_selectedUrls.end()) { + const int index = m_model->index(*it); + if (index >= 0) { + selectedItems.insert(index); + it = m_selectedUrls.erase(it); + } else { + ++it; + } + } + + if (!selectedItems.isEmpty()) { + selectionManager->beginAnchoredSelection(selectionManager->currentItem()); + selectionManager->setSelectedItems(selectedItems); + if (shouldScrollToCurrentItem) { + m_view->scrollToItem(selectedItems.first()); + } + } + } + } +} + void DolphinView::updateViewState() { if (m_currentItemUrl != QUrl()) { - KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); // if there is a selection already, leave it that way if (!selectionManager->hasSelection()) { @@ -1456,15 +1801,16 @@ void DolphinView::updateViewState() // scroll to current item and reset the state if (m_scrollToCurrentItem) { - m_view->scrollToItem(currentIndex); + m_view->scrollToItem(currentIndex, KItemListView::ViewItemPosition::Middle); m_scrollToCurrentItem = false; } + m_currentItemUrl = QUrl(); } else { selectionManager->setCurrentItem(0); } + } else { + m_currentItemUrl = QUrl(); } - - m_currentItemUrl = QUrl(); } if (!m_restoredContentsPosition.isNull()) { @@ -1476,77 +1822,30 @@ void DolphinView::updateViewState() m_container->verticalScrollBar()->setValue(y); } - if (!m_selectedUrls.isEmpty()) { - KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); - - // if there is a selection already, leave it that way - if (!selectionManager->hasSelection()) { - if (m_clearSelectionBeforeSelectingNewItems) { - selectionManager->clearSelection(); - m_clearSelectionBeforeSelectingNewItems = false; - } - - KItemSet selectedItems = selectionManager->selectedItems(); - - QList::iterator it = m_selectedUrls.begin(); - while (it != m_selectedUrls.end()) { - const int index = m_model->index(*it); - if (index >= 0) { - selectedItems.insert(index); - it = m_selectedUrls.erase(it); - } else { - ++it; - } - } - - selectionManager->beginAnchoredSelection(selectionManager->currentItem()); - selectionManager->setSelectedItems(selectedItems); - } - } + updateSelectionState(); } void DolphinView::hideToolTip(const ToolTipManager::HideBehavior behavior) { -#ifdef HAVE_BALOO if (GeneralSettings::showToolTips()) { +#if HAVE_BALOO m_toolTipManager->hideToolTip(behavior); - } +#else + Q_UNUSED(behavior) #endif + } else if (m_mode == DolphinView::IconsView) { + QToolTip::hideText(); + } } -void DolphinView::calculateItemCount(int& fileCount, - int& folderCount, - KIO::filesize_t& totalFileSize) const +bool DolphinView::handleSpaceAsNormalKey() const { - const int itemCount = m_model->count(); - - bool countFileSize = true; - - // In case we have a precomputed value - const auto job = KIO::statDetails(m_model->rootItem().url(), KIO::StatJob::SourceSide, KIO::StatRecursiveSize); - job->exec(); - const auto entry = job->statResult(); - if (entry.contains(KIO::UDSEntry::UDS_RECURSIVE_SIZE)) { - totalFileSize = static_cast(entry.numberValue(KIO::UDSEntry::UDS_RECURSIVE_SIZE)); - countFileSize = false; - } - - for (int i = 0; i < itemCount; ++i) { - const KFileItem item = m_model->fileItem(i); - if (item.isDir()) { - ++folderCount; - } else { - ++fileCount; - if (countFileSize) { - totalFileSize += item.size(); - } - } - } + return !m_container->hasFocus() || m_container->controller()->isSearchAsYouTypeActive(); } void DolphinView::slotTwoClicksRenamingTimerTimeout() { - const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); // verify that only one item is selected if (selectionManager->selectedItems().count() == 1) { @@ -1560,35 +1859,65 @@ void DolphinView::slotTwoClicksRenamingTimerTimeout() } } -void DolphinView::slotTrashFileFinished(KJob* job) +void DolphinView::slotTrashFileFinished(KJob *job) { if (job->error() == 0) { - emit operationCompletedMessage(i18nc("@info:status", "Trash operation completed.")); + selectNextItem(); // Fixes BUG: 419914 via selecting next item + Q_EMIT operationCompletedMessage(i18nc("@info:status", "Trash operation completed.")); } else if (job->error() != KIO::ERR_USER_CANCELED) { - emit errorMessage(job->errorString()); + Q_EMIT errorMessage(job->errorString(), job->error()); } } -void DolphinView::slotDeleteFileFinished(KJob* job) +void DolphinView::slotDeleteFileFinished(KJob *job) { if (job->error() == 0) { - emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed.")); + selectNextItem(); // Fixes BUG: 419914 via selecting next item + Q_EMIT operationCompletedMessage(i18nc("@info:status", "Delete operation completed.")); } else if (job->error() != KIO::ERR_USER_CANCELED) { - emit errorMessage(job->errorString()); + Q_EMIT errorMessage(job->errorString(), job->error()); + } +} + +void DolphinView::selectNextItem() +{ + if (m_active && m_selectNextItem) { + KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); + if (selectedItems().isEmpty()) { + Q_ASSERT_X(false, "DolphinView", "Selecting the next item failed."); + return; + } + const auto lastSelectedIndex = m_model->index(selectedItems().constLast()); + if (lastSelectedIndex < 0) { + Q_ASSERT_X(false, "DolphinView", "Selecting the next item failed."); + return; + } + auto nextItem = lastSelectedIndex + 1; + if (nextItem >= itemsCount()) { + nextItem = lastSelectedIndex - selectedItemsCount(); + } + if (nextItem >= 0) { + selectionManager->setSelected(nextItem, 1); + selectionManager->beginAnchoredSelection(nextItem); + } + m_selectNextItem = false; } } -void DolphinView::slotRenamingResult(KJob* job) +void DolphinView::slotRenamingResult(KJob *job) { - if (job->error()) { + // Change model data after renaming has succeeded. On failure we do nothing. + // If there is already an item with the newUrl, the copyjob will open a dialog for it, and + // KFileItemModel will update the data when the dir lister signals that the file name has changed. + if (!job->error()) { KIO::CopyJob *copyJob = qobject_cast(job); Q_ASSERT(copyJob); const QUrl newUrl = copyJob->destUrl(); + const QUrl oldUrl = copyJob->srcUrls().at(0); const int index = m_model->index(newUrl); - if (index >= 0) { + if (m_model->index(oldUrl) == index) { QHash data; - const QUrl oldUrl = copyJob->srcUrls().at(0); - data.insert("text", oldUrl.fileName()); + data.insert("text", newUrl.fileName()); m_model->setData(index, data); } } @@ -1596,27 +1925,46 @@ void DolphinView::slotRenamingResult(KJob* job) void DolphinView::slotDirectoryLoadingStarted() { + m_loadingState = LoadingState::Loading; + updatePlaceholderLabel(); + // Disable the writestate temporary until it can be determined in a fast way // in DolphinView::slotDirectoryLoadingCompleted() if (m_isFolderWritable) { m_isFolderWritable = false; - emit writeStateChanged(m_isFolderWritable); + Q_EMIT writeStateChanged(m_isFolderWritable); } - emit directoryLoadingStarted(); + Q_EMIT directoryLoadingStarted(); } void DolphinView::slotDirectoryLoadingCompleted() { + m_loadingState = LoadingState::Completed; + // Update the view-state. This has to be done asynchronously // because the view might not be in its final state yet. QTimer::singleShot(0, this, &DolphinView::updateViewState); - emit directoryLoadingCompleted(); + // Update the placeholder label in case we found that the folder was empty + // after loading it + Q_EMIT directoryLoadingCompleted(); + + applyDynamicView(); + updatePlaceholderLabel(); updateWritableState(); } +void DolphinView::slotDirectoryLoadingCanceled() +{ + m_loadingState = LoadingState::Canceled; + + updatePlaceholderLabel(); + + Q_EMIT directoryLoadingCanceled(); +} + void DolphinView::slotItemsChanged() { m_assureVisibleCurrentIndex = false; @@ -1630,10 +1978,10 @@ void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOr ViewProperties props(viewPropertiesUrl()); props.setSortOrder(current); - emit sortOrderChanged(current); + Q_EMIT sortOrderChanged(current); } -void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous) +void DolphinView::slotSortRoleChangedByHeader(const QByteArray ¤t, const QByteArray &previous) { Q_UNUSED(previous) Q_ASSERT(m_model->sortRole() == current); @@ -1641,11 +1989,10 @@ void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const Q ViewProperties props(viewPropertiesUrl()); props.setSortRole(current); - emit sortRoleChanged(current); + Q_EMIT sortRoleChanged(current); } -void DolphinView::slotVisibleRolesChangedByHeader(const QList& current, - const QList& previous) +void DolphinView::slotVisibleRolesChangedByHeader(const QList ¤t, const QList &previous) { Q_UNUSED(previous) Q_ASSERT(m_container->controller()->view()->visibleRoles() == current); @@ -1657,27 +2004,27 @@ void DolphinView::slotVisibleRolesChangedByHeader(const QList& curre ViewProperties props(viewPropertiesUrl()); props.setVisibleRoles(m_visibleRoles); - emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles); + Q_EMIT visibleRolesChanged(m_visibleRoles, previousVisibleRoles); } void DolphinView::slotRoleEditingCanceled() { - disconnect(m_view, &DolphinItemListView::roleEditingFinished, - this, &DolphinView::slotRoleEditingFinished); + disconnect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished); } -void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value) +void DolphinView::slotRoleEditingFinished(int index, const QByteArray &role, const QVariant &value) { - disconnect(m_view, &DolphinItemListView::roleEditingFinished, - this, &DolphinView::slotRoleEditingFinished); + disconnect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished); - if (index < 0 || index >= m_model->count()) { + const KFileItemList items = selectedItems(); + if (items.count() != 1) { return; } if (role == "text") { - const KFileItem oldItem = m_model->fileItem(index); - const QString newName = value.toString(); + const KFileItem oldItem = items.first(); + const EditResult retVal = value.value(); + const QString newName = retVal.newName; if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1Char('.') && newName != QLatin1String("..")) { const QUrl oldUrl = oldItem.url(); @@ -1685,64 +2032,58 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName)); #ifndef Q_OS_WIN - //Confirm hiding file/directory by renaming inline + // Confirm hiding file/directory by renaming inline if (!hiddenFilesShown() && newName.startsWith(QLatin1Char('.')) && !oldItem.name().startsWith(QLatin1Char('.'))) { - KGuiItem yesGuiItem(KStandardGuiItem::yes()); - yesGuiItem.setText(i18nc("@action:button", "Rename and Hide")); - - const auto code = KMessageBox::questionYesNo(this, - oldItem.isFile() ? i18n("Adding a dot to the beginning of this file's name will hide it from view.\n" - "Do you still want to rename it?") - : i18n("Adding a dot to the beginning of this folder's name will hide it from view.\n" - "Do you still want to rename it?"), - oldItem.isFile() ? i18n("Hide this File?") : i18n("Hide this Folder?"), - yesGuiItem, - KStandardGuiItem::cancel(), - QStringLiteral("ConfirmHide") - ); - - if (code == KMessageBox::No) { - return; + KGuiItem yesGuiItem(i18nc("@action:button", "Rename and Hide"), QStringLiteral("view-hidden")); + + const auto code = + KMessageBox::questionTwoActions(this, + oldItem.isFile() ? i18n("Adding a dot to the beginning of this file's name will hide it from view.\n" + "Do you still want to rename it?") + : i18n("Adding a dot to the beginning of this folder's name will hide it from view.\n" + "Do you still want to rename it?"), + oldItem.isFile() ? i18n("Hide this File?") : i18n("Hide this Folder?"), + yesGuiItem, + KStandardGuiItem::cancel(), + QStringLiteral("ConfirmHide")); + + if (code == KMessageBox::SecondaryAction) { + return; } } #endif - const bool newNameExistsAlready = (m_model->index(newUrl) >= 0); - if (!newNameExistsAlready) { - // Only change the data in the model if no item with the new name - // is in the model yet. If there is an item with the new name - // already, calling KIO::CopyJob will open a dialog - // asking for a new name, and KFileItemModel will update the - // data when the dir lister signals that the file name has changed. - QHash data; - data.insert(role, value); - m_model->setData(index, data); - } - - 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); - forceUrlsSelection(newUrl, {newUrl}); + if (m_model->index(newUrl) < 0) { + forceUrlsSelection(newUrl, {newUrl}); + updateSelectionState(); - if (!newNameExistsAlready) { // Only connect the result signal if there is no item with the new name // in the model yet, see bug 328262. connect(job, &KJob::result, this, &DolphinView::slotRenamingResult); } } + if (retVal.direction != EditDone) { + const short indexShift = retVal.direction == EditNext ? 1 : -1; + m_container->controller()->selectionManager()->setSelected(index, 1, KItemListSelectionManager::Deselect); + m_container->controller()->selectionManager()->setSelected(index + indexShift, 1, KItemListSelectionManager::Select); + renameSelectedItems(); + } } } -void DolphinView::loadDirectory(const QUrl& url, bool reload) +void DolphinView::loadDirectory(const QUrl &url, bool reload) { if (!url.isValid()) { const QString location(url.toDisplayString(QUrl::PreferLocalFile)); if (location.isEmpty()) { - emit errorMessage(i18nc("@info:status", "The location is empty.")); + Q_EMIT errorMessage(i18nc("@info:status", "The location is empty."), KIO::ERR_UNKNOWN); } else { - emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location)); + Q_EMIT errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location), KIO::ERR_UNKNOWN); } return; } @@ -1760,7 +2101,7 @@ void DolphinView::applyViewProperties() applyViewProperties(props); } -void DolphinView::applyViewProperties(const ViewProperties& props) +void DolphinView::applyViewProperties(const ViewProperties &props) { m_view->beginTransaction(); @@ -1775,41 +2116,47 @@ void DolphinView::applyViewProperties(const ViewProperties& props) const int oldZoomLevel = m_view->zoomLevel(); applyModeToView(); - emit modeChanged(m_mode, previousMode); + Q_EMIT modeChanged(m_mode, previousMode); if (m_view->zoomLevel() != oldZoomLevel) { - emit zoomLevelChanged(m_view->zoomLevel(), oldZoomLevel); + Q_EMIT zoomLevelChanged(m_view->zoomLevel(), oldZoomLevel); } } const bool hiddenFilesShown = props.hiddenFilesShown(); if (hiddenFilesShown != m_model->showHiddenFiles()) { m_model->setShowHiddenFiles(hiddenFilesShown); - emit hiddenFilesShownChanged(hiddenFilesShown); + Q_EMIT hiddenFilesShownChanged(hiddenFilesShown); } const bool groupedSorting = props.groupedSorting(); if (groupedSorting != m_model->groupedSorting()) { m_model->setGroupedSorting(groupedSorting); - emit groupedSortingChanged(groupedSorting); + Q_EMIT groupedSortingChanged(groupedSorting); } const QByteArray sortRole = props.sortRole(); if (sortRole != m_model->sortRole()) { m_model->setSortRole(sortRole); - emit sortRoleChanged(sortRole); + Q_EMIT sortRoleChanged(sortRole); } const Qt::SortOrder sortOrder = props.sortOrder(); if (sortOrder != m_model->sortOrder()) { m_model->setSortOrder(sortOrder); - emit sortOrderChanged(sortOrder); + Q_EMIT sortOrderChanged(sortOrder); } const bool sortFoldersFirst = props.sortFoldersFirst(); if (sortFoldersFirst != m_model->sortDirectoriesFirst()) { m_model->setSortDirectoriesFirst(sortFoldersFirst); - emit sortFoldersFirstChanged(sortFoldersFirst); + Q_EMIT sortFoldersFirstChanged(sortFoldersFirst); + } + + const bool sortHiddenLast = props.sortHiddenLast(); + if (sortHiddenLast != m_model->sortHiddenLast()) { + m_model->setSortHiddenLast(sortHiddenLast); + Q_EMIT sortHiddenLastChanged(sortHiddenLast); } const QList visibleRoles = props.visibleRoles(); @@ -1817,7 +2164,7 @@ void DolphinView::applyViewProperties(const ViewProperties& props) const QList previousVisibleRoles = m_visibleRoles; m_visibleRoles = visibleRoles; m_view->setVisibleRoles(visibleRoles); - emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles); + Q_EMIT visibleRolesChanged(m_visibleRoles, previousVisibleRoles); } const bool previewsShown = props.previewsShown(); @@ -1825,17 +2172,17 @@ void DolphinView::applyViewProperties(const ViewProperties& props) const int oldZoomLevel = zoomLevel(); m_view->setPreviewsShown(previewsShown); - emit previewsShownChanged(previewsShown); + Q_EMIT previewsShownChanged(previewsShown); // Changing the preview-state might result in a changed zoom-level if (oldZoomLevel != zoomLevel()) { - emit zoomLevelChanged(zoomLevel(), oldZoomLevel); + Q_EMIT zoomLevelChanged(zoomLevel(), oldZoomLevel); } } - KItemListView* itemListView = m_container->controller()->view(); + KItemListView *itemListView = m_container->controller()->view(); if (itemListView->isHeaderVisible()) { - KItemListHeader* header = itemListView->header(); + KItemListHeader *header = itemListView->header(); const QList headerColumnWidths = props.headerColumnWidths(); const int rolesCount = m_visibleRoles.count(); if (headerColumnWidths.count() == rolesCount) { @@ -1849,6 +2196,7 @@ void DolphinView::applyViewProperties(const ViewProperties& props) } else { header->setAutomaticColumnResizing(true); } + header->setSidePadding(DetailsModeSettings::leftPadding(), DetailsModeSettings::rightPadding()); } m_view->endTransaction(); @@ -1857,20 +2205,83 @@ void DolphinView::applyViewProperties(const ViewProperties& props) void DolphinView::applyModeToView() { switch (m_mode) { - case IconsView: m_view->setItemLayout(KFileItemListView::IconsLayout); break; - case CompactView: m_view->setItemLayout(KFileItemListView::CompactLayout); break; - case DetailsView: m_view->setItemLayout(KFileItemListView::DetailsLayout); break; - default: Q_ASSERT(false); break; + case IconsView: + m_view->setItemLayout(KFileItemListView::IconsLayout); + break; + case CompactView: + m_view->setItemLayout(KFileItemListView::CompactLayout); + break; + case DetailsView: + m_view->setItemLayout(KFileItemListView::DetailsLayout); + break; + default: + Q_ASSERT(false); + break; + } +} + +void DolphinView::applyDynamicView() +{ + ViewProperties props(viewPropertiesUrl()); + /* return early if: + * - dynamic view is not enabled + * - the current view mode is already Icon View + * - dynamic view has previously changed the view mode + */ + if (!GeneralSettings::dynamicView() || m_mode == IconsView || props.dynamicViewPassed()) { + return; } + + uint imageAndVideoCount = 0; + uint checkedItems = 0; + const uint totalItems = itemsCount(); + const KFileItemList itemList = items(); + bool applyDynamicView = false; + + for (const auto &file : itemList) { + ++checkedItems; + const QString type = file.mimetype().slice(0, 5); + + if (type == "image" || type == "video") { + ++imageAndVideoCount; + // if 2/3 or more of the items are images/videos, dynamic view should be applied + applyDynamicView = imageAndVideoCount >= (totalItems * 2 / 3); + if (applyDynamicView) { + break; + } + } else if (checkedItems - imageAndVideoCount > totalItems / 3) { + // if more than a third of the checked files are not media files, return + return; + } + } + + if (!applyDynamicView) { + return; + } + + props.setAutoSaveEnabled(!GeneralSettings::globalViewProps()); + props.setDynamicViewPassed(true); + props.setViewMode(IconsView); + applyViewProperties(props); } -void DolphinView::pasteToUrl(const QUrl& url) +void DolphinView::pasteToUrl(const QUrl &url) { KIO::PasteJob *job = KIO::paste(QApplication::clipboard()->mimeData(), url); KJobWidgets::setWindow(job, this); m_clearSelectionBeforeSelectingNewItems = true; m_markFirstNewlySelectedItemAsCurrent = true; + m_selectJobCreatedItems = true; connect(job, &KIO::PasteJob::itemCreated, this, &DolphinView::slotItemCreated); + connect(job, &KIO::PasteJob::copyJobStarted, this, [this](const KIO::CopyJob *copyJob) { + connect(copyJob, &KIO::CopyJob::copying, this, &DolphinView::slotItemCreatedFromJob); + connect(copyJob, &KIO::CopyJob::moving, this, &DolphinView::slotItemCreatedFromJob); + connect(copyJob, &KIO::CopyJob::linking, this, [this](KIO::Job *job, const QString &src, const QUrl &dest) { + Q_UNUSED(job) + Q_UNUSED(src) + slotItemCreated(dest); + }); + }); connect(job, &KIO::PasteJob::result, this, &DolphinView::slotJobResult); } @@ -1880,7 +2291,7 @@ QList DolphinView::simplifiedSelectedUrls() const const KFileItemList items = selectedItems(); urls.reserve(items.count()); - foreach (const KFileItem& item, items) { + for (const KFileItem &item : items) { urls.append(item.url()); } @@ -1892,9 +2303,9 @@ QList DolphinView::simplifiedSelectedUrls() const return urls; } -QMimeData* DolphinView::selectionMimeData() const +QMimeData *DolphinView::selectionMimeData() const { - const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + const KItemListSelectionManager *selectionManager = m_container->controller()->selectionManager(); const KItemSet selectedIndexes = selectionManager->selectedItems(); return m_model->createMimeData(selectedIndexes); @@ -1917,7 +2328,28 @@ void DolphinView::updateWritableState() m_isFolderWritable = capabilities.supportsWriting(); if (m_isFolderWritable != wasFolderWritable) { - emit writeStateChanged(m_isFolderWritable); + Q_EMIT writeStateChanged(m_isFolderWritable); + } +} + +bool DolphinView::isFolderWritable() const +{ + return m_isFolderWritable; +} + +int DolphinView::horizontalScrollBarHeight() const +{ + if (m_container && m_container->horizontalScrollBar() && m_container->horizontalScrollBar()->isVisible()) { + return m_container->horizontalScrollBar()->height(); + } + return 0; +} + +void DolphinView::setStatusBarOffset(int offset) +{ + KItemListView *view = m_container->controller()->view(); + if (view) { + view->setStatusBarOffset(offset); } } @@ -1933,15 +2365,138 @@ QUrl DolphinView::viewPropertiesUrl() const return url; } -void DolphinView::slotRenameDialogRenamingFinished(const QList& urls) -{ - forceUrlsSelection(urls.first(), urls); -} - -void DolphinView::forceUrlsSelection(const QUrl& current, const QList& selected) +void DolphinView::forceUrlsSelection(const QUrl ¤t, const QList &selected) { clearSelection(); m_clearSelectionBeforeSelectingNewItems = true; markUrlAsCurrent(current); markUrlsAsSelected(selected); } + +void DolphinView::copyPathToClipboard() +{ + const KFileItemList list = selectedItems(); + if (list.isEmpty()) { + return; + } + const KFileItem &item = list.at(0); + QString path = item.localPath(); + if (path.isEmpty()) { + path = item.url().toDisplayString(); + } + QClipboard *clipboard = QApplication::clipboard(); + if (clipboard == nullptr) { + return; + } + clipboard->setText(QDir::toNativeSeparators(path)); +} + +void DolphinView::slotIncreaseZoom() +{ + setZoomLevel(zoomLevel() + 1); +} + +void DolphinView::slotDecreaseZoom() +{ + setZoomLevel(zoomLevel() - 1); +} + +void DolphinView::slotSwipeUp() +{ + Q_EMIT goUpRequested(); +} + +void DolphinView::showLoadingPlaceholder() +{ + m_placeholderLabel->setText(i18n("Loading…")); + m_placeholderLabel->setVisible(true); +#ifndef QT_NO_ACCESSIBILITY + if (QAccessible::isActive()) { + static_cast(QAccessible::queryAccessibleInterface(m_view))->announceNewlyLoadedLocation(m_placeholderLabel->text()); + } +#endif +} + +void DolphinView::updatePlaceholderLabel() +{ + m_showLoadingPlaceholderTimer->stop(); + if (itemsCount() > 0) { +#ifndef QT_NO_ACCESSIBILITY + if (QAccessible::isActive()) { + static_cast(QAccessible::queryAccessibleInterface(m_view))->announceNewlyLoadedLocation(QString()); + } +#endif + m_placeholderLabel->setVisible(false); + return; + } + + if (m_loadingState == LoadingState::Loading) { + m_placeholderLabel->setVisible(false); + m_showLoadingPlaceholderTimer->start(); + return; + } + + if (m_loadingState == LoadingState::Canceled) { + m_placeholderLabel->setText(i18n("Loading canceled")); + } else if (!nameFilter().isEmpty()) { + m_placeholderLabel->setText(i18n("No items matching the filter")); + } else if (m_url.scheme() == QLatin1String("baloosearch") || m_url.scheme() == QLatin1String("filenamesearch")) { + m_placeholderLabel->setText(i18n("No items matching the search")); + } else if (m_url.scheme() == QLatin1String("trash") && m_url.path() == QLatin1String("/")) { + m_placeholderLabel->setText(i18n("Trash is empty")); + } else if (m_url.scheme() == QLatin1String("tags")) { + if (m_url.path() == QLatin1Char('/')) { + m_placeholderLabel->setText(i18n("No tags")); + } else { + const QString tagName = m_url.path().mid(1); // Remove leading / + m_placeholderLabel->setText(i18n("No files tagged with \"%1\"", tagName)); + } + + } else if (m_url.scheme() == QLatin1String("recentlyused")) { + m_placeholderLabel->setText(i18n("No recently used items")); + } else if (m_url.scheme() == QLatin1String("smb")) { + m_placeholderLabel->setText(i18n("No shared folders found")); + } else if (m_url.scheme() == QLatin1String("network")) { + m_placeholderLabel->setText(i18n("No relevant network resources found")); + } else if (m_url.scheme() == QLatin1String("mtp") && m_url.path() == QLatin1String("/")) { + m_placeholderLabel->setText(i18n("No MTP-compatible devices found")); + } else if (m_url.scheme() == QLatin1String("afc") && m_url.path() == QLatin1String("/")) { + m_placeholderLabel->setText(i18n("No Apple devices found")); + } else if (m_url.scheme() == QLatin1String("bluetooth")) { + m_placeholderLabel->setText(i18n("No Bluetooth devices found")); + } else { + m_placeholderLabel->setText(i18n("Folder is empty")); + } + + m_placeholderLabel->setVisible(true); +#ifndef QT_NO_ACCESSIBILITY + if (QAccessible::isActive()) { + static_cast(QAccessible::queryAccessibleInterface(m_view))->announceNewlyLoadedLocation(m_placeholderLabel->text()); + } +#endif +} + +bool DolphinView::tryShowNameToolTip(QHelpEvent *event) +{ + if (!GeneralSettings::showToolTips() && m_mode == DolphinView::IconsView) { + const std::optional index = m_view->itemAt(event->pos()); + + if (!index.has_value()) { + return false; + } + + // Check whether the filename has been elided + const bool isElided = m_view->isElided(index.value()); + + if (isElided) { + const KFileItem item = m_model->fileItem(index.value()); + const QString text = item.text(); + const QPoint pos = mapToGlobal(event->pos()); + QToolTip::showText(pos, text, this); + return true; + } + } + return false; +} + +#include "moc_dolphinview.cpp"