Implemented grouping-related slots to match sorting in some obscure places.

[dolphin.git] / src / views / dolphinviewactionhandler.cpp

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index ccf4ca11942506df1fcf17d20f956a3a64c3b7d3..815b0f63e685c7c525de99fb0bd1a154caf030a7 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -302,18 +302,6 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
     // View -> Group By
     QActionGroup *groupByActionGroup = createFileItemRolesActionGroup(QStringLiteral("group_by_"));
 
-    KToggleAction *groupAsNone = m_actionCollection->add<KToggleAction>(QStringLiteral("group_none"));
-    groupAsNone->setData("none");
-    groupAsNone->setActionGroup(groupByActionGroup);
-    groupAsNone->setText(i18nc("@label", "No grouping"));
-    m_groupByActions.insert("none", groupAsNone);
-
-    KToggleAction *groupAsFollowSort = m_actionCollection->add<KToggleAction>(QStringLiteral("group_followSort"));
-    groupAsFollowSort->setData("followSort");
-    groupAsFollowSort->setActionGroup(groupByActionGroup);
-    groupAsFollowSort->setText(i18nc("@label", "Follow sorting"));
-    m_groupByActions.insert("followSort", groupAsFollowSort);
-
     KActionMenu *groupByActionMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("group"));
     groupByActionMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-group")));
     groupByActionMenu->setText(i18nc("@action:inmenu View", "Group By"));
@@ -416,6 +404,9 @@ QActionGroup *DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt
 #endif
 
     QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
+    if (isGroupGroup) {
+        rolesInfo += KFileItemModel::extraGroupingInformation();
+    }
 
     for (const KFileItemModel::RoleInfo &info : rolesInfo) {
         if (!isSortGroup && !isGroupGroup && info.role == "text") {