diff --git a/radio/src/Makefile b/radio/src/Makefile index 0640d8ac4..515715e7d 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -393,7 +393,7 @@ endif IMG2LBM = -$(PYTHON) ../util/img2lbm.py BIN2LBM = -$(PYTHON) ../util/bin2lbm.py -FONT2PNG = -xvfb-run $(PYTHON) ../util/font2png.py +FONT2PNG = -$(PYTHON) ../util/font2png.py TRANSLATE = -$(PYTHON) ../util/translate.py VERSION = 2.2.0$(OPENTX_VERSION_SUFFIX) diff --git a/radio/src/gui/Horus/bitmaps.cpp b/radio/src/gui/Horus/bitmaps.cpp index 0dcd39ba1..2b9e3d0cb 100644 --- a/radio/src/gui/Horus/bitmaps.cpp +++ b/radio/src/gui/Horus/bitmaps.cpp @@ -212,3 +212,6 @@ const uint8_t * const LBM_MODEL_ICONS[] = { LBM_TELEMETRY_ICON }; +const uint16_t LBM_ASTERISK[] = { +#include "../../bitmaps/Horus/asterisk.lbm" +}; diff --git a/radio/src/gui/Horus/gui.h b/radio/src/gui/Horus/gui.h index 9c4628839..fea301634 100644 --- a/radio/src/gui/Horus/gui.h +++ b/radio/src/gui/Horus/gui.h @@ -98,3 +98,5 @@ extern const uint8_t LBM_RSCALE[]; extern const uint8_t * const LBM_RADIO_ICONS[]; extern const uint8_t * const LBM_MODEL_ICONS[]; +extern const uint16_t LBM_ASTERISK[]; + diff --git a/radio/src/gui/Horus/lcd.cpp b/radio/src/gui/Horus/lcd.cpp index f27968745..c8350f003 100644 --- a/radio/src/gui/Horus/lcd.cpp +++ b/radio/src/gui/Horus/lcd.cpp @@ -143,7 +143,7 @@ uint8_t getStringInfo(const char *s) int getFontHeight(LcdFlags flags) { - static const int heightTable[16] = { 12, 10, 11, 14, 18, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12 }; + static const int heightTable[16] = { 12, 10, 11, 14, 32, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12 }; return heightTable[FONTSIZE(flags) >> 8]; } diff --git a/radio/src/gui/Horus/menus.h b/radio/src/gui/Horus/menus.h index 8363231c2..3c33771cc 100644 --- a/radio/src/gui/Horus/menus.h +++ b/radio/src/gui/Horus/menus.h @@ -267,14 +267,14 @@ extern uint8_t s_warning_type; #define MENU_X 80 #define MENU_W LCD_W-(2*MENU_X) -#define POPUP_X 45 +#define POPUP_X 130 #define POPUP_Y 70 -#define POPUP_W LCD_W-(2*POPUP_X) -#define POPUP_H 90 +#define POPUP_W 300 +#define POPUP_H 130 #define WARNING_LINE_LEN 32 #define WARNING_LINE_X (POPUP_X+86) #define WARNING_LINE_Y (POPUP_Y+9) -#define WARNING_INFOLINE_Y (WARNING_LINE_Y+43) +#define WARNING_INFOLINE_Y (WARNING_LINE_Y+64) void displayBox(); void displayPopup(const char *title); diff --git a/radio/src/gui/Horus/popups.cpp b/radio/src/gui/Horus/popups.cpp index fdeb79ef1..7530e9770 100644 --- a/radio/src/gui/Horus/popups.cpp +++ b/radio/src/gui/Horus/popups.cpp @@ -52,7 +52,7 @@ void displayAlertBox() lcdDrawSolidFilledRect(POPUP_X, POPUP_Y, POPUP_W, POPUP_H, TEXT_BGCOLOR); lcdDrawRect(POPUP_X, POPUP_Y, POPUP_W, POPUP_H, SOLID, ALARM_COLOR); lcdDrawRect(POPUP_X+1, POPUP_Y+1, POPUP_W-2, POPUP_H-2, SOLID, ALARM_COLOR); - // lcdDrawBitmap(POPUP_X+15, POPUP_Y+20, LBM_ALERT); + lcdDrawBitmap(POPUP_X-80, POPUP_Y-30, LBM_ASTERISK); } void displayWarningBox() @@ -79,10 +79,10 @@ void message(const pm_char *title, const pm_char *t, const char *last MESSAGE_SO #if defined(TRANSLATIONS_FR) || defined(TRANSLATIONS_IT) || defined(TRANSLATIONS_CZ) lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y, STR_WARNING, ALARM_COLOR|DBLSIZE); - lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+15, title, ALARM_COLOR|DBLSIZE); + lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+25, title, ALARM_COLOR|DBLSIZE); #else lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y, title, ALARM_COLOR|DBLSIZE); - lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+15, STR_WARNING, ALARM_COLOR|DBLSIZE); + lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+25, STR_WARNING, ALARM_COLOR|DBLSIZE); #endif if (t) lcd_puts(WARNING_LINE_X, WARNING_INFOLINE_Y, t);