From 8ebb3610daadd3bde8c3eb205a2a129096e7a4a7 Mon Sep 17 00:00:00 2001
From: kamel5 <vdr.kamel5 (at) gmx (dot) net>
Date: Sat, 18 Apr 2020 13:52:15 +0200
Subject: [PATCH] Updated xml files

---
 skins/estuary4vdr/xmlfiles/displaymenu.xml    |  6 ++--
 .../xmlfiles/displaymenudetailepg.xml         |  4 +--
 .../xmlfiles/plug-tvguideng-detail.xml        | 10 +++---
 .../xmlfiles/plug-tvguideng-recmenu.xml       |  8 ++---
 .../xmlfiles/plug-tvguideng-root.xml          | 36 +++++++++++++------
 .../xmlfiles/plug-tvguideng-recmenu.xml       |  2 +-
 6 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/skins/estuary4vdr/xmlfiles/displaymenu.xml b/skins/estuary4vdr/xmlfiles/displaymenu.xml
index 86aea64..6de97f9 100644
--- a/skins/estuary4vdr/xmlfiles/displaymenu.xml
+++ b/skins/estuary4vdr/xmlfiles/displaymenu.xml
@@ -24,9 +24,9 @@
 
     <header>
         <area x="1%" y="0" width="60%" height="7%" layer="2">
-            <drawtext condition="not{hasicon}" x="0" valign="center" fontsize="{areaheight}*{headerfontsize}/100" font="{regular}" color="{fontdefault}" text="{title}" />
+            <drawtext condition="not{hasicon}" x="7%" valign="center" fontsize="{areaheight}*{headerfontsize}/100" font="{regular}" color="{fontdefault}" text="{title}" />
             <drawimage condition="{hasicon}" name="icon" imagetype="menuicon" path="{icon}" x="0" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
-            <drawtext condition="{hasicon}" x="{posx(icon)} + {width(icon)} + 20" valign="center" fontsize="{areaheight}*{headerfontsize}/100" font="{regular}" color="{fontdefault}" text="{title}" />
+            <drawtext condition="{hasicon}" x="{posx(icon)} + {width(icon)}*2 + 25" valign="center" fontsize="{areaheight}*{headerfontsize}/100" font="{regular}" color="{fontdefault}" text="{title}" />
         </area>
     </header>
 
@@ -58,7 +58,7 @@
     </message>
 
     <sortmode>
-        <area x="33%" y="1%" width="5%" height="5%" layer="4">
+        <area x="4%" y="1%" width="5%" height="5%" layer="4">
             <drawimage condition="{sortnumber}" imagetype="icon" path="ico_sort_number" x="0" y="0" width="100%" height="100%"/>
             <drawimage condition="{sortname}" imagetype="icon" path="ico_sort_name" x="0" y="0" width="100%" height="100%"/>
             <drawimage condition="{sorttime}" imagetype="icon" path="ico_sort_time" x="0" y="0" width="100%" height="100%"/>
diff --git a/skins/estuary4vdr/xmlfiles/displaymenudetailepg.xml b/skins/estuary4vdr/xmlfiles/displaymenudetailepg.xml
index ef0b0d9..452a85e 100644
--- a/skins/estuary4vdr/xmlfiles/displaymenudetailepg.xml
+++ b/skins/estuary4vdr/xmlfiles/displaymenudetailepg.xml
@@ -40,7 +40,7 @@
     </tab>
     <!-- TAB RERUNS -->
     <tab condition="{hasreruns}" name="{tr(reruns)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
-        <drawtext align="center" y="1%" name="title" font="{regular}" fontsize="8%" color="{fontdefault}" text="{tr(rerunsof)} '{title}'" />
+        <drawtext align="center" y="1%" name="title" font="{regular}" fontsize="8%" color="{fontdefault}" text="{hasreruns} {tr(rerunsof)} '{title}'" />
         <loop name="reruns" x="0" y="{height(title)} + 30" width="{areawidth}" rowheight="3%" orientation="vertical">
             <drawimage name="logo" condition="{reruns[channellogoexists]}" imagetype="channellogo" path="{reruns[channelid]}" x="0" width="10%" height="8%" />
             <drawtext name="channelname" condition="not{reruns[channellogoexists]}" x="-5" font="{regular}" fontsize="{areaheight}*{detailactors}/100" color="{fontdefault}" text="{reruns[channelname]}" />
@@ -106,4 +106,4 @@
             </loop>
         </area>
     </tablabels>
