BIN
Binary file not shown.
|
After Width: | Height: | Size: 9.2 KiB |
@@ -55,13 +55,13 @@ void FullScreenDialog::paint(BitmapBuffer * dc)
|
|||||||
|
|
||||||
if (type == WARNING_TYPE_ALERT || type == WARNING_TYPE_ASTERISK) {
|
if (type == WARNING_TYPE_ALERT || type == WARNING_TYPE_ASTERISK) {
|
||||||
dc->drawMask(ALERT_BITMAP_LEFT, ALERT_BITMAP_TOP,
|
dc->drawMask(ALERT_BITMAP_LEFT, ALERT_BITMAP_TOP,
|
||||||
OpenTxTheme::instance()->asterisk, ALARM_COLOR);
|
OpenTxTheme::instance()->error, ALARM_COLOR);
|
||||||
} else if (type == WARNING_TYPE_INFO) {
|
} else if (type == WARNING_TYPE_INFO) {
|
||||||
dc->drawMask(ALERT_BITMAP_LEFT, ALERT_BITMAP_TOP,
|
dc->drawMask(ALERT_BITMAP_LEFT, ALERT_BITMAP_TOP,
|
||||||
OpenTxTheme::instance()->busy, ALARM_COLOR);
|
OpenTxTheme::instance()->busy, ALARM_COLOR);
|
||||||
} else { // confirmation
|
} else { // confirmation
|
||||||
dc->drawMask(ALERT_BITMAP_LEFT, ALERT_BITMAP_TOP,
|
dc->drawMask(ALERT_BITMAP_LEFT, ALERT_BITMAP_TOP,
|
||||||
OpenTxTheme::instance()->question, ALARM_COLOR);
|
OpenTxTheme::instance()->error, ALARM_COLOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type == WARNING_TYPE_ALERT) {
|
if (type == WARNING_TYPE_ALERT) {
|
||||||
|
|||||||
@@ -25,8 +25,7 @@
|
|||||||
//#include "modal_window.h"
|
//#include "modal_window.h"
|
||||||
|
|
||||||
extern OpenTxTheme * defaultTheme;
|
extern OpenTxTheme * defaultTheme;
|
||||||
const BitmapBuffer * OpenTxTheme::asterisk = nullptr;
|
const BitmapBuffer * OpenTxTheme::error = nullptr;
|
||||||
const BitmapBuffer * OpenTxTheme::question = nullptr;
|
|
||||||
const BitmapBuffer * OpenTxTheme::busy = nullptr;
|
const BitmapBuffer * OpenTxTheme::busy = nullptr;
|
||||||
const BitmapBuffer * OpenTxTheme::shutdown = nullptr;
|
const BitmapBuffer * OpenTxTheme::shutdown = nullptr;
|
||||||
|
|
||||||
@@ -45,12 +44,9 @@ const uint8_t LBM_USB_PLUGGED[] = {
|
|||||||
#include "mask_usb_symbol.lbm"
|
#include "mask_usb_symbol.lbm"
|
||||||
};
|
};
|
||||||
|
|
||||||
const uint8_t asterisk_bitmap[] = {
|
|
||||||
#include "mask_asterisk.lbm"
|
|
||||||
};
|
|
||||||
|
|
||||||
const uint8_t question_bitmap[] = {
|
const uint8_t error_bitmap[] = {
|
||||||
#include "mask_question.lbm"
|
#include "mask_error.lbm"
|
||||||
};
|
};
|
||||||
|
|
||||||
const uint8_t busy_bitmap[] = {
|
const uint8_t busy_bitmap[] = {
|
||||||
@@ -88,10 +84,8 @@ void OpenTxTheme::init() const
|
|||||||
|
|
||||||
void OpenTxTheme::load() const
|
void OpenTxTheme::load() const
|
||||||
{
|
{
|
||||||
if (!asterisk)
|
if (!error)
|
||||||
asterisk = BitmapBuffer::load8bitMask(asterisk_bitmap);
|
error = BitmapBuffer::load8bitMask(error_bitmap);
|
||||||
if (!question)
|
|
||||||
question = BitmapBuffer::load8bitMask(question_bitmap);
|
|
||||||
if (!busy)
|
if (!busy)
|
||||||
busy = BitmapBuffer::load8bitMask(busy_bitmap);
|
busy = BitmapBuffer::load8bitMask(busy_bitmap);
|
||||||
if (!shutdown)
|
if (!shutdown)
|
||||||
|
|||||||
@@ -111,8 +111,7 @@ class OpenTxTheme: public Theme
|
|||||||
BitmapBuffer * thumb;
|
BitmapBuffer * thumb;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static const BitmapBuffer * asterisk;
|
static const BitmapBuffer * error;
|
||||||
static const BitmapBuffer * question;
|
|
||||||
static const BitmapBuffer * busy;
|
static const BitmapBuffer * busy;
|
||||||
static const BitmapBuffer * shutdown;
|
static const BitmapBuffer * shutdown;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -334,8 +334,7 @@ class Theme480: public OpenTxTheme
|
|||||||
dc->drawBitmap(0 - dc->getOffsetX(), 0 - dc->getOffsetY(), backgroundBitmap);
|
dc->drawBitmap(0 - dc->getOffsetX(), 0 - dc->getOffsetY(), backgroundBitmap);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
lcdSetColor(g_eeGeneral.themeData.options[0].value.unsignedValue);
|
dc->drawSolidFilledRect(0, 0, LCD_W, LCD_H, DEFAULT_BGCOLOR);
|
||||||
dc->drawSolidFilledRect(0, 0, LCD_W, LCD_H, CUSTOM_COLOR);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user