Added setup option to hide main menu entry (Closes #149) (Patch provided by Manuel Reimer)

13 files changed, 53 insertions, 15 deletions

diff --git a/HISTORY b/HISTORY
index 2a1a911..733a9fd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5,6 +5,8 @@ VDR Plugin 'osdteletext' Revision History
 - Updated Italian translation provided by Diego Pierotto (Closes #151)
 - Fix valid page number check in TeletextBrowser::ExecuteAction (Closes #154)
 - Fixed possible segfault (Closes #179) - (Thx to Manuel Reimer)
+- Added setup option to disable maine menu entry (Closes #149)
+  (Thx to Manuel Reimer!)
 
 2009-06-02: version 0.8.3
 - Updated Ukrainian translation provided by Yarema P. aka Knedlyk (Closes #133)
diff --git a/menu.c b/menu.c
index ea61eb5..fa1bccc 100644
--- a/menu.c
+++ b/menu.c
@@ -656,6 +656,7 @@ TeletextSetup::TeletextSetup() {
    showClock=true;
    suspendReceiving=false;
    autoUpdatePage=true;
+   HideMainMenu=false;
    //OSDHeight+width default values given in Start()
    OSDHAlign=50;
    OSDVAlign=50;
diff --git a/osdteletext.c b/osdteletext.c
index cc69bde..34c9184 100644
--- a/osdteletext.c
+++ b/osdteletext.c
@@ -44,7 +44,7 @@ public:
   virtual bool ProcessArgs(int argc, char *argv[]);
   virtual bool Start(void);
   virtual void Housekeeping(void);
-  virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
+  virtual const char *MainMenuEntry(void);
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
@@ -220,6 +220,11 @@ void cPluginTeletextosd::Housekeeping(void)
   // Perform any cleanup or other regular tasks.
 }
 
+const char *cPluginTeletextosd::MainMenuEntry(void)
+{
+   return ttSetup.HideMainMenu ? 0 : tr(MAINMENUENTRY);
+}
+
 cOsdObject *cPluginTeletextosd::MainMenuAction(void)
 {
    // Perform the action when selected from the main VDR menu.
@@ -249,6 +254,7 @@ bool cPluginTeletextosd::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "OSDHAlign")) ttSetup.OSDHAlign=atoi(Value);
   else if (!strcasecmp(Name, "OSDVAlign")) ttSetup.OSDVAlign=atoi(Value);
   else if (!strcasecmp(Name, "inactivityTimeout")) /*ttSetup.inactivityTimeout=atoi(Value)*/;
+  else if (!strcasecmp(Name, "HideMainMenu")) ttSetup.HideMainMenu=atoi(Value);
   else {
      for (int i=0;i<LastActionKey;i++) {
         if (!strcasecmp(Name, cTeletextSetupPage::actionKeyNames[i].internalName)) {
@@ -289,6 +295,7 @@ void cTeletextSetupPage::Store(void) {
    ttSetup.OSDwidth=temp.OSDwidth;
    ttSetup.OSDHAlign=temp.OSDHAlign;
    ttSetup.OSDVAlign=temp.OSDVAlign;
+   ttSetup.HideMainMenu=temp.HideMainMenu;
    //ttSetup.inactivityTimeout=temp.inactivityTimeout;
    
    for (int i=0;i<LastActionKey;i++) {
@@ -303,6 +310,7 @@ void cTeletextSetupPage::Store(void) {
    SetupStore("OSDwidth", ttSetup.OSDwidth);
    SetupStore("OSDHAlign", ttSetup.OSDHAlign);
    SetupStore("OSDVAlign", ttSetup.OSDVAlign);
+   SetupStore("HideMainMenu", ttSetup.HideMainMenu);
    //SetupStore("inactivityTimeout", ttSetup.inactivityTimeout);
 }
 
@@ -329,8 +337,9 @@ cTeletextSetupPage::cTeletextSetupPage(void) {
    temp.OSDwidth=ttSetup.OSDwidth;
    temp.OSDHAlign=ttSetup.OSDHAlign;
    temp.OSDVAlign=ttSetup.OSDVAlign;
+   temp.HideMainMenu=ttSetup.HideMainMenu;
    //temp.inactivityTimeout=ttSetup.inactivityTimeout;
-      
+
    Add(new cMenuEditIntItem(tr("Background transparency"), &tempConfiguredClrBackground, 0, 255)); 
    
    Add(new cMenuEditBoolItem(tr("Show clock"), &temp.showClock ));
@@ -344,6 +353,7 @@ cTeletextSetupPage::cTeletextSetupPage(void) {
    
    Add(new cMenuEditIntItem(tr("OSD horizontal align"), &temp.OSDHAlign, 0, 100));
    Add(new cMenuEditIntItem(tr("OSD vertical align"), &temp.OSDVAlign, 0, 100));
+   Add(new cMenuEditBoolItem(tr("Hide mainmenu entry"), &temp.HideMainMenu));
    
    //Using same string as VDR's setup menu
    //Add(new cMenuEditIntItem(tr("Setup.Miscellaneous$Min. user inactivity (min)"), &temp.inactivityTimeout));
diff --git a/po/ca_ES.po b/po/ca_ES.po
index dd3aa10..5d9b0e5 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 10:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: Catalanian\n"
@@ -68,6 +68,9 @@ msgstr ""
 msgid "OSD vertical align"
 msgstr ""
 
+msgid "Hide mainmenu entry"
+msgstr ""
+
 msgid "Key bindings"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index beaa293..a3f7626 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 10:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>\n"
 "Language-Team: German\n"
@@ -66,6 +66,9 @@ msgstr "OSD horizontale Anordnung"
 msgid "OSD vertical align"
 msgstr "OSD vertikale Anordnung"
 
+msgid "Hide mainmenu entry"
+msgstr "Hauptmen�eintrag verstecken"
+
 msgid "Key bindings"
 msgstr "Tastenzuweisung"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 8eb9cd3..837e4f5 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 10:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: Spanish\n"
@@ -66,6 +66,9 @@ msgstr ""
 msgid "OSD vertical align"
 msgstr ""
 
+msgid "Hide mainmenu entry"
+msgstr ""
+
 msgid "Key bindings"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 28632e5..4a3db9c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 10:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
@@ -66,6 +66,9 @@ msgstr "Pystykeskitys"
 msgid "OSD vertical align"
 msgstr "Vaakakeskitys"
 
+msgid "Hide mainmenu entry"
+msgstr ""
+
 msgid "Key bindings"
 msgstr "Näppäintoiminnot"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 9d590b7..6792ff9 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 10:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2009-01-10 19:32+0100\n"
 "Last-Translator: Nival Michaël\n"
 "Language-Team: French\n"
@@ -69,9 +69,11 @@ msgstr "Alignement horizontal de l'OSD"
 msgid "OSD vertical align"
 msgstr "Alignement vertical de l'OSD"
 
+msgid "Hide mainmenu entry"
+msgstr ""
+
 msgid "Key bindings"
 msgstr "Attribution des touches"
 
 msgid "  Page number"
 msgstr "  Nombre de pages"
-
diff --git a/po/it_IT.po b/po/it_IT.po
index 1f233a6..1db7928 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 10:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2009-07-15 22:49+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
@@ -73,9 +73,11 @@ msgstr "Allineamento orizzontale OSD"
 msgid "OSD vertical align"
 msgstr "Allineamento verticale OSD"
 
+msgid "Hide mainmenu entry"
+msgstr ""
+
 msgid "Key bindings"
 msgstr "Tasti associati"
 
 msgid "  Page number"
 msgstr "  Numero pagina"
-
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 08d734e..b13fecc 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 10:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Chris Silva <hudokkow@gmail.com>\n"
 "Language-Team: Portuguese\n"
@@ -66,6 +66,9 @@ msgstr "Alinhamento Horizontal do OSD"
 msgid "OSD vertical align"
 msgstr "Alinhamento Vertical do OSD"
 
+msgid "Hide mainmenu entry"
+msgstr ""
+
 msgid "Key bindings"
 msgstr "Tecla alocada"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0d9411e..82ff71e 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: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 10:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2008-12-30 13:52+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian\n"
@@ -67,9 +67,11 @@ msgstr "�������������� ��������� OSD"
 msgid "OSD vertical align"
 msgstr "������������ ��������� OSD"
 
+msgid "Hide mainmenu entry"
+msgstr ""
+
 msgid "Key bindings"
 msgstr "�������� ������"
 
 msgid "  Page number"
 msgstr "  ����� ��������"
-
diff --git a/po/uk_UA.po b/po/uk_UA.po
index cdc1a50..fc55a75 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-20 21:45+0100\n"
+"POT-Creation-Date: 2009-10-21 19:27+0200\n"
 "PO-Revision-Date: 2009-05-25 20:33+0200\n"
 "Last-Translator: Yarema P. aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -66,8 +66,11 @@ msgstr "Горизонтальне положення OSD"
 msgid "OSD vertical align"
 msgstr "Вертикальне положення OSD"
 
+msgid "Hide mainmenu entry"
+msgstr ""
+
 msgid "Key bindings"
 msgstr "Призначення клавіш"
 
 msgid "  Page number"
-msgstr "  Номер сторінки"
\ No newline at end of file
+msgstr "  Номер сторінки"
diff --git a/setup.h b/setup.h
index b802a4c..eb51633 100644
--- a/setup.h
+++ b/setup.h
@@ -45,6 +45,7 @@ public:
    int OSDHAlign;
    int OSDVAlign;
    int inactivityTimeout;
+   int HideMainMenu;
 };
 
 extern TeletextSetup ttSetup;