X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2d4d2ce9a14902ee5a2b236f8510596fc2f86b99..832b7c4a1b820043fd0b0191d937050107694ed9:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 9761f108f..ee4bb6e4c 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -6,195 +6,207 @@ #include "dolphinviewcontainer.h" +#include "admin/bar.h" +#include "admin/workerintegration.h" +#include "dolphin_compactmodesettings.h" +#include "dolphin_contentdisplaysettings.h" +#include "dolphin_detailsmodesettings.h" #include "dolphin_generalsettings.h" +#include "dolphin_iconsmodesettings.h" #include "dolphindebug.h" #include "dolphinplacesmodelsingleton.h" #include "filterbar/filterbar.h" #include "global.h" -#include "search/dolphinsearchbox.h" +#include "kitemviews/kitemlistcontainer.h" +#include "search/bar.h" +#include "selectionmode/topbar.h" #include "statusbar/dolphinstatusbar.h" -#include "views/viewmodecontroller.h" -#include "views/viewproperties.h" -#include "dolphin_detailsmodesettings.h" -#ifdef HAVE_KACTIVITIES -#include -#endif +#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 -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_view(nullptr), - m_filterBar(nullptr), - m_statusBar(nullptr), - m_statusBarTimer(nullptr), - m_statusBarTimestamp(), - m_autoGrabFocus(true) -#ifdef HAVE_KACTIVITIES - , m_activityResourceInstance(nullptr) -#endif +bool isSearchUrl(const QUrl &url) +{ + return url.scheme().contains(QLatin1String("search")); +} + +// An overview of the widgets contained by this ViewContainer +struct LayoutStructure { + int searchBar = 0; + int adminBar = 1; + int messageWidget = 2; + int selectionModeTopBar = 3; + int view = 4; + int selectionModeBottomBar = 5; + int filterBar = 6; + int statusBar = 7; +}; +constexpr LayoutStructure positionFor; + +DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent) + : QWidget(parent) + , m_topLayout(nullptr) + , m_urlNavigator{new DolphinUrlNavigator(url)} + , m_urlNavigatorConnected{nullptr} + , m_searchBar(nullptr) + , m_searchModeEnabled(false) + , m_adminBar{nullptr} + , m_authorizeToEnterFolderAction{nullptr} + , m_messageWidget(nullptr) + , m_selectionModeTopBar{nullptr} + , m_view(nullptr) + , m_filterBar(nullptr) + , m_selectionModeBottomBar{nullptr} + , m_statusBar(nullptr) + , m_statusBarTimer(nullptr) + , m_statusBarTimestamp() + , m_grabFocusOnUrlChange{true} { hide(); - m_topLayout = new QVBoxLayout(this); + m_topLayout = new QGridLayout(this); m_topLayout->setSpacing(0); m_topLayout->setContentsMargins(0, 0, 0, 0); - 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::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.")); - m_messageWidget = new KMessageWidget(this); m_messageWidget->setCloseButtonVisible(true); + m_messageWidget->setPosition(KMessageWidget::Header); m_messageWidget->hide(); -#ifndef Q_OS_WIN +#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU) 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); + showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), KMessageWidget::Warning); } #endif // Initialize filter bar m_filterBar = new FilterBar(this); - m_filterBar->setVisible(GeneralSettings::filterBar()); + m_filterBar->setVisible(GeneralSettings::filterBar(), WithoutAnimation); - 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_messageWidget, &KMessageWidget::hide); + 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_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_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::selectionChanged, this, &DolphinViewContainer::delayedStatusBarUpdate); + connect(m_view, &DolphinView::errorMessage, this, &DolphinViewContainer::slotErrorMessageFromView); + 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_view, &DolphinView::directoryLoadingProgress, m_statusBar, [this](int percent) { + m_statusBar->showProgress(i18nc("@info:progress", "Loading folder…"), percent); + }); + connect(m_view, &DolphinView::directorySortingProgress, m_statusBar, [this](int percent) { + m_statusBar->showProgress(i18nc("@info:progress", "Sorting…"), percent); + }); + connect(m_statusBar, &DolphinStatusBar::stopPressed, this, &DolphinViewContainer::stopDirectoryLoading); + connect(m_statusBar, &DolphinStatusBar::zoomLevelChanged, this, &DolphinViewContainer::slotStatusBarZoomLevelChanged); + connect(m_statusBar, &DolphinStatusBar::showMessage, this, [this](const QString &message, KMessageWidget::MessageType messageType) { + showMessage(message, messageType); + }); + connect(m_statusBar, &DolphinStatusBar::widthUpdated, this, &DolphinViewContainer::updateStatusBarGeometry); + connect(m_statusBar, &DolphinStatusBar::urlChanged, this, &DolphinViewContainer::updateStatusBar); + connect(this, &DolphinViewContainer::showFilterBarChanged, this, &DolphinViewContainer::updateStatusBar); 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); - - 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); - - setSearchModeEnabled(isSearchUrl(url)); + KIO::FileUndoManager *undoManager = KIO::FileUndoManager::self(); + connect(undoManager, &KIO::FileUndoManager::jobRecordingFinished, this, &DolphinViewContainer::delayedStatusBarUpdate); - connect(DetailsModeSettings::self(), &KCoreConfigSkeleton::configChanged, this, [=]() { - if (view()->mode() == DolphinView::Mode::DetailsView) { - view()->reload(); + m_topLayout->addWidget(m_messageWidget, positionFor.messageWidget, 0); + m_topLayout->addWidget(m_view, positionFor.view, 0); + m_topLayout->addWidget(m_filterBar, positionFor.filterBar, 0); + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::FullWidth) { + m_topLayout->addWidget(m_statusBar, positionFor.statusBar, 0); + } + connect(m_statusBar, &DolphinStatusBar::modeUpdated, this, [this]() { + const bool statusBarInLayout = m_topLayout->itemAtPosition(positionFor.statusBar, 0); + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::FullWidth) { + if (!statusBarInLayout) { + m_topLayout->addWidget(m_statusBar, positionFor.statusBar, 0); + m_statusBar->setUrl(m_view->url()); + } + } else { + if (statusBarInLayout) { + m_topLayout->removeWidget(m_statusBar); + } } + updateStatusBarGeometry(); }); + m_statusBar->setHidden(false); - // Initialize kactivities resource instance + setSearchBarVisible(isSearchUrl(url)); -#ifdef HAVE_KACTIVITIES - m_activityResourceInstance = new KActivities::ResourceInstance(window()->winId(), url); - m_activityResourceInstance->setParent(this); -#endif + // 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); + + QApplication::instance()->installEventFilter(this); } DolphinViewContainer::~DolphinViewContainer() @@ -206,21 +218,17 @@ 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); if (m_urlNavigatorConnected) { m_urlNavigatorConnected->setActive(active); } m_view->setActive(active); - -#ifdef HAVE_KACTIVITIES - if (active) { - m_activityResourceInstance->notifyFocusedIn(); - } else { - m_activityResourceInstance->notifyFocusedOut(); - } -#endif } bool DolphinViewContainer::isActive() const @@ -228,37 +236,27 @@ bool DolphinViewContainer::isActive() const return m_view->isActive(); } -void DolphinViewContainer::setAutoGrabFocus(bool grab) -{ - m_autoGrabFocus = grab; -} - -bool DolphinViewContainer::autoGrabFocus() const +void DolphinViewContainer::setGrabFocusOnUrlChange(bool grabFocus) { - return m_autoGrabFocus; + m_grabFocusOnUrlChange = grabFocus; } -QString DolphinViewContainer::currentSearchText() const -{ - 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 DolphinUrlNavigator* DolphinViewContainer::urlNavigator() const +const DolphinUrlNavigator *DolphinViewContainer::urlNavigator() const { return m_urlNavigatorConnected; } -DolphinUrlNavigator* DolphinViewContainer::urlNavigator() +DolphinUrlNavigator *DolphinViewContainer::urlNavigator() { return m_urlNavigatorConnected; } @@ -273,12 +271,12 @@ DolphinUrlNavigator *DolphinViewContainer::urlNavigatorInternalWithHistory() return m_urlNavigator.get(); } -const DolphinView* DolphinViewContainer::view() const +const DolphinView *DolphinViewContainer::view() const { return m_view; } -DolphinView* DolphinViewContainer::view() +DolphinView *DolphinViewContainer::view() { return m_view; } @@ -291,25 +289,27 @@ void DolphinViewContainer::connectUrlNavigator(DolphinUrlNavigator *urlNavigator Q_CHECK_PTR(m_view); urlNavigator->setLocationUrl(m_view->url()); - urlNavigator->setActive(isActive()); + urlNavigator->setShowHiddenFolders(m_view->hiddenFilesShown()); + urlNavigator->setSortHiddenFoldersLast(m_view->sortHiddenLast()); if (m_urlNavigatorVisualState) { urlNavigator->setVisualState(*m_urlNavigatorVisualState.get()); m_urlNavigatorVisualState.reset(); } + urlNavigator->setActive(isActive()); - connect(m_view, &DolphinView::urlChanged, - urlNavigator, &DolphinUrlNavigator::setLocationUrl); - connect(urlNavigator, &DolphinUrlNavigator::urlChanged, - this, &DolphinViewContainer::slotUrlNavigatorLocationChanged); - connect(urlNavigator, &DolphinUrlNavigator::activated, - this, &DolphinViewContainer::activate); - connect(urlNavigator, &DolphinUrlNavigator::urlAboutToBeChanged, - this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged); - connect(urlNavigator, &DolphinUrlNavigator::urlSelectionRequested, - this, &DolphinViewContainer::slotUrlSelectionRequested); - connect(urlNavigator, &DolphinUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) { + // Url changes are still done via m_urlNavigator. + connect(urlNavigator, &DolphinUrlNavigator::urlChanged, m_urlNavigator.get(), &DolphinUrlNavigator::setLocationUrl); + connect(urlNavigator, &DolphinUrlNavigator::urlsDropped, this, [=, 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); + connect(urlNavigator, &DolphinUrlNavigator::requestToLoseFocus, m_view, [this]() { + m_view->setFocus(); + }); + + urlNavigator->setReadOnlyBadgeVisible(rootItem().isLocalFile() && !rootItem().isWritable()); m_urlNavigatorConnected = urlNavigator; } @@ -320,42 +320,188 @@ void DolphinViewContainer::disconnectUrlNavigator() return; } - disconnect(m_view, &DolphinView::urlChanged, - m_urlNavigatorConnected, &DolphinUrlNavigator::setLocationUrl); - disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::urlChanged, - this, &DolphinViewContainer::slotUrlNavigatorLocationChanged); - disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::activated, - this, &DolphinViewContainer::activate); - disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::urlAboutToBeChanged, - this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged); - disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::urlSelectionRequested, - this, &DolphinViewContainer::slotUrlSelectionRequested); - disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::urlsDropped, - this, nullptr); + 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); + disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::requestToLoseFocus, m_view, nullptr); m_urlNavigatorVisualState = m_urlNavigatorConnected->visualState(); m_urlNavigatorConnected = nullptr; } -void DolphinViewContainer::showMessage(const QString& msg, MessageType type) +void DolphinViewContainer::setSearchBarVisible(bool visible) +{ + if (!visible) { + if (isSearchBarVisible()) { + m_searchBar->setVisible(false, WithAnimation); + } + return; + } + + if (!m_searchBar) { + m_searchBar = new Search::Bar(std::make_shared(m_urlNavigator->locationUrl(), QUrl{} /** will be set below. */), this); + connect(m_searchBar, &Search::Bar::urlChangeRequested, this, [this](const QUrl &url) { + m_view->setViewPropertiesContext(isSearchUrl(url) ? QStringLiteral("search") : QString()); + setGrabFocusOnUrlChange(false); // Prevent loss of focus while typing or refining a search. + setUrl(url); + setGrabFocusOnUrlChange(true); + }); + connect(m_searchBar, &Search::Bar::focusViewRequest, this, &DolphinViewContainer::requestFocus); + connect(m_searchBar, &Search::Bar::showMessage, this, [this](const QString &message, KMessageWidget::MessageType messageType) { + showMessage(message, messageType); + }); + connect(m_searchBar, + &Search::Bar::showInstallationProgress, + m_statusBar, + [this](const QString ¤tlyRunningTaskTitle, int installationProgressPercent) { + m_statusBar->showProgress(currentlyRunningTaskTitle, installationProgressPercent, DolphinStatusBar::CancelLoading::Disallowed); + }); + connect(m_searchBar, &Search::Bar::visibilityChanged, this, &DolphinViewContainer::searchBarVisibilityChanged); + m_topLayout->addWidget(m_searchBar, positionFor.searchBar, 0); + } + + m_searchBar->setVisible(true, WithAnimation); + + // The Search::Bar has been set visible but its state does not yet match with this view container or view. + // The view might for example already be searching because it was opened with a search URL. The Search::Bar needs to be updated to show the parameters of + // that search. And even if there is no search URL loaded in the view currently, we still need to figure out where the Search::Bar should be searching if + // the user starts a search from there. Let's figure out the search location in this method and let the DolphinQuery constructor figure out the rest from + // the current m_urlNavigator->locationUrl(). + for (int i = m_urlNavigator->historyIndex(); i < m_urlNavigator->historySize(); i++) { + QUrl url = m_urlNavigator->locationUrl(i); + if (isSearchUrl(url)) { + // The previous location was a search URL. Try to see if that search URL has a valid search path so we keep searching in the same location. + const auto searchPath = Search::DolphinQuery(url, QUrl{}).searchPath(); // DolphinQuery is great at extracting the search path from a search URL. + if (searchPath.isValid()) { + m_searchBar->updateStateToMatch(std::make_shared(m_urlNavigator->locationUrl(), searchPath)); + return; + } + } else if (url.scheme() == QLatin1String("tags")) { + continue; // We avoid setting a tags url as the backup search path because a DolphinQuery constructed from a tags url will already search tagged + // items everywhere. + } else { + m_searchBar->updateStateToMatch(std::make_shared(m_urlNavigator->locationUrl(), url)); + return; + } + } + // We could not find any URL fit for searching in the history. This might happen because this view only ever loaded a search which searches "Everywhere" + // and therefore there is no specific search path to choose from. But the Search::Bar *needs* to know a search path because the user might switch from + // searching "Everywhere" to "Here" and it is everybody's guess what "Here" is supposed to mean in that context… We'll simply fall back to the user's home + // path for lack of a better option. + m_searchBar->updateStateToMatch(std::make_shared(m_urlNavigator->locationUrl(), QUrl::fromUserInput(QDir::homePath()))); +} + +bool DolphinViewContainer::isSearchBarVisible() const +{ + return m_searchBar && m_searchBar->isVisible() && m_searchBar->isEnabled(); +} + +void DolphinViewContainer::setFocusToSearchBar() +{ + Q_ASSERT(isSearchBarVisible()); + m_searchBar->selectAll(); +} + +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); + m_selectionModeTopBar->setVisible(false, WithAnimation); + m_selectionModeBottomBar->setVisible(false, WithAnimation); + Q_EMIT selectionModeChanged(false); + + if (!QApplication::focusWidget() || m_selectionModeTopBar->isAncestorOf(QApplication::focusWidget()) + || m_selectionModeBottomBar->isAncestorOf(QApplication::focusWidget())) { + m_view->setFocus(); + } + 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, &DolphinViewContainer::showErrorMessage); + 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 &message, KMessageWidget::MessageType messageType, std::initializer_list buttonActions) { - if (msg.isEmpty()) { + if (message.isEmpty()) { return; } - m_messageWidget->setText(msg); + m_messageWidget->setText(message); // TODO: wrap at arbitrary character positions once QLabel can do this // https://bugreports.qt.io/browse/QTBUG-1276 m_messageWidget->setWordWrap(true); + m_messageWidget->setMessageType(messageType); - 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; - default: - Q_ASSERT(false); - break; + const QList previousMessageWidgetActions = m_messageWidget->actions(); + for (auto action : previousMessageWidgetActions) { + m_messageWidget->removeAction(action); + } + for (QAction *action : buttonActions) { + m_messageWidget->addAction(action); } m_messageWidget->setWordWrap(false); @@ -366,6 +512,19 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type) m_messageWidget->hide(); } m_messageWidget->animatedShow(); + +#ifndef QT_NO_ACCESSIBILITY + if (QAccessible::isActive() && isActive()) { + // To announce the new message keyboard focus must be moved to the message label. However, we do not have direct access to the label that is internal + // to the KMessageWidget. Instead we setFocus() on the KMessageWidget and trust that it has set correct focus handling. + m_messageWidget->setFocus(); + } +#endif +} + +void DolphinViewContainer::showProgress(const QString ¤tlyRunningTaskTitle, int progressPercent) +{ + m_statusBar->showProgress(currentlyRunningTaskTitle, progressPercent, DolphinStatusBar::CancelLoading::Disallowed); } void DolphinViewContainer::readSettings() @@ -383,54 +542,15 @@ void DolphinViewContainer::readSettings() bool DolphinViewContainer::isFilterBarVisible() const { - return m_filterBar->isVisible(); -} - -void DolphinViewContainer::setSearchModeEnabled(bool enabled) -{ - m_searchBox->setVisible(enabled); - - if (enabled) { - const QUrl& locationUrl = m_urlNavigatorConnected->locationUrl(); - m_searchBox->fromSearchUrl(locationUrl); - } - - if (enabled == isSearchModeEnabled()) { - if (enabled && !m_searchBox->hasFocus()) { - m_searchBox->setFocus(); - m_searchBox->selectAll(); - } - return; - } - - if (!enabled) { - m_view->setViewPropertiesContext(QString()); - - // Restore the URL for the URL navigator. If Dolphin has been - // started with a search-URL, the home URL is used as fallback. - QUrl url = m_searchBox->searchPath(); - if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) { - url = Dolphin::homeUrl(); - } - m_urlNavigatorConnected->setLocationUrl(url); - } - - m_searchModeEnabled = enabled; - - Q_EMIT searchModeEnabledChanged(enabled); -} - -bool DolphinViewContainer::isSearchModeEnabled() const -{ - return m_searchModeEnabled; + return m_filterBar->isEnabled(); // Gets disabled in AnimatedHeightWidget while animating towards a hidden state. } QString DolphinViewContainer::placesText() const { QString text; - if (isSearchModeEnabled()) { - text = i18n("Search for %1 in %2", m_searchBox->text(), m_searchBox->searchPath().fileName()); + if (isSearchBarVisible() && m_searchBar->isSearchConfigured()) { + text = m_searchBar->queryTitle(); } else { text = url().adjusted(QUrl::StripTrailingSlash).fileName(); if (text.isEmpty()) { @@ -452,7 +572,7 @@ void DolphinViewContainer::reload() QString DolphinViewContainer::captionWindowTitle() const { - if (GeneralSettings::showFullPathInTitlebar() && !isSearchModeEnabled()) { + if (GeneralSettings::showFullPathInTitlebar() && (!isSearchBarVisible() || !m_searchBar->isSearchConfigured())) { if (!url().isLocalFile()) { return url().adjusted(QUrl::StripTrailingSlash).toString(); } @@ -464,21 +584,26 @@ QString DolphinViewContainer::captionWindowTitle() const QString DolphinViewContainer::caption() const { - if (isSearchModeEnabled()) { - if (currentSearchText().isEmpty()){ - return i18n("Search"); - } else { - return i18n("Search for %1", currentSearchText()); + // see KUrlNavigatorPrivate::firstButtonText(). + if (url().path().isEmpty() || url().path() == QLatin1Char('/')) { + QUrlQuery query(url()); + const QString title = query.queryItemValue(QStringLiteral("title"), QUrl::FullyDecoded); + if (!title.isEmpty()) { + return title; } } + if (isSearchBarVisible() && m_searchBar->isSearchConfigured()) { + return m_searchBar->queryTitle(); + } + KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); - const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QUrl(url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?")), 1, Qt::MatchRegExp); - if (!matchedPlaces.isEmpty()) { - return placesModel->text(matchedPlaces.first()); - } + QModelIndex url_index = placesModel->closestItem(url()); + if (url_index.isValid() && placesModel->url(url_index).matches(url(), QUrl::StripTrailingSlash)) { + return placesModel->text(url_index); + } if (!url().isLocalFile()) { QUrl adjustedUrl = url().adjusted(QUrl::StripTrailingSlash); @@ -503,15 +628,14 @@ 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); + if (m_searchBar && !Search::isSupportedSearchScheme(newUrl.scheme())) { + m_searchBar->setSearchPath(newUrl); + } } - -#ifdef HAVE_KACTIVITIES - m_activityResourceInstance->setUri(newUrl); -#endif } void DolphinViewContainer::setFilterBarVisible(bool visible) @@ -519,9 +643,10 @@ void DolphinViewContainer::setFilterBarVisible(bool visible) Q_ASSERT(m_filterBar); if (visible) { m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly); - m_filterBar->show(); + m_filterBar->setVisible(true, WithAnimation); m_filterBar->setFocus(); m_filterBar->selectAll(); + Q_EMIT showFilterBarChanged(true); } else { closeFilterBar(); } @@ -545,26 +670,8 @@ void DolphinViewContainer::delayedStatusBarUpdate() void DolphinViewContainer::updateStatusBar() { m_statusBarTimestamp.start(); - - const QString text = m_view->statusBarText(); - m_statusBar->setDefaultText(text); - m_statusBar->resetToDefaultText(); -} - -void DolphinViewContainer::updateDirectoryLoadingProgress(int percent) -{ - if (m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder...")); - } - m_statusBar->setProgress(percent); -} - -void DolphinViewContainer::updateDirectorySortingProgress(int percent) -{ - if (m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(i18nc("@info:progress", "Sorting...")); - } - m_statusBar->setProgress(percent); + m_view->requestStatusBarText(); + updateStatusBarGeometry(); } void DolphinViewContainer::slotDirectoryLoadingStarted() @@ -573,23 +680,22 @@ 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->setProgress(-1); + m_statusBar->showProgress(i18nc("@info", "Searching…"), -1); } else { // Trigger an undetermined progress indication. The progress // information in percent will be triggered by the percent() signal // of the directory lister later. - m_statusBar->setProgressText(QString()); - updateDirectoryLoadingProgress(-1); + m_statusBar->showProgress(QString(), -1); + } + + if (m_urlNavigatorConnected) { + m_urlNavigatorConnected->setReadOnlyBadgeVisible(false); } } void DolphinViewContainer::slotDirectoryLoadingCompleted() { - if (!m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(QString()); - m_statusBar->setProgress(100); - } + m_statusBar->showProgress(QString(), 100); if (isSearchUrl(url()) && m_view->itemsCount() == 0) { // The dir lister has been completed on a Baloo-URI and no items have been found. Instead @@ -598,26 +704,37 @@ void DolphinViewContainer::slotDirectoryLoadingCompleted() } else { updateStatusBar(); } + + if (m_urlNavigatorConnected) { + m_urlNavigatorConnected->setReadOnlyBadgeVisible(rootItem().isLocalFile() && !rootItem().isWritable()); + } + + // Update admin bar visibility + if (m_view->url().scheme() == QStringLiteral("admin")) { + if (!m_adminBar) { + m_adminBar = new Admin::Bar(this); + m_topLayout->addWidget(m_adminBar, positionFor.adminBar, 0); + } + m_adminBar->setVisible(true, WithAnimation); + } else if (m_adminBar) { + m_adminBar->setVisible(false, WithAnimation); + } } void DolphinViewContainer::slotDirectoryLoadingCanceled() { - if (!m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(QString()); - m_statusBar->setProgress(100); - } - + m_statusBar->showProgress(QString(), 100); 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 { @@ -625,34 +742,89 @@ 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; } - KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl()); - job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); + KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl(), item.mimetype()); + // Auto*Warning*Handling, errors are put in a KMessageWidget by us in slotOpenUrlFinished. + job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoWarningHandlingEnabled, this)); 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()); + + int indexOfAppToOpenFileWith = 1; + + // executable scripts + auto mimeType = item.currentMimeType(); + if (item.isLocalFile() && mimeType.inherits(QStringLiteral("application/x-executable")) && mimeType.inherits(QStringLiteral("text/plain")) + && QFileInfo(item.localPath()).isExecutable()) { + KConfigGroup cfgGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), QStringLiteral("Executable scripts")); + const QString value = cfgGroup.readEntry("behaviourOnLaunch", "alwaysAsk"); + + // in case KIO::WidgetsOpenOrExecuteFileHandler::promptUserOpenOrExecute would not open the file + if (value != QLatin1String("open")) { + indexOfAppToOpenFileWith = 0; + } + } + + if (services.length() >= indexOfAppToOpenFileWith + 1) { + auto service = services.at(indexOfAppToOpenFileWith); + + KIO::ApplicationLauncherJob *job = new KIO::ApplicationLauncherJob(service, this); + job->setUrls({item.url()}); + + job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); + connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished); + job->start(); + } else { + // If no 2nd service available, try to open archives in new tabs, regardless of the "Open archives as folder" setting. + const QUrl &url = DolphinView::openItemAsFolderUrl(item); + const auto modifiers = QGuiApplication::keyboardModifiers(); + if (!url.isEmpty()) { + // keep in sync with KUrlNavigator::slotNavigatorButtonClicked + if (modifiers & Qt::ShiftModifier) { + Q_EMIT activeTabRequested(url); + } else { + Q_EMIT tabRequested(url); + } + } + } +} + +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(); @@ -668,7 +840,12 @@ void DolphinViewContainer::closeFilterBar() Q_EMIT showFilterBarChanged(false); } -void DolphinViewContainer::setNameFilter(const QString& nameFilter) +void DolphinViewContainer::clearFilterBar() +{ + m_filterBar->clearIfUnlocked(); +} + +void DolphinViewContainer::setNameFilter(const QString &nameFilter) { m_view->hideToolTip(ToolTipManager::HideBehavior::Instantly); m_view->setNameFilter(nameFilter); @@ -680,23 +857,29 @@ 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) { if (m_urlNavigatorConnected) { m_urlNavigatorConnected->slotReturnPressed(); } if (KProtocolManager::supportsListing(url)) { - setSearchModeEnabled(isSearchUrl(url)); + if (isSearchUrl(url)) { + setSearchBarVisible(true); + } else if (m_searchBar && m_searchBar->isSearchConfigured()) { + // Hide the search bar because it shows an outdated search which the user does not care about anymore. + setSearchBarVisible(false); + } + m_view->setUrl(url); tryRestoreViewState(); - if (m_autoGrabFocus && isActive() && !isSearchUrl(url)) { + if (m_grabFocusOnUrlChange && isActive()) { // 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. @@ -706,28 +889,41 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url) 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); + KMessageWidget::Information); } else { - showMessage(i18nc("@info:status", - "Protocol not supported by Dolphin, default application has been launched"), - Information); + showMessage(i18nc("@info:status", "Protocol not supported by Dolphin, default application has been launched"), KMessageWidget::Information); } QDesktopServices::openUrl(url); redirect(QUrl(), m_urlNavigator->locationUrl(1)); } else { - showMessage(i18nc("@info:status", "Invalid protocol"), Error); + if (!url.scheme().isEmpty()) { + showMessage(i18nc("@info:status", "Invalid protocol '%1'", url.scheme()), KMessageWidget::Error); + } else { + showMessage(i18nc("@info:status", "Invalid protocol"), KMessageWidget::Error); + } m_urlNavigator->goBack(); } } -void DolphinViewContainer::slotUrlSelectionRequested(const QUrl& url) +void DolphinViewContainer::slotUrlSelectionRequested(const QUrl &url) { - m_view->markUrlsAsSelected({url}); + // We do not want to select any item here because there is no reason to assume that the user wants to edit the folder we are emerging from. BUG: 424723 + 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() +{ + 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(); @@ -738,7 +934,7 @@ void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl) // URL history. m_urlNavigator->saveLocationState(QByteArray()); m_urlNavigator->setLocationUrl(newUrl); - setSearchModeEnabled(isSearchUrl(newUrl)); + setSearchBarVisible(isSearchUrl(newUrl)); m_urlNavigator->blockSignals(block); } @@ -748,40 +944,86 @@ void DolphinViewContainer::requestFocus() m_view->setFocus(); } -void DolphinViewContainer::startSearching() +void DolphinViewContainer::stopDirectoryLoading() +{ + m_view->stopLoading(); + m_statusBar->showProgress(QString(), 100); +} + +void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel) { - Q_CHECK_PTR(m_urlNavigatorConnected); - const QUrl url = m_searchBox->urlForSearching(); - if (url.isValid() && !url.isEmpty()) { - m_view->setViewPropertiesContext(QStringLiteral("search")); - m_urlNavigatorConnected->setLocationUrl(url); + m_view->setZoomLevel(zoomLevel); +} + +void DolphinViewContainer::slotErrorMessageFromView(const QString &message, const int kioErrorCode) +{ + if (kioErrorCode == KIO::ERR_CANNOT_ENTER_DIRECTORY && m_view->url().scheme() == QStringLiteral("file") + && KProtocolInfo::isKnownProtocol(QStringLiteral("admin")) && !rootItem().isReadable()) { + // Explain to users that they need authentication to see the folder contents. + if (!m_authorizeToEnterFolderAction) { // This code is similar to parts of Admin::Bar::hideTheNextTimeAuthorizationExpires(). + // We should not simply use the actAsAdminAction() itself here because that one always refers to the active view instead of this->m_view. + auto actAsAdminAction = Admin::WorkerIntegration::FriendAccess::actAsAdminAction(); + m_authorizeToEnterFolderAction = new QAction{actAsAdminAction->icon(), actAsAdminAction->text(), this}; + m_authorizeToEnterFolderAction->setToolTip(actAsAdminAction->toolTip()); + m_authorizeToEnterFolderAction->setWhatsThis(actAsAdminAction->whatsThis()); + connect(m_authorizeToEnterFolderAction, &QAction::triggered, this, [this, actAsAdminAction]() { + setActive(true); + actAsAdminAction->trigger(); + }); + } + showMessage(i18nc("@info", "Authorization required to enter this folder."), KMessageWidget::Error, {m_authorizeToEnterFolderAction}); + return; } + Q_EMIT showErrorMessage(message); } -void DolphinViewContainer::closeSearchBox() +void DolphinViewContainer::showErrorMessage(const QString &message) { - setSearchModeEnabled(false); + showMessage(message, KMessageWidget::Error); } -void DolphinViewContainer::stopDirectoryLoading() +void DolphinViewContainer::slotPlacesModelChanged() { - m_view->stopLoading(); - m_statusBar->setProgress(100); + if (!GeneralSettings::showFullPathInTitlebar()) { + Q_EMIT captionChanged(); + } } -void DolphinViewContainer::slotStatusBarZoomLevelChanged(int zoomLevel) +void DolphinViewContainer::slotHiddenFilesShownChanged(bool showHiddenFiles) { - m_view->setZoomLevel(zoomLevel); + if (m_urlNavigatorConnected) { + m_urlNavigatorConnected->setShowHiddenFolders(showHiddenFiles); + } } -void DolphinViewContainer::showErrorMessage(const QString& msg) +void DolphinViewContainer::slotSortHiddenLastChanged(bool hiddenLast) { - showMessage(msg, Error); + if (m_urlNavigatorConnected) { + m_urlNavigatorConnected->setSortHiddenFoldersLast(hiddenLast); + } } -bool DolphinViewContainer::isSearchUrl(const QUrl& url) const +void DolphinViewContainer::slotCurrentDirectoryRemoved() { - return url.scheme().contains(QLatin1String("search")); + 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); + // #473377: Delay changing the url to avoid modifying KCoreDirLister before KCoreDirListerCache::deleteDir() returns. + QTimer::singleShot(0, this, [&, newUrl, location] { + setUrl(newUrl); + showMessage(xi18n("Current location changed, %1 is no longer accessible.", location), KMessageWidget::Warning); + }); + } else + showMessage(xi18n("Current location changed, %1 is no longer accessible.", location), KMessageWidget::Warning); +} + +void DolphinViewContainer::slotOpenUrlFinished(KJob *job) +{ + if (job->error() && job->error() != KIO::ERR_USER_CANCELED) { + showErrorMessage(job->errorString()); + } } void DolphinViewContainer::saveViewState() @@ -800,3 +1042,62 @@ 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{}; +} + +void DolphinViewContainer::updateStatusBarGeometry() +{ + if (!m_statusBar) { + return; + } + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::Small) { + QRect statusBarRect(preferredSmallStatusBarGeometry()); + if (view()->layoutDirection() == Qt::RightToLeft) { + const int splitterWidth = m_statusBar->clippingAmount(); + statusBarRect.setLeft(rect().width() - m_statusBar->width() + splitterWidth); // Add clipping amount. + } + // Move statusbar to bottomLeft, or bottomRight with right-to-left-layout. + m_statusBar->setGeometry(statusBarRect); + // Add 1 due to how qrect coordinates work. + m_view->setStatusBarOffset(m_statusBar->geometry().height() - m_statusBar->clippingAmount() + 1); + } else { + m_view->setStatusBarOffset(0); + } +} + +bool DolphinViewContainer::eventFilter(QObject *object, QEvent *event) +{ + if (GeneralSettings::showStatusBar() == GeneralSettings::EnumShowStatusBar::Small && object == m_view) { + switch (event->type()) { + case QEvent::Resize: { + m_statusBar->updateWidthToContent(); + break; + } + case QEvent::LayoutRequest: { + m_statusBar->updateWidthToContent(); + break; + } + default: + break; + } + } + return false; +} + +QRect DolphinViewContainer::preferredSmallStatusBarGeometry() +{ + // Add offset depending if horizontal scrollbar or filterbar is visible, we need to add 1 due to how QRect coordinates work. + const int yPos = m_view->geometry().bottom() - m_view->horizontalScrollBarHeight() - m_statusBar->minimumHeight() + 1; + QRect statusBarRect = rect().adjusted(0, yPos, 0, 0); + return statusBarRect; +} + +#include "moc_dolphinviewcontainer.cpp"