dvbapp : TranscodingSetup update
[vuplus_openembedded] / recipes / enigma2 / enigma2 / vuplus / enigma2_vuplus_skin.patch
index a4ece7d..35e9752 100644 (file)
@@ -1,8 +1,8 @@
 diff --git a/configure.ac b/configure.ac
-index 4902a9c..5c74eda 100644
+index c0601c7..b2f460d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -109,6 +109,16 @@ data/skin_default/menu/Makefile
+@@ -134,6 +134,16 @@ data/skin_default/menu/Makefile
  data/skin_default/icons/Makefile
  data/skin_default/buttons/Makefile
  data/skin_default/spinner/Makefile
@@ -21,7 +21,7 @@ index 4902a9c..5c74eda 100644
  lib/actions/Makefile
 diff --git a/data/750S/Makefile.am b/data/750S/Makefile.am
 new file mode 100644
-index 0000000..a516e82
+index 0000000..7ac9481
 --- /dev/null
 +++ b/data/750S/Makefile.am
 @@ -0,0 +1,6 @@
@@ -33,7 +33,7 @@ index 0000000..a516e82
 +      *.xml *.png
 diff --git a/data/750S/buttons/Makefile.am b/data/750S/buttons/Makefile.am
 new file mode 100644
-index 0000000..eb83d1c
+index 0000000..db2e817
 --- /dev/null
 +++ b/data/750S/buttons/Makefile.am
 @@ -0,0 +1,6 @@
@@ -45,7 +45,7 @@ index 0000000..eb83d1c
 +      *.png
 diff --git a/data/750S/countries/Makefile.am b/data/750S/countries/Makefile.am
 new file mode 100644
-index 0000000..4517ada
+index 0000000..9c4bf9a
 --- /dev/null
 +++ b/data/750S/countries/Makefile.am
 @@ -0,0 +1,6 @@
@@ -57,7 +57,7 @@ index 0000000..4517ada
 +      *.png
 diff --git a/data/750S/icons/Makefile.am b/data/750S/icons/Makefile.am
 new file mode 100644
-index 0000000..9277cc5
+index 0000000..4686688
 --- /dev/null
 +++ b/data/750S/icons/Makefile.am
 @@ -0,0 +1,6 @@
@@ -69,7 +69,7 @@ index 0000000..9277cc5
 +      *.png
 diff --git a/data/750S/menu/Makefile.am b/data/750S/menu/Makefile.am
 new file mode 100644
-index 0000000..ff165af
+index 0000000..20f24d9
 --- /dev/null
 +++ b/data/750S/menu/Makefile.am
 @@ -0,0 +1,6 @@
@@ -80,11 +80,11 @@ index 0000000..ff165af
 +install_DATA = \
 +      *.png
 diff --git a/data/750S/skin.xml b/data/750S/skin.xml
-new file mode 100755
-index 0000000..7be3bca
+new file mode 100644
+index 0000000..3148751
 --- /dev/null
 +++ b/data/750S/skin.xml
-@@ -0,0 +1,2489 @@
+@@ -0,0 +1,2852 @@
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
@@ -505,7 +505,6 @@ index 0000000..7be3bca
 +      <!-- Adapter setup -->
 +      <screen name="AdapterSetup" position="110,115" size="500,415" title="Network Setup" >
 +              <ePixmap pixmap="750S/buttons/red.png" position="0,375" size="140,40" alphatest="on" />
-+              <ePixmap pixmap="750S/buttons/blue.png" position="360,375" size="140,40" alphatest="on" />
 +              <widget source="key_red" render="Label" position="20,375" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
 +              <widget source="key_blue" render="Label" position="380,375" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
 +
@@ -1088,6 +1087,7 @@ index 0000000..7be3bca
 +              <widget name="key_green" position="240,110" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
 +              <widget name="key_yellow" position="380,110" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
 +              <widget name="key_blue" position="520,110" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
++              <widget name="waitingtext" position="80,160" size="555,328" zPosition="4" font="Regular;22" halign="center" valign="center" />
 +              <widget name="list" position="80,160" size="555,328" zPosition="2" scrollbarMode="showOnDemand" transparent="1" />
 +              <widget name="DescriptionBorder" pixmap="750S/border_eventinfo.png" position="75,388" zPosition="1" size="560,103" transparent="1" alphatest="on" />
 +              <widget source="Service" render="Label" position="80,390" zPosition="1" size="480,35" font="Regular;17" foregroundColor="#cccccc">
@@ -1209,8 +1209,8 @@ index 0000000..7be3bca
 +              <widget name="number" position="145,15" size="80,25" halign="right" font="Regular;23" />
 +      </screen>
 +      <!-- Numerical help dialog -->
-+      <screen name="NumericalTextInputHelpDialog" position="170,420" zPosition="2" size="394,94" backgroundColor="#202020" flags="wfNoBorder">
-+              <eLabel position="0,0" size="392,92" backgroundColor="#c0c0c0" zPosition="-1" />
++      <screen name="NumericalTextInputHelpDialog" position="170,420" zPosition="2" size="394,124" backgroundColor="#202020" flags="wfNoBorder">
++              <eLabel position="0,0" size="392,122" backgroundColor="#c0c0c0" zPosition="-1" />
 +              <widget name="key1" position="2,2" size="130,30" font="Console;16" halign="center" valign="center" />
 +              <widget name="key2" position="132,2" size="130,30" font="Console;16" halign="center" valign="center" />
 +              <widget name="key3" position="262,2" size="130,30" font="Console;16" halign="center" valign="center" />
@@ -1220,6 +1220,9 @@ index 0000000..7be3bca
 +              <widget name="key7" position="2,62" size="130,30" font="Console;16" halign="center" valign="center" />
 +              <widget name="key8" position="132,62" size="130,30" font="Console;16" halign="center" valign="center" />
 +              <widget name="key9" position="262,62" size="130,30" font="Console;16" halign="center" valign="center" />
++              <widget name="help1" position="2,92" size="130,30" font="Regular;16" halign="center" valign="center" />
++              <widget name="key0" position="132,92" size="130,30" font="Regular;16" halign="center" valign="center" />
++              <widget name="help2" position="262,92" size="130,30" font="Regular;16" halign="center" valign="center" />
 +      </screen>
 +      <!-- Parental control - change pin -->
 +      <screen name="ParentalControlChangePin" position="100,200" size="520,160" title="Change pin code">
@@ -2573,6 +2576,366 @@ index 0000000..7be3bca
 +              </widget>
 +      </screen>
 +      
