diff options
author | louis <louis.braun@gmx.de> | 2013-11-02 11:08:25 +0100 |
---|---|---|
committer | louis <louis.braun@gmx.de> | 2013-11-02 11:08:25 +0100 |
commit | fd6d769a610a5103e73c645eba53536ca37662d4 (patch) | |
tree | d1aa8757da6da425b3cf2643e5f226a805a618c4 | |
parent | 573b9a0c6d644086a11d9b4b4c7b6b5d57cc386f (diff) | |
download | skin-nopacity-fd6d769a610a5103e73c645eba53536ca37662d4.tar.gz skin-nopacity-fd6d769a610a5103e73c645eba53536ca37662d4.tar.bz2 |
Added background with dedicated theme color for channel logos in menus
-rw-r--r-- | HISTORY | 3 | ||||
-rw-r--r-- | menuitem.c | 9 | ||||
-rw-r--r-- | menuitem.h | 1 | ||||
-rw-r--r-- | nopacity.c | 2 | ||||
-rw-r--r-- | themes/nOpacity-darkblue.theme | 1 | ||||
-rw-r--r-- | themes/nOpacity-darkgrey.theme | 1 | ||||
-rw-r--r-- | themes/nOpacity-darkred.theme | 1 | ||||
-rw-r--r-- | themes/nOpacity-default.theme | 1 | ||||
-rw-r--r-- | themes/nOpacity-freestyle.theme | 1 | ||||
-rw-r--r-- | themes/nOpacity-green.theme | 1 | ||||
-rw-r--r-- | themes/nOpacity-iceblue.theme | 1 | ||||
-rw-r--r-- | themes/nOpacity-light.theme | 1 |
12 files changed, 22 insertions, 1 deletions
@@ -332,4 +332,5 @@ Version 0.1.4 - Changed display of channel groups in displaychannel - Added configurable transparency for channeldisplay background - Added background with dedicated theme color for status icons in - displaychannel. + displaychannel +- Added background with dedicated theme color for channel logos in menus @@ -211,6 +211,11 @@ void cNopacityMenuItem::DrawRoundedCorners(tColor borderColor) { pixmapBackground->DrawEllipse(cRect(width-radius+1,height-radius+1,radius,radius), clrTransparent, -4); } +void cNopacityMenuItem::DrawChannelLogoBackground(void) { + int logoWidth = config.GetValue("menuItemLogoWidth"); + pixmapBackground->DrawRectangle(cRect(5,7,logoWidth-5, height-14), Theme.Color(clrMenuChannelLogoBack)); +} + // cNopacityMainMenuItem ------------- cNopacityMainMenuItem::cNopacityMainMenuItem(cOsd *osd, cImageCache *imgCache, const char *text, bool sel, bool setup) : cNopacityMenuItem (osd, imgCache, text, sel) { this->isSetup = setup; @@ -521,6 +526,8 @@ void cNopacityScheduleMenuItem::Render() { if (selectable) { titleY = (height - font->Height())/2 - 2; DrawBackground(textLeft); + if (Channel && Channel->Name()) + DrawChannelLogoBackground(); int progressBarDelta = 0; if (config.GetValue("displayType") == dtGraphical && textLeft < 20) progressBarDelta = 10; @@ -872,6 +879,7 @@ std::string cNopacityChannelMenuItem::readEPG(void) { void cNopacityChannelMenuItem::Render() { if (selectable) { //Channels DrawBackground(); + DrawChannelLogoBackground(); if (!drawn) { cImage *logo = imgCache->GetLogo(ctLogoMenuItem, Channel); if (logo) { @@ -1039,6 +1047,7 @@ void cNopacityTimerMenuItem::Render() { textLeft = config.GetValue("menuItemLogoWidth") + 10; if (selectable) { DrawBackground(textLeft); + DrawChannelLogoBackground(); int logoWidth = config.GetValue("menuItemLogoWidth"); int logoHeight = config.GetValue("menuItemLogoHeight"); if (!drawn) { @@ -33,6 +33,7 @@ protected: virtual void SetTextShort(void) {}; void DrawDelimiter(const char *del, const char *icon, eSkinElementType seType); void DrawRoundedCorners(tColor borderColor); + void DrawChannelLogoBackground(void); virtual void Action(void); void DoSleep(int duration); public: @@ -49,6 +49,7 @@ static bool firstDisplay = true; #define CLR_PROGRESSBARHIGH 0xDD003DF5 #define CLR_PROGRESSBARBACKHIGH 0xDD858585 #define CLR_PROGRESSBARBLENDHIGH 0xDD80B3FF +#define CLR_CHANNELLOGOBACK 0xDD858585 //BUTTONS #define CLR_BUTTONRED 0x99BB0000 @@ -135,6 +136,7 @@ THEME_CLR(Theme, clrProgressBarHigh, CLR_PROGRESSBARHIGH); THEME_CLR(Theme, clrProgressBarBackHigh, CLR_PROGRESSBARBACKHIGH); THEME_CLR(Theme, clrProgressBarBlendHigh, CLR_PROGRESSBARBLENDHIGH); THEME_CLR(Theme, clrMenuTextWindow, CLR_TRANSBLACK); +THEME_CLR(Theme, clrMenuChannelLogoBack, CLR_CHANNELLOGOBACK); //BUTTONS THEME_CLR(Theme, clrButtonRed, CLR_BUTTONRED); THEME_CLR(Theme, clrButtonRedBorder, CLR_BUTTONREDBORDER); diff --git a/themes/nOpacity-darkblue.theme b/themes/nOpacity-darkblue.theme index de02b87..94a17ff 100644 --- a/themes/nOpacity-darkblue.theme +++ b/themes/nOpacity-darkblue.theme @@ -63,6 +63,7 @@ clrProgressBarHigh = DD4979b9 clrProgressBarBackHigh = DD858585 clrProgressBarBlendHigh = DD031B3C clrMenuTextWindow = DD000000 +clrMenuChannelLogoBack = DD858585 clrButtonRed = 99BB0000 clrButtonRedBorder = FFBB0000 clrButtonRedFont = FFFFFFFF diff --git a/themes/nOpacity-darkgrey.theme b/themes/nOpacity-darkgrey.theme index c37d649..14bb13b 100644 --- a/themes/nOpacity-darkgrey.theme +++ b/themes/nOpacity-darkgrey.theme @@ -63,6 +63,7 @@ clrProgressBarHigh = DD4E78B1 clrProgressBarBackHigh = DD858585 clrProgressBarBlendHigh = DD80B3FF clrMenuTextWindow = BD000000 +clrMenuChannelLogoBack = DD858585 clrButtonRed = 99BB0000 clrButtonRedBorder = FFBB0000 clrButtonRedFont = FFFFFFFF diff --git a/themes/nOpacity-darkred.theme b/themes/nOpacity-darkred.theme index 21f35fd..cf35c56 100644 --- a/themes/nOpacity-darkred.theme +++ b/themes/nOpacity-darkred.theme @@ -63,6 +63,7 @@ clrProgressBarHigh = DDBB0000 clrProgressBarBackHigh = DD222222 clrProgressBarBlendHigh = DD550000 clrMenuTextWindow = DD000000 +clrMenuChannelLogoBack = DD858585 clrButtonRed = 99BB0000 clrButtonRedBorder = FF000000 clrButtonRedFont = FFFFFFFF diff --git a/themes/nOpacity-default.theme b/themes/nOpacity-default.theme index 8054102..c6586fc 100644 --- a/themes/nOpacity-default.theme +++ b/themes/nOpacity-default.theme @@ -63,6 +63,7 @@ clrProgressBarHigh = DD003DF5 clrProgressBarBackHigh = DD858585 clrProgressBarBlendHigh = DD80B3FF clrMenuTextWindow = DD000000 +clrMenuChannelLogoBack = DD858585 clrButtonRed = 99BB0000 clrButtonRedBorder = FFBB0000 clrButtonRedFont = FFFFFFFF diff --git a/themes/nOpacity-freestyle.theme b/themes/nOpacity-freestyle.theme index f015852..e3ec378 100644 --- a/themes/nOpacity-freestyle.theme +++ b/themes/nOpacity-freestyle.theme @@ -63,6 +63,7 @@ clrProgressBarHigh = DD4E78B1 clrProgressBarBackHigh = DD000000 clrProgressBarBlendHigh = DD80B3FF clrMenuTextWindow = B0000000 +clrMenuChannelLogoBack = 99C6C6C6 clrButtonRed = 99BB0000 clrButtonRedBorder = FFBB0000 clrButtonRedFont = FFFFFFFF diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme index 2725583..5beb36d 100644 --- a/themes/nOpacity-green.theme +++ b/themes/nOpacity-green.theme @@ -63,6 +63,7 @@ clrProgressBarHigh = DDFFCC00 clrProgressBarBackHigh = DD858585 clrProgressBarBlendHigh = DD006600 clrMenuTextWindow = DD000000 +clrMenuChannelLogoBack = DD858585 clrButtonRed = 99BB0000 clrButtonRedBorder = FFBB0000 clrButtonRedFont = FFFFFFFF diff --git a/themes/nOpacity-iceblue.theme b/themes/nOpacity-iceblue.theme index acf0a8e..c41727a 100644 --- a/themes/nOpacity-iceblue.theme +++ b/themes/nOpacity-iceblue.theme @@ -63,6 +63,7 @@ clrProgressBarHigh = DD3F5468 clrProgressBarBackHigh = FF000000 clrProgressBarBlendHigh = DD5A8998 clrMenuTextWindow = DDFFFFFF +clrMenuChannelLogoBack = 99C6C6C6 clrButtonRed = FFCC0000 clrButtonRedBorder = FFCC0000 clrButtonRedFont = FFFFFFFF diff --git a/themes/nOpacity-light.theme b/themes/nOpacity-light.theme index 2bd6194..3ad3b95 100644 --- a/themes/nOpacity-light.theme +++ b/themes/nOpacity-light.theme @@ -63,6 +63,7 @@ clrProgressBarHigh = DDff3300 clrProgressBarBackHigh = DD858585 clrProgressBarBlendHigh = DDff3300 clrMenuTextWindow = AA000000 +clrMenuChannelLogoBack = 99C6C6C6 clrButtonRed = 99BB0000 clrButtonRedBorder = 99BB0000 clrButtonRedFont = FFFFFFFF |