Optional deactivation of the timer confirmation messages

config.c

@@ -35,6 +35,7 @@ cTVGuideConfig::cTVGuideConfig() {
     jumpChannels = 0;
     blueKeyMode = 2;
     addSubtitleToTimer = 1;
+    timerMessage = 1;
     closeOnSwitch = 1;
     numkeyMode = 0;
     useRemoteTimers = 0;
@@ -297,6 +298,7 @@ bool cTVGuideConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "instRecFolderMode") == 0)        instRecFolderMode = atoi(Value);
     else if (strcmp(Name, "instRecFixedFolder") == 0)       instRecFixedFolder = Value;
     else if (strcmp(Name, "addSubtitleToTimer") == 0)       addSubtitleToTimer = atoi(Value);
+    else if (strcmp(Name, "timerMessage") == 0)             timerMessage = atoi(Value);
     else if (strcmp(Name, "favWhatsOnNow") == 0)            favWhatsOnNow = atoi(Value);
     else if (strcmp(Name, "favWhatsOnNext") == 0)           favWhatsOnNext = atoi(Value);
     else if (strcmp(Name, "favUseTime1") == 0)              favUseTime1 = atoi(Value);

config.h

@@ -88,6 +88,7 @@ class cTVGuideConfig {
         int channelJumpMode;
         int jumpChannels;
         int blueKeyMode;
+        int timerMessage;
         int addSubtitleToTimer;
         int closeOnSwitch;
         int numkeyMode;

po/ca_ES.po

@@ -25,7 +25,7 @@ msgid "min"
 msgstr "min"
 
 msgid "Reruns of "
-msgstr ""
+msgstr "Reemissions "
 
 msgid "No reruns found"
 msgstr ""
@@ -763,7 +763,7 @@ msgid "Display time in EPG Grids"
 msgstr "Mostra el temps a l'EPG"
 
 msgid "Height of Headers (Status Header and EPG View, Perc. of osd height)"
-msgstr ""
+msgstr "Alçada capçalera d'estat (% alçada OSD)"
 
 msgid "Height of Footer (Perc. of osd height)"
 msgstr ""
@@ -901,7 +901,7 @@ msgid "Instant recording:"
 msgstr ""
 
 msgid "Folder for instant Recordings"
-msgstr ""
+msgstr "Utilitza carpetes per gravacions a l'instant"
 
 msgid "Folder"
 msgstr ""
@@ -912,6 +912,9 @@ msgstr ""
 msgid "Use Remotetimers"
 msgstr "Utilitza temporitzadors remots"
 
+msgid "Show timer confirmation messages"
+msgstr ""
+
 msgid "Favorites:"
 msgstr ""
 
@@ -1000,7 +1003,7 @@ msgid "EPG Info"
 msgstr ""
 
 msgid "Reruns"
-msgstr ""
+msgstr "Reemissions"
 
 msgid "Recording Information"
 msgstr ""

po/de_DE.po

@@ -909,6 +909,9 @@ msgstr "Untertitel in manuellen Timern"
 msgid "Use Remotetimers"
 msgstr "RemoteTimers benutzen"
 
+msgid "Show timer confirmation messages"
+msgstr "Timer Bestätigungsmeldungen anzeigen"
+
 msgid "Favorites:"
 msgstr "Favoriten:"
 
@@ -1000,7 +1003,7 @@ msgid "Reruns"
 msgstr "Wiederholungen"
 
 msgid "Recording Information"
-msgstr ""
+msgstr "Aufnahme Information"
 
 msgid "Image Galery"
 msgstr "Bildergalerie"

po/it_IT.po

@@ -909,6 +909,9 @@ msgstr "Aggiungi episodi ai timer manuali"
 msgid "Use Remotetimers"
 msgstr "Usa Remotetimers"
 
+msgid "Show timer confirmation messages"
+msgstr ""
+
 msgid "Favorites:"
 msgstr ""
 

po/ru_RU.po

@@ -22,7 +22,7 @@ msgid "min"
 msgstr "мин"
 
 msgid "Reruns of "
-msgstr ""
+msgstr "ПОВТОРЫ ЭТОЙ "
 
 msgid "No reruns found"
 msgstr ""
@@ -298,7 +298,7 @@ msgid "No Search Timers Configured"
 msgstr ""
 
 msgid "Configure Search Timer Options"
-msgstr ""
+msgstr "Настроить параметры таймера"
 
 msgid "Save Search Timer"
 msgstr ""
@@ -760,7 +760,7 @@ msgid "Display time in EPG Grids"
 msgstr "Показывать время в сетке EPG"
 
 msgid "Height of Headers (Status Header and EPG View, Perc. of osd height)"
-msgstr ""
+msgstr "Высота верхней панели (% от высоты OSD)"
 
 msgid "Height of Footer (Perc. of osd height)"
 msgstr ""
@@ -898,7 +898,7 @@ msgid "Instant recording:"
 msgstr ""
 
 msgid "Folder for instant Recordings"
-msgstr ""
+msgstr "Использовать директории для быстрой записи"
 
 msgid "Folder"
 msgstr ""
@@ -909,6 +909,9 @@ msgstr ""
 msgid "Use Remotetimers"
 msgstr "RemoteTimers benutzen"
 
+msgid "Show timer confirmation messages"
+msgstr ""
+
 msgid "Favorites:"
 msgstr ""
 
@@ -997,7 +1000,7 @@ msgid "EPG Info"
 msgstr ""
 
 msgid "Reruns"
-msgstr ""
+msgstr "ПОВТОРЫ"
 
 msgid "Recording Information"
 msgstr ""

po/sk_SK.po

@@ -22,7 +22,7 @@ msgid "min"
 msgstr "min"
 
 msgid "Reruns of "
-msgstr ""
+msgstr "Repríza tohto "
 
 msgid "No reruns found"
 msgstr ""
@@ -760,7 +760,7 @@ msgid "Display time in EPG Grids"
 msgstr "Zobrazi» èas v EPG mrie¾ke"
 
 msgid "Height of Headers (Status Header and EPG View, Perc. of osd height)"
-msgstr ""
+msgstr "Vý¹ka stavovej hlavièky (% z OSD vý¹ky)"
 
 msgid "Height of Footer (Perc. of osd height)"
 msgstr ""
@@ -898,7 +898,7 @@ msgid "Instant recording:"
 msgstr ""
 
 msgid "Folder for instant Recordings"
-msgstr ""
+msgstr "Pou¾i» adresáre pre okam¾ité nahrávky"
 
 msgid "Folder"
 msgstr ""
@@ -909,6 +909,9 @@ msgstr "Prida
 msgid "Use Remotetimers"
 msgstr "Pou¾i» vzdialený plánovaè"
 
+msgid "Show timer confirmation messages"
+msgstr ""
+
 msgid "Favorites:"
 msgstr ""
 
@@ -997,7 +1000,7 @@ msgid "EPG Info"
 msgstr ""
 
 msgid "Reruns"
-msgstr ""
+msgstr "Repríza"
 
 msgid "Recording Information"
 msgstr ""

recmenuview.c

@@ -121,6 +121,7 @@ bool cRecMenuView::DisplayTimerConflict(int timerID) {
         cTVGuideTimerConflict *conflict = timerConflicts->GetCurrentConflict();
         if (!conflict)
             return false;
+//        delete activeMenu;
         activeMenu = new cRecMenuTimerConflict(conflict, rmsIgnoreTimerConflict);
         activeMenu->Display();
         return true;
@@ -163,11 +164,16 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             if (cRecMenuAskFolder *menu = dynamic_cast<cRecMenuAskFolder*>(activeMenu)) {
                 recFolder = menu->GetFolder();
             }
-            delete activeMenu;
             cTimer *timer = recManager->createTimer(event, recFolder);
             if (!DisplayTimerConflict(timer)) {
+                if (config.timerMessage) {
+                    delete activeMenu;
                     activeMenu = new cRecMenuConfirmTimer(event);
                     activeMenu->Display();
+                } else {
+                    Close();
+                    state = osEnd;
+                }
             }
             break; }
         case rmsInstantRecordFolder:
@@ -181,28 +187,45 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             //caller: main menu
             //De/Activate timer for active event
             recManager->OnOffTimer(event);
+            if (config.timerMessage) {
                 delete activeMenu;
                 activeMenu = new cRecMenuConfirmTimer(event, true);
                 activeMenu->Display();
+            } else {
+                Close();
+                state = osEnd;
+            }
             break; }
         case rmsDeleteTimer: {
             //caller: main menu
             //delete timer for active event
-            delete activeMenu;
             if (recManager->IsRecorded(event)) {
+                delete activeMenu;
                 activeMenu = new cRecMenuAskDeleteTimer(event);
+                activeMenu->Display();
             } else {
                 recManager->DeleteTimer(event);
+                if (config.timerMessage) {
+                    delete activeMenu;
                     activeMenu = new cRecMenuConfirmDeleteTimer(event);
-            }
                     activeMenu->Display();
+                } else {
+                    Close();
+                    state = osEnd;
+                }
+            }
             break; }
         case rmsDeleteTimerConfirmation: {
             //delete running timer for active event
             recManager->DeleteTimer(event);
+            if (config.timerMessage) {
                 delete activeMenu;
                 activeMenu = new cRecMenuConfirmDeleteTimer(event);
                 activeMenu->Display();
+            } else {
+                Close();
+                state = osEnd;
+            }
             break; }
         case rmsEditTimer: {
             //edit timer for active event
@@ -229,9 +252,14 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
         case rmsIgnoreTimerConflict:
         //caller: cRecMenuTimerConflict
         //Confirming created Timer
+            if (config.timerMessage) {
                 delete activeMenu;
                 activeMenu = new cRecMenuConfirmTimer(event);
                 activeMenu->Display();
+            } else {
+                Close();
+                state = osEnd;
+            }
             break;
         case rmsTimerConflictShowInfo: {
             //caller: cRecMenuTimerConflict
@@ -281,10 +309,15 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
             event = timers->Get(timerID)->Event();
 #endif
             recManager->DeleteTimer(event);
-            delete activeMenu;
             if (!DisplayTimerConflict(timerID)) {
+                if (config.timerMessage) {
+                    delete activeMenu;
                     activeMenu = new cRecMenuConfirmDeleteTimer(event);
                     activeMenu->Display();
+                } else {
+                    Close();
+                    state = osEnd;
+                }
             }
             break; }
         case rmsEditTimerConflictMenu: {
@@ -323,10 +356,15 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
                 originalTimer = menu->GetOriginalTimer();
             } else break;
             recManager->SaveTimer(originalTimer, timerModified);
-            delete activeMenu;
             if (!DisplayTimerConflict(originalTimer)) {
+                if (config.timerMessage) {
+                    delete activeMenu;
                     activeMenu = new cRecMenuConfirmTimer(originalTimer->Event(), true);
                     activeMenu->Display();
+                } else {
+                    Close();
+                    state = osEnd;
+                }
             }
             break; }
 /***************************************************************************************

setup.c

@@ -108,7 +108,8 @@ void cTvguideSetup::Store(void) {
     SetupStore("footerHeightPercent", config.footerHeightPercent);
     SetupStore("instRecFolderMode", config.instRecFolderMode);
     SetupStore("instRecFixedFolder", config.instRecFixedFolder.c_str());
-    SetupStore("AddSubtitleToTimerMode", config.addSubtitleToTimer);
+    SetupStore("addSubtitleToTimer", config.addSubtitleToTimer);
+    SetupStore("timerMessage", config.timerMessage);
     SetupStore("favWhatsOnNow", config.favWhatsOnNow);
     SetupStore("favWhatsOnNext", config.favWhatsOnNext);
     SetupStore("favUseTime1", config.favUseTime1);
@@ -432,6 +433,7 @@ void cMenuSetupFavorites::Set(void) {
     Add(new cMenuEditStraItem(tr("Add episode to manual timers"), &tmpConfig->addSubtitleToTimer, 3, addSubtitleMode));
     if (pRemoteTimers)
         Add(new cMenuEditBoolItem(tr("Use Remotetimers"), &tmpConfig->useRemoteTimers));
+    Add(new cMenuEditBoolItem(tr("Show timer confirmation messages"), &tmpConfig->timerMessage));
     Add(new cOsdItem(tr("Favorites:"), osUnknown, false));
     Add(new cMenuEditBoolItem(tr("Limit channels in favorites"), &tmpConfig->favLimitChannels));
     if (tmpConfig->favLimitChannels) {