Change the location of the methods. Now the algorithm is only applied when needed...

hierarchy). This patch was waiting in my hard disk for being committed...

CCMAIL: faure@kde.org

svn path=/trunk/KDE/kdebase/apps/; revision=847195

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 610a6d1ffe802fa6a4cf24a28c94126b75f5aac3..685177db440755c47ab9251b93c5cfb614adbb74 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -605,12 +605,21 @@ void DolphinView::renameSelectedItems()
 void DolphinView::trashSelectedItems()
 {
     emit doingOperation(KIO::FileUndoManager::Trash);
 void DolphinView::trashSelectedItems()
 {
     emit doingOperation(KIO::FileUndoManager::Trash);

-    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
+    KUrl::List list = selectedUrls();
+    DolphinDetailsView *dv = qobject_cast<DolphinDetailsView*>(itemView());
+    if (dv && dv->itemsExpandable()) {
+        list = KonqOperations::simplifiedUrlList(list);
+    }
+    KonqOperations::del(this, KonqOperations::TRASH, list);

 }
 
 void DolphinView::deleteSelectedItems()
 {
 }
 
 void DolphinView::deleteSelectedItems()
 {

-    const KUrl::List list = selectedUrls();
+    KUrl::List list = selectedUrls();
+    DolphinDetailsView *dv = qobject_cast<DolphinDetailsView*>(itemView());
+    if (dv && dv->itemsExpandable()) {
+        list = KonqOperations::simplifiedUrlList(list);
+    }

     const bool del = KonqOperations::askDeleteConfirmation(list,
                      KonqOperations::DEL,
                      KonqOperations::DEFAULT_CONFIRMATION,
     const bool del = KonqOperations::askDeleteConfirmation(list,
                      KonqOperations::DEL,
                      KonqOperations::DEFAULT_CONFIRMATION,


@@ -626,7 +635,11 @@ void DolphinView::deleteSelectedItems()
 void DolphinView::cutSelectedItems()
 {
     QMimeData* mimeData = new QMimeData();
 void DolphinView::cutSelectedItems()
 {
     QMimeData* mimeData = new QMimeData();

-    const KUrl::List kdeUrls = selectedUrls();
+    KUrl::List kdeUrls = selectedUrls();
+    DolphinDetailsView *dv = qobject_cast<DolphinDetailsView*>(itemView());
+    if (dv && dv->itemsExpandable()) {
+        kdeUrls = KonqOperations::simplifiedUrlList(kdeUrls);
+    }

     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
     QApplication::clipboard()->setMimeData(mimeData);
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
     QApplication::clipboard()->setMimeData(mimeData);