From 5b1e1743161b75da73cd987d67593fb89f43e50d Mon Sep 17 00:00:00 2001 From: kamel5 Date: Mon, 17 Jun 2019 12:25:12 +0200 Subject: [PATCH] Move some inits to cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit --- recmenus.c | 13 +++++++------ recmenus.h | 8 +++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/recmenus.c b/recmenus.c index c664e93..4bd9bf5 100644 --- a/recmenus.c +++ b/recmenus.c @@ -757,6 +757,13 @@ cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer compareSummary = searchTimer.CompareSummary(); useInFavorites = searchTimer.UseInFavorites(); + searchTimer.GetSearchModes(&searchModes); + searchTimer.GetUseChannelModes(&useChannelModes); + searchTimer.GetCompareDateModes(&compareDateModes); + searchTimer.GetSearchTimerModes(&searchTimerModes); + searchTimer.GetDelModes(&delModes); + channelgroupIndex = SplitChannelGroups(&channelGroups, &channelgroups); + SetWidthPercent(70); cString infoText; if (searchTimer.GetID() > -1) { @@ -806,12 +813,6 @@ void cRecMenuSearchTimerEdit::InitMenuItems(void) { useDayOfWeekPos = 8; avoidRepeatsPos = 14; - std::vector searchModes; - searchTimer.GetSearchModes(&searchModes); - std::vector useChannelModes; - searchTimer.GetUseChannelModes(&useChannelModes); - channelgroupIndex = SplitChannelGroups(&channelGroups, &channelgroups); - mainMenuItems.push_back(new cRecMenuItemText(tr("Search String"), searchString, TEXTINPUTLENGTH, false, searchString)); mainMenuItems.push_back(new cRecMenuItemBool(tr("Active"), timerActive, false, false, &timerActive, rmsSearchTimerSave)); mainMenuItems.push_back(new cRecMenuItemSelect(tr("Search Mode"), searchModes, mode, false, &mode, rmsSearchTimerSave)); diff --git a/recmenus.h b/recmenus.h index e506a9e..17e5517 100644 --- a/recmenus.h +++ b/recmenus.h @@ -208,7 +208,14 @@ public: class cRecMenuSearchTimerEdit: public cRecMenu { private: cTVGuideSearchTimer searchTimer; + cTVGuideSearchTimer sT; + std::vector searchModes; + std::vector useChannelModes; std::vector channelGroups; + std::vector compareDateModes; + std::vector searchTimerModes; + std::vector delModes; + std::vector channelgroups; std::vector mainMenuItems; std::vector currentMenuItems; int numMenuItems; @@ -226,7 +233,6 @@ private: int startChannel; int stopChannel; std::string channelGroup; - std::vector channelgroups; int channelgroupIndex; bool useTime; int startTime;