nOpacity 1.1.3 - wieder mit tvscraper support

diff -ruN skinnopacity-orig/detailview.c skinnopacity/detailview.c
--- skinnopacity-orig/detailview.c	2014-05-25 10:02:57.201665881 +0200
+++ skinnopacity/detailview.c	2014-05-24 23:21:42.901281915 +0200
@@ -469,7 +469,7 @@
 
 void cNopacityEPGView::CheckEPGImages(void) {
     if (eventID > 0) {
-        for (int i=1; i <= config.GetValue("numAdditionalEPGPictures"); i++) {
+        for (int i=1; i <= 10; i++) {
             cString epgimage;
             if (config.epgImagePathSet) {
                 epgimage = cString::sprintf("%s%d_%d.jpg", *config.epgImagePath, eventID, i);
@@ -501,7 +501,7 @@
                         picsFound++;
                     }
                 }
-                if (picsFound >= config.GetValue("numAdditionalRecEPGPictures")) {
+                if (picsFound >= 10) {
                     break;
                 }
             }
diff -ruN skinnopacity-orig/imageloader.c skinnopacity/imageloader.c
--- skinnopacity-orig/imageloader.c	2014-05-25 10:02:57.357665874 +0200
+++ skinnopacity/imageloader.c	2014-05-24 20:01:33.038844268 +0200
@@ -158,12 +158,14 @@
             int strlen = fileName.length();
             if (strlen < 8)
                 continue;
-            if (!fileName.compare(strlen-8, 8, "_vdr.jpg"))
+            if (fileName.compare(strlen-8, 8, "_vdr.jpg") != 0)
                 continue;
             fileName = fileName.substr(0, strlen - 4);
             *recImage = fileName.c_str();
+            closedir(folder);
             return true;
         }
     }
+    closedir(folder);
     return false;
 }
\ Kein Zeilenumbruch am Dateiende.

diff -ruN skinnopacity-orig/detailview.c skinnopacity/detailview.c
--- skinnopacity-orig/detailview.c	2014-05-25 10:02:57.201665881 +0200
+++ skinnopacity/detailview.c	2014-05-24 23:21:42.901281915 +0200
@@ -84,7 +84,8 @@
     if (!pixmapHeaderLogo) {
         pixmapHeaderLogo = osd->CreatePixmap(5, cRect(x, y, width, headerHeight));
     }
-    pixmapHeader->Fill(Theme.Color(clrMenuDetailViewBack));
+    tColor bgColor = Theme.Color(clrMenuDetailViewTabs);
+    pixmapHeader->Fill(bgColor);
     pixmapHeaderLogo->Fill(clrTransparent);
     //Channel Logo
     int logoWidth = geoManager->channelLogoWidth;
@@ -100,9 +101,9 @@
     int yDateTime = border;
     int yTitle = (headerHeight - fontHeaderLarge->Height()) / 2;
     int ySubtitle = headerHeight - fontHeader->Height() - border;
-    pixmapHeader->DrawText(cPoint(xText, yDateTime), dateTime.c_str(), Theme.Color(clrMenuFontDetailViewHeader), Theme.Color(clrMenuDetailViewBack), fontHeader);
-    pixmapHeader->DrawText(cPoint(xText, yTitle), title.c_str(), Theme.Color(clrMenuFontDetailViewHeaderTitle), Theme.Color(clrMenuDetailViewBack), fontHeaderLarge);
-    pixmapHeader->DrawText(cPoint(xText, ySubtitle), subTitle.c_str(), Theme.Color(clrMenuFontDetailViewHeader), Theme.Color(clrMenuDetailViewBack), fontHeader);
+    pixmapHeader->DrawText(cPoint(xText, yDateTime), dateTime.c_str(), Theme.Color(clrMenuFontDetailViewHeader), bgColor, fontHeader);
+    pixmapHeader->DrawText(cPoint(xText, yTitle), title.c_str(), Theme.Color(clrMenuFontDetailViewHeaderTitle), bgColor, fontHeaderLarge);
+    pixmapHeader->DrawText(cPoint(xText, ySubtitle), subTitle.c_str(), Theme.Color(clrMenuFontDetailViewHeader), bgColor, fontHeader);
 }
 
 void cNopacityView::DrawTabs(void) {
@@ -110,6 +111,7 @@
         pixmapTabs = osd->CreatePixmap(4, cRect(0, y + height - tabHeight, width, tabHeight));
     }
     tColor bgColor = Theme.Color(clrMenuDetailViewTabs);
