- enabled toggling of searchtimers in searchtimer list

1 files changed, 126 insertions, 125 deletions

diff --git a/epgsearch.h b/epgsearch.h
index 75956a0..bbd17d6 100644
--- a/epgsearch.h
+++ b/epgsearch.h
@@ -26,20 +26,20 @@ public:
 	
 	SearchTimer();
 	SearchTimer( std::string const& data );
-    void Init();
-    std::string ToText();
+	void Init();
+	std::string ToText();
 	friend bool operator<( SearchTimer const& left, SearchTimer const& right );
 
 	int Id() const { return m_id; }
-    void SetId(int id) { m_id = id; }
+	void SetId(int id) { m_id = id; }
 	std::string const& Search() const { return m_search; }
-    void SetSearch(std::string const& search) { m_search = search; }
-    int SearchMode() { return m_mode; }
-    void SetSearchMode(int mode) { m_mode = mode; }
-    int Tolerance() const { return m_fuzzytolerance; }
-    void SetTolerance(int tolerance) { m_fuzzytolerance = tolerance; }
-    bool MatchCase() const { return m_useCase; }
-    void SetMatchCase(bool useCase) { m_useCase = useCase; }
+	void SetSearch(std::string const& search) { m_search = search; }
+	int SearchMode() { return m_mode; }
+	void SetSearchMode(int mode) { m_mode = mode; }
+	int Tolerance() const { return m_fuzzytolerance; }
+	void SetTolerance(int tolerance) { m_fuzzytolerance = tolerance; }
+	bool MatchCase() const { return m_useCase; }
+	void SetMatchCase(bool useCase) { m_useCase = useCase; }
 	bool UseTime() const { return m_useTime; }
 	void SetUseTime(bool useTime) { m_useTime = useTime; }
 	bool UseTitle() const { return m_useTitle; }
@@ -56,72 +56,72 @@ public:
 	void SetStopTime(int stopTime) { m_stopTime = stopTime; }
 	eUseChannel UseChannel() const { return static_cast< eUseChannel >( m_useChannel ); }
 	void SetUseChannel(eUseChannel useChannel) { m_useChannel = useChannel; }
-    tChannelID ChannelMin() const { return m_channelMin; }
-    void SetChannelMin(tChannelID channelMin) { m_channelMin = channelMin; }
-    tChannelID ChannelMax() const { return m_channelMax; }
-    void SetChannelMax(tChannelID channelMax) { m_channelMax = channelMax; }
+	tChannelID ChannelMin() const { return m_channelMin; }
+	void SetChannelMin(tChannelID channelMin) { m_channelMin = channelMin; }
+	tChannelID ChannelMax() const { return m_channelMax; }
+	void SetChannelMax(tChannelID channelMax) { m_channelMax = channelMax; }
 	std::string ChannelText() const { return m_channels; }
 	void SetChannelText(std::string channels) { m_channels = channels; }
 	bool UseAsSearchTimer() const { return m_useAsSearchtimer; }
 	void SetUseAsSearchTimer(bool useAsSearchtimer) { m_useAsSearchtimer = useAsSearchtimer; }
 	bool UseDuration() const { return m_useDuration; }
 	void SetUseDuration(bool useDuration) { m_useDuration = useDuration; }
-    int MinDuration() const { return m_minDuration; }
-    void SetMinDuration(int minDuration) { m_minDuration = minDuration; }
-    int MaxDuration() const { return m_maxDuration; }
-    void SetMaxDuration(int maxDuration) { m_maxDuration = maxDuration; }
+	int MinDuration() const { return m_minDuration; }
+	void SetMinDuration(int minDuration) { m_minDuration = minDuration; }
+	int MaxDuration() const { return m_maxDuration; }
+	void SetMaxDuration(int maxDuration) { m_maxDuration = maxDuration; }
 	bool UseDayOfWeek() const { return m_useDayOfWeek; }
 	void SetUseDayOfWeek(bool useDayOfWeek) { m_useDayOfWeek = useDayOfWeek; }
-    int DayOfWeek() const { return m_dayOfWeek; }
-    void SetDayOfWeek(int dayOfWeek) { m_dayOfWeek = dayOfWeek; }
+	int DayOfWeek() const { return m_dayOfWeek; }
+	void SetDayOfWeek(int dayOfWeek) { m_dayOfWeek = dayOfWeek; }
 	bool UseInFavorites() const { return m_useInFavorites; }
 	void SetUseInFavorites(bool useInFavorites) { m_useInFavorites = useInFavorites; }
