From 33196207d0f72bf63206253c4fadab773c89add1 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Sat, 9 Nov 2019 11:55:25 +0100
Subject: [PATCH] Refactor cRecMenuTimerConflict

---
 recmenus.c | 56 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/recmenus.c b/recmenus.c
index 1fa7b9e..dae7b07 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -234,17 +234,19 @@ int cRecMenuTimerConflicts::GetTimerConflict(void) {
 }
 
 // --- cRecMenuTimerConflict  ---------------------------------------------------------
-cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eRecMenuState nextAction) {
-    SetWidthPercent(95);
+cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eRecMenuState nextAction) { //OK
+    SetWidthPercent(90);
+
     this->conflict = conflict;
     totalNumMenuItems = (int)conflict->timerIDs.size();
 
-    SetHeader(new cRecMenuItemTimerConflictHeader(conflict->timeStart,
+    AddHeader(new cRecMenuItemTimerConflictHeader(conflict->timeStart,
                                                   conflict->timeStop,
                                                   conflict->overlapStart,
                                                   conflict->overlapStop));
-    SetFooter(new cRecMenuItemButton(tr("Ignore Conflict"), nextAction, false, true));
-    int i=0;
+    AddFooter(new cRecMenuItemButton(tr("Ignore Conflict"), nextAction, false, true));
+
+    int i = 0;
     for(std::vector<int>::iterator it = conflict->timerIDs.begin(); it != conflict->timerIDs.end(); it++) {
 #if VDRVERSNUM >= 20301
         LOCK_TIMERS_READ;
@@ -253,26 +255,26 @@ cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict, eR
         const cTimer *timer = Timers.Get(*it);
 #endif
         if (timer) {
-            if (!AddMenuItemInitial(new cRecMenuItemTimer(  timer,
-                                                      rmsTimerConflictShowInfo,
-                                                      rmsDeleteTimerConflictMenu, 
-                                                      rmsEditTimerConflictMenu,
-                                                      rmsSearchRerunsTimerConflictMenu,
-                                                      conflict->timeStart, 
-                                                      conflict->timeStop, 
-                                                      conflict->overlapStart, 
-                                                      conflict->overlapStop, 
-                                                      (!i)?true:false)
-            ))
+            if (!AddMenuItemInitial(new cRecMenuItemTimer(timer,
+                                                          rmsTimerConflictShowInfo,
+                                                          rmsDeleteTimerConflictMenu,
+                                                          rmsEditTimerConflictMenu,
+                                                          rmsSearchRerunsTimerConflictMenu,
+                                                          conflict->timeStart,
+                                                          conflict->timeStop,
+                                                          conflict->overlapStart,
+                                                          conflict->overlapStop,
+                                                          (!i) ? true : false)))
                 break;
             i++;
         }
     }
+
     CalculateHeight();
     CreatePixmap();
     Arrange();
 }
-    
+
 cRecMenuItem *cRecMenuTimerConflict::GetMenuItem(int number) { 
     if ((number >= 0) && (number < totalNumMenuItems)) {
 #if VDRVERSNUM >= 20301
@@ -281,16 +283,16 @@ cRecMenuItem *cRecMenuTimerConflict::GetMenuItem(int number) {
 #else
         const cTimer *timer = Timers.Get(conflict->timerIDs[number]);
 #endif
-        cRecMenuItem *result = new cRecMenuItemTimer( timer,
-                                                      rmsTimerConflictShowInfo,
-                                                      rmsDeleteTimerConflictMenu, 
-                                                      rmsEditTimerConflictMenu,
-                                                      rmsSearchRerunsTimerConflictMenu,
-                                                      conflict->timeStart, 
-                                                      conflict->timeStop, 
-                                                      conflict->overlapStart, 
-                                                      conflict->overlapStop, 
-                                                      false);
+        cRecMenuItem *result = new cRecMenuItemTimer(timer,
+                                                     rmsTimerConflictShowInfo,
+                                                     rmsDeleteTimerConflictMenu, 
+                                                     rmsEditTimerConflictMenu,
+                                                     rmsSearchRerunsTimerConflictMenu,
+                                                     conflict->timeStart, 
+                                                     conflict->timeStop, 
+                                                     conflict->overlapStart, 
+                                                     conflict->overlapStop, 
+                                                     false);
         return result;
     }
     return NULL;