Project

General

Profile

Feature #149 » vdr-osdteletext-hidemainmenu.diff

Mreimer, 10/23/2009 09:15 AM

View differences:

osdteletext-0.8.3/menu.c 2009-10-21 17:15:32.622604164 +0200
mapKeyToAction[2]=HalfPage;
mapKeyToAction[0]=SwitchChannel;
showClock=true;
suspendReceiving=false;
autoUpdatePage=true;
HideMainMenu=false;
//OSDHeight+width default values given in Start()
OSDHAlign=50;
OSDVAlign=50;
//use the value set for VDR's min user inactivity.
//Initially this value could be changed via the plugin's setup, but I removed that
osdteletext-0.8.3/osdteletext.c 2009-10-21 17:20:30.980072004 +0200
virtual const char *Version(void) { return VERSION; }
virtual const char *Description(void) { return tr(DESCRIPTION); }
virtual const char *CommandLineHelp(void);
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);
};
class cTeletextSetupPage;
......
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.
return new TeletextBrowser(txtStatus);
}
......
else if (!strcasecmp(Name, "autoUpdatePage")) ttSetup.autoUpdatePage=atoi(Value);
else if (!strcasecmp(Name, "OSDheight")) ttSetup.OSDheight=atoi(Value);
else if (!strcasecmp(Name, "OSDwidth")) ttSetup.OSDwidth=atoi(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)) {
ttSetup.mapKeyToAction[i]=(eTeletextAction)atoi(Value);
//for migration to 0.4
......
ttSetup.suspendReceiving=temp.suspendReceiving;
ttSetup.autoUpdatePage=temp.autoUpdatePage;
ttSetup.OSDheight=temp.OSDheight;
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++) {
SetupStore(actionKeyNames[i].internalName, ttSetup.mapKeyToAction[i]);
}
SetupStore("configuredClrBackground", (int)(ttSetup.configuredClrBackground >> 24));
......
//SetupStore("suspendReceiving", ttSetup.suspendReceiving);
SetupStore("autoUpdatePage", ttSetup.autoUpdatePage);
SetupStore("OSDheight", ttSetup.OSDheight);
SetupStore("OSDwidth", ttSetup.OSDwidth);
SetupStore("OSDHAlign", ttSetup.OSDHAlign);
SetupStore("OSDVAlign", ttSetup.OSDVAlign);
SetupStore("HideMainMenu", ttSetup.HideMainMenu);
//SetupStore("inactivityTimeout", ttSetup.inactivityTimeout);
}
cTeletextSetupPage::cTeletextSetupPage(void) {
cString buf;
......
temp.suspendReceiving=ttSetup.suspendReceiving;
temp.autoUpdatePage=ttSetup.autoUpdatePage;
temp.OSDheight=ttSetup.OSDheight;
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 ));
//Add(new cMenuEditBoolItem(tr("Setup$Suspend receiving"), &temp.suspendReceiving ));
......
Add(new cMenuEditIntItem(tr("OSD height"), &temp.OSDheight, 250, MAXOSDHEIGHT));
Add(new cMenuEditIntItem(tr("OSD width"), &temp.OSDwidth, 320, MAXOSDWIDTH));
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));
buf = cString::sprintf("%s:", tr("Key bindings"));
item = new cOsdItem(*buf);
osdteletext-0.8.3/po/ca_ES.po 2009-10-21 17:34:12.322135054 +0200
# Jordi Vil? <jvila@tinet.org>, 2003
#
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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
msgstr ""
msgid "OSD vertical align"
msgstr ""
msgid "Hide mainmenu entry"
msgstr ""
msgid "Key bindings"
msgstr ""
msgid " Page number"
msgstr " Nombre de p?gina"
osdteletext-0.8.3/po/de_DE.po 2009-10-21 17:36:05.769735267 +0200
# Klaus Schmidinger <kls@cadsoft.de>, 2000
#
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 <kls@cadsoft.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
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"
msgid " Page number"
msgstr " Seitenzahl"
osdteletext-0.8.3/po/es_ES.po 2009-10-21 17:34:12.322135054 +0200
# Ruben Nunez Francisco <ruben.nunez@tang-it.com>, 2002
#
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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
msgstr ""
msgid "OSD vertical align"
msgstr ""
msgid "Hide mainmenu entry"
msgstr ""
msgid "Key bindings"
msgstr ""
msgid " Page number"
msgstr " N?mero de p?gina"
osdteletext-0.8.3/po/fi_FI.po 2009-10-21 17:34:12.326135467 +0200
# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
#
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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
msgstr "Pystykeskitys"
msgid "OSD vertical align"
msgstr "Vaakakeskitys"
msgid "Hide mainmenu entry"
msgstr ""
msgid "Key bindings"
msgstr "Näppäintoiminnot"
msgid " Page number"
msgstr " Sivunumero"
osdteletext-0.8.3/po/fr_FR.po 2009-10-21 17:34:12.326135467 +0200
# Nicolas Huillard <nhuillard@e-dition.fr>, 2005
#
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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
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"
osdteletext-0.8.3/po/it_IT.po 2009-10-21 17:34:12.326135467 +0200
# Diego Pierotto <vdr-italian@tiscali.it>, 2008
#
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-12 00:47+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
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"
osdteletext-0.8.3/po/pt_PT.po 2009-10-21 17:34:12.326135467 +0200
# Klaus Schmidinger <kls@cadsoft.de>, 2000
#
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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
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"
msgid " Page number"
msgstr " N?mero de P?gina"
osdteletext-0.8.3/po/ru_RU.po 2009-10-21 17:34:12.326135467 +0200
# Vyacheslav Dikonov <sdiconov@mail.ru>, 2004
#
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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-5\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
msgstr "?????????????? ????????? OSD"
msgid "OSD vertical align"
msgstr "???????????? ????????? OSD"
msgid "Hide mainmenu entry"
msgstr ""
msgid "Key bindings"
msgstr "???????? ??????"
msgid " Page number"
msgstr " ????? ????????"
osdteletext-0.8.3/po/uk_UA.po 2009-10-21 17:34:12.326135467 +0200
# Yarema P. aka Knedlyk <yupadmin@gmail.com>, 2008
#
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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
......
msgid "OSD horizontal align"
msgstr "Горизонтальне положення OSD"
msgid "OSD vertical align"
msgstr "Вертикальне положення OSD"
msgid "Hide mainmenu entry"
msgstr ""
msgid "Key bindings"
msgstr "Призначення клавіш"
msgid " Page number"
msgstr " Номер сторінки"
msgstr " Номер сторінки"
osdteletext-0.8.3/setup.h 2009-10-21 16:53:41.757004941 +0200
int autoUpdatePage;
int OSDheight;
int OSDwidth;
int OSDHAlign;
int OSDVAlign;
int inactivityTimeout;
int HideMainMenu;
};
extern TeletextSetup ttSetup;
#endif
    (1-1/1)