2 files changed, 16 insertions, 27 deletions

diff --git a/recmenus.c b/recmenus.c
index e451be0..0ee0427 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -665,37 +665,27 @@ TVGuideEPGSearchTemplate cRecMenuSearchTimerTemplates::GetTemplate(void) {
 }
 
 // --- cRecMenuSearchTimers  ---------------------------------------------------------
-cRecMenuSearchTimers::cRecMenuSearchTimers(std::vector<cTVGuideSearchTimer> searchTimers) {
+cRecMenuSearchTimers::cRecMenuSearchTimers(std::vector<cTVGuideSearchTimer> searchTimers) { // OK
+    SetWidthPercent(70);
+
     this->searchTimers = searchTimers;
     numSearchTimers = searchTimers.size();
-    SetWidthPercent(70);
-    cString headline;
-    if (numSearchTimers > 0) {
-        headline = tr("EPGSearch Search Timers");
-    } else {
-        headline = tr("No Search Timers Configured");
-    } 
-    cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*headline, true);
-    infoItem->CalculateHeight(width - 2 * border);
-    SetHeader(infoItem);
-    cRecMenuItem *button = new cRecMenuItemButton(tr("Close"), rmsClose, (!numSearchTimers)?true:false);
-    SetFooter(button);
-    if (numSearchTimers > 0)
-        SetMenuItems();    
-    CalculateHeight();
-    CreatePixmap();
-    Arrange();
-}
 
-cRecMenuSearchTimers::~cRecMenuSearchTimers(void) {
+    const cString line1 = (numSearchTimers > 0) ? tr("EPGSearch Search Timers") : tr("No Search Timers Configured");
 
-}
+    AddHeader(new cRecMenuItemInfo(*line1, 1, "", "", "", width - 2 * border, true));
+    AddFooter(new cRecMenuItemButton(tr("Close"), rmsClose, (!numSearchTimers) ? true : false));
 
-void cRecMenuSearchTimers::SetMenuItems(void) {
-    for (int i = 0; i < numSearchTimers; i++) {
-        if (!AddMenuItemInitial(new cRecMenuItemSearchTimer(searchTimers[i], rmsSearchTimerTest, rmsSearchTimerEdit, rmsSearchTimerDeleteConfirm, (i==0)?true:false)))
-            break;
+    if (numSearchTimers > 0) {
+        for (int i = 0; i < numSearchTimers; i++) {
+            if (!AddMenuItemInitial(new cRecMenuItemSearchTimer(searchTimers[i], rmsSearchTimerTest, rmsSearchTimerEdit, rmsSearchTimerDeleteConfirm, (i == 0) ? true : false)))
+                break;
+        }
     }
+
+    CalculateHeight();
+    CreatePixmap();
+    Arrange();
 }
 
 cTVGuideSearchTimer cRecMenuSearchTimers::GetSearchTimer(void) {
diff --git a/recmenus.h b/recmenus.h
index 001e78f..736a555 100644
--- a/recmenus.h
+++ b/recmenus.h
@@ -205,13 +205,12 @@ class cRecMenuSearchTimers: public cRecMenu {
 private:

     int numSearchTimers;

     std::vector<cTVGuideSearchTimer> searchTimers;

-    void SetMenuItems(void);

 public:

     cRecMenuSearchTimers(std::vector<cTVGuideSearchTimer> searchTimers);

+    virtual ~cRecMenuSearchTimers(void) {};

     cRecMenuItem *GetMenuItem(int number);

     int GetTotalNumMenuItems(void);

     cTVGuideSearchTimer GetSearchTimer(void);

-    virtual ~cRecMenuSearchTimers(void);

 };

 

 // --- cRecMenuSearchTimerEdit  ---------------------------------------------------------