rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Escape accelerators

Browse Source 
(fixes issue #12037)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
This commit is contained in:
Sven Strickroth
2025-11-07 21:36:47 +01:00
committed by Jonathan White
parent fedcbf60c5
commit 44daca921a
6 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/Tools.cpp
View File

@@ -449,6 +449,11 @@ namespace Tools
return userName; return userName;
} }
QString escapeAccelerators(QString string)
{
return string.replace("&", "&&");
}
QVariantMap qo2qvm(const QObject* object, const QStringList& ignoredProperties) QVariantMap qo2qvm(const QObject* object, const QStringList& ignoredProperties)
{ {
QVariantMap result; QVariantMap result;

1
src/core/Tools.h
View File

@@ -49,6 +49,7 @@ namespace Tools
QProcessEnvironment environment = QProcessEnvironment::systemEnvironment()); QProcessEnvironment environment = QProcessEnvironment::systemEnvironment());
QString cleanFilename(QString filename); QString cleanFilename(QString filename);
QString cleanUsername(); QString cleanUsername();
QString escapeAccelerators(QString string);
template <class T> QSet<T> asSet(const QList<T>& a) template <class T> QSet<T> asSet(const QList<T>& a)
{ {

2
src/gui/DatabaseTabWidget.cpp
View File

@@ -674,7 +674,7 @@ void DatabaseTabWidget::updateTabName(int index)
return; return;
} }
index = indexOf(dbWidget); index = indexOf(dbWidget);
setTabText(index, tabName(index)); setTabText(index, Tools::escapeAccelerators(tabName(index)));
setTabToolTip(index, dbWidget->displayFilePath()); setTabToolTip(index, dbWidget->displayFilePath());
auto iconIndex = dbWidget->database()->publicIcon(); auto iconIndex = dbWidget->database()->publicIcon();
if (iconIndex >= 0 && iconIndex < databaseIcons()->count()) { if (iconIndex >= 0 && iconIndex < databaseIcons()->count()) {

3
src/gui/MainWindow.cpp
View File

@@ -38,6 +38,7 @@
#include "autotype/AutoType.h" #include "autotype/AutoType.h"
#include "core/InactivityTimer.h" #include "core/InactivityTimer.h"
#include "core/Resources.h" #include "core/Resources.h"
#include "core/Tools.h"
#include "gui/AboutDialog.h" #include "gui/AboutDialog.h"
#include "gui/ActionCollection.h" #include "gui/ActionCollection.h"
#include "gui/Icons.h" #include "gui/Icons.h"
@@ -789,7 +790,7 @@ void MainWindow::updateLastDatabasesMenu()
const QStringList lastDatabases = config()->get(Config::LastDatabases).toStringList(); const QStringList lastDatabases = config()->get(Config::LastDatabases).toStringList();
for (const QString& database : lastDatabases) { for (const QString& database : lastDatabases) {
QAction* action = m_ui->menuRecentDatabases->addAction(database); QAction* action = m_ui->menuRecentDatabases->addAction(Tools::escapeAccelerators(database));
action->setData(database); action->setData(database);
m_lastDatabasesActions->addAction(action); m_lastDatabasesActions->addAction(action);
} }

11
tests/TestTools.cpp
View File

@@ -451,3 +451,14 @@ void TestTools::testCleanUsername_data()
QTest::newRow("Trailing dots and spaces") << "username... " << "username"; QTest::newRow("Trailing dots and spaces") << "username... " << "username";
QTest::newRow("Combination of issues") << R"( user<>:"/\|?*name... )" << "user_________name"; QTest::newRow("Combination of issues") << R"( user<>:"/\|?*name... )" << "user_________name";
} }
void TestTools::testEscapeAccelerators()
{
QCOMPARE(Tools::escapeAccelerators(""), "");
QCOMPARE(Tools::escapeAccelerators("NoAccelerator"), "NoAccelerator");
QCOMPARE(Tools::escapeAccelerators("&Accelerator"), "&&Accelerator");
QCOMPARE(Tools::escapeAccelerators("Accelerator&"), "Accelerator&&");
QCOMPARE(Tools::escapeAccelerators("Accel&erator&"), "Accel&&erator&&");
QCOMPARE(Tools::escapeAccelerators("Accel&&erator"), "Accel&&&&erator");
QCOMPARE(Tools::escapeAccelerators("Some & text"), "Some && text");
}

1
tests/TestTools.h
View File

@@ -43,6 +43,7 @@ private slots:
void testIsTextMimeType(); void testIsTextMimeType();
void testCleanUsername(); void testCleanUsername();
void testCleanUsername_data(); void testCleanUsername_data();
void testEscapeAccelerators();
}; };
#endif // KEEPASSX_TESTTOOLS_H #endif // KEEPASSX_TESTTOOLS_H