Correct an error in setup page

6 files changed, 111 insertions, 73 deletions

diff --git a/po/ca_ES.po b/po/ca_ES.po
index 3d03c4a..1ba91bd 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-04-05 13:01+0200\n"
+"POT-Creation-Date: 2019-04-07 14:23+0200\n"
 "PO-Revision-Date: 2013-09-21 17:49+0200\n"
 "Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -783,31 +783,34 @@ msgstr ""
 msgid "Use Remotetimers"
 msgstr "Utilitza temporitzadors remots"
 
+msgid "Limit channels in favorites"
+msgstr ""
+
 msgid "Use \"What's on now\" in favorites"
 msgstr ""
 
 msgid "Use \"What's on next\" in favorites"
 msgstr ""
 
-msgid "Use user defined time 1 in favorites"
+msgid "User defined times in favorites:"
 msgstr ""
 
-msgid "Description"
+msgid "Use user defined time 1"
 msgstr ""
 
-msgid "Time"
+msgid "Description"
 msgstr ""
 
-msgid "Use user defined time 2 in favorites"
+msgid "Time"
 msgstr ""
 
-msgid "Use user defined time 3 in favorites"
+msgid "Use user defined time 2"
 msgstr ""
 
-msgid "Use user defined time 4 in favorites"
+msgid "Use user defined time 3"
 msgstr ""
 
-msgid "Limit channels in favorites"
+msgid "Use user defined time 4"
 msgstr ""
 
 msgid "Switchtimer:"
@@ -846,6 +849,9 @@ msgstr ""
 msgid "Recording Menus Icon Cache"
 msgstr ""
 
+msgid "A fancy 2d EPG Viewer"
+msgstr ""
+
 msgid "No Cast available"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index fb94d97..c653a27 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-04-06 16:05+0200\n"
+"POT-Creation-Date: 2019-04-07 14:23+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: Horst\n"
 "Language-Team: \n"
@@ -780,14 +780,20 @@ msgstr "Verzeichnis für Sofortaufnahmen"
 msgid "Use Remotetimers"
 msgstr "RemoteTimers benutzen"
 
+msgid "Limit channels in favorites"
+msgstr "Kanäle in Favoriten beschränken"
+
 msgid "Use \"What's on now\" in favorites"
 msgstr "\"Was läuft jetzt\" in Favoriten benutzen"
 
 msgid "Use \"What's on next\" in favorites"
 msgstr "\"Was läuft als nächstes\" in Favoriten benutzen"
 
-msgid "Use user defined time 1 in favorites"
-msgstr "Benutzerdef. Zeit 1 in Favoriten benutzen"
+msgid "User defined times in favorites:"
+msgstr "Nutzer definierte Zeiten in Favoriten:"
+
+msgid "Use user defined time 1"
+msgstr "Verw. benutzerdef. Zeit 1"
 
 msgid "Description"
 msgstr "Beschreibung"
@@ -795,17 +801,14 @@ msgstr "Beschreibung"
 msgid "Time"
 msgstr "Zeit"
 
-msgid "Use user defined time 2 in favorites"
-msgstr "Benutzerdef. Zeit 2 in Favoriten benutzen"
+msgid "Use user defined time 2"
+msgstr "Verw. benutzerdef. Zeit 2"
 
-msgid "Use user defined time 3 in favorites"
-msgstr "Benutzerdef. Zeit 3 in Favoriten benutzen"
+msgid "Use user defined time 3"
+msgstr "Verw. benutzerdef. Zeit 3"
 
-msgid "Use user defined time 4 in favorites"
-msgstr "Benutzerdef. Zeit 4 in Favoriten benutzen"
-
-msgid "Limit channels in favorites"
-msgstr "Kanäle in Favoriten beschränken"
+msgid "Use user defined time 4"
+msgstr "Verw. benutzerdef. Zeit 4"
 
 msgid "Switchtimer:"
 msgstr "Umschalttimer:"
diff --git a/po/it_IT.po b/po/it_IT.po
index 2d44590..6be0fdf 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-04-05 13:01+0200\n"
+"POT-Creation-Date: 2019-04-07 14:23+0200\n"
 "PO-Revision-Date: 2012-08-25 17:49+0200\n"
 "Last-Translator: fiveten_59\n"
 "Language-Team: \n"
