Datetime display does not display CN/TW translations properly.
This commit is contained in:
@@ -83,13 +83,16 @@ void TopbarImpl::paint(BitmapBuffer * dc)
|
|||||||
struct gtm t;
|
struct gtm t;
|
||||||
gettime(&t);
|
gettime(&t);
|
||||||
char str[10];
|
char str[10];
|
||||||
|
#if defined(TRANSLATIONS_CN) || defined(TRANSLATIONS_TW)
|
||||||
sprintf(str, "%d %s", t.tm_mday, STR_MONTHS[t.tm_mon]);
|
sprintf(str, "%d" TR_MONTH "%d", t.tm_mon + 1, t.tm_mday);
|
||||||
|
#else
|
||||||
|
const char * const STR_MONTHS[] = TR_MONTHS;
|
||||||
|
sprintf(str, "%d %s", t.tm_mday, STR_MONTHS[t.tm_mon]);
|
||||||
|
#endif
|
||||||
//dc->drawSolidVerticalLine(DATETIME_SEPARATOR_X, 7, 31, MENU_COLOR);
|
//dc->drawSolidVerticalLine(DATETIME_SEPARATOR_X, 7, 31, MENU_COLOR);
|
||||||
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE1, str, FONT(XS) | CENTERED| FOCUS_COLOR);
|
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE1, str, FONT(XS)|FOCUS_COLOR|CENTERED);
|
||||||
|
|
||||||
getTimerString(str, getValue(MIXSRC_TX_TIME));
|
getTimerString(str, getValue(MIXSRC_TX_TIME));
|
||||||
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE2, str, FONT(XS) | CENTERED | FOCUS_COLOR);
|
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE2, str, FONT(XS)|FOCUS_COLOR|CENTERED);
|
||||||
|
|
||||||
#if defined(INTERNAL_GPS)
|
#if defined(INTERNAL_GPS)
|
||||||
if (gpsData.fix) {
|
if (gpsData.fix) {
|
||||||
@@ -121,7 +124,7 @@ void TopbarImpl::paint(BitmapBuffer * dc)
|
|||||||
const uint8_t rssiBarsHeight[] = {5, 10, 15, 21, 31};
|
const uint8_t rssiBarsHeight[] = {5, 10, 15, 21, 31};
|
||||||
for (unsigned int i = 0; i < DIM(rssiBarsHeight); i++) {
|
for (unsigned int i = 0; i < DIM(rssiBarsHeight); i++) {
|
||||||
uint8_t height = rssiBarsHeight[i];
|
uint8_t height = rssiBarsHeight[i];
|
||||||
dc->drawSolidFilledRect(LCD_W - 90 + i * 6, 38 - height, 4, height,
|
dc->drawSolidFilledRect(RSSI_X + i * 6, 38 - height, 4, height,
|
||||||
TELEMETRY_RSSI() >= rssiBarsValue[i]
|
TELEMETRY_RSSI() >= rssiBarsValue[i]
|
||||||
? FOCUS_COLOR
|
? FOCUS_COLOR
|
||||||
: MENU_TITLE_DISABLE_COLOR);
|
: MENU_TITLE_DISABLE_COLOR);
|
||||||
@@ -134,32 +137,32 @@ void TopbarImpl::paint(BitmapBuffer * dc)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Audio volume */
|
/* Audio volume */
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 4, LBM_TOPMENU_VOLUME_SCALE, MENU_TITLE_DISABLE_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 4, LBM_TOPMENU_VOLUME_SCALE, MENU_TITLE_DISABLE_COLOR);
|
||||||
if (requiredSpeakerVolume == 0 || g_eeGeneral.beepMode == e_mode_quiet)
|
if (requiredSpeakerVolume == 0 || g_eeGeneral.beepMode == e_mode_quiet)
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 4, LBM_TOPMENU_VOLUME_0, FOCUS_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 4, LBM_TOPMENU_VOLUME_0, FOCUS_COLOR);
|
||||||
else if (requiredSpeakerVolume < 7)
|
else if (requiredSpeakerVolume < 7)
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 4, LBM_TOPMENU_VOLUME_1, FOCUS_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 4, LBM_TOPMENU_VOLUME_1, FOCUS_COLOR);
|
||||||
else if (requiredSpeakerVolume < 13)
|
else if (requiredSpeakerVolume < 13)
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 4, LBM_TOPMENU_VOLUME_2, FOCUS_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 4, LBM_TOPMENU_VOLUME_2, FOCUS_COLOR);
|
||||||
else if (requiredSpeakerVolume < 19)
|
else if (requiredSpeakerVolume < 19)
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 4, LBM_TOPMENU_VOLUME_3, FOCUS_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 4, LBM_TOPMENU_VOLUME_3, FOCUS_COLOR);
|
||||||
else
|
else
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 4, LBM_TOPMENU_VOLUME_4, FOCUS_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 4, LBM_TOPMENU_VOLUME_4, FOCUS_COLOR);
|
||||||
|
|
||||||
/* Tx battery */
|
/* Tx battery */
|
||||||
uint8_t bars = GET_TXBATT_BARS(5);
|
uint8_t bars = GET_TXBATT_BARS(5);
|
||||||
#if defined(USB_CHARGER)
|
#if defined(USB_CHARGER)
|
||||||
if (usbChargerLed()) {
|
if (usbChargerLed()) {
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 25, LBM_TOPMENU_TXBATT_CHARGING, FOCUS_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 25, LBM_TOPMENU_TXBATT_CHARGING, FOCUS_COLOR);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 25, LBM_TOPMENU_TXBATT, FOCUS_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 25, LBM_TOPMENU_TXBATT, FOCUS_COLOR);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
dc->drawBitmapPattern(LCD_W - 130, 25, LBM_TOPMENU_TXBATT, FOCUS_COLOR);
|
dc->drawBitmapPattern(AUDIO_X, 25, LBM_TOPMENU_TXBATT, FOCUS_COLOR);
|
||||||
#endif
|
#endif
|
||||||
for (unsigned int i = 0; i < 5; i++) {
|
for (unsigned int i = 0; i < 5; i++) {
|
||||||
dc->drawSolidFilledRect(LCD_W - 128 + 4 * i, 30, 2, 8, i >= bars ? MENU_TITLE_DISABLE_COLOR : FOCUS_COLOR);
|
dc->drawSolidFilledRect(AUDIO_X - 2 + 4 * i, 30, 2, 8, i >= bars ? MENU_TITLE_DISABLE_COLOR : FOCUS_COLOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
|||||||
@@ -424,7 +424,7 @@ class Theme480: public OpenTxTheme
|
|||||||
struct gtm t;
|
struct gtm t;
|
||||||
gettime(&t);
|
gettime(&t);
|
||||||
char str[10];
|
char str[10];
|
||||||
#if defined(TRANSLATIONS_CN)
|
#if defined(TRANSLATIONS_CN) || defined(TRANSLATIONS_TW)
|
||||||
sprintf(str, "%d" TR_MONTH "%d", t.tm_mon + 1, t.tm_mday);
|
sprintf(str, "%d" TR_MONTH "%d", t.tm_mon + 1, t.tm_mday);
|
||||||
#else
|
#else
|
||||||
const char * const STR_MONTHS[] = TR_MONTHS;
|
const char * const STR_MONTHS[] = TR_MONTHS;
|
||||||
|
|||||||
@@ -416,7 +416,7 @@ class FlyskyTheme: public OpenTxTheme
|
|||||||
gettime(&t);
|
gettime(&t);
|
||||||
char str[10];
|
char str[10];
|
||||||
|
|
||||||
#if defined(TRANSLATIONS_CN)
|
#if defined(TRANSLATIONS_CN) || defined(TRANSLATIONS_TW)
|
||||||
sprintf(str, "%d" TR_MONTH "%d", t.tm_mon + 1, t.tm_mday);
|
sprintf(str, "%d" TR_MONTH "%d", t.tm_mon + 1, t.tm_mday);
|
||||||
#else
|
#else
|
||||||
const char * const STR_MONTHS[] = TR_MONTHS;
|
const char * const STR_MONTHS[] = TR_MONTHS;
|
||||||
|
|||||||
@@ -84,6 +84,9 @@ constexpr uint32_t DATETIME_LINE1 = 7;
|
|||||||
constexpr uint32_t DATETIME_LINE2 = 22;
|
constexpr uint32_t DATETIME_LINE2 = 22;
|
||||||
constexpr uint32_t DATETIME_MIDDLE = (LCD_W + DATETIME_SEPARATOR_X + 1) / 2;
|
constexpr uint32_t DATETIME_MIDDLE = (LCD_W + DATETIME_SEPARATOR_X + 1) / 2;
|
||||||
|
|
||||||
|
constexpr uint32_t RSSI_X = LCD_W - 90;
|
||||||
|
constexpr uint32_t AUDIO_X = LCD_W - 130;
|
||||||
|
|
||||||
constexpr uint32_t MENUS_TOOLBAR_BUTTON_WIDTH = 30;
|
constexpr uint32_t MENUS_TOOLBAR_BUTTON_WIDTH = 30;
|
||||||
constexpr uint32_t MENUS_TOOLBAR_BUTTON_PADDING = 3;
|
constexpr uint32_t MENUS_TOOLBAR_BUTTON_PADDING = 3;
|
||||||
constexpr rect_t MENUS_TOOLBAR_RECT = { 100, 51, 30, 209 };
|
constexpr rect_t MENUS_TOOLBAR_RECT = { 100, 51, 30, 209 };
|
||||||
|
|||||||
Reference in New Issue
Block a user