Mercurial > public > ostc4
comparison Discovery/Src/tMenuEditSystem.c @ 55:a7683f9765da
Italian activated (needs some fine tuning), special characters (?,?,?,?,? and others) currently not working...
author | heinrichsweikamp |
---|---|
date | Tue, 07 Aug 2018 00:24:05 +0200 |
parents | 5f11787b4f42 |
children | e941c9e49f73 |
comparison
equal
deleted
inserted
replaced
54:321df89d5710 | 55:a7683f9765da |
---|---|
272 if((blockNumber == 0) && (digitContentNew > '0' + 31)) | 272 if((blockNumber == 0) && (digitContentNew > '0' + 31)) |
273 digitContentNew = '1'; | 273 digitContentNew = '1'; |
274 if((blockNumber == 1) && (digitContentNew > '0' + 12)) | 274 if((blockNumber == 1) && (digitContentNew > '0' + 12)) |
275 digitContentNew = '1'; | 275 digitContentNew = '1'; |
276 // year range 2017-2018 | 276 // year range 2017-2018 |
277 if((blockNumber == 2) && (digitContentNew > '0' + 18)) | 277 if((blockNumber == 2) && (digitContentNew > '0' + 22)) |
278 digitContentNew = '0' + 17; | 278 digitContentNew = '0' + 18; |
279 return digitContentNew; | 279 return digitContentNew; |
280 } | 280 } |
281 if(action == ACTION_BUTTON_BACK) | 281 if(action == ACTION_BUTTON_BACK) |
282 { | 282 { |
283 digitContentNew = digitContent - 1; | 283 digitContentNew = digitContent - 1; |
495 if( actualLanguage == pSettings->selected_language) | 495 if( actualLanguage == pSettings->selected_language) |
496 active = 1; | 496 active = 1; |
497 else | 497 else |
498 active = 0; | 498 active = 0; |
499 write_field_on_off(StMSYS2_French, 30, 800, ME_Y_LINE3, &FontT48, text, active); | 499 write_field_on_off(StMSYS2_French, 30, 800, ME_Y_LINE3, &FontT48, text, active); |
500 /* | 500 |
501 | 501 |
502 pSettings->selected_language = LANGUAGE_Italian; | 502 pSettings->selected_language = LANGUAGE_Italian; |
503 if( actualLanguage == pSettings->selected_language) | 503 if( actualLanguage == pSettings->selected_language) |
504 active = 1; | 504 active = 1; |
505 else | 505 else |
506 active = 0; | 506 active = 0; |
507 write_field_on_off(StMSYS2_Italian, 30, 800, ME_Y_LINE4, &FontT48, text, active); | 507 write_field_on_off(StMSYS2_Italian, 30, 800, ME_Y_LINE4, &FontT48, text, active); |
508 | 508 |
509 /* | |
509 pSettings->selected_language = LANGUAGE_Espanol; | 510 pSettings->selected_language = LANGUAGE_Espanol; |
510 if( actualLanguage == pSettings->selected_language) | 511 if( actualLanguage == pSettings->selected_language) |
511 active = 1; | 512 active = 1; |
512 else | 513 else |
513 active = 0; | 514 active = 0; |
518 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); | 519 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); |
519 | 520 |
520 setEvent(StMSYS2_English, (uint32_t)OnAction_English); | 521 setEvent(StMSYS2_English, (uint32_t)OnAction_English); |
521 setEvent(StMSYS2_German, (uint32_t)OnAction_German); | 522 setEvent(StMSYS2_German, (uint32_t)OnAction_German); |
522 setEvent(StMSYS2_French, (uint32_t)OnAction_French); | 523 setEvent(StMSYS2_French, (uint32_t)OnAction_French); |
523 //setEvent(StMSYS2_Italian, (uint32_t)OnAction_Italian); | 524 setEvent(StMSYS2_Italian, (uint32_t)OnAction_Italian); |
524 //setEvent(StMSYS2_Espanol, (uint32_t)OnAction_Espanol); | 525 //setEvent(StMSYS2_Espanol, (uint32_t)OnAction_Espanol); |
525 } | 526 } |
526 | 527 |
527 | 528 |
528 uint8_t OnAction_English (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) | 529 uint8_t OnAction_English (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) |