Added outline width setting

13 files changed, 49 insertions, 12 deletions

diff --git a/po/ca_ES.po b/po/ca_ES.po
index c94bf07..6960e10 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -81,6 +81,9 @@ msgstr "Selecci� font DVB"
 msgid "Font Size (pixel)"
 msgstr ""
 
+msgid "Font OutlineWidth (pixel)"
+msgstr ""
+
 msgid "Language"
 msgstr "Idioma"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 1591b56..83a42bc 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -79,6 +79,9 @@ msgstr "DVB Quelle Auswahl"
 msgid "Font Size (pixel)"
 msgstr ""
 
+msgid "Font OutlineWidth (pixel)"
+msgstr ""
+
 msgid "Language"
 msgstr "Sprache"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index b2bc4eb..f2e3ac8 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -79,6 +79,9 @@ msgstr "Selecci�n fuente DVB"
 msgid "Font Size (pixel)"
 msgstr ""
 
+msgid "Font OutlineWidth (pixel)"
+msgstr ""
+
 msgid "Language"
 msgstr "Idioma"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index ea89541..45bfcdc 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -82,6 +82,10 @@ msgstr "Tekstitysl�hteen valinta"
 msgid "Font Size (pixel)"
 msgstr "Kirjasintyypin koko (px)"
 
+#, fuzzy
+msgid "Font OutlineWidth (pixel)"
+msgstr "Kirjasintyypin koko (px)"
+
 msgid "Language"
 msgstr "Tekstityskieli"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 642f8b4..07f3ee9 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2009-01-04 19:05+0100\n"
 "Last-Translator: Nival Michaël\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -82,6 +82,10 @@ msgstr "Sélection Source DVB"
 msgid "Font Size (pixel)"
 msgstr "Taille Police (pixel)"
 
+#, fuzzy
+msgid "Font OutlineWidth (pixel)"
+msgstr "Taille Police (pixel)"
+
 msgid "Language"
 msgstr "Langues"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index e7f8966..d7b6e46 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2008-12-20 19:51+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -83,6 +83,10 @@ msgstr "Selezione sorgente DVB"
 msgid "Font Size (pixel)"
 msgstr "Dim. caratteri (pixel)"
 
+#, fuzzy
+msgid "Font OutlineWidth (pixel)"
+msgstr "Dim. caratteri (pixel)"
+
 msgid "Language"
 msgstr "Lingua"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 52ee99b..7e41d2a 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2008-12-30 14:05+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -79,6 +79,10 @@ msgstr "����� DVB ���������"
 msgid "Font Size (pixel)"
 msgstr "������ �����  (pixel)"
 
+#, fuzzy
+msgid "Font OutlineWidth (pixel)"
+msgstr "������ �����  (pixel)"
+
 msgid "Language"
 msgstr "����"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index c71db0c..1743fbe 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -80,6 +80,9 @@ msgstr ""
 msgid "Font Size (pixel)"
 msgstr ""
 
+msgid "Font OutlineWidth (pixel)"
+msgstr ""
+
 msgid "Language"
 msgstr "Spr�k"
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 2e2ab25..a7887ea 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2010-02-07 14:01+0100\n"
+"POT-Creation-Date: 2010-02-07 14:29+0100\n"
 "PO-Revision-Date: 2009-05-28 14:05+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -74,6 +74,10 @@ msgstr "Вибір DVB джерела"
 msgid "Font Size (pixel)"
 msgstr "Размір фонта (пікселі)"
 
+#, fuzzy
+msgid "Font OutlineWidth (pixel)"
+msgstr "Размір фонта (пікселі)"
+
 msgid "Language"
 msgstr "Мова"
 
diff --git a/ttxtsubs.c b/ttxtsubs.c
index f7731db..251888a 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -331,6 +331,7 @@ bool cPluginTtxtsubs::SetupParse(const char *Name, const char *Value)
   else if(!strcasecmp(Name, "FrenchSpecial")) globals.mFrenchSpecial = atoi(Value);
   else if(!strcasecmp(Name, "DvbSources")) globals.mDvbSources = atoi(Value);
   else if(!strcasecmp(Name, "FontSize")) globals.mFontSize = atoi(Value);
