Merge branch 'master' of /git/enigma2

diff --combined data/skin_default.xml
index 0192d80,582a169..6efa969
--- 1/data/skin_default.xml
--- 2/data/skin_default.xml
+++ b/data/skin_default.xml
@@@ -109,7 -109,7 +109,7 @@@
                </widget>
        </screen>
        <!-- Channel selection - Radio -->
-       <screen name="ChannelSelectionRadio" position="center,center" size="560,298" title="Channel Selection">
+       <screen name="ChannelSelectionRadio" position="center,95" size="560,298" title="Channel Selection">
                <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
                <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
                <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
@@@ -655,10 -655,18 +655,10 @@@ self.instance.move(ePoint(orgpos.x() + 
                <widget name="key0" position="132,92" size="130,30" font="Console;12" halign="center" valign="center" />
                <widget name="help2" position="262,92" size="130,30" font="Console;16" halign="center" valign="center" />
        </screen>
 -      <!-- Parental control - change pin -->
 -      <screen name="ParentalControlChangePin" position="center,center" size="520,160" title="Change pin code">
 -              <widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
 -      </screen>
        <!-- Parental control - editor -->
        <screen name="ParentalControlEditor" position="center,center" size="520,400" title="Parental control services Editor">
                <widget name="servicelist" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
        </screen>
 -      <!-- Parental control - setup -->
 -      <screen name="ParentalControlSetup" position="center,center" size="520,400" title="Parental control setup">
 -              <widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
 -      </screen>
        <!-- Picture in picture -->
        <screen name="PictureInPicture" position="400,60" zPosition="-1" size="240,192" flags="wfNoBorder">
                <widget name="video" position="0,0" size="240,192" backgroundColor="transparent" />
@@@ -692,7 -700,7 +692,7 @@@
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" />
        </screen>
        <!-- Radio infobar -->
-       <screen name="RadioInfoBar" position="85,408" size="560,120" zPosition="-1" title="Radio">
+       <screen name="RadioInfoBar" position="center,408" size="560,120" zPosition="-1" title="Radio">
                <widget source="session.CurrentService" render="Label" position="5,1" size="325,26" font="Regular;20" noWrap="1" transparent="1">
                        <convert type="ServiceName">Name</convert>
                </widget>
@@@ -853,11 -861,14 +853,11 @@@
        </screen>
        <!-- Setup -->
        <screen name="Setup" position="center,center" size="560,430" title="Setup">
 -              <widget name="cancel" pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
 -              <widget name="ok" pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
 -              <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
 -              <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
 -              <widget name="canceltext" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
 -              <widget name="oktext" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
 -              <widget name="title" position="10,45" size="280,35" font="Regular;23" />
 -              <widget name="config" position="10,95" size="540,325" scrollbarMode="showOnDemand" />
 +              <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
 +              <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
 +              <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
 +              <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 name="config" position="5,50" size="550,325" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Simple channelselection -->
        <screen name="SimpleChannelSelection" position="center,center" size="560,430" title="Channel Selection">
@@@ -1096,9 -1107,9 +1096,9 @@@
        </screen>
        <!-- LCD screen (setup) -->
        <screen name="SetupSummary" position="0,0" size="132,64">
 -              <widget name="SetupTitle" position="6,0" size="120,16" font="Regular;12" />
 -              <widget name="SetupEntry" position="6,16" size="120,32" font="Regular;12" />
 -              <widget name="SetupValue" position="6,48" size="120,16" font="Regular;12" />
 +              <widget source="SetupTitle" render="Label" position="6,0" size="120,16" font="Regular;12" />
 +              <widget source="SetupEntry" render="Label" position="6,16" size="120,32" font="Regular;12" />
 +              <widget source="SetupValue" render="Label" position="6,48" size="120,16" font="Regular;12" />
        </screen>
        <!-- LCD screen (misc) -->
        <screen name="SimpleSummary" position="0,0" size="132,64">
@@@ -1159,12 -1170,12 +1159,12 @@@
                <widget name="text" position="12,35" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right" />
                <widget name="list" position="10,100" size="540,225" selectionDisabled="1" transparent="1" />
        </screen>
 -      <!-- VideoSetup (VideoMode Plugin) -->
 -      <screen name="VideoSetup" position="center,center" size="560,430" title="VideoSetup">
 +      <!-- FileBrowser -->
 +      <screen name="FileBrowser" position="center,center" size="520,430" title="DVD File Browser" >
                <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
                <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
                <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
                <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 name="config" position="5,50" size="550,325" scrollbarMode="showOnDemand" />
 +              <widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" />
        </screen>
  </skin>