3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

i18n of touch calibration screen

Browse source
This commit is contained in:
Victor Mateus Oliveira 2020-11-10 23:49:27 -03:00
parent 08bf5bd1ab
commit 38e5fe4d2c
8 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
View file

@ -499,10 +499,10 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT,
if (calibration_stage < CALIBRATION_SUCCESS) { if (calibration_stage < CALIBRATION_SUCCESS) {
// handle current state // handle current state
switch (calibration_stage) { switch (calibration_stage) {
case CALIBRATION_TOP_LEFT: str = "Top Left"; break; case CALIBRATION_TOP_LEFT: str = GET_TEXT(MSG_TOP_LEFT); break;
case CALIBRATION_BOTTOM_LEFT: str = "Bottom Left"; break; case CALIBRATION_BOTTOM_LEFT: str = GET_TEXT(MSG_BOTTOM_LEFT); break;
case CALIBRATION_TOP_RIGHT: str = "Top Right"; break; case CALIBRATION_TOP_RIGHT: str = GET_TEXT(MSG_TOP_RIGHT); break;
case CALIBRATION_BOTTOM_RIGHT: str = "Bottom Right"; break; case CALIBRATION_BOTTOM_RIGHT: str = GET_TEXT(MSG_BOTTOM_RIGHT); break;
default: break; default: break;
} }

8
Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
View file

@ -66,10 +66,10 @@ void lv_update_touch_calibration_screen() {
if (calibration_stage < CALIBRATION_SUCCESS) { if (calibration_stage < CALIBRATION_SUCCESS) {
// handle current state // handle current state
switch (calibration_stage) { switch (calibration_stage) {
case CALIBRATION_TOP_LEFT: str = "Top Left"; break; case CALIBRATION_TOP_LEFT: str = GET_TEXT(MSG_TOP_LEFT); break;
case CALIBRATION_BOTTOM_LEFT: str = "Bottom Left"; break; case CALIBRATION_BOTTOM_LEFT: str = GET_TEXT(MSG_BOTTOM_LEFT); break;
case CALIBRATION_TOP_RIGHT: str = "Top Right"; break; case CALIBRATION_TOP_RIGHT: str = GET_TEXT(MSG_TOP_RIGHT); break;
case CALIBRATION_BOTTOM_RIGHT: str = "Bottom Right"; break; case CALIBRATION_BOTTOM_RIGHT: str = GET_TEXT(MSG_BOTTOM_RIGHT); break;
default: break; default: break;
} }

7
Marlin/src/lcd/language/language_en.h
View file

@ -671,6 +671,13 @@ namespace Language_en {
PROGMEM Language_Str MSG_PROBE_WIZARD = _UxGT("Z Probe Wizard"); PROGMEM Language_Str MSG_PROBE_WIZARD = _UxGT("Z Probe Wizard");
PROGMEM Language_Str MSG_SOUND = _UxGT("Sound"); PROGMEM Language_Str MSG_SOUND = _UxGT("Sound");
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
PROGMEM Language_Str MSG_TOP_LEFT = _UxGT("Top Left");
PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Bottom Left");
PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Top Right");
PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Bottom Right");
#endif
} }
#if FAN_COUNT == 1 #if FAN_COUNT == 1

7
Marlin/src/lcd/language/language_fr.h
View file

@ -570,4 +570,11 @@ namespace Language_fr {
PROGMEM Language_Str MSG_SERVICE_IN = _UxGT(" dans:"); PROGMEM Language_Str MSG_SERVICE_IN = _UxGT(" dans:");
PROGMEM Language_Str MSG_BACKLASH_CORRECTION = _UxGT("Correction"); PROGMEM Language_Str MSG_BACKLASH_CORRECTION = _UxGT("Correction");
PROGMEM Language_Str MSG_BACKLASH_SMOOTHING = _UxGT("Lissage"); PROGMEM Language_Str MSG_BACKLASH_SMOOTHING = _UxGT("Lissage");
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
PROGMEM Language_Str MSG_TOP_LEFT = _UxGT("Haut à Gauche");
PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Bas à Gauche");
PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Haut à Droite");
PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Bas à Droite");
#endif
} }

7
Marlin/src/lcd/language/language_pt.h
View file

@ -160,4 +160,11 @@ namespace Language_pt {
PROGMEM Language_Str MSG_LCD_ENDSTOPS = _UxGT("Fim de curso"); PROGMEM Language_Str MSG_LCD_ENDSTOPS = _UxGT("Fim de curso");
PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER = _UxGT("Impressora Incorreta"); PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER = _UxGT("Impressora Incorreta");
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
PROGMEM Language_Str MSG_TOP_LEFT = _UxGT("Superior Esquerdo");
PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Inferior Esquerdo");
PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Superior Direto");
PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Inferior Direto");
#endif
} }

7
Marlin/src/lcd/language/language_pt_br.h
View file

@ -478,4 +478,11 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE = _UxGT(MSG_1_LINE("Clique p. finalizar")); PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE = _UxGT(MSG_1_LINE("Clique p. finalizar"));
PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME = _UxGT(MSG_1_LINE("Continuando...")); PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME = _UxGT(MSG_1_LINE("Continuando..."));
#endif #endif
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
PROGMEM Language_Str MSG_TOP_LEFT = _UxGT("Superior Esquerdo");
PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Inferior Esquerdo");
PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Superior Direto");
PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Inferior Direto");
#endif
} }

