frodovdr/vdr-plugin-tvguide
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git synced 2023-10-05 15:01:48 +02:00
Code Issues Releases Wiki Activity

Fixed messages in DisplayTimerConflict

Browse Source
This commit is contained in:
kamel5 2020-03-06 13:59:29 +01:00
parent eb3a4113be
commit ee68d2eb2f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recmenus.c
View File

@ -231,7 +231,7 @@ int cRecMenuTimerConflicts::GetTimerConflict(void) {
} }
// --- cRecMenuTimerConflict --------------------------------------------------------- // --- cRecMenuTimerConflict ---------------------------------------------------------
cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict) { cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eRecMenuState nextAction) {
SetWidthPercent(95); SetWidthPercent(95);
this->conflict = conflict; this->conflict = conflict;
totalNumMenuItems = (int)conflict->timerIDs.size(); totalNumMenuItems = (int)conflict->timerIDs.size();
@ -240,7 +240,7 @@ cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict) {
conflict->timeStop, conflict->timeStop,
conflict->overlapStart, conflict->overlapStart,
conflict->overlapStop)); conflict->overlapStop));
SetFooter(new cRecMenuItemButton(tr("Ignore Conflict"), rmsIgnoreTimerConflict, false, true)); SetFooter(new cRecMenuItemButton(tr("Ignore Conflict"), nextAction, false, true));
int i=0; int i=0;
for(std::vector<int>::iterator it = conflict->timerIDs.begin(); it != conflict->timerIDs.end(); it++) { for(std::vector<int>::iterator it = conflict->timerIDs.begin(); it != conflict->timerIDs.end(); it++) {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301

2
recmenus.h
View File

@ -79,7 +79,7 @@ private:
cTVGuideTimerConflict *conflict; cTVGuideTimerConflict *conflict;
int totalNumMenuItems; int totalNumMenuItems;
public: public:
cRecMenuTimerConflict(cTVGuideTimerConflict *conflict); cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eRecMenuState nextAction = rmsClose);
virtual ~cRecMenuTimerConflict(void) {}; virtual ~cRecMenuTimerConflict(void) {};
cRecMenuItem *GetMenuItem(int number); cRecMenuItem *GetMenuItem(int number);
int GetTotalNumMenuItems(void); int GetTotalNumMenuItems(void);

4
recmenuview.c
View File

@ -121,7 +121,7 @@ bool cRecMenuView::DisplayTimerConflict(int timerID) {
cTVGuideTimerConflict *conflict = timerConflicts->GetCurrentConflict(); cTVGuideTimerConflict *conflict = timerConflicts->GetCurrentConflict();
if (!conflict) if (!conflict)
return false; return false;
activeMenu = new cRecMenuTimerConflict(conflict); activeMenu = new cRecMenuTimerConflict(conflict, rmsIgnoreTimerConflict);
activeMenu->Display(); activeMenu->Display();
return true; return true;
} }
@ -654,7 +654,7 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) {
} else break; } else break;
timerConflicts->SetCurrentConflict(timerConflict); timerConflicts->SetCurrentConflict(timerConflict);
delete activeMenu; delete activeMenu;
activeMenu = new cRecMenuTimerConflict(timerConflicts->GetCurrentConflict()); activeMenu = new cRecMenuTimerConflict(timerConflicts->GetCurrentConflict(), rmsTimerConflicts);
activeMenu->Display(); activeMenu->Display();
break; } break; }
case rmsSearchRerunsTimerConflictMenu: { case rmsSearchRerunsTimerConflictMenu: {