From 707f9a940973128933b183e7ce36a807ea44e941 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 28 May 2008 23:07:09 +0000 Subject: Handle redirections (e.g. from fish://localhost) without breaking the column view -- thanks Peter for the advice on how to separate the two cleanly. svn path=/trunk/KDE/kdebase/apps/; revision=813954 --- src/dolphinview.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/dolphinview.cpp') diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index ae6ea5ec7..afd1e522d 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -102,7 +102,7 @@ DolphinView::DolphinView(QWidget* parent, connect(m_controller, SIGNAL(urlChanged(const KUrl&)), this, SIGNAL(urlChanged(const KUrl&))); connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)), - this, SIGNAL(urlChanged(const KUrl&))); + this, SIGNAL(slotRequestUrlChange(const KUrl&))); connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)), this, SLOT(openContextMenu(const QPoint&))); @@ -125,6 +125,8 @@ DolphinView::DolphinView(QWidget* parent, connect(m_controller, SIGNAL(viewportEntered()), this, SLOT(clearHoverInformation())); + connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)), + this, SLOT(slotRedirection(KUrl, KUrl))); connect(m_dirLister, SIGNAL(completed()), this, SLOT(restoreCurrentItem())); @@ -1203,4 +1205,16 @@ void DolphinView::pasteToUrl(const KUrl& url) } } +void DolphinView::slotRequestUrlChange(const KUrl& url) +{ + emit requestUrlChange(url); + m_controller->setUrl(url); +} + +void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) +{ + if (oldUrl == m_controller->url()) + m_controller->setUrl(newUrl); +} + #include "dolphinview.moc" -- cgit v1.3