From 9a795c412690d3beff9b0f0a906d1192d449e1d1 Mon Sep 17 00:00:00 2001 From: Kevin Koenig Date: Sat, 20 Nov 2021 06:39:13 -0500 Subject: [PATCH] Move [outputs] "Trim => Subtrims" button to top, change btn text (#1076) * partial implementation of 354 * implemented screen refresh and test update * chaged add to move...after much discussion * change move to add Co-authored-by: kkoenig1@optonline.com --- radio/src/gui/colorlcd/model_outputs.cpp | 8 ++++++++ radio/src/translations.cpp | 1 + radio/src/translations.h | 1 + radio/src/translations/untranslated.h | 1 + 4 files changed, 11 insertions(+) diff --git a/radio/src/gui/colorlcd/model_outputs.cpp b/radio/src/gui/colorlcd/model_outputs.cpp index 8d5efb2c3..a3eb53357 100644 --- a/radio/src/gui/colorlcd/model_outputs.cpp +++ b/radio/src/gui/colorlcd/model_outputs.cpp @@ -216,6 +216,14 @@ void ModelOutputsPage::build(FormWindow * window, int8_t focusChannel) grid.spacer(PAGE_PADDING); grid.setLabelWidth(66); + new TextButton(window, grid.getLineSlot(), STR_ADD_ALL_TRIMS_TO_SUBTRIMS, + [=] () { + moveTrimsToOffsets(); // if highlighted and menu pressed - move trims to offsets + rebuild(window, 0); + return 0; + }, 0, COLOR_THEME_PRIMARY1); + grid.nextLine(); + for (uint8_t ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++) { LimitData * output = limitAddress(ch); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index e6d64c86f..2534fb758 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -694,6 +694,7 @@ const char STR_CURVE_PRESET[] = TR_CURVE_PRESET; const char STR_PRESET[] = TR_PRESET; const char STR_CLEAR[] = TR_CLEAR; const char STR_RESET[] = TR_RESET; +const char STR_ADD_ALL_TRIMS_TO_SUBTRIMS[] = TR_ADD_ALL_TRIMS_TO_SUBTRIMS; const char STR_COUNT[] = TR_COUNT; const char STR_PT[] = TR_PT; const char STR_PTS[] = TR_PTS; diff --git a/radio/src/translations.h b/radio/src/translations.h index 53a6ffa34..e1b8d55e2 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -1031,6 +1031,7 @@ extern const char STR_CURVE_PRESET[]; extern const char STR_PRESET[]; extern const char STR_CLEAR[]; extern const char STR_RESET[]; +extern const char STR_ADD_ALL_TRIMS_TO_SUBTRIMS[]; extern const char STR_COUNT[]; extern const char STR_PT[]; extern const char STR_PTS[]; diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h index e394427b3..223b9a9bc 100644 --- a/radio/src/translations/untranslated.h +++ b/radio/src/translations/untranslated.h @@ -330,6 +330,7 @@ #define TR_USE_THEME_COLOR "Use theme color" +#define TR_ADD_ALL_TRIMS_TO_SUBTRIMS "Add all Trims to Subtrims" #define TR_DUPLICATE "Duplicate" #define TR_ACTIVATE "Set Active" #define TR_RED "Red"