From c9c2d953a56215d0db76b8cba4aa627f164a2fc9 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Sun, 24 Jan 2021 13:02:35 +0100
Subject: [PATCH 1/6] - retrieve ChannelName from 'info' and fallback via
 ChannelID from active channel list (reverse mechanism) - remove exposing
 ChannelID (senseless as default 'info' is not containing it)

---
 coreengine/definitions.h                      |  2 -
 coreengine/listelements.c                     | 52 +++++++++----------
 coreengine/viewdetail.c                       | 29 ++++++-----
 coreengine/viewelementsdisplaymenu.c          | 28 +++++-----
 .../xmlfiles/displaymenurecordings.xml        |  2 -
 5 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/coreengine/definitions.h b/coreengine/definitions.h
index 57ce803..534f154 100644
--- a/coreengine/definitions.h
+++ b/coreengine/definitions.h
@@ -1168,7 +1168,6 @@ enum class eLeMenuRecordingsIT {
     hasposter,
     posterwidth,
     posterheight,
-    recchannelnumber,
     framesPerSecond,
     isHD,
     isUHD,
@@ -1218,7 +1217,6 @@ enum class eCeMenuRecordingsIT {
     hasposter,
     posterwidth,
     posterheight,
-    recchannelnumber,
     framesPerSecond,
     isHD,
     isUHD,
diff --git a/coreengine/listelements.c b/coreengine/listelements.c
index 6f66097..6c500bf 100644
--- a/coreengine/listelements.c
+++ b/coreengine/listelements.c
@@ -1756,7 +1756,6 @@ void cLeMenuRecordings::SetTokenContainer(void) {
     tokenContainer->DefineIntToken("{isRadio}", (int)eLeMenuRecordingsIT::isRadio);
     tokenContainer->DefineStringToken("{recchannelname}", (int)eLeMenuRecordingsST::recchannelname);
     tokenContainer->DefineStringToken("{recchannelid}", (int)eLeMenuRecordingsST::recchannelid);
-    tokenContainer->DefineIntToken("{recchannelnumber}", (int)eLeMenuRecordingsIT::recchannelnumber);
     InheritTokenContainer();
 }
 
@@ -1856,21 +1855,21 @@ bool cLeMenuRecordings::Parse(bool forced) {
     delete[] recName;
 
     if (info) {
+	if (info->ChannelName() && (strlen(info->ChannelName()) > 0)) {
+	    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::recchannelname, info->ChannelName());
+	    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::recchannelid, info->ChannelID().ToString());
+	} else {
 #if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
-        LOCK_CHANNELS_READ;
-        const cChannel *channel = Channels->GetByChannelID(info->ChannelID());
+            LOCK_CHANNELS_READ;
+            const cChannel *channel = Channels->GetByChannelID(info->ChannelID());
 #else
-        const cChannel *channel = Channels.GetByChannelID(info->ChannelID());
+            const cChannel *channel = Channels.GetByChannelID(info->ChannelID());
 #endif
-        if (channel) {
-	    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::recchannelname, channel->Name());
-	    tokenContainer->AddStringToken((int)eLeMenuRecordingsST::recchannelid, *channel->GetChannelID().ToString());
-	    tokenContainer->AddIntToken((int)eLeMenuRecordingsIT::recchannelnumber, channel->Number());
-        } else {
-	    // fallback to information provided in 'info' if channel is no longer found in active channels
-	    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::recchannelname, info->ChannelName());
-	    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::recchannelid, info->ChannelID().ToString());
-        }
+            if (channel) {
+	        tokenContainer->AddStringToken((int)eLeMenuRecordingsST::recchannelname, channel->Name());
+		tokenContainer->AddStringToken((int)eLeMenuRecordingsST::recchannelid, *channel->GetChannelID().ToString());
+	    }
+	}
     }
 
     cString recDate = event->GetDateString();
