Port from KIconLoader::drawOverlays to KIconUtils::addOverlays

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

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index bcfb1a874d7a62f3c6b1a9a03ec797561bc3c806..d18754ec75352fa7c9e1b5fc916d361f48292aa8 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -8,16 +8,17 @@
 
 #include "kfileitemmodel.h"
 
 
 #include "kfileitemmodel.h"
 

-#include "dolphin_detailsmodesettings.h"
+#include "dolphin_contentdisplaysettings.h"

 #include "dolphin_generalsettings.h"
 #include "dolphindebug.h"
 #include "private/kfileitemmodelsortalgorithm.h"
 #include "dolphin_generalsettings.h"
 #include "dolphindebug.h"
 #include "private/kfileitemmodelsortalgorithm.h"

+#include "views/draganddrophelper.h"

 
 #include <KDirLister>
 #include <KIO/Job>
 
 #include <KDirLister>
 #include <KIO/Job>

+#include <KIO/ListJob>

 #include <KLocalizedString>
 #include <KUrlMimeData>
 #include <KLocalizedString>
 #include <KUrlMimeData>

-#include <kio_version.h>

 
 #include <QElapsedTimer>
 #include <QIcon>
 
 #include <QElapsedTimer>
 #include <QIcon>


@@ -26,7 +27,6 @@
 #include <QRecursiveMutex>
 #include <QTimer>
 #include <QWidget>
 #include <QRecursiveMutex>
 #include <QTimer>
 #include <QWidget>

-#include <algorithm>

 #include <klazylocalizedstring.h>
 
 Q_GLOBAL_STATIC(QRecursiveMutex, s_collatorMutex)
 #include <klazylocalizedstring.h>
 
 Q_GLOBAL_STATIC(QRecursiveMutex, s_collatorMutex)


@@ -100,11 +100,14 @@ KFileItemModel::KFileItemModel(QObject *parent)
     // for a lot of items within a quite small timeslot. To prevent expensive resortings the
     // resorting is postponed until the timer has been exceeded.
     m_resortAllItemsTimer = new QTimer(this);
     // for a lot of items within a quite small timeslot. To prevent expensive resortings the
     // resorting is postponed until the timer has been exceeded.
     m_resortAllItemsTimer = new QTimer(this);

-    m_resortAllItemsTimer->setInterval(500);
+    m_resortAllItemsTimer->setInterval(100); // 100 is a middle ground between sorting too frequently which makes the view unreadable
+                                             // and sorting too infrequently which leads to users seeing an outdated sort order.

     m_resortAllItemsTimer->setSingleShot(true);
     connect(m_resortAllItemsTimer, &QTimer::timeout, this, &KFileItemModel::resortAllItems);
 
     connect(GeneralSettings::self(), &GeneralSettings::sortingChoiceChanged, this, &KFileItemModel::slotSortingChoiceChanged);
     m_resortAllItemsTimer->setSingleShot(true);
     connect(m_resortAllItemsTimer, &QTimer::timeout, this, &KFileItemModel::resortAllItems);
 
     connect(GeneralSettings::self(), &GeneralSettings::sortingChoiceChanged, this, &KFileItemModel::slotSortingChoiceChanged);

+
+    setShowTrashMime(m_dirLister->showHiddenFiles() || !GeneralSettings::hideXTrashFile());

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


@@ -129,6 +132,8 @@ void KFileItemModel::refreshDirectory(const QUrl &url)
     }
 
     m_dirLister->openUrl(url, KDirLister::Reload);
     }
 
     m_dirLister->openUrl(url, KDirLister::Reload);

+
+    Q_EMIT directoryRefreshing();

 }
 
 QUrl KFileItemModel::directory() const
 }
 
 QUrl KFileItemModel::directory() const


@@ -236,13 +241,31 @@ bool KFileItemModel::sortHiddenLast() const
     return m_sortHiddenLast;
 }
 
     return m_sortHiddenLast;
 }
 

