dedicated theme colors for RSS Feed (closes Feature 1485)

8 files changed, 78 insertions, 20 deletions

diff --git a/HISTORY b/HISTORY
index a9b6862..ef7606c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -264,3 +264,4 @@ Version 0.1.4
   info, next evet and next event info (closes Feature 1466)
 - dedicated theme colors for timer backgrounds in main menu (closes Feature
   1463)
+- dedicated theme colors for RSS Feed (closes Feature 1485)
diff --git a/displaymenuview.c b/displaymenuview.c
index e95b21a..b12762a 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -854,15 +854,19 @@ void cNopacityDisplayMenuView::DrawRssFeed(std::string feedName) {
     pixmapRssFeed->Fill(clrTransparent);
     feedNameLength = fontRssFeed->Width(feedName.c_str());
     int labelWidth = 2 + rssFeedHeight + 2 + feedNameLength + 6;
-    pixmapRssFeed->Fill(Theme.Color(clrMenuBorder));
+    pixmapRssFeed->Fill(Theme.Color(clrRSSFeedBorder));
     cImageLoader imgLoader;
-    imgLoader.DrawBackground(Theme.Color(clrMenuItemHigh), Theme.Color(clrMenuItemHighBlend), labelWidth, rssFeedHeight - 4);
-    pixmapRssFeed->DrawImage(cPoint(2,2), imgLoader.GetImage());
+    if (config.doBlending) {
+        imgLoader.DrawBackground(Theme.Color(clrRSSFeedHeaderBack), Theme.Color(clrRSSFeedHeaderBackBlend), labelWidth, rssFeedHeight - 4);
+        pixmapRssFeed->DrawImage(cPoint(2,2), imgLoader.GetImage());
 
-    imgLoader.DrawBackground(Theme.Color(clrMenuItem), Theme.Color(clrMenuItemBlend), osdWidth - labelWidth - 2, rssFeedHeight - 4);
-    pixmapRssFeed->DrawImage(cPoint(labelWidth,2), imgLoader.GetImage());
-    
-    pixmapRssFeed->DrawText(cPoint(rssFeedHeight + 2, (rssFeedHeight - fontRssFeed->Height()) / 2), feedName.c_str(), Theme.Color(clrMenuFontHeader), clrTransparent, fontRssFeed);
+        imgLoader.DrawBackground(Theme.Color(clrRSSFeedBack), Theme.Color(clrRSSFeedBackBlend), osdWidth - labelWidth - 2, rssFeedHeight - 4);
+        pixmapRssFeed->DrawImage(cPoint(labelWidth,2), imgLoader.GetImage());
+    } else {
+        pixmapRssFeed->DrawRectangle(cRect(2, 2, labelWidth, rssFeedHeight - 4), Theme.Color(clrRSSFeedHeaderBack));
+        pixmapRssFeed->DrawRectangle(cRect(labelWidth, 2, osdWidth - labelWidth - 2, rssFeedHeight - 4), Theme.Color(clrRSSFeedBack));        
+    }
+    pixmapRssFeed->DrawText(cPoint(rssFeedHeight + 2, (rssFeedHeight - fontRssFeed->Height()) / 2), feedName.c_str(), Theme.Color(clrRSSFeedHeaderText), clrTransparent, fontRssFeed);
     pixmapRssFeedIcon->Fill(clrTransparent);
     if (imgLoader.LoadIcon("skinIcons/rss", rssFeedHeight-4)) {
         cImage icon = imgLoader.GetImage();
diff --git a/nopacity.c b/nopacity.c
index 2d8fb58..1044b8f 100644
--- a/nopacity.c
+++ b/nopacity.c
@@ -136,6 +136,15 @@ THEME_CLR(Theme, clrButtonYellowFont,       CLR_WHITE);
 THEME_CLR(Theme, clrButtonBlue,             CLR_BUTTONBLUE);
 THEME_CLR(Theme, clrButtonBlueBorder,       CLR_BUTTONBLUEBORDER);
 THEME_CLR(Theme, clrButtonBlueFont,         CLR_WHITE);
+//RSS Feeds
+THEME_CLR(Theme, clrRSSFeedBorder,          CLR_DARKBLUE);
+THEME_CLR(Theme, clrRSSFeedTitle,           CLR_BRIGHTBLUE);
+THEME_CLR(Theme, clrRSSFeedText,            CLR_WHITE);
+THEME_CLR(Theme, clrRSSFeedHeaderText,      CLR_WHITE);
+THEME_CLR(Theme, clrRSSFeedHeaderBack,      CLR_TRANSBLACK);
+THEME_CLR(Theme, clrRSSFeedHeaderBackBlend, CLR_MENUITEMHIGHBLEND);
+THEME_CLR(Theme, clrRSSFeedBack,            CLR_MENUITEM);
+THEME_CLR(Theme, clrRSSFeedBackBlend,       CLR_MENUITEMBLEND);
 //MESSAGES
 THEME_CLR(Theme, clrMessageFontStatus,      CLR_WHITE);
 THEME_CLR(Theme, clrMessageFontInfo,        CLR_WHITE);
diff --git a/rssreader.c b/rssreader.c
index f0ab032..dc42452 100644
--- a/rssreader.c
+++ b/rssreader.c
@@ -157,10 +157,10 @@ void cRssReader::drawText(void) {
     int currentX = 5;
     int textY = (height - font->Height()) / 2;
     cString text = cString::sprintf("%s: ", rssElements[currentElement].title.c_str());
-    pixmap->DrawText(cPoint(currentX, textY), *text, Theme.Color(clrMenuFontMenuItemHigh), clrTransparent, font);
+    pixmap->DrawText(cPoint(currentX, textY), *text, Theme.Color(clrRSSFeedTitle), clrTransparent, font);
     currentX += font->Width(*text);
     text = cString::sprintf("%s%s", rssElements[currentElement].content.c_str(), separator.c_str());
-    pixmap->DrawText(cPoint(currentX, textY), *text, Theme.Color(clrMenuFontMenuItem), clrTransparent, font);
+    pixmap->DrawText(cPoint(currentX, textY), *text, Theme.Color(clrRSSFeedText), clrTransparent, font);
 }
 
 void cRssReader::DoSleep(int duration) {
@@ -301,15 +301,18 @@ void cRssStandaloneTicker::SetFeed(std::string feedName) {
     
     int feedNameLength = font->Width(feedName.c_str());
     labelWidth = 2 + osdHeight + 2 + feedNameLength + 6;
-    pixmapFeed->Fill(Theme.Color(clrMenuBorder));
+    pixmapFeed->Fill(Theme.Color(clrRSSFeedBorder));
     cImageLoader imgLoader;
-    imgLoader.DrawBackground(Theme.Color(clrMenuItemHigh), Theme.Color(clrMenuItemHighBlend), labelWidth, osdHeight - 4);
-    pixmapFeed->DrawImage(cPoint(2,2), imgLoader.GetImage());
-
-    imgLoader.DrawBackground(Theme.Color(clrMenuItem), Theme.Color(clrMenuItemBlend), osdWidth - labelWidth - 2, osdHeight - 4);
-    pixmapFeed->DrawImage(cPoint(labelWidth,2), imgLoader.GetImage());
-    
-    pixmapFeed->DrawText(cPoint(osdHeight + 2, (osdHeight - font->Height()) / 2), feedName.c_str(), Theme.Color(clrMenuFontHeader), clrTransparent, font);
+    if (config.doBlending) {
+        imgLoader.DrawBackground(Theme.Color(clrRSSFeedHeaderBack), Theme.Color(clrRSSFeedHeaderBackBlend), labelWidth, osdHeight - 4);
+        pixmapFeed->DrawImage(cPoint(2,2), imgLoader.GetImage());
+        imgLoader.DrawBackground(Theme.Color(clrRSSFeedBack), Theme.Color(clrRSSFeedBackBlend), osdWidth - labelWidth - 2, osdHeight - 4);
+        pixmapFeed->DrawImage(cPoint(labelWidth,2), imgLoader.GetImage());
+    } else {
+        pixmapFeed->DrawRectangle(cRect(2, 2, labelWidth, osdHeight - 4), Theme.Color(clrRSSFeedHeaderBack));
+        pixmapFeed->DrawRectangle(cRect(labelWidth, 2, osdWidth - labelWidth - 2, osdHeight - 4), Theme.Color(clrRSSFeedBack));
+    }
+    pixmapFeed->DrawText(cPoint(osdHeight + 2, (osdHeight - font->Height()) / 2), feedName.c_str(), Theme.Color(clrRSSFeedHeaderText), clrTransparent, font);
     pixmapIcon->Fill(clrTransparent);
     if (imgLoader.LoadIcon("skinIcons/rss", osdHeight-4)) {
         cImage icon = imgLoader.GetImage();
diff --git a/themes/nOpacity-darkblue.theme b/themes/nOpacity-darkblue.theme
index a160927..f65e534 100644
--- a/themes/nOpacity-darkblue.theme
+++ b/themes/nOpacity-darkblue.theme
@@ -70,6 +70,14 @@ clrButtonYellowFont = FFFFFFFF
 clrButtonBlue = 990000BB
 clrButtonBlueBorder = FF0000BB
 clrButtonBlueFont = FFFFFFFF
+clrRSSFeedBorder = DD8c8c8c
+clrRSSFeedTitle = FFFFFFFF
+clrRSSFeedText = FFFFFFFF
+clrRSSFeedHeaderText = FFFFFFFF
+clrRSSFeedHeaderBack = DD618A9E
+clrRSSFeedHeaderBackBlend = EE135474
+clrRSSFeedBack = DD5078AB
+clrRSSFeedBackBlend = DD000000
 clrMessageFontStatus = FFFFFFFF
 clrMessageFontInfo = FFFFFFFF
 clrMessageFontWarning = FFFFFFFF
diff --git a/themes/nOpacity-darkred.theme b/themes/nOpacity-darkred.theme
index 4596743..ff448ff 100644
--- a/themes/nOpacity-darkred.theme
+++ b/themes/nOpacity-darkred.theme
@@ -70,6 +70,14 @@ clrButtonYellowFont = FFFFFFFF
 clrButtonBlue = 990000BB
 clrButtonBlueBorder = FF000000
 clrButtonBlueFont = FFFFFFFF
+clrRSSFeedBorder = FF050505
+clrRSSFeedTitle = FFCCCCCC
+clrRSSFeedText = FFCCCCCC
+clrRSSFeedHeaderText = FFCCCCCC
+clrRSSFeedHeaderBack = DDBB0000
+clrRSSFeedHeaderBackBlend = DD000000
+clrRSSFeedBack = DD333333
+clrRSSFeedBackBlend = DD000000
 clrMessageFontStatus = FFFFFFFF
 clrMessageFontInfo = FFFFFFFF
 clrMessageFontWarning = FFFFFFFF
diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme
index bf1253c..94790d9 100644
--- a/themes/nOpacity-green.theme
+++ b/themes/nOpacity-green.theme
@@ -70,6 +70,14 @@ clrButtonYellowFont = FFFFFFFF
 clrButtonBlue = 990000BB
 clrButtonBlueBorder = FF0000BB
 clrButtonBlueFont = FFFFFFFF
+clrRSSFeedBorder = DD006600
+clrRSSFeedTitle = FFFFCC00
+clrRSSFeedText = FFFFFFFF
+clrRSSFeedHeaderText = FFFFFFFF
+clrRSSFeedHeaderBack = EE006600
+clrRSSFeedHeaderBackBlend = EE006600
+clrRSSFeedBack = BB000000
+clrRSSFeedBackBlend = EE006600
 clrMessageFontStatus = FFFFFFFF
 clrMessageFontInfo = FFFFFFFF
 clrMessageFontWarning = FFFFFFFF
diff --git a/themes/nOpacity-iceblue.theme b/themes/nOpacity-iceblue.theme
index 2327a83..187856e 100644
--- a/themes/nOpacity-iceblue.theme
+++ b/themes/nOpacity-iceblue.theme
@@ -2,6 +2,7 @@ Description = IceBlue
 #DO BLENDING
 clrDoBlending = 00000000
 clrChannelBackground = B0FFFFFF
+clrChannelBackBlend = FFFFFFFF
 clrChannelHead = FF000000
 clrChannelEPG = FF000000
 clrChannelEPGInfo = FF000000
@@ -35,16 +36,18 @@ clrMenuBorder = FF000000
 clrMenuScrollBar = FF000044
 clrMenuScrollBarBack = FFB2B2C7
 clrMenuItem = FFB2B2C7
+clrMenuItemBlend = FFFFFFFF
 clrMenuItemHigh = FF000044
+clrMenuItemHighBlend = FFFFFFFF
 clrSeparatorBorder = EE444444
 clrDiskAlert = DDFF0000
 clrTimersBack = FFB2B2C7
+clrTimersBackBlend = FFFFFFFF
 clrMenuFontHeader = FF000000
 clrMenuFontDate = FF000000
 clrMenuFontDiscUsage = FF000000
-clrMenuFontButton = FF000000
-clrMenuFontTimers = FFFFFFFF
-clrMenuFontTimersHeader = FFFFFFFF
+clrMenuFontTimers = FF000000
+clrMenuFontTimersHeader = FF000000
 clrMenuFontMessages = FF000000
 clrMenuFontDetailViewText = FF000000
 clrMenuFontDetailViewHeader = FF000044 
@@ -54,14 +57,27 @@ clrMenuFontMenuItemHigh = FFFFFFFF
 clrMenuFontMenuItemTitle = FF000000
 clrMenuFontMenuItemSep = FF000000
 clrMenuHeader = 22FFFFFF
+clrMenuHeaderBlend = FFFFFFFF
 clrButtonRed = FFCC0000
+clrButtonRedBorder = FFCC0000
 clrButtonRedFont = FFFFFFFF
 clrButtonGreen = FF00F53D
+clrButtonGreenBorder = FF00F53D
 clrButtonGreenFont = FFFFFFFF
 clrButtonYellow = FFF5B800
+clrButtonYellowBorder = FFF5B800
 clrButtonYellowFont = FFFFFFFF
 clrButtonBlue = FF003DF5
+clrButtonBlueBorder = FF003DF5
 clrButtonBlueFont = FFFFFFFF
+clrRSSFeedBorder = FF000000
+clrRSSFeedTitle = FF000000
+clrRSSFeedText = FF000000
+clrRSSFeedHeaderText = FF000000
+clrRSSFeedHeaderBack = FFB2B2C7
+clrRSSFeedHeaderBackBlend = FFFFFFFF
+clrRSSFeedBack = DDFFFFFF
+clrRSSFeedBackBlend = FFFFFFFF
 clrMessageFontStatus = FFFFFFFF
 clrMessageFontInfo = FFFFFFFF
 clrMessageFontWarning = FFFFFFFF
@@ -70,3 +86,4 @@ clrMessageStatus = FF003DF5
 clrMessageInfo = FF00F53D 
 clrMessageWarning = FFF5B800
 clrMessageError = FFCC0000
+clrMessageBlend = FFFFFFFF