SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphinnavigatorswidgetaction.cpp

diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp
index be88b61af4328ec8511df24bea5dc636e65a9498..ef99d1cb701321b726a4409bf863472fd7b65161 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,28 +9,26 @@
 
 #include "trash/dolphintrash.h"
 
 
 #include "trash/dolphintrash.h"
 

+#include <KCoreAddons>

 #include <KLocalizedString>
 #include <KNotificationJobUiDelegate>
 #include <KService>
 #include <KLocalizedString>
 #include <KNotificationJobUiDelegate>
 #include <KService>

-#include <KXMLGUIFactory>
-#include <KXmlGuiWindow>

 
 #include <KIO/ApplicationLauncherJob>
 
 #include <QApplication>
 
 #include <KIO/ApplicationLauncherJob>
 
 #include <QApplication>

-#include <QDomDocument>

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

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

 #include <QToolBar>
 
 #include <limits>
 
 #include <QToolBar>
 
 #include <limits>
 

-DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) :
-    QWidgetAction{parent},
-    m_splitter{new QSplitter(Qt::Horizontal)},
-    m_adjustSpacingTimer{new QTimer(this)},
-    m_viewGeometriesHelper{m_splitter.get(), this}
+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")));
 {
     updateText();
     setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts")));


@@ -38,19 +36,19 @@ DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) :
     m_splitter->setChildrenCollapsible(false);
 
     m_splitter->addWidget(createNavigatorWidget(Primary));
     m_splitter->setChildrenCollapsible(false);
 
     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);

 }
 
 void DolphinNavigatorsWidgetAction::adjustSpacing()
 {
 }
 
 void DolphinNavigatorsWidgetAction::adjustSpacing()
 {

+    m_previousWindowWidth = qobject_cast<QWidget *>(parent())->window()->width();

     auto viewGeometries = m_viewGeometriesHelper.viewGeometries();
     const int widthOfSplitterPrimary = viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary - viewGeometries.globalXOfNavigatorsWidget;
     auto viewGeometries = m_viewGeometriesHelper.viewGeometries();
     const int widthOfSplitterPrimary = viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary - viewGeometries.globalXOfNavigatorsWidget;

-    const QList<int> splitterSizes = {widthOfSplitterPrimary,
-                                      m_splitter->width() - widthOfSplitterPrimary};
+    const QList<int> splitterSizes = {widthOfSplitterPrimary, m_splitter->width() - widthOfSplitterPrimary - m_splitter->handleWidth()};

     m_splitter->setSizes(splitterSizes);
 
     // primary side of m_splitter
     m_splitter->setSizes(splitterSizes);
 
     // primary side of m_splitter


@@ -58,11 +56,8 @@ void DolphinNavigatorsWidgetAction::adjustSpacing()
     if (leadingSpacing < 0) {
         leadingSpacing = 0;
     }
     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()
-    ) {
+    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;
         trailingSpacing = 0;
     }
     const int widthLeftForUrlNavigator = m_splitter->widget(0)->width() - leadingSpacing - trailingSpacing;


@@ -87,11 +82,8 @@ void DolphinNavigatorsWidgetAction::adjustSpacing()
     }
     spacing(Primary, Trailing)->setFixedWidth(0);
 
     }
     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 = (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;
         trailingSpacing = 0;
     } else {
         const int widthLeftForUrlNavigator2 = m_splitter->widget(1)->width() - trailingSpacing;


@@ -111,11 +103,13 @@ 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::followViewContainersGeometry(QWidget *primaryViewContainer,
-                                                                 QWidget *secondaryViewContainer)
+void DolphinNavigatorsWidgetAction::followViewContainersGeometry(QWidget *primaryViewContainer, QWidget *secondaryViewContainer)

 {
     m_viewGeometriesHelper.setViewContainers(primaryViewContainer, secondaryViewContainer);
     adjustSpacing();
 {
     m_viewGeometriesHelper.setViewContainers(primaryViewContainer, secondaryViewContainer);
     adjustSpacing();


@@ -126,13 +120,13 @@ bool DolphinNavigatorsWidgetAction::isInToolbar() const
     return qobject_cast<QToolBar *>(m_splitter->parentWidget());
 }
 
     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) {


@@ -145,15 +139,33 @@ 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::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();
 QWidget *DolphinNavigatorsWidgetAction::createWidget(QWidget *parent)
 {
     QWidget *oldParent = m_splitter->parentWidget();


@@ -183,6 +195,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);


@@ -196,31 +209,36 @@ QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const
     auto networkFolderButton = newNetworkFolderButton(urlNavigator, navigatorWidget);
     layout->addWidget(networkFolderButton);
 
     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);
+    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());

             }
             }

-            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);
+            // 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) {


