From b1e4da3be6552f58f3890bf2ad48879823d2e130 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 17 Jun 2007 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.5.4=20-=20Increased=20APIVERSION=20(forgot?= =?UTF-8?q?=20to=20do=20that=20in=201.5.2=20and=201.5.3).=20-=20Fixed=20a?= =?UTF-8?q?=20crash=20in=20i18n=20character=20set=20conversion=20(thanks?= =?UTF-8?q?=20to=20Alexander=20Riedel,=20=20=20Jose=20Alberto=20Reguero=20?= =?UTF-8?q?and=20Christian=20Wieninger=20for=20patches=20that=20cured=20pa?= =?UTF-8?q?rt=20of=20=20=20the=20problem).=20-=20Adjusted=20the=20'skincur?= =?UTF-8?q?ses'=20plugin=20to=20UTF-8=20handling.=20-=20Using=20nl=5Flangi?= =?UTF-8?q?nfo(CODESET)=20to=20determine=20the=20local=20codeset=20to=20us?= =?UTF-8?q?e=20(thanks=20to=20=20=20Thomas=20G=C3=BCnther).=20The=20codese?= =?UTF-8?q?t=20names=20in=20'libsi/si.c'=20have=20been=20changed=20to=20th?= =?UTF-8?q?e=20=20=20canonical=20spelling=20with=20'-'=20(thanks=20to=20Lu?= =?UTF-8?q?dwig=20Nussel=20for=20pointing=20this=20out).=20-=20Modified=20?= =?UTF-8?q?handling=20invalid=20characters=20in=20VFAT=20mode.=20-=20Repla?= =?UTF-8?q?ced=20strn0cpy()=20with=20Utf8Strn0Cpy()=20where=20necessary.?= =?UTF-8?q?=20-=20Now=20using=20'fontconfig'=20to=20determine=20which=20fo?= =?UTF-8?q?nts=20to=20use=20(thanks=20to=20Anssi=20Hannula=20=20=20for=20c?= =?UTF-8?q?ode=20and=20hints=20on=20how=20to=20do=20this).=20-=20If=20no?= =?UTF-8?q?=20fonts=20are=20installed,=20VDR=20now=20uses=20a=20dummy=20fo?= =?UTF-8?q?nt=20that=20doesn't=20actually=20draw=20=20=20any=20text,=20and?= =?UTF-8?q?=20logs=20an=20error=20message.=20-=20The=20new=20function=20cF?= =?UTF-8?q?ont::CreateFont()=20can=20be=20used=20by=20plugins=20to=20creat?= =?UTF-8?q?e=20and=20use=20=20=20fonts=20of=20their=20own,=20independent?= =?UTF-8?q?=20of=20VDR's=20standard=20fonts.=20-=20Updated=20the=20Finnish?= =?UTF-8?q?=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Change?= =?UTF-8?q?d=20the=20parameter=20"OSD=20font"=20to=20"Default=20font"=20in?= =?UTF-8?q?=20"Setup/OSD"=20(suggested=20=20=20by=20Rolf=20Ahrenberg).=20-?= =?UTF-8?q?=20Fixed=20handling=20detached=20processes=20in=20SystemExec()?= =?UTF-8?q?=20(thanks=20to=20Udo=20Richter).=20-=20The=20info.vdr=20file?= =?UTF-8?q?=20now=20also=20stores=20the=20name=20of=20the=20channel,=20and?= =?UTF-8?q?=20the=20new=20function=20=20=20cRecordingInfo::ChannelName()?= =?UTF-8?q?=20returns=20this=20information=20if=20available=20(based=20on?= =?UTF-8?q?=20=20=20a=20patch=20from=20Alexander=20Hans).=20-=20The=20new?= =?UTF-8?q?=20function=20cOsd::SetOsdPosition()=20can=20be=20used=20to=20d?= =?UTF-8?q?ynamically=20change=20the=20=20=20position=20and=20size=20of=20?= =?UTF-8?q?the=20OSD=20(based=20on=20a=20request=20from=20Christoph=20Haub?= =?UTF-8?q?rich).=20=20=20Plugins=20that=20implement=20skins=20should=20no?= =?UTF-8?q?=20longer=20use=20Setup.OSDWidth=20etc.=20directly,=20=20=20but?= =?UTF-8?q?=20should=20rather=20use=20cOsd::OsdWidth()=20etc.=20instead.?= =?UTF-8?q?=20=20=20Currently=20a=20change=20to=20the=20OSD=20position=20w?= =?UTF-8?q?ill=20only=20apply=20to=20newly=20opened=20OSDs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- menu.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'menu.c') diff --git a/menu.c b/menu.c index 47e9c3d..13e224d 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.451 2007/06/09 14:36:46 kls Exp $ + * $Id: menu.c 1.455 2007/06/17 12:33:01 kls Exp $ */ #include "menu.h" @@ -2160,7 +2160,7 @@ private: cThemes themes; int originalThemeIndex; int themeIndex; - cFileNameList fontNames; + cStringList fontOsdNames, fontSmlNames, fontFixNames; int fontOsdIndex, fontSmlIndex, fontFixIndex; virtual void Set(void); public: @@ -2176,12 +2176,15 @@ cMenuSetupOSD::cMenuSetupOSD(void) skinDescriptions = new const char*[numSkins]; themes.Load(Skins.Current()->Name()); themeIndex = originalThemeIndex = Skins.Current()->Theme() ? themes.GetThemeIndex(Skins.Current()->Theme()->Description()) : 0; - fontNames.Load(FONTDIR); - if (fontNames.Size()) { - fontOsdIndex = max(0, fontNames.Find(Setup.FontOsd)); - fontSmlIndex = max(0, fontNames.Find(Setup.FontSml)); - fontFixIndex = max(0, fontNames.Find(Setup.FontFix)); - } + cFont::GetAvailableFontNames(&fontOsdNames); + cFont::GetAvailableFontNames(&fontSmlNames); + cFont::GetAvailableFontNames(&fontFixNames, true); + fontOsdNames.Insert(strdup(DefaultFontOsd)); + fontSmlNames.Insert(strdup(DefaultFontSml)); + fontFixNames.Insert(strdup(DefaultFontFix)); + fontOsdIndex = max(0, fontOsdNames.Find(Setup.FontOsd)); + fontSmlIndex = max(0, fontSmlNames.Find(Setup.FontSml)); + fontFixIndex = max(0, fontFixNames.Find(Setup.FontFix)); Set(); } @@ -2211,11 +2214,9 @@ void cMenuSetupOSD::Set(void) Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"), &data.OSDMessageTime, 1, 60)); Add(new cMenuEditStraItem(tr("Setup.OSD$Use small font"), &data.UseSmallFont, 3, useSmallFontTexts)); Add(new cMenuEditBoolItem(tr("Setup.OSD$Anti-alias"), &data.AntiAlias)); - if (fontNames.Size()) { - Add(new cMenuEditStraItem(tr("Setup.OSD$OSD font name"), &fontOsdIndex, fontNames.Size(), &fontNames[0])); - Add(new cMenuEditStraItem(tr("Setup.OSD$Small font name"), &fontSmlIndex, fontNames.Size(), &fontNames[0])); - Add(new cMenuEditStraItem(tr("Setup.OSD$Fixed font name"), &fontFixIndex, fontNames.Size(), &fontNames[0])); - } + Add(new cMenuEditStraItem(tr("Setup.OSD$Default font"), &fontOsdIndex, fontOsdNames.Size(), &fontOsdNames[0])); + Add(new cMenuEditStraItem(tr("Setup.OSD$Small font"), &fontSmlIndex, fontSmlNames.Size(), &fontSmlNames[0])); + Add(new cMenuEditStraItem(tr("Setup.OSD$Fixed font"), &fontFixIndex, fontFixNames.Size(), &fontFixNames[0])); Add(new cMenuEditIntItem( tr("Setup.OSD$OSD font size (pixel)"), &data.FontOsdSize, 10, MAXFONTSIZE)); Add(new cMenuEditIntItem( tr("Setup.OSD$Small font size (pixel)"),&data.FontSmlSize, 10, MAXFONTSIZE)); Add(new cMenuEditIntItem( tr("Setup.OSD$Fixed font size (pixel)"),&data.FontFixSize, 10, MAXFONTSIZE)); @@ -2239,14 +2240,14 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key) if (skinIndex != originalSkinIndex) { cSkin *Skin = Skins.Get(skinIndex); if (Skin) { - strn0cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin)); + Utf8Strn0Cpy(data.OSDSkin, Skin->Name(), sizeof(data.OSDSkin)); Skins.SetCurrent(Skin->Name()); ModifiedApperance = true; } } if (themes.NumThemes() && Skins.Current()->Theme()) { Skins.Current()->Theme()->Load(themes.FileName(themeIndex)); - strn0cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme)); + Utf8Strn0Cpy(data.OSDTheme, themes.Name(themeIndex), sizeof(data.OSDTheme)); ModifiedApperance |= themeIndex != originalThemeIndex; } if (data.OSDLeft != Setup.OSDLeft || data.OSDTop != Setup.OSDTop || data.OSDWidth != Setup.OSDWidth || data.OSDHeight != Setup.OSDHeight) { @@ -2255,11 +2256,9 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key) } if (data.UseSmallFont != Setup.UseSmallFont || data.AntiAlias != Setup.AntiAlias) ModifiedApperance = true; - if (fontNames.Size()) { - strn0cpy(data.FontOsd, fontNames[fontOsdIndex], sizeof(data.FontOsd)); - strn0cpy(data.FontSml, fontNames[fontSmlIndex], sizeof(data.FontSml)); - strn0cpy(data.FontFix, fontNames[fontFixIndex], sizeof(data.FontFix)); - } + Utf8Strn0Cpy(data.FontOsd, fontOsdNames[fontOsdIndex], sizeof(data.FontOsd)); + Utf8Strn0Cpy(data.FontSml, fontSmlNames[fontSmlIndex], sizeof(data.FontSml)); + Utf8Strn0Cpy(data.FontFix, fontFixNames[fontFixIndex], sizeof(data.FontFix)); if (strcmp(data.FontOsd, Setup.FontOsd) || data.FontOsdSize != Setup.FontOsdSize) { cFont::SetFont(fontOsd, data.FontOsd, data.FontOsdSize); ModifiedApperance = true; -- cgit v1.2.3