@@ -2031,7 +2030,6 @@ void cCeMenuRecordings::SetTokenContainer(void) {
     tokenContainer->DefineIntToken("{isRadio}", (int)eCeMenuRecordingsIT::isRadio);
     tokenContainer->DefineStringToken("{recchannelname}", (int)eCeMenuRecordingsST::recchannelname);
     tokenContainer->DefineStringToken("{recchannelid}", (int)eCeMenuRecordingsST::recchannelid);
-    tokenContainer->DefineIntToken("{recchannelnumber}", (int)eCeMenuRecordingsIT::recchannelnumber);
     InheritTokenContainer();
 }
 
@@ -2137,21 +2135,21 @@ bool cCeMenuRecordings::Parse(bool forced) {
     if (!event) return true;
 
     if (info) {
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
-        LOCK_CHANNELS_READ;
-        const cChannel *channel = Channels->GetByChannelID(info->ChannelID());
-#else
-        const cChannel *channel = Channels.GetByChannelID(info->ChannelID());
-#endif
-        if (channel) {
-	    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::recchannelname, channel->Name());
-	    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::recchannelid, *channel->GetChannelID().ToString());
-	    tokenContainer->AddIntToken((int)eCeMenuRecordingsIT::recchannelnumber, channel->Number());
-        } else {
-	    // fallback to information provided in 'info' if channel is no longer found in active channels
+	if (info->ChannelName() && (strlen(info->ChannelName()) > 0)) {
 	    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::recchannelname, info->ChannelName());
 	    tokenContainer->AddStringToken((int)eCeMenuRecordingsST::recchannelid, info->ChannelID().ToString());
-        }
+	} else {
+#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+            LOCK_CHANNELS_READ;
+            const cChannel *channel = Channels->GetByChannelID(info->ChannelID());
+#else
+            const cChannel *channel = Channels.GetByChannelID(info->ChannelID());
+#endif
+            if (channel) {
+	        tokenContainer->AddStringToken((int)eCeMenuRecordingsST::recchannelname, channel->Name());
+		tokenContainer->AddStringToken((int)eCeMenuRecordingsST::recchannelid, *channel->GetChannelID().ToString());
+	    }
+	}
     }
 
     tokenContainer->AddStringToken((int)eCeMenuRecordingsST::epgname, info->Title() ? info->Title() : buffer.c_str());
diff --git a/coreengine/viewdetail.c b/coreengine/viewdetail.c
index e4791c6..b63e9df 100644
--- a/coreengine/viewdetail.c
+++ b/coreengine/viewdetail.c
@@ -812,24 +812,25 @@ void cViewDetailRec::SetRecInfos(void) {
 
     const cRecordingInfo *info = recording->Info();
     if (info) {
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
-        LOCK_CHANNELS_READ;
-        const cChannel *channel = Channels->GetByChannelID(info->ChannelID());
-#else
-        const cChannel *channel = Channels.GetByChannelID(info->ChannelID());
-#endif
-        if (channel) {
-            tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, channel->Name());
-            tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, *channel->GetChannelID().ToString());
-            tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, channel->Number());
-        } else {
-	    // fallback to information provided in 'info' if channel is no longer found in active channels
+	if (info->ChannelName() && (strlen(info->ChannelName()) > 0)) {
 	    tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, info->ChannelName());
 	    tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, info->ChannelID().ToString());
-        }        
+	    tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, 0); // cannot be provided, for backward compatibility only
+	} else {
+#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+            LOCK_CHANNELS_READ;
+            const cChannel *channel = Channels->GetByChannelID(info->ChannelID());
+#else
+            const cChannel *channel = Channels.GetByChannelID(info->ChannelID());
+#endif
+            if (channel) {
+	        tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, channel->Name());
+		tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, *channel->GetChannelID().ToString());
+		tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, channel->Number());
+	    }
+	}
     }
 
-
     if (index) {
         int nLastIndex = index->Last();
         if (nLastIndex) {
diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c
index dad279a..5887f26 100644
--- a/coreengine/viewelementsdisplaymenu.c
+++ b/coreengine/viewelementsdisplaymenu.c
@@ -1219,22 +1219,24 @@ bool cVeDmDetailheaderRec::Parse(bool forced) {
             tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isUHD, RecordingIsUHD(event)); // detect UHD from 'info'
             tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::isRadio, RecordingIsRadio(event, info->FramesPerSecond())); // detect Radio from 'info' and FPS
         }
