From 2eb009455bec2fcdbd394a276ce40b3ff5efc35f Mon Sep 17 00:00:00 2001
From: Jin Liu <m.liu.jin@gmail.com>
Date: Thu, 10 Apr 2025 12:38:20 +0800
Subject: [PATCH] Revert dd07a327 Move "Show in Groups" toggle action into Sort
 menu

Now it's in the first level of the "View Settings" dropdown, no
need to be nested in the "Sort" menu.
---
 src/dolphinpart.rc                     |  3 ++-
 src/dolphinui.rc                       |  1 +
 src/dolphinuiforphones.rc              |  1 +
 src/views/dolphinviewactionhandler.cpp | 12 ++++++------
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc
index 9887e5210..5f57f586a 100644
--- a/src/dolphinpart.rc
+++ b/src/dolphinpart.rc
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui name="dolphinpart" version="17" translationDomain="dolphin">
+<gui name="dolphinpart" version="18" translationDomain="dolphin">
  <MenuBar>
   <Menu name="edit"><text>&amp;Edit</text>
    <Action name="new_menu"/>
@@ -25,6 +25,7 @@
    <Action name="sort" />
    <Action name="additional_info" />
    <Action name="show_preview" />
+   <Action name="show_in_groups" />
    <Action name="show_hidden_files" />
    <Separator/>
    <Action name="view_properties" />
diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 36f4a9dee..e51bf2343 100644
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -46,6 +46,7 @@
             <Action name="view_mode" />
             <Action name="additional_info" />
             <Action name="show_preview" />
+            <Action name="show_in_groups" />
             <Action name="show_hidden_files" />
             <Action name="act_as_admin" />
             <Separator/>
diff --git a/src/dolphinuiforphones.rc b/src/dolphinuiforphones.rc
index e7bf495c5..8cebd635f 100644
--- a/src/dolphinuiforphones.rc
+++ b/src/dolphinuiforphones.rc
@@ -46,6 +46,7 @@
             <Action name="view_mode" />
             <Action name="additional_info" />
             <Action name="show_preview" />
+            <Action name="show_in_groups" />
             <Action name="show_hidden_files" />
             <Action name="act_as_admin" />
             <Separator/>
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index b7c21c8b9..079cd22fd 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -309,17 +309,11 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
         m_currentView->setSortOrder(Qt::DescendingOrder);
     });
 
-    KToggleAction *showInGroups = m_actionCollection->add<KToggleAction>(QStringLiteral("show_in_groups"));
-    showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
-    showInGroups->setWhatsThis(i18nc("@info:whatsthis", "This groups files and folders by their first letter."));
-    connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting);
-
     sortByActionMenu->addAction(ascendingAction);
     sortByActionMenu->addAction(descendingAction);
     sortByActionMenu->addSeparator();
     sortByActionMenu->addAction(sortFoldersFirst);
     sortByActionMenu->addAction(sortHiddenLast);
-    sortByActionMenu->addAction(showInGroups);
 
     // View -> Additional Information
     QActionGroup *visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_"));
@@ -334,6 +328,12 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
         visibleRolesMenu->addAction(action);
     }
 
+    KToggleAction *showInGroups = m_actionCollection->add<KToggleAction>(QStringLiteral("show_in_groups"));
+    showInGroups->setIcon(QIcon::fromTheme(QStringLiteral("view-group")));
+    showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
+    showInGroups->setWhatsThis(i18nc("@info:whatsthis", "This groups files and folders by their first letter."));
+    connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting);
+
     KToggleAction *showHiddenFiles = m_actionCollection->add<KToggleAction>(QStringLiteral("show_hidden_files"));
     showHiddenFiles->setIcon(QIcon::fromTheme(QStringLiteral("view-visible")));
     showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
-- 
2.47.3