+    tColor fgColor = Theme.Color(clrMenuDetailViewBack);
     pixmapTabs->Fill(clrTransparent);
     pixmapTabs->DrawRectangle(cRect(0, 0, width, 2), bgColor);
     int numTabs = tabs.size();
@@ -122,12 +124,12 @@
         pixmapTabs->DrawEllipse(cRect(xCurrent, tabHeight - border/2, border/2, border/2), clrTransparent, -3);
         pixmapTabs->DrawEllipse(cRect(xCurrent + tabWidth - border / 2 - 2, tabHeight - border/2, border/2, border/2), clrTransparent, -4);
         if (tab == activeView) {
-            pixmapTabs->DrawRectangle(cRect(xCurrent + 2, 0, tabWidth - 6, tabHeight - border/2 - 1), clrTransparent);
-            pixmapTabs->DrawRectangle(cRect(xCurrent + border / 2, tabHeight - border/2 - 1, tabWidth - border, border/2 - 1), clrTransparent);
-            pixmapTabs->DrawEllipse(cRect(xCurrent + 2, tabHeight - border/2 - 2, border/2, border/2), clrTransparent, 3);
-            pixmapTabs->DrawEllipse(cRect(xCurrent + tabWidth - border / 2 - 4, tabHeight - border/2 - 2, border/2, border/2), clrTransparent, 4);
+            pixmapTabs->DrawRectangle(cRect(xCurrent + 2, 0, tabWidth - 6, tabHeight - border/2 - 1), fgColor);
+            pixmapTabs->DrawRectangle(cRect(xCurrent + border / 2, tabHeight - border/2 - 1, tabWidth - border, border/2 - 1), fgColor);
+            pixmapTabs->DrawEllipse(cRect(xCurrent + 2, tabHeight - border/2 - 2, border/2, border/2), fgColor, 3);
+            pixmapTabs->DrawEllipse(cRect(xCurrent + tabWidth - border / 2 - 4, tabHeight - border/2 - 2, border/2, border/2), fgColor, 4);
         }
-        pixmapTabs->DrawText(cPoint(xCurrent + (tabWidth - textWidth) / 2, 2 + (tabHeight - font->Height())/2), tabText.c_str(), Theme.Color(clrMenuFontDetailViewText), (tab == activeView) ? clrTransparent : bgColor, font);
+        pixmapTabs->DrawText(cPoint(xCurrent + (tabWidth - textWidth) / 2, 2 + (tabHeight - font->Height())/2), tabText.c_str(), Theme.Color(clrMenuFontDetailViewText), (tab == activeView) ? fgColor : bgColor, font);
         xCurrent += tabWidth;
     }
 }
@@ -147,7 +149,7 @@
         scrollable = true;
     }
     if (!pixmapContentBack) {
-        pixmapContentBack = osd->CreatePixmap(3, cRect(x, y + headerHeight, width, contentHeight + tabHeight));
+        pixmapContentBack = osd->CreatePixmap(3, cRect(x, y + headerHeight, width, contentHeight)); //  + tabHeight
         pixmapContentBack->Fill(Theme.Color(clrMenuDetailViewBack));
     }
     pixmapContent = osd->CreatePixmap(4, cRect(x, y + headerHeight, width, contentHeight), cRect(0, 0, width, drawPortHeight));