+  else if(!strcasecmp(Name, "OutlineWidth")) globals.mOutlineWidth = atoi(Value);
   else if(!strcasecmp(Name, "Languages")) parseLanguages(Value);
   else if(!strcasecmp(Name, "HearingImpaireds")) parseHIs(Value);
   // Handle old settings
@@ -642,6 +643,7 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
   Add(new cMenuEditStraItem(tr("DVB Source Selection"),
                           &mConf.mDvbSources, 4, dvbSources));
   Add(new cMenuEditIntItem(tr("Font Size (pixel)"), &mConf.mFontSize, 10, MAXFONTSIZE * 2));
+  Add(new cMenuEditIntItem(tr("Font OutlineWidth (pixel)"), &mConf.mOutlineWidth, 1, 10));
 
   for(int n = 0; n < MAXLANGUAGES; n++) {
     char str[100];
@@ -699,6 +701,7 @@ void cMenuSetupTtxtsubs::Store(void)
   SetupStore("MainMenuEntry", mConf.mMainMenuEntry);
   SetupStore("DvbSources", mConf.mDvbSources);
   SetupStore("FontSize", mConf.mFontSize);
+  SetupStore("OutlineWidth", mConf.mOutlineWidth);
 
   char lstr[MAXLANGUAGES*2*4 + 1];
   char histr[MAXLANGUAGES*2 + 1];
diff --git a/ttxtsubsdisplay.c b/ttxtsubsdisplay.c
index 590c11c..078c9d5 100644
--- a/ttxtsubsdisplay.c
+++ b/ttxtsubsdisplay.c
@@ -360,9 +360,9 @@ void cTtxtSubsDisplay::UpdateSubtitleTextLines()
 void cTtxtSubsDisplay::DrawOutlinedText(int x, int y, const char* text, tColor textColor, tColor outlineColor,
   tColor backgroundColor, const cFont* font)
 {
-    for (int horizontalOffset = -TEXT_OUTLINE_THICKNESS; horizontalOffset <= TEXT_OUTLINE_THICKNESS; horizontalOffset++)
+    for (int horizontalOffset = -globals.mOutlineWidth; horizontalOffset <= globals.mOutlineWidth; horizontalOffset++)
     {
-        for (int verticalOffset = -TEXT_OUTLINE_THICKNESS; verticalOffset <= TEXT_OUTLINE_THICKNESS; verticalOffset++) 
+        for (int verticalOffset = -globals.mOutlineWidth; verticalOffset <= globals.mOutlineWidth; verticalOffset++) 
         {
             if (horizontalOffset || verticalOffset)
             {
diff --git a/ttxtsubsdisplay.h b/ttxtsubsdisplay.h
index 3fd0886..622a0f6 100644
--- a/ttxtsubsdisplay.h
+++ b/ttxtsubsdisplay.h
@@ -28,7 +28,6 @@ class cOsd;
 class cFont;
 
 #define MAXTTXTROWS 5
-#define TEXT_OUTLINE_THICKNESS 1
 
 struct SubtitleTextLine
 {
diff --git a/ttxtsubsglobals.h b/ttxtsubsglobals.h
index 093103a..59dfcb0 100644
--- a/ttxtsubsglobals.h
+++ b/ttxtsubsglobals.h
@@ -42,6 +42,7 @@ class cTtxtsubsConf {
       mFrenchSpecial = 0;
       mDvbSources = 0;
       mFontSize = 20;
+      mOutlineWidth = 2;
       memset(mLanguages, 0, sizeof(mLanguages));
       memset(mHearingImpaireds, 0, sizeof(mHearingImpaireds));
       mI18nLanguage = 0;
@@ -57,6 +58,7 @@ class cTtxtsubsConf {
   int frenchSpecial(void) {return mFrenchSpecial;}
   int dvbSources(void) {return mDvbSources;}
   int fontSize(void) {return mFontSize;}
+  int outlineWidth(void) {return mOutlineWidth;}
   char (*languages(void))[MAXLANGUAGES][2][4] {return &mLanguages;}
   int (*hearingImpaireds(void))[MAXLANGUAGES][2] {return &mHearingImpaireds;}
 
@@ -74,6 +76,7 @@ class cTtxtsubsConf {
   int mFrenchSpecial;
   int mDvbSources;
   int mFontSize;
+  int mOutlineWidth;
   char mLanguages[MAXLANGUAGES][2][4];
   int mHearingImpaireds[MAXLANGUAGES][2];
   int mI18nLanguage;