summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-05-23 11:22:47 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2004-05-23 11:22:47 +0200
commit41873ff43c70004be822a470dcebc7f2f8a66524 (patch)
tree5e89b83e460f7966d04ebd316ec4d5fb2b4254e6
parentdfa0e4b38bf58fdba0a67a6e611d63f162ab68ec (diff)
downloadvdr-41873ff43c70004be822a470dcebc7f2f8a66524.tar.gz
vdr-41873ff43c70004be822a470dcebc7f2f8a66524.tar.bz2
Added some missing cStatus::MsgOsdTextItem() calls1.3.8
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--menu.c6
3 files changed, 8 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7ce49219..48e7831d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -522,6 +522,7 @@ Oliver Endriss <o.endriss@gmx.de>
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
+ for reporting some missing cStatus::MsgOsdTextItem() calls
Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index 35283936..49b388d9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2835,3 +2835,5 @@ Video Disk Recorder Revision History
(thanks to Oliver Endriss).
- No longer displaying unused color buttons in the "Classic VDR" skin (thanks to
Oliver Endriss for reporting this one).
+- Added some missing cStatus::MsgOsdTextItem() calls (thanks to Oliver Endriss for
+ reporting this one).
diff --git a/menu.c b/menu.c
index d6548234..889b82b1 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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"
@@ -521,6 +521,7 @@ void cMenuText::Display(void)
{
cOsdMenu::Display();
DisplayMenu()->SetText(text, true);//XXX define control character in text to choose the font???
+ cStatus::MsgOsdTextItem(text);
}
eOSState cMenuText::ProcessKey(eKeys Key)
@@ -535,6 +536,7 @@ eOSState cMenuText::ProcessKey(eKeys Key)
case kRight|k_Repeat:
case kRight:
DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
+ cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
return osContinue;
default: break;
}
@@ -865,6 +867,7 @@ void cMenuEvent::Display(void)
{
cOsdMenu::Display();
DisplayMenu()->SetEvent(event);
+ cStatus::MsgOsdTextItem(event->Description());
}
eOSState cMenuEvent::ProcessKey(eKeys Key)
@@ -879,6 +882,7 @@ eOSState cMenuEvent::ProcessKey(eKeys Key)
case kRight|k_Repeat:
case kRight:
DisplayMenu()->Scroll(NORMALKEY(Key) == kUp || NORMALKEY(Key) == kLeft, NORMALKEY(Key) == kLeft || NORMALKEY(Key) == kRight);
+ cStatus::MsgOsdTextItem(NULL, NORMALKEY(Key) == kUp);
return osContinue;
default: break;
}