From 76639a8b271fbb64a430027ecca43ba25f80df00 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Thu, 5 Mar 2026 23:33:28 +0100 Subject: [PATCH 1/3] Use 'correct' label for tab control --- src/activities/settings/SettingsActivity.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp index 659fd3e5..10d2c192 100644 --- a/src/activities/settings/SettingsActivity.cpp +++ b/src/activities/settings/SettingsActivity.cpp @@ -243,7 +243,8 @@ void SettingsActivity::render(RenderLock&&) { true); // Draw help text - const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_TOGGLE), tr(STR_DIR_UP), tr(STR_DIR_DOWN)); + const StrId confirmLabel = (selectedSettingIndex == 0) ? STR_SELECT : STR_TOGGLE; + const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(confirmLabel), tr(STR_DIR_UP), tr(STR_DIR_DOWN)); GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4); // Always use standard refresh for settings screen From c7af23b33ecea856812bb32fb46557d1f52515e1 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Thu, 5 Mar 2026 23:40:56 +0100 Subject: [PATCH 2/3] Use 'correct' label for tab control --- src/activities/settings/SettingsActivity.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp index 659fd3e5..eaec9311 100644 --- a/src/activities/settings/SettingsActivity.cpp +++ b/src/activities/settings/SettingsActivity.cpp @@ -243,7 +243,8 @@ void SettingsActivity::render(RenderLock&&) { true); // Draw help text - const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_TOGGLE), tr(STR_DIR_UP), tr(STR_DIR_DOWN)); + const StrId confirmLabel = (selectedSettingIndex == 0) ? StrId::STR_SELECT : StrId::STR_TOGGLE; + const auto labels = mappedInput.mapLabels(tr(STR_BACK), I18N.get(confirmLabel), tr(STR_DIR_UP), tr(STR_DIR_DOWN)); GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4); // Always use standard refresh for settings screen From e31e5fd1f5bfa378b80874b293a90d818b28c454 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Sat, 7 Mar 2026 10:17:07 +0100 Subject: [PATCH 3/3] Show name of next section to appear --- src/activities/settings/SettingsActivity.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp index eaec9311..d692352c 100644 --- a/src/activities/settings/SettingsActivity.cpp +++ b/src/activities/settings/SettingsActivity.cpp @@ -243,8 +243,10 @@ void SettingsActivity::render(RenderLock&&) { true); // Draw help text - const StrId confirmLabel = (selectedSettingIndex == 0) ? StrId::STR_SELECT : StrId::STR_TOGGLE; - const auto labels = mappedInput.mapLabels(tr(STR_BACK), I18N.get(confirmLabel), tr(STR_DIR_UP), tr(STR_DIR_DOWN)); + const auto confirmLabel = (selectedSettingIndex == 0) + ? I18N.get(categoryNames[(selectedCategoryIndex + 1) % categoryCount]) + : tr(STR_TOGGLE); + const auto labels = mappedInput.mapLabels(tr(STR_BACK), confirmLabel, tr(STR_DIR_UP), tr(STR_DIR_DOWN)); GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4); // Always use standard refresh for settings screen