3d-print/anadyr-marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Translated DWIN screen titles (#18893)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Slats
2020-08-02 21:00:06 -04:00
committed by GitHub
parent 5847f9c718
commit 1d240ce5a3
2 changed files with 116 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Marlin/src/lcd/dwin/dwin.cpp
View File

@@ -379,6 +379,10 @@ inline void Draw_Title(const char * const title) {
DWIN_Draw_String(false, false, HEADER_FONT, White, Background_blue, 14, 4, (char*)title);
}
inline void Draw_Title(const __FlashStringHelper * title) {
DWIN_Draw_String(false, false, HEADER_FONT, White, Background_blue, 14, 4, (char*)title);
}
inline void Clear_Menu_Area(void) {
DWIN_Draw_Rectangle(1, Background_black, 0, 31, 272, 360);
}
@@ -568,7 +572,7 @@ inline void Draw_Prepare_Menu() {
}
else {
#ifdef USE_STRING_HEADINGS
Draw_Title("Prepare"); // TODO: GET_TEXT_F
Draw_Title(GET_TEXT_F(MSG_PREPARE));
#else
DWIN_Frame_AreaCopy(1, 178, 2, 271 - 42, 479 - 464 - 1, 14, 8); // "Prepare"
#endif
@@ -611,7 +615,7 @@ inline void Draw_Control_Menu() {
}
else {
#ifdef USE_STRING_HEADINGS
Draw_Title("Control"); // TODO: GET_TEXT_F
Draw_Title(GET_TEXT_F(MSG_CONTROL));
#else
DWIN_Frame_AreaCopy(1, 128, 2, 271 - 95, 479 - 467, 14, 8);
#endif
@@ -656,7 +660,7 @@ inline void Draw_Tune_Menu() {
}
else {
#ifdef USE_STRING_HEADINGS
Draw_Title("Tune"); // TODO: GET_TEXT
Draw_Title(GET_TEXT_F(MSG_TUNE));
#else
DWIN_Frame_AreaCopy(1, 94, 2, 271 - 145, 479 - 467, 14, 9);
#endif
@@ -730,7 +734,7 @@ inline void Draw_Motion_Menu() {
}
else {
#ifdef USE_STRING_HEADINGS
Draw_Title("Motion"); // TODO: GET_TEXT_F
Draw_Title(GET_TEXT_F(MSG_MOTION));
#else
DWIN_Frame_AreaCopy(1, 144, 16, 271 - 82, 479 - 453, 14, 8);
#endif
@@ -947,7 +951,7 @@ void Goto_MainMenu(void) {
}
else {
#ifdef USE_STRING_HEADINGS
Draw_Title("Home"); // TODO: GET_TEXT
Draw_Title(GET_TEXT_F(MSG_MAIN));
#else
DWIN_Frame_AreaCopy(1, 0, 2, 271 - 232, 479 - 467, 14, 9);
#endif
@@ -1714,7 +1718,7 @@ inline void Draw_Info_Menu() {
}
else {
#ifdef USE_STRING_HEADINGS
Draw_Title("Info"); // TODO: GET_TEXT_F
Draw_Title(GET_TEXT_F(MSG_INFO_SCREEN));
#else
DWIN_Frame_AreaCopy(1, 190, 16, 271 - 56, 479 - 453, 14, 8);
#endif
@@ -2091,7 +2095,7 @@ inline void Draw_Move_Menu() {
}
else {
#ifdef USE_STRING_HEADINGS
Draw_Title("Move"); // TODO: GET_TEXT_F
Draw_Title(GET_TEXT_F(MSG_MOVE_AXIS));
#else
DWIN_Frame_AreaCopy(1, 231, 2, 271 - 6, 479 - 467, 14, 8);
#endif
@@ -2245,7 +2249,7 @@ void Draw_Temperature_Menu() {
}
else {
#ifdef USE_STRING_HEADINGS
Draw_Title("Temperature"); // TODO: GET_TEXT_F
Draw_Title(GET_TEXT_F(MSG_TEMPERATURE));
#else
DWIN_Frame_AreaCopy(1, 56, 16, 271 - 130, 479 - 450 - 1, 14, 8);
#endif