fix typo

diff --git a/vxdcontrol/src/data/channelselector-full-hor.xml b/vxdcontrol/src/data/channelselector-full-hor.xml
index 70ae642..18c5d7e 100644 (file)
--- a/vxdcontrol/src/data/channelselector-full-hor.xml
+++ b/vxdcontrol/src/data/channelselector-full-hor.xml
@@ -16,7 +16,7 @@
                <widget backgroundColor="#254177" font="Regular;18" halign="center" name="key_blue" position="467,40" size="140,40" transparent="1" valign="center" zPosition="2"/>
                <widget colorServiceDescription = "#FA9F43" colorEventProgressbar="#888888" colorEventProgressbarSelected="#fcc000" colorEventProgressbarBorder="#555555" colorEventProgressbarBorderSelected="grey" foregroundColorServiceNotAvail="#5a5a5a" itemHeight="28" name="list" position="50,85" scrollbarMode="showNever" serviceInfoFont="Regular;20" serviceNameFont="Regular;21" serviceNumberFont="Regular;21" size="810,364"/>
                <widget font="Replacement;19" foregroundColor="secondFG" halign="center" position="620,50" render="Label" size="354,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
                <widget font="Regular;18" halign="left" position="880,140" render="Label" size="70,22" source="ServiceEvent" transparent="1" zPosition="2">
                        <convert type="EventTime">EndTime</convert>
@@ -54,7 +54,7 @@
                </widget>
                <widget itemHeight="28" name="list" position="50,120" scrollbarMode="showOnDemand" size="924,420"/>
                <widget font="Replacement;19" foregroundColor="secondFG" halign="center" position="620,61" render="Label" size="346,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
        </screen>
        

diff --git a/vxdcontrol/src/data/channelselector-full-vert.xml b/vxdcontrol/src/data/channelselector-full-vert.xml
index 2a154f2..a336edd 100644 (file)
--- a/vxdcontrol/src/data/channelselector-full-vert.xml
+++ b/vxdcontrol/src/data/channelselector-full-vert.xml
@@ -16,7 +16,7 @@
                <widget backgroundColor="#254177" font="Regular;18" halign="center" name="key_blue" position="467,40" size="140,40" transparent="1" valign="center" zPosition="2"/>
                <widget colorServiceDescription = "#FA9F43" colorEventProgressbar="#888888" colorEventProgressbarSelected="#fcc000" colorEventProgressbarBorder="#555555" colorEventProgressbarBorderSelected="grey" foregroundColorServiceNotAvail="#5a5a5a" itemHeight="28" name="list" position="50,100" scrollbarMode="showNever" serviceInfoFont="Regular;18" serviceNameFont="Replacement;20" serviceNumberFont="Replacement;20" size="600,450"/>
                <widget font="Replacement;16" foregroundColor="secondFG" halign="center" position="620,50" render="Label" size="346,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;18" halign="left" position="660,125" render="Label" size="51,22" source="ServiceEvent" transparent="1" zPosition="2">
                        <convert type="EventTime">StartTime</convert>
@@ -49,7 +49,7 @@
                </widget>
                <widget itemHeight="28" name="list" position="50,120" scrollbarMode="showOnDemand" size="924,420"/>
                <widget font="Replacement;19" foregroundColor="secondFG" halign="center" position="620,61" render="Label" size="346,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
        </screen>
        

diff --git a/vxdcontrol/src/data/channelselector-simple.xml b/vxdcontrol/src/data/channelselector-simple.xml
index 77626c4..a0da018 100644 (file)
--- a/vxdcontrol/src/data/channelselector-simple.xml
+++ b/vxdcontrol/src/data/channelselector-simple.xml
@@ -16,7 +16,7 @@
                <widget backgroundColor="#254177" font="Regular;18" halign="center" name="key_blue" position="467,52" size="140,40" transparent="1" valign="center" zPosition="2"/>
                <widget colorServiceDescription = "#aaaaaa" colorEventProgressbar="#888888" colorEventProgressbarSelected="#fcc000" colorEventProgressbarBorder="#555555" colorEventProgressbarBorderSelected="grey" foregroundColorServiceNotAvail="#5a5a5a" itemHeight="28" name="list" position="50,95" scrollbarMode="showNever" serviceInfoFont="Regular;20" serviceNameFont="Regular;21" serviceNumberFont="Regular;21" size="800,448"/>
                <widget font="Replacement;19" foregroundColor="secondFG" halign="center" position="620,61" render="Label" size="346,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
                <widget font="Regular;18" halign="left" position="880,180" render="Label" size="70,22" source="ServiceEvent" transparent="1" zPosition="2">
                        <convert type="EventTime">EndTime</convert>