@@ -780,14 +780,20 @@ msgstr "Cartella per la registrazione immediata"
 msgid "Use Remotetimers"
 msgstr "Usa Remotetimers"
 
+msgid "Limit channels in favorites"
+msgstr "Limite dei canali nei favoriti"
+
 msgid "Use \"What's on now\" in favorites"
 msgstr "Usa \"In programma ora\" nei favoriti"
 
 msgid "Use \"What's on next\" in favorites"
 msgstr "Usa \"Programma prossimo\" nei favoriti"
 
-msgid "Use user defined time 1 in favorites"
-msgstr "Usa il tempo definito per l'user 1 in favoriti"
+msgid "User defined times in favorites:"
+msgstr ""
+
+msgid "Use user defined time 1"
+msgstr "Usa il tempo definito per l'user 1"
 
 msgid "Description"
 msgstr "Descrizione"
@@ -795,17 +801,14 @@ msgstr "Descrizione"
 msgid "Time"
 msgstr "Tempo"
 
-msgid "Use user defined time 2 in favorites"
-msgstr "Usa il tempo definito per l'user 2 in favoriti"
+msgid "Use user defined time 2"
+msgstr "Usa il tempo definito per l'user 2"
 
-msgid "Use user defined time 3 in favorites"
-msgstr "Usa il tempo definito per l'user 3 in favoriti"
+msgid "Use user defined time 3"
+msgstr "Usa il tempo definito per l'user 3"
 
-msgid "Use user defined time 4 in favorites"
-msgstr "Usa il tempo definito per l'user 4 in favoriti"
-
-msgid "Limit channels in favorites"
-msgstr "Limite dei canali nei favoriti"
+msgid "Use user defined time 4"
+msgstr "Usa il tempo definito per l'user 4"
 
 msgid "Switchtimer:"
 msgstr ""
@@ -843,6 +846,9 @@ msgstr "Cache dei Gruppi Canale"
 msgid "Recording Menus Icon Cache"
 msgstr "Recording Menüs Icon Cache"
 
+msgid "A fancy 2d EPG Viewer"
+msgstr ""
+
 msgid "No Cast available"
 msgstr "Nessun cast disponibile"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c86e093..b28db28 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.0.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-04-05 13:01+0200\n"
+"POT-Creation-Date: 2019-04-07 14:23+0200\n"
 "PO-Revision-Date: 2013-09-25 17:49+0400\n"
 "Last-Translator: AmiD, ilya\n"
 "Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n"
@@ -780,31 +780,34 @@ msgstr ""
 msgid "Use Remotetimers"
 msgstr "RemoteTimers benutzen"
 
+msgid "Limit channels in favorites"
+msgstr ""
+
 msgid "Use \"What's on now\" in favorites"
 msgstr ""
 
 msgid "Use \"What's on next\" in favorites"
 msgstr ""
 
-msgid "Use user defined time 1 in favorites"
+msgid "User defined times in favorites:"
 msgstr ""
 
-msgid "Description"
+msgid "Use user defined time 1"
 msgstr ""
 
-msgid "Time"
+msgid "Description"
 msgstr ""
 
-msgid "Use user defined time 2 in favorites"
+msgid "Time"
 msgstr ""
 
-msgid "Use user defined time 3 in favorites"
+msgid "Use user defined time 2"
 msgstr ""
 
-msgid "Use user defined time 4 in favorites"
+msgid "Use user defined time 3"
 msgstr ""
 
-msgid "Limit channels in favorites"
+msgid "Use user defined time 4"
 msgstr ""
 
 msgid "Switchtimer:"
@@ -843,6 +846,9 @@ msgstr ""
 msgid "Recording Menus Icon Cache"
 msgstr ""
 
+msgid "A fancy 2d EPG Viewer"
+msgstr ""
+
 msgid "No Cast available"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 543f6f0..3296c13 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-tvguide 1.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-04-05 13:01+0200\n"
+"POT-Creation-Date: 2019-04-07 14:23+0200\n"
 "PO-Revision-Date: 2013-09-15 00:12+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -780,31 +780,34 @@ msgstr ""
 msgid "Use Remotetimers"
 msgstr "Pou¾i» vzdialený plánovaè"
 
+msgid "Limit channels in favorites"
+msgstr ""
+
 msgid "Use \"What's on now\" in favorites"
 msgstr ""
 
 msgid "Use \"What's on next\" in favorites"
 msgstr ""
 
