Update kconf update script version to 6

[dolphin.git] / src / dolphinnavigatorswidgetaction.cpp

diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp
index 84f52279a56471afc1bc109f56efd5e1b7ec3820..438cd6439a8aa44f78fd613d697062d6ff0dca6a 100644 (file)
--- a/src/dolphinnavigatorswidgetaction.cpp
+++ b/src/dolphinnavigatorswidgetaction.cpp
@@ -1,6 +1,6 @@
 /*
     This file is part of the KDE project
 /*
     This file is part of the KDE project

-    SPDX-FileCopyrightText: 2020 Felix Ernst <fe.a.ernst@gmail.com>
+    SPDX-FileCopyrightText: 2020 Felix Ernst <felixernst@kde.org>

 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */


@@ -9,67 +9,93 @@
 
 #include "trash/dolphintrash.h"
 
 
 #include "trash/dolphintrash.h"
 

+#include <KCoreAddons>

 #include <KLocalizedString>
 #include <KLocalizedString>

-#include <KXMLGUIFactory>
-#include <KXmlGuiWindow>
+#include <KNotificationJobUiDelegate>
+#include <KService>

 
 

-#include <QDomDocument>
+#include <KIO/ApplicationLauncherJob>
+
+#include <QApplication>

 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QPushButton>

-#include <QSplitter>
+#include <QStyle>
+#include <QToolBar>

 
 #include <limits>
 
 
 #include <limits>
 

-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")));
 
     m_splitter->setChildrenCollapsible(false);
 {
     updateText();
     setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts")));
 
     m_splitter->setChildrenCollapsible(false);

-    setDefaultWidget(m_splitter.get());

 
     m_splitter->addWidget(createNavigatorWidget(Primary));
 
     m_splitter->addWidget(createNavigatorWidget(Primary));

+    m_splitter->setFocusProxy(primaryUrlNavigator());

 
     m_adjustSpacingTimer->setInterval(100);
     m_adjustSpacingTimer->setSingleShot(true);
 
     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);

 }
 
 }
 

-bool DolphinNavigatorsWidgetAction::addToToolbarAndSave(KXmlGuiWindow *mainWindow)
+void DolphinNavigatorsWidgetAction::adjustSpacing()

 {
 {

-    const QString rawXml = KXMLGUIFactory::readConfigFile(mainWindow->xmlFile());
-    QDomDocument domDocument;
-    if (rawXml.isEmpty() || !domDocument.setContent(rawXml) || domDocument.isNull()) {
-        return false;
+    m_previousWindowWidth = qobject_cast<QWidget *>(parent())->window()->width();
+    auto viewGeometries = m_viewGeometriesHelper.viewGeometries();
+    const int widthOfSplitterPrimary = viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary - viewGeometries.globalXOfNavigatorsWidget;
+    const QList<int> 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;

     }
     }

-    QDomNode toolbar = domDocument.elementsByTagName(QStringLiteral("ToolBar")).at(0);
-    if (toolbar.isNull()) {
-        return false;
+    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);

 
 

-    QDomElement urlNavigatorElement = domDocument.createElement(QStringLiteral("Action"));
-    urlNavigatorElement.setAttribute(QStringLiteral("name"), QStringLiteral("url_navigators"));
+    // secondary side of m_splitter
+    if (viewGeometries.globalXOfSecondary == INT_MIN) {
+        Q_ASSERT(viewGeometries.widthOfSecondary == INT_MIN);
+        return;
+    }
+    spacing(Primary, Trailing)->setFixedWidth(0);

 
 

-    QDomNode position = toolbar.firstChildElement(QStringLiteral("Spacer"));
-    if (position.isNull()) {
-        toolbar.appendChild(urlNavigatorElement);
+    trailingSpacing = (viewGeometries.globalXOfNavigatorsWidget + m_splitter->width()) - (viewGeometries.globalXOfSecondary + viewGeometries.widthOfSecondary);
+    if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible() || networkFolderButton(Secondary)->isVisible()) {
+        trailingSpacing = 0;

     } else {
     } else {

-        toolbar.replaceChild(urlNavigatorElement, position);
+        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;
+            }
+        }

     }
     }

