Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-03-03 03:39:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remember sort order in Autotype popup dialog

Browse Source 
Fixes #1684.
This commit is contained in:
Martin van Zijl 2023-06-02 05:42:25 +12:00 committed by Jonathan White
parent 9de623120b
commit 6494cdbb4c
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/autotype/AutoTypeSelectDialog.cpp
View File

@ -85,6 +85,10 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
connect(m_ui->action, &QToolButton::clicked, this, &AutoTypeSelectDialog::activateCurrentMatch); connect(m_ui->action, &QToolButton::clicked, this, &AutoTypeSelectDialog::activateCurrentMatch);
connect(m_ui->cancelButton, SIGNAL(clicked()), SLOT(reject())); connect(m_ui->cancelButton, SIGNAL(clicked()), SLOT(reject()));
auto sortColumn = config()->get(Config::AutoTypeDialogSortColumn).toInt();
auto sortOrder = config()->get(Config::AutoTypeDialogSortOrder).toInt();
m_ui->view->sortByColumn(sortColumn, sortOrder == 0 ? Qt::AscendingOrder : Qt::DescendingOrder);
} }
// Required for QScopedPointer // Required for QScopedPointer
@ -397,6 +401,8 @@ void AutoTypeSelectDialog::showEvent(QShowEvent* event)
void AutoTypeSelectDialog::hideEvent(QHideEvent* event) void AutoTypeSelectDialog::hideEvent(QHideEvent* event)
{ {
config()->set(Config::GUI_AutoTypeSelectDialogSize, size()); config()->set(Config::GUI_AutoTypeSelectDialogSize, size());
config()->set(Config::AutoTypeDialogSortColumn, m_ui->view->horizontalHeader()->sortIndicatorSection());
config()->set(Config::AutoTypeDialogSortOrder, m_ui->view->horizontalHeader()->sortIndicatorOrder());
if (!m_accepted) { if (!m_accepted) {
emit rejected(); emit rejected();
} }

2
src/core/Config.cpp
View File

@ -77,6 +77,8 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
{Config::AutoTypeDelay,{QS("AutoTypeDelay"), Roaming, 25}}, {Config::AutoTypeDelay,{QS("AutoTypeDelay"), Roaming, 25}},
{Config::AutoTypeStartDelay,{QS("AutoTypeStartDelay"), Roaming, 500}}, {Config::AutoTypeStartDelay,{QS("AutoTypeStartDelay"), Roaming, 500}},
{Config::AutoTypeHideExpiredEntry,{QS("AutoTypeHideExpiredEntry"), Roaming, false}}, {Config::AutoTypeHideExpiredEntry,{QS("AutoTypeHideExpiredEntry"), Roaming, false}},
{Config::AutoTypeDialogSortColumn,{QS("AutoTypeDialogSortColumn"), Roaming, 0}},
{Config::AutoTypeDialogSortOrder,{QS("AutoTypeDialogSortOrder"), Roaming, Qt::AscendingOrder}},
{Config::GlobalAutoTypeKey,{QS("GlobalAutoTypeKey"), Roaming, 0}}, {Config::GlobalAutoTypeKey,{QS("GlobalAutoTypeKey"), Roaming, 0}},
{Config::GlobalAutoTypeModifiers,{QS("GlobalAutoTypeModifiers"), Roaming, 0}}, {Config::GlobalAutoTypeModifiers,{QS("GlobalAutoTypeModifiers"), Roaming, 0}},
{Config::GlobalAutoTypeRetypeTime,{QS("GlobalAutoTypeRetypeTime"), Roaming, 15}}, {Config::GlobalAutoTypeRetypeTime,{QS("GlobalAutoTypeRetypeTime"), Roaming, 15}},

2
src/core/Config.h
View File

@ -60,6 +60,8 @@ public:
AutoTypeDelay, AutoTypeDelay,
AutoTypeStartDelay, AutoTypeStartDelay,
AutoTypeHideExpiredEntry, AutoTypeHideExpiredEntry,
AutoTypeDialogSortColumn,
AutoTypeDialogSortOrder,
GlobalAutoTypeKey, GlobalAutoTypeKey,
GlobalAutoTypeModifiers, GlobalAutoTypeModifiers,
GlobalAutoTypeRetypeTime, GlobalAutoTypeRetypeTime,