From 37327c9b0aae112c5890703cba1f0157043007e0 Mon Sep 17 00:00:00 2001
From: Felix Ernst <fe.a.ernst@gmail.com>
Date: Sun, 20 Sep 2020 18:53:59 +0200
Subject: Make UrlNavigators in the toolbar the only option

The UrlNavigators will be automatically added to the toolbar. The Sort By
action is removed from the default toolbar to make space.

Remove all options to have UrlNavigators outside the toolbar and remove
those code paths.

Make it so the new NavigatorsWidgetAction contains two UrlNavigators when
in split view mode. Spacing was also added to align these UrlNavigators
with the ViewContainers when enough space is available.

Force the toolbar to be either at the top or bottom of the window.

Set a sane sizeHint for DolphinUrlNavigator. It would be better to do this
in KUrlNavigator in the future.

This commit also contains a changes which should be moved to a separate
merge requests before this gets merged:
- Add an expansion animation when split view is enabled by the user
---
 src/views/dolphinurlnavigatorwidgetaction.cpp | 91 ---------------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 src/views/dolphinurlnavigatorwidgetaction.cpp

(limited to 'src/views/dolphinurlnavigatorwidgetaction.cpp')

diff --git a/src/views/dolphinurlnavigatorwidgetaction.cpp b/src/views/dolphinurlnavigatorwidgetaction.cpp
deleted file mode 100644
index 108a5de13..000000000
--- a/src/views/dolphinurlnavigatorwidgetaction.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2020  Felix Ernst <fe.a.ernst@gmail.com>
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) version 3, or any
- * later version accepted by the membership of KDE e.V. (or its
- * successor approved by the membership of KDE e.V.), which shall
- * act as a proxy defined in Section 6 of version 3 of the license.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "dolphinurlnavigatorwidgetaction.h"
-
-#include "dolphin_generalsettings.h"
-#include "dolphinviewcontainer.h"
-
-#include <KLocalizedString>
-#include <KXMLGUIFactory>
-#include <KXmlGuiWindow>
-
-#include <QDomDocument>
-#include <QStackedWidget>
-
-DolphinUrlNavigatorWidgetAction::DolphinUrlNavigatorWidgetAction(QWidget *parent) :
-    QWidgetAction(parent)
-{
-    setText(i18nc("@action:inmenu", "Url navigator"));
-
-    m_stackedWidget = new QStackedWidget(parent);
-
-    auto expandingSpacer = new QWidget(m_stackedWidget);
-    expandingSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-    m_stackedWidget->addWidget(expandingSpacer); // index 0 of QStackedWidget
-
-    auto urlNavigator = new DolphinUrlNavigator(m_stackedWidget);
-    m_stackedWidget->addWidget(urlNavigator); // index 1 of QStackedWidget
-
-    setDefaultWidget(m_stackedWidget);
-    setUrlNavigatorVisible(GeneralSettings::locationInToolbar());
-}
-
-DolphinUrlNavigator* DolphinUrlNavigatorWidgetAction::urlNavigator() const
-{
-    return static_cast<DolphinUrlNavigator *>(m_stackedWidget->widget(1));
-}
-
-void DolphinUrlNavigatorWidgetAction::setUrlNavigatorVisible(bool visible)
-{
-    if (!visible) {
-        m_stackedWidget->setCurrentIndex(0); // expandingSpacer
-    } else {
-        m_stackedWidget->setCurrentIndex(1); // urlNavigator
-    }
-}
-
-bool DolphinUrlNavigatorWidgetAction::addToToolbarAndSave(KXmlGuiWindow *mainWindow)
-{
-    const QString rawXml = KXMLGUIFactory::readConfigFile(mainWindow->xmlFile());
-    QDomDocument domDocument;
-    if (rawXml.isEmpty() || !domDocument.setContent(rawXml) || domDocument.isNull()) {
-        return false;
-    }
-    QDomNode toolbar = domDocument.elementsByTagName(QStringLiteral("ToolBar")).at(0);
-    if (toolbar.isNull()) {
-        return false;
-    }
-
-    QDomElement urlNavigatorElement = domDocument.createElement(QStringLiteral("Action"));
-    urlNavigatorElement.setAttribute(QStringLiteral("name"), QStringLiteral("url_navigator"));
-
-    QDomNode position = toolbar.lastChildElement(QStringLiteral("Spacer"));
-    if (position.isNull()) {
-        toolbar.appendChild(urlNavigatorElement);
-    } else {
-        toolbar.replaceChild(urlNavigatorElement, position);
-    }
-
-    KXMLGUIFactory::saveConfigFile(domDocument, mainWindow->xmlFile());
-    mainWindow->reloadXML();
-    mainWindow->createGUI();
-    return true;
-}
-- 
cgit v1.3