X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b3120cb90e3d1dd5f4eef13e93378ccb1d01d098..d27ee07de7558470ef7b497fbe3d3504ce7cad07:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 8e821d8aa..ffd0d9b5e 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -1,136 +1,108 @@ -/*************************************************************************** - * Copyright (C) 2007 by Peter Penz * - * * - * 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: 2007 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphinviewcontainer.h" +#include "dolphin_compactmodesettings.h" +#include "dolphin_contentdisplaysettings.h" +#include "dolphin_detailsmodesettings.h" #include "dolphin_generalsettings.h" -#include "dolphinplacesmodelsingleton.h" +#include "dolphin_iconsmodesettings.h" #include "dolphindebug.h" +#include "dolphinplacesmodelsingleton.h" #include "filterbar/filterbar.h" #include "global.h" #include "search/dolphinsearchbox.h" +#include "selectionmode/topbar.h" #include "statusbar/dolphinstatusbar.h" -#include "trash/dolphintrash.h" -#include "views/viewmodecontroller.h" -#include "views/viewproperties.h" -#ifdef HAVE_KACTIVITIES +#include +#if HAVE_KACTIVITIES #include #endif #include #include -#include +#include +#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0) +#include +#else +#include +#endif +#include +#include #include #include #include -#include #include -#include -#include +#include +#include #include -#include -#include +#include +#include +#include #include #include -#include - -DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : - QWidget(parent), - m_topLayout(nullptr), - m_navigatorWidget(nullptr), - m_urlNavigator(nullptr), - m_emptyTrashButton(nullptr), - m_searchBox(nullptr), - m_searchModeEnabled(false), - m_messageWidget(nullptr), - m_view(nullptr), - m_filterBar(nullptr), - m_statusBar(nullptr), - m_statusBarTimer(nullptr), - m_statusBarTimestamp(), - m_autoGrabFocus(true) -#ifdef HAVE_KACTIVITIES + +// An overview of the widgets contained by this ViewContainer +struct LayoutStructure { + int searchBox = 0; + int messageWidget = 1; + int selectionModeTopBar = 2; + int view = 3; + int selectionModeBottomBar = 4; + int filterBar = 5; + int statusBar = 6; +}; +constexpr LayoutStructure positionFor; + +DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent) + : QWidget(parent) + , m_topLayout(nullptr) + , m_urlNavigator{new DolphinUrlNavigator(url)} + , m_urlNavigatorConnected{nullptr} + , m_searchBox(nullptr) + , m_searchModeEnabled(false) + , m_messageWidget(nullptr) + , m_selectionModeTopBar{nullptr} + , m_view(nullptr) + , m_filterBar(nullptr) + , m_selectionModeBottomBar{nullptr} + , m_statusBar(nullptr) + , m_statusBarTimer(nullptr) + , m_statusBarTimestamp() + , m_autoGrabFocus(true) +#if HAVE_KACTIVITIES , m_activityResourceInstance(nullptr) #endif { hide(); - m_topLayout = new QVBoxLayout(this); + m_topLayout = new QGridLayout(this); m_topLayout->setSpacing(0); m_topLayout->setContentsMargins(0, 0, 0, 0); - m_navigatorWidget = new QWidget(this); - QHBoxLayout* navigatorLayout = new QHBoxLayout(m_navigatorWidget); - navigatorLayout->setSpacing(0); - navigatorLayout->setContentsMargins(0, 0, 0, 0); - m_navigatorWidget->setWhatsThis(xi18nc("@info:whatsthis location bar", - "This line describes the location of the files and folders " - "displayed below.The name of the currently viewed " - "folder can be read at the very right. To the left of it is the " - "name of the folder that contains it. The whole line is called " - "the path to the current location because " - "following these folders from left to right leads here." - "The path is displayed on the location bar " - "which is more powerful than one would expect. To learn more " - "about the basic and advanced features of the location bar " - "click here. " - "This will open the dedicated page in the Handbook.")); - - m_urlNavigator = new KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, this); - connect(m_urlNavigator, &KUrlNavigator::activated, - this, &DolphinViewContainer::activate); - connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged, - this, &DolphinViewContainer::saveUrlCompletionMode); - - const GeneralSettings* settings = GeneralSettings::self(); - m_urlNavigator->setUrlEditable(settings->editableUrl()); - m_urlNavigator->setShowFullPath(settings->showFullPath()); - m_urlNavigator->setHomeUrl(Dolphin::homeUrl()); - KUrlComboBox* editor = m_urlNavigator->editor(); - editor->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode())); - - m_emptyTrashButton = new QPushButton(QIcon::fromTheme(QStringLiteral("user-trash")), i18nc("@action:button", "Empty Trash"), this); - m_emptyTrashButton->setFlat(true); - connect(m_emptyTrashButton, &QPushButton::clicked, this, [this]() { Trash::empty(this); }); - connect(&Trash::instance(), &Trash::emptinessChanged, m_emptyTrashButton, &QPushButton::setDisabled); - m_emptyTrashButton->setDisabled(Trash::isEmpty()); - m_emptyTrashButton->hide(); - m_searchBox = new DolphinSearchBox(this); m_searchBox->hide(); connect(m_searchBox, &DolphinSearchBox::activated, this, &DolphinViewContainer::activate); connect(m_searchBox, &DolphinSearchBox::closeRequest, this, &DolphinViewContainer::closeSearchBox); connect(m_searchBox, &DolphinSearchBox::searchRequest, this, &DolphinViewContainer::startSearching); - connect(m_searchBox, &DolphinSearchBox::returnPressed, this, &DolphinViewContainer::requestFocus); + connect(m_searchBox, &DolphinSearchBox::focusViewRequest, this, &DolphinViewContainer::requestFocus); m_searchBox->setWhatsThis(xi18nc("@info:whatsthis findbar", - "This helps you find files and folders. Enter a " - "search term and specify search settings with the " - "buttons at the bottom:Filename/Content: " - "Does the item you are looking for contain the search terms " - "within its filename or its contents?The contents of images, " - "audio files and videos will not be searched." - "From Here/Everywhere: Do you want to search in this " - "folder and its sub-folders or everywhere?" - "More Options: Click this to search by media type, access " - "time or rating.More Search Tools: Install other " - "means to find an item.")); + "This helps you find files and folders. Enter a " + "search term and specify search settings with the " + "buttons at the bottom:Filename/Content: " + "Does the item you are looking for contain the search terms " + "within its filename or its contents?The contents of images, " + "audio files and videos will not be searched." + "From Here/Everywhere: Do you want to search in this " + "folder and its sub-folders or everywhere?" + "More Options: Click this to search by media type, access " + "time or rating.More Search Tools: Install other " + "means to find an item.")); m_messageWidget = new KMessageWidget(this); m_messageWidget->setCloseButtonVisible(true); @@ -138,7 +110,6 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : #ifndef Q_OS_WIN if (getuid() == 0) { - // We must be logged in as the root user; show a big scary warning showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning); } @@ -146,111 +117,85 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : // Initialize filter bar m_filterBar = new FilterBar(this); - m_filterBar->setVisible(settings->filterBar()); + m_filterBar->setVisible(GeneralSettings::filterBar()); - connect(m_filterBar, &FilterBar::filterChanged, - this, &DolphinViewContainer::setNameFilter); - connect(m_filterBar, &FilterBar::closeRequest, - this, &DolphinViewContainer::closeFilterBar); - connect(m_filterBar, &FilterBar::focusViewRequest, - this, &DolphinViewContainer::requestFocus); + connect(m_filterBar, &FilterBar::filterChanged, this, &DolphinViewContainer::setNameFilter); + connect(m_filterBar, &FilterBar::closeRequest, this, &DolphinViewContainer::closeFilterBar); + connect(m_filterBar, &FilterBar::focusViewRequest, this, &DolphinViewContainer::requestFocus); // Initialize the main view m_view = new DolphinView(url, this); - connect(m_view, &DolphinView::urlChanged, - m_filterBar, &FilterBar::slotUrlChanged); - connect(m_view, &DolphinView::urlChanged, - m_urlNavigator, &KUrlNavigator::setLocationUrl); - connect(m_view, &DolphinView::urlChanged, - m_messageWidget, &KMessageWidget::hide); - connect(m_view, &DolphinView::writeStateChanged, - this, &DolphinViewContainer::writeStateChanged); - connect(m_view, &DolphinView::requestItemInfo, - this, &DolphinViewContainer::showItemInfo); - connect(m_view, &DolphinView::itemActivated, - this, &DolphinViewContainer::slotItemActivated); - connect(m_view, &DolphinView::itemsActivated, - this, &DolphinViewContainer::slotItemsActivated); - connect(m_view, &DolphinView::redirection, - this, &DolphinViewContainer::redirect); - connect(m_view, &DolphinView::directoryLoadingStarted, - this, &DolphinViewContainer::slotDirectoryLoadingStarted); - connect(m_view, &DolphinView::directoryLoadingCompleted, - this, &DolphinViewContainer::slotDirectoryLoadingCompleted); - connect(m_view, &DolphinView::directoryLoadingCanceled, - this, &DolphinViewContainer::slotDirectoryLoadingCanceled); - connect(m_view, &DolphinView::itemCountChanged, - this, &DolphinViewContainer::delayedStatusBarUpdate); - connect(m_view, &DolphinView::directoryLoadingProgress, - this, &DolphinViewContainer::updateDirectoryLoadingProgress); - connect(m_view, &DolphinView::directorySortingProgress, - this, &DolphinViewContainer::updateDirectorySortingProgress); - connect(m_view, &DolphinView::selectionChanged, - this, &DolphinViewContainer::delayedStatusBarUpdate); - connect(m_view, &DolphinView::errorMessage, - this, &DolphinViewContainer::showErrorMessage); - connect(m_view, &DolphinView::urlIsFileError, - this, &DolphinViewContainer::slotUrlIsFileError); - connect(m_view, &DolphinView::activated, - this, &DolphinViewContainer::activate); - - connect(m_urlNavigator, &KUrlNavigator::urlAboutToBeChanged, - this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged); - connect(m_urlNavigator, &KUrlNavigator::urlChanged, - this, &DolphinViewContainer::slotUrlNavigatorLocationChanged); - connect(m_urlNavigator, &KUrlNavigator::urlSelectionRequested, - this, &DolphinViewContainer::slotUrlSelectionRequested); - connect(m_urlNavigator, &KUrlNavigator::returnPressed, - this, &DolphinViewContainer::slotReturnPressed); - connect(m_urlNavigator, &KUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) { - m_view->dropUrls(destination, event, m_urlNavigator->dropWidget()); - }); - - connect(m_view, &DolphinView::directoryLoadingCompleted, this, [this]() { - m_emptyTrashButton->setVisible(m_view->url().scheme() == QLatin1String("trash")); - }); + connect(m_view, &DolphinView::urlChanged, m_filterBar, &FilterBar::clearIfUnlocked); + connect(m_view, &DolphinView::urlChanged, m_messageWidget, &KMessageWidget::hide); + // m_urlNavigator stays in sync with m_view's location changes and + // keeps track of them so going back and forth in the history works. + connect(m_view, &DolphinView::urlChanged, m_urlNavigator.get(), &DolphinUrlNavigator::setLocationUrl); + connect(m_urlNavigator.get(), &DolphinUrlNavigator::urlChanged, this, &DolphinViewContainer::slotUrlNavigatorLocationChanged); + connect(m_urlNavigator.get(), &DolphinUrlNavigator::urlAboutToBeChanged, this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged); + connect(m_urlNavigator.get(), &DolphinUrlNavigator::urlSelectionRequested, this, &DolphinViewContainer::slotUrlSelectionRequested); + connect(m_view, &DolphinView::writeStateChanged, this, &DolphinViewContainer::writeStateChanged); + connect(m_view, &DolphinView::requestItemInfo, this, &DolphinViewContainer::showItemInfo); + connect(m_view, &DolphinView::itemActivated, this, &DolphinViewContainer::slotItemActivated); + connect(m_view, &DolphinView::fileMiddleClickActivated, this, &DolphinViewContainer::slotfileMiddleClickActivated); + connect(m_view, &DolphinView::itemsActivated, this, &DolphinViewContainer::slotItemsActivated); + connect(m_view, &DolphinView::redirection, this, &DolphinViewContainer::redirect); + connect(m_view, &DolphinView::directoryLoadingStarted, this, &DolphinViewContainer::slotDirectoryLoadingStarted); + connect(m_view, &DolphinView::directoryLoadingCompleted, this, &DolphinViewContainer::slotDirectoryLoadingCompleted); + connect(m_view, &DolphinView::directoryLoadingCanceled, this, &DolphinViewContainer::slotDirectoryLoadingCanceled); + connect(m_view, &DolphinView::itemCountChanged, this, &DolphinViewContainer::delayedStatusBarUpdate); + connect(m_view, &DolphinView::directoryLoadingProgress, this, &DolphinViewContainer::updateDirectoryLoadingProgress); + connect(m_view, &DolphinView::directorySortingProgress, this, &DolphinViewContainer::updateDirectorySortingProgress); + connect(m_view, &DolphinView::selectionChanged, this, &DolphinViewContainer::delayedStatusBarUpdate); + connect(m_view, &DolphinView::errorMessage, this, &DolphinViewContainer::showErrorMessage); + connect(m_view, &DolphinView::urlIsFileError, this, &DolphinViewContainer::slotUrlIsFileError); + connect(m_view, &DolphinView::activated, this, &DolphinViewContainer::activate); + connect(m_view, &DolphinView::hiddenFilesShownChanged, this, &DolphinViewContainer::slotHiddenFilesShownChanged); + connect(m_view, &DolphinView::sortHiddenLastChanged, this, &DolphinViewContainer::slotSortHiddenLastChanged); + connect(m_view, &DolphinView::currentDirectoryRemoved, this, &DolphinViewContainer::slotCurrentDirectoryRemoved); // Initialize status bar m_statusBar = new DolphinStatusBar(this); m_statusBar->setUrl(m_view->url()); m_statusBar->setZoomLevel(m_view->zoomLevel()); - connect(m_view, &DolphinView::urlChanged, - m_statusBar, &DolphinStatusBar::setUrl); - connect(m_view, &DolphinView::zoomLevelChanged, - m_statusBar, &DolphinStatusBar::setZoomLevel); - connect(m_view, &DolphinView::infoMessage, - m_statusBar, &DolphinStatusBar::setText); - connect(m_view, &DolphinView::operationCompletedMessage, - m_statusBar, &DolphinStatusBar::setText); - connect(m_statusBar, &DolphinStatusBar::stopPressed, - this, &DolphinViewContainer::stopDirectoryLoading); - connect(m_statusBar, &DolphinStatusBar::zoomLevelChanged, - this, &DolphinViewContainer::slotStatusBarZoomLevelChanged); + connect(m_view, &DolphinView::urlChanged, m_statusBar, &DolphinStatusBar::setUrl); + connect(m_view, &DolphinView::zoomLevelChanged, m_statusBar, &DolphinStatusBar::setZoomLevel); + connect(m_view, &DolphinView::infoMessage, m_statusBar, &DolphinStatusBar::setText); + connect(m_view, &DolphinView::operationCompletedMessage, m_statusBar, &DolphinStatusBar::setText); + connect(m_view, &DolphinView::statusBarTextChanged, m_statusBar, &DolphinStatusBar::setDefaultText); + connect(m_view, &DolphinView::statusBarTextChanged, m_statusBar, &DolphinStatusBar::resetToDefaultText); + connect(m_statusBar, &DolphinStatusBar::stopPressed, this, &DolphinViewContainer::stopDirectoryLoading); + connect(m_statusBar, &DolphinStatusBar::zoomLevelChanged, this, &DolphinViewContainer::slotStatusBarZoomLevelChanged); m_statusBarTimer = new QTimer(this); m_statusBarTimer->setSingleShot(true); m_statusBarTimer->setInterval(300); connect(m_statusBarTimer, &QTimer::timeout, this, &DolphinViewContainer::updateStatusBar); - KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self(); - connect(undoManager, &KIO::FileUndoManager::jobRecordingFinished, - this, &DolphinViewContainer::delayedStatusBarUpdate); - - navigatorLayout->addWidget(m_urlNavigator); - navigatorLayout->addWidget(m_emptyTrashButton); + KIO::FileUndoManager *undoManager = KIO::FileUndoManager::self(); + connect(undoManager, &KIO::FileUndoManager::jobRecordingFinished, this, &DolphinViewContainer::delayedStatusBarUpdate); - m_topLayout->addWidget(m_navigatorWidget); - m_topLayout->addWidget(m_searchBox); - m_topLayout->addWidget(m_messageWidget); - m_topLayout->addWidget(m_view); - m_topLayout->addWidget(m_filterBar); - m_topLayout->addWidget(m_statusBar); + m_topLayout->addWidget(m_searchBox, positionFor.searchBox, 0); + m_topLayout->addWidget(m_messageWidget, positionFor.messageWidget, 0); + m_topLayout->addWidget(m_view, positionFor.view, 0); + m_topLayout->addWidget(m_filterBar, positionFor.filterBar, 0); + m_topLayout->addWidget(m_statusBar, positionFor.statusBar, 0); setSearchModeEnabled(isSearchUrl(url)); + // Update view as the ContentDisplaySettings change + // this happens here and not in DolphinView as DolphinviewContainer and DolphinView are not in the same build target ATM + connect(ContentDisplaySettings::self(), &KCoreConfigSkeleton::configChanged, m_view, &DolphinView::reload); + + KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); + connect(placesModel, &KFilePlacesModel::dataChanged, this, &DolphinViewContainer::slotPlacesModelChanged); + connect(placesModel, &KFilePlacesModel::rowsInserted, this, &DolphinViewContainer::slotPlacesModelChanged); + connect(placesModel, &KFilePlacesModel::rowsRemoved, this, &DolphinViewContainer::slotPlacesModelChanged); + + connect(this, &DolphinViewContainer::searchModeEnabledChanged, this, &DolphinViewContainer::captionChanged); + // Initialize kactivities resource instance -#ifdef HAVE_KACTIVITIES +#if HAVE_KACTIVITIES m_activityResourceInstance = new KActivities::ResourceInstance(window()->winId(), url); m_activityResourceInstance->setParent(this); #endif @@ -265,13 +210,20 @@ QUrl DolphinViewContainer::url() const return m_view->url(); } +KFileItem DolphinViewContainer::rootItem() const +{ + return m_view->rootItem(); +} + void DolphinViewContainer::setActive(bool active) { m_searchBox->setActive(active); - m_urlNavigator->setActive(active); + if (m_urlNavigatorConnected) { + m_urlNavigatorConnected->setActive(active); + } m_view->setActive(active); -#ifdef HAVE_KACTIVITIES +#if HAVE_KACTIVITIES if (active) { m_activityResourceInstance->notifyFocusedIn(); } else { @@ -282,7 +234,6 @@ void DolphinViewContainer::setActive(bool active) bool DolphinViewContainer::isActive() const { - Q_ASSERT(m_view->isActive() == m_urlNavigator->isActive()); return m_view->isActive(); } @@ -298,40 +249,173 @@ bool DolphinViewContainer::autoGrabFocus() const QString DolphinViewContainer::currentSearchText() const { - return m_searchBox->text(); + return m_searchBox->text(); } -const DolphinStatusBar* DolphinViewContainer::statusBar() const +const DolphinStatusBar *DolphinViewContainer::statusBar() const { return m_statusBar; } -DolphinStatusBar* DolphinViewContainer::statusBar() +DolphinStatusBar *DolphinViewContainer::statusBar() { return m_statusBar; } -const KUrlNavigator* DolphinViewContainer::urlNavigator() const +const DolphinUrlNavigator *DolphinViewContainer::urlNavigator() const { - return m_urlNavigator; + return m_urlNavigatorConnected; } -KUrlNavigator* DolphinViewContainer::urlNavigator() +DolphinUrlNavigator *DolphinViewContainer::urlNavigator() { - return m_urlNavigator; + return m_urlNavigatorConnected; } -const DolphinView* DolphinViewContainer::view() const +const DolphinUrlNavigator *DolphinViewContainer::urlNavigatorInternalWithHistory() const +{ + return m_urlNavigator.get(); +} + +DolphinUrlNavigator *DolphinViewContainer::urlNavigatorInternalWithHistory() +{ + return m_urlNavigator.get(); +} + +const DolphinView *DolphinViewContainer::view() const { return m_view; } -DolphinView* DolphinViewContainer::view() +DolphinView *DolphinViewContainer::view() { return m_view; } -void DolphinViewContainer::showMessage(const QString& msg, MessageType type) +void DolphinViewContainer::connectUrlNavigator(DolphinUrlNavigator *urlNavigator) +{ + Q_CHECK_PTR(urlNavigator); + Q_ASSERT(!m_urlNavigatorConnected); + Q_ASSERT(m_urlNavigator.get() != urlNavigator); + Q_CHECK_PTR(m_view); + + urlNavigator->setLocationUrl(m_view->url()); + urlNavigator->setShowHiddenFolders(m_view->hiddenFilesShown()); + urlNavigator->setSortHiddenFoldersLast(m_view->sortHiddenLast()); + if (m_urlNavigatorVisualState) { + urlNavigator->setVisualState(*m_urlNavigatorVisualState.get()); + m_urlNavigatorVisualState.reset(); + } + urlNavigator->setActive(isActive()); + + // Url changes are still done via m_urlNavigator. + connect(urlNavigator, &DolphinUrlNavigator::urlChanged, m_urlNavigator.get(), &DolphinUrlNavigator::setLocationUrl); + connect(urlNavigator, &DolphinUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) { + m_view->dropUrls(destination, event, urlNavigator->dropWidget()); + }); + // Aside from these, only visual things need to be connected. + connect(m_view, &DolphinView::urlChanged, urlNavigator, &DolphinUrlNavigator::setLocationUrl); + connect(urlNavigator, &DolphinUrlNavigator::activated, this, &DolphinViewContainer::activate); + + m_urlNavigatorConnected = urlNavigator; +} + +void DolphinViewContainer::disconnectUrlNavigator() +{ + if (!m_urlNavigatorConnected) { + return; + } + + disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::urlChanged, m_urlNavigator.get(), &DolphinUrlNavigator::setLocationUrl); + disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::urlsDropped, this, nullptr); + disconnect(m_view, &DolphinView::urlChanged, m_urlNavigatorConnected, &DolphinUrlNavigator::setLocationUrl); + disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::activated, this, &DolphinViewContainer::activate); + + m_urlNavigatorVisualState = m_urlNavigatorConnected->visualState(); + m_urlNavigatorConnected = nullptr; +} + +void DolphinViewContainer::setSelectionModeEnabled(bool enabled, KActionCollection *actionCollection, SelectionMode::BottomBar::Contents bottomBarContents) +{ + const bool wasEnabled = m_view->selectionMode(); + m_view->setSelectionModeEnabled(enabled); + + if (!enabled) { + if (!wasEnabled) { + return; // nothing to do here + } + Q_CHECK_PTR(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once. + Q_CHECK_PTR(m_selectionModeBottomBar); + if (m_selectionModeTopBar->isAncestorOf(QApplication::focusWidget()) || m_selectionModeBottomBar->isAncestorOf(QApplication::focusWidget())) { + m_view->setFocus(); + } + m_selectionModeTopBar->setVisible(false, WithAnimation); + m_selectionModeBottomBar->setVisible(false, WithAnimation); + Q_EMIT selectionModeChanged(false); + return; + } + + if (!m_selectionModeTopBar) { + // Changing the location will disable selection mode. + connect(m_urlNavigator.get(), &DolphinUrlNavigator::urlChanged, this, [this]() { + setSelectionModeEnabled(false); + }); + + m_selectionModeTopBar = new SelectionMode::TopBar(this); // will be created hidden + connect(m_selectionModeTopBar, &SelectionMode::TopBar::selectionModeLeavingRequested, this, [this]() { + setSelectionModeEnabled(false); + }); + m_topLayout->addWidget(m_selectionModeTopBar, positionFor.selectionModeTopBar, 0); + } + + if (!m_selectionModeBottomBar) { + m_selectionModeBottomBar = new SelectionMode::BottomBar(actionCollection, this); + connect(m_view, &DolphinView::selectionChanged, this, [this](const KFileItemList &selection) { + m_selectionModeBottomBar->slotSelectionChanged(selection, m_view->url()); + }); + connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::error, this, [this](const QString &errorMessage) { + showErrorMessage(errorMessage); + }); + connect(m_selectionModeBottomBar, &SelectionMode::BottomBar::selectionModeLeavingRequested, this, [this]() { + setSelectionModeEnabled(false); + }); + m_topLayout->addWidget(m_selectionModeBottomBar, positionFor.selectionModeBottomBar, 0); + } + m_selectionModeBottomBar->resetContents(bottomBarContents); + if (bottomBarContents == SelectionMode::BottomBar::GeneralContents) { + m_selectionModeBottomBar->slotSelectionChanged(m_view->selectedItems(), m_view->url()); + } + + if (!wasEnabled) { + m_selectionModeTopBar->setVisible(true, WithAnimation); + m_selectionModeBottomBar->setVisible(true, WithAnimation); + Q_EMIT selectionModeChanged(true); + } +} + +bool DolphinViewContainer::isSelectionModeEnabled() const +{ + const bool isEnabled = m_view->selectionMode(); + Q_ASSERT((!isEnabled + // We can't assert that the bars are invisible only because the selection mode is disabled because the hide animation might still be playing. + && (!m_selectionModeBottomBar || !m_selectionModeBottomBar->isEnabled() || !m_selectionModeBottomBar->isVisible() + || m_selectionModeBottomBar->contents() == SelectionMode::BottomBar::PasteContents)) + || (isEnabled && m_selectionModeTopBar + && m_selectionModeTopBar->isVisible() + // The bottom bar is either visible or was hidden because it has nothing to show in GeneralContents mode e.g. because no items are selected. + && m_selectionModeBottomBar + && (m_selectionModeBottomBar->isVisible() || m_selectionModeBottomBar->contents() == SelectionMode::BottomBar::GeneralContents))); + return isEnabled; +} + +void DolphinViewContainer::slotSplitTabDisabled() +{ + if (m_selectionModeBottomBar) { + m_selectionModeBottomBar->slotSplitTabDisabled(); + } +} + +void DolphinViewContainer::showMessage(const QString &msg, MessageType type) { if (msg.isEmpty()) { return; @@ -344,9 +428,15 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type) m_messageWidget->setWordWrap(true); switch (type) { - case Information: m_messageWidget->setMessageType(KMessageWidget::Information); break; - case Warning: m_messageWidget->setMessageType(KMessageWidget::Warning); break; - case Error: m_messageWidget->setMessageType(KMessageWidget::Error); break; + case Information: + m_messageWidget->setMessageType(KMessageWidget::Information); + break; + case Warning: + m_messageWidget->setMessageType(KMessageWidget::Warning); + break; + case Error: + m_messageWidget->setMessageType(KMessageWidget::Error); + break; default: Q_ASSERT(false); break; @@ -364,13 +454,10 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type) void DolphinViewContainer::readSettings() { + // The startup settings should (only) get applied if they have been + // modified by the user. Otherwise keep the (possibly) different current + // setting of the filterbar. if (GeneralSettings::modifiedStartupSettings()) { - // The startup settings should only get applied if they have been - // modified by the user. Otherwise keep the (possibly) different current - // settings of the URL navigator and the filterbar. - m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl()); - m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath()); - m_urlNavigator->setHomeUrl(Dolphin::homeUrl()); setFilterBarVisible(GeneralSettings::filterBar()); } @@ -385,6 +472,13 @@ bool DolphinViewContainer::isFilterBarVisible() const void DolphinViewContainer::setSearchModeEnabled(bool enabled) { + m_searchBox->setVisible(enabled); + + if (enabled) { + const QUrl &locationUrl = m_urlNavigator->locationUrl(); + m_searchBox->fromSearchUrl(locationUrl); + } + if (enabled == isSearchModeEnabled()) { if (enabled && !m_searchBox->hasFocus()) { m_searchBox->setFocus(); @@ -393,9 +487,6 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled) return; } - m_searchBox->setVisible(enabled); - m_navigatorWidget->setVisible(!enabled); - if (!enabled) { m_view->setViewPropertiesContext(QString()); @@ -405,10 +496,12 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled) if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) { url = Dolphin::homeUrl(); } - m_urlNavigator->setLocationUrl(url); + m_urlNavigatorConnected->setLocationUrl(url); } m_searchModeEnabled = enabled; + + Q_EMIT searchModeEnabledChanged(enabled); } bool DolphinViewContainer::isSearchModeEnabled() const @@ -441,30 +534,37 @@ void DolphinViewContainer::reload() m_messageWidget->hide(); } -QString DolphinViewContainer::caption() const +QString DolphinViewContainer::captionWindowTitle() const { - if (GeneralSettings::showFullPathInTitlebar()) { + if (GeneralSettings::showFullPathInTitlebar() && !isSearchModeEnabled()) { if (!url().isLocalFile()) { return url().adjusted(QUrl::StripTrailingSlash).toString(); } return url().adjusted(QUrl::StripTrailingSlash).path(); + } else { + return DolphinViewContainer::caption(); } +} - KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); - const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, url(), 1, Qt::MatchExactly); - - if (!matchedPlaces.isEmpty()) { - return placesModel->text(matchedPlaces.first()); - } - +QString DolphinViewContainer::caption() const +{ if (isSearchModeEnabled()) { - if (currentSearchText().isEmpty()){ + if (currentSearchText().isEmpty()) { return i18n("Search"); } else { return i18n("Search for %1", currentSearchText()); } } + KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); + const QString pattern = url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?"); + const auto &matchedPlaces = + placesModel->match(placesModel->index(0, 0), KFilePlacesModel::UrlRole, QRegularExpression::anchoredPattern(pattern), 1, Qt::MatchRegularExpression); + + if (!matchedPlaces.isEmpty()) { + return placesModel->text(matchedPlaces.first()); + } + if (!url().isLocalFile()) { QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash); QString caption; @@ -488,13 +588,13 @@ QString DolphinViewContainer::caption() const return fileName; } -void DolphinViewContainer::setUrl(const QUrl& newUrl) +void DolphinViewContainer::setUrl(const QUrl &newUrl) { if (newUrl != m_urlNavigator->locationUrl()) { m_urlNavigator->setLocationUrl(newUrl); } -#ifdef HAVE_KACTIVITIES +#if HAVE_KACTIVITIES m_activityResourceInstance->setUri(newUrl); #endif } @@ -503,6 +603,7 @@ void DolphinViewContainer::setFilterBarVisible(bool visible) { Q_ASSERT(m_filterBar); if (visible) { + m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly); m_filterBar->show(); m_filterBar->setFocus(); m_filterBar->selectAll(); @@ -529,16 +630,13 @@ void DolphinViewContainer::delayedStatusBarUpdate() void DolphinViewContainer::updateStatusBar() { m_statusBarTimestamp.start(); - - const QString text = m_view->statusBarText(); - m_statusBar->setDefaultText(text); - m_statusBar->resetToDefaultText(); + m_view->requestStatusBarText(); } void DolphinViewContainer::updateDirectoryLoadingProgress(int percent) { if (m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder...")); + m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder…")); } m_statusBar->setProgress(percent); } @@ -546,7 +644,7 @@ void DolphinViewContainer::updateDirectoryLoadingProgress(int percent) void DolphinViewContainer::updateDirectorySortingProgress(int percent) { if (m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(i18nc("@info:progress", "Sorting...")); + m_statusBar->setProgressText(i18nc("@info:progress", "Sorting…")); } m_statusBar->setProgress(percent); } @@ -557,7 +655,7 @@ void DolphinViewContainer::slotDirectoryLoadingStarted() // Search KIO-slaves usually don't provide any progress information. Give // a hint to the user that a searching is done: updateStatusBar(); - m_statusBar->setProgressText(i18nc("@info", "Searching...")); + m_statusBar->setProgressText(i18nc("@info", "Searching…")); m_statusBar->setProgress(-1); } else { // Trigger an undetermined progress indication. The progress @@ -594,14 +692,14 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled() m_statusBar->setText(QString()); } -void DolphinViewContainer::slotUrlIsFileError(const QUrl& url) +void DolphinViewContainer::slotUrlIsFileError(const QUrl &url) { const KFileItem item(url); // Find out if the file can be opened in the view (for example, this is the // case if the file is an archive). The mime type must be known for that. item.determineMimeType(); - const QUrl& folderUrl = DolphinView::openItemAsFolderUrl(item, true); + const QUrl &folderUrl = DolphinView::openItemAsFolderUrl(item, true); if (!folderUrl.isEmpty()) { setUrl(folderUrl); } else { @@ -609,32 +707,69 @@ void DolphinViewContainer::slotUrlIsFileError(const QUrl& url) } } -void DolphinViewContainer::slotItemActivated(const KFileItem& item) +void DolphinViewContainer::slotItemActivated(const KFileItem &item) { // It is possible to activate items on inactive views by // drag & drop operations. Assure that activating an item always // results in an active view. m_view->setActive(true); - const QUrl& url = DolphinView::openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives()); + const QUrl &url = DolphinView::openItemAsFolderUrl(item, GeneralSettings::browseThroughArchives()); if (!url.isEmpty()) { - setUrl(url); + const auto modifiers = QGuiApplication::keyboardModifiers(); + // keep in sync with KUrlNavigator::slotNavigatorButtonClicked + if (modifiers & Qt::ControlModifier && modifiers & Qt::ShiftModifier) { + Q_EMIT activeTabRequested(url); + } else if (modifiers & Qt::ControlModifier) { + Q_EMIT tabRequested(url); + } else if (modifiers & Qt::ShiftModifier) { + Dolphin::openNewWindow({KFilePlacesModel::convertedUrl(url)}, this); + } else { + setUrl(url); + } return; } - KRun *run = new KRun(item.targetUrl(), this); - run->setShowScriptExecutionPrompt(true); + KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl(), item.mimetype()); +#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0) + job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); +#else + job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); +#endif + job->setShowOpenOrExecuteDialog(true); + connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished); + job->start(); } -void DolphinViewContainer::slotItemsActivated(const KFileItemList& items) +void DolphinViewContainer::slotfileMiddleClickActivated(const KFileItem &item) +{ + KService::List services = KApplicationTrader::queryByMimeType(item.mimetype()); + + if (services.length() >= 2) { + auto service = services.at(1); + + KIO::ApplicationLauncherJob *job = new KIO::ApplicationLauncherJob(service, this); + job->setUrls({item.url()}); + +#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0) + job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); +#else + job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); +#endif + connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished); + job->start(); + } +} + +void DolphinViewContainer::slotItemsActivated(const KFileItemList &items) { Q_ASSERT(items.count() >= 2); KFileItemActions fileItemActions(this); - fileItemActions.runPreferredApplications(items, QString()); + fileItemActions.runPreferredApplications(items); } -void DolphinViewContainer::showItemInfo(const KFileItem& item) +void DolphinViewContainer::showItemInfo(const KFileItem &item) { if (item.isNull()) { m_statusBar->resetToDefaultText(); @@ -647,11 +782,17 @@ void DolphinViewContainer::closeFilterBar() { m_filterBar->closeFilterBar(); m_view->setFocus(); - emit showFilterBarChanged(false); + Q_EMIT showFilterBarChanged(false); +} + +void DolphinViewContainer::clearFilterBar() +{ + m_filterBar->clearIfUnlocked(); } -void DolphinViewContainer::setNameFilter(const QString& nameFilter) +void DolphinViewContainer::setNameFilter(const QString &nameFilter) { + m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly); m_view->setNameFilter(nameFilter); delayedStatusBarUpdate(); } @@ -661,69 +802,64 @@ void DolphinViewContainer::activate() setActive(true); } -void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const QUrl&) +void DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged(const QUrl &) { saveViewState(); } -void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url) +void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl &url) { - slotReturnPressed(); + if (m_urlNavigatorConnected) { + m_urlNavigatorConnected->slotReturnPressed(); + } if (KProtocolManager::supportsListing(url)) { - const bool searchUrl = isSearchUrl(url); - if (searchUrl) { - m_searchBox->fromSearchUrl(url); - } - setSearchModeEnabled(searchUrl); + setSearchModeEnabled(isSearchUrl(url)); m_view->setUrl(url); tryRestoreViewState(); - if (m_autoGrabFocus && isActive() && !searchUrl) { + if (m_autoGrabFocus && isActive() && !isSearchUrl(url)) { // When an URL has been entered, the view should get the focus. // The focus must be requested asynchronously, as changing the URL might create // a new view widget. QTimer::singleShot(0, this, &DolphinViewContainer::requestFocus); } } else if (KProtocolManager::isSourceProtocol(url)) { - QString app = QStringLiteral("konqueror"); if (url.scheme().startsWith(QLatin1String("http"))) { showMessage(i18nc("@info:status", // krazy:exclude=qmethods "Dolphin does not support web pages, the web browser has been launched"), Information); - - const KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "General"); - const QString browser = config.readEntry("BrowserApplication"); - if (!browser.isEmpty()) { - app = browser; - if (app.startsWith('!')) { - // a literal command has been configured, remove the '!' prefix - app = app.mid(1); - } - } } else { - showMessage(i18nc("@info:status", - "Protocol not supported by Dolphin, Konqueror has been launched"), - Information); + showMessage(i18nc("@info:status", "Protocol not supported by Dolphin, default application has been launched"), Information); } - const QString secureUrl = KShell::quoteArg(url.toDisplayString(QUrl::PreferLocalFile)); - const QString command = app + ' ' + secureUrl; - KRun::runCommand(command, app, app, this); + QDesktopServices::openUrl(url); + redirect(QUrl(), m_urlNavigator->locationUrl(1)); } else { showMessage(i18nc("@info:status", "Invalid protocol"), Error); + m_urlNavigator->goBack(); } } -void DolphinViewContainer::slotUrlSelectionRequested(const QUrl& url) +void DolphinViewContainer::slotUrlSelectionRequested(const QUrl &url) { m_view->markUrlsAsSelected({url}); m_view->markUrlAsCurrent(url); // makes the item scroll into view } -void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl) +void DolphinViewContainer::disableUrlNavigatorSelectionRequests() +{ + disconnect(m_urlNavigator.get(), &KUrlNavigator::urlSelectionRequested, this, &DolphinViewContainer::slotUrlSelectionRequested); +} + +void DolphinViewContainer::enableUrlNavigatorSelectionRequests() { - Q_UNUSED(oldUrl); + connect(m_urlNavigator.get(), &KUrlNavigator::urlSelectionRequested, this, &DolphinViewContainer::slotUrlSelectionRequested); +} + +void DolphinViewContainer::redirect(const QUrl &oldUrl, const QUrl &newUrl) +{ + Q_UNUSED(oldUrl) const bool block = m_urlNavigator->signalsBlocked(); m_urlNavigator->blockSignals(true); @@ -742,24 +878,13 @@ void DolphinViewContainer::requestFocus() m_view->setFocus(); } -void DolphinViewContainer::saveUrlCompletionMode(KCompletion::CompletionMode completion) -{ - GeneralSettings::setUrlCompletionMode(completion); -} - -void DolphinViewContainer::slotReturnPressed() -{ - if (!GeneralSettings::editableUrl()) { - m_urlNavigator->setUrlEditable(false); - } -} - void DolphinViewContainer::startSearching() { + Q_CHECK_PTR(m_urlNavigatorConnected); const QUrl url = m_searchBox->urlForSearching(); if (url.isValid() && !url.isEmpty()) { m_view->setViewPropertiesContext(QStringLiteral("search")); - m_urlNavigator->setLocationUrl(url); + m_urlNavigatorConnected->setLocationUrl(url); } } @@ -779,14 +904,55 @@ void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel) m_view->setZoomLevel(zoomLevel); } -void DolphinViewContainer::showErrorMessage(const QString& msg) +void DolphinViewContainer::showErrorMessage(const QString &msg) { showMessage(msg, Error); } -bool DolphinViewContainer::isSearchUrl(const QUrl& url) const +void DolphinViewContainer::slotPlacesModelChanged() +{ + if (!GeneralSettings::showFullPathInTitlebar() && !isSearchModeEnabled()) { + Q_EMIT captionChanged(); + } +} + +void DolphinViewContainer::slotHiddenFilesShownChanged(bool showHiddenFiles) +{ + if (m_urlNavigatorConnected) { + m_urlNavigatorConnected->setShowHiddenFolders(showHiddenFiles); + } +} + +void DolphinViewContainer::slotSortHiddenLastChanged(bool hiddenLast) { - return url.scheme().contains(QStringLiteral("search")); + if (m_urlNavigatorConnected) { + m_urlNavigatorConnected->setSortHiddenFoldersLast(hiddenLast); + } +} + +void DolphinViewContainer::slotCurrentDirectoryRemoved() +{ + const QString location(url().toDisplayString(QUrl::PreferLocalFile)); + if (url().isLocalFile()) { + const QString dirPath = url().toLocalFile(); + const QString newPath = getNearestExistingAncestorOfPath(dirPath); + const QUrl newUrl = QUrl::fromLocalFile(newPath); + setUrl(newUrl); + } + + showMessage(xi18n("Current location changed, %1 is no longer accessible.", location), Warning); +} + +void DolphinViewContainer::slotOpenUrlFinished(KJob *job) +{ + if (job->error() && job->error() != KIO::ERR_USER_CANCELED) { + showErrorMessage(job->errorString()); + } +} + +bool DolphinViewContainer::isSearchUrl(const QUrl &url) const +{ + return url.scheme().contains(QLatin1String("search")); } void DolphinViewContainer::saveViewState() @@ -805,3 +971,15 @@ void DolphinViewContainer::tryRestoreViewState() m_view->restoreState(stream); } } + +QString DolphinViewContainer::getNearestExistingAncestorOfPath(const QString &path) const +{ + QDir dir(path); + do { + dir.setPath(QDir::cleanPath(dir.filePath(QStringLiteral("..")))); + } while (!dir.exists() && !dir.isRoot()); + + return dir.exists() ? dir.path() : QString{}; +} + +#include "moc_dolphinviewcontainer.cpp"