summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-02-17 15:45:25 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-02-17 15:45:25 +0100
commit10d3ad00aec593c2748189e046406bc6c1142814 (patch)
tree246aa0e70f1df3bca94002093cbd1fa43da2e978
parentbe2dbbd9382d4e25f1b329ea3de45e6401b694aa (diff)
downloadvdr-10d3ad00aec593c2748189e046406bc6c1142814.tar.gz
vdr-10d3ad00aec593c2748189e046406bc6c1142814.tar.bz2
cMenuText now uses the given font
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--menu.c5
-rw-r--r--menu.h3
4 files changed, 8 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4bcef409..08ef8428 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -955,6 +955,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
via the numeric keys
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 making cMenuText use the given font
Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index 143617cb..d0f7f1c8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4317,7 +4317,7 @@ Video Disk Recorder Revision History
- Added cSkin::GetTextAreaWidth() and cSkin::GetTextAreaFont(), so that a plugin
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
Skawina).
@@ -4329,3 +4329,4 @@ Video Disk Recorder Revision History
- Improved OSD area handling in cDvbSpuDecoder (thanks to Marco Schlüßler).
- Now logging the description (if present) in case a thread is canceled (suggested
by Marco Schlüßler).
+- cMenuText now uses the given font (thanks to Rolf Ahrenberg).
diff --git a/menu.c b/menu.c
index d9c6b04c..6202aa89 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.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"
@@ -572,6 +572,7 @@ cMenuText::cMenuText(const char *Title, const char *Text, eDvbFont Font)
:cOsdMenu(Title)
{
text = NULL;
+ font = Font;
SetText(Text);
}
@@ -589,7 +590,7 @@ void cMenuText::SetText(const char *Text)
void cMenuText::Display(void)
{
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);
}
diff --git a/menu.h b/menu.h
index 55d179c7..0cfa4fb6 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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
@@ -22,6 +22,7 @@
class cMenuText : public cOsdMenu {
private:
char *text;
+ eDvbFont font;
public:
cMenuText(const char *Title, const char *Text, eDvbFont Font = fontOsd);
virtual ~cMenuText();