Drag and drop: Adjust destination if the item is no directory or desktop-file

[dolphin.git] / src / kitemviews / kfileitemmodel.cpp

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index fb089077b3df31f794bb774cb99c61c72bc35914..e0ae033026f94b8d42f9362dc004fce904bbae19 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -21,6 +21,7 @@
 
 #include <KDirLister>
 #include <KDirModel>
 
 #include <KDirLister>
 #include <KDirModel>

+#include <KGlobalSettings>

 #include <KLocale>
 #include <KStringHandler>
 #include <KDebug>
 #include <KLocale>
 #include <KStringHandler>
 #include <KDebug>


@@ -33,7 +34,7 @@
 KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
     KItemModelBase("name", parent),
     m_dirLister(dirLister),
 KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
     KItemModelBase("name", parent),
     m_dirLister(dirLister),

-    m_naturalSorting(true),
+    m_naturalSorting(KGlobalSettings::naturalSorting()),

     m_sortFoldersFirst(true),
     m_sortRole(NameRole),
     m_roles(),
     m_sortFoldersFirst(true),
     m_sortRole(NameRole),
     m_roles(),


@@ -95,6 +96,8 @@ KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
     connect(m_resortAllItemsTimer, SIGNAL(timeout()), this, SLOT(resortAllItems()));
 
     Q_ASSERT(m_minimumUpdateIntervalTimer->interval() <= m_maximumUpdateIntervalTimer->interval());
     connect(m_resortAllItemsTimer, SIGNAL(timeout()), this, SLOT(resortAllItems()));
 
     Q_ASSERT(m_minimumUpdateIntervalTimer->interval() <= m_maximumUpdateIntervalTimer->interval());

+    
+    connect(KGlobalSettings::self(), SIGNAL(naturalSortingChanged()), this, SLOT(slotNaturalSortingChanged()));

 }
 
 KFileItemModel::~KFileItemModel()
 }
 
 KFileItemModel::~KFileItemModel()


@@ -254,7 +257,7 @@ int KFileItemModel::indexForKeyboardSearch(const QString& text, int startFromInd
 bool KFileItemModel::supportsDropping(int index) const
 {
     const KFileItem item = fileItem(index);
 bool KFileItemModel::supportsDropping(int index) const
 {
     const KFileItem item = fileItem(index);

-    return item.isNull() ? false : item.isDir();
+    return item.isNull() ? false : item.isDir() || item.isDesktopFile();

 }
 
 QString KFileItemModel::roleDescription(const QByteArray& role) const
 }
 
 QString KFileItemModel::roleDescription(const QByteArray& role) const


@@ -475,7 +478,7 @@ void KFileItemModel::restoreExpandedUrls(const QSet<KUrl>& urls)
     m_urlsToExpand = urls;
 }
 
     m_urlsToExpand = urls;
 }
 