-    int SearchTimerAction() const { return m_action; }
-    void SetSearchTimerAction(int action) { m_action = action; }
-    bool UseSeriesRecording() const { return  m_useEpisode; }
-    void SetUseSeriesRecording(bool useEpisode) { m_useEpisode = useEpisode; }
+	int SearchTimerAction() const { return m_action; }
+	void SetSearchTimerAction(int action) { m_action = action; }
+	bool UseSeriesRecording() const { return  m_useEpisode; }
+	void SetUseSeriesRecording(bool useEpisode) { m_useEpisode = useEpisode; }
 	std::string const& Directory() const { return m_directory; }
 	void SetDirectory(std::string const& directory) { m_directory = directory; }
-    int DelRecsAfterDays() const { return m_delAfterDays; }
-    void SetDelRecsAfterDays(int delAfterDays) { m_delAfterDays = delAfterDays; }
-    int KeepRecs() const { return m_recordingsKeep; }
-    void SetKeepRecs(int recordingsKeep) { m_recordingsKeep = recordingsKeep; }
-    int PauseOnRecs() const {return m_pauseOnNrRecordings; }
-    void SetPauseOnRecs(int pauseOnNrRecordings) { m_pauseOnNrRecordings = pauseOnNrRecordings; }
-    int BlacklistMode() const {return m_blacklistmode; }
-    void SetBlacklistMode(int blacklistmode) { m_blacklistmode = blacklistmode; }
-    bool BlacklistSelected(int id) const;
-    void ParseBlacklist( std::string const& data );
-    int SwitchMinBefore() const { return m_switchMinBefore; }
-    void SetSwitchMinBefore(int switchMinBefore) { m_switchMinBefore = switchMinBefore; }
-    bool UseExtEPGInfo() const { return m_useExtEPGInfo; }
-    void SetUseExtEPGInfo(bool useExtEPGInfo) { m_useExtEPGInfo = useExtEPGInfo; }
-    std::vector< std::string > ExtEPGInfo() const { return m_ExtEPGInfo; } 
-    void SetExtEPGInfo(std::vector< std::string > ExtEPGInfo) { m_ExtEPGInfo = ExtEPGInfo; } 
-    bool AvoidRepeats() const { return m_avoidrepeats; }
-    void SetAvoidRepeats(bool avoidrepeats) { m_avoidrepeats = avoidrepeats; }
-    int AllowedRepeats() const { return m_allowedrepeats; }
-    void SetAllowedRepeats(int allowedrepeats) { m_allowedrepeats = allowedrepeats; }
-    int RepeatsWithinDays() const { return m_repeatsWithinDays; }
-    void SetRepeatsWithinDays(int repeatsWithinDays) { m_repeatsWithinDays = repeatsWithinDays; }
-    bool CompareTitle() const { return m_compareTitle; }
-    void SetCompareTitle(bool compareTitle) { m_compareTitle = compareTitle; }
-    bool CompareSubtitle() const { return m_compareSubtitle; }
-    void SetCompareSubtitle(bool compareSubtitle) { m_compareSubtitle = compareSubtitle; }
-    bool CompareSummary() const { return m_compareSummary; }
-    void SetCompareSummary(bool compareSummary) { m_compareSummary = compareSummary; }
-    unsigned long CompareCategories() const { return m_catvaluesAvoidRepeat; }
-    void SetCompareCategories(unsigned long compareCategories) { m_catvaluesAvoidRepeat = compareCategories; }
-    int Priority() const { return m_priority; }
-    void SetPriority(int priority) { m_priority = priority; }
-    int Lifetime() const { return m_lifetime; }
-    void SetLifetime(int lifetime) { m_lifetime = lifetime; }
-    int MarginStart() const { return m_marginstart; }
-    void SetMarginStart(int marginstart) { m_marginstart = marginstart; }
-    int MarginStop() const { return m_marginstop; }
-    void SetMarginStop(int marginstop) { m_marginstop = marginstop; }
-    bool UseVPS() const { return m_useVPS; }
-    void SetUseVPS(bool useVPS) { m_useVPS = useVPS; }
+	int DelRecsAfterDays() const { return m_delAfterDays; }
+	void SetDelRecsAfterDays(int delAfterDays) { m_delAfterDays = delAfterDays; }
+	int KeepRecs() const { return m_recordingsKeep; }
+	void SetKeepRecs(int recordingsKeep) { m_recordingsKeep = recordingsKeep; }
+	int PauseOnRecs() const {return m_pauseOnNrRecordings; }
+	void SetPauseOnRecs(int pauseOnNrRecordings) { m_pauseOnNrRecordings = pauseOnNrRecordings; }
+	int BlacklistMode() const {return m_blacklistmode; }
+	void SetBlacklistMode(int blacklistmode) { m_blacklistmode = blacklistmode; }
+	bool BlacklistSelected(int id) const;
+	void ParseBlacklist( std::string const& data );
+	int SwitchMinBefore() const { return m_switchMinBefore; }
+	void SetSwitchMinBefore(int switchMinBefore) { m_switchMinBefore = switchMinBefore; }
+	bool UseExtEPGInfo() const { return m_useExtEPGInfo; }
+	void SetUseExtEPGInfo(bool useExtEPGInfo) { m_useExtEPGInfo = useExtEPGInfo; }
+	std::vector< std::string > ExtEPGInfo() const { return m_ExtEPGInfo; } 
+	void SetExtEPGInfo(std::vector< std::string > ExtEPGInfo) { m_ExtEPGInfo = ExtEPGInfo; } 
+	bool AvoidRepeats() const { return m_avoidrepeats; }
+	void SetAvoidRepeats(bool avoidrepeats) { m_avoidrepeats = avoidrepeats; }
+	int AllowedRepeats() const { return m_allowedrepeats; }
+	void SetAllowedRepeats(int allowedrepeats) { m_allowedrepeats = allowedrepeats; }
+	int RepeatsWithinDays() const { return m_repeatsWithinDays; }
+	void SetRepeatsWithinDays(int repeatsWithinDays) { m_repeatsWithinDays = repeatsWithinDays; }
+	bool CompareTitle() const { return m_compareTitle; }
+	void SetCompareTitle(bool compareTitle) { m_compareTitle = compareTitle; }
+	bool CompareSubtitle() const { return m_compareSubtitle; }
+	void SetCompareSubtitle(bool compareSubtitle) { m_compareSubtitle = compareSubtitle; }
+	bool CompareSummary() const { return m_compareSummary; }
+	void SetCompareSummary(bool compareSummary) { m_compareSummary = compareSummary; }
+	unsigned long CompareCategories() const { return m_catvaluesAvoidRepeat; }
+	void SetCompareCategories(unsigned long compareCategories) { m_catvaluesAvoidRepeat = compareCategories; }
+	int Priority() const { return m_priority; }
+	void SetPriority(int priority) { m_priority = priority; }
+	int Lifetime() const { return m_lifetime; }
+	void SetLifetime(int lifetime) { m_lifetime = lifetime; }
+	int MarginStart() const { return m_marginstart; }
+	void SetMarginStart(int marginstart) { m_marginstart = marginstart; }
+	int MarginStop() const { return m_marginstop; }
+	void SetMarginStop(int marginstop) { m_marginstop = marginstop; }
+	bool UseVPS() const { return m_useVPS; }
+	void SetUseVPS(bool useVPS) { m_useVPS = useVPS; }
 
 private:
 	int m_id;
