From: Méven Car <meven@kde.org>
Date: Wed, 28 Jun 2023 07:49:46 +0000 (+0200)
Subject: Merge branch 'master' into kf6
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/cd2e64154fd5446a7e19aff4cb147efe2f2ba31e

Merge branch 'master' into kf6
---

cd2e64154fd5446a7e19aff4cb147efe2f2ba31e
diff --cc src/kitemviews/kfileitemmodel.cpp
index 4b06525f5,629332703..28e0876b9
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@@ -235,9 -240,35 +239,31 @@@ bool KFileItemModel::sortHiddenLast() c
      return m_sortHiddenLast;
  }
  
+ void KFileItemModel::setShowTrashMime(bool show)
+ {
+     const auto trashMime = QStringLiteral("application/x-trash");
+     QStringList excludeFilter = m_filter.excludeMimeTypes();
+     bool wasShown = !excludeFilter.contains(trashMime);
+ 
+     if (show) {
+         if (!wasShown) {
+             excludeFilter.removeAll(trashMime);
+         }
+     } else {
+         if (wasShown) {
+             excludeFilter.append(trashMime);
+         }
+     }
+ 
+     if (wasShown != show) {
+         setExcludeMimeTypeFilter(excludeFilter);
+     }
+ }
+ 
  void KFileItemModel::setShowHiddenFiles(bool show)
  {
 -#if KIO_VERSION < QT_VERSION_CHECK(5, 100, 0)
 -    m_dirLister->setShowingDotFiles(show);
 -#else
      m_dirLister->setShowHiddenFiles(show);
 -#endif
+     setShowTrashMime(show);
      m_dirLister->emitChanges();
      if (show) {
          dispatchPendingItemsToInsert();