Refactor cRecMenuSeriesTimer

1 files changed, 9 insertions, 9 deletions

diff --git a/recmenus.c b/recmenus.c
index bd1ff8e..fbadee8 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -497,9 +497,12 @@ cTimer *cRecMenuEditTimer::GetTimer(void) {
 ******************************************************************************************/
 
 // --- cRecMenuSeriesTimer ---------------------------------------------------------
-cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const cEvent *event, std::string folder) {
+cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const cEvent *event, std::string folder) { // OK
     if (!initialChannel)
         return;
+
+    SetWidthPercent(70);
+
     timerActive = true;
     channel = initialChannel->Number();
     dayOfWeek = 127; 
@@ -508,12 +511,11 @@ cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const c
     CalculateTimes(event);
     this->folder = folder;
 
-    SetWidthPercent(70);
-    cString title = tr("Create Series Timer based on");
-    cString infoText = cString::sprintf("%s:\n%s", *title, event->Title());
-    cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
-    infoItem->CalculateHeight(width - 2 * border);
-    SetHeader(infoItem);
+    const cString line1 = tr("Create Series Timer based on:");
+    const cString line2 = cString::sprintf("\"%s\"", event->Title());
+
+    AddHeader(new cRecMenuItemInfo(*line1, 2, *line2, "", "", width - 2 * border, true));
+    AddFooter(new cRecMenuItemButtonYesNo(tr("Create Timer"), tr("Cancel"), rmsSeriesTimerCreate, rmsClose, true));
 
     AddMenuItem(new cRecMenuItemBool(tr("Timer Active"), false, &timerActive));
     AddMenuItem(new cRecMenuItemChannelChooser(tr("Channel"), false, &channel));
@@ -524,8 +526,6 @@ cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const c
     AddMenuItem(new cRecMenuItemInt(tr("Priority"), 0, MAXPRIORITY, false, &priority));
     AddMenuItem(new cRecMenuItemInt(tr("Lifetime"), 0, MAXLIFETIME, false, &lifetime));
 
-    AddMenuItem(new cRecMenuItemButtonYesNo(tr("Create Timer"), tr("Cancel"), rmsSeriesTimerCreate, rmsClose, true));
-
     CalculateHeight();
     CreatePixmap();
     Arrange();