@@ -231,13 +249,14 @@ 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();
     connect(urlNavigator, &KUrlNavigator::urlChanged, this, [emptyTrashButton, urlNavigator]() {
         emptyTrashButton->setVisible(urlNavigator->locationUrl().scheme() == QLatin1String("trash"));
     emptyTrashButton->hide();
     connect(urlNavigator, &KUrlNavigator::urlChanged, this, [emptyTrashButton, urlNavigator]() {
         emptyTrashButton->setVisible(urlNavigator->locationUrl().scheme() == QLatin1String("trash"));


@@ -257,21 +276,25 @@ QPushButton *DolphinNavigatorsWidgetAction::networkFolderButton(DolphinNavigator
 
 QPushButton *DolphinNavigatorsWidgetAction::newNetworkFolderButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const
 {
 
 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);
+    auto networkFolderButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-add")), i18nc("@action:button", "Add Network Folder"), parent);

     networkFolderButton->setFlat(true);
     networkFolderButton->setFlat(true);

-    KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("org.kde.knetattach"));
-    connect(networkFolderButton, &QPushButton::clicked,
-            this, [networkFolderButton, service]() {
-                auto *job = new KIO::ApplicationLauncherJob(service, networkFolderButton);
-                auto *delegate = new KNotificationJobUiDelegate;
-                delegate->setAutoErrorHandlingEnabled(true);
-                job->setUiDelegate(delegate);
-                job->start();
-            });
+    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();
     networkFolderButton->hide();

-    connect(urlNavigator, &KUrlNavigator::urlChanged, this, [networkFolderButton, urlNavigator, service]() {
-        networkFolderButton->setVisible(service && urlNavigator->locationUrl().scheme() == QLatin1String("remote"));
+    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;
 }
     });
     return networkFolderButton;
 }


@@ -291,15 +314,13 @@ QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) co
 
 void DolphinNavigatorsWidgetAction::updateText()
 {
 
 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));
 }
 
     setText(i18ncp("@action:inmenu", "Location Bar", "Location Bars", urlNavigatorsAmount));
 }
 

-DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper
-    (QWidget *navigatorsWidget, DolphinNavigatorsWidgetAction *navigatorsWidgetAction) :
-    m_navigatorsWidget{navigatorsWidget},
-    m_navigatorsWidgetAction{navigatorsWidgetAction}
+DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper(QWidget *navigatorsWidget, DolphinNavigatorsWidgetAction *navigatorsWidgetAction)
+    : m_navigatorsWidget{navigatorsWidget}
+    , m_navigatorsWidgetAction{navigatorsWidgetAction}

 {
     Q_CHECK_PTR(navigatorsWidget);
     Q_CHECK_PTR(navigatorsWidgetAction);
 {
     Q_CHECK_PTR(navigatorsWidget);
     Q_CHECK_PTR(navigatorsWidgetAction);


@@ -308,14 +329,23 @@ DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper
 bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *watched, QEvent *event)
 {
     if (event->type() == QEvent::Resize) {
 bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *watched, QEvent *event)
 {
     if (event->type() == QEvent::Resize) {

-        m_navigatorsWidgetAction->adjustSpacing();
+        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);
 }
 
         return false;
     }
     return QObject::eventFilter(watched, event);
 }
 

-void DolphinNavigatorsWidgetAction::ViewGeometriesHelper::setViewContainers(QWidget *primaryViewContainer,
-                                                                            QWidget *secondaryViewContainer)
+void DolphinNavigatorsWidgetAction::ViewGeometriesHelper::setViewContainers(QWidget *primaryViewContainer, QWidget *secondaryViewContainer)

 {
     Q_CHECK_PTR(primaryViewContainer);
     if (m_primaryViewContainer) {
 {
     Q_CHECK_PTR(primaryViewContainer);
     if (m_primaryViewContainer) {


@@ -329,8 +359,7 @@ void DolphinNavigatorsWidgetAction::ViewGeometriesHelper::setViewContainers(QWid
     m_secondaryViewContainer = secondaryViewContainer;
 }
 
     m_secondaryViewContainer = secondaryViewContainer;
 }
 

-DolphinNavigatorsWidgetAction::ViewGeometriesHelper::Geometries
-        DolphinNavigatorsWidgetAction::ViewGeometriesHelper::viewGeometries()
+DolphinNavigatorsWidgetAction::ViewGeometriesHelper::Geometries DolphinNavigatorsWidgetAction::ViewGeometriesHelper::viewGeometries()

 {
     Q_ASSERT(m_primaryViewContainer);
     Geometries geometries;
 {
     Q_ASSERT(m_primaryViewContainer);
     Geometries geometries;


@@ -345,20 +374,19 @@ DolphinNavigatorsWidgetAction::ViewGeometriesHelper::Geometries
 
     // globalX
     if (QApplication::layoutDirection() == Qt::LeftToRight) {
 
     // 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();
+        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.
     } 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);
+        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;
 }
     }
     return geometries;
 }

+
+#include "moc_dolphinnavigatorswidgetaction.cpp"