dedicated theme colors in display channel for current event, current event info, next evet and next event info (closes Feature 1466)

7 files changed, 25 insertions, 9 deletions

diff --git a/HISTORY b/HISTORY
index 78c2200..e23429d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -260,3 +260,5 @@ Version 0.1.4
 - added exemplarily setup options for SD and HDReady
 - introduced dedicated theme font colors for different message types and 
   different buttons (closes Feature 1462)
+- dedicated theme colors in display channel for current event, current event
+  info, next evet and next event info (closes Feature 1466)
diff --git a/displaychannel.c b/displaychannel.c
index e8389fa..1af5868 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -630,7 +630,7 @@ void cNopacityDisplayChannel::DrawChannelGroups(const cChannel *Channel, cString
             prevChannelSep = CutText(*prevChannelSep, xSymbol, fontChannelGroupSmall).c_str();
             xSepPrev = xSymbol - 10 - fontChannelGroupSmall->Width(prevChannelSep);
         }
-        infoPixmap->DrawText(cPoint(xSepPrev, ySepNextPrev), *prevChannelSep, Theme.Color(clrChannelEPGInfo), clrTransparent, fontChannelGroupSmall);
+        infoPixmap->DrawText(cPoint(xSepPrev, ySepNextPrev), *prevChannelSep, Theme.Color(clrChannelEPGInfoNext), clrTransparent, fontChannelGroupSmall);
     }
     if (nextAvailable) {
         int xSymbol = xSep + widthSep + 10;
@@ -642,7 +642,7 @@ void cNopacityDisplayChannel::DrawChannelGroups(const cChannel *Channel, cString
         if (fontChannelGroupSmall->Width(nextChannelSep) > spaceAvailable) {
             nextChannelSep = CutText(*nextChannelSep, spaceAvailable, fontChannelGroupSmall).c_str();
         }
-        infoPixmap->DrawText(cPoint(xSepNext, ySepNextPrev), *nextChannelSep, Theme.Color(clrChannelEPGInfo), clrTransparent, fontChannelGroupSmall);
+        infoPixmap->DrawText(cPoint(xSepNext, ySepNextPrev), *nextChannelSep, Theme.Color(clrChannelEPGInfoNext), clrTransparent, fontChannelGroupSmall);
     }
 }
 
@@ -713,7 +713,9 @@ void cNopacityDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fol
             if (spaceShort < epgWidthShort) {
                 strEPGShort = CutText(e->ShortText(), spaceShort, fontEPGSmall).c_str();
             }
-            tColor fontColor = (i==0)?Theme.Color(clrChannelEPG):Theme.Color(clrChannelEPGInfo);
+            tColor fontColor = (i==0)?Theme.Color(clrChannelEPG):Theme.Color(clrChannelEPGNext);
+            tColor fontColorInfo = (i==0)?Theme.Color(clrChannelEPGInfo):Theme.Color(clrChannelEPGInfoNext);
+            
             pixmapEPGInfo->DrawText(cPoint(indent, y * epgInfoLineHeight), *startTime, fontColor, clrTransparent, fontEPG);
             int xEPGInfo = 2 * indent + startTimeWidth;
             if (drawRecIcon) {
@@ -726,7 +728,7 @@ void cNopacityDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fol
                 xEPGInfo += widthRecIcon + indent/2;
             }
             pixmapEPGInfo->DrawText(cPoint(xEPGInfo, y * epgInfoLineHeight), *strEPG, fontColor, clrTransparent, fontEPG);
-            pixmapEPGInfo->DrawText(cPoint(2 * indent + startTimeWidth, (y+1) * epgInfoLineHeight + 3), *strEPGShort, fontColor, clrTransparent, fontEPGSmall);
+            pixmapEPGInfo->DrawText(cPoint(2 * indent + startTimeWidth, (y+1) * epgInfoLineHeight + 3), *strEPGShort, fontColorInfo, clrTransparent, fontEPGSmall);
             int x = infoWidth - indent - seenWidth - config.resolutionIconSize - indent;
             pixmapEPGInfo->DrawText(cPoint(x, y * epgInfoLineHeight), *strSeen, fontColor, clrTransparent, fontEPG);
         }
