X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ce11325115b8655fd687c78fdf0b1c358806195e..b354498dbe25f14ca65ef93a0ef26799716a1ad4:/src/dolphinnavigatorswidgetaction.cpp diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp index cabeac4ed..ef99d1cb7 100644 --- a/src/dolphinnavigatorswidgetaction.cpp +++ b/src/dolphinnavigatorswidgetaction.cpp @@ -1,6 +1,6 @@ /* This file is part of the KDE project - SPDX-FileCopyrightText: 2020 Felix Ernst + SPDX-FileCopyrightText: 2020 Felix Ernst SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ @@ -9,28 +9,26 @@ #include "trash/dolphintrash.h" +#include #include -#include -#include +#include +#include + +#include #include -#include #include #include -#include +#include #include #include -DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) : - QWidgetAction{parent}, - m_splitter{new QSplitter(Qt::Horizontal)}, - m_adjustSpacingTimer{new QTimer(this)}, - m_globalXOfSplitter{INT_MIN}, - m_globalXOfPrimary{INT_MIN}, - m_widthOfPrimary{INT_MIN}, - m_globalXOfSecondary{INT_MIN}, - m_widthOfSecondary{INT_MIN} +DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) + : QWidgetAction{parent} + , m_splitter{new QSplitter(Qt::Horizontal)} + , m_adjustSpacingTimer{new QTimer(this)} + , m_viewGeometriesHelper{m_splitter.get(), this} { updateText(); setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts"))); @@ -38,11 +36,66 @@ DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) : m_splitter->setChildrenCollapsible(false); m_splitter->addWidget(createNavigatorWidget(Primary)); + m_splitter->setFocusProxy(primaryUrlNavigator()); m_adjustSpacingTimer->setInterval(100); m_adjustSpacingTimer->setSingleShot(true); - connect(m_adjustSpacingTimer.get(), &QTimer::timeout, - this, &DolphinNavigatorsWidgetAction::adjustSpacing); + connect(m_adjustSpacingTimer.get(), &QTimer::timeout, this, &DolphinNavigatorsWidgetAction::adjustSpacing); +} + +void DolphinNavigatorsWidgetAction::adjustSpacing() +{ + m_previousWindowWidth = qobject_cast(parent())->window()->width(); + auto viewGeometries = m_viewGeometriesHelper.viewGeometries(); + const int widthOfSplitterPrimary = viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary - viewGeometries.globalXOfNavigatorsWidget; + const QList splitterSizes = {widthOfSplitterPrimary, m_splitter->width() - widthOfSplitterPrimary - m_splitter->handleWidth()}; + m_splitter->setSizes(splitterSizes); + + // primary side of m_splitter + int leadingSpacing = viewGeometries.globalXOfPrimary - viewGeometries.globalXOfNavigatorsWidget; + if (leadingSpacing < 0) { + leadingSpacing = 0; + } + int trailingSpacing = (viewGeometries.globalXOfNavigatorsWidget + m_splitter->width()) - (viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary); + if (trailingSpacing < 0 || emptyTrashButton(Primary)->isVisible() || networkFolderButton(Primary)->isVisible()) { + trailingSpacing = 0; + } + const int widthLeftForUrlNavigator = m_splitter->widget(0)->width() - leadingSpacing - trailingSpacing; + const int widthNeededForUrlNavigator = primaryUrlNavigator()->sizeHint().width() - widthLeftForUrlNavigator; + if (widthNeededForUrlNavigator > 0) { + trailingSpacing -= widthNeededForUrlNavigator; + if (trailingSpacing < 0) { + leadingSpacing += trailingSpacing; + trailingSpacing = 0; + } + if (leadingSpacing < 0) { + leadingSpacing = 0; + } + } + spacing(Primary, Leading)->setMinimumWidth(leadingSpacing); + spacing(Primary, Trailing)->setFixedWidth(trailingSpacing); + + // secondary side of m_splitter + if (viewGeometries.globalXOfSecondary == INT_MIN) { + Q_ASSERT(viewGeometries.widthOfSecondary == INT_MIN); + return; + } + spacing(Primary, Trailing)->setFixedWidth(0); + + trailingSpacing = (viewGeometries.globalXOfNavigatorsWidget + m_splitter->width()) - (viewGeometries.globalXOfSecondary + viewGeometries.widthOfSecondary); + if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible() || networkFolderButton(Secondary)->isVisible()) { + trailingSpacing = 0; + } else { + const int widthLeftForUrlNavigator2 = m_splitter->widget(1)->width() - trailingSpacing; + const int widthNeededForUrlNavigator2 = secondaryUrlNavigator()->sizeHint().width() - widthLeftForUrlNavigator2; + if (widthNeededForUrlNavigator2 > 0) { + trailingSpacing -= widthNeededForUrlNavigator2; + if (trailingSpacing < 0) { + trailingSpacing = 0; + } + } + } + spacing(Secondary, Trailing)->setMinimumWidth(trailingSpacing); } void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator() @@ -50,34 +103,15 @@ void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator() Q_ASSERT(m_splitter->count() == 1); m_splitter->addWidget(createNavigatorWidget(Secondary)); Q_ASSERT(m_splitter->count() == 2); +#if KIO_VERSION >= QT_VERSION_CHECK(6, 14, 0) + secondaryUrlNavigator()->setBackgroundEnabled(primaryUrlNavigator()->isBackgroundEnabled()); +#endif updateText(); } -void DolphinNavigatorsWidgetAction::followViewContainerGeometry( - int globalXOfPrimary, int widthOfPrimary) +void DolphinNavigatorsWidgetAction::followViewContainersGeometry(QWidget *primaryViewContainer, QWidget *secondaryViewContainer) { - followViewContainersGeometry(globalXOfPrimary, widthOfPrimary, INT_MIN, INT_MIN); -} - -void DolphinNavigatorsWidgetAction::followViewContainersGeometry( - int globalXOfPrimary, int widthOfPrimary, - int globalXOfSecondary, int widthOfSecondary) -{ - if (QApplication::layoutDirection() == Qt::LeftToRight) { - m_globalXOfSplitter = m_splitter->mapToGlobal(QPoint(0,0)).x(); - m_globalXOfPrimary = globalXOfPrimary; - m_globalXOfSecondary = globalXOfSecondary; - } else { - // When the direction is reversed, globalX does not change. - // For the adjustSpacing() code to work we need globalX to measure from right to left - // and to measure up to the rightmost point of a widget instead of the leftmost. - m_globalXOfSplitter = (-1) * (m_splitter->mapToGlobal(QPoint(0,0)).x() + m_splitter->width()); - m_globalXOfPrimary = (-1) * (globalXOfPrimary + widthOfPrimary); - m_globalXOfSecondary = (globalXOfSecondary == INT_MIN) ? INT_MIN : - (-1) * (globalXOfSecondary + widthOfSecondary); - } - m_widthOfPrimary = widthOfPrimary; - m_widthOfSecondary = widthOfSecondary; + m_viewGeometriesHelper.setViewContainers(primaryViewContainer, secondaryViewContainer); adjustSpacing(); } @@ -86,13 +120,13 @@ bool DolphinNavigatorsWidgetAction::isInToolbar() const return qobject_cast(m_splitter->parentWidget()); } -DolphinUrlNavigator* DolphinNavigatorsWidgetAction::primaryUrlNavigator() const +DolphinUrlNavigator *DolphinNavigatorsWidgetAction::primaryUrlNavigator() const { Q_ASSERT(m_splitter); return m_splitter->widget(0)->findChild(); } -DolphinUrlNavigator* DolphinNavigatorsWidgetAction::secondaryUrlNavigator() const +DolphinUrlNavigator *DolphinNavigatorsWidgetAction::secondaryUrlNavigator() const { Q_ASSERT(m_splitter); if (m_splitter->count() < 2) { @@ -105,15 +139,33 @@ void DolphinNavigatorsWidgetAction::setSecondaryNavigatorVisible(bool visible) { if (visible) { Q_ASSERT(m_splitter->count() == 2); + m_splitter->widget(0)->setContentsMargins(0, 0, m_splitter->style()->pixelMetric(QStyle::PM_LayoutRightMargin), 0); + m_splitter->widget(1)->setContentsMargins(m_splitter->style()->pixelMetric(QStyle::PM_LayoutLeftMargin), 0, 0, 0); m_splitter->widget(1)->setVisible(true); } else if (m_splitter->count() > 1) { m_splitter->widget(1)->setVisible(false); + m_splitter->widget(0)->setContentsMargins(0, 0, 0, 0); + m_splitter->widget(1)->setContentsMargins(0, 0, 0, 0); // Fix an unlikely event of wrong trash button visibility. emptyTrashButton(Secondary)->setVisible(false); } updateText(); } +void DolphinNavigatorsWidgetAction::setBackgroundEnabled(bool enabled) +{ +#if KIO_VERSION >= QT_VERSION_CHECK(6, 14, 0) + m_splitter->setAutoFillBackground(!enabled); + m_splitter->setBackgroundRole(enabled ? QPalette::Window : QPalette::Base); + primaryUrlNavigator()->setBackgroundEnabled(enabled); + if (secondaryUrlNavigator()) { + secondaryUrlNavigator()->setBackgroundEnabled(enabled); + } +#else + Q_UNUSED(enabled); +#endif +} + QWidget *DolphinNavigatorsWidgetAction::createWidget(QWidget *parent) { QWidget *oldParent = m_splitter->parentWidget(); @@ -137,71 +189,13 @@ void DolphinNavigatorsWidgetAction::deleteWidget(QWidget *widget) m_splitter->setParent(nullptr); } -void DolphinNavigatorsWidgetAction::adjustSpacing() -{ - Q_ASSERT(m_globalXOfSplitter != INT_MIN); - Q_ASSERT(m_globalXOfPrimary != INT_MIN); - Q_ASSERT(m_widthOfPrimary != INT_MIN); - const int widthOfSplitterPrimary = m_globalXOfPrimary + m_widthOfPrimary - m_globalXOfSplitter; - const QList splitterSizes = {widthOfSplitterPrimary, - m_splitter->width() - widthOfSplitterPrimary}; - m_splitter->setSizes(splitterSizes); - - // primary side of m_splitter - int leadingSpacing = m_globalXOfPrimary - m_globalXOfSplitter; - if (leadingSpacing < 0) { - leadingSpacing = 0; - } - int trailingSpacing = (m_globalXOfSplitter + m_splitter->width()) - - (m_globalXOfPrimary + m_widthOfPrimary); - if (trailingSpacing < 0 || emptyTrashButton(Primary)->isVisible()) { - trailingSpacing = 0; - } - const int widthLeftForUrlNavigator = m_splitter->widget(0)->width() - leadingSpacing - trailingSpacing; - const int widthNeededForUrlNavigator = primaryUrlNavigator()->sizeHint().width() - widthLeftForUrlNavigator; - if (widthNeededForUrlNavigator > 0) { - trailingSpacing -= widthNeededForUrlNavigator; - if (trailingSpacing < 0) { - leadingSpacing += trailingSpacing; - trailingSpacing = 0; - } - if (leadingSpacing < 0) { - leadingSpacing = 0; - } - } - spacing(Primary, Leading)->setMinimumWidth(leadingSpacing); - spacing(Primary, Trailing)->setFixedWidth(trailingSpacing); - - // secondary side of m_splitter - if (m_globalXOfSecondary == INT_MIN) { - Q_ASSERT(m_widthOfSecondary == INT_MIN); - return; - } - spacing(Primary, Trailing)->setFixedWidth(0); - - trailingSpacing = (m_globalXOfSplitter + m_splitter->width()) - - (m_globalXOfSecondary + m_widthOfSecondary); - if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible()) { - trailingSpacing = 0; - } else { - const int widthLeftForUrlNavigator2 = m_splitter->widget(1)->width() - trailingSpacing; - const int widthNeededForUrlNavigator2 = secondaryUrlNavigator()->sizeHint().width() - widthLeftForUrlNavigator2; - if (widthNeededForUrlNavigator2 > 0) { - trailingSpacing -= widthNeededForUrlNavigator2; - if (trailingSpacing < 0) { - trailingSpacing = 0; - } - } - } - spacing(Secondary, Trailing)->setMinimumWidth(trailingSpacing); -} - QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const { auto navigatorWidget = new QWidget(m_splitter.get()); auto layout = new QHBoxLayout{navigatorWidget}; layout->setSpacing(0); layout->setContentsMargins(0, 0, 0, 0); + if (side == Primary) { auto leadingSpacing = new QWidget{navigatorWidget}; layout->addWidget(leadingSpacing); @@ -212,18 +206,39 @@ QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const auto emptyTrashButton = newEmptyTrashButton(urlNavigator, navigatorWidget); layout->addWidget(emptyTrashButton); - connect(urlNavigator, &KUrlNavigator::urlChanged, this, [this]() { - // We have to wait for DolphinUrlNavigator::sizeHint() to update which - // happens a little bit later than when urlChanged is emitted. - this->m_adjustSpacingTimer->start(); - }); + auto networkFolderButton = newNetworkFolderButton(urlNavigator, navigatorWidget); + layout->addWidget(networkFolderButton); + + connect( + urlNavigator, + &KUrlNavigator::urlChanged, + this, + [urlNavigator, this]() { + // Update URL navigator to show a server URL entry placeholder text if we + // just loaded the remote:/ page, to make it easier for users to figure out + // that they can enter arbitrary remote URLs. See bug 414670 + if (urlNavigator->locationUrl().scheme() == QLatin1String("remote")) { + if (!urlNavigator->isUrlEditable()) { + urlNavigator->setUrlEditable(true); + } + urlNavigator->clearText(); + urlNavigator->setPlaceholderText(i18n("Enter server URL (e.g. smb://[ip address])")); + } else { + urlNavigator->setPlaceholderText(QString()); + } + + // We have to wait for DolphinUrlNavigator::sizeHint() to update which + // happens a little bit later than when urlChanged is emitted. + this->m_adjustSpacingTimer->start(); + }, + Qt::QueuedConnection); auto trailingSpacing = new QWidget{navigatorWidget}; layout->addWidget(trailingSpacing); return navigatorWidget; } -QPushButton * DolphinNavigatorsWidgetAction::emptyTrashButton(DolphinNavigatorsWidgetAction::Side side) +QPushButton *DolphinNavigatorsWidgetAction::emptyTrashButton(DolphinNavigatorsWidgetAction::Side side) { int sideIndex = (side == Primary ? 0 : 1); if (side == Primary) { @@ -234,13 +249,14 @@ QPushButton * DolphinNavigatorsWidgetAction::emptyTrashButton(DolphinNavigatorsW QPushButton *DolphinNavigatorsWidgetAction::newEmptyTrashButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const { - auto emptyTrashButton = new QPushButton(QIcon::fromTheme(QStringLiteral("user-trash")), - i18nc("@action:button", "Empty Trash"), parent); + auto emptyTrashButton = new QPushButton(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@action:button", "Empty Trash"), parent); + emptyTrashButton->setToolTip(i18n("Empties Trash to create free space")); + emptyTrashButton->setFlat(true); - connect(emptyTrashButton, &QPushButton::clicked, - this, [parent]() { Trash::empty(parent); }); - connect(&Trash::instance(), &Trash::emptinessChanged, - emptyTrashButton, &QPushButton::setDisabled); + connect(emptyTrashButton, &QPushButton::clicked, this, [parent]() { + Trash::empty(parent); + }); + connect(&Trash::instance(), &Trash::emptinessChanged, emptyTrashButton, &QPushButton::setDisabled); emptyTrashButton->hide(); connect(urlNavigator, &KUrlNavigator::urlChanged, this, [emptyTrashButton, urlNavigator]() { emptyTrashButton->setVisible(urlNavigator->locationUrl().scheme() == QLatin1String("trash")); @@ -249,6 +265,40 @@ QPushButton *DolphinNavigatorsWidgetAction::newEmptyTrashButton(const DolphinUrl return emptyTrashButton; } +QPushButton *DolphinNavigatorsWidgetAction::networkFolderButton(DolphinNavigatorsWidgetAction::Side side) +{ + int sideIndex = (side == Primary ? 0 : 1); + if (side == Primary) { + return static_cast(m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget()); + } + return static_cast(m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget()); +} + +QPushButton *DolphinNavigatorsWidgetAction::newNetworkFolderButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const +{ + auto networkFolderButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-add")), i18nc("@action:button", "Add Network Folder"), parent); + networkFolderButton->setFlat(true); + connect(networkFolderButton, &QPushButton::clicked, this, [networkFolderButton]() { + const KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("org.kde.knetattach")); + auto *job = new KIO::ApplicationLauncherJob(service, networkFolderButton); + auto *delegate = new KNotificationJobUiDelegate; + delegate->setAutoErrorHandlingEnabled(true); + job->setUiDelegate(delegate); + job->start(); + }); + networkFolderButton->hide(); + connect(urlNavigator, &KUrlNavigator::urlChanged, this, [networkFolderButton, urlNavigator]() { + if (urlNavigator->locationUrl().scheme() == QLatin1String("remote")) { + // Looking up a service can be a bit slow, so we only do it now when it becomes necessary. + const KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("org.kde.knetattach")); + networkFolderButton->setVisible(service); + } else { + networkFolderButton->setVisible(false); + } + }); + return networkFolderButton; +} + QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) const { int sideIndex = (side == Primary ? 0 : 1); @@ -257,14 +307,86 @@ QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) co return m_splitter->widget(sideIndex)->layout()->itemAt(0)->widget(); } if (side == Primary) { - return m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget(); + return m_splitter->widget(sideIndex)->layout()->itemAt(4)->widget(); } - return m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget(); + return m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget(); } void DolphinNavigatorsWidgetAction::updateText() { - const int urlNavigatorsAmount = m_splitter->count() > 1 && m_splitter->widget(1)->isVisible() ? - 2 : 1; + const int urlNavigatorsAmount = m_splitter->count() > 1 && m_splitter->widget(1)->isVisible() ? 2 : 1; setText(i18ncp("@action:inmenu", "Location Bar", "Location Bars", urlNavigatorsAmount)); } + +DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper(QWidget *navigatorsWidget, DolphinNavigatorsWidgetAction *navigatorsWidgetAction) + : m_navigatorsWidget{navigatorsWidget} + , m_navigatorsWidgetAction{navigatorsWidgetAction} +{ + Q_CHECK_PTR(navigatorsWidget); + Q_CHECK_PTR(navigatorsWidgetAction); +} + +bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *watched, QEvent *event) +{ + if (event->type() == QEvent::Resize) { + if (qobject_cast(m_navigatorsWidgetAction->parent())->window()->width() != m_navigatorsWidgetAction->m_previousWindowWidth) { + // The window is being resized which means not all widgets have gotten their new sizes yet. + // Let's wait a bit so the sizes of the navigatorsWidget and the viewContainers have all + // had a chance to be updated. + m_navigatorsWidgetAction->m_adjustSpacingTimer->start(); + } else { + m_navigatorsWidgetAction->adjustSpacing(); + // We could always use the m_adjustSpacingTimer instead of calling adjustSpacing() directly + // here but then the navigatorsWidget doesn't fluently align with the viewContainers when + // the DolphinTabPage::m_expandViewAnimation is animating. + } + return false; + } + return QObject::eventFilter(watched, event); +} + +void DolphinNavigatorsWidgetAction::ViewGeometriesHelper::setViewContainers(QWidget *primaryViewContainer, QWidget *secondaryViewContainer) +{ + Q_CHECK_PTR(primaryViewContainer); + if (m_primaryViewContainer) { + m_primaryViewContainer->removeEventFilter(this); + } + primaryViewContainer->installEventFilter(this); + m_primaryViewContainer = primaryViewContainer; + + // It is not possible to resize the secondaryViewContainer without simultaneously + // resizing the primaryViewContainer so we don't have to installEventFilter() here. + m_secondaryViewContainer = secondaryViewContainer; +} + +DolphinNavigatorsWidgetAction::ViewGeometriesHelper::Geometries DolphinNavigatorsWidgetAction::ViewGeometriesHelper::viewGeometries() +{ + Q_ASSERT(m_primaryViewContainer); + Geometries geometries; + + // width + geometries.widthOfPrimary = m_primaryViewContainer->width(); + if (m_secondaryViewContainer) { + geometries.widthOfSecondary = m_secondaryViewContainer->width(); + } else { + geometries.widthOfSecondary = INT_MIN; + } + + // globalX + if (QApplication::layoutDirection() == Qt::LeftToRight) { + geometries.globalXOfNavigatorsWidget = m_navigatorsWidget->mapToGlobal(QPoint(0, 0)).x(); + geometries.globalXOfPrimary = m_primaryViewContainer->mapToGlobal(QPoint(0, 0)).x(); + geometries.globalXOfSecondary = !m_secondaryViewContainer ? INT_MIN : m_secondaryViewContainer->mapToGlobal(QPoint(0, 0)).x(); + } else { + // When the direction is reversed, globalX does not change. + // For the adjustSpacing() code to work we need globalX to measure from right to left + // and to measure up to the rightmost point of a widget instead of the leftmost. + geometries.globalXOfNavigatorsWidget = (-1) * (m_navigatorsWidget->mapToGlobal(QPoint(0, 0)).x() + m_navigatorsWidget->width()); + geometries.globalXOfPrimary = (-1) * (m_primaryViewContainer->mapToGlobal(QPoint(0, 0)).x() + geometries.widthOfPrimary); + geometries.globalXOfSecondary = + !m_secondaryViewContainer ? INT_MIN : (-1) * (m_secondaryViewContainer->mapToGlobal(QPoint(0, 0)).x() + geometries.widthOfSecondary); + } + return geometries; +} + +#include "moc_dolphinnavigatorswidgetaction.cpp"