@@ -50,7 +50,7 @@
                </widget>
                <widget itemHeight="28" name="list" position="50,120" scrollbarMode="showOnDemand" size="924,420"/>
                <widget font="Replacement;19" foregroundColor="secondFG" halign="center" position="620,61" render="Label" size="346,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
        </screen>
        

diff --git a/vxdcontrol/src/data/main.xml b/vxdcontrol/src/data/main.xml
index 07a5185..9b47f0c 100644 (file)
--- a/vxdcontrol/src/data/main.xml
+++ b/vxdcontrol/src/data/main.xml
@@ -69,7 +69,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="Replacement;21" foregroundColor="foreground" halign="center" position="165,19" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -773,7 +773,7 @@ self.instance.move(ePoint((1024-wsizex)/2, (576-wsizey)/2))
                        <convert type="ClockToText">Format:(%A)</convert>
                </widget>
                <widget font="Regular;20" foregroundColor="secondFG" halign="right" position="676,496" render="Label" size="296,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
        </screen>
        
@@ -792,7 +792,7 @@ self.instance.move(ePoint((1024-wsizex)/2, (576-wsizey)/2))
                <widget font="Regular;22" name="duration" position="265,492" size="186,30"/>
                <widget font="Regular;22" name="channel" position="490,492" size="485,30"/>
                <widget font="Replacement;19" foregroundColor="secondFG" halign="center" position="620,61" render="Label" size="346,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
                <eLabel backgroundColor="darkgrey" position="50,485" size="924,2" zPosition="5"/>
        </screen>
@@ -811,7 +811,7 @@ self.instance.move(ePoint((1024-wsizex)/2, (576-wsizey)/2))
                <widget alphatest="on" name="more_button_sel" pixmap="Vali-XD/border/epg_more.png" position="660,65" size="310,25" zPosition="1"/>
                <widget itemHeight="28" name="list" position="50,99" scrollbarMode="showOnDemand" size="924,420"/>
                <widget font="Regular;18" foregroundColor="secondFG" halign="right" position="655,40" render="Label" size="296,24" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
                <eLabel backgroundColor="darkgrey" position="50,90" size="920,2" zPosition="5"/>
        </screen>
@@ -843,7 +843,7 @@ self.instance.move(ePoint((1024-wsizex)/2, (576-wsizey)/2))
                <widget backgroundColor="#266926" font="Regular;18" halign="center" name="oktext" position="187,52" size="140,40" transparent="1" valign="center" zPosition="2"/>
                <widget name="config" position="50,94" scrollbarMode="showOnDemand" size="924,426"/>
                <widget font="Replacement;19" foregroundColor="secondFG" halign="center" position="620,61" render="Label" size="346,26" source="global.CurrentTime" transparent="1" zPosition="2">
-                       <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                </widget>
        </screen>
        
@@ -1021,7 +1021,7 @@ self.instance.move(ePoint((1024-wsizex)/2, (576-wsizey)/2))
                        <eLabel backgroundColor="noTransBG" position="700,0" size="330,576" zPosition="0"/>
                        <eLabel backgroundColor="noTransBG" position="0,400" size="710,176" zPosition="-1"/>
                        <widget backgroundColor="noTransBG" font="Regular;16" foregroundColor="foreground" halign="left" noWrap="1" position="740,50" render="Label" size="231,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                               <convert type="vhdConvClockToText">LocaleLang:%w %d %m</convert>
+                               <convert type="vConvClockToText">LocaleLang:%w %d %m</convert>
                        </widget>
                        <widget backgroundColor="noTransBG" font="Regular;22" halign="center" position="135,405" render="Label" size="450,50" source="session.CurrentService" valign="center">
                                <convert type="ServiceName">Name</convert>
