From c33b01efb2aed904af9ffaef27fb3b0b4bdda37b Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 29 Mar 2008 14:54:56 +0000 Subject: Move the pasteIntoFolder() method from the contextmenu into DolphinView. This allows to show the information inside the statusbar, that the paste operation has been completed (also some code duplication can be prevented by the way). svn path=/trunk/KDE/kdebase/apps/; revision=791436 --- src/dolphinview.cpp | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'src/dolphinview.cpp') diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index fdb4880bb..e1f1cf53c 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -607,17 +607,14 @@ void DolphinView::copySelectedItems() void DolphinView::paste() { - QClipboard* clipboard = QApplication::clipboard(); - const QMimeData* mimeData = clipboard->mimeData(); + pasteToUrl(url()); +} - const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData); - if (KonqMimeData::decodeIsCutSelection(mimeData)) { - KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, url()); - emit doingOperation(KonqFileUndoManager::MOVE); - clipboard->clear(); - } else { - KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, url()); - emit doingOperation(KonqFileUndoManager::COPY); +void DolphinView::pasteIntoFolder() +{ + const KFileItemList items = selectedItems(); + if ((items.count() == 1) && items.first().isDir()) { + pasteToUrl(items.first().url()); } } @@ -1138,4 +1135,20 @@ bool DolphinView::isCutItem(const KFileItem& item) const return false; } +void DolphinView::pasteToUrl(const KUrl& url) +{ + QClipboard* clipboard = QApplication::clipboard(); + const QMimeData* mimeData = clipboard->mimeData(); + + const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData); + if (KonqMimeData::decodeIsCutSelection(mimeData)) { + KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, url); + emit doingOperation(KonqFileUndoManager::MOVE); + clipboard->clear(); + } else { + KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, url); + emit doingOperation(KonqFileUndoManager::COPY); + } +} + #include "dolphinview.moc" -- cgit v1.3