1 files changed, 20 insertions, 20 deletions

diff --git a/recmenus.c b/recmenus.c
index f98f92e..1fa7b9e 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -196,34 +196,34 @@ cRecMenuAskDeleteTimer::cRecMenuAskDeleteTimer(const cEvent *event) { // OK
 }
 
 // --- cRecMenuTimerConflicts  ---------------------------------------------------------
-cRecMenuTimerConflicts::cRecMenuTimerConflicts(cTVGuideTimerConflicts *conflicts) {
+cRecMenuTimerConflicts::cRecMenuTimerConflicts(cTVGuideTimerConflicts *conflicts) { // OK
     SetWidthPercent(50);
 
     int numConflicts = (conflicts) ? conflicts->NumConflicts() : 0;
-    cString text;
-    if (numConflicts == 1) {
-        text = cString::sprintf("%s %s %s", tr("One"), tr("Timer Conflict"), tr("detected"));
-    } else {
-        text = cString::sprintf("%d %s %s", conflicts->NumConflicts(), tr("Timer Conflicts"), tr("detected"));
-    }
-    cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*text, true);
-    
-    for (int i=0; i<numConflicts; i++) {
+
+    const cString line1 = cString::sprintf("%d %s %s",
+                                           numConflicts,
+                                           (numConflicts == 1) ? tr("Timer Conflict") : tr("Timer Conflicts"),
+                                           tr("detected"));
+    AddHeader(new cRecMenuItemInfo(*line1, 1, "", "", "", width - 2 * border, true));
+    AddFooter(new cRecMenuItemButton(tr("Ignore Conflicts"), rmsClose, false));
+
+    for (int i = 0; i < numConflicts; i++) {
         cTVGuideTimerConflict *conflict = conflicts->GetConflict(i);
         if (!conflict)
             continue;
-        cString dateTime = DayDateTime(conflict->time);
+        const cString dateTime = DayDateTime(conflict->time);
         int numTimers = conflict->timerIDs.size();
-        cString textConflict = cString::sprintf("%s: %s (%d %s)", tr("Show conflict"), *dateTime, numTimers, tr("timers involved"));
-        bool isActive = (i==0)?true:false;
-        AddMenuItem(new cRecMenuItemButton(*textConflict, rmsTimerConflict, isActive));
+        AddMenuItem(new cRecMenuItemButton(cString::sprintf("%s: %s (%d %s)",
+                                                            tr("Show conflict"),
+                                                            *dateTime,
+                                                            numTimers,
+                                                            tr("timers involved")),
+                                           rmsTimerConflict, (i == 0) ? true : false));
     }
-    
-    SetWidthPixel(CalculateOptimalWidth() + 4*border);
-    infoItem->CalculateHeight(width - 2 * border);
-    SetHeader(infoItem);
-    AddMenuItem(new cRecMenuItemButton(tr("Ignore Conflicts"), rmsClose, false));
-    
+
+    SetWidthPixel(CalculateOptimalWidth() + 4 * border);
+
     CalculateHeight();
     CreatePixmap();
     Arrange();