++      <!-- Genuine Vuplus Plugin -->
++      <screen name="VuplusAuthenticity" position="center,center" size="600,320" title="Return the Love Event (only for genuine box)">
++              <ePixmap pixmap="750S/buttons/red.png" position="140,15" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="320,15" size="140,40" alphatest="on" />
++              <widget source="key_red" render="Label" position="145,15" zPosition="1" size="135,40" font="Regular;24" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="325,15" zPosition="1" size="135,40" font="Regular;24" halign="center" valign="center" transparent="1" />
++              <widget name="config" zPosition="2" position="10,70" size="580,80" scrollbarMode="showOnDemand" transparent="1" />
++              <widget name="text1" position="10,160" size="580,50" font="Regular;32" halign="center" valign="center"/>
++              <widget name="text2" position="10,220" size="580,100" font="Regular;18" halign="center" valign="center"/>
++      </screen>
++      <screen name="MessageBoxGenuine" position="center,center" size="600,10" title="Message">
++              <widget name="text" position="65,8" size="420,0" font="Regular;22" />
++              <widget name="ErrorPixmap" pixmap="750S/icons/input_error.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="QuestionPixmap" pixmap="750S/icons/input_question.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="InfoPixmap" pixmap="750S/icons/input_info.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="list" position="100,100" size="380,375" transparent="1" />
++              <applet type="onLayoutFinish">
++# this should be factored out into some helper code, but currently demonstrates applets.
++from enigma import eSize, ePoint
++
++orgwidth = self.instance.size().width()
++orgpos = self.instance.position()
++textsize = self[&quot;text&quot;].getSize()
++
++# y size still must be fixed in font stuff...
++textsize = (textsize[0] + 50, textsize[1] + 50)
++offset = 0
++if self.type == self.TYPE_YESNO:
++      offset = 60
++wsizex = textsize[0] + 60
++wsizey = textsize[1] + offset
++if (280 &gt; wsizex):
++      wsizex = 280
++wsize = (wsizex, wsizey)
++
++
++# resize
++self.instance.resize(eSize(*wsize))
++
++# resize label
++self[&quot;text&quot;].instance.resize(eSize(*textsize))
++
++# move list
++listsize = (wsizex, 50)
++self[&quot;list&quot;].instance.move(ePoint(0, textsize[1]))
++self[&quot;list&quot;].instance.resize(eSize(*listsize))
++
++# center window
++newwidth = wsize[0]
++self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
++              </applet>
++      </screen>
++
++      <!-- HDMI CEC Plugin -->
++      <screen name="HdmiCecPlugin" position="center,center" size="590,320" title="HDMI-CEC Plugin" >
++              <ePixmap pixmap="750S/buttons/red.png" position="20,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="160,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/yellow.png" position="300,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/blue.png" position="440,0" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="25,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="165,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_yellow" render="Label" position="305,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_blue" render="Label" position="445,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="10,50" size="580,270" scrollbarMode="showOnDemand" transparent="1" />
++      </screen>
++
++      <!-- LED Brightness Setup Plugin -->
++      <screen name="LEDBrightnessSetup" position="center,center" size="560,300" title="LED Brightness Setup">
++              <ePixmap pixmap="750S/buttons/red.png" position="40,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="210,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/yellow.png" position="380,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="45,10" zPosition="1" size="130,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="215,10" zPosition="1" size="130,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_yellow" render="Label" position="385,10" zPosition="1" size="130,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1"/>
++              <widget name="current_entry" position="130,240" size="300,30" font="Regular;18" halign="center" valign="center"/>
++      </screen>
++
++      <!-- Fancontrol Plugin -->
++      <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
++              <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++      </screen>
++
++      <!-- RC Code Plugin -->
++      <screen name="RemoteControlCode" position="center,center" size="560,250" title="Remote Control System Code Setting" >
++              <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++      </screen>
++
++      <screen name="MessageBoxConfirmCode" position="center,320" size="620,10" title="Message">
++              <widget name="text" position="65,8" size="420,0" font="Regular;20" />
++              <widget name="ErrorPixmap" pixmap="750S/icons/input_error.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="QuestionPixmap" pixmap="750S/icons/input_question.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="InfoPixmap" pixmap="750S/icons/input_info.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="list" position="100,100" size="380,375" transparent="1" />
++              <applet type="onLayoutFinish">
++# this should be factored out into some helper code, but currently demonstrates applets.
++from enigma import eSize, ePoint
++
++orgwidth  = self.instance.size().width()
++orgheight = self.instance.size().height()
++orgpos    = self.instance.position()
++textsize  = self[&quot;text&quot;].getSize()
++
++# y size still must be fixed in font stuff...
++textsize = (textsize[0] + 50, textsize[1] + 50)
++offset = 0
++if self.type == self.TYPE_YESNO:
++      offset = 60
++wsizex = textsize[0] + 60
++wsizey = textsize[1] + offset
++if (280 &gt; wsizex):
++      wsizex = 280
++wsize = (wsizex, wsizey)
++
++# resize
++self.instance.resize(eSize(*wsize))
++
++# resize label
++self[&quot;text&quot;].instance.resize(eSize(*textsize))
++
++# move list
++listsize = (wsizex, 50)
++self[&quot;list&quot;].instance.move(ePoint(0, textsize[1]))
++self[&quot;list&quot;].instance.resize(eSize(*listsize))
++
++# center window
++newwidth = wsize[0]
++newheight = wsize[1]
++self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (orgheight - newheight)/2))
++              </applet>
++      </screen>
++
++      <!-- Manual Fancontrol Plugin -->
++      <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Standby mode" >
++              <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="current" render="Label" position="150,270" zPosition="1" size="280,30" font="Regular;20" halign="center" valign="center" />
++      </screen>
++
++      <!-- UI 3D Setup Plugin -->
++      <screen name="UI3DSetupScreen" position="center,center" size="560,300" title="UI 3D setup" >
++              <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++      </screen>
++
++      <!-- Blindscan Plugin -->
++      <screen name="Blindscan" position="center,130" size="560,390" title="Blindscan">
++              <ePixmap pixmap="750S/buttons/red.png" position="40,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="210,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/blue.png" position="380,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="45,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget source="key_green" render="Label" position="215,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget source="key_blue" render="Label" position="385,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
++
++              <widget name="config" position="5,70" size="550,280" scrollbarMode="showOnDemand" />
++              <widget name="introduction" position="0,365" size="560,20" font="Regular;20" halign="center" />
++      </screen>
++
++      <!-- Web Browser Plugin -->
++      <screen name="BrowserLauncher" position="center,center" size="620,310" title="Web Browser">
++              <ePixmap pixmap="750S/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="158,0" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="15,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="163,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" position="0,50" size="309,100" scrollbarMode="showOnDemand" />
++              <ePixmap pixmap="rc_wb_desc.png" position="312,5" size="309,296" alphatest="on" />
++              <widget name="info" position="0,180" size="309,50" font="Regular;18" halign="center" foregroundColor="#a08500" transparent="1" />
++      </screen>
++
++      <!-- Crash Report Plugin -->
++      <screen name="CrashlogReportConfiguration" position="center,120" size="560,420" title="CrashlogReport Settings" >
++              <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,300" scrollbarMode="showOnDemand" transparent="1" />
++              <ePixmap pixmap="750S/div-h.png" position="0,360" zPosition="10" size="560,2" transparent="1" alphatest="on" />
++              <widget source="status" render="Label" position="10,370" size="540,40" zPosition="10" font="Regular;20" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
++              <widget name="VKeyIcon" pixmap="750S/buttons/key_text.png" position="10,390" zPosition="10" size="35,25" transparent="1" alphatest="on" />
++              <widget name="HelpWindow" pixmap="750S/vkey_icon.png" position="160,350" zPosition="1" size="1,1" transparent="1" alphatest="on" />
++      </screen>
++
++      <!-- FPGA Upgrade Plugin -->
++      <screen name="FPGAUpgrade" position="center,120" size="560,420" title="FPGA Upgrade" >
++              <ePixmap pixmap="750S/buttons/red.png" position="40,10" size="140,40" alphatest="blend" />
++              <ePixmap pixmap="750S/buttons/green.png" position="210,10" size="140,40" alphatest="blend" />
++              <ePixmap pixmap="750S/buttons/blue.png" position="380,10" size="140,40" alphatest="blend" />
++
++              <widget source="key_red" render="Label" position="45,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget source="key_green" render="Label" position="215,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget source="key_blue" render="Label" position="385,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
++
++              <widget source="status" render="Label" position="15,60" zPosition="1" size="540,40" font="Regular;18" halign="left" valign="center" transparent="1" />
++              <widget name="file_list" position="0,100" size="555,320" scrollbarMode="showOnDemand" />
++        </screen>
++
++      <screen name="UpgradeStatus" position="center,center" size="450,130" title=" ">
++              <widget name="name" position="10,0" size="430,20" font="Regular;18" halign="left" valign="bottom"/>
++              <widget name="slider" position="10,25" size="430,30" borderWidth="2" borderColor="#cccccc"/>
++              <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="#9f1313" transparent="1"/>
++              <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" transparent="1"/>
++      </screen>
++
++      <!-- Firmware Upgrade Plugin -->
++      <screen name="FirmwareUpgrade" position="center,center" size="560,175" title="Firmware Upgrade" >
++              <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="blend" />
++              <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="blend" />
++
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="0,70" itemHeight="36" size="540,40" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="status" render="Label" position="0,100" zPosition="1" size="540,75" font="Regular;20" halign="center" valign="center" />
++        </screen>
++
++      <screen name="FUFilebrowser" position="center,center" size="500,290" title="File Browser" >
++              <ePixmap pixmap="750S/buttons/blue.png" position="5,10" size="140,40" alphatest="blend" />
++
++              <widget source="key_blue" render="Label" position="10,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
++
++              <widget name="file_list" position="0,70" size="495,160" scrollbarMode="showOnDemand" />
++              <widget source="status" render="Label" position="0,230" zPosition="1" size="490,60" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
++        </screen>
++
++      <!-- WLan Setup Plugin -->
++      <screen name="WlanSelection" position="center,120" size="510,400" title="Wireless Network Adapter Selection..." >
++              <ePixmap pixmap="750S/div-h.png" position="0,350" zPosition="1" size="560,2" />
++              <ePixmap pixmap="750S/border_menu_a.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
++
++              <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="15,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="365,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="menulist" position="20,20" size="230,260" transparent="1" backgroundColor="#371e1c1a" zPosition="10" scrollbarMode="showOnDemand" />
++              <widget source="description" render="Label" position="305,10" size="195,300" font="Regular;19" halign="center" valign="center" />
++      </screen>
++
++      <screen name="WlanSetup" position="center,120" size="510,400" title="Wireless Network Setup Menu..." >
++              <ePixmap pixmap="750S/div-h.png" position="0,350" zPosition="1" size="560,2" />
++              <ePixmap pixmap="750S/border_menu_a.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
++
++              <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="15,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="365,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="menulist" position="20,20" size="230,260" transparent="1" backgroundColor="#371e1c1a" zPosition="10" scrollbarMode="showOnDemand" />
++              <widget source="description" render="Label" position="305,10" size="195,300" font="Regular;19" halign="center" valign="center" />
++      </screen>
++
++      <screen name="WlanConfig" position="center,120" size="510,400" title="Wireless Network Configuration..." >
++              <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
++              <widget source="key_red" render="Label" position="15,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="365,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget name="config" position="10,10" backgroundColor="#371e1c1a" transparent="1" size="480,195" scrollbarMode="showOnDemand" />
++              <ePixmap pixmap="750S/div-h.png" position="0,210" zPosition="1" size="550,2" />
++              <widget source="ipaddresstext" render="Label" position="100,220" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="ipaddress" render="Label" position="300,220" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="netmasktext" render="Label" position="100,245" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="netmask" render="Label" position="300,245" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="gatewaytext" render="Label" position="100,270" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="gateway" render="Label" position="300,270" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="DNS1text" render="Label" position="100,295" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="DNS1" render="Label" position="300,295" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="DNS2text" render="Label" position="100,320" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="DNS2" render="Label" position="300,320" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget name="VKeyIcon" pixmap="750S/buttons/key_text.png" position="460,245" zPosition="10" size="35,25" transparent="1" alphatest="on" />
++              <widget name="HelpWindow" pixmap="750S/vkey_icon.png" position="160,350" zPosition="1" size="1,1" transparent="1" alphatest="on" />
++      </screen>
++
++      <screen name="WlanScanAp" position="center,120" size="510,400" title="Wireless Network AP Scan..." >
++              <ePixmap pixmap="750S/div-h.png" position="0,350" zPosition="1" size="560,2" />
++              <ePixmap pixmap="750S/border_menu_a.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
++
++              <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="185,360" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/blue.png" position="360,360" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="15,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="190,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_blue" render="Label" position="365,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="menulist" position="20,20" size="230,260" backgroundColor="#371e1c1a" transparent="1" zPosition="10" scrollbarMode="showOnDemand" />
++
++              <widget source="Address" render="Label" position="265,70" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
++              <widget source="ESSID" render="Label" position="265,100" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
++              <widget source="Protocol" render="Label" position="265,130" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
++              <widget source="Frequency" render="Label" position="265,160" zPosition="1" size="240,40" font="Regular;18" halign="center" valign="center" />
++              <widget source="Encryption key" render="Label" position="265,200" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
++              <widget source="BitRate" render="Label" position="265,220" zPosition="1" size="240,60" font="Regular;18" halign="center" valign="center" />
++      </screen>
++
++      <screen name="Wlanstatus" position="center,120" size="510,400" title="Wireless Network Status..." >
++              <widget source="status" render="Label" position="5,15" size="500,350" font="Regular;18" zPosition="1" />
++
++              <ePixmap pixmap="750S/buttons/red.png" position="190,360" size="135,40" alphatest="on" />
++              <widget source="key_red" render="Label" position="185,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++      </screen>
++
++      <!-- Wireless Access Point plugin-->
++      <screen name="WirelessAccessPoint" position="65,130" size="590,400" title="Wireless Access Point Setup" >
++              <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget name="config" zPosition="2" position="5,70" size="550,220" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="current_settings" render="Label" position="10,290" size="550,20" font="Regular;19" halign="center" valign="center" transparent="1" />
++              <widget source="IPAddress_text" render="Label" position="130,320" size="190,21" font="Regular;19" transparent="1" />
++              <widget source="Netmask_text" render="Label" position="130,345" size="190,21" font="Regular;19" transparent="1" />
++              <widget source="Gateway_text" render="Label" position="130,370" size="190,21" font="Regular;19" transparent="1" />
++              <widget source="IPAddress" render="Label" position="340,320" size="240,21" font="Regular;19" transparent="1" />
++              <widget source="Netmask" render="Label" position="340,345" size="240,21" font="Regular;19" transparent="1" />
++              <widget source="Gateway" render="Label" position="340,370" size="240,21" font="Regular;19" transparent="1" />
++      </screen>
++
++      <!-- OperaBrowser Plugin MenuWindow -->
++      <screen name="OperaBrowser" position="0,0" size="720,576" backgroundColor="transparent" flags="wfNoBorder" title="Opera Browser">
++              <widget name="topArea" zPosition="-1" position="0,0" size="1280,60" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" />
++              <widget name="menuitemFile" position="30,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
++              <widget name="menuitemTool" position="180,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
++              <widget name="menuitemHelp" position="330,20" size="150,30" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" foregroundColors="#9f1313,#a08500" />
++              <widget name="menulist" position="50,60" size="200,150" backgroundColor="#000000" zPosition="10" scrollbarMode="showOnDemand" />
++              <widget name="submenulist" position="252,60" size="200,150" backgroundColor="#000000" zPosition="10" scrollbarMode="showOnDemand" />
++              <widget name="bottomArea" position="0,496" size="720,80" font="Regular;20" valign="center" halign="center" backgroundColor="#000000" />
++      </screen>
 +</skin>
 diff --git a/data/Makefile.am b/data/Makefile.am
 index 0eaa082..869a16e 100644
