piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Horus] Warning started. No transparency for now

Browse Source
This commit is contained in:
Bertrand Songis
2015-10-25 18:02:46 +01:00
parent 0e34c24d96
commit fcb845a6b2
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/Makefile
+1 -1
View File
@@ -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)
radio/src/gui/Horus/bitmaps.cpp
+3
View File
@@ -212,3 +212,6 @@ const uint8_t * const LBM_MODEL_ICONS[] = {
LBM_TELEMETRY_ICON
};
const uint16_t LBM_ASTERISK[] = {
#include "../../bitmaps/Horus/asterisk.lbm"
};
radio/src/gui/Horus/gui.h
+2
View File
@@ -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[];
radio/src/gui/Horus/lcd.cpp
+1 -1
View File
@@ -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];
}
radio/src/gui/Horus/menus.h
+4 -4
View File
@@ -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);
radio/src/gui/Horus/popups.cpp
+3 -3
View File
@@ -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);