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.

diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc
index 9887e5210ce016c73d6c1b8bf5c38c1167c09f21..5f57f586ab568a79d89bfcc5873331fe99aa1975 100644 (file)
--- 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 36f4a9dee1014c777a1e1108501e9fa2a555d3d5..e51bf23432c655f5e2a948b1523846a61da619bf 100644 (file)
--- 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 e7bf495c5f7c20d1629f9a5a669b013395b17836..8cebd635f285243c255b2f9b1b515e951fb8d67d 100644 (file)
--- 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 b7c21c8b960f0b9d78a5499de6407d98b9304fff..079cd22fd600a9e602053ec00b4bbe24180b8e86 100644 (file)
--- 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"));