Additional setup option to display epg images also if tvscraper media is available

8 files changed, 47 insertions, 26 deletions

diff --git a/HISTORY b/HISTORY
index fc62a62..c8e04c6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -231,3 +231,6 @@ Version 0.1.4
   in is set to zero
 - fixed a bug that poster or banner is not displayed in displayChannel
   if fade in is set to zero
+- Added setup option in detailed EPG view and in detailed recordings view 
+  to select if additional EPG pictures are shown if tvscraper media 
+  is available
diff --git a/menudetailview.c b/menudetailview.c
index ff79e25..4288765 100644
--- a/menudetailview.c
+++ b/menudetailview.c
@@ -339,7 +339,7 @@ void cNopacityMenuDetailEventView::SetContentHeight(void) {
     }
     //Height of EPG Pictures
     int heightEPGPics = 0;
-    if (!hasAdditionalMedia && config.displayAdditionalEPGPictures) {
+    if ((config.displayAdditionalEPGPictures == 1) || ((config.displayAdditionalEPGPictures == 2) && !hasAdditionalMedia)) {
         heightEPGPics = HeightEPGPics();
     }
     
@@ -407,8 +407,8 @@ void cNopacityMenuDetailEventView::Action(void) {
        DrawFanart(yFanart);
         osd->Flush();
     }
-    //draw additional EPG Pictures only if no media is available
-    if (!hasAdditionalMedia && config.displayAdditionalEPGPictures && Running()) {
+    //draw additional EPG Pictures
+    if (((config.displayAdditionalEPGPictures == 1) || ((config.displayAdditionalEPGPictures == 2) && !hasAdditionalMedia)) && Running()) {
         DrawEPGPictures(yEPGPics);
         osd->Flush();
     }
@@ -447,22 +447,20 @@ void cNopacityMenuDetailEventView::DrawHeader(void) {
         pixmapLogo->DrawImage(cPoint(0, max((headerHeight - config.detailViewLogoHeight - border)/2, 0)), imgLoader.GetImage());
     }
     int widthTextHeader = width - 4 * border - logoWidth;
-    if (!hasAdditionalMedia) {
-        if (imgLoader.LoadEPGImage(event->EventID())) {
-            pixmapHeader->DrawImage(cPoint(width - config.epgImageWidth - border, (headerHeight-config.epgImageHeight)/2), imgLoader.GetImage());
-            if (config.roundedCorners) {
-                int radius = config.cornerRadius;
-                if (radius > 2) {
-                    int x = width - config.epgImageWidth - border;
-                    int y = (headerHeight-config.epgImageHeight)/2;
-                    pixmapHeader->DrawEllipse(cRect(x,y,radius,radius), clrTransparent, -2);
-                    pixmapHeader->DrawEllipse(cRect(x + config.epgImageWidth - radius,y,radius,radius), clrTransparent, -1);
-                    pixmapHeader->DrawEllipse(cRect(x,y + config.epgImageHeight - radius,radius,radius), clrTransparent, -3);
-                    pixmapHeader->DrawEllipse(cRect(x + config.epgImageWidth - radius,y + config.epgImageHeight - radius,radius,radius), clrTransparent, -4);
-                }
+    if (imgLoader.LoadEPGImage(event->EventID())) {
+        pixmapHeader->DrawImage(cPoint(width - config.epgImageWidth - border, (headerHeight-config.epgImageHeight)/2), imgLoader.GetImage());
+        if (config.roundedCorners) {
+            int radius = config.cornerRadius;
+            if (radius > 2) {
+                int x = width - config.epgImageWidth - border;
+                int y = (headerHeight-config.epgImageHeight)/2;
+                pixmapHeader->DrawEllipse(cRect(x,y,radius,radius), clrTransparent, -2);
+                pixmapHeader->DrawEllipse(cRect(x + config.epgImageWidth - radius,y,radius,radius), clrTransparent, -1);
+                pixmapHeader->DrawEllipse(cRect(x,y + config.epgImageHeight - radius,radius,radius), clrTransparent, -3);
+                pixmapHeader->DrawEllipse(cRect(x + config.epgImageWidth - radius,y + config.epgImageHeight - radius,radius,radius), clrTransparent, -4);
             }
-            widthTextHeader -= config.epgImageWidth;
         }
+        widthTextHeader -= config.epgImageWidth;
     }
     int lineHeight = fontHeaderLarge->Height();
 
@@ -646,7 +644,7 @@ void cNopacityMenuDetailRecordingView::SetContentHeight(void) {
     }
     //Height of EPG Pictures
     int heightEPGPics = 0;
-    if (!hasAdditionalMedia && config.displayAdditionalEPGPictures) {
+    if ((config.displayAdditionalRecEPGPictures == 1) || ((config.displayAdditionalRecEPGPictures == 2) && !hasAdditionalMedia)) {
         if (LoadEPGPics())
             heightEPGPics = HeightEPGPics();
     }
@@ -715,8 +713,8 @@ void cNopacityMenuDetailRecordingView::Action(void) {
        DrawFanart(yFanart);
         osd->Flush();
     }
-    //draw additional EPG Pictures only if no media is available
-    if (!hasAdditionalMedia && config.displayAdditionalEPGPictures && Running()) {
+    //draw additional EPG Pictures
+    if (((config.displayAdditionalRecEPGPictures == 1) || ((config.displayAdditionalRecEPGPictures == 2) && !hasAdditionalMedia)) && Running()) {
         DrawEPGPictures(yEPGPics);
         osd->Flush();
     }
diff --git a/po/ca_CA.po b/po/ca_CA.po
index 08aa3ef..f483516 100644
--- a/po/ca_CA.po
+++ b/po/ca_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-08-18 15:18+0200\n"
+"POT-Creation-Date: 2013-08-24 09:40+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Gabychan <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -278,6 +278,9 @@ msgstr "si existeix"
 msgid "always"
 msgstr "sempre"
 
+msgid "only if no tvscraper media available"
+msgstr ""
+
 msgid "Use narrow menu"
 msgstr "Utilitza menú limitat"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index c2dd47d..bb56e54 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-08-18 15:18+0200\n"
+"POT-Creation-Date: 2013-08-24 09:40+0200\n"
 "PO-Revision-Date: 2012-11-11 17:49+0200\n"
 "Last-Translator: louis\n"
 "Language-Team: \n"
@@ -275,6 +275,9 @@ msgstr "falls vorhanden"
 msgid "always"
 msgstr "immer"
 
+msgid "only if no tvscraper media available"
+msgstr "falls keine tvscraper medien verfügbar"
+
 msgid "Use narrow menu"
 msgstr "Schmales Menü verwenden"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 1e33fc6..abd87ed 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-08-18 15:18+0200\n"
+"POT-Creation-Date: 2013-08-24 09:40+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
@@ -278,6 +278,9 @@ msgstr "se esiste"
 msgid "always"
 msgstr "sempre"
 
+msgid "only if no tvscraper media available"
+msgstr ""
+
 msgid "Use narrow menu"
 msgstr "Usa menu ridotto"
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 13089ce..5e98449 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinnopacity 0.0.6\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-08-18 15:18+0200\n"
+"POT-Creation-Date: 2013-08-24 09:40+0200\n"
 "PO-Revision-Date: 2013-03-12 15:59+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -278,6 +278,9 @@ msgstr "ak je k dispozícii"
 msgid "always"
 msgstr "v¾dy"
 
+msgid "only if no tvscraper media available"
+msgstr ""
+
 msgid "Use narrow menu"
 msgstr "Pou¾i» úzku ponuku"
 
diff --git a/setup.c b/setup.c
index eb850a1..b290df5 100644
--- a/setup.c
+++ b/setup.c
@@ -350,6 +350,9 @@ cNopacitySetupMenuDisplaySchedules::cNopacitySetupMenuDisplaySchedules(cNopacity
     scrollSpeed[1] = tr("slow");
     scrollSpeed[2] = tr("medium");
     scrollSpeed[3] = tr("fast");
+    displayEPGPictures[0] = tr("never");
+    displayEPGPictures[1] = tr("always");
+    displayEPGPictures[2] = tr("only if no tvscraper media available");
     Set();
 }
 
@@ -372,7 +375,7 @@ void cNopacitySetupMenuDisplaySchedules::Set(void) {
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of reruns to display")), &tmpNopacityConfig->numReruns, 1, 10));
         Add(new cMenuEditStraItem(cString::sprintf("%s%s", *spacer, tr("Use Subtitle for reruns")), &tmpNopacityConfig->useSubtitleRerun, 3, useSubtitleRerunTexts));
     }
-    Add(new cMenuEditBoolItem(tr("Display additional EPG Pictures in detailed EPG View"), &tmpNopacityConfig->displayAdditionalEPGPictures));
+    Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed EPG View"), &tmpNopacityConfig->displayAdditionalEPGPictures, 3, displayEPGPictures));
     if (tmpNopacityConfig->displayAdditionalEPGPictures)
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), &tmpNopacityConfig->numAdditionalEPGPictures, 1, 9));
     Add(new cMenuEditIntItem(tr("Detail EPG View Logo Width"), &tmpNopacityConfig->detailViewLogoWidth, 30, 500));
@@ -436,6 +439,9 @@ void cNopacitySetupMenuDisplayTimers::Set(void) {
 //-----MenuDisplay Recordings Menu -------------------------------------------------------------------------------------------------------------
 
 cNopacitySetupMenuDisplayRecordings::cNopacitySetupMenuDisplayRecordings(cNopacityConfig* data)  : cMenuSetupSubMenu(tr("VDR Menu: Recordings Menu"), data) {
+    displayEPGPictures[0] = tr("never");
+    displayEPGPictures[1] = tr("always");
+    displayEPGPictures[2] = tr("only if no tvscraper media available");
     Set();
 }
 
@@ -446,7 +452,7 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) {
     Add(new cMenuEditBoolItem(tr("Use narrow menu"), &tmpNopacityConfig->narrowRecordingMenu));
     if (tmpNopacityConfig->narrowRecordingMenu)
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Width (Percent of OSD Width)")), &tmpNopacityConfig->menuWidthRecordings, 10, 97));
-    Add(new cMenuEditBoolItem(tr("Display additional EPG Pictures in detailed recording View"), &tmpNopacityConfig->displayAdditionalRecEPGPictures));
+    Add(new cMenuEditStraItem(tr("Display additional EPG Pictures in detailed recording View"), &tmpNopacityConfig->displayAdditionalRecEPGPictures, 3, displayEPGPictures));
     if (tmpNopacityConfig->displayAdditionalRecEPGPictures)
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), &tmpNopacityConfig->numAdditionalRecEPGPictures, 1, 9));
     Add(new cMenuEditIntItem(tr("Folder Icon Size"), &tmpNopacityConfig->menuRecFolderSize, 30, 300));
diff --git a/setup.h b/setup.h
index 192caab..10033d6 100644
--- a/setup.h
+++ b/setup.h
@@ -50,6 +50,7 @@ class cNopacitySetupMenuDisplaySchedules : public cMenuSetupSubMenu {
     protected:
         const char *useSubtitleRerunTexts[3];
         const char *scrollSpeed[4];
+        const char *displayEPGPictures[3];
         void Set(void);
     public:
         cNopacitySetupMenuDisplaySchedules(cNopacityConfig *data);
@@ -72,6 +73,7 @@ class cNopacitySetupMenuDisplayTimers : public cMenuSetupSubMenu {
 
 class cNopacitySetupMenuDisplayRecordings : public cMenuSetupSubMenu {
     protected:
+        const char *displayEPGPictures[3];
         void Set(void);
     public:
         cNopacitySetupMenuDisplayRecordings(cNopacityConfig *data);