From aa0b09dac43ec2a58bd32a1e08d59acd35bd86aa Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 1 Oct 2008 21:39:35 +0000 Subject: * adjusted Dolphin to use KonqOperations::doDrop() instead of using a custom implementation * used new signals jobRecordingStarted() and jobRecordingFinished from FileUndoManager to inform the user in the statusbar when a recorded command has been finished svn path=/trunk/KDE/kdebase/apps/; revision=866777 --- src/dolphinviewcontainer.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/dolphinviewcontainer.cpp') diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index cccce3fad..c5ec69959 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -46,6 +46,7 @@ #include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" +#include "dolphindropcontroller.h" #include "dolphinstatusbar.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" @@ -80,8 +81,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_topLayout->setMargin(0); m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); - connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), - m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); + connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)), + this, SLOT(dropUrls(const KUrl&, QDropEvent*))); connect(m_urlNavigator, SIGNAL(activated()), this, SLOT(activate())); @@ -406,6 +407,11 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url) m_urlNavigator->saveRootUrl(m_view->rootUrl()); } +void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event) +{ + DolphinDropController::dropUrls(KFileItem(), destination, event, this); +} + void DolphinViewContainer::slotItemTriggered(const KFileItem& item) { KUrl url = item.targetUrl(); -- cgit v1.3