kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

KFileItemModel: Allow to group files and folder together

Browse source 
When folders size is available and unless sort dir first is set, folders
and files can be grouped together in the regular size groups.

Without this you can end up with multiple groups being added each time a
folder size alternates with a file size.

Relates to d520b417c97bdbdfece2a497dac8b5384a80b597
This commit is contained in:
Méven Car 2021-03-08 07:25:31 +01:00
parent 216068bd7c
commit a3559a19db
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/kitemviews/kfileitemmodel.cpp
View file

@ -2026,16 +2026,24 @@ QList<QPair<int, QVariant> > KFileItemModel::sizeRoleGroups() const
}
const KFileItem& item = m_itemData.at(i)->item;
const KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U;
KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U;
QString newGroupValue;
if (!item.isNull() && item.isDir()) {
newGroupValue = i18nc("@title:group Size", "Folders");
} else if (fileSize < 5 * 1024 * 1024) {
newGroupValue = i18nc("@title:group Size", "Small");
} else if (fileSize < 10 * 1024 * 1024) {
newGroupValue = i18nc("@title:group Size", "Medium");
} else {
newGroupValue = i18nc("@title:group Size", "Big");
if (DetailsModeSettings::directorySizeCount() || m_sortDirsFirst) {
newGroupValue = i18nc("@title:group Size", "Folders");
} else {
fileSize = m_itemData.at(i)->values.value("size").toULongLong();
}
}
if (newGroupValue.isEmpty()) {
if (fileSize < 5 * 1024 * 1024) { // < 5 MB
newGroupValue = i18nc("@title:group Size", "Small");
} else if (fileSize < 10 * 1024 * 1024) { // < 10 MB
newGroupValue = i18nc("@title:group Size", "Medium");
} else {
newGroupValue = i18nc("@title:group Size", "Big");
}
}
if (newGroupValue != groupValue) {