From 513791d5f17345224f02e9187472e2a19f1426ec Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Thu, 25 Feb 2010 20:33:20 +0200 Subject: [PATCH] Added a setup option to downscale the OSD size. --- HISTORY | 4 ++++ femon.c | 6 +++++- femoncfg.c | 1 + femoncfg.h | 1 + femonosd.c | 8 +++++--- femonosd.h | 2 ++ po/de_DE.po | 10 ++++++++-- po/es_ES.po | 10 ++++++++-- po/et_EE.po | 10 ++++++++-- po/fi_FI.po | 10 ++++++++-- po/fr_FR.po | 10 ++++++++-- po/it_IT.po | 10 ++++++++-- po/lt_LT.po | 10 ++++++++-- po/ru_RU.po | 10 ++++++++-- po/zh_CN.po | 10 ++++++++-- po/zh_TW.po | 10 ++++++++-- 16 files changed, 98 insertions(+), 24 deletions(-) diff --git a/HISTORY b/HISTORY index 0739603..ceef3b9 100644 --- a/HISTORY +++ b/HISTORY @@ -389,3 +389,7 @@ VDR Plugin 'femon' Revision History - Updated for vdr-1.7.12. - Updated Estonian translation (Thanks to Arthur Konovalov). - Added Lithuanian translation (Thanks to Valdemaras Pipiras). + +2010-xx-xx: Version 1.7.7 + +- Added a setup option to downscale the OSD size. diff --git a/femon.c b/femon.c index 72d6b19..ca3a89d 100644 --- a/femon.c +++ b/femon.c @@ -18,7 +18,7 @@ #error "VDR-1.7.12 API version or greater is required!" #endif -static const char VERSION[] = "1.7.6"; +static const char VERSION[] = "1.7.7"; static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)"); static const char MAINMENUENTRY[] = trNOOP("Signal Information"); @@ -319,6 +319,9 @@ void cMenuFemonSetup::Setup(void) Add(new cMenuEditBoolItem(tr("Position"), &data.position, trVDR("bottom"), trVDR("top"))); help.Append(tr("Define the position of OSD.")); + Add(new cMenuEditIntItem(tr("Downscale OSD size [%]"), &data.downscale, 0, 20)); + help.Append(tr("Define the downscale ratio for OSD size.")); + Add(new cMenuEditIntItem(tr("Red limit [%]"), &data.redlimit, 1, 50)); help.Append(tr("Define a limit for red bar, which is used to indicate a bad signal.")); @@ -360,6 +363,7 @@ void cMenuFemonSetup::Store(void) SetupStore("Skin", femonConfig.skin); SetupStore("Theme", femonConfig.theme); SetupStore("Position", femonConfig.position); + SetupStore("Downscale", femonConfig.downscale); SetupStore("RedLimit", femonConfig.redlimit); SetupStore("GreenLimit", femonConfig.greenlimit); SetupStore("UpdateInterval", femonConfig.updateinterval); diff --git a/femoncfg.c b/femoncfg.c index 02f1d0b..ba275a8 100644 --- a/femoncfg.c +++ b/femoncfg.c @@ -17,6 +17,7 @@ cFemonConfig::cFemonConfig(void) skin = 0; theme = 0; position = 1; + downscale = 0; redlimit = 33; greenlimit = 66; updateinterval = 5; diff --git a/femoncfg.h b/femoncfg.h index 13647e2..c8c7f59 100644 --- a/femoncfg.h +++ b/femoncfg.h @@ -28,6 +28,7 @@ public: int skin; int theme; int position; + int downscale; int redlimit; int greenlimit; int updateinterval; diff --git a/femonosd.c b/femonosd.c index d30df81..20309b1 100644 --- a/femonosd.c +++ b/femonosd.c @@ -179,8 +179,10 @@ cFemonOsd::cFemonOsd() m_UNCValid(false), m_FrontendStatusValid(false), m_DisplayMode(femonConfig.displaymode), - m_OsdWidth(cOsd::OsdWidth()), - m_OsdHeight(cOsd::OsdHeight()), + m_OsdWidth(cOsd::OsdWidth() * (100 - femonConfig.downscale) / 100), + m_OsdHeight(cOsd::OsdHeight() * (100 - femonConfig.downscale) / 100), + m_OsdLeft(cOsd::OsdLeft() + (cOsd::OsdWidth() * femonConfig.downscale / 200)), + m_OsdTop(cOsd::OsdTop() + (cOsd::OsdHeight() * femonConfig.downscale / 200)), m_InputTime(0), m_Sleep(), m_Mutex() @@ -597,7 +599,7 @@ void cFemonOsd::Show(void) return; } - m_Osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop()); + m_Osd = cOsdProvider::NewOsd(m_OsdLeft, m_OsdTop); if (m_Osd) { tArea Areas1[] = { { 0, 0, OSDWIDTH - 1, OSDHEIGHT - 1, 8 } }; if (Setup.AntiAlias && m_Osd->CanHandleAreas(Areas1, sizeof(Areas1) / sizeof(tArea)) == oeOk) { diff --git a/femonosd.h b/femonosd.h index 58ff428..a2d0151 100644 --- a/femonosd.h +++ b/femonosd.h @@ -50,6 +50,8 @@ private: int m_DisplayMode; int m_OsdWidth; int m_OsdHeight; + int m_OsdLeft; + int m_OsdTop; cFont *m_Font; cTimeMs m_InputTime; cCondWait m_Sleep; diff --git a/po/de_DE.po b/po/de_DE.po index eae8ac8..3c42042 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,9 +7,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Christian Wieninger\n" "Language-Team: \n" @@ -89,6 +89,12 @@ msgstr "Position" msgid "Define the position of OSD." msgstr "" +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "Grenze Rot [%]" diff --git a/po/es_ES.po b/po/es_ES.po index bdc7417..3633386 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Luis Palacios\n" "Language-Team: \n" @@ -87,6 +87,12 @@ msgstr "Posici msgid "Define the position of OSD." msgstr "" +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "Límite de rojo [%s]" diff --git a/po/et_EE.po b/po/et_EE.po index 3068e7c..3a4aec4 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Arthur Konovalov\n" "Language-Team: \n" @@ -87,6 +87,12 @@ msgstr "Positsioon" msgid "Define the position of OSD." msgstr "Ekraaniinfo positsiooni määritlemine." +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "Punase limiit [%]" diff --git a/po/fi_FI.po b/po/fi_FI.po index d389275..0ed8ff7 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: \n" @@ -87,6 +87,12 @@ msgstr "Sijainti" msgid "Define the position of OSD." msgstr "Määrittele näytön sijainti." +msgid "Downscale OSD size [%]" +msgstr "Pienennä näytön kokoa [%]" + +msgid "Define the downscale ratio for OSD size." +msgstr "Määrittele näytön pienennyssuhde." + msgid "Red limit [%]" msgstr "Punaisen taso [%]" diff --git a/po/fr_FR.po b/po/fr_FR.po index 5465eb7..807c030 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2008-01-26 09:59+0100\n" "Last-Translator: NIVAL Michaël \n" "Language-Team: \n" @@ -87,6 +87,12 @@ msgstr "Position" msgid "Define the position of OSD." msgstr "Définit la position de l'OSD." +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "Limite du rouge (%)" diff --git a/po/it_IT.po b/po/it_IT.po index 3bc4837..d5fa66c 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2008-11-10 23:37+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" @@ -88,6 +88,12 @@ msgstr "Posizione" msgid "Define the position of OSD." msgstr "Definisci la posizione dell'OSD." +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "Limite rosso [%]" diff --git a/po/lt_LT.po b/po/lt_LT.po index 243e152..2628c6c 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Valdemaras Pipiras\n" "Language-Team: \n" @@ -87,6 +87,12 @@ msgstr "Pozicija" msgid "Define the position of OSD." msgstr "Nustatyti ekrano užsklandos pozicijÄ…." +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "Raudonoji ribÄ… [%]" diff --git a/po/ru_RU.po b/po/ru_RU.po index 3fa2c90..4b04f24 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2007-08-12 23:22+0300\n" "Last-Translator: Vyacheslav Dikonov\n" "Language-Team: \n" @@ -87,6 +87,12 @@ msgstr " msgid "Define the position of OSD." msgstr "" +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "ºàÐáÝÐï ×ÞÝÐ áÛÐÑÞÓÞ áØÓÝÐÛÐ ÔÞ (%)" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0d4176a..1a1437d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2009-09-21 21:36+0800\n" "Last-Translator: NanFeng \n" "Language-Team: \n" @@ -87,6 +87,12 @@ msgstr "ä½ç½®" msgid "Define the position of OSD." msgstr "确定èœå•çš„ä½ç½®." +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "红é™åˆ¶[ ï¼… ]" diff --git a/po/zh_TW.po b/po/zh_TW.po index a02d2a2..ae1a3ee 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: femon 1.7.3\n" +"Project-Id-Version: femon 1.7.7\n" "Report-Msgid-Bugs-To: Rolf Ahrenberg\n" -"POT-Creation-Date: 2009-08-29 20:57+0300\n" +"POT-Creation-Date: 2010-02-25 20:31+0200\n" "PO-Revision-Date: 2009-09-21 21:36+0800\n" "Last-Translator: NanFeng \n" "Language-Team: \n" @@ -87,6 +87,12 @@ msgstr "ä½ç½®" msgid "Define the position of OSD." msgstr "確定èœå–®çš„ä½ç½®." +msgid "Downscale OSD size [%]" +msgstr "" + +msgid "Define the downscale ratio for OSD size." +msgstr "" + msgid "Red limit [%]" msgstr "ç´…é™åˆ¶[ ï¼… ]"