1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Added some missing cStatus::MsgOsdTextItem() calls

This commit is contained in:
Klaus Schmidinger 2004-05-23 11:22:47 +02:00
parent dfa0e4b38b
commit 41873ff43c
3 changed files with 8 additions and 1 deletions

View File

@ -522,6 +522,7 @@ Oliver Endriss <o.endriss@gmx.de>
because newer drivers don't do this any more because newer drivers don't do this any more
for adding a missing cStatus::MsgOsdClear() to cDisplayChannel::~cDisplayChannel() for adding a missing cStatus::MsgOsdClear() to cDisplayChannel::~cDisplayChannel()
for reporting that the "Classic VDR" skin wrongly displayed unused color buttons for reporting that the "Classic VDR" skin wrongly displayed unused color buttons
for reporting some missing cStatus::MsgOsdTextItem() calls
Reinhard Walter Buchner <rw.buchner@freenet.de> Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf' for adding some satellites to 'sources.conf'

View File

@ -2835,3 +2835,5 @@ Video Disk Recorder Revision History
(thanks to Oliver Endriss). (thanks to Oliver Endriss).
- No longer displaying unused color buttons in the "Classic VDR" skin (thanks to - No longer displaying unused color buttons in the "Classic VDR" skin (thanks to
Oliver Endriss for reporting this one). Oliver Endriss for reporting this one).
- Added some missing cStatus::MsgOsdTextItem() calls (thanks to Oliver Endriss for
reporting this one).

6
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 1.305 2004/05/23 10:35:04 kls Exp $ * $Id: menu.c 1.306 2004/05/23 11:21:06 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -521,6 +521,7 @@ void cMenuText::Display(void)
{ {
cOsdMenu::Display(); cOsdMenu::Display();
DisplayMenu()->SetText(text, true);//XXX define control character in text to choose the font??? DisplayMenu()->SetText(text, true);//XXX define control character in text to choose the font???
cStatus::MsgOsdTextItem(text);
} }
eOSState cMenuText::ProcessKey(eKeys Key) eOSState cMenuText::ProcessKey(eKeys Key)
@ -535,6 +536,7 @@ eOSState cMenuText::ProcessKey(eKeys Key)
case kRight|k_Repeat: case kRight|k_Repeat:
case kRight: case kRight:
DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight); DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
return osContinue; return osContinue;
default: break; default: break;
} }
@ -865,6 +867,7 @@ void cMenuEvent::Display(void)
{ {
cOsdMenu::Display(); cOsdMenu::Display();
DisplayMenu()->SetEvent(event); DisplayMenu()->SetEvent(event);
cStatus::MsgOsdTextItem(event->Description());
} }
eOSState cMenuEvent::ProcessKey(eKeys Key) eOSState cMenuEvent::ProcessKey(eKeys Key)
@ -879,6 +882,7 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
case kRight|k_Repeat: case kRight|k_Repeat:
case kRight: case kRight:
DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight); DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
return osContinue; return osContinue;
default: break; default: break;
} }