mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-03 20:47:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow configuring keyboard shortcuts (#9643)

Browse source 
Closes #2689

The design of the respective code is loosely based on KDE's KActionCollection. The ActionCollection manages all actions that can be shortcut configured. These actions are then exposed in the config and a user can assign a different shortcut.

Actions inside the MainWindow have been added to the ActionCollection.

---------

Co-authored-by: Jonathan White <support@dmapps.us>
This commit is contained in:
Waqar Ahmed 2024-02-04 16:29:04 +05:00 • committed by GitHub
parent d03f5e4977
commit a472ef8a93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 1238 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tests/gui/TestGui.cpp
View file

@ -33,6 +33,7 @@
#include "config-keepassx-tests.h"
#include "core/Tools.h"
#include "crypto/Crypto.h"
#include "gui/ActionCollection.h"
#include "gui/ApplicationSettingsWidget.h"
#include "gui/CategoryListWidget.h"
#include "gui/CloneDialog.h"
@ -43,6 +44,7 @@
#include "gui/PasswordGeneratorWidget.h"
#include "gui/PasswordWidget.h"
#include "gui/SearchWidget.h"
#include "gui/ShortcutSettingsPage.h"
#include "gui/TotpDialog.h"
#include "gui/TotpSetupDialog.h"
#include "gui/databasekey/KeyFileEditWidget.h"
@ -1851,6 +1853,52 @@ void TestGui::testTrayRestoreHide()
#endif
}
void TestGui::testShortcutConfig()
{
// Action collection should not be empty
QVERIFY(!ActionCollection::instance()->actions().isEmpty());
// Add an action, make sure it gets added
QAction* a = new QAction(ActionCollection::instance());
a->setObjectName("MyAction1");
ActionCollection::instance()->addAction(a);
QVERIFY(ActionCollection::instance()->actions().contains(a));
const QKeySequence seq(Qt::CTRL + Qt::SHIFT + Qt::ALT + Qt::Key_N);
ActionCollection::instance()->setDefaultShortcut(a, seq);
QCOMPARE(ActionCollection::instance()->defaultShortcut(a), seq);
bool v = false;
m_mainWindow->addAction(a);
connect(a, &QAction::triggered, ActionCollection::instance(), [&v] { v = !v; });
QTest::keyClick(m_mainWindow.data(), Qt::Key_N, Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier);
QVERIFY(v);
// Change shortcut and save
const QKeySequence newSeq(Qt::CTRL + Qt::SHIFT + Qt::ALT + Qt::Key_M);
a->setShortcut(newSeq);
QVERIFY(a->shortcut() != ActionCollection::instance()->defaultShortcut(a));
ActionCollection::instance()->saveShortcuts();
QCOMPARE(a->shortcut(), newSeq);
const auto shortcuts = Config::instance()->getShortcuts();
Config::ShortcutEntry entryForA;
for (const auto& s : shortcuts) {
if (s.name == a->objectName()) {
entryForA = s;
break;
}
}
QCOMPARE(entryForA.name, a->objectName());
QCOMPARE(QKeySequence::fromString(entryForA.shortcut), a->shortcut());
// trigger the old shortcut
QTest::keyClick(m_mainWindow.data(), Qt::Key_N, Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier);
QVERIFY(v); // value of v should not change
QTest::keyClick(m_mainWindow.data(), Qt::Key_M, Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier);
QVERIFY(!v);
disconnect(a, nullptr, nullptr, nullptr);
}
void TestGui::testAutoType()
{
// Clear entries from root group to guarantee order

1
tests/gui/TestGui.h
View file

@ -67,6 +67,7 @@ private slots:
void testSortGroups();
void testAutoType();
void testTrayRestoreHide();
void testShortcutConfig();
private:
void addCannedEntries();