only show epg description if available

2 files changed, 32 insertions, 16 deletions

diff --git a/displaymenu.c b/displaymenu.c
index 06504e59..55270f01 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -1925,10 +1925,6 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) {
         ComplexContent.SetScrollingActive(true);
 
         int ContentTop = marginItem;
-        ComplexContent.AddText(tr("Description"), false, cRect(marginItem*10, ContentTop, 0, 0), Theme.Color(clrMenuEventFontTitle), Theme.Color(clrMenuEventBg), font);
-        ContentTop += fontHeight;
-        ComplexContent.AddRect(cRect(0, ContentTop, cWidth, 3), Theme.Color(clrMenuEventFontTitle));
-        ContentTop += 6;
 
         ostringstream series_info, movie_info;
 
@@ -2043,13 +2039,25 @@ void cFlatDisplayMenu::SetEvent(const cEvent *Event) {
         if( mediaPath.length() > 0 ) {
             cImage *img = imgLoader.LoadFile(mediaPath.c_str(), mediaWidth, mediaHeight);
             if( img ) {
+                ComplexContent.AddText(tr("Description"), false, cRect(marginItem*10, ContentTop, 0, 0), Theme.Color(clrMenuEventFontTitle), Theme.Color(clrMenuEventBg), font);
+                ContentTop += fontHeight;
+                ComplexContent.AddRect(cRect(0, ContentTop, cWidth, 3), Theme.Color(clrMenuEventFontTitle));
+                ContentTop += 6;
                 ComplexContent.AddImageWithFloatedText(img, CIP_Right, text.str().c_str(), cRect(marginItem, ContentTop, cWidth - marginItem*2, cHeight - marginItem*2),
                     Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg), font);
-            } else {
+            } else if( text.str().length() > 0 ) {
+                ComplexContent.AddText(tr("Description"), false, cRect(marginItem*10, ContentTop, 0, 0), Theme.Color(clrMenuEventFontTitle), Theme.Color(clrMenuEventBg), font);
+                ContentTop += fontHeight;
+                ComplexContent.AddRect(cRect(0, ContentTop, cWidth, 3), Theme.Color(clrMenuEventFontTitle));
+                ContentTop += 6;
                 ComplexContent.AddText(text.str().c_str(), true, cRect(marginItem, ContentTop, cWidth - marginItem*2, cHeight - marginItem*2),
                     Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg), font);
             }
-        } else {
+        } else if( text.str().length() > 0 ) {
+            ComplexContent.AddText(tr("Description"), false, cRect(marginItem*10, ContentTop, 0, 0), Theme.Color(clrMenuEventFontTitle), Theme.Color(clrMenuEventBg), font);
+            ContentTop += fontHeight;
+            ComplexContent.AddRect(cRect(0, ContentTop, cWidth, 3), Theme.Color(clrMenuEventFontTitle));
+            ContentTop += 6;
             ComplexContent.AddText(text.str().c_str(), true, cRect(marginItem, ContentTop, cWidth - marginItem*2, cHeight - marginItem*2),
                 Theme.Color(clrMenuEventFontInfo), Theme.Color(clrMenuEventBg), font);
         }
@@ -2701,10 +2709,6 @@ void cFlatDisplayMenu::SetRecording(const cRecording *Recording) {
         ComplexContent.SetScrollingActive(true);
 
         int ContentTop = marginItem;
-        ComplexContent.AddText(tr("Description"), false, cRect(marginItem*10, ContentTop, 0, 0), Theme.Color(clrMenuRecFontTitle), Theme.Color(clrMenuRecBg), font);
-        ContentTop += fontHeight;
-        ComplexContent.AddRect(cRect(0, ContentTop, cWidth, 3), Theme.Color(clrMenuRecFontTitle));
-        ContentTop += 6;
 
         ostringstream series_info, movie_info;
 
@@ -2819,13 +2823,25 @@ void cFlatDisplayMenu::SetRecording(const cRecording *Recording) {
         if( mediaPath.length() > 0 ) {
             cImage *img = imgLoader.LoadFile(mediaPath.c_str(), mediaWidth, mediaHeight);
             if( img ) {
+                ComplexContent.AddText(tr("Description"), false, cRect(marginItem*10, ContentTop, 0, 0), Theme.Color(clrMenuRecFontTitle), Theme.Color(clrMenuRecBg), font);
+                ContentTop += fontHeight;
+                ComplexContent.AddRect(cRect(0, ContentTop, cWidth, 3), Theme.Color(clrMenuRecFontTitle));
+                ContentTop += 6;
                 ComplexContent.AddImageWithFloatedText(img, CIP_Right, text.str().c_str(), cRect(marginItem, ContentTop, cWidth - marginItem*2, cHeight - marginItem*2),
                     Theme.Color(clrMenuRecFontInfo), Theme.Color(clrMenuRecBg), font);
-            } else {
+            } else if( text.str().length() > 0 ) {
+                ComplexContent.AddText(tr("Description"), false, cRect(marginItem*10, ContentTop, 0, 0), Theme.Color(clrMenuRecFontTitle), Theme.Color(clrMenuRecBg), font);
+                ContentTop += fontHeight;
+                ComplexContent.AddRect(cRect(0, ContentTop, cWidth, 3), Theme.Color(clrMenuRecFontTitle));
+                ContentTop += 6;
                 ComplexContent.AddText(text.str().c_str(), true, cRect(marginItem, ContentTop, cWidth - marginItem*2, cHeight - marginItem*2),
                     Theme.Color(clrMenuRecFontInfo), Theme.Color(clrMenuRecBg), font);
             }
-        } else {
+        } else if( text.str().length() > 0 ) {
+            ComplexContent.AddText(tr("Description"), false, cRect(marginItem*10, ContentTop, 0, 0), Theme.Color(clrMenuRecFontTitle), Theme.Color(clrMenuRecBg), font);
+            ContentTop += fontHeight;
+            ComplexContent.AddRect(cRect(0, ContentTop, cWidth, 3), Theme.Color(clrMenuRecFontTitle));
+            ContentTop += 6;
             ComplexContent.AddText(text.str().c_str(), true, cRect(marginItem, ContentTop, cWidth - marginItem*2, cHeight - marginItem*2),
                 Theme.Color(clrMenuRecFontInfo), Theme.Color(clrMenuRecBg), font);
         }
diff --git a/po/de_DE.po b/po/de_DE.po
index 6eb9ee6b..cf6622f9 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinflat 0.2.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-04-26 16:07+0200\n"
+"POT-Creation-Date: 2014-05-09 18:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,9 +39,6 @@ msgstr "Timer nicht aktiv"
 msgid "no recording info"
 msgstr "keine Aufnahme Informationen"
 
-msgid "Description"
-msgstr "Beschreibung"
-
 msgid "name: "
 msgstr "Name: "
 
@@ -84,6 +81,9 @@ msgstr "Beliebtheit: "
 msgid "vote average: "
 msgstr "durchsch. Wertung: "
 
+msgid "Description"
+msgstr "Beschreibung"
+
 msgid "Movie information"
 msgstr "Film Informationen"