@@ -1061,7 +1061,7 @@ self.instance.move(ePoint((1024-wsizex)/2, (576-wsizey)/2))
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget font="Regular;16" foregroundColor="grey" halign="center" position="50,515" render="Label" size="150,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="375,449" size="420,12" zPosition="5"/>
                <widget name="PositionGauge" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="385,449" size="400,12" transparent="1" zPosition="4"/>
@@ -1257,7 +1257,7 @@ self.instance.move(ePoint((1024-wsizex)/2, (576-wsizey)/2))
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/oled-8000.xml b/vxdcontrol/src/data/oled-8000.xml
index 1fb1aa2..f6da571 100644 (file)
--- a/vxdcontrol/src/data/oled-8000.xml
+++ b/vxdcontrol/src/data/oled-8000.xml
@@ -67,7 +67,7 @@
                        <convert type="ClockToText">Default</convert>
                </widget>
                <widget font="Regular;16" halign="center" position="0,41" render="Label" size="132,23" source="global.CurrentTime">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
        </screen>
        

diff --git a/vxdcontrol/src/data/skin-atlantis-picon.xml b/vxdcontrol/src/data/skin-atlantis-picon.xml
index cf22df0..24336fd 100644 (file)
--- a/vxdcontrol/src/data/skin-atlantis-picon.xml
+++ b/vxdcontrol/src/data/skin-atlantis-picon.xml
@@ -80,7 +80,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="28,125" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="left" position="230,55" render="Label" size="501,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -206,7 +206,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,124" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,64" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -251,7 +251,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,124" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,64" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-atlantis.xml b/vxdcontrol/src/data/skin-atlantis.xml
index 4746d0a..d83722d 100644 (file)
--- a/vxdcontrol/src/data/skin-atlantis.xml
+++ b/vxdcontrol/src/data/skin-atlantis.xml
@@ -77,7 +77,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,125" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="center" position="165,56" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -159,7 +159,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,124" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,64" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -204,7 +204,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,124" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,64" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-avalon.xml b/vxdcontrol/src/data/skin-avalon.xml
index 643aec0..5219bac 100644 (file)
--- a/vxdcontrol/src/data/skin-avalon.xml
+++ b/vxdcontrol/src/data/skin-avalon.xml
@@ -76,7 +76,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="background" font="Regular;16" foregroundColor="secondFG" halign="center" position="55,86" render="Label" size="102,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="secondBG" font="OLED;21" foregroundColor="foreground" halign="left" noWrap="1" position="200,16" render="Label" size="471,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>

diff --git a/vxdcontrol/src/data/skin-base-picon.xml b/vxdcontrol/src/data/skin-base-picon.xml
index b9e8cbf..d0d67b0 100644 (file)
--- a/vxdcontrol/src/data/skin-base-picon.xml
+++ b/vxdcontrol/src/data/skin-base-picon.xml
@@ -74,7 +74,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="28,95" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="left" position="230,18" render="Label" size="506,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -202,7 +202,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -244,7 +244,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-base.xml b/vxdcontrol/src/data/skin-base.xml
index b852b34..6991c97 100644 (file)
--- a/vxdcontrol/src/data/skin-base.xml
+++ b/vxdcontrol/src/data/skin-base.xml
@@ -71,7 +71,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="center" position="165,17" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -155,7 +155,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -197,7 +197,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-beyonddreams-picon.xml b/vxdcontrol/src/data/skin-beyonddreams-picon.xml
index c69f0a5..89ad302 100644 (file)
--- a/vxdcontrol/src/data/skin-beyonddreams-picon.xml
+++ b/vxdcontrol/src/data/skin-beyonddreams-picon.xml
@@ -80,7 +80,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,95" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#4A5058" font="OLED;21" foregroundColor="foreground" halign="left" position="230,16" render="Label" size="501,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -206,7 +206,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="#580A0A" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -246,7 +246,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="#580A0A" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-beyonddreams.xml b/vxdcontrol/src/data/skin-beyonddreams.xml
index aebd552..86080b5 100644 (file)
--- a/vxdcontrol/src/data/skin-beyonddreams.xml
+++ b/vxdcontrol/src/data/skin-beyonddreams.xml
@@ -77,7 +77,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="#580A0A" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#4A5058" font="OLED;21" foregroundColor="foreground" halign="center" position="165,19" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -159,7 +159,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="#580A0A" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -199,7 +199,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="#580A0A" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-blues-picon.xml b/vxdcontrol/src/data/skin-blues-picon.xml
index 6e8f371..37c81a0 100644 (file)
--- a/vxdcontrol/src/data/skin-blues-picon.xml
+++ b/vxdcontrol/src/data/skin-blues-picon.xml
@@ -79,7 +79,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="35,106" render="Label" size="120,27" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="Regular;24" foregroundColor="foreground" halign="left" position="230,22" render="Label" size="411,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -198,7 +198,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="25,90" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">
@@ -242,7 +242,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="25,90" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">

