1 files changed, 15 insertions, 13 deletions
diff --git a/recmenus.c b/recmenus.c
index 7772168..e451be0 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -617,29 +617,30 @@ cRecMenuSearchTimer::cRecMenuSearchTimer(const cEvent *event) { // OK
 }
 
 // --- cRecMenuSearchTimerTemplates  ---------------------------------------------------------
-cRecMenuSearchTimerTemplates::cRecMenuSearchTimerTemplates(cTVGuideSearchTimer searchTimer, std::vector<TVGuideEPGSearchTemplate> templates) {
+cRecMenuSearchTimerTemplates::cRecMenuSearchTimerTemplates(cTVGuideSearchTimer searchTimer, std::vector<TVGuideEPGSearchTemplate> templates) { // OK
+    SetWidthPercent(70);
+
     this->searchTimer = searchTimer;
     this->templates = templates;
-    SetWidthPercent(70);
-    cString message = tr("Configure Search Timer for Search String");
-    cString infoText = cString::sprintf("%s:\n%s", *message, searchTimer.GetSearchString().c_str());
-    cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true);
-    infoItem->CalculateHeight(width - 2 * border);
-    SetHeader(infoItem);
-    
-    AddMenuItemInitial(new cRecMenuItemButton(tr("Manually configure Options"), rmsSearchTimerEdit, true));
-    
+
+    const cString line1 = tr("Configure Search Timer for Search String:");
+    const cString line2 = cString::sprintf("\"%s\"", searchTimer.GetSearchString().c_str());
+
+    AddHeader(new cRecMenuItemInfo(*line1, 2, *line2, "", "", width - 2 * border, true));
+    AddFooter(new cRecMenuItemButton(tr("Manually configure Options"), rmsSearchTimerEdit, true));
+
     numTemplates = templates.size();
-    for (int i=0; i<numTemplates; i++) {
-        cString buttonText = cString::sprintf("%s \"%s\"", tr("Use Template"), templates[i].name.c_str());
+    for (int i = 0; i < numTemplates; i++) {
+        const cString buttonText = cString::sprintf("%s \"%s\"", tr("Use Template"), templates[i].name.c_str());
         if (!AddMenuItemInitial(new cRecMenuItemButton(*buttonText, rmsSearchTimerCreateWithTemplate, false)))
             break;
     }
+
     CalculateHeight();
     CreatePixmap();
     Arrange();
 }
-    
+
 cRecMenuItem *cRecMenuSearchTimerTemplates::GetMenuItem(int number) {
     if (number == 0) {
         return new cRecMenuItemButton(tr("Manually configure Options"), rmsSearchTimerEdit, false);
@@ -662,6 +663,7 @@ TVGuideEPGSearchTemplate cRecMenuSearchTimerTemplates::GetTemplate(void) {
         templ = templates[tmplActive];
     return templ;
 }
+
 // --- cRecMenuSearchTimers  ---------------------------------------------------------
 cRecMenuSearchTimers::cRecMenuSearchTimers(std::vector<cTVGuideSearchTimer> searchTimers) {
     this->searchTimers = searchTimers;