┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2012-06-13 15:15:54 +0200
committerPeter Penz <[email protected]>2012-06-13 15:18:21 +0200
commite9463ffe2ac110193cac4c25fcba887249f52b3c (patch)
tree2628af56647926efc845086dc46b95650e89f1d2 /src/views
parentfb15dac9752b44ceb0846ac013160d8972c5e862 (diff)
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
Diffstat (limited to 'src/views')
-rw-r--r--src/views/dolphinview.cpp1
-rw-r--r--src/views/dolphinview.h6
2 files changed, 7 insertions, 0 deletions
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
@@ -494,6 +494,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
* state.