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

Rearange long enter menu (#3614)

Browse Source 
* Rearange long enter menu

* Remove duplicate
This commit is contained in:
3djc
2016-06-19 14:26:53 +02:00
committed by Bertrand Songis
parent 0c49f35687
commit a26c5461ab
14 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/horus/view_main.cpp
+4 -1
View File
@@ -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;
radio/src/translations.cpp
+1
View File
@@ -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)
radio/src/translations.h
+7 -6
View File
@@ -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[];
radio/src/translations/cz.h.txt
+1
View File
@@ -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"
radio/src/translations/de.h.txt
+1
View File
@@ -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
radio/src/translations/en.h.txt
+1
View File
@@ -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"
radio/src/translations/es.h.txt
+1
View File
@@ -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"
radio/src/translations/fi.h.txt
+1
View File
@@ -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"
radio/src/translations/fr.h.txt
+1
View File
@@ -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"
radio/src/translations/it.h.txt
+1
View File
@@ -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"
radio/src/translations/nl.h.txt
+1
View File
@@ -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"
radio/src/translations/pl.h.txt
+1
View File
@@ -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"
radio/src/translations/pt.h.txt
+1
View File
@@ -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"
radio/src/translations/se.h.txt
+1
View File
@@ -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"