summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/cs_CZ.po5
-rw-r--r--po/de_DE.po5
-rw-r--r--po/fi_FI.po5
-rw-r--r--po/it_IT.po6
-rw-r--r--po/ru_RU.po5
-rw-r--r--setup_menu.c31
6 files changed, 47 insertions, 10 deletions
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 4cd41613..f0b2efe7 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2009-01-07 15:46+0200\n"
+"POT-Creation-Date: 2009-08-07 15:14+0300\n"
"PO-Revision-Date: 2008-03-20 23:57+0100\n"
"Last-Translator: Maya <maja373@gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -479,6 +479,9 @@ msgstr "Obrazovkové menu"
msgid "Hide main menu"
msgstr "Nezobrazovat v hlavním menu"
+msgid "Resolution"
+msgstr ""
+
msgid "Blending method"
msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index f1840bbf..2eae7cf1 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2009-01-07 15:46+0200\n"
+"POT-Creation-Date: 2009-08-07 15:14+0300\n"
"PO-Revision-Date: 2007-11-23 10:17+0200\n"
"Last-Translator: Udo Richter\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -478,6 +478,9 @@ msgstr "On-Screen Display"
msgid "Hide main menu"
msgstr "Verstecke Hauptmenü"
+msgid "Resolution"
+msgstr ""
+
msgid "Blending method"
msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index e3c8a9b9..bf4a182b 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2009-01-07 15:46+0200\n"
+"POT-Creation-Date: 2009-08-07 15:14+0300\n"
"PO-Revision-Date: 2008-10-06 11:19+0200\n"
"Last-Translator: Rolf Ahrenberg\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -479,6 +479,9 @@ msgstr "Kuvaruutunäyttö"
msgid "Hide main menu"
msgstr "Piilota valinta päävalikossa"
+msgid "Resolution"
+msgstr "Tarkkuus"
+
msgid "Blending method"
msgstr "Piirtotapa"
diff --git a/po/it_IT.po b/po/it_IT.po
index 9276bd93..ff0acdec 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2009-01-07 15:46+0200\n"
+"POT-Creation-Date: 2009-08-07 15:14+0300\n"
"PO-Revision-Date: 2009-02-08 20:09+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -480,6 +480,9 @@ msgstr "Messaggi in sovrimpressione (OSD)"
msgid "Hide main menu"
msgstr "Nascondi voce menu princ."
+msgid "Resolution"
+msgstr ""
+
msgid "Blending method"
msgstr "Metodo di sfocatura"
@@ -650,4 +653,3 @@ msgstr "Prova immagini"
msgid "X11/xine-lib output plugin"
msgstr "Plugin uscita X11/xine-lib"
-
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 27a45d25..6a94e135 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xineliboutput 1.1.0\n"
"Report-Msgid-Bugs-To: <phintuka@users.sourceforge.net>\n"
-"POT-Creation-Date: 2009-01-07 15:46+0200\n"
+"POT-Creation-Date: 2009-08-07 15:14+0300\n"
"PO-Revision-Date: 2007-11-23 10:17+0200\n"
"Last-Translator: Vladimir Monchenko\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -478,6 +478,9 @@ msgstr "ÍÚàÐÝÝÞÕ ÜÕÝî"
msgid "Hide main menu"
msgstr "ÁÚàëâì ÞáÝÞÒÝÞÕ ÜÕÝî"
+msgid "Resolution"
+msgstr ""
+
msgid "Blending method"
msgstr ""
diff --git a/setup_menu.c b/setup_menu.c
index 0cd91bf8..ed962003 100644
--- a/setup_menu.c
+++ b/setup_menu.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: setup_menu.c,v 1.70 2009-05-29 15:09:10 phintuka Exp $
+ * $Id: setup_menu.c,v 1.71 2009-08-07 12:29:31 phintuka Exp $
*
*/
@@ -886,6 +886,8 @@ class cMenuSetupOSD : public cMenuSetupPage
int orig_alpha_correction;
int orig_alpha_correction_abs;
+ cOsdItem *ctrl_size;
+ cOsdItem *ctrl_width;
cOsdItem *ctrl_scaling;
cOsdItem *ctrl_alpha;
cOsdItem *ctrl_alpha_abs;
@@ -895,7 +897,7 @@ class cMenuSetupOSD : public cMenuSetupPage
protected:
virtual void Store(void);
void Set(void);
-
+
public:
cMenuSetupOSD(void);
~cMenuSetupOSD();
@@ -920,11 +922,13 @@ cMenuSetupOSD::~cMenuSetupOSD()
}
void cMenuSetupOSD::Set(void)
-{
+{
SetPlugin(cPluginManager::GetPlugin(PLUGIN_NAME_I18N));
int current = Current();
Clear();
+ ctrl_size = NULL;
+ ctrl_width = NULL;
ctrl_scaling = NULL;
ctrl_blending = NULL;
ctrl_lowres = NULL;
@@ -932,9 +936,20 @@ void cMenuSetupOSD::Set(void)
ctrl_alpha_abs = NULL;
Add(NewTitle(tr("On-Screen Display")));
- Add(new cMenuEditBoolItem(tr("Hide main menu"),
+ Add(new cMenuEditBoolItem(tr("Hide main menu"),
&newconfig.hide_main_menu));
+ Add(ctrl_size =
+ new cMenuEditStraI18nItem(tr("Resolution"), &newconfig.osd_size,
+ OSD_SIZE_count, xc.s_osdSizes));
+ if (newconfig.osd_size == OSD_SIZE_custom) {
+ Add(ctrl_width =
+ new cMenuEditTypedIntItem(tr(" Width"), "px",
+ &newconfig.osd_width, 480, 2048));
+ Add(new cMenuEditTypedIntItem(tr(" Height"), "px",
+ &newconfig.osd_height, 576, 1200));
+ }
+
Add(ctrl_blending =
new cMenuEditBoolItem(tr("Blending method"),
&newconfig.osd_blending,
@@ -994,6 +1009,11 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys Key)
else if(item == ctrl_alpha_abs)
xc.alpha_correction_abs = newconfig.alpha_correction_abs;
+ if (newconfig.osd_size == OSD_SIZE_custom && !ctrl_width)
+ Set();
+ if (newconfig.osd_size != OSD_SIZE_custom && ctrl_width)
+ Set();
+
if(newconfig.osd_blending==OSD_BLENDING_SOFTWARE && !ctrl_lowres)
Set();
if(newconfig.osd_blending!=OSD_BLENDING_SOFTWARE && ctrl_lowres)
@@ -1013,6 +1033,9 @@ void cMenuSetupOSD::Store(void)
orig_alpha_correction = xc.alpha_correction;
orig_alpha_correction_abs = xc.alpha_correction_abs;
+ SetupStore("OSD.Size", xc.s_osdSizes[xc.osd_size]);
+ SetupStore("OSD.Width", xc.osd_width);
+ SetupStore("OSD.Height", xc.osd_height);
SetupStore("OSD.Scaling", xc.osd_scaling);
SetupStore("OSD.HideMainMenu", xc.hide_main_menu);
SetupStore("OSD.LayersVisible", xc.osd_mixer);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 16:22:46 +0000