@@ -2583,10 +2946,10 @@ index 0eaa082..869a16e 100644
 +SUBDIRS = countries fonts defaults extensions keymaps skin_default 750S Vu_HD
  
  dist_pkgdata_DATA = \
-        defaultsatlists.xml \
+       defaultsatlists.xml \
 diff --git a/data/Vu_HD/Makefile.am b/data/Vu_HD/Makefile.am
 new file mode 100644
-index 0000000..ee39535
+index 0000000..dcdab6d
 --- /dev/null
 +++ b/data/Vu_HD/Makefile.am
 @@ -0,0 +1,6 @@
@@ -2598,7 +2961,7 @@ index 0000000..ee39535
 +      *.xml *.png
 diff --git a/data/Vu_HD/buttons/Makefile.am b/data/Vu_HD/buttons/Makefile.am
 new file mode 100644
-index 0000000..cd14ba2
+index 0000000..3da6ab8
 --- /dev/null
 +++ b/data/Vu_HD/buttons/Makefile.am
 @@ -0,0 +1,6 @@
@@ -2610,7 +2973,7 @@ index 0000000..cd14ba2
 +      *.png
 diff --git a/data/Vu_HD/countries/Makefile.am b/data/Vu_HD/countries/Makefile.am
 new file mode 100644