-</menudetailedepg>
\ No newline at end of file
+</menudetailedepg>
diff --git a/skins/estuary4vdr/xmlfiles/plug-tvguideng-detail.xml b/skins/estuary4vdr/xmlfiles/plug-tvguideng-detail.xml
index 2805de0..a2be30e 100644
--- a/skins/estuary4vdr/xmlfiles/plug-tvguideng-detail.xml
+++ b/skins/estuary4vdr/xmlfiles/plug-tvguideng-detail.xml
@@ -165,18 +165,18 @@
     <tab name="EPG 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}" />
         <drawtextbox condition="not{isseries}++not{ismovie}" x="0" y="{posy(shorttext)} + {height(shorttext)} + 5" width="96%" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{description}" />
-
+        <!-- Serie -->
         <drawimage condition="{isseries}" name="seriesbanner" imagetype="image" path="{seriesbanner1path}" x="{areawidth}*0.5" y="0" width="{areawidth}*0.5" height="{areawidth} * 0.5 * {seriesbanner1height} / {seriesbanner1width}"/>
         <drawtextbox condition="{isseries}" name="shorttext" x="0" y="0" width="49%" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{shorttext}" />
-        <drawtextbox condition="{isseries}" x="0" y="{height(shorttext)} + 5" width="96%" float="topright" floatwidth="{areawidth}*0.5" floatheight="{areawidth} * 0.5 * {seriesbanner1height} / {seriesbanner1width} - {height(shorttext)}" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{description}" />
-
+        <drawtextbox condition="{isseries}" x="0" y="{posy(shorttext)} + {height(shorttext)} + 5" width="96%" float="topright" floatwidth="{areawidth}*0.5" floatheight="{areawidth} * 0.5 * {seriesbanner1height} / {seriesbanner1width} - {height(shorttext)}" font="{regular}" fontsize="{areaheight}*{detailtextsize}/100" color="{fontdefault}" text="{description}" />
+        <!-- Movie -->
         <drawimage condition="{ismovie}" name="movieposter" imagetype="image" path="{posterpath}" x="{areawidth}*0.8" y="0" width="{areawidth}*0.2" height="{areawidth} * 0.2 * {posterheight} / {posterwidth}" />
         <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 RERUNS -->
     <tab condition="{hasreruns}" name="{tr(reruns)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
-        <drawtext align="center" y="1%" name="title" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{tr(rerunsof)} '{title}'" />
+        <drawtext align="center" y="1%" name="title" font="{regular}" fontsize="{areaheight}*{detailtextheadersize}/100" color="{fontdefault}" text="{hasreruns} {tr(rerunsof)} '{title}'" />
         <loop name="reruns" x="0" y="{height(title)} + 30" width="{areawidth}" rowheight="3%" orientation="vertical">
             <drawimage name="logo" condition="{reruns[channellogoexists]}" imagetype="channellogo" path="{reruns[channelid]}" x="0" width="10%" height="8%" />
             <drawtext name="channelname" condition="not{reruns[channellogoexists]}" x="-5" font="{regular}" fontsize="{areaheight}*{detailactors}/100" color="{fontdefault}" text="{reruns[channelname]}" />
@@ -185,7 +185,7 @@
         </loop>
     </tab>
     <!-- TAB ACTORS -->
-    <tab condition="{isseries}||{ismovie}" name="{tr(actors)}" x="3%" y="23%" width="94%" height="61%" layer="4" scrollheight="{areaheight}/4">
+    <tab condition="{isseries}||{ismovie}++{isactors}" 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)}" />
         <loop name="actors" x="0" y="{height(title)} + 10" width="{areawidth}" orientation="horizontal" columnwidth="{areawidth}/7" rowheight="{areawidth}/7*1.65" overflow="linewrap" >
             <drawimage name="thumb" imagetype="image" path="{actors[thumb]}" x="20" y="0" width="{columnwidth}-40" height="{columnwidth} * {actors[thumbheight]} / {actors[thumbwidth]} - 40 * {actors[thumbheight]} / {actors[thumbwidth]}"/>
diff --git a/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml b/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
index dc0bf14..b3c9c0c 100644
--- a/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
+++ b/skins/estuary4vdr/xmlfiles/plug-tvguideng-recmenu.xml
@@ -254,9 +254,9 @@
         </area>
         <!-- Recording -->
         <area condition="{recording}" layer="6">
-            <drawtext condition="not{current}" x="1%" y="0" font="{regular}" width="98%" fontsize="50%" color="{fontdefault}" text="{recname}" />
+            <drawtext condition="not{current}" x="1%" y="40%" font="{regular}" width="98%" fontsize="50%" color="{fontdefault}" text="{recname}" />
             <drawtext condition="not{current}" x="55%" y="0" font="{regular}" width="98%" fontsize="35%" color="{fontdefault}" text="{recdate} {recstarttime} - {recduration} min, {channelname}" />
