7 files changed, 46 insertions, 3 deletions

diff --git a/config.c b/config.c
index 605ca93..34924d8 100644
--- a/config.c
+++ b/config.c
@@ -59,6 +59,7 @@ cNopacityConfig::cNopacityConfig() {
     roundedCorners = 0;
     cornerRadius = 12;
     useMenuIcons = 1;
+    mainMenuTitleStyle = 0;
     narrowMainMenu = 1;
     narrowScheduleMenu = 1;
     narrowChannelMenu = 1;
@@ -248,6 +249,7 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "roundedCorners") == 0)          roundedCorners = atoi(Value);
     else if (strcmp(Name, "cornerRadius") == 0)            cornerRadius = atoi(Value);
     else if (strcmp(Name, "useMenuIcons") == 0)            useMenuIcons = atoi(Value);
+    else if (strcmp(Name, "mainMenuTitleStyle") == 0)      mainMenuTitleStyle = atoi(Value);
     else if (strcmp(Name, "narrowMainMenu") == 0)          narrowMainMenu = atoi(Value);
     else if (strcmp(Name, "narrowScheduleMenu") == 0)      narrowScheduleMenu = atoi(Value);
     else if (strcmp(Name, "narrowChannelMenu") == 0)       narrowChannelMenu = atoi(Value);
diff --git a/config.h b/config.h
index 4c9cab0..53d25ea 100644
--- a/config.h
+++ b/config.h
@@ -81,6 +81,7 @@ class cNopacityConfig {
         int roundedCorners;

         int cornerRadius;

         int useMenuIcons;

+        int mainMenuTitleStyle;

         int narrowMainMenu;

         int narrowScheduleMenu;

         int narrowChannelMenu;

diff --git a/displaymenu.c b/displaymenu.c
index 2b840d6..9606162 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -279,7 +279,17 @@ void cNopacityDisplayMenu::SetTitle(const char *Title) {
         cString title = Title;
         switch (MenuCategory()) {
             case mcMain:
-                title = cString::sprintf("%s %s", Title, VDRVERSION);
+                switch (config.mainMenuTitleStyle) {
+                    case 0:
+                        title = cString::sprintf("%s %s", Title, VDRVERSION);
+                        break;
+                    case 1:
+                        title = cString::sprintf("%s", VDRVERSION);
+                        break;
+                    case 2:
+                        title = " ";
+                        break;
+                }
                 left += menuView->ShowHeaderLogo(true);
                 break;
             case mcSchedule:
diff --git a/po/de_DE.po b/po/de_DE.po
index dcf390a..8e3b963 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-03-10 16:40+0100\n"
+"POT-Creation-Date: 2013-03-16 11:47+0100\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -167,6 +167,15 @@ msgstr "Schriftgröße anpassen - Header EPG Detailanzeige"
 msgid "Adjust Font Size - Detail View Header Large"
 msgstr "Schriftgröße anpassen - Header Groß EPG Detailanzeige"
 
+msgid "\"VDR\" plus VDR version"
+msgstr "\"VDR\" und VDR Version"
+
+msgid "only VDR version"
+msgstr "nur VDR Version"
+
+msgid "no title"
+msgstr "kein Titel"
+
 msgid "Use narrow main menu"
 msgstr "Schmales Hauptmenü verwenden"
 
@@ -182,6 +191,9 @@ msgstr "Menü Icons benutzen"
 msgid "Icon Size (Square)"
 msgstr "Icon Größe (quadratisch)"
 
+msgid "Main menu title style"
+msgstr ""
+
 msgid "Display Disk Usage"
 msgstr "Festplattenstatus anzeigen"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index eb418dd..3c03964 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinnopacity 0.0.6\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-03-12 08:49+0100\n"
+"POT-Creation-Date: 2013-03-16 11:47+0100\n"
 "PO-Revision-Date: 2013-03-12 15:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -170,6 +170,15 @@ msgstr "Nastavenie veµkosti písma - Podrobné zobrazenie hlavièky"
 msgid "Adjust Font Size - Detail View Header Large"
 msgstr "Nastavenie veµkosti písma - Podrobné zobrazenie veµkej hlavièky"
 
+msgid "\"VDR\" plus VDR version"
+msgstr ""
+
+msgid "only VDR version"
+msgstr ""
+
+msgid "no title"
+msgstr ""
+
 msgid "Use narrow main menu"
 msgstr "Úzke hlavné menu"
 
@@ -185,6 +194,9 @@ msgstr "Pou¾i» ikony ponuky"
 msgid "Icon Size (Square)"
 msgstr "Veµkos» ikony (do ¹tvorca)"
 
+msgid "Main menu title style"
+msgstr ""
+
 msgid "Display Disk Usage"
 msgstr "Zobrazi» vyu¾itie disku"
 
diff --git a/setup.c b/setup.c
index 6f079bd..f8398f9 100644
--- a/setup.c
+++ b/setup.c
@@ -113,6 +113,7 @@ void cNopacitySetup::Store(void) {
     SetupStore("roundedCorners", config.roundedCorners);
     SetupStore("cornerRadius", config.cornerRadius);
     SetupStore("useMenuIcons", config.useMenuIcons);
+    SetupStore("mainMenuTitleStyle", config.mainMenuTitleStyle);
     SetupStore("narrowMainMenu", config.narrowMainMenu);
     SetupStore("narrowScheduleMenu", config.narrowScheduleMenu);
     SetupStore("narrowChannelMenu", config.narrowChannelMenu);
@@ -259,6 +260,9 @@ void cNopacitySetupMenuDisplay::Set(void) {
 //-----MenuDisplay Main and Setup Menu -------------------------------------------------------------------------------------------------------------
 
 cNopacitySetupMenuDisplayMain::cNopacitySetupMenuDisplayMain(cNopacityConfig* data)  : cMenuSetupSubMenu(tr("VDR Menu: Main and Setup Menu"), data) {
+    titleStyle[0] = tr("\"VDR\" plus VDR version");
+    titleStyle[1] = tr("only VDR version");
+    titleStyle[2] = tr("no title");
     Set();
 }
 
@@ -275,6 +279,7 @@ void cNopacitySetupMenuDisplayMain::Set(void) {
     Add(new cMenuEditBoolItem(tr("Use menu icons"), &tmpNopacityConfig->useMenuIcons));
     if (tmpNopacityConfig->useMenuIcons)
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Icon Size (Square)")), &tmpNopacityConfig->iconHeight, 30, 200));
+    Add(new cMenuEditStraItem(tr("Main menu title style"), &tmpNopacityConfig->mainMenuTitleStyle, 3, titleStyle));
     Add(new cMenuEditBoolItem(tr("Display Disk Usage"), &tmpNopacityConfig->showDiscUsage));
     if (tmpNopacityConfig->showDiscUsage) {
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Size (square, Percent of OSD Width)")), &tmpNopacityConfig->menuSizeDiskUsage, 2, 100));
diff --git a/setup.h b/setup.h
index aa40b48..717d55f 100644
--- a/setup.h
+++ b/setup.h
@@ -38,6 +38,7 @@ class cNopacitySetupMenuDisplay : public cMenuSetupSubMenu {
 
 class cNopacitySetupMenuDisplayMain : public cMenuSetupSubMenu {
     protected:
+        const char *titleStyle[3];
         void Set(void);
     public:
         cNopacitySetupMenuDisplayMain(cNopacityConfig *data);