frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cMenuText now uses the given font

This commit is contained in:
Klaus Schmidinger 2006-02-17 15:45:25 +01:00
parent be2dbbd938
commit 10d3ad00ae
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -955,6 +955,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
via the numeric keys via the numeric keys
for reporting a problem with expired timers when shutting down via the Power key for reporting a problem with expired timers when shutting down via the Power key
for fixing handling the "Blue" key in the "Schedule" menu for the current channel for fixing handling the "Blue" key in the "Schedule" menu for the current channel
for making cMenuText use the given font
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark

3
HISTORY
View File

@ -4317,7 +4317,7 @@ Video Disk Recorder Revision History
- Added cSkin::GetTextAreaWidth() and cSkin::GetTextAreaFont(), so that a plugin - Added cSkin::GetTextAreaWidth() and cSkin::GetTextAreaFont(), so that a plugin
that wants to do special text formatting can do so (thanks to Alexander Rieger). that wants to do special text formatting can do so (thanks to Alexander Rieger).
2006-02-12: Version 1.3.43 2006-02-17: Version 1.3.43
- Removed an unnecessary toFile->SetReadAhead() from cutter.c (thanks to Artur - Removed an unnecessary toFile->SetReadAhead() from cutter.c (thanks to Artur
Skawina). Skawina).
@ -4329,3 +4329,4 @@ Video Disk Recorder Revision History
- Improved OSD area handling in cDvbSpuDecoder (thanks to Marco Schlüßler). - Improved OSD area handling in cDvbSpuDecoder (thanks to Marco Schlüßler).
- Now logging the description (if present) in case a thread is canceled (suggested - Now logging the description (if present) in case a thread is canceled (suggested
by Marco Schlüßler). by Marco Schlüßler).
- cMenuText now uses the given font (thanks to Rolf Ahrenberg).

5
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.410 2006/02/05 13:31:08 kls Exp $ * $Id: menu.c 1.411 2006/02/17 15:38:46 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -572,6 +572,7 @@ cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
:cOsdMenu(Title) :cOsdMenu(Title)
{ {
text = NULL; text = NULL;
font = Font;
SetText(Text); SetText(Text);
} }
@ -589,7 +590,7 @@ void cMenuText::SetText(const char *Text)
void cMenuText::Display(void) 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, font == fontFix); //XXX define control character in text to choose the font???
cStatus::MsgOsdTextItem(text); cStatus::MsgOsdTextItem(text);
} }

3
menu.h
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.h 1.82 2006/01/22 14:24:31 kls Exp $ * $Id: menu.h 1.83 2006/02/17 15:38:40 kls Exp $
*/ */
#ifndef __MENU_H #ifndef __MENU_H
@ -22,6 +22,7 @@
class cMenuText : public cOsdMenu { class cMenuText : public cOsdMenu {
private: private:
char *text; char *text;
eDvbFont font;
public: public:
cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd); cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
virtual ~cMenuText(); virtual ~cMenuText();