8
Marlin/src/lcd/tft/ui_320x240.cpp
View file

@ -605,10 +605,10 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
if (calibration_stage < CALIBRATION_SUCCESS) { if (calibration_stage < CALIBRATION_SUCCESS) {
switch (calibration_stage) { switch (calibration_stage) {
case CALIBRATION_TOP_LEFT: tft_string.set("Top Left"); break; case CALIBRATION_TOP_LEFT: tft_string.set(GET_TEXT(MSG_TOP_LEFT)); break;
case CALIBRATION_BOTTOM_LEFT: tft_string.set("Bottom Left"); break; case CALIBRATION_BOTTOM_LEFT: tft_string.set(GET_TEXT(MSG_BOTTOM_LEFT)); break;
case CALIBRATION_TOP_RIGHT: tft_string.set("Top Right"); break; case CALIBRATION_TOP_RIGHT: tft_string.set(GET_TEXT(MSG_TOP_RIGHT)); break;
case CALIBRATION_BOTTOM_RIGHT: tft_string.set("Bottom Right"); break; case CALIBRATION_BOTTOM_RIGHT: tft_string.set(GET_TEXT(MSG_BOTTOM_RIGHT)); break;
default: break; default: break;
} }

8
Marlin/src/lcd/tft/ui_480x320.cpp
View file

@ -610,10 +610,10 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
if (calibration_stage < CALIBRATION_SUCCESS) { if (calibration_stage < CALIBRATION_SUCCESS) {
switch (calibration_stage) { switch (calibration_stage) {
case CALIBRATION_TOP_LEFT: tft_string.set("Top Left"); break; case CALIBRATION_TOP_LEFT: tft_string.set(GET_TEXT(MSG_TOP_LEFT)); break;
case CALIBRATION_BOTTOM_LEFT: tft_string.set("Bottom Left"); break; case CALIBRATION_BOTTOM_LEFT: tft_string.set(GET_TEXT(MSG_BOTTOM_LEFT)); break;
case CALIBRATION_TOP_RIGHT: tft_string.set("Top Right"); break; case CALIBRATION_TOP_RIGHT: tft_string.set(GET_TEXT(MSG_TOP_RIGHT)); break;
case CALIBRATION_BOTTOM_RIGHT: tft_string.set("Bottom Right"); break; case CALIBRATION_BOTTOM_RIGHT: tft_string.set(GET_TEXT(MSG_BOTTOM_RIGHT)); break;
default: break; default: break;
} }