adapted blackhole xml files to setup parameters

7 files changed, 40 insertions, 9 deletions

diff --git a/skins/metrixhd/setup.xml b/skins/metrixhd/setup.xml
new file mode 100644
index 0000000..52bde41
--- /dev/null
+++ b/skins/metrixhd/setup.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE setup SYSTEM "../../dtd/setup.dtd">
+
+<setup>
+    <!--
+    define all your parameters here which should be configurable via
+    OSD and the skindesigner setup menu.
+    Parameters must have type "bool" or "integer". For "bool" Parameters
+    a choice yes/no is shown in the setup menu, a "integer" parameter
+    can be configured to a value between "min" and "max". If "min" is not
+    set, "0" is the minimum, if "max" is not set, "1000" is maximum.
+    "displayname" is used to display the option in the setup menu.
+    The configured parameter value is the default value.
+    -->
+    <parameters>
+        <parameter type="int" name="fadetime" min="0" max="1000" displaytext="{tr(fadetext)}">0</parameter>
+        <parameter type="bool" name="showdevices" displaytext="{tr(showdevices)}">0</parameter>
+    </parameters>
+
+    <!--
+    translations of displaytexts
+    -->
+    <translations>
+        <token name="tr(fadetext)">
+            <trans lang="en_EN">Fade time in ms (needs VDR restart)</trans>
+            <trans lang="de_DE">Einblendzeit in ms (erfordert VDR Neustart)</trans>
+        </token>
+        <token name="tr(showdevices)">
+            <trans lang="en_EN">Show DVB device info when switching channel</trans>
+            <trans lang="de_DE">DVB Karten Info beim Umschalten anzeigen</trans>
+        </token>
+    </translations>
+</setup>
diff --git a/skins/metrixhd/themes/default/globals.xml b/skins/metrixhd/themes/default/globals.xml
index 1eae5f1..1ce4251 100644
--- a/skins/metrixhd/themes/default/globals.xml
+++ b/skins/metrixhd/themes/default/globals.xml
@@ -25,8 +25,6 @@
     set such a variable to 1 for true and 0 for false
     -->
     <variables>
-        <var type="int" name="border">5</var>
-        <var type="int" name="fadeTime">0</var>
         <var type="string" name="stringglobal">hützligrütz</var>
         <var type="double" name="pi">3.14</var>
     </variables>
diff --git a/skins/metrixhd/xmlfiles/displayaudiotracks.xml b/skins/metrixhd/xmlfiles/displayaudiotracks.xml
index f37983d..8c5af98 100644
--- a/skins/metrixhd/xmlfiles/displayaudiotracks.xml
+++ b/skins/metrixhd/xmlfiles/displayaudiotracks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayaudiotracks SYSTEM "../../../dtd/displayaudiotracks.dtd">
 
-<displayaudiotracks x="25%" y="0" width="50%" height="100%" fadetime="{fadeTime}">
+<displayaudiotracks x="25%" y="0" width="50%" height="100%" fadetime="{fadetime}">
     <!-- Available Variables background:
     {numtracks}                     number of displayed tracks 
     -->
diff --git a/skins/metrixhd/xmlfiles/displaychannel.xml b/skins/metrixhd/xmlfiles/displaychannel.xml
index a7b33af..3c63a18 100644
--- a/skins/metrixhd/xmlfiles/displaychannel.xml
+++ b/skins/metrixhd/xmlfiles/displaychannel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displaychannel SYSTEM "../../../dtd/displaychannel.dtd">
 
-<displaychannel x="0" y="0" width="100%" height="100%" fadetime="{fadeTime}">
+<displaychannel x="0" y="0" width="100%" height="100%" fadetime="{fadetime}">
     <background>
         <!-- background infobar -->
         <area x="0" y="80%" width="100%" height="20%" layer="1">
@@ -197,10 +197,10 @@
     {devices[source]}           source of the currently tuned channel
     -->
     <devices>
-        <area x="70%" y="30%" width="30%" height="{areaheight}/12 * {numdevices}" layer="1">
+        <area condition="{showdevices}" x="70%" y="30%" width="30%" height="{areaheight}/12 * {numdevices}" layer="1">
             <fill color="{clrTransBlack}"/>
         </area>
-        <area x="70%" y="30%" width="30%" height="{areaheight}/12 * {numdevices}" layer="2">
+        <area condition="{showdevices}" x="70%" y="30%" width="30%" height="{areaheight}/12 * {numdevices}" layer="2">
             <loop name="devices" x="0" y="0" orientation="vertical" columnwidth="{areawidth}" rowheight="{areaheight} / {numdevices}" overflow="cut">
                 <drawtext name="label" x="5" y="0" font="{light}" fontsize="{rowheight}*0.35" color="{clrWhite}" text="{devices[num]}: {devices[type]}" />
                 <drawtext condition="{devices[hascam]}" x="{width(label)} + 15" y="0" font="{light}" fontsize="{rowheight}*0.35" color="{clrWhite}" text="(CAM {devices[cam]})" />
diff --git a/skins/metrixhd/xmlfiles/displaymessage.xml b/skins/metrixhd/xmlfiles/displaymessage.xml
index e872e95..0ff98b2 100644
--- a/skins/metrixhd/xmlfiles/displaymessage.xml
+++ b/skins/metrixhd/xmlfiles/displaymessage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!DOCTYPE displaymessage SYSTEM "../../../dtd/displaymessage.dtd">

 

-<displaymessage x="5%" y="80%" width="90%" height="15%" fadetime="{fadeTime}">

+<displaymessage x="5%" y="80%" width="90%" height="15%" fadetime="{fadetime}">

     <background>

         <area x="0" y="0" width="100%" height="100%" layer="1">

             <fill color="{clrTransBlack}" />

diff --git a/skins/metrixhd/xmlfiles/displayreplay.xml b/skins/metrixhd/xmlfiles/displayreplay.xml
index 889d51b..8853fad 100644
--- a/skins/metrixhd/xmlfiles/displayreplay.xml
+++ b/skins/metrixhd/xmlfiles/displayreplay.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayreplay SYSTEM "../../../dtd/displayreplay.dtd">
 
-<displayreplay x="0" y="0" width="100%" height="100%" fadetime="{fadeTime}">
+<displayreplay x="0" y="0" width="100%" height="100%" fadetime="{fadetime}">
     <background>
         <!-- background infobar -->
         <area x="0" y="80%" width="100%" height="20%" layer="1">
diff --git a/skins/metrixhd/xmlfiles/displayvolume.xml b/skins/metrixhd/xmlfiles/displayvolume.xml
index 6811d67..604f7e5 100644
--- a/skins/metrixhd/xmlfiles/displayvolume.xml
+++ b/skins/metrixhd/xmlfiles/displayvolume.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayvolume SYSTEM "../../../dtd/displayvolume.dtd">
 
-<displayvolume x="20%" y="75%" width="60%" height="20%" fadetime="{fadeTime}">
+<displayvolume x="20%" y="75%" width="60%" height="20%" fadetime="{fadetime}">
     <background>
         <area x="0" y="0" width="100%" height="100%" layer="1">
             <fill color="{clrTransBlack}" />