Reverted resortAllItems() in favor of a group comparator for lessThan. Minor bug...

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

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 7a3c758a57890e8f6a433f38134829163f1ffc07..7454ed0b947f2979483d052da5a7a4a122c1ae08 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -278,17 +278,17 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
 
     sortByActionMenu->addSeparator();
 
 
     sortByActionMenu->addSeparator();
 

-    QActionGroup *group = new QActionGroup(sortByActionMenu);
-    group->setExclusive(true);
+    QActionGroup *groupForSort = new QActionGroup(sortByActionMenu);
+    groupForSort->setExclusive(true);

 
     KToggleAction *sortAscendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("sort_ascending"));
 
     KToggleAction *sortAscendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("sort_ascending"));

-    sortAscendingAction->setActionGroup(group);
+    sortAscendingAction->setActionGroup(groupForSort);

     connect(sortAscendingAction, &QAction::triggered, this, [this] {
         m_currentView->setSortOrder(Qt::AscendingOrder);
     });
 
     KToggleAction *sortDescendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("sort_descending"));
     connect(sortAscendingAction, &QAction::triggered, this, [this] {
         m_currentView->setSortOrder(Qt::AscendingOrder);
     });
 
     KToggleAction *sortDescendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("sort_descending"));

-    sortDescendingAction->setActionGroup(group);
+    sortDescendingAction->setActionGroup(groupForSort);

     connect(sortDescendingAction, &QAction::triggered, this, [this] {
         m_currentView->setSortOrder(Qt::DescendingOrder);
     });
     connect(sortDescendingAction, &QAction::triggered, this, [this] {
         m_currentView->setSortOrder(Qt::DescendingOrder);
     });


@@ -314,14 +314,17 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
 
     groupByActionMenu->addSeparator();
 
 
     groupByActionMenu->addSeparator();
 

+    QActionGroup *groupForGroup = new QActionGroup(groupByActionMenu);
+    groupForGroup->setExclusive(true);
+

     KToggleAction *groupAscendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("group_ascending"));
     KToggleAction *groupAscendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("group_ascending"));

-    groupAscendingAction->setActionGroup(group);
+    groupAscendingAction->setActionGroup(groupForGroup);

     connect(groupAscendingAction, &QAction::triggered, this, [this] {
         m_currentView->setGroupOrder(Qt::AscendingOrder);
     });
 
     KToggleAction *groupDescendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("group_descending"));
     connect(groupAscendingAction, &QAction::triggered, this, [this] {
         m_currentView->setGroupOrder(Qt::AscendingOrder);
     });
 
     KToggleAction *groupDescendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("group_descending"));

-    groupDescendingAction->setActionGroup(group);
+    groupDescendingAction->setActionGroup(groupForGroup);

     connect(groupDescendingAction, &QAction::triggered, this, [this] {
         m_currentView->setGroupOrder(Qt::DescendingOrder);
     });
     connect(groupDescendingAction, &QAction::triggered, this, [this] {
         m_currentView->setGroupOrder(Qt::DescendingOrder);
     });


@@ -605,9 +608,9 @@ void DolphinViewActionHandler::slotGroupOrderChanged(Qt::SortOrder order)
 {
     QAction *descending = m_actionCollection->action(QStringLiteral("group_descending"));
     QAction *ascending = m_actionCollection->action(QStringLiteral("group_ascending"));
 {
     QAction *descending = m_actionCollection->action(QStringLiteral("group_descending"));
     QAction *ascending = m_actionCollection->action(QStringLiteral("group_ascending"));

-    const bool sortDescending = (order == Qt::DescendingOrder);
-    descending->setChecked(sortDescending);
-    ascending->setChecked(!sortDescending);
+    const bool groupDescending = (order == Qt::DescendingOrder);
+    descending->setChecked(groupDescending);
+    ascending->setChecked(!groupDescending);

 }
 
 void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst)
 }
 
 void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst)


@@ -836,7 +839,7 @@ void DolphinViewActionHandler::slotGroupTriggered(QAction *action)
     // actions and the sub-menu-actions. If an action gets checked, it must
     // be assured that all other actions get unchecked, except the ascending/
     // descending actions
     // actions and the sub-menu-actions. If an action gets checked, it must
     // be assured that all other actions get unchecked, except the ascending/
     // descending actions

-    for (QAction *groupAction : std::as_const(m_sortByActions)) {
+    for (QAction *groupAction : std::as_const(m_groupByActions)) {

         KActionMenu *actionMenu = qobject_cast<KActionMenu *>(groupAction);
         if (actionMenu) {
             const auto actions = actionMenu->menu()->actions();
         KActionMenu *actionMenu = qobject_cast<KActionMenu *>(groupAction);
         if (actionMenu) {
             const auto actions = actionMenu->menu()->actions();