Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental

diff --combined data/skin_default.xml
index 396515e,497d33a..9fb2fc2
--- 1/data/skin_default.xml
--- 2/data/skin_default.xml
+++ b/data/skin_default.xml
@@@ -62,47 -62,8 +62,47 @@@
                <widget name="statuspic" pixmaps="skin_default/buttons/button_green.png,skin_default/buttons/button_green_off.png" position="130,380" zPosition="10" size="15,16" transparent="1" alphatest="on"/>
        </screen>
        <!-- Audio selection -->
 -      <screen name="AudioSelection" position="center,center" size="300,170" title="Audio">
 -              <widget name="tracks" position="20,10" size="260,150" scrollbarMode="showOnDemand" />
 +      <screen name="AudioSelection" position="center,center" size="420,330" title="Audio">
 +              <widget name="config" position="50,10" size="360,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>
 +              
 +              <ePixmap pixmap="skin_default/div-h.png" position="10,112" zPosition="10" size="360,2" />
 +
 +              <widget source="streams" render="Listbox" scrollbarMode="showOnDemand" position="10,120" size="400,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,
 +                                              MultiContentEntryText(pos = (40, 0),  size = (55, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 2), # number,
 +                                              MultiContentEntryText(pos = (100, 0), size = (80, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 3), # description,
 +                                              MultiContentEntryText(pos = (190, 0), size = (140, 25), font = 0, flags = RT_HALIGN_LEFT,  text = 4), # language,
 +                                              MultiContentEntryText(pos = (340, 4), size = (60, 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,
 +                                              MultiContentEntryText(pos = (40, 0),  size = (55, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 2), # number,
 +                                              MultiContentEntryText(pos = (100, 0), size = (80, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 3), # description,
 +                                              MultiContentEntryText(pos = (190, 0), size = (140, 25), font = 0, flags = RT_HALIGN_LEFT,  text = 4), # language,
 +                                              MultiContentEntryText(pos = (340, 4), size = (60, 25),  font = 1, flags = RT_HALIGN_RIGHT, text = 5), # selection,
 +                                      ], False, "showNever")
 +                                      },
 +                              "fonts": [gFont("Regular", 20), gFont("Regular", 16)],
 +                              "itemHeight": 25
 +                              }
 +                      </convert>
 +              </widget>
        </screen>
        <!-- Bouquet selector -->
        <screen name="BouquetSelector" position="center,center" size="300,240" title="Choose bouquet">
@@@ -616,7 -577,19 +616,19 @@@ self.instance.move(ePoint(orgpos.x() + 
                <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 name="list" position="5,50" size="550,280" scrollbarMode="showOnDemand" zPosition="10"/>
+               <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>
                <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>
@@@ -974,9 -947,9 +986,9 @@@
                </widget>
        </screen>
        <!-- Subtitle selection -->
 -      <screen name="Subtitles" position="center,center" size="380,285" title="Subtitle selection">
 +<!--  <screen name="Subtitles" position="center,center" size="380,285" title="Subtitle selection">
                <widget name="config" position="10,10" zPosition="1" size="360,275" scrollbarMode="showOnDemand" />
 -      </screen>
 +      </screen>-->
        <!-- Subtitle area -->
        <screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" />
        <!-- TextBox -->