experimentally merge audio + subtitle streams selection dialogs into one

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index aceafd73278243c1cf0427fde3024b5088d9b40f..edf61357a0fccbedac18a038ab9c6a50ff0dab70 100755 (executable)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -65,6 +65,20 @@
        <screen name="AudioSelection" position="center,center" size="560,330" title="Audio">
                <widget name="config" position="50,10" size="500,110" scrollbarMode="showOnDemand" />
                
+               <widget source="key_red" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="10,10" size="35,25" alphatest="on">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="key_green" render="Pixmap" pixmap="skin_default/buttons/key_green.png" position="10,35" size="35,25" alphatest="on">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="key_yellow" render="Pixmap" pixmap="skin_default/buttons/key_yellow.png" position="10,60" size="35,25" alphatest="on">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="key_blue" render="Pixmap" pixmap="skin_default/buttons/key_blue.png" position="10,85" size="35,25" alphatest="on">
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               
+               
                <widget source="key_red" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="10,10" size="35,25" alphatest="on">
                        <convert type="ConditionalShowHide" />
                </widget>
@@ -80,7 +94,12 @@
                
                <ePixmap pixmap="skin_default/div-h.png" position="10,112" zPosition="10" size="540,2" />
 
+
                <widget source="streams" render="Listbox" scrollbarMode="showOnDemand" position="10,120" size="540,200" zPosition="3" transparent="1" >
+                       <convert type="TemplatedMultiContent">
+                               {"templates":
+                                       {"default": (25, [ 
+                                               MultiContentEntryText(pos = (0, 0),   size = (35, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 1), # key,
                        <convert type="TemplatedMultiContent">
                                {"templates":
                                        {"default": (25, [ 
@@ -90,6 +109,9 @@
                                                MultiContentEntryText(pos = (240, 0), size = (200, 25), font = 0, flags = RT_HALIGN_LEFT,  text = 4), # language,
                                                MultiContentEntryText(pos = (450, 4), size = (90, 25),  font = 1, flags = RT_HALIGN_RIGHT, text = 5), # selection,
                                        ], True, "showNever"),
+                                       "notselected": (25, [ 
+                                               MultiContentEntryText(pos = (0, 0),   size = (35, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 1), # key,
+                                       ], True, "showNever"),
                                        "notselected": (25, [ 
                                                MultiContentEntryText(pos = (0, 0),   size = (35, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 1), # key,
                                                MultiContentEntryText(pos = (40, 0),  size = (60, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 2), # number,
@@ -102,6 +124,13 @@
                                "itemHeight": 25
                                }
                        </convert>
+               </widget>
+                                       ], False, "showNever")
+                                       },
+                               "fonts": [gFont("Regular", 20), gFont("Regular", 16)],
+                               "itemHeight": 25
+                               }
+                       </convert>
                </widget>
        </screen>
        <!-- Bouquet selector -->
@@ -616,19 +645,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
                <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
                <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget source="list" render="Listbox" position="5,50" size="550,280" zPosition="10" scrollbarMode="showOnDemand">
-                       <convert type="TemplatedMultiContent"> <!--  iface, name, description, interfacepng, defaultpng, activepng, divpng  -->
-                               {"template": [
-                                               MultiContentEntryText(pos = (85, 6), size = (440, 28), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_TOP, text = 1), # index 1 is the interfacename
-                                               MultiContentEntryText(pos = (85, 43), size = (440, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_BOTTOM, text = 2), # index 2 is the description
-                                               MultiContentEntryPixmapAlphaTest(pos = (2, 8), size = (54, 54), png = 3), # index 3 is the interface pixmap
-                                               MultiContentEntryPixmapAlphaTest(pos = (63, 46), size = (15, 16), png = 4), # index 4 is the default pixmap
-                                       ],
-                               "fonts": [gFont("Regular", 28),gFont("Regular", 20)],
-                               "itemHeight": 70
-                               }
-                       </convert>
-               </widget>
+               <widget name="list" position="5,50" size="550,280" scrollbarMode="showOnDemand" zPosition="10"/>
                <ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2" />
                <widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
        </screen>