optimized some theme colors in displaychannel and displaymessage

9 files changed, 14 insertions, 8 deletions

diff --git a/HISTORY b/HISTORY
index 7bfe267..abcfd2f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -286,3 +286,4 @@ Version 0.1.4
 - improved function to float text around poster in textwindow
 - fixed nasty font pixelation with non blending themes for timer display in
   main menu
+- optimized some theme colors in displaychannel and displaymessage
diff --git a/displaychannel.c b/displaychannel.c
index ad4aca3..4c70546 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -720,7 +720,7 @@ void cNopacityDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Fol
             pixmapEPGInfo->DrawText(cPoint(indent, y * epgInfoLineHeight), *startTime, fontColor, clrTransparent, fontEPG);
             int xEPGInfo = 2 * indent + startTimeWidth;
             if (drawRecIcon) {
-                tColor clrRecIcon = (i==0)?Theme.Color(clrChannelRecActive):Theme.Color(clrRecNext);
+                tColor clrRecIcon = (i==0)?Theme.Color(clrRecNow):Theme.Color(clrRecNext);
                 tColor clrRecIconText = (i==0)?Theme.Color(clrRecNowFont):Theme.Color(clrRecNextFont);
                 pixmapEPGInfo->DrawRectangle(cRect(xEPGInfo, y * epgInfoLineHeight , widthRecIcon, epgInfoLineHeight), clrRecIcon);
                 int xRecText = xEPGInfo + (widthRecIcon - fontEPGSmall->Width("REC"))/2;
diff --git a/displaymenuview.c b/displaymenuview.c
index c513dd4..e0a2838 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -802,18 +802,23 @@ void cNopacityDisplayMenuView::ClearScrollbar(void) {
 
 void cNopacityDisplayMenuView::DrawMessage(eMessageType Type, const char *Text) {
     tColor col = Theme.Color(clrMessageStatus);
+    tColor colFont = Theme.Color(clrMessageFontStatus);
     switch (Type) {
         case mtStatus: 
             col = Theme.Color(clrMessageStatus);
+            colFont = Theme.Color(clrMessageFontStatus);
             break;
         case mtInfo:
             col = Theme.Color(clrMessageInfo);
+            colFont = Theme.Color(clrMessageFontInfo);
             break;
         case mtWarning:
             col = Theme.Color(clrMessageWarning);
+            colFont = Theme.Color(clrMessageFontWarning);
             break;
         case mtError:
             col = Theme.Color(clrMessageError);
+            colFont = Theme.Color(clrMessageFontError);
             break;
     }
     if (pixmapStatus) {
@@ -831,7 +836,7 @@ void cNopacityDisplayMenuView::DrawMessage(eMessageType Type, const char *Text)
     }
     int textWidth = fontMessage->Width(Text);
     tColor clrFontBack = (config.doBlending)?(clrTransparent):col;
-    pixmapStatus->DrawText(cPoint((messageWidth - textWidth) / 2, (messageHeight - fontMessage->Height()) / 2), Text, Theme.Color(clrMenuFontMessages), clrFontBack, fontMessage);
+    pixmapStatus->DrawText(cPoint((messageWidth - textWidth) / 2, (messageHeight - fontMessage->Height()) / 2), Text, colFont, clrFontBack, fontMessage);
 }
 
 void cNopacityDisplayMenuView::ClearMessage(void) {
diff --git a/nopacity.c b/nopacity.c
index 1044b8f..014ab43 100644
--- a/nopacity.c
+++ b/nopacity.c
@@ -75,6 +75,7 @@ THEME_CLR(Theme, clrProgressBarBlend,       CLR_PROGRESSBARBLEND);
 THEME_CLR(Theme, clrChannelSymbolOn,        CLR_DARKBLUE);
 THEME_CLR(Theme, clrChannelSymbolOff,       CLR_CHANNELSYMBOLOFF);
 THEME_CLR(Theme, clrChannelRecActive,       CLR_CHANNELRECACTIVE);
+THEME_CLR(Theme, clrRecNow,                 CLR_CHANNELRECACTIVE);
 THEME_CLR(Theme, clrRecNowFont,             CLR_WHITE);
 THEME_CLR(Theme, clrRecNext,                CLR_RECNEXT);
 THEME_CLR(Theme, clrRecNextFont,            CLR_BLACK);
@@ -113,7 +114,6 @@ THEME_CLR(Theme, clrMenuFontDate,           CLR_WHITE);
 THEME_CLR(Theme, clrMenuFontDiscUsage,      CLR_WHITE);
 THEME_CLR(Theme, clrMenuFontTimers,         CLR_WHITE);
 THEME_CLR(Theme, clrMenuFontTimersHeader,   CLR_WHITE);
-THEME_CLR(Theme, clrMenuFontMessages,       CLR_WHITE);
 THEME_CLR(Theme, clrMenuFontDetailViewText, CLR_WHITE);
 THEME_CLR(Theme, clrMenuFontDetailViewHeader, CLR_GRAY);
 THEME_CLR(Theme, clrMenuFontDetailViewHeaderTitle, CLR_BRIGHTBLUE);
diff --git a/themes/nOpacity-darkblue.theme b/themes/nOpacity-darkblue.theme
index f65e534..583a9f8 100644
--- a/themes/nOpacity-darkblue.theme
+++ b/themes/nOpacity-darkblue.theme
@@ -14,6 +14,7 @@ clrProgressBarBlend = DD031B3C
 clrChannelSymbolOn = DD5078ab
 clrChannelSymbolOff = DD858585
 clrChannelRecActive = DDFF0000
+clrRecNow = DDFF0000
 clrRecNowFont = FFFFFFFF
 clrRecNext = DDFFFF00
 clrRecNextFont = FF000000
@@ -48,7 +49,6 @@ clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
-clrMenuFontMessages = FFFFFFFF
 clrMenuFontDetailViewText = FFFFFFFF
 clrMenuFontDetailViewHeader = FF858585
 clrMenuFontDetailViewHeaderTitle = FFB6C6E0
diff --git a/themes/nOpacity-darkgrey.theme b/themes/nOpacity-darkgrey.theme
index 5cf2a40..ba8cff7 100644
--- a/themes/nOpacity-darkgrey.theme
+++ b/themes/nOpacity-darkgrey.theme
@@ -13,6 +13,7 @@ clrProgressBarBlend = DD80B3FF
 clrChannelSymbolOn = FFFFD700
 clrChannelSymbolOff = DD858585
 clrChannelRecActive = DDFF0000
+clrRecNow = DDFF0000
 clrRecNowFont = FFFFFFFF
 clrRecNext = DDFFFF00
 clrRecNextFont = FF000000
@@ -47,7 +48,6 @@ clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
-clrMenuFontMessages = FFFFFFFF
 clrMenuFontDetailViewText = FFFFFFFF
 clrMenuFontDetailViewHeader = FF858585
 clrMenuFontDetailViewHeaderTitle = FFFFFFFF
diff --git a/themes/nOpacity-darkred.theme b/themes/nOpacity-darkred.theme
index 35de9cb..6d65631 100644
--- a/themes/nOpacity-darkred.theme
+++ b/themes/nOpacity-darkred.theme
@@ -14,6 +14,7 @@ clrProgressBarBlend = DD550000
 clrChannelSymbolOn = aa770000
 clrChannelSymbolOff = aa222222
 clrChannelRecActive = DDFF0000
+clrRecNow = DDFF0000
 clrRecNowFont = FFFFFFFF
 clrRecNext = DDFFFF00
 clrRecNextFont = FF000000
@@ -48,7 +49,6 @@ clrMenuFontDate = FFCCCCCC
 clrMenuFontDiscUsage = FFCCCCCC
 clrMenuFontTimers = FFCCCCCC
 clrMenuFontTimersHeader = FFCCCCCC
-clrMenuFontMessages = FFCCCCCC
 clrMenuFontDetailViewText = FFCCCCCC
 clrMenuFontDetailViewHeader = FF858585
 clrMenuFontDetailViewHeaderTitle = FFDDDDDD
diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme
index 94790d9..b62fe06 100644
--- a/themes/nOpacity-green.theme
+++ b/themes/nOpacity-green.theme
@@ -14,6 +14,7 @@ clrProgressBarBlend = DD006600
 clrChannelSymbolOn = DD006600
 clrChannelSymbolOff = DD858585
 clrChannelRecActive = DDFF0000
+clrRecNow = DDFF0000
 clrRecNowFont = FFFFFFFF
 clrRecNext = DDFFFF00
 clrRecNextFont = FF000000
@@ -48,7 +49,6 @@ clrMenuFontDate = FFFFFFFF
 clrMenuFontDiscUsage = FFFFFFFF
 clrMenuFontTimers = FFFFFFFF
 clrMenuFontTimersHeader = FFFFFFFF
-clrMenuFontMessages = FFFFFFFF
 clrMenuFontDetailViewText = FFFFFFFF
 clrMenuFontDetailViewHeader = FF858585
 clrMenuFontDetailViewHeaderTitle = FFFFCC00
diff --git a/themes/nOpacity-iceblue.theme b/themes/nOpacity-iceblue.theme
index 187856e..8ac4048 100644
--- a/themes/nOpacity-iceblue.theme
+++ b/themes/nOpacity-iceblue.theme
@@ -14,6 +14,7 @@ clrProgressBarBlend = DD5A8998
 clrChannelSymbolOn = DD3F5468
 clrChannelSymbolOff = DD858585
 clrChannelRecActive = DDFF0000
+clrRecNow = DDFF0000
 clrRecNowFont = FFFFFFFF
 clrRecNext = DDFFFF00
 clrRecNextFont = FF000000
@@ -48,7 +49,6 @@ clrMenuFontDate = FF000000
 clrMenuFontDiscUsage = FF000000
 clrMenuFontTimers = FF000000
 clrMenuFontTimersHeader = FF000000
-clrMenuFontMessages = FF000000
 clrMenuFontDetailViewText = FF000000
 clrMenuFontDetailViewHeader = FF000044 
 clrMenuFontDetailViewHeaderTitle = FF000044