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

TOOLS internationalisation

Browse Source
This commit is contained in:
3djc
2019-04-19 16:41:21 +02:00
parent 5be4890cce
commit 962cdc7b67
16 changed files with 143 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/radio_power_meter.cpp
+9 -8
View File
@@ -34,10 +34,10 @@ enum PowerMeterFields {
void menuRadioPowerMeter(event_t event)
{
SUBMENU("POWER METER", POWER_METER_FIELDS_MAX-1, {0, 0, READONLY_ROW, READONLY_ROW});
SUBMENU(STR_MENU_POWER_METER, POWER_METER_FIELDS_MAX-1, {0, 0, READONLY_ROW, READONLY_ROW});
if (TELEMETRY_STREAMING()) {
lcdDrawCenteredText(LCD_H/2, "Turn off receiver");
lcdDrawCenteredText(LCD_H/2, STR_TURN_OFF_RECEIVER);
if (event == EVT_KEY_FIRST(KEY_EXIT)) {
killEvents(event);
popMenu();
@@ -46,7 +46,7 @@ void menuRadioPowerMeter(event_t event)
}
if (menuEvent) {
lcdDrawCenteredText(LCD_H/2, "Stopping...");
lcdDrawCenteredText(LCD_H/2, STR_STOPPING);
lcdRefresh();
moduleSettings[g_moduleIdx].mode = MODULE_MODE_NORMAL;
/* wait 1s to resume normal operation before leaving */
@@ -65,7 +65,8 @@ void menuRadioPowerMeter(event_t event)
}
// The warning
lcdDrawText(3 * FW, FH + 3, "Max: ", BOLD);
lcdDrawText(3 * FW, FH + 3, STR_MAX, BOLD);
lcdDrawText(lcdLastRightPos, FH + 3, ": ", BOLD);
lcdDrawNumber(lcdLastRightPos, FH + 3, -10 + 10 * reusableBuffer.powerMeter.attn, BOLD);
lcdDrawText(lcdLastRightPos, FH + 3, "dBm ", BOLD);
lcdDrawText(lcdLastRightPos, FH + 3, "(", BOLD);
@@ -78,7 +79,7 @@ void menuRadioPowerMeter(event_t event)
switch (i) {
case POWER_METER_FREQ_RANGE:
lcdDrawText(0, y, "Freq.");
lcdDrawText(0, y, STR_POWERMETER_FREQ);
lcdDrawNumber(8 * FW, y, reusableBuffer.powerMeter.freq / 1000000, LEFT | attr);
lcdDrawText(lcdNextPos, y, " MHz band");
if (attr) {
@@ -91,7 +92,7 @@ void menuRadioPowerMeter(event_t event)
break;
case POWER_METER_ATTENUATOR:
lcdDrawText(0, y, "Attn");
lcdDrawText(0, y, STR_POWERMETER_ATTN);
lcdDrawNumber(8 * FW, y, -10 * reusableBuffer.powerMeter.attn, LEFT | attr);
lcdDrawText(lcdNextPos, y, " dB");
if (attr) {
@@ -100,7 +101,7 @@ void menuRadioPowerMeter(event_t event)
break;
case POWER_METER_POWER:
lcdDrawText(0, y, "Power");
lcdDrawText(0, y, STR_POWERMETER_POWER);
if (reusableBuffer.powerMeter.power) {
lcdDrawNumber(8 * FW, y, reusableBuffer.powerMeter.power + reusableBuffer.powerMeter.attn * 1000, LEFT | PREC2);
lcdDrawText(lcdNextPos, y, "dBm");
@@ -108,7 +109,7 @@ void menuRadioPowerMeter(event_t event)
break;
case POWER_METER_PEAK:
lcdDrawText(0, y, "Peak");
lcdDrawText(0, y, STR_POWERMETER_PEAK);
if (reusableBuffer.powerMeter.peak) {
lcdDrawNumber(8 * FW, y, reusableBuffer.powerMeter.peak + reusableBuffer.powerMeter.attn * 1000, LEFT | PREC2);
lcdDrawText(lcdNextPos, y, "dBm");
radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
+3 -3
View File
@@ -30,10 +30,10 @@ enum SpectrumFields {
void menuRadioSpectrumAnalyser(event_t event)
{
SUBMENU("SPECTRUM ANALYSER", 1, {1});
SUBMENU(STR_MENU_SPECTRUM_ANALYSER, 1, {1});
if (TELEMETRY_STREAMING()) {
lcdDrawCenteredText(LCD_H/2, "Turn off receiver");
lcdDrawCenteredText(LCD_H/2, STR_TURN_OFF_RECEIVER );
if (event == EVT_KEY_FIRST(KEY_EXIT)) {
killEvents(event);
popMenu();
@@ -42,7 +42,7 @@ void menuRadioSpectrumAnalyser(event_t event)
}
if (menuEvent) {
lcdDrawCenteredText(LCD_H/2, "Stopping...");
lcdDrawCenteredText(LCD_H/2, STR_STOPPING );
lcdRefresh();
moduleSettings[g_moduleIdx].mode = MODULE_MODE_NORMAL;
/* wait 1s to resume normal operation before leaving */
radio/src/gui/common/stdlcd/radio_tools.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void menuRadioTools(event_t event)
}
}
SIMPLE_MENU("TOOLS", menuTabGeneral, MENU_RADIO_TOOLS, HEADER_LINE + spectrum_modules + power_modules);
SIMPLE_MENU(STR_MENUTOOLS, menuTabGeneral, MENU_RADIO_TOOLS, HEADER_LINE + spectrum_modules + power_modules);
#if defined(PXX2)
uint8_t menu_index = 0;