From 730dd6b51e6761b9339443927d5cc283c6e72d4d Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 23 May 2004 10:46:28 +0200 Subject: No longer displaying unused color buttons in the "Classic VDR" skin --- CONTRIBUTORS | 1 + HISTORY | 2 ++ skinclassic.c | 10 +++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c7f35d75..7ce49219 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -521,6 +521,7 @@ Oliver Endriss for pointing out that the LNB power needs to be explicitly turned on at startup, because newer drivers don't do this any more for adding a missing cStatus::MsgOsdClear() to cDisplayChannel::~cDisplayChannel() + for reporting that the "Classic VDR" skin wrongly displayed unused color buttons Reinhard Walter Buchner for adding some satellites to 'sources.conf' diff --git a/HISTORY b/HISTORY index 16d1e3c8..35283936 100644 --- a/HISTORY +++ b/HISTORY @@ -2833,3 +2833,5 @@ Video Disk Recorder Revision History - Added play mode pmVideoOnly (thanks to Marcel Wiesweg). - Added a missing cStatus::MsgOsdClear() to cDisplayChannel::~cDisplayChannel() (thanks to Oliver Endriss). +- No longer displaying unused color buttons in the "Classic VDR" skin (thanks to + Oliver Endriss for reporting this one). diff --git a/skinclassic.c b/skinclassic.c index fe9c0254..3f0de1c5 100644 --- a/skinclassic.c +++ b/skinclassic.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinclassic.c 1.2 2004/05/22 13:04:54 kls Exp $ + * $Id: skinclassic.c 1.3 2004/05/23 10:40:02 kls Exp $ */ #include "skinclassic.h" @@ -231,10 +231,10 @@ void cSkinClassicDisplayMenu::SetButtons(const char *Red, const char *Green, con int t2 = x0 + w / 2; int t3 = x1 - w / 4; int t4 = x1; - osd->DrawText(t0, y4, Red, Theme.Color(clrButtonRedFg), Theme.Color(clrButtonRedBg), font, t1 - t0, 0, taCenter); - osd->DrawText(t1, y4, Green, Theme.Color(clrButtonGreenFg), Theme.Color(clrButtonGreenBg), font, t2 - t1, 0, taCenter); - osd->DrawText(t2, y4, Yellow, Theme.Color(clrButtonYellowFg), Theme.Color(clrButtonYellowBg), font, t3 - t2, 0, taCenter); - osd->DrawText(t3, y4, Blue, Theme.Color(clrButtonBlueFg), Theme.Color(clrButtonBlueBg), font, t4 - t3, 0, taCenter); + osd->DrawText(t0, y4, Red, Theme.Color(clrButtonRedFg), Red ? Theme.Color(clrButtonRedBg) : Theme.Color(clrBackground), font, t1 - t0, 0, taCenter); + osd->DrawText(t1, y4, Green, Theme.Color(clrButtonGreenFg), Green ? Theme.Color(clrButtonGreenBg) : Theme.Color(clrBackground), font, t2 - t1, 0, taCenter); + osd->DrawText(t2, y4, Yellow, Theme.Color(clrButtonYellowFg), Yellow ? Theme.Color(clrButtonYellowBg) : Theme.Color(clrBackground), font, t3 - t2, 0, taCenter); + osd->DrawText(t3, y4, Blue, Theme.Color(clrButtonBlueFg), Blue ? Theme.Color(clrButtonBlueBg) : Theme.Color(clrBackground), font, t4 - t3, 0, taCenter); } void cSkinClassicDisplayMenu::SetMessage(eMessageType Type, const char *Text) -- cgit v1.2.3