diff options
author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2007-10-25 16:38:51 +0000 |
---|---|---|
committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2007-10-25 16:38:51 +0000 |
commit | b9542da7561744534b482deae6f087ac020935cb (patch) | |
tree | 0ed1ce9d7101f5c17d5a2cf79194a6238e3b08b8 | |
parent | 3e27a5e446e94a306569a9116e0d5eaa0f3f6b04 (diff) | |
download | vdr-plugin-live-b9542da7561744534b482deae6f087ac020935cb.tar.gz vdr-plugin-live-b9542da7561744534b482deae6f087ac020935cb.tar.bz2 |
- additional timer info in popup menu in timers menu
-rw-r--r-- | pages/timers.ecpp | 3 | ||||
-rw-r--r-- | po/ca_ES.po | 5 | ||||
-rw-r--r-- | po/cs_CZ.po | 5 | ||||
-rw-r--r-- | po/da_DK.po | 5 | ||||
-rw-r--r-- | po/de_DE.po | 5 | ||||
-rw-r--r-- | po/el_GR.po | 5 | ||||
-rw-r--r-- | po/es_ES.po | 5 | ||||
-rw-r--r-- | po/et_EE.po | 5 | ||||
-rw-r--r-- | po/fi_FI.po | 5 | ||||
-rw-r--r-- | po/fr_FR.po | 6 | ||||
-rw-r--r-- | po/hr_HR.po | 5 | ||||
-rw-r--r-- | po/hu_HU.po | 5 | ||||
-rw-r--r-- | po/it_IT.po | 6 | ||||
-rw-r--r-- | po/nl_NL.po | 6 | ||||
-rw-r--r-- | po/nn_NO.po | 5 | ||||
-rw-r--r-- | po/pl_PL.po | 5 | ||||
-rw-r--r-- | po/pt_PT.po | 5 | ||||
-rw-r--r-- | po/ro_RO.po | 5 | ||||
-rw-r--r-- | po/ru_RU.po | 5 | ||||
-rw-r--r-- | po/sl_SI.po | 5 | ||||
-rw-r--r-- | po/sv_SE.po | 5 | ||||
-rw-r--r-- | po/tr_TR.po | 5 | ||||
-rw-r--r-- | timers.cpp | 17 | ||||
-rw-r--r-- | timers.h | 2 | ||||
-rw-r--r-- | tools.cpp | 12 | ||||
-rw-r--r-- | 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)) + "<hr>" + + StringEscapeAndBreak(StringWordTruncate(epgEvent->LongDescr(), maximumDescriptionLength)) + "<br/><br/>" + 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: <cwieninger@gmx.de>\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à <jvila@tinet.org>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <vladimir.barta@k2atmitec.cz>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <mogens@elneff.dk>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <kls@cadsoft.de>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <mail@dimitrios.de>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <ruben.nunez@tang-it.com>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <kasjas@hot.ee>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <rahrenbe@cc.hut.fi>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -43,6 +43,9 @@ msgstr "Ylläpidon salasana" 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: <cwieninger@gmx.de>\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 <nhuillard@e-dition.fr>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <drazen.dupor@dupor.com>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <seanc@libero.it>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <Maarten.Wisse@urz.uni-hd.de>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <truls@slevigen.no>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <mrak@gmx.de>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <pmml@netvita.pt>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <lucianm@users.sourceforge.net>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <sdiconov@mail.ru>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <matjaz.thaler@guest.arnes.si>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <tomas@prybil.se>\n" "Language-Team: <vdr@linuxtv.org>\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: <cwieninger@gmx.de>\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 <oktay_73@yahoo.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -40,6 +40,9 @@ msgstr "" msgid "%A, %x" msgstr "" +msgid "Searchtimer" +msgstr "" + msgid "Error in timer settings" msgstr "" @@ -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() { } @@ -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(); @@ -230,4 +230,16 @@ string StringUrlEncode( string const& input ) return ostr.str(); } +// returns the content of <element>...</element> +string GetXMLValue( std::string const& xml, std::string const& element ) +{ + string start = "<" + element + ">"; + string end = "</" + element + ">"; + 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 @@ -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 { |