changes for skindesigner 0.8.0

louisbraun · Jan 26, 2016 · 493922b · 493922b
1 parent 3ed6cea
commit 493922b
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 59 deletions.
diff --git a/xmlfiles/displaychannel.xml b/xmlfiles/displaychannel.xml
@@ -96,20 +96,17 @@
     {remaining}                        Remaining time of current Schedule in seconds
     -->
     <progressbar>
+        <area background="true" x="17%" y="80%" width="81%" height="2%" layer="2">
+            <drawellipse x="0" y="0" width="{areaheight}" height="{areaheight}" color="{clrBlack}" quadrant="0" />
+            <drawellipse x="{areawidth}-{areaheight}" y="0" width="{areaheight}" height="{areaheight}" color="{clrBlack}" quadrant="0" />
+            <drawrectangle x="{areaheight}/2" y="0" width="{areawidth} - {areaheight}" height="{areaheight}" color="{clrBlack}" />
+        </area>
         <area x="17%" y="80%" width="81%" height="2%" layer="2">
             <drawellipse x="1" y="1" width="{areaheight}-2" height="{areaheight}-2" color="{clrProgressbar}" quadrant="0" />
             <drawellipse x="1 + {elapsed}/{duration}*{areawidth} - {elapsed}/{duration}*{areaheight}" y="1" width="{areaheight}-2" height="{areaheight}-2" color="{clrProgressbar}" quadrant="0" />
             <drawrectangle x="{areaheight}/2" y="1" width="{elapsed}/{duration}*{areawidth} - {elapsed}/{duration}*{areaheight}" height="{areaheight}-2" color="{clrProgressbar}" />
         </area>
     </progressbar>
-
-    <progressbarback>
-        <area x="17%" y="80%" width="81%" height="2%" layer="2">
-            <drawellipse x="0" y="0" width="{areaheight}" height="{areaheight}" color="{clrBlack}" quadrant="0" />
-            <drawellipse x="{areawidth}-{areaheight}" y="0" width="{areaheight}" height="{areaheight}" color="{clrBlack}" quadrant="0" />
-            <drawrectangle x="{areaheight}/2" y="0" width="{areawidth} - {areaheight}" height="{areaheight}" color="{clrBlack}" />
-        </area>
-    </progressbarback>
     <!-- Available Variables statusinfo:
     {isRadio}                          true if channel is a radio channel
     {hasVT}                            true if channel has video text   
@@ -174,20 +171,16 @@
     {signalquality}                     SNR value of currently displayed channel
     -->
     <signalquality>
+        <area background="true" x="17%" y="95%" width="15%" height="4%" layer="2">
+            <drawimage imagetype="skinpart" path="signal" x="0" y="0" width="100%" height="45%"/>
+            <drawimage imagetype="skinpart" path="signal" x="0" y="50%" width="100%" height="45%"/>
+        </area>
         <area x="17%" y="95%" width="15%" height="4%" layer="3">
             <drawrectangle x="{areawidth}*{signalstrength}/100" y="0" width="{areawidth} - {areawidth}*{signalstrength}/100" height="45%" color="{clrTransBlack}" />
             <drawrectangle x="{areawidth}*{signalquality}/100" y="50%" width="{areawidth} - {areawidth}*{signalquality}/100" height="45%" color="{clrTransBlack}" />
         </area>
     </signalquality>
 
-    <!-- background of signalmeter, will only be drawn if signalquality was deleted -->
-    <signalqualityback>
-        <area x="17%" y="95%" width="15%" height="4%" layer="2">
-            <drawimage imagetype="skinpart" path="signal" x="0" y="0" width="100%" height="45%"/>
-            <drawimage imagetype="skinpart" path="signal" x="0" y="50%" width="100%" height="45%"/>
-        </area>
-    </signalqualityback>
-
     <!-- Available Variables scrapercontent:
     {mediapath}                         Full Path of Poster or Banner to use in image path attribute
     {mediawidth}                        width of image in pixel
@@ -218,7 +211,7 @@
             <drawimage condition="{error}" imagetype="skinpart" path="messageError" x="0" y="0" width="100%" height="100%" />
         </area>
         <area x="5%" y="88%" width="90%" height="10%" layer="7">
-            <drawtext align="center" valign="center" font="{light}" fontsize="50%" color="{clrWhite}" text="{text}" />
+            <drawtext align="center" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrWhite}" text="{text}" />
         </area>
     </message>
 

diff --git a/xmlfiles/displaymenu.xml b/xmlfiles/displaymenu.xml
@@ -81,7 +81,7 @@
             <drawimage condition="{error}" imagetype="skinpart" path="messageError" x="0" y="0" width="100%" height="100%" />
         </area>
         <area x="5%" y="80%" width="90%" height="15%" layer="7">
-            <drawtext align="center" valign="center" font="{light}" fontsize="40%" color="{clrWhite}" text="{text}" />
+            <drawtext align="center" valign="center" font="{vdrOsd}" fontsize="40%" color="{clrWhite}" text="{text}" />
         </area>
     </message>
     <!-- Available Variables colorbuttons:

diff --git a/xmlfiles/displaymenuchannels.xml b/xmlfiles/displaymenuchannels.xml
@@ -117,7 +117,7 @@
                 <drawtextbox x="51%" y="{posy(titlenext)} + {height(titlenext)} + 10" width="48%" height="{areaheight} - {posy(titlenext)} - {height(titlenext)} - 10" font="{vdrOsd}" fontsize="5%" color="{clrWhite}" text="{nexteventshorttext}&#10;&#10;{nexteventdescription}" />
             </area>
             <areascroll mode="forthandback" orientation="vertical" delay="1000" scrollspeed="medium" x="32%" y="78%" width="67%" height="20%" layer="2">
-                <drawtext x="10" y="0" font="{semibold}" fontsize="20%" color="{clrWhite}" text="{tr(nextschedules)}:" />
+                <drawtext x="10" y="0" font="{vdrOsd}" fontsize="20%" color="{clrWhite}" text="{tr(nextschedules)}:" />
                 <loop name="schedule" x="0" y="{areaheight}/4 + 5" orientation="vertical">
                     <drawtext x="10" font="{vdrOsd}" width="{areawidth}-20" fontsize="19%" color="{clrWhite}" text="{schedule[start]} {schedule[title]}" />
                 </loop>

diff --git a/xmlfiles/displaymenudefault.xml b/xmlfiles/displaymenudefault.xml
@@ -44,7 +44,7 @@
                 <drawimage condition="{current}" imagetype="skinpart" path="menubuttondefaultactive" x="0" y="1%" width="{areawidth}" height="{areaheight}*0.98"/>
             </area>
             <areascroll scrollelement="column1" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="1%" width="{column1width}" layer="3">
-                <drawtext condition="not{current}" name="column1" x="{column1x}" width="{column1width}" valign="center" font="{vdrOsd}" fontsize="90%" color="{clrFontMenuItem}" text="{column1}" />
+                <drawtext condition="not{current}" x="{column1x}" width="{column1width}" valign="center" font="{vdrOsd}" fontsize="90%" color="{clrFontMenuItem}" text="{column1}" />
                 <drawtext condition="{current}" name="column1" x="{column1x}" width="{column1width}" valign="center" font="{vdrOsd}" fontsize="90%" color="{clrFontMenuItemSelected}" text="{column1}" />
             </areascroll>
             <area x="1%" width="100%" layer="3">

diff --git a/xmlfiles/displaymenudetailtext.xml b/xmlfiles/displaymenudetailtext.xml
@@ -19,7 +19,7 @@
     {text}                    detailed text
     -->
     <tab name="text" x="2%" y="11%" width="94%" height="79%" layer="2" scrollheight="{areaheight}/4">
-        <drawtextbox x="0" y="0" width="100%" font="{light}" fontsize="5%" color="{clrWhite}" text="{text}" />
+        <drawtextbox x="0" y="0" width="100%" font="{vdrOsd}" fontsize="5%" color="{clrWhite}" text="{text}" />
     </tab>
 
 </menudetailedtext>
diff --git a/xmlfiles/displaymenumain.xml b/xmlfiles/displaymenumain.xml
@@ -28,7 +28,7 @@
     {timers[channelid]}          ChannelID of channel
     {timers[channellogoexists]}  true if channel logo exists
     -->
-    <timers detached="true" delay="100" fadetime="0">
+    <timers>
         <area x="85%" y="28%" width="14%" height="60%" layer="1">
             <drawrectangle condition="gt({numtimers}, 0)" x="0" y="0" width="{areawidth}" height="{areaheight} / 4 * 99 / 100" color="{clrTransBlack}" />
             <drawrectangle condition="gt({numtimers}, 1)" x="0" y="{areaheight} / 4" width="{areawidth}" height="{areaheight} / 4 * 99 / 100" color="{clrTransBlack}" />
@@ -61,7 +61,7 @@
     {discalert}               true if disc usage is > 95%
     {vdrusagestring}          localized VDR internal usage string
     -->
-    <discusage detached="true" delay="100" fadetime="0">
+    <discusage>
         <area background="true" x="89%" y="11%" width="10%" height="16%" layer="1">
             <fill condition="lt({freepercent}, 6)" color="{clrTransRed}" />
             <fill condition="gt({freepercent}, 5)" color="{clrBackground}" />
@@ -75,7 +75,7 @@
         </area>        
     </discusage>
 
-    <currentweather detached="true" delay="100" fadetime="0">
+    <currentweather>
         <area background="true" x="63%" y="11%" width="25%" height="16%" layer="1">
             <fill color="{clrBackground}"/>
         </area>
@@ -135,7 +135,7 @@
                 <drawimage imagetype="menuicon" path="{icon}" x="10" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
             </area>
             <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="23%" width="77%" layer="3">
-                <drawtext condition="not{current}" name="menutext" x="0" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItem}" text="{number} {label}" />
+                <drawtext condition="not{current}" x="0" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItem}" text="{number} {label}" />
                 <drawtext condition="{current}" name="menutext" x="0" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItemSelected}" text="{number} {label}" />
             </areascroll>
         </listelement>

