diff --git a/radio/sdcard/horus/THEMES/Darkblue/horus.bmp b/radio/sdcard/horus/THEMES/Darkblue/horus.bmp new file mode 100644 index 000000000..98bc631cd Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/horus.bmp differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_bg.png b/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_bg.png new file mode 100644 index 000000000..715792023 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_bg.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_dot.png b/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_dot.png new file mode 100644 index 000000000..6f76965a9 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_dot.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_shadow.png b/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_shadow.png new file mode 100644 index 000000000..97bf6c577 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_currentmenu_shadow.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor.png new file mode 100644 index 000000000..68ddd4516 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels1.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels1.png new file mode 100644 index 000000000..b886fc1bc Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels1.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels2.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels2.png new file mode 100644 index 000000000..4d0354e25 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels2.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels3.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels3.png new file mode 100644 index 000000000..d9ba27de7 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels3.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels4.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels4.png new file mode 100644 index 000000000..fb321151f Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_channels4.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_gvars.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_gvars.png new file mode 100644 index 000000000..55b488d1e Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_gvars.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_logsw.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_logsw.png new file mode 100644 index 000000000..dc6355143 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_logsw.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_mixes1.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_mixes1.png new file mode 100644 index 000000000..7b0c71f60 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_mixes1.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_mixes2.png b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_mixes2.png new file mode 100644 index 000000000..f8c04780e Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_monitor_mixes2.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_opentx.png b/radio/sdcard/horus/THEMES/Darkblue/mask_opentx.png new file mode 100644 index 000000000..df2b0b356 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_opentx.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_opentx_testmode.png b/radio/sdcard/horus/THEMES/Darkblue/mask_opentx_testmode.png new file mode 100644 index 000000000..b535cf8ee Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_opentx_testmode.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_switches.png b/radio/sdcard/horus/THEMES/Darkblue/mask_switches.png new file mode 100644 index 000000000..4097ed751 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/mask_switches.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_boat1.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_boat1.png new file mode 100644 index 000000000..a9335c4bc Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_boat1.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_boat2.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_boat2.png new file mode 100644 index 000000000..e3c899d18 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_boat2.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_default.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_default.png new file mode 100644 index 000000000..6f3042c67 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_default.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_favorites.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_favorites.png new file mode 100644 index 000000000..e4a37dacb Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_favorites.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane1.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane1.png new file mode 100644 index 000000000..a49a50271 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane1.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane2.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane2.png new file mode 100644 index 000000000..8305b4150 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane2.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane3.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane3.png new file mode 100644 index 000000000..d998144b2 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/icon_plane3.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png new file mode 100644 index 000000000..e8a6c0b32 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_modelname.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_modelname.png new file mode 100644 index 000000000..2edca73ea Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_modelname.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_modelqty.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_modelqty.png new file mode 100644 index 000000000..9a38e4f13 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_modelqty.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_moveback.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_moveback.png new file mode 100644 index 000000000..63f56df92 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_moveback.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_moveico.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_moveico.png new file mode 100644 index 000000000..3662b9bb0 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_moveico.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_sdfree.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_sdfree.png new file mode 100644 index 000000000..f0ae81982 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_sdfree.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/stick_background.png b/radio/sdcard/horus/THEMES/Darkblue/stick_background.png new file mode 100644 index 000000000..9f6d53d92 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/stick_background.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/stick_pointer.png b/radio/sdcard/horus/THEMES/Darkblue/stick_pointer.png new file mode 100644 index 000000000..0d75765f9 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/stick_pointer.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/topleft.png b/radio/sdcard/horus/THEMES/Darkblue/topleft.png new file mode 100644 index 000000000..603bfe1cf Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/topleft.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/trackp_background.png b/radio/sdcard/horus/THEMES/Darkblue/trackp_background.png new file mode 100644 index 000000000..5beada59e Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/trackp_background.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/wizard/background.png b/radio/sdcard/horus/THEMES/Darkblue/wizard/background.png new file mode 100644 index 000000000..6b31b2914 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/wizard/background.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/wizard/itembg.png b/radio/sdcard/horus/THEMES/Darkblue/wizard/itembg.png new file mode 100644 index 000000000..b899446b2 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/wizard/itembg.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/wizard/pgdn.png b/radio/sdcard/horus/THEMES/Darkblue/wizard/pgdn.png new file mode 100644 index 000000000..6a1377620 Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/wizard/pgdn.png differ diff --git a/radio/sdcard/horus/THEMES/Darkblue/wizard/pgup.png b/radio/sdcard/horus/THEMES/Darkblue/wizard/pgup.png new file mode 100644 index 000000000..06fab5cac Binary files /dev/null and b/radio/sdcard/horus/THEMES/Darkblue/wizard/pgup.png differ diff --git a/radio/src/gui/480x272/themes/darkblue.cpp b/radio/src/gui/480x272/themes/darkblue.cpp index ac65869d5..242166450 100644 --- a/radio/src/gui/480x272/themes/darkblue.cpp +++ b/radio/src/gui/480x272/themes/darkblue.cpp @@ -117,53 +117,77 @@ class DarkblueTheme: public Theme loadMenuIcon(ICON_MONITOR_CHANNELS4, "mask_monitor_channels4.png"); loadMenuIcon(ICON_MONITOR_LOGICAL_SWITCHES, "/mask_monitor_logsw.png"); } - + void loadThemeBitmaps() const - { + { + // Model Selection screen + delete modelselIconBitmap; + modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TEXT_BGCOLOR, TITLE_BGCOLOR); + if (modelselIconBitmap) { + BitmapBuffer * bitmap = BitmapBuffer::load(getThemePath("modelsel/icon_default.png")); + modelselIconBitmap->drawBitmap(25, 8, bitmap); + delete bitmap; + } + + delete modelselSdFreeBitmap; + modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", TEXT_COLOR, TEXT_BGCOLOR); + + 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", TEXT_BGCOLOR, HEADER_BGCOLOR); + mixerSetupToBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_to.png", TEXT_BGCOLOR, 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 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); - + mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", TEXT_COLOR, TEXT_BGCOLOR); + delete mixerSetupDelaySlowBitmap; mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", TEXT_COLOR, TEXT_BGCOLOR); - + delete mixerSetupFlightmodeBitmap; mixerSetupFlightmodeBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_fm.png", TEXT_COLOR, TEXT_BGCOLOR); }