prehistoric-systems/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-03-11 08:54:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move "Show subgroup entries" option from Settings to View menu

Browse source
This commit is contained in:
Juzu-O 2025-10-05 11:46:34 +03:00 committed by Jonathan White
parent a299e5796a
commit 8159e7a43c
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
5 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
share/translations/keepassxc_en.ts
View file

@ -5963,6 +5963,10 @@ Are you sure you want to continue with this file?</source>
<source>Show Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Entries of Subgroups</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Preview Panel</source>
<translation type="unfinished"></translation>
@ -6316,6 +6320,10 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
<source>Toggle Show Toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Toggle Show Entries of Subgroups</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Toggle Show Preview Panel</source>
<translation type="unfinished"></translation>

2
src/gui/ApplicationSettingsWidget.cpp
View file

@ -218,7 +218,6 @@ 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());
@ -395,7 +394,6 @@ 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());

8
src/gui/ApplicationSettingsWidgetGeneral.ui
View file

@ -573,13 +573,6 @@
</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">
@ -1448,7 +1441,6 @@
<tabstop>EnableCopyOnDoubleClickCheckBox</tabstop>
<tabstop>openUrlOnDoubleClick</tabstop>
<tabstop>useGroupIconOnEntryCreationCheckBox</tabstop>
<tabstop>showSubgroupEntriesCheckBox</tabstop>
<tabstop>minimizeOnOpenUrlCheckBox</tabstop>
<tabstop>hideWindowOnCopyCheckBox</tabstop>
<tabstop>minimizeOnCopyRadioButton</tabstop>

5
src/gui/MainWindow.cpp
View file

@ -2045,6 +2045,11 @@ void MainWindow::initViewMenu()
applySettingsChanges();
});
m_ui->actionShowEntriesOfSubgroups->setChecked(config()->get(Config::GUI_ShowSubgroupEntries).toBool());
connect(m_ui->actionShowEntriesOfSubgroups, &QAction::toggled, this, [](bool checked) {
config()->set(Config::GUI_ShowSubgroupEntries, checked);
});
m_ui->actionShowGroupPanel->setChecked(!config()->get(Config::GUI_HideGroupPanel).toBool());
connect(m_ui->actionShowGroupPanel, &QAction::toggled, this, [](bool checked) {
config()->set(Config::GUI_HideGroupPanel, !checked);

13
src/gui/MainWindow.ui
View file

@ -399,6 +399,8 @@
<addaction name="actionShowMenubar"/>
<addaction name="actionShowToolbar"/>
<addaction name="separator"/>
<addaction name="actionShowEntriesOfSubgroups"/>
<addaction name="separator"/>
<addaction name="actionHideUsernames"/>
<addaction name="actionHidePasswords"/>
</widget>
@ -1244,6 +1246,17 @@
<string notr="true">Ctrl+Shift+A</string>
</property>
</action>
<action name="actionShowEntriesOfSubgroups">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Show Entries of Subgroups</string>
</property>
<property name="toolTip">
<string>Toggle Show Entries of Subgroups</string>
</property>
</action>
<action name="actionHideUsernames">
<property name="checkable">
<bool>true</bool>