"Grouped sorting" defaults to true. Grouping is still disabled by default because...

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

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 9464c7e09b09bf0fd5fcd38e3f285a6a76d15626..5b7b781a8fbdc6d8631b63771b9724f92db7e014 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -39,6 +39,7 @@ KFileItemModel::KFileItemModel(QObject *parent)
     , m_sortDirsFirst(true)
     , m_sortHiddenLast(false)
     , m_sortRole(NameRole)
+    , m_groupRole(NoRole)
     , m_sortingProgressPercent(-1)
     , m_roles()
     , m_itemData()
@@ -946,6 +947,15 @@ QList<KFileItemModel::RoleInfo> KFileItemModel::rolesInformation()
     return rolesInfo;
 }
 
+QList<KFileItemModel::RoleInfo> KFileItemModel::extraGroupingInformation()
+{
+    static QList<RoleInfo> rolesInfo{
+        {QByteArray("none"),         kli18nc("@label", "No grouping").toString(),       nullptr,     nullptr,     false,      false},
+        {QByteArray("followSort"),   kli18nc("@label", "Follow sorting").toString(),    nullptr,    nullptr,     false,      false}
+    };
+    return rolesInfo;
+}
+
 void KFileItemModel::onGroupedSortingChanged(bool current)
 {
     Q_UNUSED(current)
@@ -979,6 +989,7 @@ void KFileItemModel::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder pre
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
+    resortAllItems();
 }
 
 void KFileItemModel::onGroupRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems)
@@ -1008,6 +1019,7 @@ void KFileItemModel::onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder pr
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
+    resortAllItems();
 }
 
 void KFileItemModel::loadSortingSettings()
@@ -1032,7 +1044,7 @@ void KFileItemModel::loadSortingSettings()
     // Workaround for bug https://bugreports.qt.io/browse/QTBUG-69361
     // Force the clean state of QCollator in single thread to avoid thread safety problems in sort
     m_collator.compare(QString(), QString());
-    m_dirSizeMode = ContentDisplaySettings::directorySizeMode();
+    ContentDisplaySettings::self();
 }
 
 void KFileItemModel::resortAllItems()
@@ -2100,7 +2112,7 @@ bool KFileItemModel::lessThan(const ItemData *a, const ItemData *b, const QColla
                 return true;
             }
         }
