From cd84f8665a35cd4f0a736dda4d26a8551b87abe4 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Wed, 27 Oct 2021 12:21:11 +1000 Subject: [PATCH] Use ModelTextEdit in model edit screens!! --- radio/src/gui/colorlcd/model_curves.cpp | 4 ++-- radio/src/gui/colorlcd/model_gvars.cpp | 2 +- radio/src/gui/colorlcd/model_setup.cpp | 4 ++-- radio/src/gui/colorlcd/model_telemetry.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/colorlcd/model_curves.cpp b/radio/src/gui/colorlcd/model_curves.cpp index d463e11b7..12151a4a4 100644 --- a/radio/src/gui/colorlcd/model_curves.cpp +++ b/radio/src/gui/colorlcd/model_curves.cpp @@ -87,7 +87,7 @@ class CurveEditWindow : public Page // Name new StaticText(window, grid.getFieldSlot(), STR_NAME, 0, COLOR_THEME_PRIMARY1); grid.nextLine(); - new RadioTextEdit(window, grid.getFieldSlot(), curve.name, sizeof(curve.name)); + new ModelTextEdit(window, grid.getFieldSlot(), curve.name, sizeof(curve.name)); grid.nextLine(); // Type @@ -169,7 +169,7 @@ class CurveEditWindow : public Page // Name new StaticText(window, grid.getLabelSlot(), STR_NAME, 0, COLOR_THEME_PRIMARY1); - new RadioTextEdit(window, grid.getFieldSlot(), curve.name, sizeof(curve.name)); + new ModelTextEdit(window, grid.getFieldSlot(), curve.name, sizeof(curve.name)); grid.nextLine(); // Type diff --git a/radio/src/gui/colorlcd/model_gvars.cpp b/radio/src/gui/colorlcd/model_gvars.cpp index 07d369432..4a3eeed25 100644 --- a/radio/src/gui/colorlcd/model_gvars.cpp +++ b/radio/src/gui/colorlcd/model_gvars.cpp @@ -263,7 +263,7 @@ void GVarEditWindow::buildBody(FormWindow * window) grid.spacer(8); new StaticText(window, grid.getLabelSlot(), STR_NAME, 0, COLOR_THEME_PRIMARY1); - new RadioTextEdit(window, grid.getFieldSlot(), gvar->name, LEN_GVAR_NAME); + new ModelTextEdit(window, grid.getFieldSlot(), gvar->name, LEN_GVAR_NAME); grid.nextLine(); diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index 97d1745f7..0ca3fedb1 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -175,7 +175,7 @@ class RegisterDialog: public Dialog { // Register ID new StaticText(form, grid.getLabelSlot(), STR_REG_ID, 0, COLOR_THEME_PRIMARY1); - auto edit = new RadioTextEdit(form, grid.getFieldSlot(), g_model.modelRegistrationID, sizeof(g_model.modelRegistrationID)); + auto edit = new ModelTextEdit(form, grid.getFieldSlot(), g_model.modelRegistrationID, sizeof(g_model.modelRegistrationID)); grid.nextLine(); // UID @@ -222,7 +222,7 @@ class RegisterDialog: public Dialog { rect_t rect = waiting->getRect(); waiting->deleteLater(); - rxName = new RadioTextEdit(&content->form, rect, reusableBuffer.moduleSetup.pxx2.registerRxName, PXX2_LEN_RX_NAME); + rxName = new ModelTextEdit(&content->form, rect, reusableBuffer.moduleSetup.pxx2.registerRxName, PXX2_LEN_RX_NAME); rect = exitButton->getRect(); auto okButton = new TextButton(&content->form, rect, "OK", [=]() -> int8_t { diff --git a/radio/src/gui/colorlcd/model_telemetry.cpp b/radio/src/gui/colorlcd/model_telemetry.cpp index 543afa88b..f298fc4b7 100644 --- a/radio/src/gui/colorlcd/model_telemetry.cpp +++ b/radio/src/gui/colorlcd/model_telemetry.cpp @@ -344,7 +344,7 @@ class SensorEditWindow : public Page { // Sensor name new StaticText(window, grid.getLabelSlot(), STR_NAME, 0, COLOR_THEME_PRIMARY1); - new RadioTextEdit(window, grid.getFieldSlot(), sensor->label, sizeof(sensor->label)); + new ModelTextEdit(window, grid.getFieldSlot(), sensor->label, sizeof(sensor->label)); grid.nextLine(); // Type