piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): Main view numbering (#3357)

Browse Source 
* fix(ui): Main view numbering #3073

* Fix max last tab focus.
This commit is contained in:
Risto
2023-03-17 10:27:47 +10:00
committed by GitHub
parent 816a823727
commit 150f341a23
17 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/menu_screen.cpp
+10 -5
View File
@@ -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);
}
radio/src/gui/colorlcd/screen_setup.cpp
+10 -1
View File
@@ -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);
radio/src/translations/cn.h
+1 -1
View File
@@ -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 "行程"
radio/src/translations/cz.h
+1 -1
View File
@@ -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"
radio/src/translations/da.h
+1 -1
View File
@@ -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"
radio/src/translations/de.h
+1 -1
View File
@@ -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"
radio/src/translations/en.h
+1 -1
View File
@@ -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"
radio/src/translations/es.h
+1 -1
View File
@@ -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"
radio/src/translations/fi.h
+1 -1
View File
@@ -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"
radio/src/translations/fr.h
+1 -1
View File
@@ -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"
radio/src/translations/it.h
+1 -1
View File
@@ -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"
radio/src/translations/jp.h
+1 -1
View File
@@ -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 "ゲージ"
radio/src/translations/nl.h
+1 -1
View File
@@ -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"
radio/src/translations/pl.h
+1 -1
View File
@@ -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"
radio/src/translations/pt.h
+1 -1
View File
@@ -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"
radio/src/translations/se.h
+1 -1
View File
@@ -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"
radio/src/translations/tw.h
+1 -1
View File
@@ -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 "行程"