Mercurial > public > ostc4
changeset 865:cb386cccc7c5
When opening the logbook, or scrolling inside a logbook page,
show 'Page' instead of 'Back' to make it clear that this is
the way to page through the logbook pages.
from mikeller
| author | heinrichsweikamp |
|---|---|
| date | Mon, 22 Jul 2024 16:39:48 +0200 |
| parents | fa431d42b5fb |
| children | 3a1c533f3840 |
| files | Discovery/Inc/text_multilanguage.h Discovery/Src/tInfoLog.c Discovery/Src/text_multilanguage.c |
| diffstat | 3 files changed, 23 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Discovery/Inc/text_multilanguage.h Mon Jul 22 16:38:36 2024 +0200 +++ b/Discovery/Inc/text_multilanguage.h Mon Jul 22 16:39:48 2024 +0200 @@ -374,7 +374,9 @@ TXT2BYTE_Starting, TXT2BYTE_Finished, - TXT2BYTE_END + TXT2BYTE_Page, + + TXT2BYTE_END, }; #endif /* TEXT_MULTILINGUAGE_H */
--- a/Discovery/Src/tInfoLog.c Mon Jul 22 16:38:36 2024 +0200 +++ b/Discovery/Src/tInfoLog.c Mon Jul 22 16:39:48 2024 +0200 @@ -233,6 +233,8 @@ infolog.line = 0; infolog.modeFlipPages = 1; + tInfo_write_buttonTextline(&INFOLOGscreen, TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); + if(!settingsGetPointer()->FlipDisplay) { GFX_SetFrameBottom(pMenuCursorDesignSolo->FBStartAdress, 0, 25, 800, 390); @@ -420,12 +422,11 @@ } GFX_write_string(&FontT48, &INFOLOGwindow, text,1); - if(infolog.linesAvailableForPage > 1) + if(infolog.page == 255) { + tInfo_write_buttonTextline(&INFOLOGscreen, TXT2BYTE_ButtonBack,0,0); + } else { tInfo_write_buttonTextline(&INFOLOGscreen, TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); - else if(infolog.page == 255) - tInfo_write_buttonTextline(&INFOLOGscreen, TXT2BYTE_ButtonBack,0,0); - else - tInfo_write_buttonTextline(&INFOLOGscreen, TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,0); + } GFX_SetFrameTop(INFOLOGscreen.FBStartAdress); set_globalState_Log_Page(infolog.page); @@ -443,6 +444,12 @@ infolog.modeFlipPages = 0; + if (infolog.linesAvailableForPage > 1) { + tInfo_write_buttonTextline(&INFOLOGscreen, TXT2BYTE_Page, TXT2BYTE_ButtonEnter, TXT2BYTE_ButtonNext); + } else { + tInfo_write_buttonTextline(&INFOLOGscreen, TXT2BYTE_Page, TXT2BYTE_ButtonEnter, 0); + } + if(!settingsGetPointer()->FlipDisplay) { GFX_SetFrameBottom((pMenuCursor->FBStartAdress) + 65*2*(infolog.line - 1), 0, 25, 800, 390);
--- a/Discovery/Src/text_multilanguage.c Mon Jul 22 16:38:36 2024 +0200 +++ b/Discovery/Src/text_multilanguage.c Mon Jul 22 16:39:48 2024 +0200 @@ -1901,6 +1901,12 @@ static uint8_t text_IT_Finished[] = "Finito"; static uint8_t text_ES_Finished[] = "Terminado"; +static uint8_t text_EN_Page[] = "Page"; +static uint8_t text_DE_Page[] = "Blättern"; +static uint8_t text_FR_Page[] = "Défiler"; +static uint8_t text_IT_Page[] = "Scorrere"; +static uint8_t text_ES_Page[] = "Desplazarse"; + /* Lookup Table -------------------------------------------------------------*/ const tText text_array[] = @@ -2189,4 +2195,6 @@ {(uint8_t)TXT2BYTE_Timer, {text_EN_Timer, text_DE_Timer, text_FR_Timer, text_IT_Timer, text_ES_Timer}}, {(uint8_t)TXT2BYTE_Starting, {text_EN_Starting, text_DE_Starting, text_FR_Starting, text_IT_Starting, text_ES_Starting}}, {(uint8_t)TXT2BYTE_Finished, {text_EN_Finished, text_DE_Finished, text_FR_Finished, text_IT_Finished, text_ES_Finished}}, + + {(uint8_t)TXT2BYTE_Page, {text_EN_Page, text_DE_Page, text_FR_Page, text_IT_Page, text_ES_Page}}, };