From 962592b2f78f7cc7542af98f97e4eac3457bee42 Mon Sep 17 00:00:00 2001 From: olliw42 Date: Wed, 23 Jun 2021 16:23:20 +0200 Subject: [PATCH] Consistify icons for model setting, select, and category --- .../default_theme/mask_menu_model_select.png | Bin 0 -> 1287 bytes .../default_theme/mask_model_select_category.png | Bin 0 -> 803 bytes radio/src/gui/colorlcd/menus.h | 2 ++ radio/src/gui/colorlcd/model_select.cpp | 4 ++-- radio/src/gui/colorlcd/themes/480_bitmaps.h | 6 ++++++ radio/src/gui/colorlcd/themes/480_default.cpp | 2 ++ radio/src/gui/colorlcd/view_main_menu.cpp | 4 ++-- 7 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 radio/src/bitmaps/480x272/default_theme/mask_menu_model_select.png create mode 100644 radio/src/bitmaps/480x272/default_theme/mask_model_select_category.png diff --git a/radio/src/bitmaps/480x272/default_theme/mask_menu_model_select.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_model_select.png new file mode 100644 index 0000000000000000000000000000000000000000..e4d326ce304c18336da053dfde320d6a8eda262f GIT binary patch literal 1287 zcmV+i1^D`jP)0ZdHC=lckkXMolXN_Hk)y|T(q>b(9qBTz^6~2SYKZ!91fGsW&yBR zEO@q`~5{ZqS5H@iR1CO9^iC3C7DdhKSeT`)YYr1TB2Mh-re2R z%jl~d~Rc%-hbPC7a|Bo>SPk@7+nCnqP1 ziBqYRSS%I+4m{JEni~D3Sz20>#l=M#A0L-+I4obkem(Te0kK#tdaEHK;`90R5|_i~ z=BAuHc~U1{Sy_>b7cUARmo8nBjg1Y_G)=yI`69Vou56A%$$dVbh=>>g0)YSkw{PDD zK+`n*em~c)U8A+N6|2=sHk+lpyPMI`(W2gLZEa;`WrZ_m&d}M}NhXsi+qQ+=1ukN- zm;honnop-@QD>9jPsxaJgJmS68#Tx=JpW1K`=SXPh{3g8TRH z)6~?&<;$0O^X3h`y}i7C{hClHgsQ4MdGbV`c2A!^<^B8jY;A3kOeWdh-Ugt$x*C_u z1wbSc!BiObEiEl&OLXtvJv2=N;O*PD%*@O%J3GsrJ9pUH+A6v?m&@rTH5d%EwY72n z{CWEN`f$75I!7Xr_(5Ely@z39VuJns{i7@&mY0`VUS4K?ejc~mt#c$22~58ROixd< zx3>pCMMVXF3noQT^et03ivsrc_W1nyv;IGwPIL9@ReoJ)tE;Qb&CO9!QGv(fDIuw^ zuP@?I6y*o;`uciFz|V>;77K%egVfd4ar5R)o zMx(K;$^wU?D5dRm5PqIqu~Hk%E*-Ojsr?+6Bi z3=9kuJ*CIv;p4}TeEaqdx7$r)VJ`T@vl>?RtsB;jo-LcTNClXlRgyg@v--%WAb2`L1$H!USNoTJd_l zjE#*kJUmQKPY-9$o&}((sfm0(4?tyQWs!=is;aWivbMHXzuwr`V0d^K0I%1J)oLyF xT*qbvj?MZUtJ(W6?d|`|&>!n3%-{ZK`wrc^6OQP}xH$j-002ovPDHLkV1n~3Xm
6iG0Fe{0T0!CD(7Q4j)2;kug@14$O%bveAqT|Dow$%BEJ-I@8=_uKcIafpcU4dLXQq6uz- zzaPA^vVza&V`ylI$H&JngB^|5aaUItmSq8OcXx+nS)81lFgZEN$jAsDkLPn_X&`i6 z7mvpyfB=%oWMq7NTmYGxnvz1HAckRxX_`{0R2tb*K1{V?7#tlPv9`8GBoe{z_fsyH ziN#_h5(!#cTWfP8kqDVghTh&@hKGlFeSQ5qjT4Ck{r&yS&(Cvzf6wyrGMc8L>pIC~ zl5jZ8*47p`H#hY3^q{ILg+c+_wlPf;MNu$KlTxYlIdC?crBbN?aBy%ydwV-OJ39n} zLFVS>xW2w-Vq$`;t1C23BM=C%x3>pCxm+fhOmcgBi)C5l^LgIh-Wt<*c6PR=WiFQ! zRaM_(^+1Xip{!w!{91@L2WpQy)_V@SeH2yT$>2&@U_)!amLUmx}*9;sU z9#XAV0dToo|II+^z#SbOwSKi)<>lq2HZB&6tgf!|Yw2gRSuQRvaJgK>beX z*w~QM(^CP&>-CDR>kaLv{OL>M@i@6$j#8<_($W$G0|PjnP83C9Y;25BD1^h|_^F+u z{F_4}olc`^8n$h-zP?T%5MXzA7sD_(J3C`=aFFx!a{z4HCY4HYd3i~(Sp1q-N2AeN zic_hSjE;^9Abov(l1`^TEFZt$FVD}name, ICON_MODEL), category(category) + PageTab(category->name, ICON_MODEL_SELECT_CATEGORY), category(category) { } @@ -360,7 +360,7 @@ class ModelCategoryPage : public PageTab }; ModelSelectMenu::ModelSelectMenu(): - TabsGroup(ICON_MODEL) + TabsGroup(ICON_MODEL_SELECT) { modelslist.load(); diff --git a/radio/src/gui/colorlcd/themes/480_bitmaps.h b/radio/src/gui/colorlcd/themes/480_bitmaps.h index 2b1df160b..ea278241a 100644 --- a/radio/src/gui/colorlcd/themes/480_bitmaps.h +++ b/radio/src/gui/colorlcd/themes/480_bitmaps.h @@ -61,6 +61,12 @@ const uint8_t mask_model_special_functions[] = { const uint8_t mask_model_telemetry[] = { #include "mask_model_telemetry.lbm" }; +const uint8_t mask_menu_model_select[] = { +#include "mask_menu_model_select.lbm" //TODO: someone may want to make proper icon +}; +const uint8_t mask_model_select_category[] = { +#include "mask_model_select_category.lbm" //TODO: someone should make proper icon +}; const uint8_t mask_monitor[] = { #include "mask_monitor.lbm" }; diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp index 5d5907536..c5159c6b4 100644 --- a/radio/src/gui/colorlcd/themes/480_default.cpp +++ b/radio/src/gui/colorlcd/themes/480_default.cpp @@ -150,6 +150,8 @@ class Theme480: public OpenTxTheme loadMenuIcon(ICON_MODEL_SPECIAL_FUNCTIONS, mask_model_special_functions); loadMenuIcon(ICON_MODEL_LUA_SCRIPTS, mask_model_lua_scripts); loadMenuIcon(ICON_MODEL_TELEMETRY, mask_model_telemetry); + loadMenuIcon(ICON_MODEL_SELECT, mask_menu_model_select); + loadMenuIcon(ICON_MODEL_SELECT_CATEGORY, mask_model_select_category); loadMenuIcon(ICON_STATS, mask_menu_stats); loadMenuIcon(ICON_STATS_THROTTLE_GRAPH, mask_stats_throttle_graph); loadMenuIcon(ICON_STATS_TIMERS, mask_stats_timers); diff --git a/radio/src/gui/colorlcd/view_main_menu.cpp b/radio/src/gui/colorlcd/view_main_menu.cpp index 569baa0a8..b82f9c1cf 100644 --- a/radio/src/gui/colorlcd/view_main_menu.cpp +++ b/radio/src/gui/colorlcd/view_main_menu.cpp @@ -51,7 +51,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) : // "Tasks", 0, FOCUS_COLOR | FONT(XL) | CENTERED); // pos += title->height() + PAGE_LINE_SPACING; - carousel->addButton(ICON_MODEL, "Select\nModel", [=]() -> uint8_t { + carousel->addButton(ICON_MODEL_SELECT, "Select\nModel", [=]() -> uint8_t { deleteLater(); new ModelSelectMenu(); return 0; @@ -63,7 +63,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) : return 0; }); - carousel->addButton(ICON_RADIO_TOOLS, "Model\nSettings", [=]() -> uint8_t { + carousel->addButton(ICON_MODEL, "Model\nSettings", [=]() -> uint8_t { deleteLater(); new ModelMenu(); return 0;