summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config.c2
-rw-r--r--config.h1
-rw-r--r--enigma.c72
-rw-r--r--po/ca_ES.po5
-rw-r--r--po/cs_CZ.po5
-rw-r--r--po/da_DK.po5
-rw-r--r--po/de_DE.po5
-rw-r--r--po/el_GR.po5
-rw-r--r--po/es_ES.po5
-rw-r--r--po/et_EE.po5
-rw-r--r--po/fi_FI.po5
-rw-r--r--po/fr_FR.po5
-rw-r--r--po/hr_HR.po5
-rw-r--r--po/hu_HU.po5
-rw-r--r--po/it_IT.po5
-rw-r--r--po/nl_NL.po5
-rw-r--r--po/nn_NO.po5
-rw-r--r--po/pl_PL.po5
-rw-r--r--po/pt_PT.po5
-rw-r--r--po/ro_RO.po5
-rw-r--r--po/ru_RU.po5
-rw-r--r--po/sl_SI.po5
-rw-r--r--po/sv_SE.po5
-rw-r--r--po/tr_TR.po5
-rw-r--r--setup.c2
-rw-r--r--skinenigmang.c1
-rw-r--r--tools.c17
-rw-r--r--tools.h4
28 files changed, 179 insertions, 25 deletions
diff --git a/config.c b/config.c
index ff5913f..3417f0c 100644
--- a/config.c
+++ b/config.c
@@ -58,7 +58,7 @@ cEnigmaConfig::cEnigmaConfig() : showAuxInfo(1), showLogo(1), showVps(1), showSy
useTextEffects(0), scrollDelay(50), scrollPause(1500), scrollMode(0),
blinkPause(1000), scrollInfo(1), scrollListItem(1), scrollOther(1), scrollTitle(1),
dynOsd(0), statusLineMode(0), showWssSymbols(0), showStatusSymbols(0), showScrollbar(1),
- showSignalInfo(0), showCaMode(0), drawRoundCorners(1), channelLogoWidth(80), channelLogoHeight(80),
+ showSignalInfo(0), showCatGenCon(0), showCaMode(0), drawRoundCorners(1), channelLogoWidth(80), channelLogoHeight(80),
signalInfoWidth(74), progressBarWidth(124)
{
memset(logoDir, 0, sizeof(logoDir));
diff --git a/config.h b/config.h
index f9aec34..2df1912 100644
--- a/config.h
+++ b/config.h
@@ -145,6 +145,7 @@ public:
int showStatusSymbols;
int showScrollbar;
int showSignalInfo;
+ int showCatGenCon;
int showCaMode;
int drawRoundCorners;
int channelLogoWidth;
diff --git a/enigma.c b/enigma.c
index 660a740..e1a8811 100644
--- a/enigma.c
+++ b/enigma.c
@@ -269,6 +269,7 @@ private:
int idTitle;
int idEvTitle;
int idEvSubTitle;
+ int idEvCat;
int nBPP;
const cFont *pFontOsdTitle;
@@ -303,6 +304,7 @@ private:
#endif //DISABLE_SIGNALINFO
cString GetChannelName(const cChannel *Channel);
cString GetChannelNumber(const cChannel *Channel, int Number);
+ int FindCatTextAndLen(const cEvent* e, int& xTextWidth, std::string& cat);
public:
cSkinEnigmaDisplayChannel(bool WithInfo);
virtual ~ cSkinEnigmaDisplayChannel();
@@ -346,6 +348,7 @@ cSkinEnigmaDisplayChannel::cSkinEnigmaDisplayChannel(bool WithInfo)
idTitle = -1;
idEvTitle = -1;
idEvSubTitle = -1;
+ idEvCat = -1;
nBPP = 1;
int MessageHeight = 2 * SmallGap + pFontMessage->Height() + 2 * SmallGap;
@@ -780,6 +783,44 @@ cString cSkinEnigmaDisplayChannel::GetChannelNumber(const cChannel *Channel, int
return buffer;
}
+int cSkinEnigmaDisplayChannel::FindCatTextAndLen(const cEvent* e, int& xTextWidth, std::string& cat)
+{
+ int xCatWidth = 0;
+ cat = ExtractAttribute(e->Description(), EVENT_CATEGORY);
+ std::string gen = ExtractAttribute(e->Description(), EVENT_GENRE);
+ if (!cat.empty() && !gen.empty())
+ cat += " - ";
+ cat += gen;
+
+#if VDRVERSNUM >= 10711
+ if (cat.empty()) {
+ std::string strInfo;
+ bool fFirst = true;
+ for (int i = 0; e->Contents(i); i++) {
+ const char *s = e->ContentToString(e->Contents(i));
+ if (!isempty(s)) {
+ if (!fFirst)
+ strInfo += " ";
+ fFirst = false;
+ strInfo += s;
+ }
+ }
+ cat += strInfo;
+ }
+#endif
+
+ if (!cat.empty()) {
+ if (pFontSubtitle->Width(e->ShortText()) > xTextWidth * .5)
+ xCatWidth = std::min((int)(xTextWidth * .3), pFontLanguage->Width(cat.c_str()));
+ else
+ xCatWidth = std::min((int)(xTextWidth * .5), pFontLanguage->Width(cat.c_str()));
+ xTextWidth -= xCatWidth;
+ }
+
+ return xCatWidth;
+
+}
+
void cSkinEnigmaDisplayChannel::SetChannel(const cChannel *Channel, int Number)
{
debug("cSkinEnigmaDisplayChannel::SetChannel()");
@@ -853,10 +894,12 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
EnigmaTextEffects.ResetText(idEvTitle, Theme.Color(clrMenuTxtFg), Theme.Color(clrBackground), false);
EnigmaTextEffects.ResetText(idEvSubTitle, Theme.Color(clrMenuItemNotSelectableFg), Theme.Color(clrBackground), false);
- idEvTitle = idEvSubTitle = -1;
+ EnigmaTextEffects.ResetText(idEvCat, Theme.Color(clrMenuItemNotSelectableFg), Theme.Color(clrBackground), false);
+ idEvTitle = idEvSubTitle = idEvCat = -1;
// check epg datas
const cEvent *e = Present; // Current event
+ int wDur = 0;
if (e) {
char sLen[6];
char sNow[12];
@@ -882,8 +925,9 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
error("Invalid value for ShowRemaining: %d", EnigmaConfig.showRemaining);
}
}
+ wDur = std::max(pFontTitle->Width(sLen), pFontSubtitle->Width(sNow));
- int xDurationLeft = xEventNowRight - Gap - std::max(pFontTitle->Width(sLen), pFontSubtitle->Width(sNow));
+ int xDurationLeft = xEventNowRight - Gap - wDur;
int xDurationWidth = xEventNowRight - Gap - xDurationLeft;
int xTextLeft = xTimeLeft + xTimeWidth + BigGap;
int xTextWidth = xDurationLeft - xTextLeft - BigGap;
@@ -913,6 +957,17 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
Theme.Color(clrSymbolTimerActive),
Theme.Color(clrBackground));
}
+
+ if (EnigmaConfig.showCatGenCon) {
+ std::string cat;
+ int xCatWidth = FindCatTextAndLen(e, xTextWidth, cat);
+
+ // draw category
+ idEvCat = TE_MARQUEE(osd, idEvCat, fScrollOther, xTextLeft + xTextWidth + SmallGap, yEventNowTop + lineHeightTitle, cat.c_str(),
+ Theme.Color(clrMenuItemNotSelectableFg),
+ Theme.Color(clrBackground), pFontSubtitle, nBPP, xCatWidth - SmallGap, pFontSubtitle->Height(), taRight);
+ }
+
// draw shorttext
idEvSubTitle = TE_MARQUEE(osd, idEvSubTitle, fScrollOther, xTextLeft, yEventNowTop + lineHeightTitle, e->ShortText(),
Theme.Color(clrMenuItemNotSelectableFg),
@@ -945,7 +1000,7 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
char sLen[6];
snprintf(sLen, sizeof(sLen), "%d'", e->Duration() / 60);
- int xDurationLeft = xEventNowRight - Gap - pFontTitle->Width(sLen);
+ int xDurationLeft = xEventNowRight - Gap - wDur;
int xDurationWidth = xEventNowRight - Gap - xDurationLeft;
int xTextLeft = xTimeLeft + xTimeWidth + BigGap;
int xTextWidth = xDurationLeft - xTextLeft - BigGap;
@@ -966,6 +1021,17 @@ void cSkinEnigmaDisplayChannel::SetEvents(const cEvent *Present,
osd->DrawBitmap(xTimeLeft + (xTimeWidth - bmTimer.Width()) / 2,
yEventNextTop + lineHeightTitle, bmTimer,
Theme.Color(clrSymbolTimerActive), Theme.Color(clrAltBackground));
+
+ if (EnigmaConfig.showCatGenCon) {
+ std::string cat;
+ int xCatWidth = FindCatTextAndLen(e, xTextWidth, cat);
+
+ // draw category
+ osd->DrawText(xTextLeft + xTextWidth + SmallGap, yEventNextTop + lineHeightTitle, cat.c_str(),
+ Theme.Color(clrMenuItemNotSelectableFg),
+ Theme.Color(clrAltBackground), pFontSubtitle, xCatWidth - SmallGap, 0, taRight);
+ }
+
// draw shorttext
osd->DrawText(xTextLeft, yEventNextTop + lineHeightTitle, e->ShortText(),
Theme.Color(clrMenuItemNotSelectableFg),
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 35dde72..319fde5 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2010-10-23 22:43+0100\n"
"Last-Translator: Innocent De Marchi <tangram.peces@gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -147,6 +147,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr "Mostra el sistema CA com a text"
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr "pixel algo"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index eaec7cf..12339fa 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index bc3d5ba..7f869c2 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 3ed8fa2..fc9cbd7 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Andreas Mair <andreas _@_ vdr-developer.org>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr " Breite der Signal-Informationen"
msgid "Show CA system as text"
msgstr "CA System als Text anzeigen"
+msgid "Show Category - Genre / Contents"
+msgstr "Kategory - Gengre / Inhalt anzeigen"
+
msgid "pixel algo"
msgstr "Pixel-Algorithmus"
diff --git a/po/el_GR.po b/po/el_GR.po
index 5bd6657..bbc24b5 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index d32f5b5..7a74b75 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2008-02-19 17:15+0100\n"
"Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -149,6 +149,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr "Algoritmo píxel"
diff --git a/po/et_EE.po b/po/et_EE.po
index 3eba2df..56fb8aa 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 34da8b5..5f2a51b 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2012-05-22 22:25+0200\n"
"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr "näytteistys"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 354b8e9..0bd80c9 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -149,6 +149,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr "Algorithme pixel"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 80fecab..57f168a 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -146,6 +146,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 8438f94..7ec208e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2011-11-30 13:27+0200\n"
"Last-Translator: jv\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -146,6 +146,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr "Kódolási rendszer szövegként"
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr "pixel algo"
diff --git a/po/it_IT.po b/po/it_IT.po
index 3662610..8606478 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2010-08-09 23:43+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -150,6 +150,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr "Mostra sistema CA come testo"
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr "algoritmo pixel"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 2ae03af..707f960 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: dorpsgek @vdr-portal.de\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -149,6 +149,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr "pixelalgoritme"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index c517382..f6557b3 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -146,6 +146,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 11d7f8a..f928403 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index f89fe80..4490d01 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index b9e7bbc..0d22aad 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -146,6 +146,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 14dc6e2..e601989 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: SergArb @vdr-portal.de / neptunvasja @vdr-portal.de\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -148,6 +148,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr "ÐÛÓÞàØâÜ ßØÚáÕÛï"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 763ec36..c5d48a1 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -146,6 +146,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index f4c7fa0..fceb03b 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -146,6 +146,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 93cde3c..db8091b 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2012-05-19 09:21+0200\n"
+"POT-Creation-Date: 2013-03-02 14:52+0100\n"
"PO-Revision-Date: 2007-12-18 08:11+0100\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -145,6 +145,9 @@ msgstr ""
msgid "Show CA system as text"
msgstr ""
+msgid "Show Category - Genre / Contents"
+msgstr ""
+
msgid "pixel algo"
msgstr ""
diff --git a/setup.c b/setup.c
index 02feaba..a28ad2e 100644
--- a/setup.c
+++ b/setup.c
@@ -103,6 +103,7 @@ void cPluginSkinEnigmaSetup::Store(void)
SetupStore("MinInfoWidth", EnigmaConfig.minInfoWidth);
SetupStore("ShowVPS", EnigmaConfig.showVps);
SetupStore("ShowFlags", EnigmaConfig.showFlags);
+ SetupStore("ShowCatGenCon", EnigmaConfig.showCatGenCon);
SetupStore("ShowMarker", EnigmaConfig.showMarker);
SetupStore("CacheSize", EnigmaConfig.cacheSize);
SetupStore("UseChannelId", EnigmaConfig.useChannelId);
@@ -283,6 +284,7 @@ void cMenuSetupGeneral::Set(void)
Add(new cMenuEditIntItem(tr(" Width of signal info"), &data->signalInfoWidth, 74, Setup.OSDWidth));
#endif //DISABLE_SIGNALINFO
Add(new cMenuEditBoolItem(tr("Show CA system as text"), &data->showCaMode));
+ Add(new cMenuEditBoolItem(tr("Show Category - Genre / Contents"), &data->showCatGenCon));
SetCurrent(Get(currentItem));
Display();
diff --git a/skinenigmang.c b/skinenigmang.c
index 0eabe3a..708e7b2 100644
--- a/skinenigmang.c
+++ b/skinenigmang.c
@@ -187,6 +187,7 @@ bool cPluginSkinEnigma::SetupParse(const char *OptionName, const char *Value)
else if (!strcasecmp(OptionName, "ShowMarker")) EnigmaConfig.showMarker = atoi(Value);
else if (!strcasecmp(OptionName, "ShowVPS")) EnigmaConfig.showVps = atoi(Value);
else if (!strcasecmp(OptionName, "ShowFlags")) EnigmaConfig.showFlags = atoi(Value);
+ else if (!strcasecmp(OptionName, "ShowCatGenCon")) EnigmaConfig.showCatGenCon = atoi(Value);
else if (!strcasecmp(OptionName, "CacheSize")) EnigmaConfig.cacheSize = atoi(Value);
else if (!strcasecmp(OptionName, "UseChannelId")) EnigmaConfig.useChannelId = atoi(Value);
else if (!strcasecmp(OptionName, "NumReruns")) EnigmaConfig.numReruns = atoi(Value);
diff --git a/tools.c b/tools.c
index 198169f..1adeca3 100644
--- a/tools.c
+++ b/tools.c
@@ -38,6 +38,7 @@
#define AUX_TAGS_PIN_ITEM1_END "</protected>"
#define AUX_TAGS_PIN_END "</pin-plugin>"
+
std::string parseaux(const char *aux)
{
bool founditem = false;
@@ -213,4 +214,20 @@ bool ischaracters(const char *str, const char *mask)
return match;
}
+std::string ExtractAttribute(const char* evDescription, const char* name)
+{
+ std::string attribute;
+
+ if (!evDescription || !name) return attribute;
+
+ std::string description(evDescription);
+ size_t apos = description.find(name);
+ if (apos != std::string::npos) {
+ apos += strlen(name);
+ size_t npos = description.find('\n', apos);
+ attribute = description.substr(apos, npos - apos);
+ }
+ return attribute;
+}
+
// vim:et:sw=2:ts=2:
diff --git a/tools.h b/tools.h
index 606e9f1..fb16057 100644
--- a/tools.h
+++ b/tools.h
@@ -10,8 +10,12 @@
#include "common.h"
+#define EVENT_CATEGORY "Category: "
+#define EVENT_GENRE "Genre: "
+
std::string parseaux(const char *str);
bool ischaracters(const char *aux, const char *mask);
+std::string ExtractAttribute(const char* evDescription, const char* name);
#endif // __SKINENIGMA_TOOLS_H
// vim:et:sw=2:ts=2:
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-26 07:20:48 +0000