diff --git a/xmlfiles/displaymenurecordings.xml b/xmlfiles/displaymenurecordings.xml
@@ -21,7 +21,7 @@
         {numrecordingsfolder}   if item is a folder, number of recordings in this folder
         {newrecordingsfolder}   if item is a folder, number of new recordings in this folder
         {hasposterthumbnail}    true if a scraped poster thumbnail is available for recording
-        {thumbnailbwidth}       width of scraped poster thumbnail
+        {thumbnailwidth}       width of scraped poster thumbnail
         {thumbnailheight}       height of scraped poster thumbnail
         {thumbnailpath}         absolute path of scraped poster thumbnail
         -->
@@ -36,15 +36,15 @@
                 <drawimage name="foldericon" imagetype="icon" path="ico_recfolder" x="0" width="0.9*{areaheight} * 92 / 136" height="0.9*{areaheight}" valign="center" />
             </area>
             <areascroll condition="{folder}" scrollelement="foldername" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="5%" width="23%" layer="3">
-                <drawtext condition="not{current}" name="foldername" x="0" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItem}" text="{name} ({numrecordingsfolder}, {newrecordingsfolder} new)" />
+                <drawtext condition="not{current}" x="0" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItem}" text="{name} ({numrecordingsfolder}, {newrecordingsfolder} new)" />
                 <drawtext condition="{current}" name="foldername" x="0" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItemSelected}" text="{name} ({numrecordingsfolder}, {newrecordingsfolder} new)" />
             </areascroll>
             <!-- Recording -->
             <area condition="{hasposterthumbnail}++not{folder}" x="1%" width="4%" layer="3">
-                <drawimage imagetype="image" path="{thumbnailpath}" x="0" width="0.9*{areaheight} * {thumbnailbwidth} / {thumbnailheight}" height="0.9*{areaheight}" valign="center" />
+                <drawimage imagetype="image" path="{thumbnailpath}" x="0" width="0.9*{areaheight} * {thumbnailwidth} / {thumbnailheight}" height="0.9*{areaheight}" valign="center" />
             </area>
             <areascroll condition="not{folder}" scrollelement="recname" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="5%" width="23%" layer="3">
-                <drawtext condition="not{current}" name="recname" x="0" y="5" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItem}" text="{name}" />
+                <drawtext condition="not{current}" x="0" y="5" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItem}" text="{name}" />
                 <drawtext condition="{current}" name="recname" x="0" y="5" font="{vdrOsd}" fontsize="50%" color="{clrFontMenuItemSelected}" text="{name}" />
             </areascroll>
             <area condition="not{folder}" x="5%" width="23%" layer="3">

diff --git a/xmlfiles/displaymenuschedules.xml b/xmlfiles/displaymenuschedules.xml
@@ -224,7 +224,7 @@
                 <drawtextbox condition="not{hasposter}" x="10" y="{posy(poster)}" width="99%" height="{areaheight} - {posy(poster)}" font="{vdrOsd}" fontsize="{areaheight}/18" color="{clrWhite}" text="{description}" />
             </area>
             <areascroll condition="{whatsonnow}||{whatsonnext}" mode="forthandback" orientation="vertical" delay="1000" scrollspeed="medium" x="32%" y="78%" width="67%" height="20%" layer="2">
-                <drawtext x="10" y="0" font="{semibold}" fontsize="20%" color="{clrWhite}" text="{tr(nextschedules)}:" />
+                <drawtext x="10" y="0" font="{vdrOsd}" fontsize="20%" color="{clrWhite}" text="{tr(nextschedules)}:" />
                 <loop name="schedule" x="0" y="{areaheight}/4 + 5" orientation="vertical">
                     <drawtext x="10" font="{vdrOsd}" width="{areawidth}-20" fontsize="20%" color="{clrWhite}" text="{schedule[start]} {schedule[title]}" />
                 </loop>

diff --git a/xmlfiles/displaymessage.xml b/xmlfiles/displaymessage.xml
@@ -21,7 +21,7 @@
             <drawimage condition="{error}" imagetype="skinpart" path="messageError" x="0" y="0" width="100%" height="100%" />
         </area>
         <area x="5%" y="88%" width="90%" height="10%" layer="7">
-            <drawtext align="center" valign="center" font="{light}" fontsize="50%" color="{clrWhite}" text="{text}" />
+            <drawtext align="center" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrWhite}" text="{text}" />
         </area>
     </message>
 

diff --git a/xmlfiles/displayreplay.xml b/xmlfiles/displayreplay.xml
@@ -211,7 +211,7 @@
             <drawimage condition="{error}" imagetype="skinpart" path="messageError" x="0" y="0" width="100%" height="100%" />
         </area>
         <area x="5%" y="88%" width="90%" height="10%" layer="7">
-            <drawtext align="center" valign="center" font="{light}" fontsize="50%" color="{clrWhite}" text="{text}" />
+            <drawtext align="center" valign="center" font="{vdrOsd}" fontsize="50%" color="{clrWhite}" text="{text}" />
         </area>
     </message>