Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

3djc/horus cosmetics (#3640)

Browse source 
* Move miscellaneous bitmaps load to a specific function

* Adujst channel monitors colors for Darkblue
This commit is contained in:
3djc 2016-06-30 20:36:11 +02:00 • committed by Bertrand Songis
parent 9b7a4352d6
commit fef4bff9fa
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
radio/src/gui/horus/themes/darkblue.cpp
View file

@ -56,9 +56,9 @@ class DarkblueTheme: public Theme
lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = BLACK; lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = BLACK;
lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = RGB(10, 78, 121); lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = RGB(10, 78, 121);
lcdColorTable[OVERLAY_COLOR_INDEX] = BLACK; lcdColorTable[OVERLAY_COLOR_INDEX] = BLACK;
lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED; lcdColorTable[BARGRAPH1_COLOR_INDEX] = RGB(15, 150, 250);
lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(167, 167, 167); lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(167, 167, 167);
lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(222, 222, 222); lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(97, 97, 102);
} }
void loadMenuIcon(uint8_t index, const char * filename) const void loadMenuIcon(uint8_t index, const char * filename) const
@ -116,7 +116,10 @@ class DarkblueTheme: public Theme
loadMenuIcon(ICON_MONITOR_CHANNELS3, "mask_monitor_channels3.png"); loadMenuIcon(ICON_MONITOR_CHANNELS3, "mask_monitor_channels3.png");
loadMenuIcon(ICON_MONITOR_CHANNELS4, "mask_monitor_channels4.png"); loadMenuIcon(ICON_MONITOR_CHANNELS4, "mask_monitor_channels4.png");
loadMenuIcon(ICON_MONITOR_LOGICAL_SWITCHES, "/mask_monitor_logsw.png"); loadMenuIcon(ICON_MONITOR_LOGICAL_SWITCHES, "/mask_monitor_logsw.png");
}
void loadThemeBitmaps() const
{
// Channels monitor screen // Channels monitor screen
delete chanMonLockedBitmap; delete chanMonLockedBitmap;
chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", TEXT_COLOR, TEXT_BGCOLOR); chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", TEXT_COLOR, TEXT_BGCOLOR);
@ -143,12 +146,12 @@ class DarkblueTheme: public Theme
delete mixerSetupReplaceBitmap; delete mixerSetupReplaceBitmap;
mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", TEXT_COLOR, TEXT_BGCOLOR); mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", TEXT_COLOR, TEXT_BGCOLOR);
} }
virtual void load() const virtual void load() const
{ {
loadColors(); loadColors();
loadMenusIcons(); loadMenusIcons();
loadThemeBitmaps();
loadFontCache(); loadFontCache();
} }

13
radio/src/gui/horus/themes/default.cpp
View file

@ -143,10 +143,17 @@ class DefaultTheme: public Theme
currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR); currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR);
currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR); currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR);
currentMenuBackground->drawMask(10, 39, dot, MENU_TITLE_COLOR); currentMenuBackground->drawMask(10, 39, dot, MENU_TITLE_COLOR);
delete topleftBitmap; delete topleftBitmap;
topleftBitmap = BitmapBuffer::loadMaskOnBackground("topleft.png", TITLE_BGCOLOR, HEADER_BGCOLOR); topleftBitmap = BitmapBuffer::loadMaskOnBackground("topleft.png", TITLE_BGCOLOR, HEADER_BGCOLOR);
delete background;
delete shadow;
delete dot;
}
void loadThemeBitmaps() const
{
// Model Selection screen // Model Selection screen
delete modelselIconBitmap; delete modelselIconBitmap;
modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR); modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR);
@ -194,9 +201,6 @@ class DefaultTheme: public Theme
delete mixerSetupReplaceBitmap; 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 background;
delete shadow;
delete dot;
} }
virtual void load() const virtual void load() const
@ -223,6 +227,7 @@ class DefaultTheme: public Theme
lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = color; lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = color;
lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = color; lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = color;
loadIcons(); loadIcons();
loadThemeBitmaps();
loadFontCache(); loadFontCache();
} }