diff --git a/vxdcontrol/src/data/skin-blues.xml b/vxdcontrol/src/data/skin-blues.xml
index f1be92f..8a04cec 100644 (file)
--- a/vxdcontrol/src/data/skin-blues.xml
+++ b/vxdcontrol/src/data/skin-blues.xml
@@ -76,7 +76,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="35,55" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="left" position="180,24" render="Label" size="500,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -154,7 +154,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="25,90" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">
@@ -198,7 +198,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="25,90" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">

diff --git a/vxdcontrol/src/data/skin-glas-picon.xml b/vxdcontrol/src/data/skin-glas-picon.xml
index 01b9f12..f893b5b 100644 (file)
--- a/vxdcontrol/src/data/skin-glas-picon.xml
+++ b/vxdcontrol/src/data/skin-glas-picon.xml
@@ -80,7 +80,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,104" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="Replacement;23" foregroundColor="foreground" halign="left" position="230,27" render="Label" size="500,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -205,7 +205,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">
@@ -250,7 +250,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>       
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">

diff --git a/vxdcontrol/src/data/skin-glas.xml b/vxdcontrol/src/data/skin-glas.xml
index 3336266..100d0f4 100644 (file)
--- a/vxdcontrol/src/data/skin-glas.xml
+++ b/vxdcontrol/src/data/skin-glas.xml
@@ -77,7 +77,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,101" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="center" position="165,27" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -158,7 +158,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">
@@ -203,7 +203,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>       
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">

diff --git a/vxdcontrol/src/data/skin-metalpad-picon.xml b/vxdcontrol/src/data/skin-metalpad-picon.xml
index 64c117d..6054b1a 100644 (file)
--- a/vxdcontrol/src/data/skin-metalpad-picon.xml
+++ b/vxdcontrol/src/data/skin-metalpad-picon.xml
@@ -199,7 +199,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="grey" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,17" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -239,7 +239,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="grey" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,17" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-metalpad.xml b/vxdcontrol/src/data/skin-metalpad.xml
index b686be2..409598d 100644 (file)
--- a/vxdcontrol/src/data/skin-metalpad.xml
+++ b/vxdcontrol/src/data/skin-metalpad.xml
@@ -73,7 +73,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="grey" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="center" position="165,13" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -155,7 +155,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="grey" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,17" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -195,7 +195,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="grey" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,17" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-shadow-picon.xml b/vxdcontrol/src/data/skin-shadow-picon.xml
index a4ff6a2..e5260d5 100644 (file)
--- a/vxdcontrol/src/data/skin-shadow-picon.xml
+++ b/vxdcontrol/src/data/skin-shadow-picon.xml
@@ -80,7 +80,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,104" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="Replacement;23" foregroundColor="foreground" halign="left" position="230,27" render="Label" size="500,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -205,7 +205,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">
@@ -250,7 +250,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>       
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">

diff --git a/vxdcontrol/src/data/skin-shadow.xml b/vxdcontrol/src/data/skin-shadow.xml
index ec8ec32..3065d0a 100644 (file)
--- a/vxdcontrol/src/data/skin-shadow.xml
+++ b/vxdcontrol/src/data/skin-shadow.xml
@@ -77,7 +77,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,101" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="center" position="165,27" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -158,7 +158,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">
@@ -203,7 +203,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>       
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">