-            <drawtext condition="{current}" x="1%" y="0" font="{regular}" width="98%" fontsize="50%" color="{fontmenuactive}" text="{recname}" />
+            <drawtext condition="{current}" x="1%" y="40%" font="{regular}" width="98%" fontsize="50%" color="{fontmenuactive}" text="{recname}" />
             <drawtext condition="{current}" x="55%" y="0" font="{regular}" width="98%" fontsize="35%" color="{fontmenuactive}" text="{recdate} {recstarttime} - {recduration} min, {channelname}" />
         </area>
         <!-- Searchtimer -->
@@ -349,8 +349,8 @@
                 <drawrectangle x="5%" y="{areaheight}-1" width="90%" height="1" color="{menubackline}"/>
             </area>
             <area layer="6">
-                <drawrectangle condition="not{current}" x="{areawidth}*0.05 + {timerstart}*{areawidth}*0.9/1000" y="25%" width="{timerwidth}*{areawidth}*0.9/1000" height="50%" color="{fontmenuactive}"/>
-                <drawrectangle condition="{current}" x="{areawidth}*0.05 + {timerstart}*{areawidth}*0.9/1000" y="25%" width="{timerwidth}*{areawidth}*0.9/1000" height="50%" color="{fontdefault}"/>
+                <drawrectangle condition="not{current}" x="{areawidth}*0.05 + {timerstartpercent}*{areawidth}*0.9/1000" y="25%" width="{timerwidthpercent}*{areawidth}*0.9/1000" height="50%" color="{fontmenuactive}"/>
+                <drawrectangle condition="{current}" x="{areawidth}*0.05 + {timerstartpercent}*{areawidth}*0.9/1000" y="25%" width="{timerwidthpercent}*{areawidth}*0.9/1000" height="50%" color="{fontdefault}"/>
             </area>
         </areacontainer>
         <!-- Favorites -->
diff --git a/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml b/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
index bdf2cc3..ed217e3 100644
--- a/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
+++ b/skins/estuary4vdr/xmlfiles/plug-tvguideng-root.xml
@@ -3,6 +3,7 @@
 
 <displayplugin x="0" y="0" width="100%" height="100%" fadetime="0" scaletvx="0" scaletvy="0" scaletvwidth="100%" scaletvheight="100%">
 
+    <!--Hintergrund und Rahmen horizontal-->
     <viewelement name="background_hor">
         <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" />
@@ -15,12 +16,18 @@
             <drawrectangle x="2%" y="10%" width="96%" height="65%" color="{menuback}" />
             <drawrectangle x="17%" y="77%" width="73%" height="14%" color="{menuback}" />
             <drawrectangle x="5%" y="16%" width="2" height="59%" color="{menubackline}" />
-            <drawrectangle x="17%" y="16%" width="2" height="59%" color="{menubackline}" />
+            <!--senkrechte Linie zwischen Kanal und EPG-->
+            <!--<drawrectangle x="17%" y="16%" width="2" height="59%" color="{menubackline}" />-->
+            <!--horizontale Linie zwischen Timeline und EPG-->
             <drawrectangle x="2%" y="16%" width="96%" height="2" color="{menubackline}" />
-            <drawrectangle x="{areawidth}*0.98 - 3" y="14%" width="2" height="2%" color="{menubackline}" />
+            <!--senkrechte Linie rechts von Timeline-->
+            <drawrectangle x="{areawidth}*0.98 - 2" y="{areaheight}*0.14 - 1" width="2" height="{areaheight}*0.02 - 2" color="{menubackline}" />
+            <!--senkrechte Linie rechts vom EPG-->
+	    <drawrectangle x="{areawidth}*0.98 - 2" y="16%" width="2" height="59%" color="{menubackline}" />
         </area>
     </viewelement>
 
+    <!--Hintergrund und Rahmen vertikal-->
     <viewelement name="background_ver">
         <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" />
@@ -341,14 +348,15 @@
         </area>
     </viewelement>
 
+    <!--Timeline horizontal-->
     <grid name="timeline_hor" x="15%" y="11%" width="81%" height="5%">
         <area layer="3">