-msgid "Use user defined time 1 in favorites"
+msgid "User defined times in favorites:"
 msgstr ""
 
-msgid "Description"
+msgid "Use user defined time 1"
 msgstr ""
 
-msgid "Time"
+msgid "Description"
 msgstr ""
 
-msgid "Use user defined time 2 in favorites"
+msgid "Time"
 msgstr ""
 
-msgid "Use user defined time 3 in favorites"
+msgid "Use user defined time 2"
 msgstr ""
 
-msgid "Use user defined time 4 in favorites"
+msgid "Use user defined time 3"
 msgstr ""
 
-msgid "Limit channels in favorites"
+msgid "Use user defined time 4"
 msgstr ""
 
 msgid "Switchtimer:"
@@ -843,6 +846,9 @@ msgstr ""
 msgid "Recording Menus Icon Cache"
 msgstr ""
 
+msgid "A fancy 2d EPG Viewer"
+msgstr ""
+
 msgid "No Cast available"
 msgstr ""
 
diff --git a/setup.c b/setup.c
index da842f6..bfc9f3f 100644
--- a/setup.c
+++ b/setup.c
@@ -155,7 +155,7 @@ void cTvguideSetup::Store(void) {
     SetupStore("limitLogoCache", tvguideConfig.limitLogoCache);
 }
 
-cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cTvguideConfig* data) : cOsdMenu(Title, 30) {
+cMenuSetupSubMenu::cMenuSetupSubMenu(const char* Title, cTvguideConfig* data) : cOsdMenu(Title, 40) {
     tmpTvguideConfig = data;
     indent = "    ";
 }
@@ -397,33 +397,34 @@ void cMenuSetupFavorites::Set(void) {
     if (pRemoteTimers)
         Add(new cMenuEditBoolItem(tr("Use Remotetimers"), &tmpTvguideConfig->useRemoteTimers));
 
+    Add(new cMenuEditBoolItem(tr("Limit channels in favorites"), &tmpTvguideConfig->favLimitChannels));
+    if (tmpTvguideConfig->favLimitChannels) {
+        Add(new cMenuEditChanItem(tr("Start Channel"), &tmpTvguideConfig->favStartChannel));
+        Add(new cMenuEditChanItem(tr("Stop Channel"), &tmpTvguideConfig->favStopChannel));
+    }
     Add(new cMenuEditBoolItem(tr("Use \"What's on now\" in favorites"), &tmpTvguideConfig->favWhatsOnNow));
     Add(new cMenuEditBoolItem(tr("Use \"What's on next\" in favorites"), &tmpTvguideConfig->favWhatsOnNext));
-    Add(new cMenuEditBoolItem(tr("Use user defined time 1 in favorites"), &tmpTvguideConfig->favUseTime1));
+    Add(new cOsdItem(tr("User defined times in favorites:"), osUnknown, false));
+    Add(new cMenuEditBoolItem(tr("Use user defined time 1"), &tmpTvguideConfig->favUseTime1));
     if (tmpTvguideConfig->favUseTime1) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Description")), description1, sizeof(description1), trVDR(FileNameChars)));
         Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpTvguideConfig->favTime1));
     }
-    Add(new cMenuEditBoolItem(tr("Use user defined time 2 in favorites"), &tmpTvguideConfig->favUseTime2));
+    Add(new cMenuEditBoolItem(tr("Use user defined time 2"), &tmpTvguideConfig->favUseTime2));
     if (tmpTvguideConfig->favUseTime2) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Description")), description2, sizeof(description2), trVDR(FileNameChars)));
         Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpTvguideConfig->favTime2));
     }
-    Add(new cMenuEditBoolItem(tr("Use user defined time 3 in favorites"), &tmpTvguideConfig->favUseTime3));
+    Add(new cMenuEditBoolItem(tr("Use user defined time 3"), &tmpTvguideConfig->favUseTime3));
     if (tmpTvguideConfig->favUseTime3) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Description")), description3, sizeof(description3), trVDR(FileNameChars)));
         Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpTvguideConfig->favTime3));
     }