diff --git a/vxdcontrol/src/data/skin-shadow2-picon.xml b/vxdcontrol/src/data/skin-shadow2-picon.xml
index 200cf45..037fc4a 100644 (file)
--- a/vxdcontrol/src/data/skin-shadow2-picon.xml
+++ b/vxdcontrol/src/data/skin-shadow2-picon.xml
@@ -80,7 +80,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="35,103" render="Label" size="120,27" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="Regular;24" foregroundColor="foreground" halign="left" position="230,25" render="Label" size="455,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -200,7 +200,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">
@@ -245,7 +245,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>       
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">

diff --git a/vxdcontrol/src/data/skin-shadow2.xml b/vxdcontrol/src/data/skin-shadow2.xml
index 8e156d0..afb9ac3 100644 (file)
--- a/vxdcontrol/src/data/skin-shadow2.xml
+++ b/vxdcontrol/src/data/skin-shadow2.xml
@@ -77,7 +77,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,101" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="left" position="165,27" render="Label" size="522,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -156,7 +156,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">
@@ -201,7 +201,7 @@
                        <convert type="ClockToText">Format:%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>       
                <ePixmap alphatest="blend" pixmap="Vali-XD/dvr/mpslider.png" position="302,89" size="420,12" zPosition="5"/>
                <widget backgroundColor="background" pointer="Vali-XD/dvr/position_pointer_mp.png:6,1" position="312,89" render="PositionGauge" size="400,12" source="session.CurrentService" transparent="1" zPosition="4">

diff --git a/vxdcontrol/src/data/skin-validator-picon.xml b/vxdcontrol/src/data/skin-validator-picon.xml
index 8c506b7..a3518db 100644 (file)
--- a/vxdcontrol/src/data/skin-validator-picon.xml
+++ b/vxdcontrol/src/data/skin-validator-picon.xml
@@ -80,7 +80,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="28,95" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="left" position="230,16" render="Label" size="501,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -206,7 +206,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -246,7 +246,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-validator.xml b/vxdcontrol/src/data/skin-validator.xml
index c95dc2b..989e005 100644 (file)
--- a/vxdcontrol/src/data/skin-validator.xml
+++ b/vxdcontrol/src/data/skin-validator.xml
@@ -77,7 +77,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="center" position="165,19" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -159,7 +159,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -199,7 +199,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,91" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,19" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-vision-picon.xml b/vxdcontrol/src/data/skin-vision-picon.xml
index 5df55a4..c872081 100644 (file)
--- a/vxdcontrol/src/data/skin-vision-picon.xml
+++ b/vxdcontrol/src/data/skin-vision-picon.xml
@@ -80,7 +80,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="28,125" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="left" position="230,54" render="Label" size="501,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -206,7 +206,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,124" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,64" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -251,7 +251,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,124" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,64" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>

diff --git a/vxdcontrol/src/data/skin-vision.xml b/vxdcontrol/src/data/skin-vision.xml
index 662ece4..6ec9301 100644 (file)
--- a/vxdcontrol/src/data/skin-vision.xml
+++ b/vxdcontrol/src/data/skin-vision.xml
@@ -77,7 +77,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,125" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="background" font="OLED;21" foregroundColor="foreground" halign="center" position="165,56" render="Label" size="694,28" source="session.CurrentService" transparent="1" zPosition="3">
                        <convert type="ServiceName">Name</convert>
@@ -159,7 +159,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,124" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,64" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="1" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>
@@ -204,7 +204,7 @@
                        <convert type="ClockToText">Format::%S</convert>
                </widget>
                <widget backgroundColor="secondBG" font="Regular;16" foregroundColor="secondFG" halign="center" position="30,124" render="Label" size="120,22" source="global.CurrentTime" transparent="1" zPosition="3">
-                       <convert type="vhdConvClockToText">LocaleKurz:%w %d %m</convert>
+                       <convert type="vConvClockToText">LocaleKurz:%w %d %m</convert>
                </widget>
                <widget backgroundColor="#0444444a" pointer="Vali-XD/dvr/position_pointer.png:572,0" position="330,64" render="PositionGauge" size="420,12" source="session.CurrentService" transparent="0" zPosition="4">
                        <convert type="ServicePosition">Gauge</convert>