-
-    KXMLGUIFactory::saveConfigFile(domDocument, mainWindow->xmlFile());
-    mainWindow->reloadXML();
-    mainWindow->createGUI();
-    return true;
+    spacing(Secondary, Trailing)->setMinimumWidth(trailingSpacing);

 }
 
 void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator()
 }
 
 void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator()


@@ -77,34 +103,30 @@ void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator()
     Q_ASSERT(m_splitter->count() == 1);
     m_splitter->addWidget(createNavigatorWidget(Secondary));
     Q_ASSERT(m_splitter->count() == 2);
     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();
 }
 
     updateText();
 }
 

-void DolphinNavigatorsWidgetAction::followViewContainerGeometry(
-                                    int globalXOfPrimary,   int widthOfPrimary)
+void DolphinNavigatorsWidgetAction::followViewContainersGeometry(QWidget *primaryViewContainer, QWidget *secondaryViewContainer)

 {
 {

-    followViewContainersGeometry(globalXOfPrimary, widthOfPrimary, INT_MIN, INT_MIN);
+    m_viewGeometriesHelper.setViewContainers(primaryViewContainer, secondaryViewContainer);
+    adjustSpacing();

 }
 
 }
 

-void DolphinNavigatorsWidgetAction::followViewContainersGeometry(
-                                    int globalXOfPrimary,   int widthOfPrimary,
-                                    int globalXOfSecondary, int widthOfSecondary)
+bool DolphinNavigatorsWidgetAction::isInToolbar() const

 {
 {

-    m_globalXOfSplitter = m_splitter->mapToGlobal(QPoint(0,0)).x();
-    m_globalXOfPrimary = globalXOfPrimary;
-    m_widthOfPrimary = widthOfPrimary;
-    m_globalXOfSecondary = globalXOfSecondary;
-    m_widthOfSecondary = widthOfSecondary;
-    adjustSpacing();
+    return qobject_cast<QToolBar *>(m_splitter->parentWidget());

 }
 
 }
 

-DolphinUrlNavigator* DolphinNavigatorsWidgetAction::primaryUrlNavigator() const
+DolphinUrlNavigator *DolphinNavigatorsWidgetAction::primaryUrlNavigator() const

 {
     Q_ASSERT(m_splitter);
     return m_splitter->widget(0)->findChild<DolphinUrlNavigator *>();
 }
 
 {
     Q_ASSERT(m_splitter);
     return m_splitter->widget(0)->findChild<DolphinUrlNavigator *>();
 }
 