diff --git a/nopacity.c b/nopacity.c
index 324cb1d..fc5c8c9 100644
--- a/nopacity.c
+++ b/nopacity.c
@@ -66,7 +66,9 @@ THEME_CLR(Theme, clrChannelBackground,      CLR_TRANSBLACK2);
 THEME_CLR(Theme, clrChannelBackBlend,       CLR_DARKBLUE2);
 THEME_CLR(Theme, clrChannelHead,            CLR_BRIGHTBLUE);
 THEME_CLR(Theme, clrChannelEPG,             CLR_WHITE);
-THEME_CLR(Theme, clrChannelEPGInfo,         CLR_GRAY);
+THEME_CLR(Theme, clrChannelEPGInfo,         CLR_WHITE);
+THEME_CLR(Theme, clrChannelEPGNext,         CLR_GRAY);
+THEME_CLR(Theme, clrChannelEPGInfoNext,     CLR_GRAY);
 THEME_CLR(Theme, clrProgressBar,            CLR_DARKBLUE);
 THEME_CLR(Theme, clrProgressBarBack,        CLR_PROGRESSBARBACK);
 THEME_CLR(Theme, clrProgressBarBlend,       CLR_PROGRESSBARBLEND);
diff --git a/themes/nOpacity-darkblue.theme b/themes/nOpacity-darkblue.theme
index 0dd1c9b..963dab7 100644
--- a/themes/nOpacity-darkblue.theme
+++ b/themes/nOpacity-darkblue.theme
@@ -5,7 +5,9 @@ clrChannelBackground = B0000000
 clrChannelBackBlend = DD5078ab
 clrChannelHead = FFEEEEEE
 clrChannelEPG = FFFFFFFF
-clrChannelEPGInfo = FF858585
+clrChannelEPGInfo = FFFFFFFF
+clrChannelEPGNext = FF858585
+clrChannelEPGInfoNext = FF858585
 clrProgressBar = DD4979b9
 clrProgressBarBack = DD858585
 clrProgressBarBlend = DD031B3C
diff --git a/themes/nOpacity-darkred.theme b/themes/nOpacity-darkred.theme
index 319350c..7d67607 100644
--- a/themes/nOpacity-darkred.theme
+++ b/themes/nOpacity-darkred.theme
@@ -1,10 +1,13 @@
 Description = Dark Red
+#DO BLENDING
 clrDoBlending = FFFFFFFF
 clrChannelBackground = CC000000
 clrChannelBackBlend = CC333333
 clrChannelHead = FFEEEEEE
 clrChannelEPG = FFCCCCCC
-clrChannelEPGInfo = FF858585
+clrChannelEPGInfo = FFCCCCCC
+clrChannelEPGNext = FF858585
+clrChannelEPGInfoNext = FF858585
 clrProgressBar = DDBB0000
 clrProgressBarBack = DD222222
 clrProgressBarBlend = DD550000
diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme
index 0fd2294..2057b87 100644
--- a/themes/nOpacity-green.theme
+++ b/themes/nOpacity-green.theme
@@ -1,10 +1,13 @@
 Description = Green
+#DO BLENDING
 clrDoBlending = FFFFFFFF
 clrChannelBackground = B0000000
 clrChannelBackBlend = DD006600
 clrChannelHead = FFFFCC00
 clrChannelEPG = FFFFFFFF
-clrChannelEPGInfo = FF858585
+clrChannelEPGInfo = FFFFFFFF
+clrChannelEPGNext = FF858585
+clrChannelEPGInfoNext = FF858585
 clrProgressBar = DDFFCC00
 clrProgressBarBack = DD858585
 clrProgressBarBlend = DD006600
diff --git a/themes/nOpacity-iceblue.theme b/themes/nOpacity-iceblue.theme
index a15f644..d2ab508 100644
--- a/themes/nOpacity-iceblue.theme
+++ b/themes/nOpacity-iceblue.theme
@@ -4,7 +4,9 @@ clrDoBlending = 00000000
 clrChannelBackground = B0FFFFFF
 clrChannelHead = FF000000
 clrChannelEPG = FF000000
-clrChannelEPGInfo = FF474750
+clrChannelEPGInfo = FF000000
+clrChannelEPGNext = FF474750
+clrChannelEPGInfoNext = FF474750
 clrProgressBar = DD3F5468
 clrProgressBarBack = FF000000
 clrProgressBarBlend = DD5A8998