From 3967bbc22f7ae50e10dd78d2c94af8646d7b4b66 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 16 May 2022 14:51:24 +0200 Subject: [PATCH] Macros: Fix shortcut display on macOS Some "NativeText" parameters were missing. Change-Id: Id08b8281d1458c05ff302011e32d8babbaf7b2bc Reviewed-by: Christian Stenger --- src/plugins/macros/macromanager.cpp | 13 +++++++++---- src/plugins/macros/macrooptionswidget.cpp | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 1db0b30d275..0b757c41546 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -280,10 +280,15 @@ void MacroManager::startMacro() foreach (IMacroHandler *handler, d->handlers) handler->startRecording(d->currentMacro); - QString endShortcut = Core::ActionManager::command(Constants::END_MACRO)->keySequence().toString(); - QString executeShortcut = Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO)->keySequence().toString(); - QString help = tr("Macro mode. Type \"%1\" to stop recording and \"%2\" to play the macro.") - .arg(endShortcut).arg(executeShortcut); + const QString endShortcut = Core::ActionManager::command(Constants::END_MACRO) + ->keySequence() + .toString(QKeySequence::NativeText); + const QString executeShortcut = Core::ActionManager::command(Constants::EXECUTE_LAST_MACRO) + ->keySequence() + .toString(QKeySequence::NativeText); + const QString help + = tr("Macro mode. Type \"%1\" to stop recording and \"%2\" to play the macro.") + .arg(endShortcut, executeShortcut); Core::EditorManager::showEditorStatusBar(Constants::M_STATUS_BUFFER, help, tr("Stop Recording Macro"), this, [this] { endMacro(); }); diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 9bade1fea56..0408dd9377b 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -96,8 +96,10 @@ void MacroOptionsWidget::createTable() Core::Command *command = Core::ActionManager::command(base.withSuffix(macro->displayName())); - if (command && command->action()) - macroItem->setText(2, command->action()->shortcut().toString()); + if (command && command->action()) { + macroItem->setText(2, + command->action()->shortcut().toString(QKeySequence::NativeText)); + } } } }