@@ -146,52 +146,52 @@ private:
 	bool m_useEpisode;
 	int m_priority;
 	int m_lifetime;
-    int m_fuzzytolerance;
-    bool m_useInFavorites;
-    bool m_useAsSearchtimer;
-    int m_action;
-    std::string m_directory;
-    int m_delAfterDays;
-    int m_recordingsKeep;
-    int m_pauseOnNrRecordings;
-    int m_switchMinBefore;
-    int m_marginstart;
-    int m_marginstop;
-    bool m_useVPS;
-    bool m_useExtEPGInfo;
-    std::vector< std::string > m_ExtEPGInfo;
-    bool m_avoidrepeats;
-    int m_allowedrepeats;
-    bool m_compareTitle;
-    bool m_compareSubtitle;
-    bool m_compareSummary;
-    int m_repeatsWithinDays;
-    int m_blacklistmode;
-    std::vector< std::string > m_blacklistIDs;
-    int m_menuTemplate;
-    unsigned long m_catvaluesAvoidRepeat;
+	int m_fuzzytolerance;
+	bool m_useInFavorites;
+	bool m_useAsSearchtimer;
+	int m_action;
+	std::string m_directory;
+	int m_delAfterDays;
+	int m_recordingsKeep;
+	int m_pauseOnNrRecordings;
+	int m_switchMinBefore;
+	int m_marginstart;
+	int m_marginstop;
+	bool m_useVPS;
+	bool m_useExtEPGInfo;
+	std::vector< std::string > m_ExtEPGInfo;
+	bool m_avoidrepeats;
+	int m_allowedrepeats;
+	bool m_compareTitle;
+	bool m_compareSubtitle;
+	bool m_compareSummary;
+	int m_repeatsWithinDays;
+	int m_blacklistmode;
+	std::vector< std::string > m_blacklistIDs;
+	int m_menuTemplate;
+	unsigned long m_catvaluesAvoidRepeat;
 
 	void ParseChannel( std::string const& data );
 	void ParseChannelIDs( std::string const& data );
