Refactor cRecMenuSearchTimerTemplatesCreate

1 files changed, 10 insertions, 12 deletions

diff --git a/recmenus.c b/recmenus.c
index 89960e6..fb53685 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -998,23 +998,21 @@ cRecMenuSearchTimerCreateConfirm::cRecMenuSearchTimerCreateConfirm(bool success)
 }
 
 // --- cRecMenuSearchTimerTemplatesCreate  ---------------------------------------------------------
-cRecMenuSearchTimerTemplatesCreate::cRecMenuSearchTimerTemplatesCreate(TVGuideEPGSearchTemplate templ, cTVGuideSearchTimer searchTimer) {
+cRecMenuSearchTimerTemplatesCreate::cRecMenuSearchTimerTemplatesCreate(TVGuideEPGSearchTemplate templ, cTVGuideSearchTimer searchTimer) { // OK
+    SetWidthPercent(70);
+
     this->templ = templ;
     this->searchTimer = searchTimer;
-    SetWidthPercent(70);
 
-    cString message1 = tr("Creating Search Timer");
-    cString message2 = tr("Search Term");
-    cString message3 = tr("Using Template");
-    
-    cString infoText = cString::sprintf("%s\n%s: \"%s\"\n%s \"%s\"", *message1, *message2, searchTimer.GetSearchString().c_str(), *message3, templ.name.c_str());
-    cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText);
-    infoItem->CalculateHeight(width - 2 * border);
-    AddMenuItem(infoItem);
+    const cString line1 = tr("Creating Search Timer");
+    const cString line2 = cString::sprintf("%s: \"%s\"", tr("Search Term"), searchTimer.GetSearchString().c_str());
+    const cString line3 = cString::sprintf("%s \"%s\"", tr("Using Template"), templ.name.c_str());
+
+    AddHeader(new cRecMenuItemInfo(*line1, 3, *line2, *line3, "", width - 2 * border));
+    AddFooter(new cRecMenuItemButtonYesNo(tr("Create Search Timer"), tr("Use other Template"), rmsSearchTimerSave, rmsSearchTimerOptions, false));
 
     AddMenuItem(new cRecMenuItemButton(tr("Display Results for Search Timer"), rmsSearchTimerTest, true));
-    AddMenuItem(new cRecMenuItemButtonYesNo(tr("Create Search Timer"), tr("Use other Template"), rmsSearchTimerSave, rmsSearchTimerOptions, false));
-    
+
     CalculateHeight();
     CreatePixmap();
     Arrange();