Optional deactivation of the timer confirmation messages

This commit is contained in:
kamel5 2020-07-30 11:24:00 +02:00
parent 78d6e980ee
commit 4d80c6900d
9 changed files with 94 additions and 36 deletions

View File

@ -35,6 +35,7 @@ cTVGuideConfig::cTVGuideConfig() {
jumpChannels = 0; jumpChannels = 0;
blueKeyMode = 2; blueKeyMode = 2;
addSubtitleToTimer = 1; addSubtitleToTimer = 1;
timerMessage = 1;
closeOnSwitch = 1; closeOnSwitch = 1;
numkeyMode = 0; numkeyMode = 0;
useRemoteTimers = 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, "instRecFolderMode") == 0) instRecFolderMode = atoi(Value);
else if (strcmp(Name, "instRecFixedFolder") == 0) instRecFixedFolder = Value; else if (strcmp(Name, "instRecFixedFolder") == 0) instRecFixedFolder = Value;
else if (strcmp(Name, "addSubtitleToTimer") == 0) addSubtitleToTimer = atoi(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, "favWhatsOnNow") == 0) favWhatsOnNow = atoi(Value);
else if (strcmp(Name, "favWhatsOnNext") == 0) favWhatsOnNext = atoi(Value); else if (strcmp(Name, "favWhatsOnNext") == 0) favWhatsOnNext = atoi(Value);
else if (strcmp(Name, "favUseTime1") == 0) favUseTime1 = atoi(Value); else if (strcmp(Name, "favUseTime1") == 0) favUseTime1 = atoi(Value);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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