+
+	if (info->ChannelName() && (strlen(info->ChannelName()) > 0)) {
+	    tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, info->ChannelName());
+	    tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, info->ChannelID().ToString());
+	    tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, 0); // cannot be provided, for backward compatibility only
+	} else {
 #if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
-        LOCK_CHANNELS_READ;
-        const cChannels* channels = Channels;
+            LOCK_CHANNELS_READ;
+            const cChannel *channel = Channels->GetByChannelID(info->ChannelID());
 #else
-        cChannels* channels = &Channels;
+            const cChannel *channel = Channels.GetByChannelID(info->ChannelID());
 #endif
-        const cChannel *channel = channels->GetByChannelID(info->ChannelID());
-        if (channel) {
-            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, channel->Name());
-            tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, *channel->GetChannelID().ToString());
-            tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, channel->Number());
-        } else {
-	    // fallback to information provided in 'info' if channel is no longer found in active channels
-	    tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, info->ChannelName());
-	    tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, info->ChannelID().ToString());
-        }
+            if (channel) {
+	        tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, channel->Name());
+		tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, *channel->GetChannelID().ToString());
+		tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, channel->Number());
+	    }
+	}
     }
     string recImage = "";
     string path = recording->FileName() ? recording->FileName() : "";
diff --git a/skinskeleton/xmlfiles/displaymenurecordings.xml b/skinskeleton/xmlfiles/displaymenurecordings.xml
index 9bde817..e46fd12 100644
--- a/skinskeleton/xmlfiles/displaymenurecordings.xml
+++ b/skinskeleton/xmlfiles/displaymenurecordings.xml
@@ -35,7 +35,6 @@
         {posterpath}            absolute path of scraped poster
         {recchannelname}        name of channel from which was recorded
         {recchannelid}          id of channel from which was recorded
-        {recchannelnumber}      number of channel from which was recorded
         {framesPerSecond}       frames per second (from EPG info)
         {isHD}                  true if recording is HD/UHD (from EPG info)
         {isUHD}                 true if recording is UHD (from EPG info)
@@ -81,7 +80,6 @@
         {bannerpath}            absolute path of scraped banner        
         {recchannelname}        name of channel from which was recorded
         {recchannelid}          id of channel from which was recorded
-        {recchannelnumber}      number of channel from which was recorded
         {framesPerSecond}       frames per second (from EPG info)
         {isHD}                  true if recording is HD/UHD (from EPG info)
         {isUHD}                 true if recording is UHD (from EPG info)

From 1aead6d4008077380faebde1ad59d76cf41a8552 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Sun, 24 Jan 2021 09:46:47 +0100
Subject: [PATCH 2/6] update version, extend history

---
 HISTORY        | 2 ++
 skindesigner.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/HISTORY b/HISTORY
index e6b5e0f..07eb0e3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -465,3 +465,5 @@ Version 1.2.9
 Version 1.2.10
 - [pbiering] added tokens for recordings: isUHD, isRadio
 - [pbiering] added token for channels: isUHD
+- [pbiering] expose to displaymenurecordings: recchannelname, recchannelid, recchannelnumber
+- [pbiering] add fallback to get name/id from 'info' in case channel is no longer in active channel list
diff --git a/skindesigner.c b/skindesigner.c
index 33f249b..c3f3e66 100644
--- a/skindesigner.c
+++ b/skindesigner.c
@@ -21,7 +21,7 @@
 #endif
 
 
