diff --git a/recmenus.c b/recmenus.c index 6c314f0..24ce694 100644 --- a/recmenus.c +++ b/recmenus.c @@ -951,26 +951,25 @@ cRecMenuItem *cRecMenuSearchTimerEdit::GetMenuItem(int number) { } // --- cRecMenuSearchTimerDeleteConfirm --------------------------------------------- -cRecMenuSearchTimerDeleteConfirm::cRecMenuSearchTimerDeleteConfirm(cTVGuideSearchTimer searchTimer) { - this->searchTimer = searchTimer; +cRecMenuSearchTimerDeleteConfirm::cRecMenuSearchTimerDeleteConfirm(cTVGuideSearchTimer searchTimer) { // OK SetWidthPercent(70); - cString message = tr("Really delete Search Timer"); - cString infoText = cString::sprintf("%s \"%s\"?", *message, searchTimer.GetSearchString().c_str()); - cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*infoText, true); - infoItem->CalculateHeight(width - 2 * border); - SetHeader(infoItem); + + this->searchTimer = searchTimer; + + const cString line1 = tr("Really delete Search Timer"); + const cString line2 = cString::sprintf("\"%s\"?", searchTimer.GetSearchString().c_str()); + + AddHeader(new cRecMenuItemInfo(*line1, 2, *line2, "", "", width - 2 * border, true)); + AddFooter(new cRecMenuItemButton(tr("Cancel"), rmsClose, false)); + AddMenuItem(new cRecMenuItemButton(tr("Delete only Search Timer"), rmsSearchTimerDelete, true)); AddMenuItem(new cRecMenuItemButton(tr("Delete Search Timer and created Timers"), rmsSearchTimerDeleteWithTimers, false)); - SetFooter(new cRecMenuItemButton(tr("Cancel"), rmsClose, false)); + CalculateHeight(); CreatePixmap(); Arrange(); } -cRecMenuSearchTimerDeleteConfirm::~cRecMenuSearchTimerDeleteConfirm(void) { - -} - cTVGuideSearchTimer cRecMenuSearchTimerDeleteConfirm::GetSearchTimer(void) { return searchTimer; } diff --git a/recmenus.h b/recmenus.h index 736a555..ca8ab4f 100644 --- a/recmenus.h +++ b/recmenus.h @@ -257,7 +257,7 @@ private: cTVGuideSearchTimer searchTimer; public: cRecMenuSearchTimerDeleteConfirm(cTVGuideSearchTimer searchTimer); - virtual ~cRecMenuSearchTimerDeleteConfirm(void); + virtual ~cRecMenuSearchTimerDeleteConfirm(void) {}; cTVGuideSearchTimer GetSearchTimer(void); };