From efcfdf171d360e7604dbac0fe6e574390e369d8c Mon Sep 17 00:00:00 2001 From: Max Paperno Date: Wed, 25 Jan 2017 19:02:35 -0500 Subject: [PATCH] [Simulator] Fix keymap help text (closes #4289). --- companion/src/simulation/simulatordialog.cpp | 4 ++-- companion/src/simulation/simulatordialog.ui | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp index be04db15d..379785f8d 100644 --- a/companion/src/simulation/simulatordialog.cpp +++ b/companion/src/simulation/simulatordialog.cpp @@ -424,7 +424,7 @@ void SimulatorDialog::setupUi() #endif if (firmware->getCapability(Capability(SportTelemetry))) - keymapHelp.append(keymapHelp_t(ui->btn_telemSim->shortcut().toString(QKeySequence::NativeText), ui->btn_luaReload->statusTip())); + keymapHelp.append(keymapHelp_t(ui->btn_telemSim->shortcut().toString(QKeySequence::NativeText), ui->btn_telemSim->statusTip())); else ui->btn_telemSim->hide(); @@ -432,7 +432,7 @@ void SimulatorDialog::setupUi() keymapHelp.append(keymapHelp_t(ui->btn_debugConsole->shortcut().toString(QKeySequence::NativeText), ui->btn_debugConsole->statusTip())); if (!firmware->getCapability(Capability(LuaInputsPerScript))) // hackish! but using "LuaScripts" checks for id "lua" in fw. - keymapHelp.append(keymapHelp_t(ui->btn_luaReload->shortcut().toString(QKeySequence::NativeText), ui->btn_telemSim->statusTip())); + keymapHelp.append(keymapHelp_t(ui->btn_luaReload->shortcut().toString(QKeySequence::NativeText), ui->btn_luaReload->statusTip())); else ui->btn_luaReload->hide(); diff --git a/companion/src/simulation/simulatordialog.ui b/companion/src/simulation/simulatordialog.ui index 022cb5f48..9b1d48e9c 100644 --- a/companion/src/simulation/simulatordialog.ui +++ b/companion/src/simulation/simulatordialog.ui @@ -259,7 +259,7 @@ Open the Joystick Settings window (F3) - Telemetry Simulator + Joystick Configuration Joystick Config.