-DolphinUrlNavigator* DolphinNavigatorsWidgetAction::secondaryUrlNavigator() const
+DolphinUrlNavigator *DolphinNavigatorsWidgetAction::secondaryUrlNavigator() const

 {
     Q_ASSERT(m_splitter);
     if (m_splitter->count() < 2) {
 {
     Q_ASSERT(m_splitter);
     if (m_splitter->count() < 2) {


@@ -117,72 +139,52 @@ void DolphinNavigatorsWidgetAction::setSecondaryNavigatorVisible(bool visible)
 {
     if (visible) {
         Q_ASSERT(m_splitter->count() == 2);
 {
     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(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();
 }
 
         // Fix an unlikely event of wrong trash button visibility.
         emptyTrashButton(Secondary)->setVisible(false);
     }
     updateText();
 }
 

-void DolphinNavigatorsWidgetAction::adjustSpacing()
+void DolphinNavigatorsWidgetAction::setBackgroundEnabled(bool enabled)

 {
 {

-    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<int> 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;
+#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);

     }
     }

-    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);
+#endif
+}

 
 

-    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;
-            }
+QWidget *DolphinNavigatorsWidgetAction::createWidget(QWidget *parent)
+{
+    QWidget *oldParent = m_splitter->parentWidget();
+    if (oldParent && oldParent->layout()) {
+        oldParent->layout()->removeWidget(m_splitter.get());
+        QGridLayout *layout = qobject_cast<QGridLayout *>(oldParent->layout());
+        if (qobject_cast<QToolBar *>(parent) && layout) {
+            // in DolphinTabPage::insertNavigatorsWidget the minimumHeight of this row was
+            // set to fit the m_splitter. Since we are now removing it again, the
+            // minimumHeight can be reset to 0.
+            layout->setRowMinimumHeight(0, 0);

         }
     }
         }
     }

-    spacing(Secondary, Trailing)->setMinimumWidth(trailingSpacing);
+    m_splitter->setParent(parent);
+    return m_splitter.get();
+}
+
+void DolphinNavigatorsWidgetAction::deleteWidget(QWidget *widget)
+{
+    Q_UNUSED(widget)
+    m_splitter->setParent(nullptr);

 }
 
 QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const
 }
 
 QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const


@@ -191,6 +193,7 @@ QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const
     auto layout = new QHBoxLayout{navigatorWidget};
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
     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);
     if (side == Primary) {
         auto leadingSpacing = new QWidget{navigatorWidget};
         layout->addWidget(leadingSpacing);


@@ -201,18 +204,39 @@ QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const
     auto emptyTrashButton = newEmptyTrashButton(urlNavigator, navigatorWidget);
     layout->addWidget(emptyTrashButton);
 
     auto emptyTrashButton = newEmptyTrashButton(urlNavigator, navigatorWidget);
     layout->addWidget(emptyTrashButton);
 

-    connect(urlNavigator, &KUrlNavigator::urlChanged, [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;
 }
 
 
     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) {
 {
     int sideIndex = (side == Primary ? 0 : 1);
     if (side == Primary) {


@@ -223,21 +247,56 @@ QPushButton * DolphinNavigatorsWidgetAction::emptyTrashButton(DolphinNavigatorsW
 
 QPushButton *DolphinNavigatorsWidgetAction::newEmptyTrashButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const
 {
 
 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);
     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();
     emptyTrashButton->hide();

-    connect(urlNavigator, &KUrlNavigator::urlChanged, [emptyTrashButton, urlNavigator]() {
+    connect(urlNavigator, &KUrlNavigator::urlChanged, this, [emptyTrashButton, urlNavigator]() {

         emptyTrashButton->setVisible(urlNavigator->locationUrl().scheme() == QLatin1String("trash"));
     });
     emptyTrashButton->setDisabled(Trash::isEmpty());
     return emptyTrashButton;
 }
 
         emptyTrashButton->setVisible(urlNavigator->locationUrl().scheme() == QLatin1String("trash"));
     });
     emptyTrashButton->setDisabled(Trash::isEmpty());
     return emptyTrashButton;
 }
 

+QPushButton *DolphinNavigatorsWidgetAction::networkFolderButton(DolphinNavigatorsWidgetAction::Side side)
+{
+    int sideIndex = (side == Primary ? 0 : 1);
+    if (side == Primary) {
+        return static_cast<QPushButton *>(m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget());
+    }
+    return static_cast<QPushButton *>(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);
 QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) const
 {
     int sideIndex = (side == Primary ? 0 : 1);


@@ -246,14 +305,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(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()
 {
 }
 
 void DolphinNavigatorsWidgetAction::updateText()
 {

-    const int urlNavigatorsAmount = m_splitter->count() > 1 && m_splitter->widget(1)->isVisible() ?
-                                    2 : 1;
-    setText(i18ncp("@action:inmenu", "Url Navigator", "Url Navigators", urlNavigatorsAmount));
+    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<QWidget*>(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"