From e9463ffe2ac110193cac4c25fcba887249f52b3c Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 13 Jun 2012 15:15:54 +0200 Subject: Fix regression: Open file if entering it in the URL-navigator The regression has been introduced when hiding the DolphinDirLister inside KFileItemModel. Now the signal urlIsFileError() gets forwarded to the container again where the file will be opened. BUG: 301757 FIXED-IN: 4.9.0 --- src/views/dolphinview.cpp | 1 + src/views/dolphinview.h | 6 ++++++ 2 files changed, 7 insertions(+) (limited to 'src/views') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index e06aad6f2..7cfb3fc41 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -160,6 +160,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) : connect(m_model, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString))); connect(m_model, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString))); connect(m_model, SIGNAL(directoryRedirection(KUrl,KUrl)), this, SLOT(slotDirectoryRedirection(KUrl,KUrl))); + connect(m_model, SIGNAL(urlIsFileError(KUrl)), this, SIGNAL(urlIsFileError(KUrl))); m_view->installEventFilter(this); connect(m_view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)), diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index b2c4121a0..1ad4d6c82 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -493,6 +493,12 @@ signals: */ void redirection(const KUrl& oldUrl, const KUrl& newUrl); + /** + * Is emitted when the URL set by DolphinView::setUrl() represents a file. + * In this case no signal errorMessage() will be emitted. + */ + void urlIsFileError(const KUrl& url); + /** * Is emitted when the write state of the folder has been changed. The application * should disable all actions like "Create New..." that depend on the write -- cgit v1.3