From 6e706c4b1cc9d7568181bda22e08bdd52ba0f773 Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 11 Sep 2024 16:24:40 +1000 Subject: [PATCH] feat(color): show global variable names in UI (#5526) --- radio/src/gui/colorlcd/model/model_gvars.cpp | 4 ++-- radio/src/gui/colorlcd/model/special_functions.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/model/model_gvars.cpp b/radio/src/gui/colorlcd/model/model_gvars.cpp index ce9c5c2ae..817514431 100644 --- a/radio/src/gui/colorlcd/model/model_gvars.cpp +++ b/radio/src/gui/colorlcd/model/model_gvars.cpp @@ -334,7 +334,7 @@ class GVarEditWindow : public Page refreshTitle = false; lastFlightMode = curFM; lastGVar = fmData->gvars[index]; - sprintf(label, "%s%d=", STR_GV, index + 1); + sprintf(label, "%s=", getSourceString(index + MIXSRC_FIRST_GVAR)); if (lastGVar > GVAR_MAX) { uint8_t fm = lastGVar - GVAR_MAX - 1; if (fm >= curFM) fm++; @@ -425,7 +425,7 @@ class GVarEditWindow : public Page new StaticText(line, rect_t{}, STR_NAME); grid.nextCell(); - new ModelTextEdit(line, rect_t{}, gvar->name, LEN_GVAR_NAME); + new ModelTextEdit(line, rect_t{}, gvar->name, LEN_GVAR_NAME, [=]() { refreshTitle = true; }); line = window->newLine(grid); diff --git a/radio/src/gui/colorlcd/model/special_functions.cpp b/radio/src/gui/colorlcd/model/special_functions.cpp index 84651a220..2504865f5 100644 --- a/radio/src/gui/colorlcd/model/special_functions.cpp +++ b/radio/src/gui/colorlcd/model/special_functions.cpp @@ -511,7 +511,7 @@ void FunctionEditPage::updateSpecialFunctionOneWindow() auto gvarchoice = new Choice(line, rect_t{}, 0, MAX_GVARS - 1, GET_SET_DEFAULT(CFN_GVAR_INDEX(cfn))); gvarchoice->setTextHandler([](int32_t value) { - return std::string(STR_GV) + std::to_string(value + 1); + return std::string(getSourceString(value + MIXSRC_FIRST_GVAR)); }); line = specialFunctionOneWindow->newLine(grid); @@ -560,7 +560,7 @@ void FunctionEditPage::updateSpecialFunctionOneWindow() auto gvarchoice = new Choice(line, rect_t{}, 0, MAX_GVARS - 1, GET_SET_DEFAULT(CFN_PARAM(cfn))); gvarchoice->setTextHandler([](int32_t value) { - return std::string(STR_GV) + std::to_string(value + 1); + return std::string(getSourceString(value + MIXSRC_FIRST_GVAR)); }); gvarchoice->setAvailableHandler( [=](int value) { return CFN_GVAR_INDEX(cfn) != value; });