+void KFileItemModel::setShowTrashMime(bool showTrashMime)
+{
+    const auto trashMime = QStringLiteral("application/x-trash");
+    QStringList excludeFilter = m_filter.excludeMimeTypes();
+
+    if (showTrashMime) {
+        excludeFilter.removeAll(trashMime);
+    } else if (!excludeFilter.contains(trashMime)) {
+        excludeFilter.append(trashMime);
+    }
+
+    setExcludeMimeTypeFilter(excludeFilter);
+}
+
+void KFileItemModel::scheduleResortAllItems()
+{
+    if (!m_resortAllItemsTimer->isActive()) {
+        m_resortAllItemsTimer->start();
+    }
+}
+

 void KFileItemModel::setShowHiddenFiles(bool show)
 {
 void KFileItemModel::setShowHiddenFiles(bool show)
 {

-#if KIO_VERSION < QT_VERSION_CHECK(5, 100, 0)
-    m_dirLister->setShowingDotFiles(show);
-#else

     m_dirLister->setShowHiddenFiles(show);
     m_dirLister->setShowHiddenFiles(show);

-#endif
+    setShowTrashMime(show || !GeneralSettings::hideXTrashFile());

     m_dirLister->emitChanges();
     if (show) {
         dispatchPendingItemsToInsert();
     m_dirLister->emitChanges();
     if (show) {
         dispatchPendingItemsToInsert();


@@ -251,11 +274,7 @@ void KFileItemModel::setShowHiddenFiles(bool show)
 
 bool KFileItemModel::showHiddenFiles() const
 {
 
 bool KFileItemModel::showHiddenFiles() const
 {

-#if KIO_VERSION < QT_VERSION_CHECK(5, 100, 0)
-    return m_dirLister->showingDotFiles();
-#else

     return m_dirLister->showHiddenFiles();
     return m_dirLister->showHiddenFiles();

-#endif

 }
 
 void KFileItemModel::setShowDirectoriesOnly(bool enabled)
 }
 
 void KFileItemModel::setShowDirectoriesOnly(bool enabled)


@@ -330,7 +349,18 @@ bool KFileItemModel::supportsDropping(int index) const
     } else {
         item = fileItem(index);
     }
     } else {
         item = fileItem(index);
     }

-    return !item.isNull() && ((item.isDir() && item.isWritable()) || item.isDesktopFile());
+    return !item.isNull() && DragAndDropHelper::supportsDropping(item);
+}
+
+bool KFileItemModel::canEnterOnHover(int index) const
+{
+    KFileItem item;
+    if (index == -1) {
+        item = rootItem();
+    } else {
+        item = fileItem(index);
+    }
+    return !item.isNull() && (item.isDir() || item.isDesktopFile());

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


@@ -598,9 +628,7 @@ bool KFileItemModel::setExpanded(int index, bool expanded)
 
         m_expandedDirs.remove(targetUrl);
         m_dirLister->stop(url);
 
         m_expandedDirs.remove(targetUrl);
         m_dirLister->stop(url);

-#if KIO_VERSION >= QT_VERSION_CHECK(5, 92, 0)

         m_dirLister->forgetDirs(url);
         m_dirLister->forgetDirs(url);

-#endif

 
         const int parentLevel = expandedParentsCount(index);
         const int itemCount = m_itemData.count();
 
         const int parentLevel = expandedParentsCount(index);
         const int itemCount = m_itemData.count();


@@ -616,9 +644,7 @@ bool KFileItemModel::setExpanded(int index, bool expanded)
                 const QUrl url = itemData->item.url();
                 m_expandedDirs.remove(targetUrl);
                 m_dirLister->stop(url); // TODO: try to unit-test this, see https://bugs.kde.org/show_bug.cgi?id=332102#c11
                 const QUrl url = itemData->item.url();
                 m_expandedDirs.remove(targetUrl);
                 m_dirLister->stop(url); // TODO: try to unit-test this, see https://bugs.kde.org/show_bug.cgi?id=332102#c11

-#if KIO_VERSION >= QT_VERSION_CHECK(5, 92, 0)

                 m_dirLister->forgetDirs(url);
                 m_dirLister->forgetDirs(url);

-#endif

                 expandedChildren.append(targetUrl);
             }
             ++childIndex;
                 expandedChildren.append(targetUrl);
             }
             ++childIndex;


@@ -738,6 +764,20 @@ QStringList KFileItemModel::mimeTypeFilters() const
     return m_filter.mimeTypes();
 }
 
     return m_filter.mimeTypes();
 }
 

