summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2013-11-02 10:24:39 +0100
committerlouis <louis.braun@gmx.de>2013-11-02 10:24:39 +0100
commit13197227a45203a1e67e5062a9dc60b8c23e9c73 (patch)
treeaecf9df047513fb2afb78cec204c3b980e3c756d
parentf886f49ba90a8673d7e63550a7f87247fd633ffa (diff)
downloadskin-nopacity-13197227a45203a1e67e5062a9dc60b8c23e9c73.tar.gz
skin-nopacity-13197227a45203a1e67e5062a9dc60b8c23e9c73.tar.bz2
Added background for status icons in displaychannel
Diffstat
-rw-r--r--HISTORY2
-rw-r--r--displaychannelview.c25
-rw-r--r--displaychannelview.h1
-rw-r--r--nopacity.c5
-rw-r--r--themes/nOpacity-darkblue.theme4
-rw-r--r--themes/nOpacity-darkgrey.theme4
-rw-r--r--themes/nOpacity-darkred.theme4
-rw-r--r--themes/nOpacity-default.theme4
-rw-r--r--themes/nOpacity-freestyle.theme8
-rw-r--r--themes/nOpacity-green.theme4
-rw-r--r--themes/nOpacity-iceblue.theme4
-rw-r--r--themes/nOpacity-light.theme4
12 files changed, 38 insertions, 31 deletions
diff --git a/HISTORY b/HISTORY
index 35f2b57..c6df886 100644
--- a/HISTORY
+++ b/HISTORY
@@ -331,3 +331,5 @@ Version 0.1.4
- Fixed clearing pixmap in displaychannel if no epg is available
- Changed display of channel groups in displaychannel
- Added configurable transparency for channeldisplay background
+- Added background with dedicated theme color for status icons in
+ displaychannel.
diff --git a/displaychannelview.c b/displaychannelview.c
index bbf8fdb..e9041bd 100644
--- a/displaychannelview.c
+++ b/displaychannelview.c
@@ -31,6 +31,7 @@ cNopacityDisplayChannelView::~cNopacityDisplayChannelView() {
osd->DestroyPixmap(pixmapProgressBar);
osd->DestroyPixmap(pixmapEPGInfo);
osd->DestroyPixmap(pixmapStatusIcons);
+ osd->DestroyPixmap(pixmapStatusIconsBackground);
osd->DestroyPixmap(pixmapSourceInfo);
if (pixmapSignalStrength)
osd->DestroyPixmap(pixmapSignalStrength);
@@ -107,11 +108,11 @@ void cNopacityDisplayChannelView::CreatePixmaps(void) {
int statusIconX = geoManager->osdWidth
- config.GetValue("channelBorderVertical")
- statusIconsWidth
- - 2*statusIconBorder;
+ - 3*statusIconBorder;
if (config.GetValue("logoPosition") == lpRight)
statusIconX -= geoManager->channelLogoWidthTotal;
- pixmapStatusIcons = osd->CreatePixmap(2,
+ pixmapStatusIcons = osd->CreatePixmap(3,
cRect(statusIconX,
geoManager->channelTop + geoManager->channelHeaderHeight +
geoManager->channelProgressBarHeight +
@@ -119,6 +120,14 @@ void cNopacityDisplayChannelView::CreatePixmaps(void) {
statusIconsWidth,
geoManager->channelFooterHeight)
);
+ pixmapStatusIconsBackground = osd->CreatePixmap(2,
+ cRect(statusIconX - 2*statusIconBorder,
+ geoManager->channelTop + geoManager->channelHeaderHeight +
+ geoManager->channelProgressBarHeight +
+ geoManager->channelEpgInfoHeight + 1,
+ statusIconsWidth + 3*statusIconBorder,
+ geoManager->channelFooterHeight - 2)
+ );
int sourceInfoX = geoManager->channelContentX + 2 * statusIconBorder;
if (config.GetValue("displaySignalStrength"))
sourceInfoX +=geoManager->channelWidth * 0.2;
@@ -141,6 +150,7 @@ void cNopacityDisplayChannelView::CreatePixmaps(void) {
pixmapProgressBar->SetAlpha(0);
pixmapEPGInfo->SetAlpha(0);
pixmapStatusIcons->SetAlpha(0);
+ pixmapStatusIconsBackground->SetAlpha(0);
pixmapSourceInfo->SetAlpha(0);
} else {
int alphaBack = (100 - config.GetValue("channelBackgroundTransparency"))*255/100;
@@ -159,6 +169,7 @@ void cNopacityDisplayChannelView::SetAlpha(int alpha) {
pixmapProgressBar->SetAlpha(alpha);
pixmapEPGInfo->SetAlpha(alpha);
pixmapStatusIcons->SetAlpha(alpha);
+ pixmapStatusIconsBackground->SetAlpha(alpha);
pixmapSourceInfo->SetAlpha(alpha);
if (pixmapSignalStrength)
pixmapSignalStrength->SetAlpha(alpha);
@@ -429,6 +440,15 @@ void cNopacityDisplayChannelView::ClearEPGInfo(void) {
}
void cNopacityDisplayChannelView::DrawStatusIcons(const cChannel *Channel) {
+ pixmapStatusIconsBackground->Fill(Theme.Color(clrStatusIconsBack));
+ DrawRoundedCorners(pixmapStatusIconsBackground,
+ 5,
+ 0,
+ 0,
+ pixmapStatusIconsBackground->ViewPort().Width(),
+ pixmapStatusIconsBackground->ViewPort().Height()
+ );
+
isRadioChannel = ((!Channel->Vpid())&&(Channel->Apid(0)))?true:false;
int iconX = 0;
@@ -538,6 +558,7 @@ cString cNopacityDisplayChannelView::GetScreenResolutionIcon(void) {
void cNopacityDisplayChannelView::ClearStatusIcons(void) {
pixmapStatusIcons->Fill(clrTransparent);
+ pixmapStatusIconsBackground->Fill(clrTransparent);
}
void cNopacityDisplayChannelView::DrawPoster(const cEvent *event, bool initial) {
diff --git a/displaychannelview.h b/displaychannelview.h
index 36727a2..69a66d8 100644
--- a/displaychannelview.h
+++ b/displaychannelview.h
@@ -23,6 +23,7 @@ private:
cPixmap *pixmapProgressBar;
cPixmap *pixmapEPGInfo;
cPixmap *pixmapStatusIcons;
+ cPixmap *pixmapStatusIconsBackground;
cPixmap *pixmapSignalStrength;
cPixmap *pixmapSignalQuality;
cPixmap *pixmapSignalMeter;
diff --git a/nopacity.c b/nopacity.c
index 33b0560..2ec4152 100644
--- a/nopacity.c
+++ b/nopacity.c
@@ -6,6 +6,7 @@ static bool menuActive = false;
static bool firstDisplay = true;
//COMMON
+#define CLR_TRANSPARENT 0x00000000
#define CLR_BACKGROUND_BLUE 0xFF242A38
#define CLR_TRANSBLACK 0xDD000000
#define CLR_TRANSBLACK2 0xB0000000
@@ -76,9 +77,7 @@ THEME_CLR(Theme, clrChannelEPGInfoNext, CLR_GRAY);
THEME_CLR(Theme, clrChannelProgressBar, CLR_CHANNELPROGRESSBAR);
THEME_CLR(Theme, clrChannelProgressBarBack, CLR_CHANNELPROGRESSBARBACK);
THEME_CLR(Theme, clrChannelProgressBarBlend,CLR_CHANNELPROGRESSBARBLEND);
-THEME_CLR(Theme, clrChannelSymbolOn, CLR_DARKBLUE);
-THEME_CLR(Theme, clrChannelSymbolOff, CLR_CHANNELSYMBOLOFF);
-THEME_CLR(Theme, clrChannelRecActive, CLR_CHANNELRECACTIVE);
+THEME_CLR(Theme, clrStatusIconsBack, CLR_TRANSPARENT);
THEME_CLR(Theme, clrRecNow, CLR_CHANNELRECACTIVE);
THEME_CLR(Theme, clrRecNowFont, CLR_WHITE);
THEME_CLR(Theme, clrRecNext, CLR_RECNEXT);
diff --git a/themes/nOpacity-darkblue.theme b/themes/nOpacity-darkblue.theme
index 42885c5..de02b87 100644
--- a/themes/nOpacity-darkblue.theme
+++ b/themes/nOpacity-darkblue.theme
@@ -9,9 +9,7 @@ clrChannelEPGInfoNext = FF858585
clrChannelProgressBar = DD4979b9
clrChannelProgressBarBack = DD858585
clrChannelProgressBarBlend = DD031B3C
-clrChannelSymbolOn = DD5078ab
-clrChannelSymbolOff = DD858585
-clrChannelRecActive = DDFF0000
+clrStatusIconsBack = 00000000
clrRecNow = DDFF0000
clrRecNowFont = FFFFFFFF
clrRecNext = DDFFFF00
diff --git a/themes/nOpacity-darkgrey.theme b/themes/nOpacity-darkgrey.theme
index 74a08fd..c37d649 100644
--- a/themes/nOpacity-darkgrey.theme
+++ b/themes/nOpacity-darkgrey.theme
@@ -9,9 +9,7 @@ clrChannelEPGInfoNext = FF858585
clrChannelProgressBar = DD4E78B1
clrChannelProgressBarBack = DD858585
clrChannelProgressBarBlend = DD80B3FF
-clrChannelSymbolOn = FFFFD700
-clrChannelSymbolOff = DD858585
-clrChannelRecActive = DDFF0000
+clrStatusIconsBack = 00000000
clrRecNow = DDFF0000
clrRecNowFont = FFFFFFFF
clrRecNext = DDFFFF00
diff --git a/themes/nOpacity-darkred.theme b/themes/nOpacity-darkred.theme
index b2035c2..21f35fd 100644
--- a/themes/nOpacity-darkred.theme
+++ b/themes/nOpacity-darkred.theme
@@ -9,9 +9,7 @@ clrChannelEPGInfoNext = FF858585
clrChannelProgressBar = DDBB0000
clrChannelProgressBarBack = DD222222
clrChannelProgressBarBlend = DD550000
-clrChannelSymbolOn = aa770000
-clrChannelSymbolOff = aa222222
-clrChannelRecActive = DDFF0000
+clrStatusIconsBack = 00000000
clrRecNow = DDFF0000
clrRecNowFont = FFFFFFFF
clrRecNext = DDFFFF00
diff --git a/themes/nOpacity-default.theme b/themes/nOpacity-default.theme
index 042eba1..8054102 100644
--- a/themes/nOpacity-default.theme
+++ b/themes/nOpacity-default.theme
@@ -9,9 +9,7 @@ clrChannelEPGInfoNext = FF858585
clrChannelProgressBar = DD003DF5
clrChannelProgressBarBack = DD858585
clrChannelProgressBarBlend = DD80B3FF
-clrChannelSymbolOn = DD003DF5
-clrChannelSymbolOff = DD858585
-clrChannelRecActive = DDFF0000
+clrStatusIconsBack = 00000000
clrRecNow = DDFF0000
clrRecNowFont = FFFFFFFF
clrRecNext = DDFFFF00
diff --git a/themes/nOpacity-freestyle.theme b/themes/nOpacity-freestyle.theme
index 53e61b8..f015852 100644
--- a/themes/nOpacity-freestyle.theme
+++ b/themes/nOpacity-freestyle.theme
@@ -9,9 +9,7 @@ clrChannelEPGInfoNext = FF858585
clrChannelProgressBar = FFC6D590
clrChannelProgressBarBack = DD000000
clrChannelProgressBarBlend = FF8EAB21
-clrChannelSymbolOn = FFFFD700
-clrChannelSymbolOff = DD858585
-clrChannelRecActive = DDFF0000
+clrStatusIconsBack = 00000000
clrRecNow = DDFF0000
clrRecNowFont = FFFFFFFF
clrRecNext = DDFFFF00
@@ -30,7 +28,7 @@ clrReplayHighlightIcon = FFFFD700
clrTracksFontHead = FF858585
clrTracksFontButtons = FFFFFFFF
clrVolumeFont = FFFFFFFF
-clrMenuBack = AA12273f
+clrMenuBack = B012273f
clrMenuBorder = AA242A38
clrMenuScrollBar = 908EAB21
clrMenuScrollBarBack = 99242A38
@@ -64,7 +62,7 @@ clrProgressBarBlend = FF8EAB21
clrProgressBarHigh = DD4E78B1
clrProgressBarBackHigh = DD000000
clrProgressBarBlendHigh = DD80B3FF
-clrMenuTextWindow = DD000000
+clrMenuTextWindow = B0000000
clrButtonRed = 99BB0000
clrButtonRedBorder = FFBB0000
clrButtonRedFont = FFFFFFFF
diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme
index a6df161..2725583 100644
--- a/themes/nOpacity-green.theme
+++ b/themes/nOpacity-green.theme
@@ -9,9 +9,7 @@ clrChannelEPGInfoNext = FF858585
clrChannelProgressBar = DDFFCC00
clrChannelProgressBarBack = DD858585
clrChannelProgressBarBlend = DD006600
-clrChannelSymbolOn = DD006600
-clrChannelSymbolOff = DD858585
-clrChannelRecActive = DDFF0000
+clrStatusIconsBack = 00000000
clrRecNow = DDFF0000
clrRecNowFont = FFFFFFFF
clrRecNext = DDFFFF00
diff --git a/themes/nOpacity-iceblue.theme b/themes/nOpacity-iceblue.theme
index b3a6c38..acf0a8e 100644
--- a/themes/nOpacity-iceblue.theme
+++ b/themes/nOpacity-iceblue.theme
@@ -9,9 +9,7 @@ clrChannelEPGInfoNext = FF474750
clrChannelProgressBar = DD3F5468
clrChannelProgressBarBack = FF000000
clrChannelProgressBarBlend = DD5A8998
-clrChannelSymbolOn = DD3F5468
-clrChannelSymbolOff = DD858585
-clrChannelRecActive = DDFF0000
+clrStatusIconsBack = DD3F5468
clrRecNow = DDFF0000
clrRecNowFont = FFFFFFFF
clrRecNext = DDFFFF00
diff --git a/themes/nOpacity-light.theme b/themes/nOpacity-light.theme
index 5fd52c6..2bd6194 100644
--- a/themes/nOpacity-light.theme
+++ b/themes/nOpacity-light.theme
@@ -9,9 +9,7 @@ clrChannelEPGInfoNext = FFBDBDBD
clrChannelProgressBar = DD6fac10
clrChannelProgressBarBack = DD858585
clrChannelProgressBarBlend = DD6fac10
-clrChannelSymbolOn = DD6fac10
-clrChannelSymbolOff = DD858585
-clrChannelRecActive = DDFF0000
+clrStatusIconsBack = 00000000
clrRecNow = DDFF0000
clrRecNowFont = FFFFFFFF
clrRecNext = DDFFFF00
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 13:03:49 +0000