Add Show Subgroup Entries feature

Copilot · juzu-o · juzu-o · commit bc2337311f9b · 2025-08-29T12:28:47.000+03:00
Co-authored-by: juzu-o &lt;3142026+juzu-o@users.noreply.github.com&gt;
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
@@ -577,6 +577,10 @@
         <source>Skip confirmation for main window Auto-Type actions</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show subgroup entries in entry list view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ApplicationSettingsWidgetSecurity</name>
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
@@ -119,6 +119,7 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
     {Config::GUI_CheckForUpdatesIncludeBetas, {QS("GUI/CheckForUpdatesIncludeBetas"), Roaming, false}},
     {Config::GUI_ShowExpiredEntriesOnDatabaseUnlock, {QS("GUI/ShowExpiredEntriesOnDatabaseUnlock"), Roaming, true}},
     {Config::GUI_ShowExpiredEntriesOnDatabaseUnlockOffsetDays, {QS("GUI/ShowExpiredEntriesOnDatabaseUnlockOffsetDays"), Roaming, 3}},
+    {Config::GUI_ShowSubgroupEntries, {QS("GUI/ShowSubgroupEntries"), Roaming, false}},
     {Config::GUI_FontSizeOffset, {QS("GUI/FontSizeOffset"), Local, 0}},
 
     {Config::GUI_MainWindowGeometry, {QS("GUI/MainWindowGeometry"), Local, {}}},
diff --git a/src/core/Config.h b/src/core/Config.h
@@ -101,6 +101,7 @@ class Config : public QObject
         SearchWaitForEnter,
         GUI_ShowExpiredEntriesOnDatabaseUnlock,
         GUI_ShowExpiredEntriesOnDatabaseUnlockOffsetDays,
+        GUI_ShowSubgroupEntries,
         GUI_FontSizeOffset,
 
         GUI_MainWindowGeometry,
diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
@@ -214,6 +214,7 @@ void ApplicationSettingsWidget::loadSettings()
     m_generalUi->dropToBackgroundOnCopyRadioButton->setChecked(config()->get(Config::DropToBackgroundOnCopy).toBool());
     m_generalUi->useGroupIconOnEntryCreationCheckBox->setChecked(
         config()->get(Config::UseGroupIconOnEntryCreation).toBool());
+    m_generalUi->showSubgroupEntriesCheckBox->setChecked(config()->get(Config::GUI_ShowSubgroupEntries).toBool());
     m_generalUi->autoTypeEntryTitleMatchCheckBox->setChecked(config()->get(Config::AutoTypeEntryTitleMatch).toBool());
     m_generalUi->autoTypeEntryURLMatchCheckBox->setChecked(config()->get(Config::AutoTypeEntryURLMatch).toBool());
     m_generalUi->autoTypeHideExpiredEntryCheckBox->setChecked(config()->get(Config::AutoTypeHideExpiredEntry).toBool());
@@ -388,6 +389,7 @@ void ApplicationSettingsWidget::saveSettings()
     config()->set(Config::MinimizeOnCopy, m_generalUi->minimizeOnCopyRadioButton->isChecked());
     config()->set(Config::DropToBackgroundOnCopy, m_generalUi->dropToBackgroundOnCopyRadioButton->isChecked());
     config()->set(Config::UseGroupIconOnEntryCreation, m_generalUi->useGroupIconOnEntryCreationCheckBox->isChecked());
+    config()->set(Config::GUI_ShowSubgroupEntries, m_generalUi->showSubgroupEntriesCheckBox->isChecked());
     config()->set(Config::AutoTypeEntryTitleMatch, m_generalUi->autoTypeEntryTitleMatchCheckBox->isChecked());
     config()->set(Config::AutoTypeEntryURLMatch, m_generalUi->autoTypeEntryURLMatchCheckBox->isChecked());
     config()->set(Config::AutoTypeHideExpiredEntry, m_generalUi->autoTypeHideExpiredEntryCheckBox->isChecked());
diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui
@@ -566,6 +566,13 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QCheckBox" name="showSubgroupEntriesCheckBox">
+                <property name="text">
+                 <string>Show subgroup entries in entry list view</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QCheckBox" name="minimizeOnOpenUrlCheckBox">
                 <property name="text">
@@ -1431,6 +1438,7 @@
   <tabstop>EnableCopyOnDoubleClickCheckBox</tabstop>
   <tabstop>openUrlOnDoubleClick</tabstop>
   <tabstop>useGroupIconOnEntryCreationCheckBox</tabstop>
+  <tabstop>showSubgroupEntriesCheckBox</tabstop>
   <tabstop>minimizeOnOpenUrlCheckBox</tabstop>
   <tabstop>hideWindowOnCopyCheckBox</tabstop>
   <tabstop>minimizeOnCopyRadioButton</tabstop>
diff --git a/src/gui/entry/EntryModel.cpp b/src/gui/entry/EntryModel.cpp
@@ -68,7 +68,13 @@ void EntryModel::setGroup(Group* group)
 
     m_group = group;
     m_allGroups.clear();
-    m_entries = group->entries();
+
+    // Check if we should show subgroup entries
+    if (config()->get(Config::GUI_ShowSubgroupEntries).toBool()) {
+        m_entries = group->entriesRecursive();
+    } else {
+        m_entries = group->entries();
+    }
     m_orgEntries.clear();
 
     makeConnections(group);
@@ -607,6 +613,12 @@ void EntryModel::onConfigChanged(Config::ConfigKey key)
     case Config::GUI_HidePasswords:
         emit dataChanged(index(0, Password), index(rowCount() - 1, Password), {Qt::DisplayRole});
         break;