-    void ParseExtEPGInfo( std::string const& data );
+	void ParseExtEPGInfo( std::string const& data );
 };
 
 class ExtEPGInfo
 {
-  public:
-   ExtEPGInfo(std::string const& data );
-   int Id() const { return m_id; }
-   std::string Name() const { return m_menuname; }
-   std::vector< std::string > Values() const { return m_values; }
-   bool Selected(unsigned int index, std::string const& values);
-  private:
-   int m_id;
-   std::string m_name;
-   std::string m_menuname;
-   std::vector< std::string > m_values;
-   int m_searchmode;
-
-   void ParseValues( std::string const& data );
+public:
+	ExtEPGInfo(std::string const& data );
+	int Id() const { return m_id; }
+	std::string Name() const { return m_menuname; }
+	std::vector< std::string > Values() const { return m_values; }
+	bool Selected(unsigned int index, std::string const& values);
+private:
+	int m_id;
+	std::string m_name;
+	std::string m_menuname;
+	std::vector< std::string > m_values;
+	int m_searchmode;
+
+	void ParseValues( std::string const& data );
 };
 
 class ExtEPGInfos
@@ -216,11 +216,11 @@ private:
 
 class ChannelGroup
 {
-  public:
-   ChannelGroup(std::string const& data );
-   std::string Name() { return m_name; }
-  private:
-   std::string m_name;
+public:
+	ChannelGroup(std::string const& data );
+	std::string Name() { return m_name; }
+private:
+	std::string m_name;
 };
 
 class ChannelGroups
@@ -252,7 +252,7 @@ public:
 	typedef TimerList::const_iterator const_iterator;
 
 	SearchTimers();
-    bool Save(SearchTimer* searchtimer);
+	bool Save(SearchTimer* searchtimer);
 
 	size_type size() const { return m_timers.size(); }
 
@@ -261,6 +261,7 @@ public:
 	iterator end() { return m_timers.end(); }
 	const_iterator end() const { return m_timers.end(); }
 	SearchTimer* GetByTimerId( std::string const& id );
+	bool ToggleActive(std::string const& id);
 private:
 	TimerList m_timers;
 };
@@ -272,7 +273,7 @@ public:
 
 	std::string const& Search() const { return m_search; }
 	int Id() const { return m_id; }
-    bool operator<( Blacklist const& other ) const { return Search() < other.Search(); }
+	bool operator<( Blacklist const& other ) const { return Search() < other.Search(); }
 
 private:
 	int m_id;
@@ -308,26 +309,26 @@ public:
 	tEventID EventId() const { return m_eventId; }
 	std::string const& Title() const { return m_title; }
 	std::string const& ShortText() const { return m_shorttext; }
-    time_t StartTime() const { return m_starttime; }
-    time_t StopTime() const { return m_stoptime; }
-    tChannelID Channel() const { return m_channel; }
-    time_t TimerStartTime() const { return m_timerstart; }
-    time_t TimerStopTime() const { return m_timerstop; }
-    int TimerMode() const { return m_timerMode; }
-    bool operator<( SearchResult const& other ) const { return m_starttime <  other.m_starttime; }
+	time_t StartTime() const { return m_starttime; }
+	time_t StopTime() const { return m_stoptime; }
+	tChannelID Channel() const { return m_channel; }
+	time_t TimerStartTime() const { return m_timerstart; }
+	time_t TimerStopTime() const { return m_timerstop; }
+	int TimerMode() const { return m_timerMode; }
+	bool operator<( SearchResult const& other ) const { return m_starttime <  other.m_starttime; }
 
 private:
 	int m_searchId;
-    tEventID m_eventId;
-    std::string m_title;
+	tEventID m_eventId;
+	std::string m_title;
 	std::string m_shorttext;
-    time_t m_starttime;
-    time_t m_stoptime;
+	time_t m_starttime;
+	time_t m_stoptime;
 	tChannelID m_channel;
-    time_t m_timerstart;
-    time_t m_timerstop;
-    std::string m_file;
-    int m_timerMode;
+	time_t m_timerstart;
+	time_t m_timerstop;
+	std::string m_file;
+	int m_timerMode;
 };
 
 class SearchResults