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 000000000..2edca73ea Binary files /dev/null and b/radio/sdcard/horus/THEMES/Default/modelsel/mask_modelname.png differ 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); }