-void KFileItemModel::setExpanded(const QSet<KUrl>& urls)
+void KFileItemModel::expandParentItems(const KUrl& url)

 {
     const KDirLister* dirLister = m_dirLister.data();
     if (!dirLister) {
 {
     const KDirLister* dirLister = m_dirLister.data();
     if (!dirLister) {


@@ -484,20 +487,15 @@ void KFileItemModel::setExpanded(const QSet<KUrl>& urls)
 
     const int pos = dirLister->url().path().length();
 
 
     const int pos = dirLister->url().path().length();
 

-    // Assure that each sub-path of the URLs that should be
-    // expanded is added to m_urlsToExpand too. KDirLister
+    // Assure that each sub-path of the URL that should be
+    // expanded is added to m_urlsToExpand. KDirLister

     // does not care whether the parent-URL has already been
     // expanded.
     // does not care whether the parent-URL has already been
     // expanded.

-    QSetIterator<KUrl> it1(urls);
-    while (it1.hasNext()) {
-        const KUrl& url = it1.next();
-
-        KUrl urlToExpand = dirLister->url();
-        const QStringList subDirs = url.path().mid(pos).split(QDir::separator());
-        for (int i = 0; i < subDirs.count(); ++i) {
-            urlToExpand.addPath(subDirs.at(i));
-            m_urlsToExpand.insert(urlToExpand);
-        }
+    KUrl urlToExpand = dirLister->url();
+    const QStringList subDirs = url.path().mid(pos).split(QDir::separator());
+    for (int i = 0; i < subDirs.count() - 1; ++i) {
+        urlToExpand.addPath(subDirs.at(i));
+        m_urlsToExpand.insert(urlToExpand);

     }
 
     // KDirLister::open() must called at least once to trigger an initial
     }
 
     // KDirLister::open() must called at least once to trigger an initial


@@ -862,6 +860,12 @@ void KFileItemModel::slotClear(const KUrl& url)
     Q_UNUSED(url);
 }
 
     Q_UNUSED(url);
 }
 

+void KFileItemModel::slotNaturalSortingChanged()
+{
+    m_naturalSorting = KGlobalSettings::naturalSorting();
+    resortAllItems();
+}
+

 void KFileItemModel::dispatchPendingItemsToInsert()
 {
     if (!m_pendingItemsToInsert.isEmpty()) {
 void KFileItemModel::dispatchPendingItemsToInsert()
 {
     if (!m_pendingItemsToInsert.isEmpty()) {


@@ -1116,6 +1120,30 @@ KFileItemModel::Role KFileItemModel::roleIndex(const QByteArray& role) const
     return rolesHash.value(role, NoRole);
 }
 
     return rolesHash.value(role, NoRole);
 }
 

+QByteArray KFileItemModel::roleByteArray(Role role) const
+{
+    static const char* const roles[RolesCount] = {
+        0, // NoRole
+        "name",
+        "size",
+        "date",
+        "permissions",
+        "owner",
+        "group",
+        "type",
+        "destination",
+        "path",
+        "comment",
+        "tags",
+        "rating",
+        "isDir",
+        "isExpanded",
+        "isExpandable",
+        "expansionLevel"        
+    };
+    return roles[role];
+}
+

 QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item) const
 {    
     // It is important to insert only roles that are fast to retrieve. E.g.
 QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item) const
 {    
     // It is important to insert only roles that are fast to retrieve. E.g.


@@ -1265,62 +1293,69 @@ int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b) const
     case NameRole:
         // The name role is handled as default fallback after the switch
         break;
     case NameRole:
         // The name role is handled as default fallback after the switch
         break;

-
-    case DateRole: {
-        const KDateTime dateTimeA = itemA.time(KFileItem::ModificationTime);
-        const KDateTime dateTimeB = itemB.time(KFileItem::ModificationTime);
-        if (dateTimeA < dateTimeB) {
-            result = -1;
-        } else if (dateTimeA > dateTimeB) {
-            result = +1;
-        }
-        break;
-    }
-
+        

     case SizeRole: {
         if (itemA.isDir()) {
     case SizeRole: {
         if (itemA.isDir()) {

-            Q_ASSERT(itemB.isDir()); // see "if (m_sortFoldersFirst || m_sortRole == SizeRole)" above
+            // See "if (m_sortFoldersFirst || m_sortRole == SizeRole)" in KFileItemModel::lessThan():
+            Q_ASSERT(itemB.isDir());

 
             const QVariant valueA = a->values.value("size");
             const QVariant valueB = b->values.value("size");
 
             const QVariant valueA = a->values.value("size");
             const QVariant valueB = b->values.value("size");

-
-            if (valueA.isNull()) {
+            if (valueA.isNull() && valueB.isNull()) {
+                result = 0;
+            } else if (valueA.isNull()) {

                 result = -1;
             } else if (valueB.isNull()) {
                 result = +1;
             } else {
                 result = -1;
             } else if (valueB.isNull()) {
                 result = +1;
             } else {

-                result = valueA.value<KIO::filesize_t>() - valueB.value<KIO::filesize_t>();
+                result = valueA.toInt() - valueB.toInt();

             }
         } else {
             }
         } else {

-            Q_ASSERT(!itemB.isDir()); // see "if (m_sortFoldersFirst || m_sortRole == SizeRole)" above
-            result = itemA.size() - itemB.size();
+            // See "if (m_sortFoldersFirst || m_sortRole == SizeRole)" in KFileItemModel::lessThan():
+            Q_ASSERT(!itemB.isDir());
+            const KIO::filesize_t sizeA = itemA.size();
+            const KIO::filesize_t sizeB = itemB.size();
+            if (sizeA > sizeB) {
+                result = +1;
+            } else if (sizeA < sizeB) {
+                result = -1;
+            } else {
+                result = 0;
+            }

         }
         break;
     }
 
         }
         break;
     }
 

-    case TypeRole: {
-        result = QString::compare(a->values.value("type").toString(),
-                                  b->values.value("type").toString());
+    case DateRole: {
+        const KDateTime dateTimeA = itemA.time(KFileItem::ModificationTime);
+        const KDateTime dateTimeB = itemB.time(KFileItem::ModificationTime);
+        if (dateTimeA < dateTimeB) {
+            result = -1;
+        } else if (dateTimeA > dateTimeB) {
+            result = +1;
+        }

         break;
     }
         break;
     }

-
-    case CommentRole: {
-        result = QString::compare(a->values.value("comment").toString(),
-                                  b->values.value("comment").toString());
+    
+    case RatingRole: {
+        result = a->values.value("rating").toInt() - b->values.value("rating").toInt();

         break;
     }
         break;
     }

-
+    
+    case PermissionsRole:
+    case OwnerRole:
+    case GroupRole:
+    case TypeRole:
+    case DestinationRole:
+    case PathRole:
+    case CommentRole:

     case TagsRole: {
     case TagsRole: {

-        result = QString::compare(a->values.value("tags").toString(),
-                                  b->values.value("tags").toString());
-        break;
-    }
-
-    case RatingRole: {
-        result = a->values.value("rating").toInt() - b->values.value("rating").toInt();
+        const QByteArray role = roleByteArray(m_sortRole);
+        result = QString::compare(a->values.value(role).toString(),
+                                  b->values.value(role).toString());

         break;
     }
         break;
     }

-
+        

     default:
         break;
     }
     default:
         break;
     }