kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix and add menu accelerators (#15532)

Browse Source 
* Fix and add menu accelerators: menus common to all workbenches

I use menu accelerators fairly often, so I find it very frustrating when
they are missing, or worse, they don't work due to the same letter being
assigned to several commands.

This patch adds accelerators to lots of menu entries missing them and
fixes broken accelerators.

Wherever possible, standard accelerator keys are used:
https://doc.qt.io/qt-5/accelerators.html

This commit covers accelerator fixes that are common to all workbenches.
Accelerator fixes for specific workbenches will be done in separate
commits.

* Add missing accelerators: Spreadsheet workbench
This commit is contained in:
Snow Faerie
2024-12-13 17:39:30 +01:00
committed by GitHub
parent 9a7063395a
commit 8bc062b6e8
17 changed files with 198 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Gui/Action.cpp
View File

@@ -848,6 +848,25 @@ void RecentFilesAction::appendFile(const QString& filename)
_pimpl->trySaveUserParameter();
}
static QString numberToLabel(int number) {
if (number > 0 && number < 10) { // NOLINT: *-magic-numbers
return QString::fromLatin1("&%1").arg(number);
}
if (number == 10) { // NOLINT: *-magic-numbers
return QString::fromLatin1("1&0");
}
// If we have a number greater than 10, we start using the alphabet.
// So 11 becomes 'A' and so on.
constexpr char lettersStart = 11;
constexpr char lettersEnd = lettersStart + ('Z' - 'A');
if (number >= lettersStart && number < lettersEnd) {
QChar letter = QChar::fromLatin1('A' + (number - lettersStart));
return QString::fromLatin1("%1 (&%2)").arg(number).arg(letter);
}
// Not enough accelerators to cover this number.
return QString::fromLatin1("%1").arg(number);
}
/**
* Set the list of recent files. For each item an action object is
* created and added to this action group.
@@ -858,8 +877,9 @@ void RecentFilesAction::setFiles(const QStringList& files)
int numRecentFiles = std::min<int>(recentFiles.count(), files.count());
for (int index = 0; index < numRecentFiles; index++) {
QString numberLabel = numberToLabel(index + 1);
QFileInfo fi(files[index]);
recentFiles[index]->setText(QString::fromLatin1("%1 %2").arg(index+1).arg(fi.fileName()));
recentFiles[index]->setText(QString::fromLatin1("%1 %2").arg(numberLabel).arg(fi.fileName()));
recentFiles[index]->setStatusTip(tr("Open file %1").arg(files[index]));
recentFiles[index]->setToolTip(files[index]); // set the full name that we need later for saving
recentFiles[index]->setData(QVariant(index));
@@ -1020,7 +1040,8 @@ void RecentMacrosAction::setFiles(const QStringList& files)
auto accel_col = QString::fromStdString(shortcut_modifiers);
for (int index = 0; index < numRecentFiles; index++) {
QFileInfo fi(files[index]);
recentFiles[index]->setText(QString::fromLatin1("%1 %2").arg(index+1).arg(fi.completeBaseName()));
QString numberLabel = numberToLabel(index + 1);
recentFiles[index]->setText(QString::fromLatin1("%1 %2").arg(numberLabel).arg(fi.completeBaseName()));
recentFiles[index]->setToolTip(files[index]); // set the full name that we need later for saving
recentFiles[index]->setData(QVariant(index));
QString accel(tr("none"));