From c4fda383641fd986977a3b771f90eb28cb9b2179 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Sun, 23 Nov 2008 02:22:13 +0200 Subject: [PATCH] Replaced "Use single area (8bpp)" option with VDR's "Setup/OSD/Anti-alias". --- HISTORY | 1 + femon.c | 5 ----- femoncfg.c | 1 - femoncfg.h | 1 - femonosd.c | 2 +- po/de_DE.po | 11 +---------- po/es_ES.po | 11 +---------- po/et_EE.po | 11 +---------- po/fi_FI.po | 14 +------------- po/fr_FR.po | 14 +------------- po/it_IT.po | 14 +------------- po/ru_RU.po | 11 +---------- 12 files changed, 9 insertions(+), 87 deletions(-) diff --git a/HISTORY b/HISTORY index bfee9b2..ce442d7 100644 --- a/HISTORY +++ b/HISTORY @@ -317,3 +317,4 @@ VDR Plugin 'femon' Revision History - Updated Italian translation (Thanks to Diego Pierotto). - Fixed a memory leak. - Added a check for the minimum OSD height. +- Replaced "Use single area (8bpp)" option with VDR's "Setup/OSD/Anti-alias". diff --git a/femon.c b/femon.c index 5888f26..af56705 100644 --- a/femon.c +++ b/femon.c @@ -108,7 +108,6 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value) { // Parse your own setup parameters and store their values. if (!strcasecmp(Name, "HideMenu")) femonConfig.hidemenu = atoi(Value); - else if (!strcasecmp(Name, "UseSingleArea")) femonConfig.usesinglearea = atoi(Value); else if (!strcasecmp(Name, "DisplayMode")) femonConfig.displaymode = atoi(Value); else if (!strcasecmp(Name, "Position")) femonConfig.position = atoi(Value); else if (!strcasecmp(Name, "OSDHeight")) femonConfig.osdheight = atoi(Value); @@ -311,9 +310,6 @@ void cMenuFemonSetup::Setup(void) Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &data.hidemenu)); help.Append(tr("Define whether the main menu entry is hidden.")); - Add(new cMenuEditBoolItem(tr("Use single area (8bpp)"), &data.usesinglearea)); - help.Append(tr("Define whether a single 8bpp OSD area is preferred.\n\nRequired by Truetype fonts and anti-aliasing.")); - Add(new cMenuEditStraItem(tr("Default display mode"), &data.displaymode, eFemonModeMaxNumber, dispmodes)); help.Append(tr("Define the default display mode at startup.")); @@ -372,7 +368,6 @@ void cMenuFemonSetup::Store(void) Dprintf("%s()\n", __PRETTY_FUNCTION__); femonConfig = data; SetupStore("HideMenu", femonConfig.hidemenu); - SetupStore("UseSingleArea", femonConfig.usesinglearea); SetupStore("DisplayMode", femonConfig.displaymode); SetupStore("Skin", femonConfig.skin); SetupStore("Theme", femonConfig.theme); diff --git a/femoncfg.c b/femoncfg.c index efe74c1..965f03c 100644 --- a/femoncfg.c +++ b/femoncfg.c @@ -13,7 +13,6 @@ cFemonConfig femonConfig; cFemonConfig::cFemonConfig(void) { hidemenu = 0; - usesinglearea = 0; displaymode = 0; skin = 0; theme = 0; diff --git a/femoncfg.h b/femoncfg.h index 08e1560..08b1380 100644 --- a/femoncfg.h +++ b/femoncfg.h @@ -24,7 +24,6 @@ struct cFemonConfig public: cFemonConfig(void); int hidemenu; - int usesinglearea; int displaymode; int skin; int theme; diff --git a/femonosd.c b/femonosd.c index 681da29..ce9c2de 100644 --- a/femonosd.c +++ b/femonosd.c @@ -515,7 +515,7 @@ void cFemonOsd::Show(void) if (m_Osd) { // try to use single 8bpp area tArea Areas1[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 8 } }; - if (femonConfig.usesinglearea && m_Osd->CanHandleAreas(Areas1, sizeof(Areas1) / sizeof(tArea)) == oeOk) { + if (Setup.AntiAlias && m_Osd->CanHandleAreas(Areas1, sizeof(Areas1) / sizeof(tArea)) == oeOk) { m_Osd->SetAreas(Areas1, sizeof(Areas1) / sizeof(tArea)); } else { diff --git a/po/de_DE.po b/po/de_DE.po index 2760979..2918267 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.3\n" +"Project-Id-Version: femon 1.6.4\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" "POT-Creation-Date: 2008-11-09 13:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" @@ -71,15 +71,6 @@ msgstr "Hauptmen msgid "Define whether the main menu entry is hidden." msgstr "" -msgid "Use single area (8bpp)" -msgstr "Ein Bildbereich benutzen (8bpp)" - -msgid "" -"Define whether a single 8bpp OSD area is preferred.\n" -"\n" -"Required by Truetype fonts and anti-aliasing." -msgstr "" - msgid "Default display mode" msgstr "Standard Anzeigemodus" diff --git a/po/es_ES.po b/po/es_ES.po index 8bb406e..312a30e 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.3\n" +"Project-Id-Version: femon 1.6.4\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" "POT-Creation-Date: 2008-11-09 13:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" @@ -69,15 +69,6 @@ msgstr "Ocultar en el men msgid "Define whether the main menu entry is hidden." msgstr "" -msgid "Use single area (8bpp)" -msgstr "" - -msgid "" -"Define whether a single 8bpp OSD area is preferred.\n" -"\n" -"Required by Truetype fonts and anti-aliasing." -msgstr "" - msgid "Default display mode" msgstr "Modo de visualización estandar" diff --git a/po/et_EE.po b/po/et_EE.po index f5ab4dd..fcfe26f 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.3\n" +"Project-Id-Version: femon 1.6.4\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" "POT-Creation-Date: 2008-11-09 13:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" @@ -69,15 +69,6 @@ msgstr "Peida valik peamen msgid "Define whether the main menu entry is hidden." msgstr "" -msgid "Use single area (8bpp)" -msgstr "" - -msgid "" -"Define whether a single 8bpp OSD area is preferred.\n" -"\n" -"Required by Truetype fonts and anti-aliasing." -msgstr "" - msgid "Default display mode" msgstr "Vaikimisi displei moodus" diff --git a/po/fi_FI.po b/po/fi_FI.po index 02a328d..1367f96 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.3\n" +"Project-Id-Version: femon 1.6.4\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" "POT-Creation-Date: 2008-11-09 13:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" @@ -69,18 +69,6 @@ msgstr "Piilota valinta päävalikosta" msgid "Define whether the main menu entry is hidden." msgstr "Määrittele, näytetäänkö laajennoksen valinta päävalikossa." -msgid "Use single area (8bpp)" -msgstr "Käytä yksittäistä kuva-aluetta (8bpp)" - -msgid "" -"Define whether a single 8bpp OSD area is preferred.\n" -"\n" -"Required by Truetype fonts and anti-aliasing." -msgstr "" -"Määrittele, yritetäänkö käyttää yksittäistä 8bpp kuva-aluetta.\n" -"\n" -"Truetype-kirjasimet ja reunan pehmennys vaativat tämän asetuksen." - msgid "Default display mode" msgstr "Oletusnäyttötila" diff --git a/po/fr_FR.po b/po/fr_FR.po index c30c6e5..c3ac623 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.3\n" +"Project-Id-Version: femon 1.6.4\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" "POT-Creation-Date: 2008-11-09 13:31+0200\n" "PO-Revision-Date: 2008-01-26 09:59+0100\n" @@ -69,18 +69,6 @@ msgstr "Masquer dans le menu principal" msgid "Define whether the main menu entry is hidden." msgstr "Définit si l'entrée doit être masquée dans le menu principal." -msgid "Use single area (8bpp)" -msgstr "Utiliser zone unique (8bpp)" - -msgid "" -"Define whether a single 8bpp OSD area is preferred.\n" -"\n" -"Required by Truetype fonts and anti-aliasing." -msgstr "" -"Définit si une seule zone OSD de 8bpp est préférée.\n" -"\n" -"Requis par les polices Truetype et l'anti-aliasing." - msgid "Default display mode" msgstr "Affichage par défaut" diff --git a/po/it_IT.po b/po/it_IT.po index 9a365e7..bc673d5 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.3\n" +"Project-Id-Version: femon 1.6.4\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" "POT-Creation-Date: 2008-11-09 13:31+0200\n" "PO-Revision-Date: 2008-11-10 23:37+0100\n" @@ -70,18 +70,6 @@ msgstr "Nascondi voce menu principale" msgid "Define whether the main menu entry is hidden." msgstr "Definisci se la voce del menu principale è nascosta." -msgid "Use single area (8bpp)" -msgstr "Utilizza area singola (8bpp)" - -msgid "" -"Define whether a single 8bpp OSD area is preferred.\n" -"\n" -"Required by Truetype fonts and anti-aliasing." -msgstr "" -"Definisci se è preferita un'area OSD singola a 8bpp.\n" -"\n" -"Richiesto dai caratteri Truetype e anti-aliasing." - msgid "Default display mode" msgstr "Modalità visualizz. predefinita" diff --git a/po/ru_RU.po b/po/ru_RU.po index f7ac2bc..9b72eb0 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.6.3\n" +"Project-Id-Version: femon 1.6.4\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" "POT-Creation-Date: 2008-11-09 13:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" @@ -69,15 +69,6 @@ msgstr " msgid "Define whether the main menu entry is hidden." msgstr "" -msgid "Use single area (8bpp)" -msgstr "" - -msgid "" -"Define whether a single 8bpp OSD area is preferred.\n" -"\n" -"Required by Truetype fonts and anti-aliasing." -msgstr "" - msgid "Default display mode" msgstr "ÀÕÖØÜ ßÞ ãÜÞÛçÐÝØî"