+    case Config::GUI_ShowSubgroupEntries:
+        // Refresh the entry list when the subgroup setting changes
+        if (m_group) {
+            setGroup(m_group);
+        }
+        break;
     default:
         break;
     }
diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp
@@ -33,6 +33,8 @@
 #include "gui/Icons.h"
 #include "gui/SortFilterHideProxyModel.h"
 
+#include "core/Config.h"
+
 #define ICON_ONLY_SECTION_SIZE 26
 
 class PasswordStrengthItemDelegate : public QStyledItemDelegate
@@ -94,6 +96,9 @@ EntryView::EntryView(QWidget* parent)
         emit entrySelectionChanged(currentEntry());
     });
 
+    // Listen for config changes to update Group column visibility
+    connect(config(), &Config::changed, this, &EntryView::onConfigChanged);
+
     new QShortcut(Qt::CTRL + Qt::Key_F10, this, SLOT(contextMenuShortcutPressed()), nullptr, Qt::WidgetShortcut);
 
     resetViewToDefaults();
@@ -209,7 +214,16 @@ void EntryView::focusInEvent(QFocusEvent* event)
 void EntryView::displayGroup(Group* group)
 {
     m_model->setGroup(group);
-    header()->hideSection(EntryModel::ParentGroup);
+
+    // Show Group column when subgroup entries are enabled, since entries from different groups will be shown
+    // But respect user's preference if they've manually hidden it
+    if (config()->get(Config::GUI_ShowSubgroupEntries).toBool() && !m_userHidGroupColumnInSubgroupMode) {
+        header()->showSection(EntryModel::ParentGroup);
+    } else if (!config()->get(Config::GUI_ShowSubgroupEntries).toBool()) {
+        header()->hideSection(EntryModel::ParentGroup);
+    }
+    // If user has hidden the column in subgroup mode, don't force it to show
+
     setFirstEntryActive();
     m_inSearchMode = false;
 }
@@ -355,7 +369,8 @@ void EntryView::showHeaderMenu(const QPoint& position)
         int columnIndex = action->data().toInt();
         action->setChecked(!isColumnHidden(columnIndex));
     }
-    actions[EntryModel::ParentGroup]->setVisible(inSearchMode());
+    actions[EntryModel::ParentGroup]->setVisible(inSearchMode()
+                                                 || config()->get(Config::GUI_ShowSubgroupEntries).toBool());
 
     m_headerMenu->popup(mapToGlobal(position));
 }
@@ -385,11 +400,21 @@ void EntryView::toggleColumnVisibility(QAction* action)
         if (header()->sectionSize(columnIndex) == 0) {
             header()->resizeSection(columnIndex, header()->defaultSectionSize());
         }
+        // Reset flag when user manually shows Group column
+        if (columnIndex == EntryModel::ParentGroup && !m_inSearchMode
+            && config()->get(Config::GUI_ShowSubgroupEntries).toBool()) {
+            m_userHidGroupColumnInSubgroupMode = false;
+        }
         resetFixedColumns();
         return;
     }
     if ((header()->count() - header()->hiddenSectionCount()) > 1) {
         header()->hideSection(columnIndex);
+        // Track when user manually hides Group column while subgroup entries is enabled
+        if (columnIndex == EntryModel::ParentGroup && !m_inSearchMode
+            && config()->get(Config::GUI_ShowSubgroupEntries).toBool()) {
+            m_userHidGroupColumnInSubgroupMode = true;
+        }
         return;
     }
     action->setChecked(true);
@@ -461,7 +486,8 @@ void EntryView::resetFixedColumns()
 void EntryView::resetViewToDefaults()
 {
     // Reduce number of columns that are shown by default
-    if (m_inSearchMode) {
+    if (m_inSearchMode
+        || (config()->get(Config::GUI_ShowSubgroupEntries).toBool() && !m_userHidGroupColumnInSubgroupMode)) {
         header()->showSection(EntryModel::ParentGroup);
     } else {
         header()->hideSection(EntryModel::ParentGroup);
@@ -595,3 +621,19 @@ bool EntryView::isColumnHidden(int logicalIndex)
 {
     return header()->isSectionHidden(logicalIndex) || header()->sectionSize(logicalIndex) == 0;
 }
+
+void EntryView::onConfigChanged(Config::ConfigKey key)
+{
+    if (key == Config::GUI_ShowSubgroupEntries && !m_inSearchMode) {
+        // Reset user preference when setting is toggled - this allows the
+        // Group column to auto-appear when re-enabling the feature
+        m_userHidGroupColumnInSubgroupMode = false;
+
+        // Update Group column visibility when subgroup entries setting changes
+        if (config()->get(Config::GUI_ShowSubgroupEntries).toBool()) {
+            header()->showSection(EntryModel::ParentGroup);
+        } else {
+            header()->hideSection(EntryModel::ParentGroup);
+        }
+    }
+}
diff --git a/src/gui/entry/EntryView.h b/src/gui/entry/EntryView.h
@@ -21,6 +21,7 @@
 
 #include <QTreeView>
 
+#include "core/Config.h"
 #include "gui/entry/EntryModel.h"
 
 class Entry;
@@ -72,6 +73,7 @@ private slots:
     void resetViewToDefaults();
     void contextMenuShortcutPressed();
     void sortIndicatorChanged(int logicalIndex, Qt::SortOrder order);
+    void onConfigChanged(Config::ConfigKey key);
 
 private:
     void resetFixedColumns();
@@ -84,6 +86,7 @@ private slots:
     Qt::SortOrder m_lastOrder;
     bool m_inSearchMode = false;
     bool m_columnsNeedRelayout = true;
+    bool m_userHidGroupColumnInSubgroupMode = false;
 
     QMenu* m_headerMenu;
     QActionGroup* m_columnActions;