-index 0000000..9a025db
+index 0000000..68c6dc7
 --- /dev/null
 +++ b/data/Vu_HD/countries/Makefile.am
 @@ -0,0 +1,6 @@
@@ -2622,7 +2985,7 @@ index 0000000..9a025db
 +      *.png
 diff --git a/data/Vu_HD/icons/Makefile.am b/data/Vu_HD/icons/Makefile.am
 new file mode 100644
-index 0000000..0351458
+index 0000000..650c1e5
 --- /dev/null
 +++ b/data/Vu_HD/icons/Makefile.am
 @@ -0,0 +1,6 @@
@@ -2634,7 +2997,7 @@ index 0000000..0351458
 +      *.png
 diff --git a/data/Vu_HD/menu/Makefile.am b/data/Vu_HD/menu/Makefile.am
 new file mode 100644
-index 0000000..ed47ec9
+index 0000000..9d4f458
 --- /dev/null
 +++ b/data/Vu_HD/menu/Makefile.am
 @@ -0,0 +1,6 @@
@@ -2645,11 +3008,11 @@ index 0000000..ed47ec9
 +install_DATA = \
 +      *.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
-new file mode 100755
-index 0000000..555c0d6
+new file mode 100644
+index 0000000..fa1e2e4
 --- /dev/null
 +++ b/data/Vu_HD/skin.xml
-@@ -0,0 +1,3036 @@
+@@ -0,0 +1,3454 @@
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
@@ -2879,6 +3242,13 @@ index 0000000..555c0d6
 +              <widget source="RecordingPossible" render="FixedLabel" text="Record" position="100,125" zPosition="1" size="130,22" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#d2dee2" transparent="1">
 +                      <convert type="ConditionalShowHide" />
 +              </widget>
++              <!-- Red button, Hbbtv (only if record is not on red, for now) -->
++              <widget source="HbbtvApplication" render="Pixmap" pixmap="Vu_HD/buttons/red.png" position="60,122" zPosition="1" size="25,25" alphatest="on">
++                      <convert type="ConditionalShowHide" />
++              </widget>
++              <widget source="HbbtvApplication" render="Label" position="100,125" zPosition="1" size="130,22" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#d9dee2" transparent="1">
++                      <convert type="HbbtvApplicationInfo">Name</convert>
++              </widget>
 +              <!-- Green button (is subservices available?) -->
 +              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="250,122" size="25,25" alphatest="blend" />
 +              <widget source="session.CurrentService" render="Pixmap" pixmap="Vu_HD/buttons/green.png" position="250,122" zPosition="1" size="25,25" alphatest="blend">
@@ -3043,7 +3413,7 @@ index 0000000..555c0d6
 +              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
 +              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="240,98" size="25,25" alphatest="blend" />
 +              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="435,98" size="25,25" alphatest="blend" />
-+              <ePixmap pixmap="Vu_HD/buttons/blue.png" position="630,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="630,98" size="25,25" alphatest="blend" />
 +              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +              <widget source="key_blue" render="Label" position="668,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +              <widget name="config" position="160,140" transparent="1" backgroundColor="#27d9dee2" size="500,125" scrollbarMode="showOnDemand" />     
@@ -3151,7 +3521,7 @@ index 0000000..555c0d6
 +              <widget name="key_green" position="316,84" zPosition="1" size="182,20" font="Regular;20" halign="left" valign="center" foregroundColor="#1c1c1c" backgroundColor="#27ebebeb" transparent="1" />
 +              <widget name="key_yellow" position="543,84" zPosition="1" size="182,20" font="Regular;20" halign="left" valign="center" foregroundColor="#1c1c1c" backgroundColor="#27ebebeb" transparent="1" />
 +              <widget name="key_blue" position="770,84" zPosition="1" size="182,20" font="Regular;20" halign="left" valign="center" foregroundColor="#1c1c1c" backgroundColor="#27ebebeb" transparent="1" />
-+              <widget name="list" position="30,127" size="615,462" zPosition="3" scrollbarMode="showOnDemand" foregroundColor="#1c1c1c" backgroundColor="#27ebebeb" selectionPixmap="Vu_HD/buttons/FocusBar_H42.png" foregroundColorServiceNotAvail="#2c2c2c" serviceItemHeight="42" serviceNumberFont="Regular;24" serviceNameFont="Regular;24" serviceInfoFont="Semibold;21" transparent="1" />
++              <widget name="list" position="30,127" size="615,462" zPosition="3" scrollbarMode="showOnDemand" foregroundColor="#1c1c1c" backgroundColor="#27ebebeb" selectionPixmap="Vu_HD/buttons/FocusBar_H42.png" foregroundColorServiceNotAvail="#6c6c6c" serviceItemHeight="42" serviceNumberFont="Regular;24" serviceNameFont="Regular;24" serviceInfoFont="Semibold;21" transparent="1" />
 +              <eLabel text=" " backgroundColor="#9c9c9c" position="655,127" size="2,450" />
 +              <widget source="ServiceEvent" render="Label" position="670,130" zPosition="1" size="300,24" foregroundColor="#07255d" backgroundColor="#27d8dee2" font="Semibold;24" noWrap="1" transparent="1">
 +                      <convert type="EventName">Name</convert>
@@ -3179,7 +3549,7 @@ index 0000000..555c0d6
 +              </widget>
 +      </screen>
 +      <!-- Channel selection - Radio -->
-+      <screen name="ChannelSelectionRadio" position="145, 55" size="990,610" flags="wfNoBorder" backgroundColor="transparent">
++      <screen name="ChannelSelectionRadio" position="145, 55" size="990,610" zPosition="-10" flags="wfNoBorder" backgroundColor="transparent">
 +              <ePixmap pixmap="Vu_HD/Bg_List.png" position="0,0" size="990,610" zPosition="-10" alphatest="on"  transparent="1" />
 +              <ePixmap pixmap="Vu_HD/icons/ico_Radio_title.png" position="44,37" size="38,34" alphatest="blend"  transparent="1" />
 +              <widget source="Title" render="Label" position="95,40" size="700,32" zPosition="3" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27d8dee2" transparent="1" />
@@ -3718,6 +4088,7 @@ index 0000000..555c0d6
 +              <widget name="key_green" position="316,84" zPosition="1" size="182,20" font="Regular;20" halign="left" valign="center" foregroundColor="#1c1c1c" backgroundColor="#27ebebeb" transparent="1" />
 +              <widget name="key_yellow" position="543,84" zPosition="1" size="182,20" font="Regular;20" halign="left" valign="center" foregroundColor="#1c1c1c" backgroundColor="#27ebebeb" transparent="1" />
 +              <widget name="key_blue" position="770,84" zPosition="1" size="182,20" font="Regular;20" halign="left" valign="center" foregroundColor="#1c1c1c" backgroundColor="#27ebebeb" transparent="1" />
