From c0837a59a6e19a3a068ed3e819c382133fff2324 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 10 Nov 2016 21:45:07 +0100 Subject: [PATCH] Add back model bin name, currently needed if you want to use model notes (#3994) * Add back model bin name, currently needed if you want to use model notes * Turn into code graphics by Mhotar(tm) --- .../Default/modelsel/mask_modelname.png | Bin 0 -> 661 bytes radio/src/gui/480x272/bitmaps.cpp | 2 +- radio/src/gui/480x272/bitmaps.h | 1 + radio/src/gui/480x272/model_select.cpp | 11 +++-- radio/src/gui/480x272/themes/default.cpp | 43 ++++++++++-------- 5 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 radio/sdcard/horus/THEMES/Default/modelsel/mask_modelname.png diff --git a/radio/sdcard/horus/THEMES/Default/modelsel/mask_modelname.png b/radio/sdcard/horus/THEMES/Default/modelsel/mask_modelname.png new file mode 100644 index 0000000000000000000000000000000000000000..2edca73ea45ab919f028ad7cc89dea05dfd66eb3 GIT binary patch literal 661 zcmV;G0&4w}NizgN z{1a?MEYhT~N*5Aq3k9(ntZkwQ7Pg8YCPmVSh2Usq1V56KV%c%Cg}VnXk9T=L4)>l1 zlH6{$R1}5DWRf0_hbEJWMx&8uXJ?dUnYCJto6UxQ3ghvZk|Ytp!SeZhe0zJ_gRxlb zpV03Lhr=4Ex7lp?U%6ba{bfF%GnGnFuh$=RlVzE+*-UdZRI61eih`Gy7u4%@^m;u^ zCKCXF!{LA=Nw~SWfh0*N7K_N|^S>M|77JxrW~bBPcDv=@TCdk^x7)nBx}w|d-Y=(8 zsqpCNhyZA{S{Vw3czu1%L?S^^6lpe_34lhUk&2@HjAJ+)GMmlP>-GMaRS*OQ0s-c7 zIljKWax$6h!OP1_jz%M`@$vD&_xE=$77MOcE3H2m3>XT9_RDd(T=4t-NF)-7$K$xT zxPZgqz;rr=s;U?a252^$Xfzs#Mx$C9I#pF!C=^gGm$6>20RWjy2BIixj|4%0+wF$e z>xIE!fZc8f?(XjR_4UQYV!?X7&d0|`K0Q4h%(UC>62V}Q(P)&dR*RpXpCrlq`}>37 z^Yb%x{eGXaEMq(#!)moc6h++L-eR}gfuwc{f&iP%hU4R7oSvQnB)MEJSt^y7PN#W( veomcE$CHy2I-O2NA`w13JWy5DA0Oiz#dxpUGm9As00000NkvXXu0mjfg{vY) literal 0 HcmV?d00001 diff --git a/radio/src/gui/480x272/bitmaps.cpp b/radio/src/gui/480x272/bitmaps.cpp index 2e9996ae4..a70f73a3e 100644 --- a/radio/src/gui/480x272/bitmaps.cpp +++ b/radio/src/gui/480x272/bitmaps.cpp @@ -183,6 +183,7 @@ const uint8_t LBM_SWIPE_RIGHT[] = { BitmapBuffer * modelselIconBitmap = NULL; BitmapBuffer * modelselSdFreeBitmap = NULL; BitmapBuffer * modelselModelQtyBitmap = NULL; +BitmapBuffer * modelselModelNameBitmap = NULL; BitmapBuffer * modelselModelMoveBackground = NULL; BitmapBuffer * modelselModelMoveIcon = NULL; BitmapBuffer * chanMonLockedBitmap = NULL; @@ -200,4 +201,3 @@ BitmapBuffer * mixerSetupDelayBitmap = NULL; BitmapBuffer * mixerSetupSlowBitmap = NULL; BitmapBuffer * mixerSetupDelaySlowBitmap = NULL; BitmapBuffer * mixerSetupFlightmodeBitmap = NULL; - diff --git a/radio/src/gui/480x272/bitmaps.h b/radio/src/gui/480x272/bitmaps.h index 6bea462f7..5bc9c010b 100644 --- a/radio/src/gui/480x272/bitmaps.h +++ b/radio/src/gui/480x272/bitmaps.h @@ -74,6 +74,7 @@ extern const uint8_t LBM_SWIPE_RIGHT[]; extern BitmapBuffer * modelselIconBitmap; extern BitmapBuffer * modelselSdFreeBitmap; extern BitmapBuffer * modelselModelQtyBitmap; +extern BitmapBuffer * modelselModelNameBitmap; extern BitmapBuffer * modelselModelMoveBackground; extern BitmapBuffer * modelselModelMoveIcon; diff --git a/radio/src/gui/480x272/model_select.cpp b/radio/src/gui/480x272/model_select.cpp index a7218b577..ddf5ab4ed 100644 --- a/radio/src/gui/480x272/model_select.cpp +++ b/radio/src/gui/480x272/model_select.cpp @@ -346,7 +346,8 @@ bool menuModelSelect(event_t event) drawModel(MODELS_LEFT, y, *it, current, selected); } if (selected) { - // lcdDrawText(MODELS_LEFT, LCD_H-FH-1, (*it)->name, TEXT_COLOR); + lcd->drawBitmap(5, LCD_H-FH, modelselModelNameBitmap); + lcdDrawText(22, LCD_H-FH-1, (*it)->name, TEXT_COLOR); } } } @@ -371,11 +372,11 @@ bool menuModelSelect(event_t event) drawVerticalScrollbar(DEFAULT_SCROLLBAR_X, 7, LCD_H - 15, menuVerticalOffset, (index + 1) / 2, 4); // Footer - lcd->drawBitmap(5, LCD_H-FH, modelselSdFreeBitmap); + lcd->drawBitmap(5, LCD_H-FH-20, modelselSdFreeBitmap); uint32_t size = sdGetSize() / 100; - lcdDrawNumber(22, LCD_H-FH-1, size, PREC1, 0, NULL, "GB"); - lcd->drawBitmap(80, LCD_H-FH, modelselModelQtyBitmap); - lcdDrawNumber(105, LCD_H-FH-1, modelslist.modelsCount); + lcdDrawNumber(22, LCD_H-FH-21, size, PREC1, 0, NULL, "GB"); + lcd->drawBitmap(80, LCD_H-FH-20, modelselModelQtyBitmap); + lcdDrawNumber(105, LCD_H-FH-21, modelslist.modelsCount); return true; } diff --git a/radio/src/gui/480x272/themes/default.cpp b/radio/src/gui/480x272/themes/default.cpp index 971a87060..e973134e7 100644 --- a/radio/src/gui/480x272/themes/default.cpp +++ b/radio/src/gui/480x272/themes/default.cpp @@ -143,7 +143,7 @@ class DefaultTheme: public Theme currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR); currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR); currentMenuBackground->drawMask(10, 39, dot, MENU_TITLE_COLOR); - + delete topleftBitmap; topleftBitmap = BitmapBuffer::loadMaskOnBackground("topleft.png", TITLE_BGCOLOR, HEADER_BGCOLOR); @@ -169,56 +169,59 @@ class DefaultTheme: public Theme delete modelselModelQtyBitmap; modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", TEXT_COLOR, TEXT_BGCOLOR); + delete modelselModelNameBitmap; + modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", TEXT_COLOR, TEXT_BGCOLOR); + delete modelselModelMoveBackground; modelselModelMoveBackground = BitmapBuffer::loadMask(getThemePath("modelsel/mask_moveback.png")); delete modelselModelMoveIcon; modelselModelMoveIcon = BitmapBuffer::loadMask(getThemePath("modelsel/mask_moveico.png")); - + // Channels monitor screen delete chanMonLockedBitmap; chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", TEXT_COLOR, TEXT_BGCOLOR); - + delete chanMonInvertedBitmap; chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", TEXT_COLOR, TEXT_BGCOLOR); - + // Mixer setup screen delete mixerSetupMixerBitmap; mixerSetupMixerBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_mixer.png", MENU_TITLE_COLOR, HEADER_BGCOLOR); - + delete mixerSetupToBitmap; - mixerSetupToBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_to.png", MENU_TITLE_COLOR, HEADER_BGCOLOR); + mixerSetupToBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_to.png", MENU_TITLE_COLOR, HEADER_BGCOLOR); delete mixerSetupOutputBitmap; - mixerSetupOutputBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_output.png", MENU_TITLE_COLOR, HEADER_BGCOLOR); + mixerSetupOutputBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_output.png", MENU_TITLE_COLOR, HEADER_BGCOLOR); delete mixerSetupAddBitmap; mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", TEXT_COLOR, TEXT_BGCOLOR); - + delete mixerSetupMultiBitmap; mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", TEXT_COLOR, TEXT_BGCOLOR); - + delete mixerSetupReplaceBitmap; - mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", TEXT_COLOR, TEXT_BGCOLOR); - + mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", TEXT_COLOR, TEXT_BGCOLOR); + delete mixerSetupLabelBitmap; - mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", TEXT_COLOR, TEXT_BGCOLOR); - + mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", TEXT_COLOR, TEXT_BGCOLOR); + delete mixerSetupCurveBitmap; - mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", TEXT_COLOR, TEXT_BGCOLOR); - + mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", TEXT_COLOR, TEXT_BGCOLOR); + delete mixerSetupSwitchBitmap; - mixerSetupSwitchBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_switch.png", TEXT_COLOR, TEXT_BGCOLOR); - + mixerSetupSwitchBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_switch.png", TEXT_COLOR, TEXT_BGCOLOR); + delete mixerSetupFlightmodeBitmap; mixerSetupFlightmodeBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_fm.png", TEXT_COLOR, TEXT_BGCOLOR); - + delete mixerSetupSlowBitmap; mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", TEXT_COLOR, TEXT_BGCOLOR); - + delete mixerSetupDelayBitmap; mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", TEXT_COLOR, TEXT_BGCOLOR); - + delete mixerSetupDelaySlowBitmap; mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", TEXT_COLOR, TEXT_BGCOLOR); }