-static const char *VERSION        = "1.2.9";
+static const char *VERSION        = "1.2.10";
 static const char *DESCRIPTION    = trNOOP("Skin Designer");
 
 class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI {

From 858143ce2b08d9dc1d8acdd621697b51c6b39062 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Sun, 24 Jan 2021 15:12:35 +0100
Subject: [PATCH 3/6] Update skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml

---
 .../xmlfiles/plug-tvguideng-root.xml          | 326 ++++++------------
 1 file changed, 108 insertions(+), 218 deletions(-)

diff --git a/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml b/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
index ed217e3..e2b74a4 100644
--- a/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
+++ b/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
@@ -67,238 +67,126 @@
     </viewelement>
 
     <viewelement name="footer_hor">
-        <!--red-->
-        <area condition="{red1}" x="0" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{red1}" x="0" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
-        </area>
-        <!--green-->
-        <area condition="{green1}" x="0" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{green1}" x="0" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
-        </area>
-        <!--yellow-->
-        <area condition="{yellow1}" x="0" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{yellow1}" x="0" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
-        </area>
-        <!--blue-->
-        <area condition="{blue1}" x="0" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{blue1}" x="0" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+        <area x="0" y="94%" width="25%" height="6%" layer="2">
+            <!--red-->
+            <drawimage condition="{red1}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{red1}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+            <!--green-->
+            <drawimage condition="{green1}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{green1}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+            <!--yellow-->
+            <drawimage condition="{yellow1}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{yellow1}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+            <!--blue-->
+            <drawimage condition="{blue1}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{blue1}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
         </area>
 
-        <!--red-->
-        <area condition="{red2}" x="25%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{red2}" x="25%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
-        </area>
-        <!--green-->
-        <area condition="{green2}" x="25%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{green2}" x="25%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
-        </area>
-        <!--yellow-->
-        <area condition="{yellow2}" x="25%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{yellow2}" x="25%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
-        </area>
-        <!--blue-->
-        <area condition="{blue2}" x="25%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{blue2}" x="25%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+        <area x="25%" y="94%" width="25%" height="6%" layer="2">
+            <!--red-->
+            <drawimage condition="{red2}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{red2}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+            <!--green-->
+            <drawimage condition="{green2}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{green2}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+            <!--yellow-->
+            <drawimage condition="{yellow2}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{yellow2}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+            <!--blue-->
+            <drawimage condition="{blue2}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{blue2}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
         </area>
 
-        <!--red-->
-        <area condition="{red3}" x="50%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{red3}" x="50%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
-        </area>
-        <!--green-->
-        <area condition="{green3}" x="50%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{green3}" x="50%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
-        </area>
-        <!--yellow-->
-        <area condition="{yellow3}" x="50%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{yellow3}" x="50%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
-        </area>
-        <!--blue-->
-        <area condition="{blue3}" x="50%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{blue3}" x="50%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+        <area x="50%" y="94%" width="25%" height="6%" layer="2">
+            <!--red-->
+            <drawimage condition="{red3}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{red3}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+            <!--green-->
+            <drawimage condition="{green3}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{green3}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+            <!--yellow-->
+            <drawimage condition="{yellow3}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{yellow3}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+            <!--blue-->
+            <drawimage condition="{blue3}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{blue3}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
         </area>
 
-        <!--red-->
-        <area condition="{red4}" x="75%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{red4}" x="75%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
-        </area>
-        <!--green-->
-        <area condition="{green4}" x="75%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{green4}" x="75%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
-        </area>
-        <!--yellow-->
-        <area condition="{yellow4}" x="75%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{yellow4}" x="75%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
-        </area>
-        <!--blue-->
-        <area condition="{blue4}" x="75%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{blue4}" x="75%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+        <area x="75%" y="94%" width="25%" height="6%" layer="2">
+            <!--red-->
+            <drawimage condition="{red4}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{red4}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+            <!--green-->
+            <drawimage condition="{green4}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{green4}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+            <!--yellow-->
+            <drawimage condition="{yellow4}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{yellow4}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+            <!--blue-->
+            <drawimage condition="{blue4}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{blue4}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
         </area>
     </viewelement>
 
     <viewelement name="footer_ver">
-        <!--red-->
-        <area condition="{red1}" x="0" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{red1}" x="0" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
-        </area>
-        <!--green-->
-        <area condition="{green1}" x="0" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{green1}" x="0" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
-        </area>
-        <!--yellow-->
-        <area condition="{yellow1}" x="0" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{yellow1}" x="0" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
-        </area>
-        <!--blue-->
-        <area condition="{blue1}" x="0" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{blue1}" x="0" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+        <area x="0" y="94%" width="25%" height="6%" layer="2">
+            <!--red-->
+            <drawimage condition="{red1}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{red1}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+            <!--green-->
+            <drawimage condition="{green1}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{green1}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+            <!--yellow-->
+            <drawimage condition="{yellow1}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{yellow1}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+            <!--blue-->
+            <drawimage condition="{blue1}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{blue1}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
         </area>
 
-        <!--red-->
-        <area condition="{red2}" x="25%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{red2}" x="25%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
-        </area>
-        <!--green-->
-        <area condition="{green2}" x="25%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{green2}" x="25%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
-        </area>
-        <!--yellow-->
-        <area condition="{yellow2}" x="25%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{yellow2}" x="25%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
-        </area>
-        <!--blue-->
-        <area condition="{blue2}" x="25%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{blue2}" x="25%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+	<area x="25%" y="94%" width="25%" height="6%" layer="2">
+            <!--red-->
+            <drawimage condition="{red2}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{red2}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+            <!--green-->
+            <drawimage condition="{green2}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{green2}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+            <!--yellow-->
+            <drawimage condition="{yellow2}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{yellow2}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+            <!--blue-->
+            <drawimage condition="{blue2}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{blue2}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
         </area>
 
-        <!--red-->
-        <area condition="{red3}" x="50%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{red3}" x="50%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
-        </area>
-        <!--green-->
-        <area condition="{green3}" x="50%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{green3}" x="50%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
-        </area>
-        <!--yellow-->
-        <area condition="{yellow3}" x="50%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{yellow3}" x="50%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
-        </area>
-        <!--blue-->
-        <area condition="{blue3}" x="50%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{blue3}" x="50%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+	<area x="50%" y="94%" width="25%" height="6%" layer="2">
+            <!--red-->
+            <drawimage condition="{red3}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{red3}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+            <!--green-->
+            <drawimage condition="{green3}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{green3}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+            <!--yellow-->
+            <drawimage condition="{yellow3}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{yellow3}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+            <!--blue-->
+            <drawimage condition="{blue3}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{blue3}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
         </area>
 
-        <!--red-->
-        <area condition="{red4}" x="75%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{red4}" x="75%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
-        </area>
-        <!--green-->
-        <area condition="{green4}" x="75%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{green4}" x="75%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
-        </area>
-        <!--yellow-->
-        <area condition="{yellow4}" x="75%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{yellow4}" x="75%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
-        </area>
-        <!--blue-->
-        <area condition="{blue4}" x="75%" y="94%" width="25%" height="6%" layer="2">
-            <drawimage imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
-        </area>
-        <area condition="{blue4}" x="75%" y="94%" width="25%" height="6%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
+	<area x="75%" y="94%" width="25%" height="6%" layer="2">
+            <!--red-->
+            <drawimage condition="{red4}" imagetype="skinpart" path="button_red" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{red4}++isset{red}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{red}" />
+            <!--green-->
+            <drawimage condition="{green4}" imagetype="skinpart" path="button_green" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{green4}++isset{green}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{green}" />
+            <!--yellow-->
+            <drawimage condition="{yellow4}" imagetype="skinpart" path="button_yellow" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{yellow4}++isset{yellow}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{yellow}" />
+            <!--blue-->
+            <drawimage condition="{blue4}" imagetype="skinpart" path="button_blue" x="0" y="0" width="100%" height="100%"/>
+            <drawtext condition="{blue4}++isset{blue}" align="center" valign="center" font="{regular}" fontsize="{areaheight}*{buttonfontsize}/100" color="{fontdefault}" text="{blue}" />
         </area>
     </viewelement>
 
@@ -426,7 +314,8 @@
             <drawrectangle x="0" y="0" width="2" height="100%" color="{menubackline}" />
             <drawrectangle x="0" y="{areaheight}-2" width="100%" height="2" color="{menubackline}" />
             <!--<drawrectangle x="{areawidth}-2" y="0" width="2" height="100%" color="{menubackline}" />-->
-            <drawimage condition="{timer}" imagetype="icon" path="ico_rec_selected" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
+	    <drawimage condition="{timer}++{timerisactive}" imagetype="icon" path="ico_timer_is_active" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
+            <drawimage condition="{timer}++not{timerisactive}" imagetype="icon" path="ico_timer_is_inactive" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
         </area>
         <!--EPG without time-->		
         <area condition="not{tvgshowtime}" layer="4">
@@ -435,7 +324,8 @@
             <drawrectangle x="0" y="0" width="2" height="100%" color="{menubackline}" />
             <drawrectangle x="0" y="{areaheight}-2" width="100%" height="2" color="{menubackline}" />
             <!--<drawrectangle x="{areawidth}-2" y="0" width="2" height="100%" color="{menubackline}" />-->
-            <drawimage condition="{timer}" imagetype="icon" path="ico_rec_selected" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
+	    <drawimage condition="{timer}++{timerisactive}" imagetype="icon" path="ico_timer_is_active" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
+	    <drawimage condition="{timer}++not{timerisactive}" imagetype="icon" path="ico_timer_is_inactive" x="{areawidth} - {areaheight}*0.4 - 5" y="5" width="0.4*{areaheight}" height="0.4*{areaheight}" />
         </area>
     </grid>
 

From 1315e732174b66a38fe82232faf90c6ba8aa13d8 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Mon, 25 Jan 2021 11:17:31 +0100
Subject: [PATCH 4/6] Update
 skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml

---
 skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml b/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
index b3c9c0c..a09a666 100644
--- a/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
+++ b/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
@@ -20,8 +20,10 @@
 
     <grid name="recmenu" x="0" y="0" width="100%" height="100%">
         <!-- background -->
-        <area condition="not{info}++not{buttonyesno}++not{timerconflictheader}++not{timerconflict}++not{timelineheader}++not{timelinetimer}" layer="5">
+        <!-- <area condition="not{info}++not{buttonyesno}++not{timerconflictheader}++not{timerconflict}++not{timelineheader}++not{timelinetimer}" layer="5">  -->
+        <area condition="not{buttonyesno}" layer="5">
             <fill condition="{current}" color="{menubackactive}" />
+            <fill condition="not{current}" color="{tvgrecmenuback}" />
             <drawrectangle condition="not{current}" x="0" y="{areaheight}-1" width="100%" height="1" color="{menubackline}" />
         </area>
         <!-- info -->

From f711a71722d25ce6c8b660e62a4fb9b3cbc4e059 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Mon, 25 Jan 2021 15:58:07 +0100
Subject: [PATCH 5/6] Update
 skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml

---
 .../xmlfiles/displaymenudetailrecording.xml   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml b/skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml
index 56fb858..4f88562 100644
--- a/skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml
+++ b/skins/estuary4vdr/xmlfiles/displaymenudetailrecording.xml
@@ -1,4 +1,5 @@
 <menudetailedrecording x="0" y="0" width="100%" height="100%" fadetime="0">
+
     <background>
         <area x="0" y="0" width="100%" height="100%" layer="1">
             <drawimage imagetype="skinpart" x="0" y="0" width="100%" height="100%" path="background_menu" />
@@ -10,12 +11,6 @@
         </area>
     </background>
 
-    <scrollbar>
-        <area x="97%" y="23%" width="{areawidth}*0.01" height="61%" layer="3">
-            <drawrectangle x="0" y="{areaheight} * {offset} / 1000" width="100%" height="{areaheight} * {height} / 1000" color="{progressbar}" />
-        </area>
-    </scrollbar>
-
     <detailheader>
         <area x="3%" y="11%" width="95%" height="10%" layer="3">
             <drawtext x="0" y="{areaheight}*{detailheaderdateposy}/100" font="{regular}" fontsize="{areaheight}*{detailheaderdatesize}/100" color="{fontdefault}" text="{date} {time}, {duration} min" />
@@ -23,6 +18,12 @@
         </area>
     </detailheader>
 
+    <scrollbar>
+        <area x="97%" y="23%" width="{areawidth}*0.01" height="61%" layer="3">
+            <drawrectangle x="0" y="{areaheight} * {offset} / 1000" width="100%" height="{areaheight} * {height} / 1000" color="{progressbar}" />
+        </area>
+    </scrollbar>
+
     <!-- TAB EPGINFO -->
     <tab name="Info" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
         <drawtextbox condition="not{isseries}++not{ismovie}" name="shorttext" x="0" y="1%" width="96%" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{shorttext}" />
@@ -36,6 +37,7 @@
         <drawtextbox condition="{ismovie}" name="shorttextmovie" x="0" y="0" width="75%" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{shorttext}" />
         <drawtextbox condition="{ismovie}" x="0" y="{height(shorttextmovie)} + 5" width="96%" float="topright" floatwidth="{width(movieposter)} + 10" floatheight="{height(movieposter)} - {height(shorttextmovie)}" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{description}" />
     </tab>
+
     <!-- TAB RECINFO -->
     <tab name="{tr(recinfo)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
         <drawtext align="center" y="0" name="title" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{tr(recinfo)}" />
@@ -47,6 +49,7 @@
         <drawtext name="line6" x="0" y="{posy(line5)} + {height(line5)} + 10" width="96%" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{tr(format)}: {recordingformat}" />
         <drawtext x="0" y="{posy(line6)} + {height(line6)} + 10" width="96%" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{tr(searchtimer)}: {searchtimer}" />
     </tab>
+
     <!-- TAB ACTORS -->
     <tab condition="{isseries}||{ismovie}" name="{tr(actors)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
         <drawtext align="center" name="title" y="0" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{tr(actors)}" />
@@ -56,6 +59,7 @@
             <drawtext align="center" y="{height(thumb)} + 10 + {height(actorname)}" width="{columnwidth}" font="{regular}" fontsize="{areaheight}*{detailactors}/100" color="{fontdefault}" text="{actors[role]}" />
         </loop>
     </tab>
+
     <!-- TAB TVDBINFO -->
     <tab condition="{isseries}" name="TvDBInfo" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
         <drawimage name="banner" imagetype="image" path="{seriesbanner1path}" align="center" y="10" width="{areawidth}*0.7" height="{areawidth} * 0.7 * {seriesbanner1height} / {seriesbanner1width}"/>
@@ -63,11 +67,13 @@
         <drawimage name="seasonposter" imagetype="image" path="{seasonposterpath}" x="{areawidth}*0.7" y="{height(banner)} + {height(episodeimage)} + 30" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {seasonposterheight} / {seasonposterwidth}"/>
         <drawtextbox x="0" y="{height(banner)} + 20" width="96%" float="topright" floatwidth="{width(seasonposter)} + 10" floatheight="{height(episodeimage)} + {height(seasonposter)} + 30" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{tr(episode)}: {episodetitle} ({tr(season)} {episodeseason}, {tr(episode)} {episodenumber}) &#10;&#10;{episodeoverview}|&#10;&#10;{tr(gueststars)}: {episodegueststars}||&#10;&#10;{tr(seriesfirstaired)}: {seriesfirstaired}||&#10;{tr(episodefirstaired)}: {episodefirstaired}||&#10;{tr(network)}: {seriesnetwork}||&#10;{tr(genre)}: {seriesgenre}||&#10;{tr(status)}: {seriesstatus}||&#10;{tr(rating)}: {seriesrating}||&#10;{tr(episoderating)}: {episoderating}&#10;|{seriesoverview}&#10;" />
     </tab>
+
     <!-- TAB MOVIEDBINFO -->
     <tab condition="{ismovie}" name="MovieDBInfo" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
         <drawimage name="poster" imagetype="image" path="{posterpath}" x="70%" y="10" width="{areawidth}*0.3" height="{areawidth} * 0.3 * {posterheight} / {posterwidth}"/>
         <drawtextbox x="0" y="10" width="96%" float="topright" floatwidth="{width(poster)} + 10" floatheight="{height(poster)} + 20" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{tr(originaltitle)}: {movieoriginalTitle}&#10;&#10;|{tr(genre)}: {moviegenres}&#10;&#10;||{movietagline}&#10;&#10;|{movieoverview}&#10;&#10;|{tr(budget)}: {moviebudget}&#10;||{tr(revenue)}: {movierevenue}&#10;&#10;||{tr(adult)}: {movieadult}&#10;||{tr(releasedate)}: {moviereleasedate}&#10;||{tr(runtime)}: {movieruntime} min&#10;||&#10;{tr(popularity)}: {moviepopularity}&#10;||&#10;{tr(voteaverage)}: {movievoteaverage}&#10;||&#10;{tr(homepage)}: {moviehomepage}|&#10;" />
     </tab>
+
     <!-- TAB SERIESGALERY -->
     <tab condition="{isseries}" name="{tr(seriesgalery)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}*0.61">
         <drawimage name="banner1" imagetype="image" path="{seriesbanner1path}" align="center" y="{areaheight}/2 - {height(banner1)}/2" width="{areawidth}*0.9" height="{areawidth} * 0.9 * {seriesbanner1height} / {seriesbanner1width}"/>       
@@ -81,13 +87,14 @@
         <drawimage name="poster2" imagetype="image" path="{seriesposter2path}" x="20" y="6*{areaheight}" width="{areaheight} * 0.95 * {seriesposter2width} / {seriesposter2height}" height="{areaheight} * 0.95"/>
         <drawimage name="poster3" imagetype="image" path="{seriesposter3path}" x="{areawidth} - {width(poster3)} - 20" y="6*{areaheight}" width="{areaheight} * 0.95 * {seriesposter3width} / {seriesposter3height}" height="{areaheight} * 0.95"/>
     </tab>
+
     <!-- TAB MOVIEGALERY -->
     <tab condition="{ismovie}" name="{tr(moviegalery)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}*0.61">
         <drawimage name="fanart" imagetype="image" path="{fanartpath}" align="center" y="10" width="{areaheight} * 0.95 * {fanartwidth} / {fanartheight}" height="{areaheight} * 0.95"/>
         <drawimage name="poster" imagetype="image" path="{posterpath}" align="center" y="{areaheight}" width="{areaheight} * 0.95 * {posterwidth} / {posterheight}" height="{areaheight} * 0.95"/>
         <drawimage condition="{movieiscollection}" name="collectionfanart" imagetype="image" path="{collectionfanartpath}" align="center" y="2*{areaheight}" width="{areaheight} * 0.95 * {collectionfanartwidth} / {collectionfanartheight}" height="{areaheight} * 0.95"/>
         <drawimage condition="{movieiscollection}" name="collectionposter" imagetype="image" path="{collectionposterpath}" align="center" y="3*{areaheight}" width="{areaheight} * 0.95 * {collectionposterwidth} / {collectionposterheight}" height="{areaheight} * 0.95"/>
-    </tab>
+	</tab>
 
     <tablabels>
         <area x="2%" y="85%" width="{areawidth} - 60" height="6%" layer="3">

From 4500b62b5c545035d50c64af4e1535c5567cce80 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Mon, 25 Jan 2021 16:05:35 +0100
Subject: [PATCH 6/6] Version 1.2.10

---
 HISTORY | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index 07eb0e3..d19b6a2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -465,5 +465,6 @@ Version 1.2.9
 Version 1.2.10
 - [pbiering] added tokens for recordings: isUHD, isRadio
 - [pbiering] added token for channels: isUHD
-- [pbiering] expose to displaymenurecordings: recchannelname, recchannelid, recchannelnumber
-- [pbiering] add fallback to get name/id from 'info' in case channel is no longer in active channel list
+- [pbiering] expose to displaymenurecordings: recchannelname, recchannelid
+- [pbiering] retrieve ChannelName from 'info' and fallback via ChannelID from active channel list
+- [kamel5] Update skin estuary4vdr