-            <drawrectangle x="{areawidth}*1/6-5" y="60%" width="2" height="40%" color="{menubackline}" />
-            <drawrectangle x="{areawidth}*2/6-5" y="80%" width="2" height="20%" color="{menubackline}" />
-            <drawrectangle x="{areawidth}*3/6-5" y="80%" width="2" height="20%" color="{menubackline}" />
-            <drawrectangle x="{areawidth}*4/6-5" y="70%" width="2" height="30%" color="{menubackline}" />
-            <drawrectangle x="{areawidth}*5/6-5" y="80%" width="2" height="20%" color="{menubackline}" />
-            <drawrectangle x="{areawidth}-5" y="80%" width="2" height="20%" color="{menubackline}" />
+            <drawrectangle x="{areawidth}*1/6-3" y="60%" width="2" height="40%" color="{menubackline}" />
+            <drawrectangle x="{areawidth}*2/6-3" y="80%" width="2" height="20%" color="{menubackline}" />
+            <drawrectangle x="{areawidth}*3/6-3" y="80%" width="2" height="20%" color="{menubackline}" />
+            <drawrectangle x="{areawidth}*4/6-3" y="70%" width="2" height="30%" color="{menubackline}" />
+            <drawrectangle x="{areawidth}*5/6-3" y="80%" width="2" height="20%" color="{menubackline}" />
+            <drawrectangle x="{areawidth}*6/6-3" y="80%" width="2" height="20%" color="{menubackline}" />
         </area>
         <area layer="4">
             <drawtext condition="not{fullhour}" x="2" y="0" fontsize="55%" font="{regular}" color="{fontdefault}" text="{timestring}" />
@@ -371,6 +379,7 @@
         </area>
     </grid>
 
+    <!--Kanäle horizontal-->
     <grid name="channels_hor" x="5%" y="16%" width="12%" height="59%">
         <area layer="3">
             <drawtext name="channum" x="{areawidth}*0.3 - {width(channum)}" valign="center" fontsize="50%" font="{regular}" color="{fontdefault}" text="{number}" />
@@ -403,24 +412,29 @@
         </area>
      </grid>
 
-    <grid name="schedules_hor" x="{areawidth}*0.17 + 2" y="16%" width="{areawidth}*0.81 - 1" height="59%">
+    <!--EPG horizontal-->
+    <grid name="schedules_hor" x="17%" y="16%" width="81%" height="59%">
         <area condition="{current}" layer="3">
             <fill color="{menubackactive}" />
         </area>
+        <!--EPG with time-->
         <area condition="{tvgshowtime}" layer="4">
             <drawtext condition="not{current}" x="10" width="96%" y="{areaheight}*{tvghorgriddateposy}/100" font="regular" color="{fontdefault}" fontsize="{areaheight}*{tvghorgriddatesize}/100" text="{start} - {stop}" />
             <drawtext condition="not{current}" x="10" width="96%" y="{areaheight}*{tvghorgridtitleposy}/100" font="regular" color="{fontdefault}" fontsize="{areaheight}*{tvghorgridtitlesize}/100" text="{title}" />
             <drawtext condition="{current}" x="10" width="96%" y="{areaheight}*{tvghorgriddateposy}/100" font="regular" color="{fontmenuactive}" fontsize="{areaheight}*{tvghorgriddatesize}/100" text="{start} - {stop}" />
             <drawtext condition="{current}" x="10" width="96%" y="{areaheight}*{tvghorgridtitleposy}/100" font="regular" color="{fontmenuactive}" fontsize="{areaheight}*{tvghorgridtitlesize}/100" text="{title}" />
+            <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}" />
+            <!--<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}" />
         </area>
+        <!--EPG without time-->		
         <area condition="not{tvgshowtime}" layer="4">
             <drawtext condition="not{current}" x="10" width="96%" valign="center" font="regular" color="{fontdefault}" fontsize="{areaheight}*{tvghorgridtitlesize}/100" text="{title}" />
             <drawtext condition="{current}" x="10" width="96%" valign="center"  font="regular" color="{fontmenuactive}" fontsize="{areaheight}*{tvghorgridtitlesize}/100" text="{title}" />
+            <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}" />
+            <!--<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}" />
         </area>
     </grid>
diff --git a/skins/metrixhd/xmlfiles/plug-tvguideng-recmenu.xml b/skins/metrixhd/xmlfiles/plug-tvguideng-recmenu.xml
index eae4767..b749fc6 100644
--- a/skins/metrixhd/xmlfiles/plug-tvguideng-recmenu.xml
+++ b/skins/metrixhd/xmlfiles/plug-tvguideng-recmenu.xml
@@ -280,7 +280,7 @@
                 <drawrectangle x="5%" y="{areaheight}-1" width="90%" height="1" color="{clrBlack}"/>
             </area>
             <area layer="6">
-                <drawrectangle x="{areawidth}*0.05 + {timerstart}*{areawidth}*0.9/1000" y="25%" width="{timerwidth}*{areawidth}*0.9/1000" height="50%" color="{clrWhite}"/>
+                <drawrectangle x="{areawidth}*0.05 + {timerstartpercent}*{areawidth}*0.9/1000" y="25%" width="{timerwidthpercent}*{areawidth}*0.9/1000" height="50%" color="{clrWhite}"/>
             </area>
         </areacontainer>
         <area condition="{favorite}" layer="6">