+void KFileItemModel::setExcludeMimeTypeFilter(const QStringList &filters)
+{
+    if (m_filter.excludeMimeTypes() != filters) {
+        dispatchPendingItemsToInsert();
+        m_filter.setExcludeMimeTypes(filters);
+        applyFilters();
+    }
+}
+
+QStringList KFileItemModel::excludeMimeTypeFilter() const
+{
+    return m_filter.excludeMimeTypes();
+}
+

 void KFileItemModel::applyFilters()
 {
     // ===STEP 1===
 void KFileItemModel::applyFilters()
 {
     // ===STEP 1===


@@ -954,7 +994,7 @@ void KFileItemModel::resortAllItems()
     // been moved because of the resorting.
     QList<QUrl> oldUrls;
     oldUrls.reserve(itemCount);
     // been moved because of the resorting.
     QList<QUrl> oldUrls;
     oldUrls.reserve(itemCount);

-    for (const ItemData *itemData : qAsConst(m_itemData)) {
+    for (const ItemData *itemData : std::as_const(m_itemData)) {

         oldUrls.append(itemData->item.url());
     }
 
         oldUrls.append(itemData->item.url());
     }
 


@@ -1199,7 +1239,7 @@ void KFileItemModel::slotItemsDeleted(const KFileItemList &items)
         indexesToRemoveWithChildren.reserve(m_itemData.count());
 
         const int itemCount = m_itemData.count();
         indexesToRemoveWithChildren.reserve(m_itemData.count());
 
         const int itemCount = m_itemData.count();

-        for (int index : qAsConst(indexesToRemove)) {
+        for (int index : std::as_const(indexesToRemove)) {

             indexesToRemoveWithChildren.append(index);
 
             const int parentLevel = expandedParentsCount(index);
             indexesToRemoveWithChildren.append(index);
 
             const int parentLevel = expandedParentsCount(index);


@@ -1617,7 +1657,7 @@ void KFileItemModel::prepareItemsForSorting(QList<ItemData *> &itemDataList)
     case DeletionTimeRole:
         // These roles can be determined with retrieveData, and they have to be stored
         // in the QHash "values" for the sorting.
     case DeletionTimeRole:
         // These roles can be determined with retrieveData, and they have to be stored
         // in the QHash "values" for the sorting.

-        for (ItemData *itemData : qAsConst(itemDataList)) {
+        for (ItemData *itemData : std::as_const(itemDataList)) {

             if (itemData->values.isEmpty()) {
                 itemData->values = retrieveData(itemData->item, itemData->parent);
             }
             if (itemData->values.isEmpty()) {
                 itemData->values = retrieveData(itemData->item, itemData->parent);
             }


@@ -1626,7 +1666,7 @@ void KFileItemModel::prepareItemsForSorting(QList<ItemData *> &itemDataList)
 
     case TypeRole:
         // At least store the data including the file type for items with known MIME type.
 
     case TypeRole:
         // At least store the data including the file type for items with known MIME type.

-        for (ItemData *itemData : qAsConst(itemDataList)) {
+        for (ItemData *itemData : std::as_const(itemDataList)) {

             if (itemData->values.isEmpty()) {
                 const KFileItem item = itemData->item;
                 if (item.isDir() || item.isMimeTypeKnown()) {
             if (itemData->values.isEmpty()) {
                 const KFileItem item = itemData->item;
                 if (item.isDir() || item.isMimeTypeKnown()) {


@@ -1698,7 +1738,8 @@ void KFileItemModel::emitItemsChangedAndTriggerResorting(const KItemRangeList &i
 
     // Trigger a resorting if necessary. Note that this can happen even if the sort
     // role has not changed at all because the file name can be used as a fallback.
 
     // Trigger a resorting if necessary. Note that this can happen even if the sort
     // role has not changed at all because the file name can be used as a fallback.

-    if (changedRoles.contains(sortRole()) || changedRoles.contains(roleForType(NameRole))) {
+    if (changedRoles.contains(sortRole()) || changedRoles.contains(roleForType(NameRole))
+        || (changedRoles.contains("count") && sortRole() == "size")) { // "count" is used in the "size" sort role, so this might require a resorting.

         for (const KItemRange &range : itemRanges) {
             bool needsResorting = false;
 
         for (const KItemRange &range : itemRanges) {
             bool needsResorting = false;
 


@@ -1723,7 +1764,7 @@ void KFileItemModel::emitItemsChangedAndTriggerResorting(const KItemRangeList &i
             }
 
             if (needsResorting) {
             }
 
             if (needsResorting) {

-                m_resortAllItemsTimer->start();
+                scheduleResortAllItems();

                 return;
             }
         }
                 return;
             }
         }


@@ -1821,7 +1862,7 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem &item,
     }
 
     if (m_requestRole[IsHiddenRole]) {
     }
 
     if (m_requestRole[IsHiddenRole]) {

-        data.insert(sharedValue("isHidden"), item.isHidden());
+        data.insert(sharedValue("isHidden"), item.isHidden() || item.mimetype() == QStringLiteral("application/x-trash"));

     }
 
     if (m_requestRole[NameRole]) {
     }
 
     if (m_requestRole[NameRole]) {


@@ -1829,6 +1870,7 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem &item,
     }
 
     if (m_requestRole[ExtensionRole] && !isDir) {
     }
 
     if (m_requestRole[ExtensionRole] && !isDir) {

+        // TODO KF6 use KFileItem::suffix 464722

         data.insert(sharedValue("extension"), QFileInfo(item.name()).suffix());
     }
 
         data.insert(sharedValue("extension"), QFileInfo(item.name()).suffix());
     }
 


@@ -1988,7 +2030,8 @@ bool KFileItemModel::lessThan(const ItemData *a, const ItemData *b, const QColla
         }
     }
 
         }
     }
 

-    if (m_sortDirsFirst || (DetailsModeSettings::directorySizeCount() && m_sortRole == SizeRole)) {
+    if (m_sortDirsFirst
+        || (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount && m_sortRole == SizeRole)) {

         const bool isDirA = a->item.isDir();
         const bool isDirB = b->item.isDir();
         if (isDirA && !isDirB) {
         const bool isDirA = a->item.isDir();
         const bool isDirB = b->item.isDir();
         if (isDirA && !isDirB) {


@@ -2040,7 +2083,7 @@ int KFileItemModel::sortRoleCompare(const ItemData *a, const ItemData *b, const
         break;
 
     case SizeRole: {
         break;
 
     case SizeRole: {

-        if (DetailsModeSettings::directorySizeCount() && itemA.isDir()) {
+        if (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount && itemA.isDir()) {

             // folders first then
             // items A and B are folders thanks to lessThan checks
             auto valueA = a->values.value("count");
             // folders first then
             // items A and B are folders thanks to lessThan checks
             auto valueA = a->values.value("count");


@@ -2300,7 +2343,7 @@ QList<QPair<int, QVariant>> KFileItemModel::sizeRoleGroups() const
         KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U;
         QString newGroupValue;
         if (!item.isNull() && item.isDir()) {
         KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U;
         QString newGroupValue;
         if (!item.isNull() && item.isDir()) {

-            if (DetailsModeSettings::directorySizeCount() || m_sortDirsFirst) {
+            if (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount || m_sortDirsFirst) {

                 newGroupValue = i18nc("@title:group Size", "Folders");
             } else {
                 fileSize = m_itemData.at(i)->values.value("size").toULongLong();
                 newGroupValue = i18nc("@title:group Size", "Folders");
             } else {
                 fileSize = m_itemData.at(i)->values.value("size").toULongLong();


@@ -2813,12 +2856,15 @@ bool KFileItemModel::isConsistent() const
 
 void KFileItemModel::slotListerError(KIO::Job *job)
 {
 
 void KFileItemModel::slotListerError(KIO::Job *job)
 {

-    if (job->error() == KIO::ERR_IS_FILE) {
+    const int jobError = job->error();
+    if (jobError == KIO::ERR_IS_FILE) {

         if (auto *listJob = qobject_cast<KIO::ListJob *>(job)) {
             Q_EMIT urlIsFileError(listJob->url());
         }
     } else {
         const QString errorString = job->errorString();
         if (auto *listJob = qobject_cast<KIO::ListJob *>(job)) {
             Q_EMIT urlIsFileError(listJob->url());
         }
     } else {
         const QString errorString = job->errorString();

-        Q_EMIT errorMessage(!errorString.isEmpty() ? errorString : i18nc("@info:status", "Unknown error."));
+        Q_EMIT errorMessage(!errorString.isEmpty() ? errorString : i18nc("@info:status", "Unknown error."), jobError);

     }
 }
     }
 }

+
+#include "moc_kfileitemmodel.cpp"