++              <widget name="waitingtext" position="60,150" size="860,375" zPosition="4" font="Regular;22" foregroundColor="#1c1c1c" backgroundColor="#27d8dee2" halign="center" valign="center" />
 +              <widget name="list" position="60,150" size="860,375" zPosition="2" scrollbarMode="showOnDemand" transparent="1" />
 +              <widget name="DescriptionBorder" position="80,430" size="800,150" zPosition="1" transparent="1" alphatest="on"/>
 +              <widget source="Service" render="Label" position="80,430" zPosition="1" size="640,22" font="Regular;20" foregroundColor="#3c3c3c" backgroundColor="#27aeaeae" transparent="1">
@@ -3864,7 +4235,7 @@ index 0000000..555c0d6
 +              <widget name="number" position="145,15" size="80,25" halign="right" font="Regular;23" />
 +      </screen>
 +      <!-- Numerical help dialog -->
-+      <screen name="NumericalTextInputHelpDialog" position="440,535" zPosition="2" size="394,94" backgroundColor="#27b5b9bd" flags="wfNoBorder">
++      <screen name="NumericalTextInputHelpDialog" position="440,535" zPosition="2" size="394,124" backgroundColor="#27b5b9bd" flags="wfNoBorder">
 +<!--
 +              <eLabel position="0,0" size="392,92" backgroundColor="#c0c0c0" zPosition="-1" />
 +-->           
@@ -3877,6 +4248,9 @@ index 0000000..555c0d6
 +              <widget name="key7" position="2,62" size="130,30" font="Console;16" halign="center" valign="center" transparent="1"/>
 +              <widget name="key8" position="132,62" size="130,30" font="Console;16" halign="center" valign="center" transparent="1"/>
 +              <widget name="key9" position="262,62" size="130,30" font="Console;16" halign="center" valign="center" transparent="1"/>
++              <widget name="help1" position="2,92" size="130,30" font="Regular;16" halign="center" valign="center" transparent="1"/>
++              <widget name="key0" position="132,92" size="130,30" font="Regular;16" halign="center" valign="center" transparent="1"/>
++              <widget name="help2" position="262,92" size="130,30" font="Regular;16" halign="center" valign="center" transparent="1"/>
 +      </screen>
 +      <!-- Parental control - change pin -->
 +      <screen name="ParentalControlChangePin" position="center,center" size="520,160" title="Change pin code">
@@ -5642,52 +6016,459 @@ index 0000000..555c0d6
 +                      </convert>
 +              </widget>
 +      </screen>       
-+      <screen name="FactoryTest" position="300,100" size="660,550" title="Test Menu" >
-+              <widget name="testlist" position="10,0" size="440,455" itemHeight="35" />
-+              <widget name="resultlist" position="470,0" size="60,455" itemHeight="35" />
-+              <widget name="testdate" position="20,470" size="250,35" font="Regular;30" />
-+              <widget name="testversion" position="20,505" size="250,35" font="Regular;30" />
-+              <widget name="mactext" position="320,470" size="340,35" font="Regular;30" />                    
-+      </screen>
-+      <screen name="MacConfig" position="center,center" size="520,100" title="Mac Config" >
-+              <eLabel text="Mac Address " position="10,15" size="200,40" font="Regular;30" />         
-+              <widget name="text" position="230,15" size="230,40" font="Regular;30" halign="right"/>
-+              <widget name="text1" position="470,15" size="40,40" font="Regular;30" />                
-+              <eLabel text=" " position="5,55" zPosition="-1" size="510,5" backgroundColor="#02e1e8e6" />             
-+              <widget name="stattext" position="30,75" size="450,35" font="Regular;30" />
-+      </screen>
-+      <screen name="ScCiTest" position="center,center" size="440,200" title="CI Smartcard Test" >
-+              <widget name="testlist" position="10,0" size="340,120" />
-+              <widget name="resultlist" position="370,0" size="60,120" />
-+              <eLabel text=" " position="5,125" zPosition="-1" size="430,5" backgroundColor="#02e1e8e6" />            
-+              <widget name="text" position="10,140" size="420,50" font="Regular;25" />
-+      </screen>
-+      <screen name="SmartCardTest" position="center,center" size="300,120" title="SmartCard Test" >
-+              <widget name="text" position="10,10" size="280,100" font="Regular;30" />
-+      </screen>
-+      <screen name="FrontTest" position="center,center" size="300,180" title="Front Test" >
-+              <widget name="text" position="10,10" size="280,160" font="Regular;30" />
-+      </screen>
-+      <screen name="FrontTest_solo" position="center,center" size="300,180" title="Front Test" >
-+              <widget name="text" position="10,10" size="280,160" font="Regular;30" />
-+      </screen>
-+      <screen name="RS232Test" position="center,center" size="260,100" title="RS232 Test" >
-+              <widget name="text" position="10,10" size="240,80" font="Regular;30" />
-+      </screen>
-+      <screen name="AgingTest" position="center,center" size="350,150" title="Aging Test" >
-+              <widget name="text1" position="10,10" size="330,40" font="Regular;30" />
-+              <widget name="text2" position="10,60" size="330,40" font="Regular;30" />
++
++      <!-- Genuine Vuplus Plugin -->
++      <screen name="VuplusAuthenticity" position="center,center" size="800,370" title="Return the Love Event (only for genuine box)">
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="250,15" size="25,25" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="435,15" size="25,25" alphatest="on" />
++              <widget source="key_red" render="Label" position="265,15" zPosition="1" size="140,25" font="Regular;24" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="450,15" zPosition="1" size="140,25" font="Regular;24" halign="center" valign="center" transparent="1" />
++              <widget name="config" zPosition="2" position="80,70" size="640,80" scrollbarMode="showOnDemand" transparent="1" />
++              <widget name="text1" position="0,165" size="800,90" font="Regular;32" halign="center" valign="center"/>
++              <widget name="text2" position="100,260" size="600,110" font="Regular;24" halign="center" valign="center"/>
++      </screen>
++      <screen name="MessageBoxGenuine" position="center,center" size="600,10" title="Message">
++              <widget name="text" position="65,8" size="420,0" font="Regular;22" />
++              <widget name="ErrorPixmap" pixmap="Vu_HD/icons/input_error.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="QuestionPixmap" pixmap="Vu_HD/icons/input_question.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="InfoPixmap" pixmap="Vu_HD/icons/input_info.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="list" position="100,100" size="380,375" transparent="1" backgroundColor="darkgrey" />
++              <applet type="onLayoutFinish">
++# this should be factored out into some helper code, but currently demonstrates applets.
++from enigma import eSize, ePoint
++
++orgwidth = self.instance.size().width()
++orgpos = self.instance.position()
++textsize = self[&quot;text&quot;].getSize()
++
++# y size still must be fixed in font stuff...
++textsize = (textsize[0] + 50, textsize[1] + 50)
++offset = 0
++if self.type == self.TYPE_YESNO:
++      offset = 60
++wsizex = textsize[0] + 60
++wsizey = textsize[1] + offset
++if (280 &gt; wsizex):
++      wsizex = 280
++wsize = (wsizex, wsizey)
++
++
++# resize
++self.instance.resize(eSize(*wsize))
++
++# resize label
++self[&quot;text&quot;].instance.resize(eSize(*textsize))
++
++# move list
++listsize = (wsizex, 50)
++self[&quot;list&quot;].instance.move(ePoint(0, textsize[1]))
++self[&quot;list&quot;].instance.resize(eSize(*listsize))
++
++# center window
++newwidth = wsize[0]
++self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
++              </applet>
 +      </screen>
