Use a more generic error icon

Thx to https://icons8.com
This commit is contained in:
Raphael Coeffic
2021-06-10 19:58:47 +02:00
parent 4bcb703345
commit 1bf6ada539
5 changed files with 9 additions and 17 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

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