From b9542da7561744534b482deae6f087ac020935cb Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Thu, 25 Oct 2007 16:38:51 +0000 Subject: - additional timer info in popup menu in timers menu --- pages/timers.ecpp | 3 ++- po/ca_ES.po | 5 ++++- po/cs_CZ.po | 5 ++++- po/da_DK.po | 5 ++++- po/de_DE.po | 5 ++++- po/el_GR.po | 5 ++++- po/es_ES.po | 5 ++++- po/et_EE.po | 5 ++++- po/fi_FI.po | 5 ++++- po/fr_FR.po | 6 +++++- po/hr_HR.po | 5 ++++- po/hu_HU.po | 5 ++++- po/it_IT.po | 6 +++++- po/nl_NL.po | 6 +++++- po/nn_NO.po | 5 ++++- po/pl_PL.po | 5 ++++- po/pt_PT.po | 5 ++++- po/ro_RO.po | 5 ++++- po/ru_RU.po | 5 ++++- po/sl_SI.po | 5 ++++- po/sv_SE.po | 5 ++++- po/tr_TR.po | 5 ++++- timers.cpp | 17 +++++++++++++++++ timers.h | 2 +- tools.cpp | 12 ++++++++++++ tools.h | 1 + 26 files changed, 120 insertions(+), 23 deletions(-) diff --git a/pages/timers.ecpp b/pages/timers.ecpp index 45bcc01..0eaacd6 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -71,7 +71,8 @@ static const size_t maximumDescriptionLength = 300; if (timer->Event()) { epgEvent = EpgEvents::CreateEpgInfo(timer->Channel(), timer->Event()); - longDescription = StringEscapeAndBreak(StringWordTruncate(epgEvent->LongDescr(), maximumDescriptionLength)) + longDescription = StringEscapeAndBreak(SortedTimers::GetTimerInfo(*timer)) + "
" + + StringEscapeAndBreak(StringWordTruncate(epgEvent->LongDescr(), maximumDescriptionLength)) + "

" + tr("Click to view details."); } string currentDay = SortedTimers::GetTimerDays(*timer); diff --git a/po/ca_ES.po b/po/ca_ES.po index 1fe3d75..acb5216 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Jordi Vilà \n" "Language-Team: \n" @@ -42,6 +42,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 5ff2825..aeb6f4b 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Vladimír Bárta \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index 6610659..ae3deeb 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 3277087..1ff97d7 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "Admin Passwort" msgid "%A, %x" msgstr "%A, %x" +msgid "Searchtimer" +msgstr "Suchtimer" + msgid "Error in timer settings" msgstr "" diff --git a/po/el_GR.po b/po/el_GR.po index 3a581c9..9c02c14 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 94873ef..3a13de8 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Ruben Nunez Francisco \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/et_EE.po b/po/et_EE.po index 26ec44c..e79a440 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 33d8adf..645af87 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: \n" @@ -43,6 +43,9 @@ msgstr "Yll msgid "%A, %x" msgstr "%A, %x" +msgid "Searchtimer" +msgstr "Hakuajastimet" + msgid "Error in timer settings" msgstr "Ajastimen asetukset virheelliset" diff --git a/po/fr_FR.po b/po/fr_FR.po index 844ffb8..89102a5 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Nicolas Huillard \n" "Language-Team: \n" @@ -43,6 +43,10 @@ msgstr "Mot de passe de l'Admin" msgid "%A, %x" msgstr "%A, %x" +#, fuzzy +msgid "Searchtimer" +msgstr "Recherche" + msgid "Error in timer settings" msgstr "" diff --git a/po/hr_HR.po b/po/hr_HR.po index c82ebff..6263ff2 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Drazen Dupor \n" "Language-Team: \n" @@ -41,6 +41,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index c3e0e0f..714f1e8 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Istvan Koenigsberger , Guido Josten \n" "Language-Team: \n" @@ -41,6 +41,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index a5ab8a4..f38e4be 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Sean Carlos \n" "Language-Team: \n" @@ -42,6 +42,10 @@ msgstr "" msgid "%A, %x" msgstr "" +#, fuzzy +msgid "Searchtimer" +msgstr "Utilizzare come timer di ricerca" + msgid "Error in timer settings" msgstr "" diff --git a/po/nl_NL.po b/po/nl_NL.po index 1210cfc..5d3370a 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Maarten Wisse \n" "Language-Team: \n" @@ -42,6 +42,10 @@ msgstr "" msgid "%A, %x" msgstr "" +#, fuzzy +msgid "Searchtimer" +msgstr "Gebruik als zoek timer" + msgid "Error in timer settings" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index eba5b26..a36422b 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: \n" @@ -41,6 +41,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 4e114d8..7b347a3 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Michael Rakowski \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 77aca99..8bd1b77 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Paulo Lopes \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 4eef85e..2f737e4 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Lucian Muresan \n" "Language-Team: \n" @@ -41,6 +41,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 96bf7e4..54612d9 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Vyacheslav Dikonov \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index 9c68768..b02b58e 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: \n" @@ -41,6 +41,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 88018a1..ce200b8 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Tomas Prybil \n" "Language-Team: \n" @@ -41,6 +41,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 5370399..53d4dd0 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR-LIVE 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-21 16:25+0200\n" +"POT-Creation-Date: 2007-10-25 18:35+0200\n" "PO-Revision-Date: 2007-08-19 20:15+0200\n" "Last-Translator: Oktay Yolgeçen \n" "Language-Team: \n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" diff --git a/timers.cpp b/timers.cpp index 2a9aafd..b9f3594 100644 --- a/timers.cpp +++ b/timers.cpp @@ -87,6 +87,23 @@ string SortedTimers::GetTimerDays(cTimer const& timer) return currentDay; } +string SortedTimers::GetTimerInfo(cTimer const& timer) +{ + ostringstream info; + info << trVDR("Priority") << ": " << timer.Priority() << endl; + info << trVDR("Lifetime") << ": " << timer.Lifetime() << endl; + info << trVDR("VPS") << ": " << (timer.HasFlags(tfVps)?trVDR("yes"):trVDR("no")) << endl; + + string epgsearchinfo = GetXMLValue(timer.Aux(), "epgsearch"); + if (!epgsearchinfo.empty()) + { + string searchtimer = GetXMLValue(epgsearchinfo, "searchtimer"); + if (!searchtimer.empty()) + info << tr("Searchtimer") << ": " << searchtimer << endl; + } + return info.str(); +} + TimerManager::TimerManager() { } diff --git a/timers.h b/timers.h index c4bf7f3..f03ddc5 100644 --- a/timers.h +++ b/timers.h @@ -20,8 +20,8 @@ public: cTimer* GetByTimerId( std::string const& timerid ); bool Modified() { return Timers.Modified( m_state ); } - static std::string GetTimerDays(cTimer const& timer); + static std::string GetTimerInfo(cTimer const& timer); private: SortedTimers(); diff --git a/tools.cpp b/tools.cpp index a1fbaf1..3851808 100644 --- a/tools.cpp +++ b/tools.cpp @@ -230,4 +230,16 @@ string StringUrlEncode( string const& input ) return ostr.str(); } +// returns the content of ... +string GetXMLValue( std::string const& xml, std::string const& element ) +{ + string start = "<" + element + ">"; + string end = ""; + string::size_type startPos = xml.find(start); + if (startPos == string::npos) return ""; + string::size_type endPos = xml.find(end); + if (endPos == string::npos) return ""; + return xml.substr(startPos + start.size(), endPos - startPos - start.size()); +} + } // namespace vdrlive diff --git a/tools.h b/tools.h index 63450f1..bb1798b 100644 --- a/tools.h +++ b/tools.h @@ -37,6 +37,7 @@ std::string MD5Hash(std::string const& str); time_t GetTimeT(std::string timestring); std::string ExpandTimeString(std::string timestring); std::string StringUrlEncode( std::string const& input ); +std::string GetXMLValue( std::string const& xml, std::string const& element ); struct bad_lexical_cast: std::runtime_error { -- cgit v1.2.3