-+      <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
++
++      <!-- HDMI CEC Plugin -->
++      <screen name="HdmiCecPlugin" position="center,center" size="590,320" title="HDMI-CEC Plugin" >
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="20,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="160,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/yellow.png" position="300,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/blue.png" position="440,0" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="25,0" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="165,0" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_yellow" render="Label" position="305,0" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_blue" render="Label" position="445,0" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="10,50" size="580,270" scrollbarMode="showOnDemand" transparent="1" />
++      </screen>
++
++      <!-- LED Brightness Setup Plugin -->
++      <screen name="LEDBrightnessSetup" position="center,center" size="560,300" title="LED Brightness Setup">
 +              <ePixmap pixmap="Vu_HD/buttons/red.png" position="10,10" size="25,25" alphatest="on" />
-+              <ePixmap pixmap="Vu_HD/buttons/green.png" position="290,10" size="25,25" alphatest="on" />
-+              <widget source="key_red" render="Label" position="40,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-+              <widget source="key_green" render="Label" position="320,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="195,10" size="25,25" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/yellow.png" position="380,10" size="25,25" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="30,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="215,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_yellow" render="Label" position="400,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,50" size="550,200" scrollbarMode="showOnDemand" transparent="1"/>
++              <widget name="current_entry" position="130,240" size="300,30" font="Regular;18" halign="center" valign="center"/>
++      </screen>
++
++      <!-- Fancontrol Plugin -->
++      <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="110,10" size="30,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="310,10" size="30,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++      </screen>
++
++      <!-- RC Code Plugin -->
++      <screen name="RemoteControlCode" position="center,center" size="560,250" title="Remote Control System Code Setting" >
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="110,10" size="30,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="310,10" size="30,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="115,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="315,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++
 +              <widget name="config" zPosition="2" position="5,50" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
 +      </screen>
