From 324fbdc02a3e0b90278f5757bc810594767c140e Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Fri, 11 Mar 2011 16:16:25 +0200 Subject: Added recording filtering to include also descriptions. --- pages/recordings.ecpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 3457e92..1722514 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -236,9 +236,13 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) { // TRANSLATORS: recording duration format string duration(LiveSetup().GetShowRecDuration() ? FormatDuration(tr("(%d')"), recItem->Duration()) : ""); string shortDescr(recItem->RecInfo()->ShortText() ? recItem->RecInfo()->ShortText() : ""); - string hint(tr("Click to view details.")); if (!shortDescr.empty()) hint = shortDescr + "
" + hint; + string description(recItem->RecInfo()->Description() ? recItem->RecInfo()->Description() : ""); + string hint(tr("Click to view details.")); + if (!shortDescr.empty()) hint = shortDescr + "
" + hint; + else if (!description.empty()) hint = description + "
" + hint; #ifdef HAVE_LIBPCRECPP - if (filter.empty() || pcrecpp::RE(filter.c_str(), pcrecpp::UTF8()).PartialMatch(recItem->Name()) || pcrecpp::RE(filter.c_str(), pcrecpp::UTF8()).PartialMatch(shortDescr)) + pcrecpp::RE re(filter.c_str(), pcrecpp::UTF8()); + if (filter.empty() || re.PartialMatch(recItem->Name()) || re.PartialMatch(shortDescr) || re.PartialMatch(description)) #endif { -- cgit v1.2.3