From 42023831374496c62708ce7ad2cdd69104a1c820 Mon Sep 17 00:00:00 2001
From: Felix Ernst <fe.a.ernst@gmail.com>
Date: Thu, 5 Nov 2020 16:28:13 +0100
Subject: [PATCH] =?utf8?q?Apply=20M=C3=A9ven=20Car's=20suggestions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/dolphinmainwindow.cpp             |  9 +++------
 src/dolphinnavigatorswidgetaction.cpp | 15 +++++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 8b389ce9b..e3435685f 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -143,9 +143,6 @@ DolphinMainWindow::DolphinMainWindow() :
     setAcceptDrops(true);
 
     auto *navigatorsWidgetAction = new DolphinNavigatorsWidgetAction(this);
-    navigatorsWidgetAction->setText(i18nc(
-        "@action:inmenu When split view is enabled there are two otherwise one.",
-        "Url Navigator(s)"));
     actionCollection()->addAction(QStringLiteral("url_navigators"), navigatorsWidgetAction);
     m_tabWidget = new DolphinTabWidget(navigatorsWidgetAction, this);
     m_tabWidget->setObjectName("tabWidget");
@@ -915,17 +912,17 @@ void DolphinMainWindow::goBack()
 
 void DolphinMainWindow::goForward()
 {
-    m_activeViewContainer->urlNavigator()->goForward();
+    m_activeViewContainer->urlNavigatorInternalWithHistory()->goForward();
 }
 
 void DolphinMainWindow::goUp()
 {
-    m_activeViewContainer->urlNavigator()->goUp();
+    m_activeViewContainer->urlNavigatorInternalWithHistory()->goUp();
 }
 
 void DolphinMainWindow::goHome()
 {
-    m_activeViewContainer->urlNavigator()->goHome();
+    m_activeViewContainer->urlNavigatorInternalWithHistory()->goHome();
 }
 
 void DolphinMainWindow::goBackInNewTab()
diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp
index bd2985d47..11140347a 100644
--- a/src/dolphinnavigatorswidgetaction.cpp
+++ b/src/dolphinnavigatorswidgetaction.cpp
@@ -27,7 +27,10 @@ DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) :
     m_globalXOfSecondary{-1},
     m_widthOfSecondary{-1}
 {
-    setText(i18nc("@action:inmenu", "Url navigator"));
+    setText(i18nc(
+        "@action:inmenu When split view is enabled there are two otherwise one.",
+        "Url Navigator(s)"));
+    setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts")));
 
     m_splitter->setChildrenCollapsible(false);
     setDefaultWidget(m_splitter.get());
@@ -55,7 +58,7 @@ bool DolphinNavigatorsWidgetAction::addToToolbarAndSave(KXmlGuiWindow *mainWindo
     QDomElement urlNavigatorElement = domDocument.createElement(QStringLiteral("Action"));
     urlNavigatorElement.setAttribute(QStringLiteral("name"), QStringLiteral("url_navigators"));
 
-    QDomNode position = toolbar.lastChildElement(QStringLiteral("Spacer"));
+    QDomNode position = toolbar.firstChildElement(QStringLiteral("Spacer"));
     if (position.isNull()) {
         toolbar.appendChild(urlNavigatorElement);
     } else {
@@ -193,10 +196,10 @@ QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const
     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();
-            });
+        // 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 trailingSpacing = new QWidget{navigatorWidget};
     layout->addWidget(trailingSpacing);
-- 
2.47.3