From a26c5461abcc2e093017af39603346d6ee0381c6 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 19 Jun 2016 14:26:53 +0200 Subject: [PATCH] Rearange long enter menu (#3614) * Rearange long enter menu * Remove duplicate --- radio/src/gui/horus/view_main.cpp | 5 ++++- radio/src/translations.cpp | 1 + radio/src/translations.h | 13 +++++++------ radio/src/translations/cz.h.txt | 1 + radio/src/translations/de.h.txt | 1 + radio/src/translations/en.h.txt | 1 + radio/src/translations/es.h.txt | 1 + radio/src/translations/fi.h.txt | 1 + radio/src/translations/fr.h.txt | 1 + radio/src/translations/it.h.txt | 1 + radio/src/translations/nl.h.txt | 1 + radio/src/translations/pl.h.txt | 1 + radio/src/translations/pt.h.txt | 1 + radio/src/translations/se.h.txt | 1 + 14 files changed, 23 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/horus/view_main.cpp b/radio/src/gui/horus/view_main.cpp index c0c5f7eeb..78a028bda 100644 --- a/radio/src/gui/horus/view_main.cpp +++ b/radio/src/gui/horus/view_main.cpp @@ -113,6 +113,9 @@ void onMainViewMenu(const char *result) else if (result == STR_ABOUT_US) { chainMenu(menuAboutView); } + else if (result == STR_MONITOR_SCREENS) { + pushMenu(menuTabMonitors[lastMonitorPage]); + } } int getMainViewsCount() @@ -140,9 +143,9 @@ bool menuMainView(evt_t event) if (modelHasNotes()) { POPUP_MENU_ADD_ITEM(STR_VIEW_NOTES); } + POPUP_MENU_ADD_ITEM(STR_MONITOR_SCREENS); POPUP_MENU_ADD_ITEM(STR_RESET_SUBMENU); POPUP_MENU_ADD_ITEM(STR_STATISTICS); - POPUP_MENU_ADD_ITEM(STR_SETUP_SCREENS); POPUP_MENU_ADD_ITEM(STR_ABOUT_US); POPUP_MENU_START(onMainViewMenu); break; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 85b3be2fc..2b4e29a96 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -455,6 +455,7 @@ const pm_char STR_RESET_TELEMETRY[] PROGMEM = TR_RESET_TELEMETRY; const pm_char STR_STATISTICS[] PROGMEM = TR_STATISTICS; const pm_char STR_ABOUT_US[] PROGMEM = TR_ABOUT_US; const pm_char STR_SETUP_SCREENS[] PROGMEM = TR_SETUP_SCREENS; +const pm_char STR_MONITOR_SCREENS[] PROGMEM = TR_MONITOR_SCREENS; #endif #if defined(MULTIMODULE) diff --git a/radio/src/translations.h b/radio/src/translations.h index cb3ac14f9..8f2d8844b 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -564,11 +564,11 @@ extern const pm_char STR_MENUTELEMETRY[]; extern const pm_char STR_MENUTEMPLATES[]; extern const pm_char STR_MENUSTAT[]; extern const pm_char STR_MENUDEBUG[]; -extern const pm_char STR_MONITOR_OUTPUTS1[]; -extern const pm_char STR_MONITOR_OUTPUTS2[]; -extern const pm_char STR_MONITOR_SWITCHES[]; -extern const pm_char STR_MONITOR_MIXERS1[]; -extern const pm_char STR_MONITOR_MIXERS2[]; +extern const pm_char STR_MONITOR_OUTPUTS1[]; +extern const pm_char STR_MONITOR_OUTPUTS2[]; +extern const pm_char STR_MONITOR_SWITCHES[]; +extern const pm_char STR_MONITOR_MIXERS1[]; +extern const pm_char STR_MONITOR_MIXERS2[]; extern const pm_char STR_MENUGLOBALVARS[]; extern const pm_char STR_INVERT_THR[]; extern const pm_char STR_AND_SWITCH[]; @@ -589,7 +589,7 @@ extern const pm_char STR_MULTI_DSMFRAME[]; #endif #if defined(DSM2) || defined(PXX) extern const pm_char STR_RECEIVER_NUM[]; -extern const pm_char STR_RECEIVER[]; +extern const pm_char STR_RECEIVER[]; #endif #if defined(PXX) || defined(CPUARM) @@ -675,6 +675,7 @@ extern const pm_char STR_PERSISTENT_MAH[]; extern const pm_char STR_STATISTICS[]; extern const pm_char STR_ABOUT_US[]; extern const pm_char STR_SETUP_SCREENS[]; + extern const pm_char STR_MONITOR_SCREENS[]; #endif extern const pm_char STR_RESET_BTN[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 5f91f707d..28fd74bac 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -998,6 +998,7 @@ #define TR_STATISTICS "Statistika" #define TR_ABOUT_US "O nás" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "AND Spínač" #define TR_SF "SF" #define TR_GF "GF" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 680f02dac..6f03264c3 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1002,6 +1002,7 @@ #define TR_STATISTICS "Statistik und Gas" #define TR_ABOUT_US "Die Programmierer" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "UND Schalt" //UND mit weiterem Schaltern #define TR_SF "SF" //Spezial Funktionen #define TR_GF "GF" // Globale Funktionen diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 29344d3c4..62b1da7da 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1017,6 +1017,7 @@ #define TR_STATISTICS "Statistics" #define TR_ABOUT_US "About" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "AND switch" #define TR_SF "SF" #define TR_GF "GF" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 28f41f03e..5f925a4f7 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -962,6 +962,7 @@ #define TR_STATISTICS "Estadisticas" #define TR_ABOUT_US "Nosotros" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "AND Inter." #define TR_SF "CF" #define TR_GF "GF" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 9cb6a2112..4d667a870 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -962,6 +962,7 @@ #define TR_STATISTICS "Statistics" #define TR_ABOUT_US "About" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "AND Switch" #define TR_SF "CF" #define TR_GF "GF" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index e25b7f38c..a283960a8 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -994,6 +994,7 @@ #define TR_STATISTICS "Statistiques" #define TR_ABOUT_US "A propos" #define TR_SETUP_SCREENS "Configuration écrans" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "ET suppl." #define TR_SF "FS" #define TR_GF "FG" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 76247bb1f..7eaf6e2c6 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -997,6 +997,7 @@ #define TR_STATISTICS "Statistiche" #define TR_ABOUT_US "Info su" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "Inter. AND" #define TR_SF "CF" #define TR_GF "GF" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index c0fe4d63b..c4dc744ee 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1011,6 +1011,7 @@ #define TR_STATISTICS "Statistieken" #define TR_ABOUT_US "De Programmeurs" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "AND Switch" #define TR_SF "SF" #define TR_GF "GF" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 40ad3d2d9..dca12b4a4 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -999,6 +999,7 @@ #define TR_STATISTICS "Statystyki" #define TR_ABOUT_US "O nas" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "Przełącznik AND" #define TR_SF "FS" #define TR_GF "FG" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index a6cb800b0..d0235cf21 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -958,6 +958,7 @@ #define TR_STATISTICS "Statistics" #define TR_ABOUT_US "About Us" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "AND Switch" #define TR_SF "CF" #define TR_GF "GF" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index fd365183c..f83ac380c 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1010,6 +1010,7 @@ #define TR_STATISTICS "Statistik" #define TR_ABOUT_US "Om Oss" #define TR_SETUP_SCREENS "Setup screens" +#define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "OCH Brytare" #define TR_SF "BF" #define TR_GF "GF"