From 5bb2a0f3c9f2d07dcb0739b88e37b203b451ecf3 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 22 Sep 2010 19:39:46 +0000 Subject: Unbelievable: I simply forgot to implement the Stop-action in Dolphin since KDE SC 4.0. Well better later than never: Done now :-) BUG: 233836 svn path=/trunk/KDE/kdebase/apps/; revision=1178344 --- src/views/dolphinview.cpp | 7 +++++++ src/views/dolphinview.h | 8 ++++++++ 2 files changed, 15 insertions(+) (limited to 'src/views') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index d4f489615..e9bee3186 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -437,6 +437,11 @@ void DolphinView::reload() restoreState(restoreStream); } +void DolphinView::stopLoading() +{ + m_viewAccessor.dirLister()->stop(); +} + void DolphinView::refresh() { const bool oldActivationState = m_active; @@ -1161,6 +1166,8 @@ void DolphinView::slotLoadingCompleted() // Restore the contents position. This has to be done using a Qt::QueuedConnection // because the view might not be in its final state yet. QMetaObject::invokeMethod(this, "restoreContentsPosition", Qt::QueuedConnection); + + emit finishedPathLoading(url()); } void DolphinView::slotRefreshItems() diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index 6a5d10898..f24bb6be7 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -257,6 +257,8 @@ public: /** Reloads the current directory. */ void reload(); + void stopLoading(); + /** * Refreshes the view to get synchronized with the (updated) Dolphin settings. * This method only needs to get invoked if the view settings for the Icons View, @@ -524,6 +526,12 @@ signals: */ void startedPathLoading(const KUrl& url); + /** + * Is emitted after the path triggered by DolphinView::setUrl() + * has been loaded. + */ + void finishedPathLoading(const KUrl& url); + /** * Emitted when KDirLister emits redirection. * Testcase: fish://localhost -- cgit v1.3