aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-05-16 14:51:24 +0200
committerEike Ziller <eike.ziller@qt.io>2022-05-17 11:56:52 +0000
commit3967bbc22f7ae50e10dd78d2c94af8646d7b4b66 (patch)
tree8fae91fa3524350544d5c82f5ab02611001e5f45
parentcf5588924c8265aa0823d94dfd9ef79f6afe2917 (diff)
Macros: Fix shortcut display on macOS
Some "NativeText" parameters were missing. Change-Id: Id08b8281d1458c05ff302011e32d8babbaf7b2bc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/macros/macromanager.cpp13
-rw-r--r--src/plugins/macros/macrooptionswidget.cpp6
2 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 1db0b30d27..0b757c4154 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 9bade1fea5..0408dd9377 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));
+ }
}
}
}