use KDirModel::mimeData() for cut/copy operations as suggested by David Faure

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 31b9de78591c53236c5a46118cec1907c8f0b187..6fad094f7af4f61938a0b9eb044f260262e150ad 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -33,6 +33,7 @@
 #include <kdirlister.h>
 #include <kfilepreviewgenerator.h>
 #include <kiconeffect.h>
+#include <kfileitem.h>
 #include <klocale.h>
 #include <kio/deletejob.h>
 #include <kio/netaccess.h>
@@ -44,6 +45,7 @@
 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konqmimedata.h>
+#include <kstringhandler.h>
 #include <ktoggleaction.h>
 #include <kurl.h>
 
@@ -64,6 +66,15 @@
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"
 
+/**
+ * Helper function for sorting items with qSort() in
+ * DolphinView::renameSelectedItems().
+ */
+bool lessThan(const KFileItem& item1, const KFileItem& item2)
+{
+    return KStringHandler::naturalCompare(item1.name(), item2.name()) < 0;
+}
+
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
                          KDirLister* dirLister,
@@ -594,7 +605,7 @@ void DolphinView::changeSelection(const KFileItemList& selection)
 
 void DolphinView::renameSelectedItems()
 {
-    const KFileItemList items = selectedItems();
+    KFileItemList items = selectedItems();
     const int itemCount = items.count();
     if (itemCount < 1) {
         return;
@@ -615,10 +626,14 @@ void DolphinView::renameSelectedItems()
             // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
             // as one operation instead of n rename operations like it is done now...
             Q_ASSERT(newName.contains('#'));
+            
+            // currently the items are sorted by the selection order, resort
+            // them by the file name
+            qSort(items.begin(), items.end(), lessThan);
 
             // iterate through all selected items and rename them...
             int index = 1;
-            foreach (const KFileItem &item, items) {
+            foreach (const KFileItem& item, items) {
                 const KUrl& oldUrl = item.url();
                 QString number;
                 number.setNum(index++);
@@ -686,7 +701,7 @@ void DolphinView::deleteSelectedItems()
 
 void DolphinView::cutSelectedItems()
 {
-    QMimeData* mimeData = new QMimeData();
+    QMimeData* mimeData = selectionMimeData();
     const KUrl::List kdeUrls = simplifiedSelectedUrls();
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
@@ -695,7 +710,7 @@ void DolphinView::cutSelectedItems()
 
 void DolphinView::copySelectedItems()
 {
-    QMimeData* mimeData = new QMimeData();
+    QMimeData* mimeData = selectionMimeData();
     const KUrl::List kdeUrls = selectedUrls();
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
@@ -1409,4 +1424,16 @@ bool DolphinView::itemsExpandable() const
     return (m_detailsView != 0) && m_detailsView->itemsExpandable();
 }
 
+QMimeData* DolphinView::selectionMimeData() const
+{
+    if (isColumnViewActive()) {
+        return m_columnView->selectionMimeData();
+    }
+
+    const QAbstractItemView* view = itemView();
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
+    return m_dolphinModel->mimeData(selection.indexes());
+}
+
 #include "dolphinview.moc"