use TemplatedMultiContent for language selection

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index f6248b9890ad3d5a2a91a3524dd8edaeaeac1bb7..7cf15eeb13684cbc09cb0cca1a5154ee8d35b5de 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -23,8 +23,17 @@
        <!-- Adapter setup -->
        <screen name="AdapterSetup" position="130,140" size="460,330" title="Network Setup" >
                <widget name="iface" position="10,10" size="440,30" zPosition="1" font="Regular;20" />
-               <widget name="config" position="10,50" size="440,175" scrollbarMode="showOnDemand" />
-               <widget name="introduction" position="10,300" size="440,20" font="Regular;21" halign="center" />
+               <widget name="config" position="10,50" size="440,130" scrollbarMode="showOnDemand" />
+               <widget name="introduction" position="10,180" size="440,20" font="Regular;21" halign="center" />
+               <widget name="introduction2" position="10,210" size="440,20" font="Regular;21" halign="center" />
+               
+               <widget name="IPtext" position="10,240" size="190,21" zPosition="1" font="Regular;21" />
+               <widget name="Netmasktext" position="10,265" size="190,21" zPosition="1" font="Regular;21" />
+               <widget name="Gatewaytext" position="10,290" size="190,21" zPosition="1" font="Regular;21" />
+               
+               <widget name="IP" position="200,240" size="440,21" zPosition="1" font="Regular;21" />
+               <widget name="Mask" position="200,265" size="440,21" zPosition="1" font="Regular;21" />
+               <widget name="Gateway" position="200,290" size="440,21" zPosition="1" font="Regular;21" />
        </screen>
        <!-- Audio selection -->
        <screen name="AudioSelection" position="210,203" size="300,170" title="Audio" >
@@ -138,7 +147,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
                </applet>
        </screen>
        <!-- Common interface -->
-       <screen name="CiMmi" position="135,153" size="450,270" >
+       <screen name="MMIDialog" position="135,153" size="450,270" >
                <widget name="title" position="10,10" size="430,25" font="Regular;23" />
                <widget name="subtitle" position="10,35" size="430,25" font="Regular;23" />
                <widget name="entries" position="10,70" size="430,150" scrollbarMode="showOnDemand" />
@@ -149,10 +158,6 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
                <widget name="text" position="10,5" size="440,25" font="Regular;23" />
                <widget name="entries" position="10,45" size="420,100" scrollbarMode="showOnDemand" />
        </screen>
-       <!-- Common interface - wait -->
-       <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>
        <!-- Clock display -->
        <screen name="clockDisplay" position="300,100" size="300,300" >
                <widget name="okbutton" position="10,10" size="280,40" />
@@ -304,7 +309,15 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
        <!-- Language selection -->
        <screen name="LanguageSelection" position="200,150" size="320,300" title="Language selection" >
                <widget source="languages" render="Listbox" position="0,0" size="320,300" scrollbarMode="showOnDemand" >
-                       <convert type="StaticMultiList" />
+                       <convert type="TemplatedMultiContent">
+                               {"template": [
+                                               MultiContentEntryText(pos = (80, 10), size = (200, 50), flags = RT_HALIGN_LEFT, text = 1), # index 1 is the language name,
+                                               MultiContentEntryPixmap(pos = (10, 5), size = (60, 40), png = 2), # index 2 is the pixmap
+                                       ],
+                                "fonts": [gFont("Regular", 20)],
+                                "itemHeight": 50
+                               }
+                       </convert>
                </widget>
        </screen>
        <!-- Mediaplayer -->
@@ -575,7 +588,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="subpages_9" position="35,250" size="36,20" alphatest="on" />
        </screen>
        <!-- RDS info -->
-       <screen name="RdsInfoDisplay" position="0,0" zPosition="-2" size="720,568" backgroundColor="transparent" flags="wfNoBorder" >
+       <screen name="RdsInfoDisplay" position="0,0" zPosition="-2" size="720,576" backgroundColor="transparent" flags="wfNoBorder" >
                <widget name="RadioText" position="50,481" size="620,29" font="Regular;21" noWrap="1" backgroundColor="#003258" shadowOffset="-2,-2" shadowColor="transpBlack" />
                <widget name="RtpText" position="50,510" size="620,29" font="Regular;21" halign="right" noWrap="1" backgroundColor="#003258" shadowOffset="-2,-2" shadowColor="transpBlack" />
                <widget name="RassLogo" pixmap="rass_logo.png" position="50,445" size="50,21" />
@@ -675,8 +688,8 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="config" position="10,50" size="520,200" scrollbarMode="showOnDemand" />
                <widget name="cancel" pixmap="skin_default/key-red.png" position="10,265" zPosition="1" size="140,40" transparent="1" alphatest="on" />
                <widget name="ok" pixmap="skin_default/key-green.png" position="390,265" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-               <widget name="canceltext" position="10,265" zPosition="2" size="140,40" font="Regular;20" valign="center" halign="center" transparent="1" />
-               <widget name="oktext" position="390,265" zPosition="2" size="140,40" font="Regular;20" valign="center" halign="center" transparent="1" />
+               <widget name="canceltext" position="10,265" zPosition="2" size="140,40" font="Regular;20" valign="center" halign="center" transparent="1" backgroundColor="#d21c31" />
+               <widget name="oktext" position="390,265" zPosition="2" size="140,40" font="Regular;20" valign="center" halign="center" transparent="1" backgroundColor="#4da539" />
        </screen>
        <!-- Simple channelselection -->
        <screen name="SimpleChannelSelection" position="90,98" size="560,417" title="Channel Selection">
@@ -730,7 +743,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="config" position="10,10" size="405,325" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Subtitle area -->
-       <screen name="SubtitleDisplay" position="0,0" size="720,568" zPosition="-1" flags="wfNoBorder" />
+       <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" />
        <!-- Time & date input -->
        <screen name="TimeDateInput" position="160,150" size="400,200" title="Time/Date Input">
                <widget name="cancel" pixmap="skin_default/key-red.png" position="10,0" zPosition="1" size="140,40" alphatest="on" />
@@ -764,9 +777,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        <screen name="TimerEntry" position="90,95" size="560,430" title="Timer entry">
                <widget name="config" position="10,10" size="540,350" scrollbarMode="showOnDemand" />
                <widget name="cancel" pixmap="skin_default/key-red.png" position="10,380" zPosition="1" size="140,40" transparent="1" alphatest="on" />
+               <widget name="location" pixmap="skin_default/key-yellow.png" position="260,380" zPosition="1" size="140,40" transparent="1" alphatest="on" />
                <widget name="ok" pixmap="skin_default/key-green.png" position="410,380" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-               <widget name="canceltext" position="10,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" />
-               <widget name="oktext" position="410,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" />
+               <widget name="canceltext" position="10,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" backgroundColor="#9f1313" transparent="1" />
+               <widget name="locationtext" position="260,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" backgroundColor="#a08500" transparent="1" />
+               <widget name="oktext" position="410,380" zPosition="2" size="140,40" valign="center" halign="center" font="Regular;21" backgroundColor="#1f771f" transparent="1" />
        </screen>
        <!-- Timer log -->
        <screen name="TimerLog" position="70,100" size="560,400" title="Timer log">