From 94ddcde7f2465b2b400d26bea59ae81188b2ee6c Mon Sep 17 00:00:00 2001 From: 0penBrain <48731257+0penBrain@users.noreply.github.com> Date: Tue, 25 Jan 2022 15:14:30 +0100 Subject: [PATCH] [RecentMacros] Fix shortcut display in status bar --- src/Gui/Action.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp index a30b67fa91..9e31fcc54d 100644 --- a/src/Gui/Action.cpp +++ b/src/Gui/Action.cpp @@ -916,15 +916,16 @@ void RecentMacrosAction::setFiles(const QStringList& files) int numRecentFiles = std::min(recentFiles.count(), files.count()); for (int index = 0; index < numRecentFiles; index++) { QFileInfo fi(files[index]); - QString accel = QString::fromStdString(shortcut_modifiers); - accel.append(QString::number(index+1,10)).toStdString(); recentFiles[index]->setText(QString::fromLatin1("%1 %2").arg(index+1).arg(fi.baseName())); - recentFiles[index]->setStatusTip(tr("Run macro %1 (Shift+click to edit) shortcut: %2").arg(files[index]).arg(accel)); recentFiles[index]->setToolTip(files[index]); // set the full name that we need later for saving recentFiles[index]->setData(QVariant(index)); + QString accel(tr("none")); if (index < shortcut_count){ + accel = QString::fromStdString(shortcut_modifiers); + accel.append(QString::number(index+1,10)).toStdString(); recentFiles[index]->setShortcut(accel); } + recentFiles[index]->setStatusTip(tr("Run macro %1 (Shift+click to edit) shortcut: %2").arg(files[index]).arg(accel)); recentFiles[index]->setVisible(true); }