-        if (m_sortDirsFirst || (m_dirSizeMode == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount && 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) {
@@ -2154,7 +2166,7 @@ int KFileItemModel::sortRoleCompare(const ItemData *a, const ItemData *b, const
         break;
 
     case SizeRole: {
-        if (m_dirSizeMode == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount && 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");
@@ -2428,6 +2440,7 @@ int KFileItemModel::stringCompare(const QString &a, const QString &b, const QCol
 
 KFileItemModel::ItemGroupInfo KFileItemModel::nameRoleGroup(const ItemData *itemData, bool withString) const
 {
+    static bool oldWithString;
     static ItemGroupInfo oldGroupInfo;
     static QChar oldFirstChar;
     ItemGroupInfo groupInfo;
@@ -2439,8 +2452,8 @@ KFileItemModel::ItemGroupInfo KFileItemModel::nameRoleGroup(const ItemData *item
 
     // Use the first character of the name as group indication
     firstChar = name.at(0).toUpper();
-
-    if (firstChar == oldFirstChar) {
+    
+    if (firstChar == oldFirstChar && withString == oldWithString) {
         return oldGroupInfo;
     }
     if (firstChar == QLatin1Char('~') && name.length() > 1) {
@@ -2495,6 +2508,7 @@ KFileItemModel::ItemGroupInfo KFileItemModel::nameRoleGroup(const ItemData *item
         }
         groupInfo.comparable = (int)'.';
     }
+    oldWithString = withString;
     oldFirstChar = firstChar;
     oldGroupInfo = groupInfo;
     return groupInfo;
@@ -2502,8 +2516,6 @@ KFileItemModel::ItemGroupInfo KFileItemModel::nameRoleGroup(const ItemData *item
 
 KFileItemModel::ItemGroupInfo KFileItemModel::sizeRoleGroup(const ItemData *itemData, bool withString) const
 {
-    static ItemGroupInfo oldGroupInfo;
-    static KIO::filesize_t oldFileSize;
     ItemGroupInfo groupInfo;
     KIO::filesize_t fileSize;
 
@@ -2512,15 +2524,12 @@ KFileItemModel::ItemGroupInfo KFileItemModel::sizeRoleGroup(const ItemData *item
 
     groupInfo.comparable = -1; // None
     if (!item.isNull() && item.isDir()) {
-        if (m_dirSizeMode != ContentDisplaySettings::EnumDirectorySizeMode::ContentSize) {
+        if (ContentDisplaySettings::directorySizeMode() != ContentDisplaySettings::EnumDirectorySizeMode::ContentSize) {
             groupInfo.comparable = 0; // Folders
         } else {
             fileSize = itemData->values.value("size").toULongLong();
         }
     }
-    if (fileSize == oldFileSize) {
-        return oldGroupInfo;
-    }
     if (groupInfo.comparable < 0) {
         if (fileSize < 5 * 1024 * 1024) { // < 5 MB
             groupInfo.comparable = 1; // Small
@@ -2535,14 +2544,13 @@ KFileItemModel::ItemGroupInfo KFileItemModel::sizeRoleGroup(const ItemData *item
         char const *groupNames[] = {"Folders", "Small", "Medium", "Big"};
         groupInfo.text = i18nc("@title:group Size", groupNames[groupInfo.comparable]);
     }
-    oldFileSize = fileSize;
-    oldGroupInfo = groupInfo;
     return groupInfo;
 }
 
 KFileItemModel::ItemGroupInfo
 KFileItemModel::timeRoleGroup(const std::function<QDateTime(const ItemData *)> &fileTimeCb, const ItemData *itemData, bool withString) const
 {
+    static bool oldWithString;
     static ItemGroupInfo oldGroupInfo;
     static QDate oldFileDate;
     ItemGroupInfo groupInfo;
@@ -2552,6 +2560,9 @@ KFileItemModel::timeRoleGroup(const std::function<QDateTime(const ItemData *)> &
     const QDate fileDate = fileTime.date();
     const int daysDistance = fileDate.daysTo(currentDate);
 
+    if (fileDate == oldFileDate && withString == oldWithString) {
+        return oldGroupInfo;
+    }
     // Simplified grouping algorithm, preserving dates
     // but not taking "pretty printing" into account
     if (currentDate.year() == fileDate.year() && currentDate.month() == fileDate.month()) {
@@ -2755,6 +2766,7 @@ KFileItemModel::timeRoleGroup(const std::function<QDateTime(const ItemData *)> &
             }
         }
     }
+    oldWithString = withString;
     oldFileDate = fileDate;
     oldGroupInfo = groupInfo;
     return groupInfo;
@@ -2762,13 +2774,14 @@ KFileItemModel::timeRoleGroup(const std::function<QDateTime(const ItemData *)> &
 
 KFileItemModel::ItemGroupInfo KFileItemModel::permissionRoleGroup(const ItemData *itemData, bool withString) const
 {
+    static bool oldWithString;
     static ItemGroupInfo oldGroupInfo;
     static QFileDevice::Permissions oldPermissions;
     ItemGroupInfo groupInfo;
 
     const QFileInfo info(itemData->item.url().toLocalFile());
     const QFileDevice::Permissions permissions = info.permissions();
-    if (permissions == oldPermissions) {
+    if (permissions == oldPermissions && withString == oldWithString) {
         return oldGroupInfo;
     }
     groupInfo.comparable = (int)permissions;
@@ -2814,6 +2827,7 @@ KFileItemModel::ItemGroupInfo KFileItemModel::permissionRoleGroup(const ItemData
         others = others.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : others.mid(0, others.length() - 2);
         groupInfo.text = i18nc("@title:group Files and folders by permissions", "User: %1 | Group: %2 | Others: %3", user, group, others);
     }
+    oldWithString = withString;
     oldPermissions = permissions;
     oldGroupInfo = groupInfo;
     return groupInfo;
@@ -2826,7 +2840,7 @@ KFileItemModel::ItemGroupInfo KFileItemModel::ratingRoleGroup(const ItemData *it
     if (withString) {
         // Dolphin does not currently use string representation of star rating
         // as stars are rendered as graphics in group headers.
-        groupInfo.text = i18nc("@item:intext Rated N (stars)", "Rated ") + QString::number(groupInfo.comparable);
+        groupInfo.text = i18nc("@item:intext Rated N (stars)", "Rated %i", QString::number(groupInfo.comparable));
     }
     return groupInfo;
 }