-    Add(new cMenuEditBoolItem(tr("Use user defined time 4 in favorites"), &tmpTvguideConfig->favUseTime4));
+    Add(new cMenuEditBoolItem(tr("Use user defined time 4"), &tmpTvguideConfig->favUseTime4));
     if (tmpTvguideConfig->favUseTime4) {
         Add(new cMenuEditStrItem(cString::sprintf("%s%s", *indent, tr("Description")), description4, sizeof(description4), trVDR(FileNameChars)));
         Add(new cMenuEditTimeItem(cString::sprintf("%s%s", *indent, tr("Time")), &tmpTvguideConfig->favTime4));
     }
-    Add(new cMenuEditBoolItem(tr("Limit channels in favorites"), &tmpTvguideConfig->favLimitChannels));
-    if (tmpTvguideConfig->favLimitChannels) {
-        Add(new cMenuEditChanItem(tr("Start Channel"), &tmpTvguideConfig->favStartChannel));
-        Add(new cMenuEditChanItem(tr("Stop Channel"), &tmpTvguideConfig->favStopChannel));
-    }
     Add(new cOsdItem(tr("Switchtimer:"), osUnknown, false));
     Add(new cMenuEditStraItem(tr("Switch Mode"), &tmpTvguideConfig->switchMode, 3,  switchModeItems));
     Add(new cMenuEditIntItem(tr("Switch (x)min before start of the show"), &tmpTvguideConfig->switchMinsBefore, 0, 10));
@@ -434,32 +435,42 @@ void cMenuSetupFavorites::Set(void) {
 }
 
 eOSState cMenuSetupFavorites::ProcessKey(eKeys Key) {
+
     int tmpFavUseTime1 = tmpTvguideConfig->favUseTime1;
     int tmpFavUseTime2 = tmpTvguideConfig->favUseTime2;
     int tmpFavUseTime3 = tmpTvguideConfig->favUseTime3;
     int tmpFavUseTime4 = tmpTvguideConfig->favUseTime4;
     int tmpFavLimitChannels = tmpTvguideConfig->favLimitChannels;
     int tmpFolderMode = tmpTvguideConfig->instRecFolderMode;
+
     eOSState state = cOsdMenu::ProcessKey(Key);
-    if (Key == kOk) {
-        tmpTvguideConfig->descUser1 = description1;
-        tmpTvguideConfig->descUser2 = description2;
-        tmpTvguideConfig->descUser3 = description3;
-        tmpTvguideConfig->descUser4 = description4;
-        tmpTvguideConfig->instRecFixedFolder = fixedFolder;
-    } else if ((Key == kLeft)||(Key == kRight)) {
-        if ((tmpFavUseTime1 != tmpTvguideConfig->favUseTime1) ||
-            (tmpFavUseTime2 != tmpTvguideConfig->favUseTime2) ||
-            (tmpFavUseTime3 != tmpTvguideConfig->favUseTime3) ||
-            (tmpFavUseTime4 != tmpTvguideConfig->favUseTime4) ||
-            (tmpFavLimitChannels != tmpTvguideConfig->favLimitChannels) ||
-            (tmpFolderMode != tmpTvguideConfig->instRecFolderMode) )
-            Set();
+
+    if ((tmpFavUseTime1 != tmpTvguideConfig->favUseTime1) ||
+        (tmpFavUseTime2 != tmpTvguideConfig->favUseTime2) ||
+        (tmpFavUseTime3 != tmpTvguideConfig->favUseTime3) ||
+        (tmpFavUseTime4 != tmpTvguideConfig->favUseTime4) ||
+        (tmpFavLimitChannels != tmpTvguideConfig->favLimitChannels) ||
+        (tmpFolderMode != tmpTvguideConfig->instRecFolderMode) ) {
+        Set();
+        Display();
     }
+
+    if (state == osUnknown) {
+        switch (Key) {
+        case kOk: {
+            tmpTvguideConfig->descUser1 = cString::sprintf("%s", description1);
+            tmpTvguideConfig->descUser2 = cString::sprintf("%s", description2);
+            tmpTvguideConfig->descUser3 = cString::sprintf("%s", description3);
+            tmpTvguideConfig->descUser4 = cString::sprintf("%s", description4);
+            return osBack; }
+        default:
+            break;
+        }
+    }
+
     return state;
 }
 
-
 //-----Image Caching-------------------------------------------------------------------------------------------------------------
 cMenuSetupImageCache::cMenuSetupImageCache(cTvguideConfig* data)  : cMenuSetupSubMenu(tr("Image Loading and Caching"), data) {
     Set();