From 1bf6ada539ab1ecb1d99cea0d8e4afdadfe19178 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Thu, 10 Jun 2021 19:24:33 +0200 Subject: [PATCH] Use a more generic error icon Thx to https://icons8.com --- .../480x272/default_theme/mask_error.png | Bin 0 -> 9396 bytes radio/src/gui/colorlcd/fullscreen_dialog.cpp | 4 ++-- radio/src/gui/colorlcd/theme.cpp | 16 +++++----------- radio/src/gui/colorlcd/theme.h | 3 +-- radio/src/gui/colorlcd/themes/480_default.cpp | 3 +-- 5 files changed, 9 insertions(+), 17 deletions(-) create mode 100755 radio/src/bitmaps/480x272/default_theme/mask_error.png diff --git a/radio/src/bitmaps/480x272/default_theme/mask_error.png b/radio/src/bitmaps/480x272/default_theme/mask_error.png new file mode 100755 index 0000000000000000000000000000000000000000..3bf350e55c65b69be7c640c59d4ccb7a44723b35 GIT binary patch literal 9396 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 Ln(5rpIv@348ANv0 literal 0 HcmV?d00001 diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/fullscreen_dialog.cpp index 4efc67064..97a2f001b 100644 --- a/radio/src/gui/colorlcd/fullscreen_dialog.cpp +++ b/radio/src/gui/colorlcd/fullscreen_dialog.cpp @@ -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) { diff --git a/radio/src/gui/colorlcd/theme.cpp b/radio/src/gui/colorlcd/theme.cpp index f009b3367..b9561fab9 100644 --- a/radio/src/gui/colorlcd/theme.cpp +++ b/radio/src/gui/colorlcd/theme.cpp @@ -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) diff --git a/radio/src/gui/colorlcd/theme.h b/radio/src/gui/colorlcd/theme.h index 2d5c61608..fdd5149c9 100644 --- a/radio/src/gui/colorlcd/theme.h +++ b/radio/src/gui/colorlcd/theme.h @@ -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; }; diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp index 374b474a5..7b18995d1 100644 --- a/radio/src/gui/colorlcd/themes/480_default.cpp +++ b/radio/src/gui/colorlcd/themes/480_default.cpp @@ -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); } }