#include "dolphinviewcontainer.h"
#include "dolphin_generalsettings.h"
-#include "dolphinplacesmodelsingleton.h"
#include "dolphindebug.h"
+#include "dolphinplacesmodelsingleton.h"
#include "filterbar/filterbar.h"
#include "global.h"
#include "search/dolphinsearchbox.h"
#include "statusbar/dolphinstatusbar.h"
-#include "trash/dolphintrash.h"
#include "views/viewmodecontroller.h"
#include "views/viewproperties.h"
#include "dolphin_detailsmodesettings.h"
-#include "views/dolphinview.h"
#ifdef HAVE_KACTIVITIES
#include <KActivities/ResourceInstance>
#include <KProtocolManager>
#include <KShell>
#include <KUrlComboBox>
-#include <KUrlNavigator>
#include <QDropEvent>
#include <QLoggingCategory>
DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
QWidget(parent),
m_topLayout(nullptr),
- m_navigatorWidget(nullptr),
- m_urlNavigator(nullptr),
- m_emptyTrashButton(nullptr),
+ m_urlNavigator{new DolphinUrlNavigator(url)},
+ m_urlNavigatorConnected{nullptr},
m_searchBox(nullptr),
m_searchModeEnabled(false),
m_messageWidget(nullptr),
m_topLayout->setSpacing(0);
m_topLayout->setContentsMargins(0, 0, 0, 0);
- m_navigatorWidget = new QWidget(this);
- QHBoxLayout* navigatorLayout = new QHBoxLayout(m_navigatorWidget);
- navigatorLayout->setSpacing(0);
- navigatorLayout->setContentsMargins(0, 0, 0, 0);
- m_navigatorWidget->setWhatsThis(xi18nc("@info:whatsthis location bar",
- "<para>This line describes the location of the files and folders "
- "displayed below.</para><para>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 "
- "the <emphasis>path</emphasis> to the current location because "
- "following these folders from left to right leads here.</para>"
- "<para>The path is displayed on the <emphasis>location bar</emphasis> "
- "which is more powerful than one would expect. To learn more "
- "about the basic and advanced features of the location bar "
- "<link url='help:/dolphin/location-bar.html'>click here</link>. "
- "This will open the dedicated page in the Handbook.</para>"));
-
- m_urlNavigator = new KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, this);
- connect(m_urlNavigator, &KUrlNavigator::activated,
- this, &DolphinViewContainer::activate);
- connect(m_urlNavigator->editor(), &KUrlComboBox::completionModeChanged,
- this, &DolphinViewContainer::saveUrlCompletionMode);
-
- const GeneralSettings* settings = GeneralSettings::self();
- m_urlNavigator->setUrlEditable(settings->editableUrl());
- m_urlNavigator->setShowFullPath(settings->showFullPath());
- m_urlNavigator->setHomeUrl(Dolphin::homeUrl());
- KUrlComboBox* editor = m_urlNavigator->editor();
- editor->setCompletionMode(KCompletion::CompletionMode(settings->urlCompletionMode()));
-
- m_emptyTrashButton = new QPushButton(QIcon::fromTheme(QStringLiteral("user-trash")), i18nc("@action:button", "Empty Trash"), this);
- m_emptyTrashButton->setFlat(true);
- connect(m_emptyTrashButton, &QPushButton::clicked, this, [this]() { Trash::empty(this); });
- connect(&Trash::instance(), &Trash::emptinessChanged, m_emptyTrashButton, &QPushButton::setDisabled);
- m_emptyTrashButton->setDisabled(Trash::isEmpty());
- m_emptyTrashButton->hide();
-
m_searchBox = new DolphinSearchBox(this);
m_searchBox->hide();
connect(m_searchBox, &DolphinSearchBox::activated, this, &DolphinViewContainer::activate);
// Initialize filter bar
m_filterBar = new FilterBar(this);
- m_filterBar->setVisible(settings->filterBar());
+ m_filterBar->setVisible(GeneralSettings::filterBar());
connect(m_filterBar, &FilterBar::filterChanged,
this, &DolphinViewContainer::setNameFilter);
m_view = new DolphinView(url, this);
connect(m_view, &DolphinView::urlChanged,
m_filterBar, &FilterBar::slotUrlChanged);
- connect(m_view, &DolphinView::urlChanged,
- m_urlNavigator, &KUrlNavigator::setLocationUrl);
connect(m_view, &DolphinView::urlChanged,
m_messageWidget, &KMessageWidget::hide);
+ // m_urlNavigator stays in sync with m_view's location changes and
+ // keeps track of them so going back and forth in the history works.
+ connect(m_view, &DolphinView::urlChanged,
+ m_urlNavigator.get(), &DolphinUrlNavigator::setLocationUrl);
+ connect(m_urlNavigator.get(), &DolphinUrlNavigator::urlChanged,
+ this, &DolphinViewContainer::slotUrlNavigatorLocationChanged);
+ connect(m_urlNavigator.get(), &DolphinUrlNavigator::urlAboutToBeChanged,
+ this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged);
+ connect(m_urlNavigator.get(), &DolphinUrlNavigator::urlSelectionRequested,
+ this, &DolphinViewContainer::slotUrlSelectionRequested);
connect(m_view, &DolphinView::writeStateChanged,
this, &DolphinViewContainer::writeStateChanged);
connect(m_view, &DolphinView::requestItemInfo,
this, &DolphinViewContainer::slotUrlIsFileError);
connect(m_view, &DolphinView::activated,
this, &DolphinViewContainer::activate);
-
- connect(m_urlNavigator, &KUrlNavigator::urlAboutToBeChanged,
- this, &DolphinViewContainer::slotUrlNavigatorLocationAboutToBeChanged);
- connect(m_urlNavigator, &KUrlNavigator::urlChanged,
- this, &DolphinViewContainer::slotUrlNavigatorLocationChanged);
- connect(m_urlNavigator, &KUrlNavigator::urlSelectionRequested,
- this, &DolphinViewContainer::slotUrlSelectionRequested);
- connect(m_urlNavigator, &KUrlNavigator::returnPressed,
- this, &DolphinViewContainer::slotReturnPressed);
- connect(m_urlNavigator, &KUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) {
- m_view->dropUrls(destination, event, m_urlNavigator->dropWidget());
- });
-
- connect(m_view, &DolphinView::directoryLoadingCompleted, this, [this]() {
- m_emptyTrashButton->setVisible(m_view->url().scheme() == QLatin1String("trash"));
- });
+ connect(m_view, &DolphinView::hiddenFilesShownChanged,
+ this, &DolphinViewContainer::slotHiddenFilesShownChanged);
+ connect(m_view, &DolphinView::sortHiddenLastChanged,
+ this, &DolphinViewContainer::slotSortHiddenLastChanged);
// Initialize status bar
m_statusBar = new DolphinStatusBar(this);
m_statusBar, &DolphinStatusBar::setText);
connect(m_view, &DolphinView::operationCompletedMessage,
m_statusBar, &DolphinStatusBar::setText);
+ connect(m_view, &DolphinView::statusBarTextChanged,
+ m_statusBar, &DolphinStatusBar::setDefaultText);
+ connect(m_view, &DolphinView::statusBarTextChanged,
+ m_statusBar, &DolphinStatusBar::resetToDefaultText);
connect(m_statusBar, &DolphinStatusBar::stopPressed,
this, &DolphinViewContainer::stopDirectoryLoading);
connect(m_statusBar, &DolphinStatusBar::zoomLevelChanged,
connect(undoManager, &KIO::FileUndoManager::jobRecordingFinished,
this, &DolphinViewContainer::delayedStatusBarUpdate);
- navigatorLayout->addWidget(m_urlNavigator);
- navigatorLayout->addWidget(m_emptyTrashButton);
-
- m_topLayout->addWidget(m_navigatorWidget);
m_topLayout->addWidget(m_searchBox);
m_topLayout->addWidget(m_messageWidget);
m_topLayout->addWidget(m_view);
}
});
+ KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
+ connect(placesModel, &KFilePlacesModel::dataChanged,
+ this, &DolphinViewContainer::slotPlacesModelChanged);
+ connect(placesModel, &KFilePlacesModel::rowsInserted,
+ this, &DolphinViewContainer::slotPlacesModelChanged);
+ connect(placesModel, &KFilePlacesModel::rowsRemoved,
+ this, &DolphinViewContainer::slotPlacesModelChanged);
+
+ connect(this, &DolphinViewContainer::searchModeEnabledChanged,
+ this, &DolphinViewContainer::captionChanged);
+
// Initialize kactivities resource instance
#ifdef HAVE_KACTIVITIES
void DolphinViewContainer::setActive(bool active)
{
m_searchBox->setActive(active);
- m_urlNavigator->setActive(active);
+ if (m_urlNavigatorConnected) {
+ m_urlNavigatorConnected->setActive(active);
+ }
m_view->setActive(active);
#ifdef HAVE_KACTIVITIES
bool DolphinViewContainer::isActive() const
{
- Q_ASSERT(m_view->isActive() == m_urlNavigator->isActive());
return m_view->isActive();
}
return m_statusBar;
}
-const KUrlNavigator* DolphinViewContainer::urlNavigator() const
+const DolphinUrlNavigator* DolphinViewContainer::urlNavigator() const
+{
+ return m_urlNavigatorConnected;
+}
+
+DolphinUrlNavigator* DolphinViewContainer::urlNavigator()
{
- return m_urlNavigator;
+ return m_urlNavigatorConnected;
}
-KUrlNavigator* DolphinViewContainer::urlNavigator()
+const DolphinUrlNavigator *DolphinViewContainer::urlNavigatorInternalWithHistory() const
{
- return m_urlNavigator;
+ return m_urlNavigator.get();
+}
+
+DolphinUrlNavigator *DolphinViewContainer::urlNavigatorInternalWithHistory()
+{
+ return m_urlNavigator.get();
}
const DolphinView* DolphinViewContainer::view() const
return m_view;
}
+void DolphinViewContainer::connectUrlNavigator(DolphinUrlNavigator *urlNavigator)
+{
+ Q_CHECK_PTR(urlNavigator);
+ Q_ASSERT(!m_urlNavigatorConnected);
+ Q_ASSERT(m_urlNavigator.get() != urlNavigator);
+ Q_CHECK_PTR(m_view);
+
+ urlNavigator->setLocationUrl(m_view->url());
+ urlNavigator->setShowHiddenFolders(m_view->hiddenFilesShown());
+ urlNavigator->setSortHiddenFoldersLast(m_view->sortHiddenLast());
+ if (m_urlNavigatorVisualState) {
+ urlNavigator->setVisualState(*m_urlNavigatorVisualState.get());
+ m_urlNavigatorVisualState.reset();
+ }
+ urlNavigator->setActive(isActive());
+
+ // Url changes are still done via m_urlNavigator.
+ connect(urlNavigator, &DolphinUrlNavigator::urlChanged,
+ m_urlNavigator.get(), &DolphinUrlNavigator::setLocationUrl);
+ connect(urlNavigator, &DolphinUrlNavigator::urlsDropped,
+ this, [=](const QUrl &destination, QDropEvent *event) {
+ m_view->dropUrls(destination, event, urlNavigator->dropWidget());
+ });
+ // Aside from these, only visual things need to be connected.
+ connect(m_view, &DolphinView::urlChanged,
+ urlNavigator, &DolphinUrlNavigator::setLocationUrl);
+ connect(urlNavigator, &DolphinUrlNavigator::activated,
+ this, &DolphinViewContainer::activate);
+
+ m_urlNavigatorConnected = urlNavigator;
+}
+
+void DolphinViewContainer::disconnectUrlNavigator()
+{
+ if (!m_urlNavigatorConnected) {
+ return;
+ }
+
+ disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::urlChanged,
+ m_urlNavigator.get(), &DolphinUrlNavigator::setLocationUrl);
+ disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::urlsDropped,
+ this, nullptr);
+ disconnect(m_view, &DolphinView::urlChanged,
+ m_urlNavigatorConnected, &DolphinUrlNavigator::setLocationUrl);
+ disconnect(m_urlNavigatorConnected, &DolphinUrlNavigator::activated,
+ this, &DolphinViewContainer::activate);
+
+ m_urlNavigatorVisualState = m_urlNavigatorConnected->visualState();
+ m_urlNavigatorConnected = nullptr;
+}
+
void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
{
if (msg.isEmpty()) {
void DolphinViewContainer::readSettings()
{
+ // The startup settings should (only) get applied if they have been
+ // modified by the user. Otherwise keep the (possibly) different current
+ // setting of the filterbar.
if (GeneralSettings::modifiedStartupSettings()) {
- // 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 navigator and the filterbar.
- m_urlNavigator->setUrlEditable(GeneralSettings::editableUrl());
- m_urlNavigator->setShowFullPath(GeneralSettings::showFullPath());
- m_urlNavigator->setHomeUrl(Dolphin::homeUrl());
setFilterBarVisible(GeneralSettings::filterBar());
}
void DolphinViewContainer::setSearchModeEnabled(bool enabled)
{
m_searchBox->setVisible(enabled);
- m_navigatorWidget->setVisible(!enabled);
if (enabled) {
const QUrl& locationUrl = m_urlNavigator->locationUrl();
if (url.isEmpty() || !url.isValid() || isSearchUrl(url)) {
url = Dolphin::homeUrl();
}
- m_urlNavigator->setLocationUrl(url);
+ m_urlNavigatorConnected->setLocationUrl(url);
}
m_searchModeEnabled = enabled;
- emit searchModeEnabledChanged(enabled);
+ Q_EMIT searchModeEnabledChanged(enabled);
}
bool DolphinViewContainer::isSearchModeEnabled() const
}
KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel();
- const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QUrl(url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?")), 1, Qt::MatchRegExp);
+ const QString pattern = url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?");
+ const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, QRegularExpression::anchoredPattern(pattern), 1, Qt::MatchRegularExpression);
if (!matchedPlaces.isEmpty()) {
return placesModel->text(matchedPlaces.first());
void DolphinViewContainer::updateStatusBar()
{
m_statusBarTimestamp.start();
-
- const QString text = m_view->statusBarText();
- m_statusBar->setDefaultText(text);
- m_statusBar->resetToDefaultText();
+ m_view->requestStatusBarText();
}
void DolphinViewContainer::updateDirectoryLoadingProgress(int percent)
}
KIO::OpenUrlJob *job = new KIO::OpenUrlJob(item.targetUrl());
- job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
+ job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoWarningHandlingEnabled, this));
job->setShowOpenOrExecuteDialog(true);
+ connect(job, &KIO::OpenUrlJob::finished, this, &DolphinViewContainer::slotOpenUrlFinished);
job->start();
}
Q_ASSERT(items.count() >= 2);
KFileItemActions fileItemActions(this);
- fileItemActions.runPreferredApplications(items, QString());
+ fileItemActions.runPreferredApplications(items);
}
void DolphinViewContainer::showItemInfo(const KFileItem& item)
{
m_filterBar->closeFilterBar();
m_view->setFocus();
- emit showFilterBarChanged(false);
+ Q_EMIT showFilterBarChanged(false);
}
void DolphinViewContainer::setNameFilter(const QString& nameFilter)
void DolphinViewContainer::slotUrlNavigatorLocationChanged(const QUrl& url)
{
- slotReturnPressed();
+ if (m_urlNavigatorConnected) {
+ m_urlNavigatorConnected->slotReturnPressed();
+ }
if (KProtocolManager::supportsListing(url)) {
setSearchModeEnabled(isSearchUrl(url));
redirect(QUrl(), m_urlNavigator->locationUrl(1));
} else {
showMessage(i18nc("@info:status", "Invalid protocol"), Error);
+ m_urlNavigator->goBack();
}
}
m_view->markUrlAsCurrent(url); // makes the item scroll into view
}
+void DolphinViewContainer::disableUrlNavigatorSelectionRequests()
+{
+ disconnect(m_urlNavigator.get(), &KUrlNavigator::urlSelectionRequested,
+ this, &DolphinViewContainer::slotUrlSelectionRequested);
+}
+
+void DolphinViewContainer::enableUrlNavigatorSelectionRequests()
+{
+ connect(m_urlNavigator.get(), &KUrlNavigator::urlSelectionRequested,
+ this, &DolphinViewContainer::slotUrlSelectionRequested);
+}
+
void DolphinViewContainer::redirect(const QUrl& oldUrl, const QUrl& newUrl)
{
Q_UNUSED(oldUrl)
m_view->setFocus();
}
-void DolphinViewContainer::saveUrlCompletionMode(KCompletion::CompletionMode completion)
-{
- GeneralSettings::setUrlCompletionMode(completion);
-}
-
-void DolphinViewContainer::slotReturnPressed()
-{
- if (!GeneralSettings::editableUrl()) {
- m_urlNavigator->setUrlEditable(false);
- }
-}
-
void DolphinViewContainer::startSearching()
{
+ Q_CHECK_PTR(m_urlNavigatorConnected);
const QUrl url = m_searchBox->urlForSearching();
if (url.isValid() && !url.isEmpty()) {
m_view->setViewPropertiesContext(QStringLiteral("search"));
- m_urlNavigator->setLocationUrl(url);
+ m_urlNavigatorConnected->setLocationUrl(url);
}
}
showMessage(msg, Error);
}
+void DolphinViewContainer::slotPlacesModelChanged()
+{
+ if (!GeneralSettings::showFullPathInTitlebar() && !isSearchModeEnabled()) {
+ Q_EMIT captionChanged();
+ }
+}
+
+void DolphinViewContainer::slotHiddenFilesShownChanged(bool showHiddenFiles)
+{
+ if (m_urlNavigatorConnected) {
+ m_urlNavigatorConnected->setShowHiddenFolders(showHiddenFiles);
+ }
+}
+
+void DolphinViewContainer::slotSortHiddenLastChanged(bool hiddenLast)
+{
+ if (m_urlNavigatorConnected) {
+ m_urlNavigatorConnected->setSortHiddenFoldersLast(hiddenLast);
+ }
+}
+
+void DolphinViewContainer::slotOpenUrlFinished(KJob *job)
+{
+ if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {
+ showErrorMessage(job->errorString());
+ }
+}
+
bool DolphinViewContainer::isSearchUrl(const QUrl& url) const
{
return url.scheme().contains(QLatin1String("search"));
projects / dolphin.git / blobdiff