X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ad5d3367c7fef4c3c11188a768f21a2ee2b3c025..b76cc3f6fa2e94857a9168068e1ea10a4a0b6a2d:/src/dolphinurlnavigator.cpp diff --git a/src/dolphinurlnavigator.cpp b/src/dolphinurlnavigator.cpp index 70f780e55..1dfe5420f 100644 --- a/src/dolphinurlnavigator.cpp +++ b/src/dolphinurlnavigator.cpp @@ -1,60 +1,39 @@ /* - * Copyright 2020 Felix Ernst - * - * 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 . - */ + This file is part of the KDE project + SPDX-FileCopyrightText: 2020 Felix Ernst + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ #include "dolphinurlnavigator.h" #include "dolphin_generalsettings.h" #include "dolphinplacesmodelsingleton.h" +#include "dolphinurlnavigatorscontroller.h" #include "global.h" -#include #include #include +#include +#include #include -#include DolphinUrlNavigator::DolphinUrlNavigator(QWidget *parent) : - KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), QUrl(), parent) -{ - init(); -} + DolphinUrlNavigator(QUrl(), parent) +{} DolphinUrlNavigator::DolphinUrlNavigator(const QUrl &url, QWidget *parent) : KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, parent) -{ - init(); -} - -void DolphinUrlNavigator::init() { const GeneralSettings* settings = GeneralSettings::self(); setUrlEditable(settings->editableUrl()); setShowFullPath(settings->showFullPath()); setHomeUrl(Dolphin::homeUrl()); - setPlacesSelectorVisible(s_placesSelectorVisible); + setPlacesSelectorVisible(DolphinUrlNavigatorsController::placesSelectorVisible()); editor()->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode())); - editor()->lineEdit()->installEventFilter(this); - installEventFilter(this); setWhatsThis(xi18nc("@info:whatsthis location bar", - "This line describes the location of the files and folders " + "This describes the location of the files and folders " "displayed below.The name of the currently viewed " "folder can be read at the very right. To the left of it is the " "name of the folder that contains it. The whole line is called " @@ -66,95 +45,65 @@ void DolphinUrlNavigator::init() "click here. " "This will open the dedicated page in the Handbook.")); - s_instances.push_front(this); + DolphinUrlNavigatorsController::registerDolphinUrlNavigator(this); - connect(this, &DolphinUrlNavigator::returnPressed, + connect(this, &KUrlNavigator::returnPressed, this, &DolphinUrlNavigator::slotReturnPressed); - connect(editor(), &KUrlComboBox::completionModeChanged, - this, DolphinUrlNavigator::setCompletionMode); } DolphinUrlNavigator::~DolphinUrlNavigator() { - s_instances.remove(this); + DolphinUrlNavigatorsController::unregisterDolphinUrlNavigator(this); } -bool DolphinUrlNavigator::eventFilter(QObject* watched, QEvent* event) +QSize DolphinUrlNavigator::sizeHint() const { - Q_UNUSED(watched) - if (event->type() == QEvent::ChildPolished) { - QChildEvent *childEvent = static_cast(event); - QMenu *popup = qobject_cast(childEvent->child()); - if (popup) { - // The popups of the "breadcrumb mode" navigation buttons - // should not get the action added. They can currently be - // identified by their number of separators: 0 or 1 - // The popups we are interested in have 2 or more separators. - int separatorCount = 0; - for (QAction *action : popup->actions()) { - if (action->isSeparator()) { - separatorCount++; - } - } - if (separatorCount > 1) { - q_check_ptr(s_ActionForContextMenu); - popup->addAction(s_ActionForContextMenu); - } - } + if (isUrlEditable()) { + return editor()->lineEdit()->sizeHint(); } - return false; -} - -void DolphinUrlNavigator::slotReadSettings() -{ - // The startup settings should (only) get applied if they have been - // modified by the user. Otherwise keep the (possibly) different current - // settings of the URL navigators and split view. - if (GeneralSettings::modifiedStartupSettings()) { - for (DolphinUrlNavigator *urlNavigator : s_instances) { - urlNavigator->setUrlEditable(GeneralSettings::editableUrl()); - urlNavigator->setShowFullPath(GeneralSettings::showFullPath()); - urlNavigator->setHomeUrl(Dolphin::homeUrl()); + int widthHint = 0; + for (int i = 0; i < layout()->count(); ++i) { + QWidget *widget = layout()->itemAt(i)->widget(); + const QAbstractButton *button = qobject_cast(widget); + if (button && button->icon().isNull()) { + widthHint += widget->minimumSizeHint().width(); } } + return QSize(widthHint, KUrlNavigator::sizeHint().height()); } -void DolphinUrlNavigator::slotReturnPressed() -{ - if (!GeneralSettings::editableUrl()) { - setUrlEditable(false); - } -} - -void DolphinUrlNavigator::addToContextMenu(QAction* action) +std::unique_ptr DolphinUrlNavigator::visualState() const { - s_ActionForContextMenu = action; + std::unique_ptr visualState{new VisualState}; + visualState->isUrlEditable = (isUrlEditable()); + const QLineEdit *lineEdit = editor()->lineEdit(); + visualState->hasFocus = lineEdit->hasFocus(); + visualState->text = lineEdit->text(); + visualState->cursorPosition = lineEdit->cursorPosition(); + visualState->selectionStart = lineEdit->selectionStart(); + visualState->selectionLength = lineEdit->selectionLength(); + return visualState; } - -void DolphinUrlNavigator::slotPlacesPanelVisibilityChanged(bool visible) +void DolphinUrlNavigator::setVisualState(const VisualState& visualState) { - // The places-selector from the URL navigator should only be shown - // if the places dock is invisible - s_placesSelectorVisible = !visible; - - for (DolphinUrlNavigator *urlNavigator : s_instances) { - urlNavigator->setPlacesSelectorVisible(s_placesSelectorVisible); + setUrlEditable(visualState.isUrlEditable); + if (!visualState.isUrlEditable) { + return; + } + editor()->lineEdit()->setText(visualState.text); + if (visualState.hasFocus) { + editor()->lineEdit()->setFocus(); + editor()->lineEdit()->setCursorPosition(visualState.cursorPosition); + if (visualState.selectionStart != -1) { + editor()->lineEdit()->setSelection(visualState.selectionStart, visualState.selectionLength); + } } } -void DolphinUrlNavigator::setCompletionMode(const KCompletion::CompletionMode completionMode) +void DolphinUrlNavigator::slotReturnPressed() { - if (completionMode != GeneralSettings::urlCompletionMode()) - { - GeneralSettings::setUrlCompletionMode(completionMode); - for (const DolphinUrlNavigator *urlNavigator : s_instances) - { - urlNavigator->editor()->setCompletionMode(completionMode); - } + if (!GeneralSettings::editableUrl()) { + setUrlEditable(false); } } - -std::forward_list DolphinUrlNavigator::s_instances; -bool DolphinUrlNavigator::s_placesSelectorVisible = true; -QAction *DolphinUrlNavigator::s_ActionForContextMenu = nullptr;