++
++      <screen name="MessageBoxConfirmCode" position="center,center" size="620,10" title="Message">
++              <widget name="text" position="65,8" size="420,0" font="Regular;20" />
++              <widget name="ErrorPixmap" pixmap="Vu_HD/icons/input_error.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="QuestionPixmap" pixmap="Vu_HD/icons/input_question.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="InfoPixmap" pixmap="Vu_HD/icons/input_info.png" position="5,5" size="53,53" alphatest="blend" />
++              <widget name="list" position="100,100" size="380,375" transparent="1" backgroundColor="#279e9fa4" />
++              <applet type="onLayoutFinish">
++# this should be factored out into some helper code, but currently demonstrates applets.
++from enigma import eSize, ePoint
++
++orgwidth = self.instance.size().width()
++orgheight = self.instance.size().height()
++orgpos = self.instance.position()
++textsize = self[&quot;text&quot;].getSize()
++
++# y size still must be fixed in font stuff...
++textsize = (textsize[0] + 50, textsize[1] + 50)
++offset = 0
++if self.type == self.TYPE_YESNO:
++      offset = 60
++wsizex = textsize[0] + 60
++wsizey = textsize[1] + offset
++if (280 &gt; wsizex):
++      wsizex = 280
++wsize = (wsizex, wsizey)
++
++
++# resize
++self.instance.resize(eSize(*wsize))
++
++# resize label
++self[&quot;text&quot;].instance.resize(eSize(*textsize))
++
++# move list
++listsize = (wsizex, 50)
++self[&quot;list&quot;].instance.move(ePoint(0, textsize[1]))
++self[&quot;list&quot;].instance.resize(eSize(*listsize))
++
++# center window
++newwidth = wsize[0]
++newheight = wsize[1]
++self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (orgheight - newheight)/2))
++              </applet>
++      </screen>
++
++      <!-- Manual Fancontrol Plugin -->
++      <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Standby mode" >
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="120,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="320,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="current" render="Label" position="150,270" zPosition="1" size="280,30" font="Regular;20" halign="center" valign="center" />
++      </screen>
++
++      <!-- UI 3D Setup Plugin -->
++      <screen name="UI3DSetupScreen" position="center,center" size="560,300" title="UI 3D setup" >
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="120,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="320,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++      </screen>
++
++      <!-- Blindscan Plugin -->
++      <screen name="Blindscan" position="center,center" size="560,390" title="Blindscan">
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="40,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="210,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/blue.png" position="380,10" size="140,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="50,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget source="key_green" render="Label" position="220,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget source="key_blue" render="Label" position="390,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
++
++              <widget name="config" position="5,70" size="550,280" scrollbarMode="showOnDemand" />
++              <widget name="introduction" position="0,365" size="560,20" font="Regular;20" halign="center" />
++      </screen>
++
++      <!-- Web Browser Plugin -->
++      <screen name="BrowserLauncher" position="center,center" size="309,498" title="Web Browser">
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="4,0" size="40,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="154,0" size="40,40" alphatest="on" />
++
++              <widget source="key_red" render="Label" position="30,0" zPosition="1" size="125,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="180,0" zPosition="1" size="125,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++
++              <widget name="config" position="0,50" size="309,100" scrollbarMode="showOnDemand" />
++              <ePixmap pixmap="rc_wb_desc.png" position="0,150" size="309,296" alphatest="on" />
++              <widget name="info" position="0,455" size="309,50" font="Regular;18" halign="center" foregroundColor="blue" transparent="1" />
++      </screen>
++
++      <!-- Crash Report Plugin -->
++      <screen name="CrashlogReportConfiguration" position="209,48" size="865,623" title="CrashlogReport Setting" flags="wfNoBorder" backgroundColor="transparent">    
++              <ePixmap pixmap="Vu_HD/Bg_EPG_list.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
++              <eLabel text="CrashlogReport Setting" position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
++              <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" halign="right" backgroundColor="#27d9dee2" transparent="1">
++                      <convert type="ClockToText">Format:%H:%M</convert>
++              </widget>
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="435,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="630,98" size="25,25" alphatest="blend" />
++              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <widget name="config" zPosition="2" position="50,130" itemHeight="36" size="750,324" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="status" render="Label" position="160,525" size="540,60" zPosition="10" foregroundColor="#3c3c3c" backgroundColor="#27aeaeae" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget name="VKeyIcon" pixmap="Vu_HD/buttons/key_text.png" position="500,350" zPosition="10" size="35,25" transparent="1" alphatest="on" />
++              <widget name="HelpWindow" pixmap="Vu_HD/vkey_icon.png" position="310,400" zPosition="1" size="1,1" transparent="1" alphatest="on" />
++      </screen>
++
++      <!-- FPGA Upgrade Plugin -->
++      <screen name="FPGAUpgrade" position="center,center" size="560,420" title="FPGA Upgrade" >
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="40,10" size="140,40" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="210,10" size="140,40" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/blue.png" position="380,10" size="140,40" alphatest="blend" />
++
++              <widget source="key_red" render="Label" position="60,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget source="key_green" render="Label" position="230,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
++              <widget source="key_blue" render="Label" position="400,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
++
++              <widget source="status" render="Label" position="15,60" zPosition="1" size="540,40" font="Regular;18" halign="left" valign="center" transparent="1" />
++              <widget name="file_list" position="0,100" size="555,320" scrollbarMode="showOnDemand" />
++        </screen>
++
++      <screen name="UpgradeStatus" position="center,center" size="450,130" title=" ">
++              <widget name="name" position="10,0" size="430,20" font="Regular;18" halign="left" valign="bottom"/>
++              <widget name="slider" position="10,25" size="430,30" borderWidth="2" borderColor="#cccccc"/>
++              <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="blue" backgroundColor="blue" transparent="1"/>
++              <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" transparent="1"/>
++      </screen>
++
++      <!-- Firmware Upgrade Plugin -->
++      <screen name="FirmwareUpgrade" position="center,center" size="560,175" title="Firmware Upgrade" >
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="125,7" size="80,40" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="330,7" size="80,40" alphatest="blend" />
++
++              <widget source="key_red" render="Label" position="160,0" zPosition="1" size="155,40" font="Regular;20" halign="left" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="365,0" zPosition="1" size="155,40" font="Regular;20" halign="left" valign="center" transparent="1" />
++
++              <widget name="config" zPosition="2" position="0,50" itemHeight="36" size="540,40" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="status" render="Label" position="0,100" zPosition="1" size="540,75" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
++        </screen>
++
++      <screen name="FUFilebrowser" position="center,center" size="500,290" title="File Browser" >
++              <ePixmap pixmap="Vu_HD/buttons/blue.png" position="5,7" size="80,40" alphatest="blend" />
++              <widget source="key_blue" render="Label" position="40,0" zPosition="1" size="300,40" font="Regular;20" halign="left" valign="center" transparent="1"/>
++              <widget name="file_list" position="0,50" size="500,160" scrollbarMode="showOnDemand" />
++
++              <widget source="status" render="Label" position="0,230" zPosition="1" size="500,60" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
++        </screen>
++
++
++      <!-- WLan Setup Plugin -->
++      <screen name="WlanSelection" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">
++              <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
++              <eLabel text="Wireless Network Adapter Selection..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
++              <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
++                      <convert type="ClockToText">Format:%H:%M</convert>
++              </widget>
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
++              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
++              <widget name="menulist" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
++              <widget source="description" render="Label" position="500,140" size="280,360" font="Regular;19" halign="center" valign="center" backgroundColor="#c5c9cc" transparent="1"/>
++      </screen>
++
++      <screen name="WlanSetup" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">   
++              <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
++              <eLabel text="Wireless Network Setup Menu..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
++              <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
++                      <convert type="ClockToText">Format:%H:%M</convert>
++              </widget>
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
++              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
++              <widget name="menulist" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
++              <widget source="description" render="Label" position="500,140" size="280,360" font="Regular;19" halign="center" valign="center" backgroundColor="#c5c9cc" transparent="1"/>
++      </screen>
++
++      <screen name="WlanConfig" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">  
++              <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
++              <eLabel text="Wireless Network Configuration..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
++              <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
++                      <convert type="ClockToText">Format:%H:%M</convert>
++              </widget>
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
++              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
++              <widget name="config" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
++              <widget source="ipaddresstext" render="Label" position="500,160" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="ipaddress" render="Label" position="530,190" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />     
++              <widget source="netmasktext" render="Label" position="500,220" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="netmask" render="Label" position="530,250" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="gatewaytext" render="Label" position="500,280" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="gateway" render="Label" position="530,310" zPosition="1" size="150,26" font="Regular;20"  valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="DNS1text" render="Label" position="500,350" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="DNS1" render="Label" position="530,380" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="DNS2text" render="Label" position="500,410" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="DNS2" render="Label" position="530,440" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget name="VKeyIcon" pixmap="Vu_HD/buttons/key_text.png" position="500,480" zPosition="10" size="35,25" transparent="1" alphatest="on" />
++                <widget name="HelpWindow" pixmap="Vu_HD/vkey_icon.png" position="310,535" zPosition="1" size="1,1" transparent="1" alphatest="on" />
++      </screen>
++
++      <screen name="WlanScanAp" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">
++              <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
++              <eLabel text="Wireless Network AP Scan..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
++              <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
++                      <convert type="ClockToText">Format:%H:%M</convert>
++              </widget>
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/blue.png" position="630,98" size="25,25" alphatest="blend" />
++              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="key_blue" render="Label" position="665,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
++              <widget name="menulist" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
++              <widget source="Address" render="Label" position="490,220" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="ESSID" render="Label" position="490,250" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="Protocol" render="Label" position="490,280" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />      
++              <widget source="Frequency" render="Label" position="490,310" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="Encryption key" render="Label" position="490,340" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="BitRate" render="Label" position="490,370" zPosition="1" size="300,60" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++      </screen>
++
++      <screen name="Wlanstatus" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">
++              <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
++              <eLabel text="Wireless Network Status..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
++              <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
++                      <convert type="ClockToText">Format:%H:%M</convert>
++              </widget>
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
++              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="status" render="Label" position="110,200" size="650,400" transparent="1" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" zPosition="1" />
++      </screen>
++
++      <!-- Wireless Access Point Plugin -->
++      <screen name = "WirelessAccessPoint" position="center,center" size="650,520" title="Wireless Access Point Setup" >
++              <ePixmap pixmap="Vu_HD/buttons/red.png" position="20,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/green.png" position="180,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/yellow.png" position="340,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="Vu_HD/buttons/blue.png" position="500,10" size="140,40" alphatest="on" />
++              <widget source="key_red" render="Label" position="25,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_green" render="Label" position="185,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_yellow" render="Label" position="345,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget source="key_blue" render="Label" position="505,10" zPosition="1" size="140,30" font="Regular;20" halign="center" valign="center" transparent="1" />
++              <widget name="config" zPosition="2" position="10,60" size="630,350" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="current_settings" render="Label" position="10,410" size="630,20" font="Regular;19" halign="center" valign="center" transparent="1" />
++              <widget source="IPAddress_text" render="Label" position="160,440" size="190,21" font="Regular;19" transparent="1" />
++              <widget source="Netmask_text" render="Label" position="160,465" size="190,21" font="Regular;19" transparent="1" />
++              <widget source="Gateway_text" render="Label" position="160,490" size="190,21" font="Regular;19" transparent="1" />
++              <widget source="IPAddress" render="Label" position="370,440" size="240,21" font="Regular;19" transparent="1" />
++              <widget source="Netmask" render="Label" position="370,465" size="240,21" font="Regular;19" transparent="1" />
++              <widget source="Gateway" render="Label" position="370,490" size="240,21" font="Regular;19" transparent="1" />
++      </screen>
++
++      <!-- DeviceManager Plugin -->
++      <screen name="DeviceManager" position="center,center" size="670,400" title="DeviceManager">
++              <ePixmap pixmap="skin_default/buttons/red.png" position="20,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="skin_default/buttons/green.png" position="180,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="skin_default/buttons/yellow.png" position="340,0" size="140,40" alphatest="on" />
++              <ePixmap pixmap="skin_default/buttons/blue.png" position="500,0" size="140,40" alphatest="on" />
++              <widget name="key_red" position="20,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#9f1313" transparent="1" />
++              <widget name="key_green" position="180,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#1f771f" transparent="1" />
++              <widget name="key_yellow" position="340,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#a08500" transparent="1" />
++              <widget name="key_blue" position="500,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#18188b" transparent="1" />
++              <ePixmap pixmap="skin_default/div-h.png" position="0,48" size="670,2" alphatest="on" />
++              <widget source="menu" render="Listbox" position="0,48" size="670,350" scrollbarMode="showOnDemand">
++                      <convert type="TemplatedMultiContent">
++                      {"templates":
++                              {"default": (54,[
++                                              MultiContentEntryText(pos = (100, 0), size = (560, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0), # index 0 is vendor  - model
++                                              MultiContentEntryText(pos = (100, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 1 is Device
++                                              MultiContentEntryText(pos = (230, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 2 is Size
++                                              MultiContentEntryText(pos = (360, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 3), # index 3 is Partitions
++                                              MultiContentEntryText(pos = (490, 32), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 4), # index 4 is Removable
++                                              MultiContentEntryPixmapAlphaTest(pos = (0, 52), size = (670, 2), png = 5), # png 5 is the div pixmap
++                                      ]),
++                              "partitions": (98, [
++                                              MultiContentEntryText(pos = (100, 0), size = (560, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0), # index 1 is Partition
++                                              MultiContentEntryText(pos = (100, 32), size = (560, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 2 is Mounted on
++                                              MultiContentEntryText(pos = (100, 54), size = (560, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 3 UUID
++                                              MultiContentEntryText(pos = (100, 76), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 3), # index 4 Type
++                                              MultiContentEntryText(pos = (230, 76), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 4), # index 5 Size_total
++                                              MultiContentEntryText(pos = (380, 76), size = (200, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 5), # index 6 Size_free
++                                              MultiContentEntryPixmapAlphaTest(pos = (0, 96), size = (670, 2), png = 6), # png 6 is the div pixmap
++                                      ]),
++                              "mountpoint": (54,[
++                                              MultiContentEntryPixmapAlphaTest(pos = (10, 7), size = (30, 30), png = 0), # index 0: picture
++                                              MultiContentEntryText(pos = (40, 0), size = (500, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 1 name
++                                              MultiContentEntryText(pos = (40, 32), size = (500, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 2 path
++                                              MultiContentEntryPixmapAlphaTest(pos = (0, 52), size = (670, 2), png = 5), # index 5 is the div pixmap
++                                      ])
++                              },
++                              "fonts": [gFont("Regular", 22),gFont("Regular", 16),gFont("Regular", 28)],
++                              "itemHeight": 54
++                      }
++                      </convert>
++              </widget>
++      </screen>
++
++      <!-- TranscodingSetup Plugin -->
++      <screen name="TranscodingSetup" position="center,center" size="560,320" >
++              <ePixmap pixmap="skin_default/buttons/red.png" position="30,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="skin_default/buttons/green.png" position="210,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="skin_default/buttons/yellow.png" position="390,10" size="140,40" alphatest="on" />
++              <widget source="key_red" render="Label" position="30,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
++              <widget source="key_green" render="Label" position="210,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
++              <widget source="key_yellow" render="Label" position="390,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" foregroundColor="#ffffff" transparent="1" />
++              <widget name="config" zPosition="2" position="5,70" size="550,120" scrollbarMode="showOnDemand" transparent="1" />
++              <widget source="text" render="Label" position="20,190" size="520,130" font="Regular;18" halign="center" valign="center" />
++      </screen>
++
++      <!-- ZappingModeSelection Plugin -->
++      <screen name="ZappingModeSelection" position="center,center" size="560,250" title="Zapping Mode Selection" >
++              <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
++              <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
++              <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
++              <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
++              <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
++      </screen>
++
 +</skin>
++
 diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
-index 2f7e7c7..832b582 100644
+index 2f7e7c7..f81801a 100644
 --- a/data/fonts/Makefile.am
 +++ b/data/fonts/Makefile.am
 @@ -5,4 +5,7 @@ dist_install_DATA = \
@@ -5698,12 +6479,12 @@ index 2f7e7c7..832b582 100644
 +      tuxtxt.ttf \
 +      MyriadPro-Regular.otf \
 +      MyriadPro-Semibold.otf \
-+      MyriadPro-SemiboldIt.otf 
++      MyriadPro-SemiboldIt.otf
 diff --git a/data/skin.xml b/data/skin.xml
-index cde03f4..77c5f64 100755
+index ccd8eb7..9233610 100755
 --- a/data/skin.xml
 +++ b/data/skin.xml
-@@ -179,11 +179,10 @@
+@@ -150,11 +150,10 @@
                        <convert type="ConditionalShowHide" />
                </widget>
                <!-- Audio icon (is there multichannel audio?) -->
@@ -5717,10 +6498,10 @@ index cde03f4..77c5f64 100755
                <ePixmap pixmap="skin_default/progress_bg.png" position="48,77" size="84,7" transparent="1" alphatest="on" />
                <widget source="session.Event_Now" render="Progress" pixmap="skin_default/progress_small.png" position="50,78" zPosition="1" size="80,5" transparent="1">
 diff --git a/lib/gdi/epng.cpp b/lib/gdi/epng.cpp
-index 972a89d..2629ef8 100644
+index fd33298..d8c1982 100644
 --- a/lib/gdi/epng.cpp
 +++ b/lib/gdi/epng.cpp
-@@ -115,10 +115,71 @@ int loadPNG(ePtr<gPixmap> &result, const char *filename)
+@@ -116,10 +116,71 @@ int loadPNG(ePtr<gPixmap> &result, const char *filename)
                }
                surface->clut.start=0;
                png_read_end(png_ptr, end_info);
@@ -5793,7 +6574,7 @@ index 972a89d..2629ef8 100644
        png_destroy_read_struct(&png_ptr, &info_ptr,&end_info);
        fclose(fp);
 diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
-index 7ddbcbf..46f96a9 100755
+index 688fe50..7bc66dc 100755
 --- a/lib/python/Screens/ChannelSelection.py
 +++ b/lib/python/Screens/ChannelSelection.py
 @@ -2,6 +2,8 @@ from Tools.Profile import profile
@@ -5805,7 +6586,7 @@ index 7ddbcbf..46f96a9 100755
  from Components.ServiceList import ServiceList
  from Components.ActionMap import NumberActionMap, ActionMap, HelpableActionMap
  from Components.MenuList import MenuList
-@@ -703,6 +705,9 @@ class ChannelSelectionBase(Screen):
+@@ -731,6 +733,9 @@ class ChannelSelectionBase(Screen):
                self["key_yellow"] = Button(_("Provider"))
                self["key_blue"] = Button(_("Favourites"))
  
@@ -5815,7 +6596,7 @@ index 7ddbcbf..46f96a9 100755
                self["list"] = ServiceList()
                self.servicelist = self["list"]
  
-@@ -848,25 +853,51 @@ class ChannelSelectionBase(Screen):
+@@ -876,25 +881,51 @@ class ChannelSelectionBase(Screen):
                pos = titleStr.find(']')
                if pos == -1:
                        pos = titleStr.find(')')
@@ -5886,7 +6667,7 @@ index 7ddbcbf..46f96a9 100755
        def moveUp(self):
                self.servicelist.moveUp()
 diff --git a/lib/python/Screens/FixedMenu.py b/lib/python/Screens/FixedMenu.py
-index 0122346..add611b 100644
+index 0122346..c877a19 100644
 --- a/lib/python/Screens/FixedMenu.py
 +++ b/lib/python/Screens/FixedMenu.py
 @@ -20,3 +20,10 @@ class FixedMenu(Screen):
@@ -5899,7 +6680,7 @@ index 0122346..add611b 100644
 +              self["title1"] = StaticText('')
 +              self["title2"] = StaticText('')
 +              #
-+              
++
 diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
 index 2a8801c..20403d8 100755
 --- a/lib/python/Screens/Menu.py
@@ -5992,7 +6773,7 @@ index 2a8801c..20403d8 100755
  
        def createSummary(self):
 diff --git a/skin.py b/skin.py
-index b490f73..bbd9ddd 100755
+index 19da203..f191530 100755
 --- a/skin.py
 +++ b/skin.py
 @@ -50,7 +50,7 @@ def loadSkin(name, scope = SCOPE_SKIN):