From: Zakhar Afonin Date: Sat, 22 Jun 2024 12:14:02 +0000 (+0300) Subject: Merge branch 'work/zakharafoniam/useful-groups' of https://invent.kde.org/zakharafoni... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e5e824f876df3abc724c0868714738c975a3f7dd?hp=-c Merge branch 'work/zakharafoniam/useful-groups' of https://invent.kde.org/zakharafoniam/dolphin into work/zakharafoniam/useful-groups --- e5e824f876df3abc724c0868714738c975a3f7dd diff --combined src/kitemviews/kfileitemmodel.cpp index b7598401b,071e60df7..2133eef79 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@@ -946,15 -946,6 +946,15 @@@ QList KFileIt return rolesInfo; } +QList KFileItemModel::extraGroupingInformation() +{ + static QList 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) @@@ -2837,7 -2828,7 +2837,7 @@@ KFileItemModel::ItemGroupInfo KFileItem 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; }