From 150f341a23608e671c7b8ec638b9f5fabd8df41d Mon Sep 17 00:00:00 2001 From: Risto Date: Fri, 17 Mar 2023 01:27:47 +0100 Subject: [PATCH] fix(color): Main view numbering (#3357) * fix(ui): Main view numbering #3073 * Fix max last tab focus. --- radio/src/gui/colorlcd/menu_screen.cpp | 15 ++++++++++----- radio/src/gui/colorlcd/screen_setup.cpp | 11 ++++++++++- radio/src/translations/cn.h | 2 +- radio/src/translations/cz.h | 2 +- radio/src/translations/da.h | 2 +- radio/src/translations/de.h | 2 +- radio/src/translations/en.h | 2 +- radio/src/translations/es.h | 2 +- radio/src/translations/fi.h | 2 +- radio/src/translations/fr.h | 2 +- radio/src/translations/it.h | 2 +- radio/src/translations/jp.h | 2 +- radio/src/translations/nl.h | 2 +- radio/src/translations/pl.h | 2 +- radio/src/translations/pt.h | 2 +- radio/src/translations/se.h | 2 +- radio/src/translations/tw.h | 2 +- 17 files changed, 35 insertions(+), 21 deletions(-) diff --git a/radio/src/gui/colorlcd/menu_screen.cpp b/radio/src/gui/colorlcd/menu_screen.cpp index b0cda8ce3..c3f96e389 100644 --- a/radio/src/gui/colorlcd/menu_screen.cpp +++ b/radio/src/gui/colorlcd/menu_screen.cpp @@ -46,7 +46,16 @@ void ScreenMenu::updateTabs(int8_t tabIdx) if (customScreens[index]) { auto tab = new ScreenSetupPage(this, getTabs(), index); std::string title(STR_MAIN_VIEW_X); - title.back() = index + '1'; + if (index >= 9) + { + title[title.size() - 2] = '1'; + title.back() = (index - 9) + '0'; + } + else + { + title[title.size() - 2] = index + '1'; + title.back() = ' '; + } tab->setTitle(title); tab->setIcon(ICON_THEME_VIEW1 + index); @@ -66,9 +75,5 @@ void ScreenMenu::updateTabs(int8_t tabIdx) tab = tabIdx; } - auto tabs = getTabs(); - if (tab >= tabs - 1) { - tab = tabs - 2; - } setCurrentTab(tab); } diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp index e7c996760..cc4fa1b90 100644 --- a/radio/src/gui/colorlcd/screen_setup.cpp +++ b/radio/src/gui/colorlcd/screen_setup.cpp @@ -138,7 +138,16 @@ void ScreenAddPage::build(FormWindow * window) auto tab = new ScreenSetupPage(menu, pageIndex, newIdx); std::string title(STR_MAIN_VIEW_X); - title.back() = newIdx + '1'; + if (newIdx >= 9) + { + title[title.size() - 2] = '1'; + title.back() = (newIdx - 9) + '0'; + } + else + { + title[title.size() - 2] = newIdx + '1'; + title.back() = ' '; + } tab->setTitle(title); tab->setIcon(ICON_THEME_VIEW1 + newIdx); diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index e0d2c16f1..1230148f8 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -1027,7 +1027,7 @@ #define TR_ALIGN_OPTS { "左", "中", "右" } #define TR_TEXT "文本" #define TR_COLOR "颜色" - #define TR_MAIN_VIEW_X "Main view X" + #define TR_MAIN_VIEW_X "Main view XX" #define TR_PANEL1_BACKGROUND "面板1背景" #define TR_PANEL2_BACKGROUND "面板2背景" #define TR_WIDGET_GAUGE "行程" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 39aefe25d..ccca7d7ed 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -1031,7 +1031,7 @@ #define TR_ALIGN_OPTS { "Vlevo", "Uprostřed", "Vpravo" } #define TR_TEXT "Text" #define TR_COLOR "Barva" - #define TR_MAIN_VIEW_X "Hlavní pohled X" + #define TR_MAIN_VIEW_X "Hlavní pohled XX" #define TR_PANEL1_BACKGROUND "Panel1 pozadí" #define TR_PANEL2_BACKGROUND "Panel2 pozadí" #define TR_WIDGET_GAUGE "Měřidlo" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index f300847ed..8d1794d28 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -1032,7 +1032,7 @@ #define TR_ALIGN_OPTS { "Venstre", "Center", "Højre" } #define TR_TEXT "Tekst" #define TR_COLOR "Farve" - #define TR_MAIN_VIEW_X "Hoved visning X" + #define TR_MAIN_VIEW_X "Hoved visning XX" #define TR_PANEL1_BACKGROUND "Panel1 baggrund" #define TR_PANEL2_BACKGROUND "Panel2 baggrund" #define TR_WIDGET_GAUGE "Måling" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 0a89405bc..2dd06fa92 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -1015,7 +1015,7 @@ #define TR_ALIGN_OPTS { "Links", "Mitte", "Rechts" } #define TR_TEXT "Text" #define TR_COLOR "Farbe" - #define TR_MAIN_VIEW_X "Hauptansicht X" + #define TR_MAIN_VIEW_X "Hauptansicht XX" #define TR_PANEL1_BACKGROUND "Panel1 Hintergrund" #define TR_PANEL2_BACKGROUND "Panel2 Hintergrund" #define TR_WIDGET_GAUGE "Pegel" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 0c2a0ce45..ea9cdf3ed 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -1024,7 +1024,7 @@ #define TR_ALIGN_OPTS { "Left", "Center", "Right" } #define TR_TEXT "Text" #define TR_COLOR "Color" - #define TR_MAIN_VIEW_X "Main view X" + #define TR_MAIN_VIEW_X "Main view XX" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" #define TR_WIDGET_GAUGE "Gauge" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index ea04d8ee4..bc9beaae9 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -1032,7 +1032,7 @@ #define TR_ALIGN_OPTS { "Lzquierdo", "Centro", "Derecho" } #define TR_TEXT "Texto" #define TR_COLOR "Color" - #define TR_MAIN_VIEW_X "Vista principal X" + #define TR_MAIN_VIEW_X "Vista principal XX" #define TR_PANEL1_BACKGROUND "Fondo panel1" #define TR_PANEL2_BACKGROUND "Fondo panel2" #define TR_WIDGET_GAUGE "Gauge" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 4005eff5e..447b47ed2 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -1042,7 +1042,7 @@ #define TR_ALIGN_OPTS { "Vasen", "Keski", "Oikea" } #define TR_TEXT "Text" #define TR_COLOR "Color" - #define TR_MAIN_VIEW_X "Main view X" + #define TR_MAIN_VIEW_X "Main view XX" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" #define TR_WIDGET_GAUGE "Gauge" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 3c5b2f312..4f959bb3a 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -1047,7 +1047,7 @@ #define TR_ALIGN_OPTS { "Gauche", "Centre", "Droite" } #define TR_TEXT "Text" #define TR_COLOR "Color" - #define TR_MAIN_VIEW_X "Main view X" + #define TR_MAIN_VIEW_X "Main view XX" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" #define TR_WIDGET_GAUGE "Gauge" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index 68f14bfbb..6ad064b89 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -1033,7 +1033,7 @@ #define TR_ALIGN_OPTS { "Sinistra", "Mezzo", "Destra" } #define TR_TEXT "Testo" #define TR_COLOR "Colore" - #define TR_MAIN_VIEW_X "Vista principale X" + #define TR_MAIN_VIEW_X "Vista principale XX" #define TR_PANEL1_BACKGROUND "Sfondo Panello 1" #define TR_PANEL2_BACKGROUND "Sfondo Panello 2" #define TR_WIDGET_GAUGE "Indicatore" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 8ce77d005..3eed9ad17 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -1025,7 +1025,7 @@ #define TR_ALIGN_OPTS { "左", "中央", "右" } #define TR_TEXT "テキスト" #define TR_COLOR "カラー" - #define TR_MAIN_VIEW_X "メインビュー X" + #define TR_MAIN_VIEW_X "メインビュー XX" #define TR_PANEL1_BACKGROUND "パネル1 背景" #define TR_PANEL2_BACKGROUND "パネル2 背景" #define TR_WIDGET_GAUGE "ゲージ" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index eb0c5c048..e34a8972b 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -1040,7 +1040,7 @@ #define TR_ALIGN_OPTS { "Links", "Midden", "Rechts" } #define TR_TEXT "Text" #define TR_COLOR "Color" - #define TR_MAIN_VIEW_X "Main view X" + #define TR_MAIN_VIEW_X "Main view XX" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" #define TR_WIDGET_GAUGE "Gauge" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index b87dac392..2b9f47fe3 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -1027,7 +1027,7 @@ #define TR_ALIGN_OPTS { "Lewy", "Centrum", "Prawe" } #define TR_TEXT "Tekst" #define TR_COLOR "Kolor" - #define TR_MAIN_VIEW_X "Main view X" + #define TR_MAIN_VIEW_X "Main view XX" #define TR_PANEL1_BACKGROUND "Panel1 tło" #define TR_PANEL2_BACKGROUND "Panel2 tło" #define TR_WIDGET_GAUGE "Wskaźnik" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 06603ecb4..81957d7e8 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -1035,7 +1035,7 @@ #define TR_ALIGN_OPTS { "Esquerda", "Centro", "Direita" } #define TR_TEXT "Text" #define TR_COLOR "Color" - #define TR_MAIN_VIEW_X "Main view X" + #define TR_MAIN_VIEW_X "Main view XX" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" #define TR_WIDGET_GAUGE "Gauge" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 2fe622337..3410d9f52 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -1063,7 +1063,7 @@ #define TR_ALIGN_OPTS { "Vänster", "Mitten", "Höger" } #define TR_TEXT "Text" #define TR_COLOR "Färg" - #define TR_MAIN_VIEW_X "Huvudvy X" + #define TR_MAIN_VIEW_X "Huvudvy XX" #define TR_PANEL1_BACKGROUND "Panel 1 bakgrund" #define TR_PANEL2_BACKGROUND "Panel 2 bakgrund" #define TR_WIDGET_GAUGE "Mätare" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index bc140aba2..20723b86e 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -1025,7 +1025,7 @@ #define TR_ALIGN_OPTS { "左", "中", "右" } #define TR_TEXT "文本" #define TR_COLOR "顏色" - #define TR_MAIN_VIEW_X "Main view X" + #define TR_MAIN_VIEW_X "Main view XX" #define TR_PANEL1_BACKGROUND "面板1背景" #define TR_PANEL2_BACKGROUND "面板2背景" #define TR_WIDGET_GAUGE "行程"