add ability to choose "Multiple service support (auto/no/yes)" in Ci Setup

[vuplus_dvbapp] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 72f3467..041fb5c 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -4,7 +4,9 @@
        <screen name="Menu" position="210,150" size="300,265" title="Main menu">
                <widget name="title" position="10,10" size="280,35" font="Regular;23" />
                <!--<widget name="menu" position="10,55" size="280,150" font="Regular;23" />-->
-               <widget name="menu" position="10,55" size="290,205" scrollbarMode="showOnDemand" />
+               <widget source="menu" render="Listbox" position="10,55" size="290,205" scrollbarMode="showOnDemand" >
+                       <convert type="StringList" />
+               </widget>
        </screen>
        <screen name="BouquetSelector" position="210,150" size="300,195" title="Choose bouquet">
                <widget name="menu" position="10,10" size="280,175" scrollbarMode="showOnDemand" />
@@ -90,8 +92,8 @@
        <screen name="CiWait" position="180,263" size="360,50" title="Common Interface">
                <widget name="message" position="20,10" size="320,25" font="Regular;23" />
        </screen>
-       <screen name="CiSelection" position="180,238" size="360,100" title="Common Interface">
-               <widget name="entries" position="10,10" size="340,75" />
+       <screen name="CiSelection" position="140,226" size="440,125" title="Common Interface">
+               <widget name="entries" position="10,10" size="420,100" />
        </screen>
        <screen name="CiMmi" position="135,153" size="450,270">
                <widget name="title" position="10,10" size="430,25" font="Regular;23" />
@@ -112,7 +114,7 @@
                <widget name="footer" position="20,250" size="360,25" font="Regular;23"/>
                <!--<widget name="introduction" position="20,360" size="280,30" font="Regular;23" />-->
        </screen>
-       <screen name="TimerEntry" position="110,188" size="500,400" title="Timer entry">
+       <screen name="TimerEntry" position="110,88" size="500,400" title="Timer entry">
                <widget name="config" position="5,10" size="480,350" />
                <widget name="ok" position="140,365" size="53,30" pixmap="ok.png" />
                <widget name="oktext" position="140,365" size="53,30" valign="center" halign="center" zPosition="2" font="Regular;20" transparent="1" />
@@ -209,16 +211,39 @@
                <widget name="list" position="0,45" size="560,252" scrollbarMode="showOnDemand" />
        </screen>
        <screen name="RadioInfoBar" position="90,420" size="560,105" zPosition="-1">
-               <widget name="ServiceName" position="0,0" size="390,26" font="Regular;22" backgroundColor="dark" />
+               <widget source="CurrentService" render="Label" position="0,0" size="390,26" font="Regular;22" backgroundColor="dark" >
+                       <convert type="ServiceName">Name</convert>
+               </widget>
                <widget name="BlinkingPoint" pixmap="record.png" position="400,0" zPosition="2" size="58,25" />
-               <widget name="Clock" position="465,0" size="95,28" font="Regular;22" backgroundColor="dark" />
-               <widget name="Now_ProgressBar" position="465,27" size="90,9" zPosition="1" borderWidth="2" />
-               <widget name="Event_Now_StartTime" position="0,44" size="60,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Next_StartTime" position="0,74" size="60,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Now" position="80,44" size="380,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Next" position="80,74" size="380,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Now_Duration" position="470,44" size="150,22" font="Regular;20" backgroundColor="dark" />
-               <widget name="Event_Next_Duration" position="470,74" size="150,22" font="Regular;20" backgroundColor="dark" />
+               <widget source="CurrentTime" render="Label" position="465,0" size="95,28" font="Regular;22" backgroundColor="dark" >
+                       <convert type="ClockToText">WithSeconds</convert>
+               </widget>
+               <widget source="Event_Now" render="Progress" position="465,27" size="90,9" zPosition="1" borderWidth="2" >
+                       <convert type="EventTime">Progress</convert>
+               </widget>
+               <widget source="Event_Now" render="Label" position="0,44" size="60,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventTime">StartTime</convert>
+                       <convert type="ClockToText">Default</convert>
+               </widget>
+               <widget source="Event_Next" render="Label" position="0,74" size="60,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventTime">StartTime</convert>
+                       <convert type="ClockToText">Default</convert>
+               </widget>
+               <widget source="Event_Now" render="Label" position="80,44" size="380,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventName">Name</convert>
+               </widget>
+               <widget source="Event_Next" render="Label" position="80,74" size="380,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventName">Name</convert>
+               </widget>
+               
+               <widget source="Event_Now" render="Label" position="470,44" size="150,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventTime">Remaining</convert>
+                       <convert type="RemainingToText">InMinutes</convert>
+               </widget>
+               <widget source="Event_Next" render="Label" position="470,74" size="150,22" font="Regular;20" backgroundColor="dark" >
+                       <convert type="EventTime">Duration</convert>
+                       <convert type="ClockToText">InMinutes</convert>
+               </widget>
        </screen>
        <screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
                <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
@@ -334,7 +359,7 @@ newwidth = wsize[0]
                <widget name="apply" position="10,240" size="250,35" />
        </screen>
        <screen name="HelpMenu" flags="wfNoBorder" position="0,0" size="720,576" title="Menu">
-               <widget name="list" position="50,100" size="450,375" scrollbarMode="showOnDemand" />
+               <widget name="list" position="50,100" size="450,378" scrollbarMode="showOnDemand" />
                <widget name="rc" pixmap="rc.png" position="540,50" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
                <widget name="arrowup" pixmap="arrowup.png" position="585,425" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
                <eLabel position="400,40" size="220,60" text="help..." font="Regular;50" />
@@ -346,8 +371,10 @@ newwidth = wsize[0]
        <screen name="TimeshiftState" flags="wfNoBorder" position="70,70" size="150,60" backgroundColor="transpBlack" zPosition="2">
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" 
                        backgroundColor="transpBlack" foregroundColor="white" />
-               <widget name="timeshift" position="0,30" size="150,30" font="Regular;25" halign="center" 
-                       backgroundColor="transpBlack" foregroundColor="white" />
+               <widget source="CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" 
+                       backgroundColor="transpBlack" foregroundColor="white" >
+                       <convert type="ServicePosition">Remaining</convert>
+               </widget>
        </screen>
        <screen name="TimeDateInput" position="150,150" size="400,200" title="Time/Date Input">
                <widget name="config" position="5,10" size="380,150" />