Merge branch 'master' of https://github.com/OpenPLi/enigma2 master
authormeo <lupomeo@hotmail.com>
Tue, 12 Jan 2016 15:44:11 +0000 (16:44 +0100)
committermeo <lupomeo@hotmail.com>
Tue, 12 Jan 2016 15:44:11 +0000 (16:44 +0100)
Conflicts:
lib/python/Components/UsageConfig.py
lib/python/Screens/About.py

129 files changed:
configure.ac
data/Makefile.am
data/keymap.xml
data/rc_models/rc_models.cfg
data/skin_default.xml
data/skin_display_dm800se.xml [moved from data/skin_display96.xml with 94% similarity]
data/skin_display_et8500.xml
data/skin_display_vusolo4k.xml [new file with mode: 0644]
enigma2.bb
lib/base/cfile.cpp
lib/base/cfile.h
lib/python/Components/AVSwitch.py
lib/python/Components/Converter/ClientsStreaming.py
lib/python/Components/Converter/EventName.py
lib/python/Components/Converter/FrontendInfo.py
lib/python/Components/Converter/PliExtraInfo.py
lib/python/Components/Converter/RotorPosition.py
lib/python/Components/Converter/ServiceInfo.py
lib/python/Components/Converter/ServiceName.py
lib/python/Components/Converter/StaticText.py
lib/python/Components/Converter/TransponderInfo.py
lib/python/Components/Converter/ValueToPixmap.py
lib/python/Components/HTMLComponent.py
lib/python/Components/HTMLSkin.py
lib/python/Components/InputDevice.py
lib/python/Components/Keyboard.py
lib/python/Components/Label.py
lib/python/Components/Lcd.py
lib/python/Components/MovieList.py
lib/python/Components/Netlink.py
lib/python/Components/NimManager.py
lib/python/Components/ParentalControl.py
lib/python/Components/Playlist.py
lib/python/Components/Renderer/ChannelNumber.py
lib/python/Components/Renderer/Label.py
lib/python/Components/Renderer/NextEpgInfo.py
lib/python/Components/Renderer/Pig.py
lib/python/Components/Renderer/Pixmap.py
lib/python/Components/Renderer/VideoSize.py
lib/python/Components/ResourceManager.py
lib/python/Components/ServiceList.py
lib/python/Components/Sources/CurrentService.py
lib/python/Components/Sources/EventInfo.py
lib/python/Components/Sources/FrontendStatus.py
lib/python/Components/Sources/Source.py
lib/python/Components/SystemInfo.py
lib/python/Components/TuneTest.py
lib/python/Components/UsageConfig.py
lib/python/Components/VideoWindow.py
lib/python/Components/config.py
lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
lib/python/Plugins/Extensions/DVDPlayer/__init__.py
lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpgSetup.py
lib/python/Plugins/Extensions/MediaPlayer/__init__.py
lib/python/Plugins/Extensions/PicturePlayer/ui.py
lib/python/Plugins/Extensions/SocketMMI/SocketMMI.py
lib/python/Plugins/Extensions/SocketMMI/__init__.py
lib/python/Plugins/Extensions/SocketMMI/plugin.py
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
lib/python/Plugins/SystemPlugins/FastScan/plugin.py
lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am [deleted file]
lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/__init__.py [deleted file]
lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am [deleted file]
lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/plugin_frontprocessorupgrade.xml [deleted file]
lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py [deleted file]
lib/python/Plugins/SystemPlugins/Makefile.am
lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/__init__.py [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/flash.png [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_de.jpg [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_en.jpg [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml [deleted file]
lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py [deleted file]
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
lib/python/Plugins/SystemPlugins/SoftwareManager/ImageWizard.py
lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py
lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/python/Screens/About.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/ClockDisplay.py
lib/python/Screens/ConfigMenu.py
lib/python/Screens/EpgSelection.py
lib/python/Screens/FactoryReset.py
lib/python/Screens/Hotkey.py
lib/python/Screens/InfoBar.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/InputBox.py
lib/python/Screens/LocationBox.py
lib/python/Screens/MinuteInput.py
lib/python/Screens/MovieSelection.py
lib/python/Screens/Mute.py
lib/python/Screens/NetworkSetup.py
lib/python/Screens/PVRState.py
lib/python/Screens/Satconfig.py
lib/python/Screens/ScanSetup.py
lib/python/Screens/ServiceStopScreen.py
lib/python/Screens/SimpleSummary.py
lib/python/Screens/SleepTimerEdit.py
lib/python/Screens/TimerEntry.py
lib/python/Tools/Alternatives.py
lib/python/Tools/Directories.py
lib/python/Tools/Downloader.py
lib/python/Tools/TextBoundary.py
lib/python/Tools/Transponder.py
lib/python/enigma_py_patcher.py
main/enigma.cpp
mytest.py
po/et.po
po/fr.po
po/pl.po
po/ru.po
skin.py
tools/host_tools/FormatConverter/datasource.py
tools/host_tools/FormatConverter/input.py
tools/host_tools/FormatConverter/lamedb2satxml.py
tools/host_tools/FormatConverter/main.py
tools/host_tools/FormatConverter/satxml.py

index 70a15a0..3e0da55 100644 (file)
@@ -58,8 +58,8 @@ if test `echo "$BOXTYPE" | cut -b 1-2` == "dm"; then
        AC_DEFINE(DREAMBOX, 1, [Dreambox hardware])
        AC_DEFINE(KEY_PLAY_ACTUALLY_IS_KEY_PLAYPAUSE, 1,[define when rc sends a KEY_PLAY event for its KEY_PLAYPAUSE key])
 fi
-if test "$BOXTYPE" == "vusolo2" -o "$BOXTYPE" == "vuduo2" -o "$BOXTYPE" == "vusolose"; then
-       AC_DEFINE(VUPLUS_RC_WORKAROUND, 1, [workaround for problem with vusolo2/vuduo2/vusolose event/rc driver])
+if test "$BOXTYPE" == "vusolo2" -o "$BOXTYPE" == "vuduo2" -o "$BOXTYPE" == "vusolose" -o "$BOXTYPE" == "vusolo4k" -o "$BOXTYPE" == "vuzero"; then
+       AC_DEFINE(VUPLUS_RC_WORKAROUND, 1, [workaround for problem with vuplus event/rc driver])
 fi
 
 AC_ARG_WITH(textlcd,
@@ -72,17 +72,6 @@ if test x"$withtextlcd" != xno ; then
 fi
 AM_CONDITIONAL(HAVE_TEXTLCD, test x"$withtextlcd" != xno)
 
-AC_ARG_WITH(colorlcd,
-       AC_HELP_STRING([--with-colorlcd], [use 96x64 16bpp color display, yes or no]),
-       [[withcolorlcd=$withval]],
-       [[withcolorlcd=no]]
-)
-if test x"$withcolorlcd" != xno ; then
-       AC_DEFINE(HAVE_COLORLCD, 1,[Define when using a 96x64 color display device])
-fi
-AM_CONDITIONAL(HAVE_COLORLCD, test x"$withcolorlcd" != xno)
-
-
 AC_ARG_WITH(oldpvr,
        AC_HELP_STRING([--with-oldpvr], [use /dev/misc/pvr instead of /dev/dvb/adapterX/dvrX, yes or no]),
        [[witholdpvr=$withval]],
@@ -266,8 +255,6 @@ lib/python/Plugins/SystemPlugins/DefaultServicesScanner/Makefile
 lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile
 lib/python/Plugins/SystemPlugins/DiseqcTester/Makefile
 lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile
-lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile
-lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile
 lib/python/Plugins/SystemPlugins/Hotplug/Makefile
 lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile
 lib/python/Plugins/SystemPlugins/Makefile
@@ -275,8 +262,6 @@ lib/python/Plugins/SystemPlugins/TempFanControl/Makefile
 lib/python/Plugins/SystemPlugins/TempFanControl/meta/Makefile
 lib/python/Plugins/SystemPlugins/NetworkWizard/Makefile
 lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile
-lib/python/Plugins/SystemPlugins/NFIFlash/Makefile
-lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile
 lib/python/Plugins/SystemPlugins/PositionerSetup/Makefile
 lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile
 lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/Makefile
index 97a3ca2..654555e 100644 (file)
@@ -21,12 +21,8 @@ dist_pkgdata_DATA = \
 if HAVE_TEXTLCD
 dist_pkgdata_DATA += skin_text.xml
 else
-if HAVE_COLORLCD
-dist_pkgdata_DATA += skin_display96.xml
-else
 dist_pkgdata_DATA += skin_display.xml
 endif
-endif
 
 skin_display.xml: $(srcdir)/skin_display_default.xml
        test -f $(srcdir)/skin_display_$(BOXTYPE).xml && cp $(srcdir)/skin_display_$(BOXTYPE).xml skin_display.xml || cp $(srcdir)/skin_display_default.xml skin_display.xml
index 8ed83cb..53d5349 100644 (file)
 
        <map context="InfobarActions">
                <key id="KEY_VIDEO" mapto="showMovies" flags="m"/>
-               <key id="KEY_RADIO" mapto="showRadio" flags="m"/>
-               <key id="KEY_TV" mapto="showTv" flags="m"/>
+               <key id="KEY_RADIO" mapto="showRadio" flags="b"/>
+               <key id="KEY_TV" mapto="showTv" flags="b"/>
                <key id="KEY_FILE" mapto="showMovies" flags="m"/>
                <key id="KEY_TEXT" mapto="showText" flags="m"/>
        </map>
                </device>
                <key id="KEY_EXIT" mapto="exit" flags="m"/>
                <key id="KEY_ESC" mapto="exit" flags="m"/>
-               <key id="KEY_TV" mapto="exit" flags="m"/>
+               <key id="KEY_TV" mapto="exit" flags="b"/>
        </map>
 
        <map context="GlobalActions">
        <map context="InfobarTimeshiftActions">
                <device name="dreambox remote control (native)">
                        <key id="KEY_YELLOW" mapto="timeshiftStart" flags="b"/>
-                       <key id="KEY_TV" mapto="timeshiftStop" flags="m"/>
+                       <key id="KEY_TV" mapto="timeshiftStop" flags="b"/>
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_YELLOW" mapto="timeshiftStart" flags="m"/>
        </map>
 
        <map context="MoviePlayerActions">
-               <key id="KEY_TV" mapto="leavePlayer" flags="m"/>
+               <key id="KEY_TV" mapto="leavePlayer" flags="b"/>
                <key id="KEY_STOP" mapto="leavePlayer" flags="m"/>
                <key id="KEY_EXIT" mapto="leavePlayerOnExit" flags="m"/>
                <key id="KEY_ESC" mapto="leavePlayerOnExit" flags="m"/>
        </map>
 
        <map context="TvRadioActions">
-               <key id="KEY_TV" mapto="keyTV" flags="m"/>
-               <key id="KEY_RADIO" mapto="keyRadio" flags="m"/>
+               <key id="KEY_TV" mapto="keyTV" flags="b"/>
+               <key id="KEY_RADIO" mapto="keyRadio" flags="b"/>
        </map>
 
        <map context="TimerEditActions">
                        <key id="KEY_TV" mapto="tv" flags="m"/>
                        <key id="KEY_STOP" mapto="tv" flags="m"/>
                        <key id="KEY_RADIO" mapto="dvdAudioMenu" flags="l"/>
-                       <key id="KEY_RADIO" mapto="nextAudioTrack" flags="m"/>
+                       <key id="KEY_RADIO" mapto="nextAudioTrack" flags="b"/>
                        <key id="KEY_TEXT" mapto="nextSubtitleTrack" flags="m"/>
                        <key id="KEY_VIDEO" mapto="nextAngle" flags="m"/>
                </device>
                <key id="KEY_BLUE" mapto="blue" flags="b"/>
                <key id="KEY_BLUE" mapto="blue_long" flags="l"/>
                <key id="KEY_RECORD" mapto="rec" flags="m"/>
-               <key id="KEY_RADIO" mapto="radio" flags="m"/>
-               <key id="KEY_TV" mapto="showTv" flags="m"/>
+               <key id="KEY_RADIO" mapto="radio" flags="b"/>
+               <key id="KEY_RADIO" mapto="radio_long" flags="l"/>
+               <key id="KEY_TV" mapto="showTv" flags="b"/>
+               <key id="KEY_TV" mapto="showTv_long" flags="l"/>
                <key id="KEY_TEXT" mapto="text" flags="m"/>
                <key id="KEY_HELP" mapto="displayHelp" flags="b"/>
                <key id="KEY_HELP" mapto="displayHelp_long" flags="l"/>
index 01e65e2..0d5cef8 100644 (file)
@@ -39,6 +39,7 @@ vuduo2   vuduo2
 vuduo    vu
 vusolo2  vu
 vusolo   vu
+vusolo4k   vu
 vuultimo vuultimo
 vuuno    vu
 xp1000   xp1000
index 688caf2..fb51a04 100644 (file)
                <color color="#ffffff" name="WindowTitleForeground"/>
                <color color="#000000" name="WindowTitleBackground"/>
        </windowstyle>
-       <!-- id=2 is for dm800se 16-bit OLED -->
-       <windowstyle type="skinned" id="2">
-               <color name="Background" color="#000000"/>
-               <color name="LabelForeground" color="#ffffff"/>
-               <color name="ListboxBackground" color="#000000"/>
-               <color name="ListboxForeground" color="#ffffff"/>
-               <color name="ListboxSelectedBackground" color="#000000"/>
-               <color name="ListboxSelectedForeground" color="#ffffff"/>
-               <color name="ListboxMarkedBackground" color="#000000"/>
-               <color name="ListboxMarkedForeground" color="#ffffff"/>
-               <color name="ListboxMarkedAndSelectedBackground" color="#000000"/>
-               <color name="ListboxMarkedAndSelectedForeground" color="#ffffff"/>
-               <color name="WindowTitleForeground" color="#ffffff"/>
-               <color name="WindowTitleBackground" color="#000000"/>
-       </windowstyle>
        <fonts>
-               <font filename="nmsbd.ttf" name="Regular" scale="90" />
-               <font filename="andale.ttf" name="Fixed" scale="100" />
-               <font filename="tuxtxt.ttf" name="Console" scale="100" />
+               <font filename="nmsbd.ttf" name="Regular" scale="90"/>
+               <font filename="andale.ttf" name="Fixed" scale="100"/>
+               <font filename="tuxtxt.ttf" name="Console" scale="100"/>
                <!-- Arabic and Thai char set replacement -->
-               <font filename="ae_AlMateen.ttf" name="Replacement" scale="100" replacement="1" />
+               <font filename="ae_AlMateen.ttf" name="Replacement" scale="100" replacement="1"/>
                <!-- Aliases that should be present -->
-               <alias name="Body" font="Regular" size="20" height="25" />
-               <alias name="ChoiceList" font="Regular" size="20" height="25" />
-               <alias name="TextNormal" font="Regular" size="20" height="24" />
+               <alias name="Body" font="Regular" size="20" height="25"/>
+               <alias name="ChoiceList" font="Regular" size="20" height="25"/>
+               <alias name="TextNormal" font="Regular" size="20" height="24"/>
        </fonts>
        <colors>
-               <color name="white" value="#ffffff" />
-               <color name="black" value="#000000" />
-               <color name="dark" value="#25062748" />
-               <color name="menu" value="#25062748" />
-               <color name="red" value="#f23d21" />
-               <color name="green" value="#389416" />
-               <color name="blue" value="#0064c7" />
-               <color name="yellow" value="#bab329" />
-               <color name="transparent" value="#ffffffff" />
-               <color name="transpBlack" value="#80000000" />
-               <color name="transpWhite" value="#80ffffff" />
-               <color name="background" value="#25062748" />
-               <color name="foreground" value="#ffffff" />
+               <color name="white" value="#ffffff"/>
+               <color name="black" value="#000000"/>
+               <color name="dark" value="#25062748"/>
+               <color name="menu" value="#25062748"/>
+               <color name="red" value="#f23d21"/>
+               <color name="green" value="#389416"/>
+               <color name="blue" value="#0064c7"/>
+               <color name="yellow" value="#bab329"/>
+               <color name="transparent" value="#ffffffff"/>
+               <color name="transpBlack" value="#80000000"/>
+               <color name="transpWhite" value="#80ffffff"/>
+               <color name="background" value="#25062748"/>
+               <color name="foreground" value="#ffffff"/>
                <color name="secondBG" value="#18101214"/>
        </colors>
        <!-- Screwed Stone II skin (skin_default.xml) /Nemesis -->
        <!-- About screen -->
        <screen name="About" position="center,center" size="540,490" title="About">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="135,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="270,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="405,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="135,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_blue" position="405,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="135,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="270,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="405,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="135,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_blue" position="405,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
                <widget name="AboutScrollLabel" font="Regular;20" position="0,40" size="540,450" zPosition="2" halign="center"/>
        </screen>
        <!-- MemoryInfo screen -->
        <screen name="MemoryInfo" position="center,center" size="540,453" title="Memory Info">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="135,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="270,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="405,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="135,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_blue" position="405,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="lmemtext" position= "5,40" size="215,413" font="Regular;18" zPosition="1" halign="left" transparent="1" />
-               <widget name="lmemvalue" position="5,40" size="215,413" font="Regular;18" zPosition="2" halign="right" transparent="1" />
-               <widget name="rmemtext" position= "320,40" size="215,413" font="Regular;18" zPosition="1" halign="left" transparent="1" />
-               <widget name="rmemvalue" position="320,40" size="215,413" font="Regular;18" zPosition="2" halign="right" transparent="1" />
-               <widget name="pfree" position="245,100" size="70,20" font="Regular;14" zPosition="1" halign="right" backgroundColor="secondBG" transparent="1" />
-               <widget name="pused" position="245,382" size="70,20" font="Regular;14" zPosition="1" halign="right" backgroundColor="secondBG" transparent="1" />
-               <widget name="slide" position="255,42" size="18,410" render="Progress" zPosition="1" borderWidth="1" orientation="orBottomToTop" />
-               <widget name="info" position="330,370" size="200,100" font="Regular;14" zPosition="1" halign="center" foregroundColor="#909090" transparent="1" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="135,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="270,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="405,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="135,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_blue" position="405,0" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="lmemtext" position= "5,40" size="215,413" font="Regular;18" zPosition="1" halign="left" transparent="1"/>
+               <widget name="lmemvalue" position="5,40" size="215,413" font="Regular;18" zPosition="2" halign="right" transparent="1"/>
+               <widget name="rmemtext" position= "320,40" size="215,413" font="Regular;18" zPosition="1" halign="left" transparent="1"/>
+               <widget name="rmemvalue" position="320,40" size="215,413" font="Regular;18" zPosition="2" halign="right" transparent="1"/>
+               <widget name="pfree" position="245,100" size="70,20" font="Regular;14" zPosition="1" halign="right" backgroundColor="secondBG" transparent="1"/>
+               <widget name="pused" position="245,382" size="70,20" font="Regular;14" zPosition="1" halign="right" backgroundColor="secondBG" transparent="1"/>
+               <widget name="slide" position="255,42" size="18,410" render="Progress" zPosition="1" borderWidth="1" orientation="orBottomToTop"/>
+               <widget name="info" position="330,370" size="200,100" font="Regular;14" zPosition="1" halign="center" foregroundColor="#909090" transparent="1"/>
                <widget name="params" rowsincolumn="23"/>
        </screen>
        <!-- Adapter setup -->
-       <screen name="AdapterSetup" position="center,center" size="560,400" title="Network setup" >
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
+       <screen name="AdapterSetup" position="center,center" size="560,400" title="Network setup">
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
 
-               <widget name="config" position="5,40" size="550,150" scrollbarMode="showOnDemand" />
-               <ePixmap pixmap="skin_default/div-h.png" position="0,195" zPosition="1" size="560,2" />
+               <widget name="config" position="5,40" size="550,150" scrollbarMode="showOnDemand"/>
+               <ePixmap pixmap="skin_default/div-h.png" position="0,195" zPosition="1" size="560,2"/>
                <widget source="DNS1text" render="Label" position="5,200" size="190,21" zPosition="1" font="Regular;19" halign="left" valign="center" backgroundColor="#25062748" transparent="1"/>
                <widget source="DNS2text" render="Label" position="5,220" size="190,21" zPosition="1" font="Regular;19" halign="left" valign="center" backgroundColor="#25062748" transparent="1"/>
                <widget source="DNS1" render="Label" position="400,200" size="145,21" zPosition="1" font="Regular;18" halign="right" valign="center" backgroundColor="#25062748" transparent="1"/>
                <widget source="DNS2" render="Label" position="400,220" size="145,21" zPosition="1" font="Regular;18" halign="right" valign="center" backgroundColor="#25062748" transparent="1"/>
-               <ePixmap pixmap="skin_default/div-h.png" position="0,240" zPosition="1" size="550,2" />
+               <ePixmap pixmap="skin_default/div-h.png" position="0,240" zPosition="1" size="550,2"/>
 
-               <widget source="introduction" render="Label" position="50,250" size="380,20" font="Regular;20" halign="center" />
-               <widget source="IPtext" render="Label" position="100,280" size="190,21" zPosition="1" font="Regular;19" />
-               <widget source="Netmasktext" render="Label" position="100,305" size="190,21" zPosition="1" font="Regular;19" />
-               <widget source="Gatewaytext" render="Label" position="100,330" size="190,21" zPosition="1" font="Regular;19" />
-               <widget source="IP" render="Label" position="300,280" size="190,21" zPosition="1" font="Regular;19" />
-               <widget source="Mask" render="Label" position="300,305" size="190,21" zPosition="1" font="Regular;19" />
-               <widget source="Gateway" render="Label" position="300,330" size="1900,21" zPosition="1" font="Regular;19" />
+               <widget source="introduction" render="Label" position="50,250" size="380,20" font="Regular;20" halign="center"/>
+               <widget source="IPtext" render="Label" position="100,280" size="190,21" zPosition="1" font="Regular;19"/>
+               <widget source="Netmasktext" render="Label" position="100,305" size="190,21" zPosition="1" font="Regular;19"/>
+               <widget source="Gatewaytext" render="Label" position="100,330" size="190,21" zPosition="1" font="Regular;19"/>
+               <widget source="IP" render="Label" position="300,280" size="190,21" zPosition="1" font="Regular;19"/>
+               <widget source="Mask" render="Label" position="300,305" size="190,21" zPosition="1" font="Regular;19"/>
+               <widget source="Gateway" render="Label" position="300,330" size="1900,21" zPosition="1" font="Regular;19"/>
 
-               <ePixmap pixmap="skin_default/div-h.png" position="0,350" zPosition="1" size="560,2" />
-               <widget source="Adaptertext" render="Label" position="10,355" size="120,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1" />
-               <widget source="Adapter" render="Label" position="120,355" size="400,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1" />
+               <ePixmap pixmap="skin_default/div-h.png" position="0,350" zPosition="1" size="560,2"/>
+               <widget source="Adaptertext" render="Label" position="10,355" size="120,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1"/>
+               <widget source="Adapter" render="Label" position="120,355" size="400,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1"/>
                <widget source="introduction2" render="Label" position="10,380" size="540,21" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
-               <widget source="VKeyIcon" render="Pixmap" pixmap="skin_default/buttons/key_text.png" position="10,380" zPosition="10" size="35,25" transparent="1" alphatest="on" >
-                       <convert type="ConditionalShowHide" />
+               <widget source="VKeyIcon" render="Pixmap" pixmap="skin_default/buttons/key_text.png" position="10,380" zPosition="10" size="35,25" transparent="1" alphatest="on">
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <widget name="HelpWindow" pixmap="skin_default/vkey_icon.png" position="160,315" zPosition="1" size="1,1" transparent="1" alphatest="on" />
+               <widget name="HelpWindow" pixmap="skin_default/vkey_icon.png" position="160,315" zPosition="1" size="1,1" transparent="1" alphatest="on"/>
        </screen>
 
-       <screen name="AdapterSetupConfiguration" position="center,center" size="560,400" title="Network configuration..." >
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <ePixmap pixmap="skin_default/border_menu.png" position="5,45" zPosition="1" size="250,300" transparent="1" alphatest="on" />
-               <widget name="menulist" position="15,55" size="230,260" zPosition="10" scrollbarMode="showOnDemand" />
-               <widget source="description" render="Label" position="305,50" size="230,300" font="Regular;19" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
-               <ePixmap pixmap="skin_default/div-h.png" position="0,350" zPosition="1" size="560,2" />
-               <widget source="IFtext" render="Label" position="10,355" size="120,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1" />
-               <widget source="IF" render="Label" position="120,355" size="400,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1" />
+       <screen name="AdapterSetupConfiguration" position="center,center" size="560,400" title="Network configuration...">
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <ePixmap pixmap="skin_default/border_menu.png" position="5,45" zPosition="1" size="250,300" transparent="1" alphatest="on"/>
+               <widget name="menulist" position="15,55" size="230,260" zPosition="10" scrollbarMode="showOnDemand"/>
+               <widget source="description" render="Label" position="305,50" size="230,300" font="Regular;19" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
+               <ePixmap pixmap="skin_default/div-h.png" position="0,350" zPosition="1" size="560,2"/>
+               <widget source="IFtext" render="Label" position="10,355" size="120,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1"/>
+               <widget source="IF" render="Label" position="120,355" size="400,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1"/>
                <widget source="Statustext" render="Label" position="10,375" size="115,21" zPosition="10" font="Regular;20" halign="left" backgroundColor="#25062748" transparent="1"/>
                <widget name="statuspic" pixmaps="skin_default/buttons/button_green.png,skin_default/buttons/button_green_off.png" position="130,380" zPosition="10" size="15,16" transparent="1" alphatest="on"/>
        </screen>
        <!-- Audio selection -->
        <screen name="AudioSelection" position="center,center" size="485,330" title="Audio">
-               <widget name="config" position="50,10" size="425,110" scrollbarMode="showOnDemand" />
+               <widget name="config" position="50,10" size="425,110" scrollbarMode="showOnDemand"/>
                <widget source="key_red" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="10,10" size="35,25" alphatest="on">
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
                <widget source="key_green" render="Pixmap" pixmap="skin_default/buttons/key_green.png" position="10,35" size="35,25" alphatest="on">
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
                <widget source="key_yellow" render="Pixmap" pixmap="skin_default/buttons/key_yellow.png" position="10,60" size="35,25" alphatest="on">
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
                <widget source="key_blue" render="Pixmap" pixmap="skin_default/buttons/key_blue.png" position="10,85" size="35,25" alphatest="on">
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <ePixmap pixmap="skin_default/div-h.png" position="10,112" zPosition="10" size="465,2" />
-               <widget source="streams" render="Listbox" scrollbarMode="showOnDemand" position="10,120" size="465,200" zPosition="3" transparent="1" >
+               <ePixmap pixmap="skin_default/div-h.png" position="10,112" zPosition="10" size="465,2"/>
+               <widget source="streams" render="Listbox" scrollbarMode="showOnDemand" position="10,120" size="465,200" zPosition="3" transparent="1">
                        <convert type="TemplatedMultiContent">
                                {"templates":
                                        {"default": (25, [
        </screen>
        <!-- Bouquet selector -->
        <screen name="BouquetSelector" position="center,center" size="300,240" title="Select a bouquet">
-               <widget name="menu" position="10,10" size="290,225" scrollbarMode="showOnDemand" />
+               <widget name="menu" position="10,10" size="290,225" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Channel context menu -->
        <screen name="ChannelContextMenu" position="center,center" size="350,255" title="Channellist menu">
-               <widget name="menu" position="10,10" size="340,230" scrollbarMode="showOnDemand" />
+               <widget name="menu" position="10,10" size="340,230" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Channel selection - TV -->
        <screen name="ChannelSelection" position="center,center" size="560,430" title="Channel selection">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="list" position="0,40" size="560,280" scrollbarMode="showOnDemand" />
-               <ePixmap pixmap="skin_default/border_eventinfo.png" position="0,321" zPosition="1" size="560,103" transparent="1" alphatest="on" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="list" position="0,40" size="560,280" scrollbarMode="showOnDemand"/>
+               <ePixmap pixmap="skin_default/border_eventinfo.png" position="0,321" zPosition="1" size="560,103" transparent="1" alphatest="on"/>
                <widget source="ServiceEvent" render="Label" position="10,327" zPosition="1" size="460,20" font="Regular;19" noWrap="1">
                        <convert type="EventName">Name</convert>
                </widget>
-               <ePixmap pixmap="skin_default/icons/clock.png" position="483,329" zPosition="1" size="14,14" alphatest="on" />
+               <ePixmap pixmap="skin_default/icons/clock.png" position="483,329" zPosition="1" size="14,14" alphatest="on"/>
                <widget source="global.CurrentTime" render="Label" position="500,327" zPosition="1" size="50,20" font="Regular;19" halign="right">
                        <convert type="ClockToText"></convert>
                </widget>
-               <widget source="ServiceEvent" render="Label" position="210,347" zPosition="1" size="260,20" font="Regular;19" halign="right" noWrap="1" >
+               <widget source="ServiceEvent" render="Label" position="210,347" zPosition="1" size="260,20" font="Regular;19" halign="right" noWrap="1">
                        <convert type="ServiceName">Name</convert>
                </widget>
-               <widget source="ServiceEvent" render="Label" position="10,347" zPosition="1" size="50,22" font="Regular;19" >
+               <widget source="ServiceEvent" render="Label" position="10,347" zPosition="1" size="50,22" font="Regular;19">
                        <convert type="EventTime">StartTime</convert>
                        <convert type="ClockToText"></convert>
                </widget>
        </screen>
        <!-- Channel selection - Radio -->
        <screen name="ChannelSelectionRadio" position="center,95" size="560,298" title="Channel selection">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="list" position="0,45" size="560,252" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="list" position="0,45" size="560,252" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Choice box -->
        <screen name="ChoiceBox" position="center,center" size="550,400" title="Input">
-               <widget name="text" position="top" size="*,2h" font="TextNormal" />
-               <widget name="list" position="fill" scrollbarMode="showOnDemand" />
+               <widget name="text" position="top" size="*,2h" font="TextNormal"/>
+               <widget name="list" position="fill" scrollbarMode="showOnDemand"/>
                <applet type="onLayoutFinish">
 self.autoResize()
                </applet>
        </screen>
        <!-- Hotkey -->
        <screen name="HotkeySetup" position="center,center" size="560,400" title="Input">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/key_0.png" position="520,0" size="35,25" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="list" position="0,45" size="280,350" scrollbarMode="showOnDemand" />
-               <widget name="choosen" position="280,45" size="280,350" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/key_0.png" position="520,0" size="35,25" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="list" position="0,45" size="280,350" scrollbarMode="showOnDemand"/>
+               <widget name="choosen" position="280,45" size="280,350" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Common interface -->
        <screen name="MMIDialog" position="center,center" size="450,270">
-               <widget name="title" position="10,10" size="430,25" font="Regular;23" />
-               <widget name="subtitle" position="10,35" size="430,25" font="Regular;23" />
-               <widget name="entries" position="10,70" size="430,150" scrollbarMode="showOnDemand" />
-               <widget name="bottom" position="10,230" size="430,25" font="Regular;23" />
+               <widget name="title" position="10,10" size="430,25" font="Regular;23"/>
+               <widget name="subtitle" position="10,35" size="430,25" font="Regular;23"/>
+               <widget name="entries" position="10,70" size="430,150" scrollbarMode="showOnDemand"/>
+               <widget name="bottom" position="10,230" size="430,25" font="Regular;23"/>
        </screen>
        <!-- Common interface - selection -->
        <screen name="CiSelection" position="center,center" size="440,185" title="Common Interface">
-               <widget name="text" position="10,10" size="430,25" font="Regular;23" />
-               <widget name="entries" position="10,55" size="420,125" scrollbarMode="showOnDemand" />
+               <widget name="text" position="10,10" size="430,25" font="Regular;23"/>
+               <widget name="entries" position="10,55" size="420,125" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Console -->
        <screen name="Console" position="center,center" size="560,430" title="Command execution...">
-               <widget name="text" position="10,10" size="540,420" font="Console;14" />
+               <widget name="text" position="10,10" size="540,420" font="Console;14"/>
        </screen>
        <!-- Clock display -->
        <screen name="clockDisplay" position="300,100" size="300,300">
-               <widget name="okbutton" position="10,10" size="280,40" />
-               <widget name="title" position="10,120" size="280,50" />
-               <widget name="theClock" position="10,60" size="280,50" />
+               <widget name="okbutton" position="10,10" size="280,40"/>
+               <widget name="title" position="10,120" size="280,50"/>
+               <widget name="theClock" position="10,60" size="280,50"/>
        </screen>
        <!-- Config OSD -->
        <screen name="configOSD" position="center,center" size="460,350" title="OSD settings">
-               <widget name="okbutton" position="20,270" size="205,40" />
-               <widget name="txt_alpha" position="20,20" size="110,20" />
-               <widget name="sld_alpha" position="150,20" size="290,20" />
-               <widget name="txt_brightness" position="20,60" size="120,20" />
-               <widget name="sld_brightness" position="150,20" size="290,20" />
-               <widget name="txt_gamma" position="20,100" size="120,20" />
-               <widget name="sld_gamma" position="150,100" size="290,20" />
+               <widget name="okbutton" position="20,270" size="205,40"/>
+               <widget name="txt_alpha" position="20,20" size="110,20"/>
+               <widget name="sld_alpha" position="150,20" size="290,20"/>
+               <widget name="txt_brightness" position="20,60" size="120,20"/>
+               <widget name="sld_brightness" position="150,20" size="290,20"/>
+               <widget name="txt_gamma" position="20,100" size="120,20"/>
+               <widget name="sld_gamma" position="150,100" size="290,20"/>
        </screen>
        <!-- Config test -->
        <screen name="configTest" position="300,100" size="300,300" title="config menu">
-               <widget name="config" position="10,30" size="420,220" />
+               <widget name="config" position="10,30" size="420,220"/>
        </screen>
        <!-- Default wizard -->
-       <screen name="DefaultWizard" position="fill" title="Welcome..." flags="wfNoBorder" >
+       <screen name="DefaultWizard" position="fill" title="Welcome..." flags="wfNoBorder">
                <panel name="WizardMarginsTemplate"/>
                <panel name="WizardPictureLangTemplate"/>
                <panel name="RemoteControlTemplate"/>
-               <panel position="left" size="10,*" />
-               <panel position="right" size="10,*" />
+               <panel position="left" size="10,*"/>
+               <panel position="right" size="10,*"/>
                <panel position="fill">
-                       <widget name="text" position="top" size="*,270" font="Regular;23" valign="center" />
+                       <widget name="text" position="top" size="*,270" font="Regular;23" valign="center"/>
                        <panel position="fill" layout="stack">
-                               <widget source="list" render="Listbox" position="fill" scrollbarMode="showOnDemand" >
-                                       <convert type="StringList" />
+                               <widget source="list" render="Listbox" position="fill" scrollbarMode="showOnDemand">
+                                       <convert type="StringList"/>
                                </widget>
-                               <widget name="config" position="fill" zPosition="1" scrollbarMode="showOnDemand" transparent="1" />
+                               <widget name="config" position="fill" zPosition="1" scrollbarMode="showOnDemand" transparent="1"/>
                        </panel>
                </panel>
        </screen>
        <!-- unhandled key pressed -->
        <screen name="UnhandledKey" flags="wfNoBorder" position="620,50" size="34,45" title="UnhandledKey" zPosition="100" backgroundColor="transparent">
-               <widget name="UnhandledKeyPixmap" pixmap="skin_default/unhandled-key.png" position="0,0" size="34,45" alphatest="off" />
+               <widget name="UnhandledKeyPixmap" pixmap="skin_default/unhandled-key.png" position="0,0" size="34,45" alphatest="off"/>
        </screen>
        <!-- EPG Selection - Single -->
        <screen name="EPGSelection" position="center,center" size="560,430" title="EPG selection">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="list" position="0,40" size="560,375" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="list" position="0,40" size="560,375" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- EPG Selection - Multi -->
        <screen name="EPGSelectionMulti" position="center,center" size="560,430" title="EPG selection">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <ePixmap pixmap="skin_default/border_epg.png" position="5,70" size="551,361" alphatest="on" />
-               <widget name="now_button_sel" pixmap="skin_default/epg_now.png" position="5,50" zPosition="1" size="320,25" alphatest="on" />
-               <widget name="next_button_sel" pixmap="skin_default/epg_next.png" position="5,50" zPosition="1" size="320,25" alphatest="on" />
-               <widget name="more_button_sel" pixmap="skin_default/epg_more.png" position="5,50" zPosition="1" size="320,25" alphatest="on" />
-               <widget name="now_text" position="5,50" zPosition="2" size="108,22" text="NOW" font="Regular;16" halign="center" valign="center" backgroundColor="background" transparent="1" />
-               <widget name="next_text" position="111,50" zPosition="2" size="108,22" text="NEXT" font="Regular;16" halign="center" valign="center" backgroundColor="background" transparent="1" />
-               <widget name="more_text" position="216,50" zPosition="2" size="108,22" text="MORE" font="Regular;16" halign="center" valign="center" backgroundColor="background" transparent="1" />
-               <widget name="date" position="410,35" size="140,45" font="Regular;18" valign="center" halign="right" />
-               <widget name="list" position="11,75" size="540,350" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <ePixmap pixmap="skin_default/border_epg.png" position="5,70" size="551,361" alphatest="on"/>
+               <widget name="now_button_sel" pixmap="skin_default/epg_now.png" position="5,50" zPosition="1" size="320,25" alphatest="on"/>
+               <widget name="next_button_sel" pixmap="skin_default/epg_next.png" position="5,50" zPosition="1" size="320,25" alphatest="on"/>
+               <widget name="more_button_sel" pixmap="skin_default/epg_more.png" position="5,50" zPosition="1" size="320,25" alphatest="on"/>
+               <widget name="now_text" position="5,50" zPosition="2" size="108,22" text="NOW" font="Regular;16" halign="center" valign="center" backgroundColor="background" transparent="1"/>
+               <widget name="next_text" position="111,50" zPosition="2" size="108,22" text="NEXT" font="Regular;16" halign="center" valign="center" backgroundColor="background" transparent="1"/>
+               <widget name="more_text" position="216,50" zPosition="2" size="108,22" text="MORE" font="Regular;16" halign="center" valign="center" backgroundColor="background" transparent="1"/>
+               <widget name="date" position="410,35" size="140,45" font="Regular;18" valign="center" halign="right"/>
+               <widget name="list" position="11,75" size="540,350" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Eventview context menu -->
-       <screen name="EventViewContextMenu" position="150,160" size="400,260" title="Event view menu" >
-               <widget name="menu" position="10,10" size="390,250" scrollbarMode="showOnDemand" />
+       <screen name="EventViewContextMenu" position="150,160" size="400,260" title="Event view menu">
+               <widget name="menu" position="10,10" size="390,250" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Eventview -->
        <screen name="EventView" position="center,center" size="560,430" title="Event view">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="epg_description" position="10,50" size="540,330" font="Regular;22" />
-               <widget name="datetime" position="10,395" size="130,25" font="Regular;22" />
-               <widget name="duration" position="140,395" size="100,25" font="Regular;22" />
-               <widget name="channel" position="240,395" size="305,25" font="Regular;22" halign="right" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="epg_description" position="10,50" size="540,330" font="Regular;22"/>
+               <widget name="datetime" position="10,395" size="130,25" font="Regular;22"/>
+               <widget name="duration" position="140,395" size="100,25" font="Regular;22"/>
+               <widget name="channel" position="240,395" size="305,25" font="Regular;22" halign="right"/>
        </screen>
        <!-- Graphical Multi EPG -->
        <screen name="GraphMultiEPG" position="center,center" size="560,435" title="Electronic Program Guide">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="timeline_text" position="0,41" size="560,20" />
-               <widget name="list" position="0,65" size="560,270" EntryBorderColor="#071930" EntryBackgroundColor="#2f4964" EntryBackgroundColorSelected="#25688caf" scrollbarMode="showOnDemand" />
-               <eLabel position="0,41" size="560,1" backgroundColor="#2f4964" zPosition="1" />
-               <eLabel position="0,65" size="560,2" backgroundColor="#2f4964" zPosition="1" />
-               <eLabel position="0,335" size="560,2" backgroundColor="#2f4964" zPosition="1" />
-               <eLabel position="530,65" size="1,270" backgroundColor="#2f4964" zPosition="1" />
-               <widget name="timeline0" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png" />
-               <widget name="timeline1" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png" />
-               <widget name="timeline2" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png" />
-               <widget name="timeline3" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png" />
-               <widget name="timeline4" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png" />
-               <widget name="timeline5" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png" />
-               <widget name="timeline_now" position="0,64" zPosition="2" size="19,273" pixmap="skin_default/timeline-now.png" alphatest="on" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="timeline_text" position="0,41" size="560,20"/>
+               <widget name="list" position="0,65" size="560,270" EntryBorderColor="#071930" EntryBackgroundColor="#2f4964" EntryBackgroundColorSelected="#25688caf" scrollbarMode="showOnDemand"/>
+               <eLabel position="0,41" size="560,1" backgroundColor="#2f4964" zPosition="1"/>
+               <eLabel position="0,65" size="560,2" backgroundColor="#2f4964" zPosition="1"/>
+               <eLabel position="0,335" size="560,2" backgroundColor="#2f4964" zPosition="1"/>
+               <eLabel position="530,65" size="1,270" backgroundColor="#2f4964" zPosition="1"/>
+               <widget name="timeline0" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline1" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline2" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline3" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline4" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline5" position="0,65" zPosition="1" size="1,270" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline_now" position="0,64" zPosition="2" size="19,273" pixmap="skin_default/timeline-now.png" alphatest="on"/>
                <!-- ePixmap pixmap="skin_default/border_multiepg.png" position="0,42" zPosition="1" size="560,393" transparent="1" alphatest="on" / -->
                <widget source="Event" render="Label" position="10,337" zPosition="1" size="460,20" font="Regular;19" noWrap="1">
                        <convert type="EventName">Name</convert>
                </widget>
-               <ePixmap pixmap="skin_default/icons/clock.png" position="483,339" zPosition="1" size="14,14" alphatest="on" />
+               <ePixmap pixmap="skin_default/icons/clock.png" position="483,339" zPosition="1" size="14,14" alphatest="on"/>
                <widget source="global.CurrentTime" render="Label" position="500,337" zPosition="1" size="50,20" font="Regular;19" halign="right">
                        <convert type="ClockToText"></convert>
                </widget>
@@ -406,64 +391,64 @@ self.autoResize()
                </widget>
        </screen>
        <screen name="GraphMultiEPGList" position="center,center" size="560,435" title="Electronic Program Guide">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="timeline_text" position="0,41" size="560,20" />
-               <widget name="list" position="0,65" size="560,365" EntryBorderColor="#071930" EntryBackgroundColor="#2f4964" EntryBackgroundColorSelected="#25688caf" scrollbarMode="showOnDemand" />
-               <widget name="timeline0" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png" />
-               <widget name="timeline1" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png" />
-               <widget name="timeline2" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png" />
-               <widget name="timeline3" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png" />
-               <widget name="timeline4" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png" />
-               <widget name="timeline5" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png" />
-               <widget name="timeline_now" position="0,64" zPosition="2" size="19,10" pixmap="skin_default/timeline-now.png" alphatest="on" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="timeline_text" position="0,41" size="560,20"/>
+               <widget name="list" position="0,65" size="560,365" EntryBorderColor="#071930" EntryBackgroundColor="#2f4964" EntryBackgroundColorSelected="#25688caf" scrollbarMode="showOnDemand"/>
+               <widget name="timeline0" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline1" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline2" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline3" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline4" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline5" position="0,65" zPosition="1" size="1,365" pixmap="skin_default/timeline.png"/>
+               <widget name="timeline_now" position="0,64" zPosition="2" size="19,10" pixmap="skin_default/timeline-now.png" alphatest="on"/>
        </screen>
        <!-- Harddisk selection -->
        <screen name="HarddiskSelection" position="center,center" size="540,285" title="Select HDD">
-               <widget name="hddlist" position="10,10" size="520,275" />
+               <widget name="hddlist" position="10,10" size="520,275"/>
        </screen>
        <!-- Harddisk setup -->
        <screen name="HarddiskSetup" position="center,center" size="420,160" title="Harddisk">
-               <widget name="model" position="20,10" size="380,25" font="Regular;23" />
-               <widget name="capacity" position="20,40" size="380,25" font="Regular;23" />
-               <widget name="bus" position="20,70" size="380,25" font="Regular;23" />
-               <ePixmap pixmap="skin_default/buttons/button_red.png" position="120,110" zPosition="10" size="15,16" transparent="1" alphatest="on" />
-               <widget name="initializetext" position="140,110" size="140,40" zPosition="10" font="Regular;20" transparent="1" />
-               <!--widget name="initialize" pixmap="skin_default/buttons/red.png" position="140,110" size="140,40" alphatest="on" />
+               <widget name="model" position="20,10" size="380,25" font="Regular;23"/>
+               <widget name="capacity" position="20,40" size="380,25" font="Regular;23"/>
+               <widget name="bus" position="20,70" size="380,25" font="Regular;23"/>
+               <ePixmap pixmap="skin_default/buttons/button_red.png" position="120,110" zPosition="10" size="15,16" transparent="1" alphatest="on"/>
+               <widget name="initializetext" position="140,110" size="140,40" zPosition="10" font="Regular;20" transparent="1"/>
+               <!--widget name="initialize" pixmap="skin_default/buttons/red.png" position="140,110" size="140,40" alphatest="on"/>
                <widget name="initializetext" position="140,110" size="140,40" zPosition="1" font="Regular;20" halign="center" valign="center" transparent="1" /-->
        </screen>
        <!-- Harddisk wait -->
        <screen name="HarddiskWait" position="center,center" size="540,60">
-               <widget name="wait" position="20,10" size="500,25" font="Regular;23" />
+               <widget name="wait" position="20,10" size="500,25" font="Regular;23"/>
        </screen>
        <!-- Help menu -->
        <screen name="HelpMenu" position="fill" title="Menu" flags="wfNoBorder">
-               <eLabel text="help..." position="280,40" size="220,60" font="Regular;40" halign="right" />
-               <widget name="list" position="50,100" size="450,380" scrollbarMode="showOnDemand" />
-               <widget name="rc" pixmaps="skin_default/rc.png,skin_default/rcold.png" position="540,10" zPosition="10" size="154,500" alphatest="on" />
-               <widget name="arrowdown" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
-               <widget name="arrowdown2" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
-               <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
-               <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
-               <widget name="long_key" position="320,520" size="350,50" font="Regular;25" halign="right" foregroundColor="yellow" />
+               <eLabel text="help..." position="280,40" size="220,60" font="Regular;40" halign="right"/>
+               <widget name="list" position="50,100" size="450,380" scrollbarMode="showOnDemand"/>
+               <widget name="rc" pixmaps="skin_default/rc.png,skin_default/rcold.png" position="540,10" zPosition="10" size="154,500" alphatest="on"/>
+               <widget name="arrowdown" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on"/>
+               <widget name="arrowdown2" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on"/>
+               <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on"/>
+               <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on"/>
+               <widget name="long_key" position="320,520" size="350,50" font="Regular;25" halign="right" foregroundColor="yellow"/>
        </screen>
        <!-- Inputbox -->
        <screen name="InputBox" position="center,center" size="550,90" title="Input">
-               <widget name="text" position="10,20" size="550,25" font="Regular;23" />
-               <widget name="input" position="10,55" size="550,25" font="Regular;20" />
+               <widget name="text" position="10,20" size="550,25" font="Regular;23"/>
+               <widget name="input" position="10,55" size="550,25" font="Regular;20"/>
        </screen>
        <!-- IPKG -->
        <screen name="Ipkg" position="center,center" size="550,200" title="Installing software...">
-               <widget name="activityslider" position="0,0" size="550,5" pixmap="skin_default/progress_small.png" />
-               <widget name="package" position="10,30" size="550,20" font="Regular;18" />
-               <widget name="status" position="10,60" size="550,45" font="Regular;18" />
-               <widget name="slider" position="10,100" size="530,15" pixmap="skin_default/progress_big.png" borderWidth="2" borderColor="#cccccc" />
+               <widget name="activityslider" position="0,0" size="550,5" pixmap="skin_default/progress_small.png"/>
+               <widget name="package" position="10,30" size="550,20" font="Regular;18"/>
+               <widget name="status" position="10,60" size="550,45" font="Regular;18"/>
+               <widget name="slider" position="10,100" size="530,15" pixmap="skin_default/progress_big.png" borderWidth="2" borderColor="#cccccc"/>
        </screen>
        <!-- Language selection -->
        <screen name="LanguageSelection" position="center,center" size="380,300" title="Language selection">
@@ -481,14 +466,12 @@ self.autoResize()
        </screen>
        <screen name="LanguageWizard" position="fill" title="Welcome..." flags="wfNoBorder">
                <panel name="WizardMarginsTemplate"/>
-               <panel position="left" size="110,*">
-                       <panel position="top" size="*,50"/>
-               </panel>
                <panel name="RemoteControlTemplate"/>
-               <panel position="left" size="10,*" />
-               <panel position="right" size="10,*" />
+               <panel position="left" size="10,*"/>
+               <panel position="right" size="10,*"/>
                <panel position="fill">
-                       <widget name="text" position="top" size="*,240" font="Regular;23" valign="center" />
+                       <widget name="text" position="top" size="*,240" font="Regular;23" valign="center"/>
+                       <panel position="bottom" size="*,50"/>
                        <widget source="languages" render="Listbox" position="fill" scrollbarMode="showOnDemand">
                                <convert type="TemplatedMultiContent">
                                        {"template": [
@@ -503,57 +486,57 @@ self.autoResize()
                </panel>
        </screen>
        <!-- Location Box -->
-       <screen name="LocationBox" position="center,center" size="540,460" >
-               <widget name="text" position="0,2" size="540,22" font="Regular;22" />
-               <widget name="target" position="0,23" size="540,22" valign="center" font="Regular;22" />
-               <widget name="filelist" position="0,55" zPosition="1" size="540,210" scrollbarMode="showOnDemand" selectionDisabled="1" />
-               <widget name="textbook" position="0,272" size="540,22" font="Regular;22" />
-               <widget name="booklist" position="5,302" zPosition="2" size="535,100" scrollbarMode="showOnDemand" />
-               <widget name="red" position="0,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
-               <widget name="key_red" position="0,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
-               <widget name="green" position="135,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
-               <widget name="key_green" position="135,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
-               <widget name="yellow" position="270,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
-               <widget name="key_yellow" position="270,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
-               <widget name="blue" position="405,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
-               <widget name="key_blue" position="405,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
+       <screen name="LocationBox" position="center,center" size="540,460">
+               <widget name="text" position="0,2" size="540,22" font="Regular;22"/>
+               <widget name="target" position="0,23" size="540,22" valign="center" font="Regular;22"/>
+               <widget name="filelist" position="0,55" zPosition="1" size="540,210" scrollbarMode="showOnDemand" selectionDisabled="1"/>
+               <widget name="textbook" position="0,272" size="540,22" font="Regular;22"/>
+               <widget name="booklist" position="5,302" zPosition="2" size="535,100" scrollbarMode="showOnDemand"/>
+               <widget name="red" position="0,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on"/>
+               <widget name="key_red" position="0,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1"/>
+               <widget name="green" position="135,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on"/>
+               <widget name="key_green" position="135,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1"/>
+               <widget name="yellow" position="270,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on"/>
+               <widget name="key_yellow" position="270,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1"/>
+               <widget name="blue" position="405,415" zPosition="1" size="135,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on"/>
+               <widget name="key_blue" position="405,415" zPosition="2" size="135,40" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1"/>
        </screen>
        <!-- Mediaplayer -->
        <screen name="MediaPlayer" position="70,70" size="580,475" title="Media player">
-               <ePixmap pixmap="skin_default/mediaplayer_bg.png" position="13,9" zPosition="-1" size="554,460" alphatest="on" />
-               <widget name="artisttext" position="20,11" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-               <widget name="artist" position="94,11" size="339,17" font="Regular;16" valign="top" transparent="1" />
-               <widget name="albumtext" position="20,29" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-               <widget name="album" position="94,29" size="339,17" font="Regular;16" valign="top" transparent="1" />
-               <widget name="yeartext" position="20,47" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-               <widget name="year" position="94,47" size="339,17" font="Regular;16" valign="top" transparent="1" />
-               <widget name="genretext" position="20,65" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-               <widget name="genre" position="94,65" size="339,17" font="Regular;16" valign="top" transparent="1" />
-               <eLabel name="nowPlaying" position="20,92" size="413,16" text="Now playing" font="Regular;14" foregroundColor="#ffc435" transparent="1" />
-               <widget name="title" position="20,108" size="413,18" font="Regular;16" valign="top" transparent="1" />
-               <widget name="coverArt" pixmap="skin_default/no_coverArt.png" position="446,11" size="116,116" transparent="1" alphatest="blend" />
-               <ePixmap pixmap="skin_default/icons/mp_buttons.png" position="454,136" size="108,13" alphatest="on" />
-               <widget name="PositionGauge" position="15,138" size="396,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" />
+               <ePixmap pixmap="skin_default/mediaplayer_bg.png" position="13,9" zPosition="-1" size="554,460" alphatest="on"/>
+               <widget name="artisttext" position="20,11" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1"/>
+               <widget name="artist" position="94,11" size="339,17" font="Regular;16" valign="top" transparent="1"/>
+               <widget name="albumtext" position="20,29" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1"/>
+               <widget name="album" position="94,29" size="339,17" font="Regular;16" valign="top" transparent="1"/>
+               <widget name="yeartext" position="20,47" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1"/>
+               <widget name="year" position="94,47" size="339,17" font="Regular;16" valign="top" transparent="1"/>
+               <widget name="genretext" position="20,65" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1"/>
+               <widget name="genre" position="94,65" size="339,17" font="Regular;16" valign="top" transparent="1"/>
+               <eLabel name="nowPlaying" position="20,92" size="413,16" text="Now playing" font="Regular;14" foregroundColor="#ffc435" transparent="1"/>
+               <widget name="title" position="20,108" size="413,18" font="Regular;16" valign="top" transparent="1"/>
+               <widget name="coverArt" pixmap="skin_default/no_coverArt.png" position="446,11" size="116,116" transparent="1" alphatest="blend"/>
+               <ePixmap pixmap="skin_default/icons/mp_buttons.png" position="454,136" size="108,13" alphatest="on"/>
+               <widget name="PositionGauge" position="15,138" size="396,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1"/>
                <widget name="repeat" pixmaps="skin_default/icons/repeat_off.png,skin_default/icons/repeat_on.png" position="416,135" size="22,15" transparent="1" alphatest="on"/>
-               <widget name="filelist" position="15,163" size="550,138" scrollbarMode="showOnDemand" />
-               <widget name="playlist" position="15,322" size="550,138" scrollbarMode="showOnDemand" selectionDisabled="1" />
-               <widget name="currenttext" position="0,0" size="0,0" />
-               <widget name="titletext" position="0,0" size="0,0" />
+               <widget name="filelist" position="15,163" size="550,138" scrollbarMode="showOnDemand"/>
+               <widget name="playlist" position="15,322" size="550,138" scrollbarMode="showOnDemand" selectionDisabled="1"/>
+               <widget name="currenttext" position="0,0" size="0,0"/>
+               <widget name="titletext" position="0,0" size="0,0"/>
        </screen>
        <!-- Menu screens -->
        <screen name="Menu" position="center,center" size="380,285" title="Main menu">
-               <widget source="title" render="Label" position="10,10" size="360,35" font="Regular;23" />
+               <widget source="title" render="Label" position="10,10" size="360,35" font="Regular;23"/>
                <widget source="menu" render="Listbox" position="10,55" size="360,225" scrollbarMode="showOnDemand">
-                       <convert type="StringList" />
+                       <convert type="StringList"/>
                </widget>
        </screen>
        <!-- Messagebox -->
        <screen name="MessageBoxTemplate">
-               <widget name="text" position="65,8" size="520,0" font="Regular;22" />
-               <widget name="ErrorPixmap" pixmap="skin_default/icons/input_error.png" position="5,5" size="53,53" alphatest="on" />
-               <widget name="QuestionPixmap" pixmap="skin_default/icons/input_question.png" position="5,5" size="53,53" alphatest="on" />
-               <widget name="InfoPixmap" pixmap="skin_default/icons/input_info.png" position="5,5" size="53,53" alphatest="on" />
-               <widget name="list" position="100,100" size="480,375" />
+               <widget name="text" position="65,8" size="520,0" font="Regular;22"/>
+               <widget name="ErrorPixmap" pixmap="skin_default/icons/input_error.png" position="5,5" size="53,53" alphatest="on"/>
+               <widget name="QuestionPixmap" pixmap="skin_default/icons/input_question.png" position="5,5" size="53,53" alphatest="on"/>
+               <widget name="InfoPixmap" pixmap="skin_default/icons/input_info.png" position="5,5" size="53,53" alphatest="on"/>
+               <widget name="list" position="100,100" size="480,375"/>
                <applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
 from enigma import eSize, ePoint
@@ -595,42 +578,42 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
                </applet>
        </screen>
        <screen name="MessageBox" position="center,center" size="600,10" title="Message">
-               <panel name= "MessageBoxTemplate" />
+               <panel name= "MessageBoxTemplate"/>
        </screen>
        <screen name="MessageBoxSimple" position="center,center" size="600,10" title="Message">
-               <panel name= "MessageBoxTemplate" />
+               <panel name= "MessageBoxTemplate"/>
        </screen>
 
        <!-- Minute input -->
        <screen name="MinuteInput" position="center,center" size="280,60" title="Seek">
-               <widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" />
+               <widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23"/>
        </screen>
        <!-- Movie context menu -->
        <screen name="MovieContextMenu" position="center,center" size="560,300" title="Movielist menu">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="menu" position="10,40" size="550,250" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="menu" position="10,40" size="550,250" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Movieselection -->
        <screen name="MovieSelection" position="center,center" size="560,445" title="Select a movie">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="waitingtext" position="0,45" size="560,395" zPosition="4" font="Regular;22" halign="center" valign="center" />
-               <widget name="chosenletter" position="0,45" size="560,395" foregroundColor="yellow" font="Regular;50" halign="center" valign="center" transparent="1" zPosition="4" />
-               <widget name="list" position="0,40" size="560,375" zPosition="2" scrollbarMode="showOnDemand" />
-               <widget name="DescriptionBorder" pixmap="skin_default/border_eventinfo.png" position="0,316" zPosition="1" size="560,103" transparent="1" alphatest="on" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="waitingtext" position="0,45" size="560,395" zPosition="4" font="Regular;22" halign="center" valign="center"/>
+               <widget name="chosenletter" position="0,45" size="560,395" foregroundColor="yellow" font="Regular;50" halign="center" valign="center" transparent="1" zPosition="4"/>
+               <widget name="list" position="0,40" size="560,375" zPosition="2" scrollbarMode="showOnDemand"/>
+               <widget name="DescriptionBorder" pixmap="skin_default/border_eventinfo.png" position="0,316" zPosition="1" size="560,103" transparent="1" alphatest="on"/>
                <widget source="Service" render="Label" position="5,318" zPosition="1" size="480,35" font="Regular;17" foregroundColor="#cccccc">
                        <convert type="MovieInfo">ShortDescription</convert>
                </widget>
@@ -646,34 +629,34 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
                </widget>
                <widget name="movie_sort" pixmaps="skin_default/icons/az.png,skin_default/icons/newtop.png,skin_default/icons/shuffle.png,skin_default/icons/za.png,skin_default/icons/oldtop.png,skin_default/icons/faz.png,skin_default/icons/fza.png,skin_default/icons/default.png" position="0,425" zPosition="10" size="35,20" transparent="1" alphatest="on"/>
                <widget name="movie_off" pixmaps="skin_default/icons/ask.png,skin_default/icons/movielist.png,skin_default/icons/quit.png,skin_default/icons/pause.png,skin_default/icons/playlist.png,skin_default/icons/playlistquit.png,skin_default/icons/loop.png,skin_default/icons/rep.png" position="40,425" zPosition="10" size="35,20" transparent="1" alphatest="on"/>
-               <widget name="freeDiskSpace" position="10,425" size="540,20" font="Regular;19" valign="center" halign="right" />
+               <widget name="freeDiskSpace" position="10,425" size="540,20" font="Regular;19" valign="center" halign="right"/>
        </screen>
        <!-- Mute -->
        <screen name="Mute" position="50,50" zPosition="10" size="34,45" backgroundColor="transparent" title="Mute" flags="wfNoBorder">
-               <ePixmap position="0,0" size="34,45" pixmap="skin_default/mute.png" alphatest="on" />
+               <ePixmap position="0,0" size="34,45" pixmap="skin_default/mute.png" alphatest="on"/>
        </screen>
        <!-- Nameserver -->
-       <screen name="NameserverSetup" position="center,center" size="560,400" title="Nameserver setup" >
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="config" position="5,50" size="550,280" scrollbarMode="showOnDemand" />
-               <ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2" />
-               <widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
+       <screen name="NameserverSetup" position="center,center" size="560,400" title="Nameserver setup">
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="config" position="5,50" size="550,280" scrollbarMode="showOnDemand"/>
+               <ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2"/>
+               <widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
        </screen>
        <!-- Network adapter selection -->
        <screen name="NetworkAdapterSelection" position="center,center" size="560,400" title="Select a network adapter">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
                <widget source="list" render="Listbox" position="5,50" size="550,280" zPosition="10" scrollbarMode="showOnDemand">
                        <convert type="TemplatedMultiContent"> <!--  iface, name, description, interfacepng, defaultpng, activepng, divpng  -->
                                {"template": [
@@ -687,50 +670,50 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
                                }
                        </convert>
                </widget>
-               <ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2" />
-               <widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
+               <ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2"/>
+               <widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
        </screen>
        <!-- Network adapter test Black = "#000000" Grey = "#8c8c93" Green = "#1cff1c" Red = #f23d21-->
-       <screen name="NetworkAdapterTest" position="center,center" size="570,400" title="Network test..." >
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="Adaptertext" position="10,70" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />
-               <widget name="Adapter" position="130,70" size="270,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
-               <widget name="AdapterInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,60" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-               <widget name="AdapterInfo_Text" position="440,70" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
-               <widget name="AdapterInfo_OK" pixmap="skin_default/icons/lock_on.png" position="400,65" size="38,31" alphatest="on" zPosition="2" />
-               <widget name="Networktext" position="10,120" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />
-               <widget name="Network" position="160,120" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
-               <widget name="NetworkInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,110" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-               <widget name="NetworkInfo_Text" position="440,120" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
-               <widget name="NetworkInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,115" size="38,31" alphatest="on" zPosition="2" />
-               <widget name="Dhcptext" position="10,170" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />
-               <widget name="Dhcp" position="160,170" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
-               <widget name="DhcpInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,160" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-               <widget name="DhcpInfo_Text" position="440,170" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
-               <widget name="DhcpInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,165" size="38,31" alphatest="on" zPosition="2" />
-               <widget name="IPtext" position="10,220" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />
-               <widget name="IP" position="160,220" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
-               <widget name="IPInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,210" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-               <widget name="IPInfo_Text" position="440,220" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
-               <widget name="IPInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,215" size="38,31" alphatest="on" zPosition="2" />
-               <widget name="DNStext" position="10,270" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c" />
-               <widget name="DNS" position="160,270" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c" />
-               <widget name="DNSInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,260" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-               <widget name="DNSInfo_Text" position="440,270" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c" />
-               <widget name="DNSInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,265" size="38,31" alphatest="on" zPosition="2" />
-               <widget name="EditSettingsButton" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,310" zPosition="1" size="140,40" transparent="1" alphatest="on" />
-               <widget name="EditSettings_Text" position="440,320" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#000000,#8c8c93,#1cff1c" />
-               <widget name="InfoTextBorder" pixmap="skin_default/border_info.png" position="10,50" zPosition="20" size="550,300" alphatest="on" />
-               <widget name="InfoText" position="15,55" size="541,290" zPosition="25" font="Regular;21" />
+       <screen name="NetworkAdapterTest" position="center,center" size="570,400" title="Network test...">
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="Adaptertext" position="10,70" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c"/>
+               <widget name="Adapter" position="130,70" size="270,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c"/>
+               <widget name="AdapterInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,60" zPosition="1" size="140,40" transparent="1" alphatest="on"/>
+               <widget name="AdapterInfo_Text" position="440,70" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c"/>
+               <widget name="AdapterInfo_OK" pixmap="skin_default/icons/lock_on.png" position="400,65" size="38,31" alphatest="on" zPosition="2"/>
+               <widget name="Networktext" position="10,120" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c"/>
+               <widget name="Network" position="160,120" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c"/>
+               <widget name="NetworkInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,110" zPosition="1" size="140,40" transparent="1" alphatest="on"/>
+               <widget name="NetworkInfo_Text" position="440,120" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c"/>
+               <widget name="NetworkInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,115" size="38,31" alphatest="on" zPosition="2"/>
+               <widget name="Dhcptext" position="10,170" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c"/>
+               <widget name="Dhcp" position="160,170" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c"/>
+               <widget name="DhcpInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,160" zPosition="1" size="140,40" transparent="1" alphatest="on"/>
+               <widget name="DhcpInfo_Text" position="440,170" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c"/>
+               <widget name="DhcpInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,165" size="38,31" alphatest="on" zPosition="2"/>
+               <widget name="IPtext" position="10,220" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c"/>
+               <widget name="IP" position="160,220" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c"/>
+               <widget name="IPInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,210" zPosition="1" size="140,40" transparent="1" alphatest="on"/>
+               <widget name="IPInfo_Text" position="440,220" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c"/>
+               <widget name="IPInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,215" size="38,31" alphatest="on" zPosition="2"/>
+               <widget name="DNStext" position="10,270" size="120,21" zPosition="1" font="Regular;19" foregroundColors="#8c8c93,#1cff1c"/>
+               <widget name="DNS" position="160,270" size="240,21" zPosition="1" font="Regular;19" halign="center" foregroundColors="#8c8c93,#f23d21,#1cff1c"/>
+               <widget name="DNSInfo" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,260" zPosition="1" size="140,40" transparent="1" alphatest="on"/>
+               <widget name="DNSInfo_Text" position="440,270" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#8c8c93,#000000,#1cff1c"/>
+               <widget name="DNSInfo_Check" pixmaps="skin_default/icons/lock_on.png,skin_default/icons/lock_error.png" position="400,265" size="38,31" alphatest="on" zPosition="2"/>
+               <widget name="EditSettingsButton" pixmaps="skin_default/buttons/blue.png,skin_default/buttons/blue_pressed.png" position="425,310" zPosition="1" size="140,40" transparent="1" alphatest="on"/>
+               <widget name="EditSettings_Text" position="440,320" size="110,21" zPosition="2" font="Regular;19" transparent="1" foregroundColors="#000000,#8c8c93,#1cff1c"/>
+               <widget name="InfoTextBorder" pixmap="skin_default/border_info.png" position="10,50" zPosition="20" size="550,300" alphatest="on"/>
+               <widget name="InfoText" position="15,55" size="541,290" zPosition="25" font="Regular;21"/>
        </screen>
        <!-- Network setup -->
        <screen name="NetworkSetup" position="center,center" size="460,330" title="Network setup">
-               <widget name="menu" position="10,10" size="440,310" />
+               <widget name="menu" position="10,10" size="440,310"/>
        </screen>
        <!-- Nim selection -->
        <screen name="NimSelection" position="center,center" size="490,330" title="Select a tuner">
@@ -748,20 +731,20 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
        </screen>
        <!-- Nim setup -->
        <screen name="NimSetup" position="center,center" size="560,412" title="Reception settings">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="config" position="10,50" size="540,355" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="config" position="10,50" size="540,355" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Numberzap -->
        <screen name="NumberZap" position="center,center" size="250,60" title="Channel">
-               <widget name="channel" position="35,15" size="110,25" font="Regular;23" />
-               <widget name="number" position="145,15" size="80,25" halign="right" font="Regular;23" />
+               <widget name="channel" position="35,15" size="110,25" font="Regular;23"/>
+               <widget name="number" position="145,15" size="80,25" halign="right" font="Regular;23"/>
        </screen>
        <!-- BufferIndicator -->
        <screen name="BufferIndicator" title="Channel" position="c-100,45" size="200,35" backgroundColor="transparent" flags="wfNoBorder" zPosition="100">
@@ -769,61 +752,61 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
        </screen>
        <!-- Numerical help dialog -->
        <screen name="NumericalTextInputHelpDialog" position="190,400" 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="Regular;18" halign="center" valign="center" />
-               <widget name="key2" position="132,2" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="key3" position="262,2" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="key4" position="2,32" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="key5" position="132,32" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="key6" position="262,32" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="key7" position="2,62" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="key8" position="132,62" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="key9" position="262,62" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="help1" position="2,92" size="130,30" font="Regular;18" halign="center" valign="center" />
-               <widget name="key0" position="132,92" size="130,30" font="Regular;14" halign="center" valign="center" />
-               <widget name="help2" position="262,92" size="130,30" font="Regular;18" halign="center" valign="center" />
+               <eLabel position="0,0" size="392,122" backgroundColor="#c0c0c0" zPosition="-1"/>
+               <widget name="key1" position="2,2" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key2" position="132,2" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key3" position="262,2" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key4" position="2,32" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key5" position="132,32" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key6" position="262,32" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key7" position="2,62" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key8" position="132,62" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key9" position="262,62" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="help1" position="2,92" size="130,30" font="Regular;18" halign="center" valign="center"/>
+               <widget name="key0" position="132,92" size="130,30" font="Regular;14" halign="center" valign="center"/>
+               <widget name="help2" position="262,92" size="130,30" font="Regular;18" halign="center" valign="center"/>
        </screen>
        <!-- Parental control - editor -->
        <screen name="ParentalControlEditor" position="center,center" size="520,400" title="Parental control services editor">
-               <widget name="servicelist" position="10,10" size="500,350" scrollbarMode="showOnDemand" />
+               <widget name="servicelist" position="10,10" size="500,350" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Picture in picture -->
        <screen name="PictureInPicture" position="400,60" zPosition="-1" size="240,192" flags="wfNoBorder">
-               <widget name="video" position="0,0" size="240,192" backgroundColor="transparent" />
+               <widget name="video" position="0,0" size="240,192" backgroundColor="transparent"/>
        </screen>
        <!-- Pin input -->
-       <screen name="PinInputTemplate" >
-               <widget name="service" position="10,10" size="480,25" font="Regular;20" />
-               <widget name="text" position="10,40" size="480,25" font="Regular;20" halign="center" />
-               <widget name="tries" position="10,70" size="480,25" font="Regular;20" halign="center" />
-               <widget name="input" position="10,110" size="480,40" font="Regular;50" halign="center" />
+       <screen name="PinInputTemplate">
+               <widget name="service" position="10,10" size="480,25" font="Regular;20"/>
+               <widget name="text" position="10,40" size="480,25" font="Regular;20" halign="center"/>
+               <widget name="tries" position="10,70" size="480,25" font="Regular;20" halign="center"/>
+               <widget name="input" position="10,110" size="480,40" font="Regular;50" halign="center"/>
        </screen>
        <screen name="PinInput" position="center,center" size="500,170" title="PIN code needed">
-               <panel name="PinInputTemplate" />
+               <panel name="PinInputTemplate"/>
        </screen>
        <screen name="PinInputPopup" position="center,center" size="500,170" title="PIN code needed">
-               <panel name="PinInputTemplate" />
+               <panel name="PinInputTemplate"/>
        </screen>
        <!-- Picture in picture setup -->
        <screen name="PiPSetup" position="center,center" size="600,150" backgroundColor="transparent" flags="wfNoBorder" title="PiP setup">
-               <widget name="text" position="0,0" size="600,150" font="Regular;23" />
+               <widget name="text" position="0,0" size="600,150" font="Regular;23"/>
        </screen>
        <!-- Plugin browser -->
        <screen name="PluginBrowser" position="center,center" size="400,405" title="Plugin browser">
-               <ePixmap pixmap="skin_default/buttons/red-big.png" position="0,0" size="200,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green-big.png" position="200,0" size="200,40" alphatest="on" />
-               <widget name="red" position="0,0" zPosition="1" size="200,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="green" position="200,0" zPosition="1" size="200,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="list" position="0,45" size="400,355" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red-big.png" position="0,0" size="200,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green-big.png" position="200,0" size="200,40" alphatest="on"/>
+               <widget name="red" position="0,0" zPosition="1" size="200,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="green" position="200,0" zPosition="1" size="200,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="list" position="0,45" size="400,355" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Plugin downloads -->
        <screen name="PluginDownloadBrowser" position="center,center" size="560,420" title="Downloadable plugins">
-               <widget name="text" position="0,0" zPosition="1" size="560,430" font="Regular;20" halign="center" valign="center" />
-               <widget name="list" position="10,10" zPosition="2" size="540,405" scrollbarMode="showOnDemand" />
+               <widget name="text" position="0,0" zPosition="1" size="560,430" font="Regular;20" halign="center" valign="center"/>
+               <widget name="list" position="10,10" zPosition="2" size="540,405" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- PVR state -->
        <screen name="PVRState" position="70,70" zPosition="2" size="150,30" backgroundColor="transpBlack" flags="wfNoBorder">
-               <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" />
+               <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white"/>
        </screen>
        <!-- Radio infobar -->
        <screen name="RadioInfoBar" position="center,408" size="560,120" zPosition="-1" title="Radio">
@@ -832,12 +815,12 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
                </widget>
                <widget source="RdsDecoder" render="Pixmap" pixmap="skin_default/icons/rass_logo.png" position="330,1" size="50,21" alphatest="on">
                        <convert type="RdsInfo">RasInteractiveAvailable</convert>
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="480,3" zPosition="2" size="14,14" alphatest="on" >
+               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="480,3" zPosition="2" size="14,14" alphatest="on">
                        <convert type="ConditionalShowHide">Blink</convert>
                </widget>
-               <ePixmap pixmap="skin_default/icons/clock.png" position="480,3" zPosition="1" size="14,14" alphatest="on" />
+               <ePixmap pixmap="skin_default/icons/clock.png" position="480,3" zPosition="1" size="14,14" alphatest="on"/>
                <widget source="session.Event_Now" render="Progress" pixmap="skin_default/progress_medium.png" position="395,5" zPosition="2" size="71,11" borderWidth="2" borderColor="#cccccc" transparent="1">
                        <convert type="EventTime">Progress</convert>
                </widget>
@@ -866,173 +849,173 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
                        <convert type="EventTime">Duration</convert>
                        <convert type="ClockToText">InMinutes</convert>
                </widget>
-               <eLabel position="5,68" size="550,1" backgroundColor="#384472" />
-               <eLabel position="5,69" size="550,1" backgroundColor="#04060a" />
+               <eLabel position="5,68" size="550,1" backgroundColor="#384472"/>
+               <eLabel position="5,69" size="550,1" backgroundColor="#04060a"/>
                <widget source="RdsDecoder" render="Label" position="5,71" size="550,50" font="LCD;20" foregroundColor="#80ffff">
                        <convert type="RdsInfo">RadioText</convert>
                </widget>
        </screen>
        <!-- RASS -->
        <screen name="RassInteractive" position="50,180" size="100,275" backgroundColor="transpWhite" flags="wfNoBorder">
-               <ePixmap pixmap="skin_default/icons/rass_logo.png" position="25,0" size="50,21" transparent="1" alphatest="on" />
-               <eLabel text="Index" position="36,25" size="60,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <eLabel text="0" position="5,25" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="Marker" position="21,25" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <eLabel text="1" position="5,50" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_1" position="35,50" size="36,20" alphatest="on" />
-               <eLabel text="2" position="5,75" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_2" position="35,75" size="36,20" alphatest="on" />
-               <eLabel text="3" position="5,100" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_3" position="35,100" size="36,20" alphatest="on" />
-               <eLabel text="4" position="5,125" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_4" position="35,125" size="36,20" alphatest="on" />
-               <eLabel text="5" position="5,150" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_5" position="35,150" size="36,20" alphatest="on" />
-               <eLabel text="6" position="5,175" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_6" position="35,175" size="36,20" alphatest="on" />
-               <eLabel text="7" position="5,200" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_7" position="35,200" size="36,20" alphatest="on" />
-               <eLabel text="8" position="5,225" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_8" position="35,225" size="36,20" alphatest="on" />
-               <eLabel text="9" position="5,250" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite" />
-               <widget name="subpages_9" position="35,250" size="36,20" alphatest="on" />
+               <ePixmap pixmap="skin_default/icons/rass_logo.png" position="25,0" size="50,21" transparent="1" alphatest="on"/>
+               <eLabel text="Index" position="36,25" size="60,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <eLabel text="0" position="5,25" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="Marker" position="21,25" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <eLabel text="1" position="5,50" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_1" position="35,50" size="36,20" alphatest="on"/>
+               <eLabel text="2" position="5,75" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_2" position="35,75" size="36,20" alphatest="on"/>
+               <eLabel text="3" position="5,100" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_3" position="35,100" size="36,20" alphatest="on"/>
+               <eLabel text="4" position="5,125" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_4" position="35,125" size="36,20" alphatest="on"/>
+               <eLabel text="5" position="5,150" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_5" position="35,150" size="36,20" alphatest="on"/>
+               <eLabel text="6" position="5,175" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_6" position="35,175" size="36,20" alphatest="on"/>
+               <eLabel text="7" position="5,200" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_7" position="35,200" size="36,20" alphatest="on"/>
+               <eLabel text="8" position="5,225" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_8" position="35,225" size="36,20" alphatest="on"/>
+               <eLabel text="9" position="5,250" size="16,25" font="Regular;21" foregroundColor="black" backgroundColor="transpWhite"/>
+               <widget name="subpages_9" position="35,250" size="36,20" alphatest="on"/>
        </screen>
        <!-- RDS info -->
        <screen name="RdsInfoDisplay" position="fill" zPosition="-2" backgroundColor="transparent" flags="wfNoBorder">
-               <widget name="RadioText" position="50,481" size="620,29" font="Regular;21" noWrap="1" backgroundColor="#003258" shadowOffset="-2,-2" shadowColor="transpBlack" />
-               <widget name="RtpText" position="50,510" size="620,29" font="Regular;21" halign="right" noWrap="1" backgroundColor="#003258" shadowOffset="-2,-2" shadowColor="transpBlack" />
-               <widget name="RassLogo" pixmap="skin_default/icons/rass_logo.png" position="50,445" size="50,21" />
+               <widget name="RadioText" position="50,481" size="620,29" font="Regular;21" noWrap="1" backgroundColor="#003258" shadowOffset="-2,-2" shadowColor="transpBlack"/>
+               <widget name="RtpText" position="50,510" size="620,29" font="Regular;21" halign="right" noWrap="1" backgroundColor="#003258" shadowOffset="-2,-2" shadowColor="transpBlack"/>
+               <widget name="RassLogo" pixmap="skin_default/icons/rass_logo.png" position="50,445" size="50,21"/>
        </screen>
        <!-- Satfinder -->
        <screen name="Satfinder" position="center,center" size="520,450" title="Satfinder">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <eLabel text="Cancel" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <eLabel text="Scan" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="introduction" position="0,0" size="0,0" font="Regular;23" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <eLabel text="Cancel" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <eLabel text="Scan" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="introduction" position="0,0" size="0,0" font="Regular;23"/>
 
-               <ePixmap pixmap="skin_default/icons/dish_scan.png" position="5,75" zPosition="0" size="119,110" transparent="1" alphatest="on" />
+               <ePixmap pixmap="skin_default/icons/dish_scan.png" position="5,75" zPosition="0" size="119,110" transparent="1" alphatest="on"/>
                <widget source="Frontend" render="Label" position="190,60" zPosition="2" size="260,20" font="Regular;19" halign="center" valign="center" transparent="1">
                        <convert type="FrontendInfo">SNRdB</convert>
                </widget>
-               <eLabel name="snr" text="SNR:" position="120,85" size="60,22" font="Regular;21" halign="right" transparent="1" />
+               <eLabel name="snr" text="SNR:" position="120,85" size="60,22" font="Regular;21" halign="right" transparent="1"/>
                <widget source="Frontend" render="Progress" position="190,85" size="260,20" pixmap="skin_default/bar_snr.png" borderWidth="2" borderColor="#cccccc">
                        <convert type="FrontendInfo">SNR</convert>
                </widget>
                <widget source="Frontend" render="Label" position="460,85" size="60,22" font="Regular;21">
                        <convert type="FrontendInfo">SNR</convert>
                </widget>
-               <eLabel name="ber" text="BER:" position="120,110" size="60,22" font="Regular;21" halign="right" transparent="1" />
+               <eLabel name="ber" text="BER:" position="120,110" size="60,22" font="Regular;21" halign="right" transparent="1"/>
                <widget source="Frontend" render="Progress" position="190,110" size="260,20" pixmap="skin_default/bar_ber.png" borderWidth="2" borderColor="#cccccc">
                        <convert type="FrontendInfo">BER</convert>
                </widget>
                <widget source="Frontend" render="Label" position="460,110" size="60,22" font="Regular;21">
                        <convert type="FrontendInfo">BER</convert>
                </widget>
-               <eLabel name="lock" text="Lock:" position="120,165" size="60,22" font="Regular;21" halign="right" />
+               <eLabel name="lock" text="Lock:" position="120,165" size="60,22" font="Regular;21" halign="right"/>
                <widget source="Frontend" render="Pixmap" pixmap="skin_default/icons/lock_on.png" position="190,160" zPosition="1" size="38,31" alphatest="on">
                        <convert type="FrontendInfo">LOCK</convert>
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
                <widget source="Frontend" render="Pixmap" pixmap="skin_default/icons/lock_off.png" position="190,160" zPosition="1" size="38,31" alphatest="on">
                        <convert type="FrontendInfo">LOCK</convert>
                        <convert type="ConditionalShowHide">Invert</convert>
                </widget>
-               <ePixmap pixmap="skin_default/div-h.png" position="10,202" zPosition="1" size="500,2" />
-               <widget name="config" position="10,205" size="500,225" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/div-h.png" position="10,202" zPosition="1" size="500,2"/>
+               <widget name="config" position="10,205" size="500,225" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Scan setup -->
        <screen name="ScanSetup" position="center,center" size="520,450" title="Manual scan">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <eLabel text="Cancel" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <eLabel text="Scan" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <eLabel text="Cancel" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <eLabel text="Scan" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
 
-               <widget name="config" position="10,50" size="500,400" scrollbarMode="showOnDemand" />
-               <widget name="introduction" position="0,0" size="0,0" />
+               <widget name="config" position="10,50" size="500,400" scrollbarMode="showOnDemand"/>
+               <widget name="introduction" position="0,0" size="0,0"/>
        </screen>
        <!-- Scan simple -->
        <screen name="ScanSimple" position="center,center" size="420,350" title="Automatic scan">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <eLabel text="Cancel" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <eLabel text="Scan" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <eLabel text="Cancel" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <eLabel text="Scan" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
 
-               <widget name="header" position="0,0" size="0,0" font="Regular;23" />
-               <widget name="config" position="10,50" size="400,300" scrollbarMode="showOnDemand" />
-               <widget name="footer" position="0,0" size="0,0" />
+               <widget name="header" position="0,0" size="0,0" font="Regular;23"/>
+               <widget name="config" position="10,50" size="400,300" scrollbarMode="showOnDemand"/>
+               <widget name="footer" position="0,0" size="0,0"/>
        </screen>
        <!-- Positioner setup -->
        <screen name="PositionerSetup" position="center,center" size="660,485" title="Positioner setup">
-               <widget name="list" position="120,10" size="420,180" transparent="1" font="Regular;20" />
-               <eLabel position="0,190" size="165,100" backgroundColor="red" />
-               <eLabel position="165,190" size="165,100" backgroundColor="green" />
-               <eLabel position="330,190" size="165,100" backgroundColor="yellow" />
-               <eLabel position="495,190" size="165,100" backgroundColor="blue" />
+               <widget name="list" position="120,10" size="420,180" transparent="1" font="Regular;20"/>
+               <eLabel position="0,190" size="165,100" backgroundColor="red"/>
+               <eLabel position="165,190" size="165,100" backgroundColor="green"/>
+               <eLabel position="330,190" size="165,100" backgroundColor="yellow"/>
+               <eLabel position="495,190" size="165,100" backgroundColor="blue"/>
 
-               <widget name="key_red" position="0,190" size="165,90" zPosition="1" halign="center" valign="center" font="Regular;20"  foregroundColor="white" transparent="1" />
-               <widget name="key_green" position="165,190" size="165,90" zPosition="1" halign="center" valign="center" font="Regular;20"  foregroundColor="white" transparent="1" />
-               <widget name="key_yellow" position="330,190" size="165,90" zPosition="1" halign="center" valign="center" font="Regular;20"  foregroundColor="white" transparent="1" />
-               <widget name="key_blue" position="490,190" size="165,90" zPosition="1" halign="center" valign="center" font="Regular;20"  foregroundColor="white" transparent="1" />
+               <widget name="key_red" position="0,190" size="165,90" zPosition="1" halign="center" valign="center" font="Regular;20"  foregroundColor="white" transparent="1"/>
+               <widget name="key_green" position="165,190" size="165,90" zPosition="1" halign="center" valign="center" font="Regular;20"  foregroundColor="white" transparent="1"/>
+               <widget name="key_yellow" position="330,190" size="165,90" zPosition="1" halign="center" valign="center" font="Regular;20"  foregroundColor="white" transparent="1"/>
+               <widget name="key_blue" position="490,190" size="165,90" zPosition="1" halign="center" valign="center" font="Regular;20"  foregroundColor="white" transparent="1"/>
 
-               <widget name="snr_db" position="100,330" size="200,21" halign="center" valign="center" font="Regular;20" backgroundColor="un353e575e" transparent="1" />
-               <widget name="SNR" position="10,360" size="80,21" font="Regular;20" transparent="1" />
-               <widget name="snr_bar" position="100,360" size="200,20" transparent="1" borderColor="#00ffffff" borderWidth="2" foregroundColor="#00bab329" />
-               <widget name="snr_percentage" position="310,360" size="80,21" font="Regular;20" transparent="1" foregroundColor="white" />
-               <widget name="AGC" position="10,390" size="80,21" font="Regular;20" transparent="1" />
-               <widget name="agc_bar" position="100,390" size="200,20" transparent="1" borderColor="#00ffffff" borderWidth="2" foregroundColor="#00389416" />
-               <widget name="agc_percentage" position="310,390" size="80,21" font="Regular;20" transparent="1" />
-               <widget name="BER" position="10,420" size="80,21" font="Regular;20" transparent="1" />
-               <widget name="ber_bar" position="100,420" size="200,20" transparent="1" borderColor="#00ffffff" borderWidth="2" foregroundColor="#0000ff00" />
-               <widget name="ber_value" position="310,420" size="80,21" font="Regular;20" transparent="1" />
+               <widget name="snr_db" position="100,330" size="200,21" halign="center" valign="center" font="Regular;20" backgroundColor="un353e575e" transparent="1"/>
+               <widget name="SNR" position="10,360" size="80,21" font="Regular;20" transparent="1"/>
+               <widget name="snr_bar" position="100,360" size="200,20" transparent="1" borderColor="#00ffffff" borderWidth="2" foregroundColor="#00bab329"/>
+               <widget name="snr_percentage" position="310,360" size="80,21" font="Regular;20" transparent="1" foregroundColor="white"/>
+               <widget name="AGC" position="10,390" size="80,21" font="Regular;20" transparent="1"/>
+               <widget name="agc_bar" position="100,390" size="200,20" transparent="1" borderColor="#00ffffff" borderWidth="2" foregroundColor="#00389416"/>
+               <widget name="agc_percentage" position="310,390" size="80,21" font="Regular;20" transparent="1"/>
+               <widget name="BER" position="10,420" size="80,21" font="Regular;20" transparent="1"/>
+               <widget name="ber_bar" position="100,420" size="200,20" transparent="1" borderColor="#00ffffff" borderWidth="2" foregroundColor="#0000ff00"/>
+               <widget name="ber_value" position="310,420" size="80,21" font="Regular;20" transparent="1"/>
 
-               <widget name="Lock" position="400,330" size="80,21" font="Regular;20" transparent="1" />
-               <widget name="lock_state" position="540,330" size="120,21" font="Regular;20" transparent="1" />
-               <widget name="lock_off" pixmap="skin_default/icons/lock_off.png" position="490,330" zPosition="1" size="38,31" transparent="1" alphatest="on" />
-               <widget name="lock_on" pixmap="skin_default/icons/lock_on.png" position="490,330" zPosition="1" size="38,31" transparent="1" alphatest="on" />
-               <widget name="Frequency" position="400,360" size="170,21" font="Regular;20" transparent="1" />
-               <widget name="frequency_value" position="580,360" size="80,21" font="Regular;20" transparent="1" />
-               <widget name="Symbolrate" position="400,390" size="170,21" font="Regular;20" transparent="1" />
-               <widget name="symbolrate_value" position="580,390" size="80,21" font="Regular;20" transparent="1" />
-               <widget name="FEC" position="400,420" size="140,21" font="Regular;20" transparent="1" />
-               <widget name="fec_value" position="580,420" size="80,21" font="Regular;20" transparent="1" />
+               <widget name="Lock" position="400,330" size="80,21" font="Regular;20" transparent="1"/>
+               <widget name="lock_state" position="540,330" size="120,21" font="Regular;20" transparent="1"/>
+               <widget name="lock_off" pixmap="skin_default/icons/lock_off.png" position="490,330" zPosition="1" size="38,31" transparent="1" alphatest="on"/>
+               <widget name="lock_on" pixmap="skin_default/icons/lock_on.png" position="490,330" zPosition="1" size="38,31" transparent="1" alphatest="on"/>
+               <widget name="Frequency" position="400,360" size="170,21" font="Regular;20" transparent="1"/>
+               <widget name="frequency_value" position="580,360" size="80,21" font="Regular;20" transparent="1"/>
+               <widget name="Symbolrate" position="400,390" size="170,21" font="Regular;20" transparent="1"/>
+               <widget name="symbolrate_value" position="580,390" size="80,21" font="Regular;20" transparent="1"/>
+               <widget name="FEC" position="400,420" size="140,21" font="Regular;20" transparent="1"/>
+               <widget name="fec_value" position="580,420" size="80,21" font="Regular;20" transparent="1"/>
 
-               <widget name="rotorstatus" position="120,300" size="400,21" font="Regular;20" foregroundColor="#00ffc000" halign="center" valign="center" />
-               <ePixmap pixmap="skin_default/div-h.png" position="0,450" zPosition="1" size="660,2" />
+               <widget name="rotorstatus" position="120,300" size="400,21" font="Regular;20" foregroundColor="#00ffc000" halign="center" valign="center"/>
+               <ePixmap pixmap="skin_default/div-h.png" position="0,450" zPosition="1" size="660,2"/>
                <widget name="status_bar" position="90,460" size="520,21" halign="center" valign="left" font="Regular;20" foregroundColor="white"/>
-               <ePixmap alphatest="on" pixmap="skin_default/buttons/key_info.png" position="0,455" size="40,30" zPosition="1" />
-               <ePixmap alphatest="on" pixmap="skin_default/buttons/key_menu.png" position="45,455" size="40,30" zPosition="1" />
-               <ePixmap alphatest="on" pixmap="skin_default/icons/clock.png" position="585,460" size="14,14" zPosition="1" />
-               <widget font="Regular;18" halign="left" position="610,463" render="Label" size="70,21" source="global.CurrentTime" transparent="1" >
+               <ePixmap alphatest="on" pixmap="skin_default/buttons/key_info.png" position="0,455" size="40,30" zPosition="1"/>
+               <ePixmap alphatest="on" pixmap="skin_default/buttons/key_menu.png" position="45,455" size="40,30" zPosition="1"/>
+               <ePixmap alphatest="on" pixmap="skin_default/icons/clock.png" position="585,460" size="14,14" zPosition="1"/>
+               <widget font="Regular;18" halign="left" position="610,463" render="Label" size="70,21" source="global.CurrentTime" transparent="1">
                        <convert type="ClockToText">Default</convert>
                </widget>
        </screen>
        <!-- Fast Scan -->
        <screen name="FastScanScreen" position="center,center" size="520,350" title="Fast Scan">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <eLabel text="Cancel" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <eLabel text="Scan" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <eLabel text="Cancel" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <eLabel text="Scan" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
 
-               <widget name="config" position="10,50" size="500,300" scrollbarMode="showOnDemand" />
-               <widget name="introduction" position="0,0" size="0,0" />
+               <widget name="config" position="10,50" size="500,300" scrollbarMode="showOnDemand"/>
+               <widget name="introduction" position="0,0" size="0,0"/>
        </screen>
        <!-- Scart -->
-       <screen name="Scart" position="fill" backgroundColor="transparent" />
+       <screen name="Scart" position="fill" backgroundColor="transparent"/>
        <!-- Service info -->
        <screen name="ServiceInfoSimple" position="center,center" size="560,430" title="Service info">
-               <widget name="infolist" position="20,45" size="560,380" selectionDisabled="1" />
+               <widget name="infolist" position="20,45" size="560,380" selectionDisabled="1"/>
        </screen>
        <screen name="ServiceInfo" position="center,center" size="560,430" title="Service info">
                <panel name="ServiceInfoSimple"/>
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
        </screen>
 
        <!-- Service scan -->
@@ -1040,63 +1023,63 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
                <widget source="FrontendInfo" render="Pixmap" pixmap="skin_default/icons/scan-s.png" position="5,5" size="64,64" transparent="1" alphatest="on">
                        <convert type="FrontendInfo">TYPE</convert>
                        <convert type="ValueRange">0,0</convert>
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
                <widget source="FrontendInfo" render="Pixmap" pixmap="skin_default/icons/scan-c.png" position="5,5" size="64,64" transparent="1" alphatest="on">
                        <convert type="FrontendInfo">TYPE</convert>
                        <convert type="ValueRange">1,1</convert>
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
                <widget source="FrontendInfo" render="Pixmap" pixmap="skin_default/icons/scan-t.png" position="5,5" size="64,64" transparent="1" alphatest="on">
                        <convert type="FrontendInfo">TYPE</convert>
                        <convert type="ValueRange">2,2</convert>
-                       <convert type="ConditionalShowHide" />
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <widget name="network" position="80,15" size="330,20" font="Regular;20" />
-               <widget name="transponder" position="80,40" size="330,20" font="Regular;20" />
-               <widget name="scan_state" position="10,80" zPosition="2" size="400,20" font="Regular;18" />
-               <widget name="pass" position="10,80" size="400,20" font="Regular;18" />
-               <widget name="scan_progress" position="10,105" size="400,15" pixmap="skin_default/progress_big.png" borderWidth="2" borderColor="#cccccc" />
-               <widget name="servicelist" position="10,135" size="400,265" selectionDisabled="1" />
+               <widget name="network" position="80,15" size="330,20" font="Regular;20"/>
+               <widget name="transponder" position="80,40" size="330,20" font="Regular;20"/>
+               <widget name="scan_state" position="10,80" zPosition="2" size="400,20" font="Regular;18"/>
+               <widget name="pass" position="10,80" size="400,20" font="Regular;18"/>
+               <widget name="scan_progress" position="10,105" size="400,15" pixmap="skin_default/progress_big.png" borderWidth="2" borderColor="#cccccc"/>
+               <widget name="servicelist" position="10,135" size="400,265" selectionDisabled="1"/>
        </screen>
        <!-- Setup -->
        <screen name="Setup" position="center,center" size="560,430" title="Setup">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="config" position="5,50" size="550,375" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="config" position="5,50" size="550,375" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Simple channelselection -->
        <screen name="SimpleChannelSelection" position="center,center" size="560,430" title="Channel selection">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="list" position="00,45" size="560,364" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Skin Selector -->
        <screen name="SkinSelector" position="center,center" size="600,400" title="Select a skin">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" zPosition="1" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="2" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <ePixmap pixmap="skin_default/border_menu_300.png" position="5,50" zPosition="1" size="300,300" transparent="1" alphatest="on" />
-               <widget name="SkinList" position="10,60" size="290,260" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" zPosition="1" alphatest="on"/>
+               <widget source="key_red" render="Label" position="0,0" zPosition="2" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <ePixmap pixmap="skin_default/border_menu_300.png" position="5,50" zPosition="1" size="300,300" transparent="1" alphatest="on"/>
+               <widget name="SkinList" position="10,60" size="290,260" scrollbarMode="showOnDemand"/>
                <widget name="Preview" position="310,50" size="280,210" alphatest="on"/>
-               <ePixmap pixmap="skin_default/div-h.png" position="20,360" zPosition="1" size="600,2" />
-               <widget source="introduction" render="Label" position="0,370" size="560,30" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
+               <ePixmap pixmap="skin_default/div-h.png" position="20,360" zPosition="1" size="600,2"/>
+               <widget source="introduction" render="Label" position="0,370" size="560,30" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
        </screen>
        <!-- Standby mode -->
-       <screen name="Standby" flags="wfNoBorder" position="fill" title="Standby" />
+       <screen name="Standby" flags="wfNoBorder" position="fill" title="Standby"/>
        <!-- Extra margin for wizard, never know how bad the TV is... -->
        <screen name="WizardMarginsTemplate">
-               <panel position="left" size="10%,*" />
-               <panel position="right" size="8%,*" />
-               <panel position="top" size="8%,*" />
-               <panel position="bottom" size="10%,*" />
+               <panel position="left" size="10%,*"/>
+               <panel position="right" size="8%,*"/>
+               <panel position="top" size="8%,*"/>
+               <panel position="bottom" size="10%,*"/>
        </screen>
        <!-- Start Wizard -->
        <screen name="RemoteControlTemplate">
@@ -1110,99 +1093,99 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
                </panel>
        </screen>
        <screen name="WizardPictureLangTemplate">
-               <panel position="left" size="110,*">
-                       <panel position="top" size="*,50"/>
-                       <ePixmap pixmap="skin_default/buttons/button_red.png" position="left" zPosition="0" size="15,16" alphatest="on" />
-                       <widget name="languagetext" position="fill" font="Regular;18" />
+               <panel position="top" size="*,50"/>
+               <panel position="top" size="*,50">
+                       <ePixmap pixmap="skin_default/buttons/button_red.png" position="left" zPosition="0" size="15,16" alphatest="on"/>
+                       <widget name="languagetext" position="fill" font="Regular;18"/>
                </panel>
        </screen>
        <!-- it's the same screen... -->
        <screen name="StartWizard" position="fill" title="Welcome..." flags="wfNoBorder">
-               <panel name="DefaultWizard" />
+               <panel name="DefaultWizard"/>
        </screen>
        <!-- Subservice quickzap -->
        <screen name="SubservicesQuickzap" position="center,center" size="512,200" title="Subservices" backgroundColor="transparent" flags="wfNoBorder">
-               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="450,0" zPosition="2" size="14,14" alphatest="on" >
+               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="450,0" zPosition="2" size="14,14" alphatest="on">
                        <convert type="ConditionalShowHide">Blink</convert>
                </widget>
-               <eLabel text="Subservices" position="0,0" size="470,20" font="Regular;13" backgroundColor="#33294a6b" />
-               <widget name="CurrentSubserviceNumber" position="0,20" size="50,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1" />
+               <eLabel text="Subservices" position="0,0" size="470,20" font="Regular;13" backgroundColor="#33294a6b"/>
+               <widget name="CurrentSubserviceNumber" position="0,20" size="50,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1"/>
                <widget source="session.CurrentService" render="Label" position="50,20" size="420,34" font="Regular;22" backgroundColor="#33294a6b" shadowColor="black" shadowOffset="-1,-1">
                        <convert type="ServiceName">Name</convert>
                </widget>
        </screen>
        <!-- Subtitle selection -->
        <screen name="Subtitles" position="center,center" size="380,285" title="Subtitle selection">
-               <widget name="config" position="10,10" zPosition="1" size="360,275" scrollbarMode="showOnDemand" />
+               <widget name="config" position="10,10" zPosition="1" size="360,275" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Subtitle area -->
-       <screen name="SubtitleDisplay" position="fill" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" />
+       <screen name="SubtitleDisplay" position="fill" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent"/>
        <!-- TextBox -->
        <screen name="TextBox" position="center,center" size="550,400" title="Message...">
-               <widget name="text" position="0,0" size="540,390" font="Regular;18" />
+               <widget name="text" position="0,0" size="540,390" font="Regular;18"/>
                <!--widget source="text" render="Label" position="0,0" size="540,390" font="Regular;18" /-->
        </screen>
        <!-- Time & date input -->
        <screen name="TimeDateInput" position="center,center" size="400,200" title="Date/time input">
-               <widget name="cancel" pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
-               <widget name="ok" pixmap="skin_default/buttons/green.png" position="250,0" size="140,40" alphatest="on" />
-               <widget name="canceltext" position="10,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" transparent="1" />
-               <widget name="oktext" position="250,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" transparent="1" />
-               <widget name="config" position="10,40" size="380,150" />
+               <widget name="cancel" pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on"/>
+               <widget name="ok" pixmap="skin_default/buttons/green.png" position="250,0" size="140,40" alphatest="on"/>
+               <widget name="canceltext" position="10,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" transparent="1"/>
+               <widget name="oktext" position="250,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" transparent="1"/>
+               <widget name="config" position="10,40" size="380,150"/>
        </screen>
        <!-- Timer edit -->
        <screen name="TimerEdit" position="center,center" size="590,335" title="Timer edit">
-               <widget name="description" position="10,10" size="580,40" font="Regular;25" />
-               <widget name="lbegin" position="405,102" size="103,30" font="Regular;25" foregroundColor="red" />
-               <widget name="lend" position="405,158" size="103,30" font="Regular;25" foregroundColor="green" />
-               <widget name="begin" position="508,105" size="72,35" font="Regular;25" />
-               <widget name="end" position="508,150" size="72,35" font="Regular;25" />
-               <widget name="apply" position="10,240" size="250,35" />
+               <widget name="description" position="10,10" size="580,40" font="Regular;25"/>
+               <widget name="lbegin" position="405,102" size="103,30" font="Regular;25" foregroundColor="red"/>
+               <widget name="lend" position="405,158" size="103,30" font="Regular;25" foregroundColor="green"/>
+               <widget name="begin" position="508,105" size="72,35" font="Regular;25"/>
+               <widget name="end" position="508,150" size="72,35" font="Regular;25"/>
+               <widget name="apply" position="10,240" size="250,35"/>
        </screen>
        <!-- Timer edit list -->
        <screen name="TimerEditList" position="center,center" size="560,430" title="Timer editor">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="timerlist" position="0,60" size="560,350" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="timerlist" position="0,60" size="560,350" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Timer entry -->
        <screen name="TimerEntry" position="center,center" size="560,440" title="Timer entry">
-               <widget name="cancel" pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <widget name="ok" pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="canceltext" position="0,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#9f1313" transparent="1" />
-               <widget name="oktext" position="140,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#18188b" transparent="1" />
-               <widget name="config" position="10,45" size="540,385" scrollbarMode="showOnDemand" />
+               <widget name="cancel" pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <widget name="ok" pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="canceltext" position="0,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="oktext" position="140,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="2" size="140,40" halign="center" valign="center" font="Regular;21" backgroundColor="#18188b" transparent="1"/>
+               <widget name="config" position="10,45" size="540,385" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Timer log -->
        <screen name="TimerLog" position="center,center" size="560,430" title="Timer log">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="loglist" position="0,45" size="560,250" scrollbarMode="showOnDemand" />
-               <widget name="logentry" position="0,300" size="560,130" font="Regular;20" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on"/>
+               <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="key_yellow" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+               <widget name="key_blue" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1"/>
+               <widget name="loglist" position="0,45" size="560,250" scrollbarMode="showOnDemand"/>
+               <widget name="logentry" position="0,300" size="560,130" font="Regular;20"/>
        </screen>
        <!-- Timer Selection -->
        <screen name="TimerSelection" position="center,center" size="560,430" title="Timer selection">
-               <widget name="timerlist" position="0,45" size="560,350" scrollbarMode="showOnDemand" />
+               <widget name="timerlist" position="0,45" size="560,350" scrollbarMode="showOnDemand"/>
        </screen>
        <!-- Timeshift state -->
        <screen name="TimeshiftState" position="70,70" zPosition="2" size="150,60" backgroundColor="transpBlack" flags="wfNoBorder">
-               <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" />
+               <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack"/>
                <widget source="session.CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" foregroundColor="white" backgroundColor="transpBlack">
                        <convert type="ServicePosition">Remaining</convert>
                </widget>
@@ -1212,64 +1195,64 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
        </screen>
        <!-- Translator Info -->
        <screen name="TranslationInfo" position="center,center" size="420,350" title="Translation">
-               <eLabel position="10,20" size="380,23" font="Regular;23" text="Translation:" />
-               <widget source="TranslatorName" render="Label" position="10,55" size="380,20" font="Regular;20" />
-               <widget source="TranslationInfo" render="Label" position="10,100" size="380,250" font="Regular;20" />
+               <eLabel position="10,20" size="380,23" font="Regular;23" text="Translation:"/>
+               <widget source="TranslatorName" render="Label" position="10,55" size="380,20" font="Regular;20"/>
+               <widget source="TranslationInfo" render="Label" position="10,100" size="380,250" font="Regular;20"/>
        </screen>
        <!-- Volumebar -->
        <screen name="Volume" position="253,60" zPosition="1" size="214,21" title="Volume" flags="wfNoBorder">
-               <ePixmap pixmap="skin_default/volume.png" position="0,0" size="214,21" />
-               <widget name="Volume" pixmap="skin_default/progress_small.png" position="31,7" zPosition="1" size="168,7" transparent="1" />
+               <ePixmap pixmap="skin_default/volume.png" position="0,0" size="214,21"/>
+               <widget name="Volume" pixmap="skin_default/progress_small.png" position="31,7" zPosition="1" size="168,7" transparent="1"/>
        </screen>
        <!-- JobView -->
        <screen name="JobView" position="center,center" size="520,350" title="Job overview">
-               <widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28" />
-               <widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23" />
-               <widget source="job_progress" render="Progress" position="20,162" size="480,36" borderWidth="2" backgroundColor="#254f7497" />
+               <widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28"/>
+               <widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23"/>
+               <widget source="job_progress" render="Progress" position="20,162" size="480,36" borderWidth="2" backgroundColor="#254f7497"/>
                <widget source="job_progress" render="Label" position="120,166" size="280,32" font="Regular;28" foregroundColor="#000000" zPosition="2" halign="center" transparent="1"  >
-                       <convert type="ProgressToText" />
+                       <convert type="ProgressToText"/>
                </widget>
-               <widget source="job_status" render="Label" position="20,212" size="480,26" font="Regular;23" />
-               <widget name="config" position="20,254" size="480,20" />
-               <widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="20,300" size="140,40" alphatest="on" >
-                       <convert type="ConditionalShowHide" />
+               <widget source="job_status" render="Label" position="20,212" size="480,26" font="Regular;23"/>
+               <widget name="config" position="20,254" size="480,20"/>
+               <widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="20,300" size="140,40" alphatest="on">
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <widget source="cancelable" render="FixedLabel" text="Cancel" position="20,300" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" >
-                       <convert type="ConditionalShowHide" />
+               <widget source="cancelable" render="FixedLabel" text="Cancel" position="20,300" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1">
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="190,300" size="140,40" alphatest="on" >
-                       <convert type="ConditionalShowHide" />
+               <widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="190,300" size="140,40" alphatest="on">
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="190,300" size="140,40" transparent="1" backgroundColor="#1f771f" >
-                       <convert type="ConditionalShowHide" />
+               <widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="190,300" size="140,40" transparent="1" backgroundColor="#1f771f">
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="360,300" size="140,40" alphatest="on" >
-                       <convert type="ConditionalShowHide" />
+               <widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="360,300" size="140,40" alphatest="on">
+                       <convert type="ConditionalShowHide"/>
                </widget>
-               <widget source="backgroundable" render="FixedLabel" text="Continue in background" font="Regular;20" halign="center" valign="center" position="360,300" size="140,40" transparent="1" backgroundColor="#18188b" >
-                       <convert type="ConditionalShowHide" />
+               <widget source="backgroundable" render="FixedLabel" text="Continue in background" font="Regular;20" halign="center" valign="center" position="360,300" size="140,40" transparent="1" backgroundColor="#18188b">
+                       <convert type="ConditionalShowHide"/>
                </widget>
        </screen>
        <!-- VideoMode -->
        <screen name="VideoMode" position="center,center" size="250,60" title="VideoMode">
-               <widget name="videomode" position="10,10" size="230,40" font="Regular;23" halign="left" />
+               <widget name="videomode" position="10,10" size="230,40" font="Regular;23" halign="left"/>
        </screen>
        <!-- VirtualKeyBoard -->
        <screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99" title="Virtual keyboard">
-               <ePixmap pixmap="skin_default/vkey_text.png" position="9,45" zPosition="-4" size="542,52" alphatest="on" />
-               <widget source="country" render="Pixmap" position="490,0" size="60,40" alphatest="on" borderWidth="2" borderColor="yellow" >
+               <ePixmap pixmap="skin_default/vkey_text.png" position="9,45" zPosition="-4" size="542,52" alphatest="on"/>
+               <widget source="country" render="Pixmap" position="490,0" size="60,40" alphatest="on" borderWidth="2" borderColor="yellow">
                        <convert type="ValueToPixmap">LanguageCode</convert>
                </widget>
-               <widget name="header" position="10,20" size="500,20" font="Regular;20" transparent="1" noWrap="1" />
-               <widget name="text" position="12,45" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right" />
-               <widget name="list" position="10,110" size="540,225" selectionDisabled="1" transparent="1" />
+               <widget name="header" position="10,20" size="500,20" font="Regular;20" transparent="1" noWrap="1"/>
+               <widget name="text" position="12,45" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right"/>
+               <widget name="list" position="10,110" size="540,225" selectionDisabled="1" transparent="1"/>
        </screen>
        <!-- FileBrowser -->
-       <screen name="FileBrowser" position="center,center" size="520,430" title="DVD file browser" >
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" />
+       <screen name="FileBrowser" position="center,center" size="520,430" title="DVD file browser">
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on"/>
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on"/>
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1"/>
+               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1"/>
+               <widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand"/>
        </screen>
 </skin>
similarity index 94%
rename from data/skin_display96.xml
rename to data/skin_display_dm800se.xml
index 650e219..5b83d54 100644 (file)
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--  Skin: LCD from Magic by MiLo -->
 <skin>
+       <windowstyle type="skinned" id="1">
+               <color name="Background" color="#000000"/>
+               <color name="LabelForeground" color="#ffffff"/>
+               <color name="ListboxBackground" color="#000000"/>
+               <color name="ListboxForeground" color="#ffffff"/>
+               <color name="ListboxSelectedBackground" color="#000000"/>
+               <color name="ListboxSelectedForeground" color="#ffffff"/>
+               <color name="ListboxMarkedBackground" color="#000000"/>
+               <color name="ListboxMarkedForeground" color="#ffffff"/>
+               <color name="ListboxMarkedAndSelectedBackground" color="#000000"/>
+               <color name="ListboxMarkedAndSelectedForeground" color="#ffffff"/>
+               <color name="WindowTitleForeground" color="#ffffff"/>
+               <color name="WindowTitleBackground" color="#000000"/>
+       </windowstyle>
        <fonts>
                <!-- pick a funky name for the font, so we don't conflict  -->
                <font filename="nmsbd.ttf" name="FdLcD" scale="90"/>
index 1630df6..7d5db9a 100644 (file)
@@ -23,8 +23,9 @@
        </fonts>
 
 <!-- main-->
-       <screen name="InfoBarSummary" position="0,0" size="720,576"> 
-               <widget source="session.CurrentService" render="Label" position="15,21" size="675,70" foregroundColor="#e5b243" font="FdLcD; 50" halign="center" zPosition="14">
+       <screen name="InfoBarSummary" position="0,0" size="720,576">
+               <widget source="session.CurrentService" render="ChannelNumber" position="20,31" size="120,45" foregroundColor="#99ff99" font="FdLcD; 40" halign="left" zPosition="14" />
+               <widget source="session.CurrentService" render="Label" position="0,21" size="720,55" foregroundColor="#e5b243" font="FdLcD; 50" halign="center" zPosition="13">
                        <convert type="ServiceName">Name</convert>
                </widget>
                <widget source="session.Event_Now" render="Label" position="48,189" foregroundColor="#dedede" size="675,192" font="FdLcDLight; 45" halign="left" valign="center">
                </widget>
        </screen>
 <!-- channelselection-->
-       <screen name="ChannelSelection_summary" position="0,0" size="720,576"> 
-               <widget source="parent.ServiceEvent" render="Label" position="17,21" size="675,70" foregroundColor="#e5b243" font="FdLcD; 50" halign="center">
+       <screen name="ChannelSelection_summary" position="0,0" size="720,576">
+               <widget source="parent.ServiceEvent" render="Label" position="20,31" size="120,45" foregroundColor="#99ff99" font="FdLcD; 40" halign="left" zPosition="14" >
+                       <convert type="ServiceName">Number</convert>
+               </widget>
+               <widget source="parent.ServiceEvent" render="Label" position="0,21" size="720,55" foregroundColor="#e5b243" font="FdLcD; 50" halign="center" zPosition="13" >
                        <convert type="ServiceName">Name</convert>
                </widget>
                <widget source="parent.ServiceEvent" render="Label" position="18,189" foregroundColor="#dedede" size="675,192" font="FdLcDLight; 45" halign="center" valign="center">
                <widget source="global.CurrentTime" render="Label" position="500,490" size="182,52" halign="right" font="FdLcD;50">
                        <convert type="ClockToText">Default</convert>
                </widget>
-               <widget source="parent.Service" render="ChannelNumber" position="17,481" size="169,61" zPosition="8" font="FdLcD;40" halign="center" valign="top" transparent="1" />
-               <widget source="parent.Service" render="Picon" zPosition="13" position="224,394" size="242,142" transparent="1" alphatest="blend">      
+               <widget source="parent.Service" render="Picon" zPosition="13" position="224,394" size="242,142" transparent="1" alphatest="blend">
                        <convert type="ServiceName">Reference</convert>
                </widget>
        </screen>
diff --git a/data/skin_display_vusolo4k.xml b/data/skin_display_vusolo4k.xml
new file mode 100644 (file)
index 0000000..ae220aa
--- /dev/null
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<skin>
+       <windowstyle id="1" type="skinned">
+               <color color="#000000" name="Background"/>
+               <color color="#ffffff" name="LabelForeground"/>
+               <color color="#000000" name="ListboxBackground"/>
+               <color color="#ffffff" name="ListboxForeground"/>
+               <color color="#000000" name="ListboxSelectedBackground"/>
+               <color color="#ffffff" name="ListboxSelectedForeground"/>
+               <color color="#000000" name="ListboxMarkedBackground"/>
+               <color color="#ffffff" name="ListboxMarkedForeground"/>
+               <color color="#000000" name="ListboxMarkedAndSelectedBackground"/>
+               <color color="#ffffff" name="ListboxMarkedAndSelectedForeground"/>
+               <color color="#ffffff" name="WindowTitleForeground"/>
+               <color color="#000000" name="WindowTitleBackground"/>
+       </windowstyle>
+       <fonts>
+               <!-- pick a funky name for the font, so we don't conflict  -->
+               <font filename="nmsbd.ttf" name="FdLcD" scale="100"/>
+               <alias name="Huge" font="FdLcD" size="128" height="128" />
+               <alias name="Bigger" font="FdLcD" size="72" height="72" />
+               <alias name="Big" font="FdLcD" size="56" height="56" />
+               <alias name="Medium" font="FdLcD" size="40" height="40" />
+               <alias name="Small" font="FdLcD" size="32" height="32" />
+       </fonts>
+       <colors>
+               <color name="fullred" value="#ff0000" />
+               <color name="yellow" value="#ffff00" />
+               <color name="greenish" value="#04b404" />
+               <color name="lightcyan" value="#7fffff" />
+       </colors>
+
+<!-- template -->
+       <screen name="SummaryClockPanel">
+               <widget source="global.CurrentTime" render="Label" position="320,260" size="160,60" font="Medium" halign="center" valign="center" noWrap="1" foregroundColor="lightcyan">
+                       <convert type="ClockToText"></convert>
+               </widget>
+       </screen>
+
+       <screen name="SummaryClockRecPanel">
+               <widget source="global.CurrentTime" render="Label" position="right" size="160,*" font="Big" halign="right" valign="center" noWrap="1" foregroundColor="lightcyan">
+                       <convert type="ClockToText"></convert>
+               </widget>
+               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="right" size="30,30">
+                       <convert type="ConditionalShowHide"></convert>
+               </widget>
+       </screen>
+
+<!-- main-->
+       <!-- menus-->
+       <screen name="MenuSummary" position="fill">
+               <widget source="parent.title" render="Label" position="0,5" size="480,70" font="Big" halign="center" valign="center" foregroundColor="yellow" />
+               <widget source="parent.menu" render="Label" position="0,90" size="480,90" font="Medium" halign="center" valign="center">
+                       <convert type="StringListSelection" />
+               </widget>
+       </screen>
+
+<!-- setup-->
+       <screen name="SetupSummary" position="fill">
+               <widget source="SetupTitle" render="Label" position="0,5" size="480,70" font="Big" halign="center" valign="center" foregroundColor="yellow" />
+               <widget source="SetupEntry" render="Label" position="0,90" size="480,90" font="Medium" halign="center" valign="center" />
+               <widget source="SetupValue" render="Label" position="0,200" size="480,70" font="Medium" halign="center" valign="center" />
+       </screen>
+
+       <screen name="InfoBarSummary" position="fill">
+               <!-- Margins to stay away from extreme left/right sides -->
+               <panel position="left" size="5%,*" />
+               <panel position="right" size="5%,*" />
+               <panel position="fill">
+                       <widget source="session.CurrentService" render="Label" position="top" size="*,70" font="Big" halign="center" valign="center" foregroundColor="yellow" >
+                               <convert type="ServiceName">Name</convert>
+                       </widget>
+                       <widget source="session.Event_Now" render="Label" position="top" size="*,100" font="Medium" halign="center" valign="center" >
+                               <convert type="EventName">Name</convert>
+                       </widget>
+                       <widget source="session.Event_Now" render="Progress" position="top" size="*,20" borderWidth="1" >
+                               <convert type="EventTime">Progress</convert>
+                       </widget>
+                       <panel position="top" size="*,40">
+                               <widget source="session.Event_Now" render="Label" position="left" size="130,*" font="Medium" halign="center" valign="center" >
+                                       <convert type="EventTime">StartTime</convert>
+                                       <convert type="ClockToText">Format:%H:%M</convert>
+                               </widget>
+                               <widget source="session.Event_Now" render="Label" position="left" size="130,*" font="Medium" halign="center" valign="center" >
+                                       <convert type="EventTime">EndTime</convert>
+                                       <convert type="ClockToText">Format:- %H:%M</convert>
+                               </widget>
+                               <widget source="session.Event_Now" render="Label" position="right" size="100,*" font="Medium" halign="right" valign="center" >
+                                       <convert type="EventTime">Remaining</convert>
+                                       <convert type="RemainingToText">FOLLOW</convert>
+                               </widget>
+                       </panel>
+                       <panel name="SummaryClockRecPanel" position="bottom" />
+               </panel>
+       </screen>
+
+<!-- channelselection-->
+       <screen name="ChannelSelection_summary" position="fill">
+               <widget source="parent.ServiceEvent" render="Label" position="0,5" size="480,70" font="Big" halign="center" valign="center" foregroundColor="yellow" >
+                       <convert type="ServiceName">Name</convert>
+               </widget>
+               <widget source="parent.ServiceEvent" render="Label" position="0,70" size="480,90" font="Medium" halign="center" valign="center" >
+                       <convert type="EventName">Name</convert>
+               </widget>
+               <widget source="parent.ServiceEvent" render="Progress" position="20,170" size="440,20" borderWidth="1" >
+                       <convert type="EventTime">Progress</convert>
+               </widget>
+               <widget source="parent.ServiceEvent" render="Label" position="20,200" size="130,40" font="Medium" halign="center" valign="center" >
+                       <convert type="EventTime">StartTime</convert>
+                       <convert type="ClockToText">Format:%H:%M</convert>
+               </widget>
+               <widget source="parent.ServiceEvent" render="Label" position="150,200" size="130,40" font="Medium" halign="center" valign="center" >
+                       <convert type="EventTime">EndTime</convert>
+                       <convert type="ClockToText">Format:- %H:%M</convert>
+               </widget>
+               <widget source="parent.ServiceEvent" render="Label" position="350,200" size="100,40" font="Medium" halign="right" valign="center" >
+                       <convert type="EventTime">Remaining</convert>
+                       <convert type="RemainingToText">FOLLOW</convert>
+               </widget>
+               <panel name="SummaryClockPanel" position="bottom" size="*,64" />
+       </screen>
+
+<!-- EPG Screens -->
+       <screen name="EPGSelection_summary" position="fill">
+               <widget source="parent.Service" render="Label" position="0,5" size="480,70" font="Big" halign="center" valign="center" foregroundColor="yellow" >
+                       <convert type="ServiceName">Name</convert>
+               </widget>
+               <widget source="parent.Event" render="Label" position="0,70" size="480,90" font="Medium" halign="center" valign="center" >
+                       <convert type="EventName">Name</convert>
+               </widget>
+               <widget source="parent.Event" render="Progress" position="20,170" size="440,20" borderWidth="1" >
+                       <convert type="EventTime">Progress</convert>
+               </widget>
+               <widget source="parent.Event" render="Label" position="20,200" size="130,40" font="Medium" halign="center" valign="center" >
+                       <convert type="EventTime">StartTime</convert>
+                       <convert type="ClockToText">Format:%H:%M</convert>
+               </widget>
+               <widget source="parent.Event" render="Label" position="150,200" size="130,40" font="Medium" halign="center" valign="center" >
+                       <convert type="EventTime">EndTime</convert>
+                       <convert type="ClockToText">Format:- %H:%M</convert>
+               </widget>
+               <widget source="parent.Event" render="Label" position="350,200" size="100,40" font="Medium" halign="right" valign="center" >
+                       <convert type="EventTime">Remaining</convert>
+                       <convert type="RemainingToText">FOLLOW</convert>
+               </widget>
+               <eLabel text="TUNER:" position="20,260" size="160,60" halign="center" valign="center" font="Medium" />
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="A" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">0,0</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="B" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">1,1</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="C" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">2,2</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="D" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">3,3</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="E" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">4,4</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="F" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">5,5</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="G" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">6,6</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="H" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">7,7</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="I" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">8,8</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.FrontendInfo" render="FixedLabel" position="180,260" size="60,60" text="J" foregroundColor="greenish" font="Medium" halign="center" valign="center" >
+                       <convert type="FrontendInfo">NUMBER</convert>
+                       <convert type="ValueRange">9,9</convert>
+                       <convert type="ConditionalShowHide" />
+               </widget>
+               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="285,270" size="30,30" zPosition="3" alphatest="blend">
+                       <convert type="ConditionalShowHide"></convert>
+               </widget>
+               <panel name="SummaryClockPanel" />
+       </screen>
+       <screen name="QuickEPG_summary" position="fill">
+               <panel name="EPGSelection_summary" />
+       </screen>
+       <screen name="GraphicalEPG_summary" position="fill">
+               <panel name="EPGSelection_summary" />
+       </screen>
+       <screen name="GraphicalEPGPIG_summary" position="fill">
+               <panel name="EPGSelection_summary" />
+       </screen>
+       <screen name="GraphicalInfoBarEPG_summary" position="fill">
+               <panel name="EPGSelection_summary" />
+       </screen>
+       <screen name="EPGSelectionMulti_summary" position="fill">
+               <panel name="EPGSelection_summary" />
+       </screen>
+
+<!-- messagebox-->
+       <screen name="MessageBox_summary" position="fill">
+               <widget source="parent.Text" render="Label" position="0,20" size="480,180" font="Medium" halign="center" valign="center" />
+               <widget source="parent.selectedChoice" render="Label" position="0,220" size="400,70" font="Medium" halign="center" valign="center" noWrap="1" />
+       </screen>
+       <screen name="MessageBoxSimple_summary" position="fill">
+               <panel name="MessageBox_summary" />
+       </screen>
+
+<!-- standby -->
+       <screen name="StandbySummary" position="fill">
+               <panel position="top" size="*,70">
+                       <panel position="bottom" size="*,30">
+                               <widget source="session.RecordState" render="Pixmap" pixmap="skin_default/icons/record.png" position="right" size="30,30">
+                                       <convert type="ConditionalShowHide"></convert>
+                               </widget>
+                       </panel>
+               </panel>
+               <widget source="global.CurrentTime" render="Label" position="bottom" size="*,70" font="Medium" foregroundColor="yellow" halign="center" valign="center" noWrap="1">
+                       <convert type="ClockToText">LongDate</convert>
+               </widget>
+               <widget source="global.CurrentTime" render="Label" position="fill" font="Huge" halign="center" valign="center" noWrap="1">
+                       <convert type="ClockToText">Format:%H:%M</convert>
+               </widget>
+       </screen>
+
+<!-- movieplayer-->
+       <screen name="InfoBarMoviePlayerSummary" position="fill">
+               <panel position="left" size="5%,*" />
+               <panel position="right" size="5%,*" />
+               <panel position="fill">
+                       <widget source="session.CurrentService" render="Label" position="top" size="*,120" font="Medium" halign="center" valign="center" >
+                               <convert type="ServiceName">Name</convert>
+                       </widget>
+                       <widget source="session.CurrentService" render="Progress" position="top" size="*,20" borderWidth="1" >
+                               <convert type="ServicePosition">Position</convert>
+                       </widget>
+                       <panel position="top" size="*,40">
+                               <widget source="session.CurrentService" render="Label" position="left" size="50%,*" font="Medium" halign="left" valign="center" >
+                                       <convert type="ServicePosition">Position,ShowHours</convert>
+                               </widget>
+                               <widget source="session.CurrentService" render="Label" position="fill" font="Medium" halign="right" valign="center" >
+                                       <convert type="ServicePosition">Remaining,Negate,ShowHours</convert>
+                               </widget>
+                       </panel>
+                       <panel name="SummaryClockRecPanel" position="bottom" size="*,40" />
+               </panel>
+       </screen>
+
+       <screen name="MovieContextMenuSummary" position="fill">
+               <widget source="parent.Title" render="Label" position="top" size="*,70" font="Big" halign="left" valign="center" noWrap="1" />
+               <widget source="selected" render="Label" position="fill" font="Medium" />
+               <panel name="SummaryClockRecPanel" position="bottom" />
+       </screen>
+
+       <screen name="MovieSelectionSummary" position="fill">
+               <panel position="left" size="5%,*" />
+               <panel position="right" size="5%,*" />
+               <panel position="fill">
+                       <widget source="parent.Title" render="Label" position="top" size="*,40" font="Small" halign="left" valign="center" noWrap="1"  foregroundColor="yellow" />
+                       <widget source="name" render="Label" position="top" size="*,100" font="Medium" halign="left" valign="top" />
+                       <panel position="top" size="*,40">
+                               <widget source="parent.Service" render="Label" position="fill" font="Medium" halign="right" noWrap="1" foregroundColor="yellow">
+                                       <convert type="MovieInfo">RecordServiceName</convert>
+                               </widget>
+                       </panel>
+                       <panel position="bottom" size="*,64">
+                               <panel name="SummaryClockRecPanel" position="right" />
+                               <widget source="parent.Service" render="Label" position="fill" font="Medium" halign="left" valign="center" noWrap="1">
+                                       <convert type="MovieInfo">FileSize</convert>
+                               </widget>
+                       </panel>
+               </panel>
+       </screen>
+
+<!-- misc-->
+       <screen name="SimpleSummary" position="fill">
+               <widget source="parent.Title" render="Label" position="top" size="*,100" font="Medium" halign="center" valign="center" />
+               <panel position="bottom" size="*,24" name="SummaryClockPanel" />
+       </screen>
+       <screen name="WizardSummary" position="fill">
+               <widget source="text" render="Label" position="top" size="*,71" font="FdLcD;35" halign="center" />
+               <widget source="parent.list" render="Label" position="fill" font="FdLcD;25" halign="center" >
+                       <convert type="StringListSelection" />
+               </widget>
+       </screen>
+       <screen name="VideoWizardSummary" position="fill">
+               <widget name="text" position="top" size="*,40" font="FdLcD;12" transparent="1" />
+               <widget source="parent.list" render="Label" position="fill" font="FdLcD;45" halign="center" >
+                       <convert type="StringListSelection" />
+               </widget>
+       </screen>
+
+<!-- Plugin browser -->
+       <screen name="PluginBrowserSummary" position="fill">
+               <widget source="parent.Title" render="Label" position="top" size="*,26" font="FdLcD;25" noWrap="1" />
+               <widget source="entry" render="Label" position="top" size="*,61" font="FdLcD;50" halign="left" />
+               <widget source="desc" render="Label" position="fill" font="FdLcD;22" valign="top" />
+       </screen>
+
+<!-- JobView Summary -->
+       <screen name="JobView_summary" position="fill">
+               <widget source="parent.summary_job_name" render="Label" position="0,38" size="400,58" font="FdLcD;24" halign="left" />
+               <widget source="parent.summary_job_task" render="Label" position="0,100" size="400,25" font="FdLcD;19" halign="left" />
+               <widget source="parent.summary_job_progress" render="Progress" position="0,0" size="285,30" borderWidth="1" zPosition="1" />
+               <widget source="parent.summary_job_progress" render="Label" position="290,0" size="100,30" font="FdLcD;24" zposition="0" halign="center" valign="center" transparent="1" >
+                       <convert type="ProgressToText" />
+               </widget>
+       </screen>
+
+       <screen name="EventView_summary" position="fill">
+               <widget source="parent.Title" render="Label" position="0,0" size="160,22" font="FdLcD;20" halign="left" noWrap="1" />
+               <widget source="parent.summary_description" render="Label" position="0,22" size="400,140" font="FdLcD;24" />
+       </screen>
+
+       <screen name="EventViewSimple_summary" position="fill">
+               <widget source="parent.Title" render="Label" position="0,0" size="160,22" font="FdLcD;20" halign="left" noWrap="1" />
+               <widget source="parent.summary_description" render="Label" position="0,22" size="400,140" font="FdLcD;24" />
+       </screen>
+
+
+
+       <screen name="ChoiceBox_summary" position="fill">
+               <widget source="parent.summary_list" render="Label" position="fill" font="FdLcD;18" noWrap="1" />
+       </screen>
+
+
+
+       <screen name="AboutSummary" position="fill">
+               <widget source="AboutText" render="Label" position="fill" font="FdLcD;11" />
+       </screen>
+
+       <screen name="TimerEditListSummary" position="fill">
+               <widget source="parent.Title" render="Label" position="0,0" size="400,26" font="FdLcD;24" halign="center" noWrap="1" />
+               <widget source="service" render="Label" position="0,40" size="400,30" font="FdLcD;28" halign="center" noWrap="1" />
+               <widget source="name" render="Label" position="0,80" size="400,100" font="FdLcD;28" halign="center" valign="center" />
+               <widget source="time" render="Label" position="0,188" size="400,28" font="FdLcD;24" halign="left" transparent="1" />
+               <widget source="duration" render="Label" position="0,214" size="400,28" font="FdLcD;24" halign="left" transparent="1" />
+               <widget source="state" render="Label" position="0,214" size="400,28" font="FdLcD;24" halign="right" transparent="1" />
+       </screen>
+
+       <screen name="AutoTimerOverviewSummary" position="fill">
+               <widget source="parent.Title" render="Label" position="0,0" size="400,26" font="FdLcD;24" halign="center" noWrap="1" />
+               <widget source="entry" render="Label" position="0,40" size="400,125" font="FdLcD;28" halign="center" valign="center" />
+               <panel name="SummaryClockPanel" />
+       </screen>
+
+       <screen name="WizardSummary" position="fill">
+               <widget source="text" render="Label" position="0,0" size="400,55" font="FdLcD;24" halign="center" />
+               <widget source="parent.list" render="Label" position="0,85" size="400,124" font="FdLcD;24" halign="center" >
+                       <convert type="StringListSelection" />
+               </widget>
+       </screen>
+       <screen name="LanguageWizardSummary" position="fill">
+               <widget source="parent.summarytext" render="Label" position="0,0" size="400,55" font="FdLcD;24" halign="center" />
+               <widget source="parent.summarylangname" render="Label" position="0,85" size="400,124" font="FdLcD;24" halign="center" />
+       </screen>
+       <screen name="VideoWizardSummary" position="fill">
+               <widget source="text" render="Label" position="0,0" size="400,50" font="FdLcD;24" halign="center" />
+               <widget source="parent.list" render="Label" position="0,85" size="400,124" font="FdLcD;24" halign="center" >
+                       <convert type="StringListSelection" />
+               </widget>
+       </screen>
+
+<!-- DVD -->
+       <screen name="DVDSummary" position="fill">
+               <widget source="session.CurrentService" render="Label" position="top" size="*,28" font="FdLcD;12"  >
+                       <convert type="ServiceName">Name</convert>
+               </widget>
+               <widget source="session.CurrentService" render="Progress" position="top" size="*,4" borderWidth="1" >
+                       <convert type="ServicePosition">Position</convert>
+               </widget>
+               <panel position="fill">
+                       <widget source="session.CurrentService" render="Label" position="left" size="60,*" font="FdLcD;12" halign="left" >
+                               <convert type="ServicePosition">Position</convert>
+                       </widget>
+                       <widget name="Chapter" position="fill" font="FdLcD;12" halign="left" />
+               </panel>
+       </screen>
+
+</skin>
index 50094ac..9bed933 100644 (file)
@@ -41,7 +41,6 @@ EXTRA_OECONF = "\
        --enable-maintainer-mode --with-target=native --with-libsdl=no --with-boxtype=${MACHINE} \
        --enable-dependency-tracking \
        ${@base_contains("MACHINE_FEATURES", "textlcd", "--with-textlcd" , "", d)} \
-       ${@base_contains("MACHINE_FEATURES", "colorlcd", "--with-colorlcd" , "", d)} \
        BUILD_SYS=${BUILD_SYS} \
        HOST_SYS=${HOST_SYS} \
        STAGING_INCDIR=${STAGING_INCDIR} \
index 9b67b60..93a52d4 100644 (file)
@@ -35,3 +35,11 @@ int CFile::writeInt(const char *filename, int value)
                return -1;
        return fprintf(f, "%d", value);
 }
+
+int CFile::write(const char *filename, const char *value)
+{
+       CFile f(filename, "w");
+       if (!f)
+               return -1;
+       return fprintf(f, "%s", value);
+}
index 3c41fd5..1f3ab2c 100644 (file)
@@ -28,6 +28,7 @@ struct CFile
        static int parseInt(int *result, const char *filename);
        static int writeIntHex(const char *filename, int value);
        static int writeInt(const char *filename, int value);
+       static int write(const char *filename, const char *value);
 };
 
 #endif
index 1f4fa5e..10eb420 100644 (file)
@@ -209,4 +209,3 @@ def InitAVSwitch():
                config.av.scaler_sharpness.addNotifier(setScaler_sharpness)
        else:
                config.av.scaler_sharpness = NoSave(ConfigNothing())
-
index 71fc923..fe7a0c1 100644 (file)
@@ -128,4 +128,3 @@ class ClientsStreaming(Converter, Poll, object):
 
        def doSuspend(self, suspended):
                pass
-
index bb6fbc9..3f52ff7 100644 (file)
@@ -148,4 +148,4 @@ class EventName(Converter, object):
                                return "undefined"
                        return ""
 
-       text = property(getText)
\ No newline at end of file
+       text = property(getText)
index 21644aa..86b3e32 100644 (file)
@@ -27,8 +27,10 @@ class FrontendInfo(Converter, object):
                        self.type = self.SLOT_NUMBER
                elif type == "TYPE":
                        self.type = self.TUNER_TYPE
-               elif type == "STRING":
+               elif type.startswith("STRING"):
                        self.type = self.STRING
+                       type = type.split(",")
+                       self.space_for_tuners = len(type) > 1 and int(type[1]) or 5
                else:
                        self.type = self.LOCK
 
@@ -64,8 +66,10 @@ class FrontendInfo(Converter, object):
                                                string += "\c0000??00"
                                        elif self.source.tuner_mask & 1 << n.slot:
                                                string += "\c00????00"
-                                       else:
+                                       elif len(nimmanager.nim_slots) <= self.space_for_tuners:
                                                string += "\c007?7?7?"
+                                       else:
+                                               continue
                                        string += chr(ord("A")+n.slot)
                        return string
                if percent is None:
index fbf9fdc..8087b25 100644 (file)
@@ -385,4 +385,3 @@ class PliExtraInfo(Poll, Converter, object):
                elif what[0] == self.CHANGED_POLL and self.updateFEdata is not None:
                        self.updateFEdata = False
                        Converter.changed(self, what)
-
index 686247a..092211c 100644 (file)
@@ -70,4 +70,4 @@ class RotorPosition(Converter, object):
                        Converter.changed(self, (self.CHANGED_ALL,))
 
        def show_hide(self, configElement=None):
-               Converter.changed(self, (self.CHANGED_ALL,))
\ No newline at end of file
+               Converter.changed(self, (self.CHANGED_ALL,))
index a2fc5e2..04e0320 100644 (file)
@@ -31,6 +31,7 @@ class ServiceInfo(Converter, object):
        IS_HD = 23
        IS_SD_AND_WIDESCREEN = 24
        IS_SD_AND_NOT_WIDESCREEN = 25
+       IS_4K = 26
 
        def __init__(self, type):
                Converter.__init__(self, type)
@@ -61,6 +62,7 @@ class ServiceInfo(Converter, object):
                                "IsHD": (self.IS_HD, (iPlayableService.evVideoSizeChanged,)),
                                "IsSDAndWidescreen": (self.IS_SD_AND_WIDESCREEN, (iPlayableService.evVideoSizeChanged,)),
                                "IsSDAndNotWidescreen": (self.IS_SD_AND_NOT_WIDESCREEN, (iPlayableService.evVideoSizeChanged,)),
+                               "Is4K": (self.IS_4K, (iPlayableService.evVideoSizeChanged,)),
                        }[type]
 
        def getServiceInfoString(self, info, what, convert = lambda x: "%d" % x):
@@ -119,11 +121,13 @@ class ServiceInfo(Converter, object):
                elif self.type == self.IS_SD:
                        return info.getInfo(iServiceInformation.sVideoHeight) < 720
                elif self.type == self.IS_HD:
-                       return info.getInfo(iServiceInformation.sVideoHeight) >= 720
+                       return info.getInfo(iServiceInformation.sVideoHeight) >= 720 and info.getInfo(iServiceInformation.sVideoHeight) < 2160
                elif self.type == self.IS_SD_AND_WIDESCREEN:
                        return info.getInfo(iServiceInformation.sVideoHeight) < 720 and info.getInfo(iServiceInformation.sAspect) in WIDESCREEN
                elif self.type == self.IS_SD_AND_NOT_WIDESCREEN:
                        return info.getInfo(iServiceInformation.sVideoHeight) < 720 and info.getInfo(iServiceInformation.sAspect) not in WIDESCREEN
+               elif self.type == self.IS_4K:
+                       return info.getInfo(iServiceInformation.sVideoHeight) >= 2160
                return False
 
        boolean = property(getBoolean)
index c0ae6e9..6c5d108 100644 (file)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from Components.Converter.Converter import Converter
-from enigma import iServiceInformation, iPlayableService, iPlayableServicePtr
+from enigma import iServiceInformation, iPlayableService, iPlayableServicePtr, eServiceReference
 from ServiceReference import resolveAlternate
 from Components.Element import cached
 
@@ -9,6 +9,7 @@ class ServiceName(Converter, object):
        PROVIDER = 1
        REFERENCE = 2
        EDITREFERENCE = 3
+       NUMBER = 4
 
        def __init__(self, type):
                Converter.__init__(self, type)
@@ -19,6 +20,8 @@ class ServiceName(Converter, object):
                        self.type = self.REFERENCE
                elif type == "EditReference":
                        self.type = self.EDITREFERENCE
+               elif type == "Number":
+                       self.type = self.NUMBER
                else:
                        self.type = self.NAME
 
@@ -47,9 +50,18 @@ class ServiceName(Converter, object):
                        if nref:
                                ref = nref
                        return ref.toString()
+               elif self.type == self.NUMBER:
+                       if not ref:
+                               ref = eServiceReference(info.getInfoString(iServiceInformation.sServiceref))
+                       num = ref and ref.getChannelNum() or None
+                       if num is None:
+                               num = '---'
+                       else:
+                               num = str(num)
+                       return num
 
        text = property(getText)
 
        def changed(self, what):
                if what[0] != self.CHANGED_SPECIFIC or what[1] in (iPlayableService.evStart,):
-                       Converter.changed(self, what)
\ No newline at end of file
+                       Converter.changed(self, what)
index d3a67b2..1b69bfa 100644 (file)
@@ -4,4 +4,3 @@ class StaticText(Converter, object):
        def __init__(self, text):
                Converter.__init__(self, type)
                self.text = str(text)
-
index 0824deb..62f7de0 100644 (file)
@@ -68,4 +68,3 @@ class TransponderInfo(Converter, object):
        def changed(self, what):
                if what[0] != self.CHANGED_SPECIFIC or what[1] in (iPlayableService.evStart,):
                        Converter.changed(self, what)
-
index 66e6c68..b3e1606 100644 (file)
@@ -37,4 +37,3 @@ class ValueToPixmap(Converter, object):
        def changed(self, what):
                if what[0] != self.CHANGED_SPECIFIC or what[1] == self.type:
                        Converter.changed(self, what)
-
index bef518e..233a099 100644 (file)
@@ -2,4 +2,3 @@
 class HTMLComponent:
        def produceHTML(self):
                return ""
-
index 913c90e..bf9c1ec 100644 (file)
@@ -10,4 +10,3 @@ class HTMLSkin:
                        res += self[name].produceHTML()
                res += "</html>\n";
                return res
-
index c191eb7..4937c79 100644 (file)
@@ -1,8 +1,7 @@
 from config import config, ConfigSlider, ConfigSubsection, ConfigYesNo, ConfigText, ConfigInteger
-from os import listdir, open as os_open, close as os_close, write as os_write, O_RDWR, O_NONBLOCK
-from Tools.Directories import pathExists
 from SystemInfo import SystemInfo
 from fcntl import ioctl
+import os
 import struct
 
 # asm-generic/ioctl.h
@@ -30,15 +29,15 @@ class inputDevices:
                self.getInputDevices()
 
        def getInputDevices(self):
-               devices = listdir("/dev/input/")
+               devices = os.listdir("/dev/input/")
 
                for evdev in devices:
                        try:
                                buffer = "\0"*512
-                               self.fd = os_open("/dev/input/" + evdev, O_RDWR | O_NONBLOCK)
+                               self.fd = os.open("/dev/input/" + evdev, os.O_RDWR | os.O_NONBLOCK)
                                self.name = ioctl(self.fd, EVIOCGNAME(256), buffer)
                                self.name = self.name[:self.name.find("\0")]
-                               os_close(self.fd)
+                               os.close(self.fd)
                        except (IOError,OSError), err:
                                print '[iInputDevices] getInputDevices ' + evdev + ' <ERROR: ioctl(EVIOCGNAME): ' + str(err) + ' >'
                                self.name = None
@@ -101,26 +100,26 @@ class inputDevices:
                self.setDeviceAttribute(device, 'configuredName', None)
                event_repeat = struct.pack('iihhi', 0, 0, 0x14, 0x01, 100)
                event_delay = struct.pack('iihhi', 0, 0, 0x14, 0x00, 700)
-               fd = os_open("/dev/input/" + device, O_RDWR)
-               os_write(fd, event_repeat)
-               os_write(fd, event_delay)
-               os_close(fd)
+               fd = os.open("/dev/input/" + device, os.O_RDWR)
+               os.write(fd, event_repeat)
+               os.write(fd, event_delay)
+               os.close(fd)
 
        def setRepeat(self, device, value): #REP_PERIOD
                if self.getDeviceAttribute(device, 'enabled') == True:
                        print "[iInputDevices] setRepeat for device %s to %d ms" % (device,value)
                        event = struct.pack('iihhi', 0, 0, 0x14, 0x01, int(value))
-                       fd = os_open("/dev/input/" + device, O_RDWR)
-                       os_write(fd, event)
-                       os_close(fd)
+                       fd = os.open("/dev/input/" + device, os.O_RDWR)
+                       os.write(fd, event)
+                       os.close(fd)
 
        def setDelay(self, device, value): #REP_DELAY
                if self.getDeviceAttribute(device, 'enabled') == True:
                        print "[iInputDevices] setDelay for device %s to %d ms" % (device,value)
                        event = struct.pack('iihhi', 0, 0, 0x14, 0x00, int(value))
-                       fd = os_open("/dev/input/" + device, O_RDWR)
-                       os_write(fd, event)
-                       os_close(fd)
+                       fd = os.open("/dev/input/" + device, os.O_RDWR)
+                       os.write(fd, event)
+                       os.close(fd)
 
 
 class InitInputDevices:
@@ -197,13 +196,9 @@ config.plugins.remotecontroltype.rctype = ConfigInteger(default = 0)
 
 class RcTypeControl():
        def __init__(self):
-               if SystemInfo["RcTypeChangable"] and pathExists('/proc/stb/info/boxtype'):
+               if SystemInfo["RcTypeChangable"] and os.path.exists('/proc/stb/info/boxtype'):
                        self.isSupported = True
-
-                       fd = open('/proc/stb/info/boxtype', 'r')
-                       self.boxType = fd.read()
-                       fd.close()
-
+                       self.boxType = open('/proc/stb/info/boxtype', 'r').read().strip()
                        if config.plugins.remotecontroltype.rctype.value != 0:
                                self.writeRcType(config.plugins.remotecontroltype.rctype.value)
                else:
@@ -216,8 +211,6 @@ class RcTypeControl():
                return self.boxType
 
        def writeRcType(self, rctype):
-               fd = open('/proc/stb/ir/rc/type', 'w')
-               fd.write('%d' % (rctype))
-               fd.close()
+               open('/proc/stb/ir/rc/type', 'w').write(rctype and '%d' % rctype or '0')
 
 iRcTypeControl = RcTypeControl()
index f954adb..80c2c35 100644 (file)
@@ -1,20 +1,19 @@
 from Components.Console import Console
-from os import listdir as os_listdir, path as os_path
-from re import compile as re_compile
+import os
+import re
 from enigma import eEnv
 
 class Keyboard:
        def __init__(self):
                self.keyboardmaps = []
-               self.readKeyboardMapFiles()
-
-       def readKeyboardMapFiles(self):
-               for keymapfile in os_listdir(eEnv.resolve('${datadir}/keymaps/')):
+               self.kpath = eEnv.resolve('${datadir}/keymaps')
+               eq = re.compile('^\s*(\w+)\s*=\s*(.*)\s*$')
+               for keymapfile in os.listdir(self.kpath):
                        if (keymapfile.endswith(".info")):
                                mapfile = None
                                mapname = None
-                               for line in open(eEnv.resolve('${datadir}/keymaps/') + keymapfile):
-                                       m = re_compile('^\s*(\w+)\s*=\s*(.*)\s*$').match(line)
+                               for line in open(os.path.join(self.kpath, keymapfile)):
+                                       m = eq.match(line)
                                        if m:
                                                key, val = m.groups()
                                                if key == 'kmap':
@@ -22,14 +21,14 @@ class Keyboard:
                                                if key == 'name':
                                                    mapname = val
                                                if (mapfile is not None) and (mapname is not None):
-                                                   self.keyboardmaps.append(( mapfile,mapname))
+                                                   self.keyboardmaps.append((mapfile, mapname))
 
        def activateKeyboardMap(self, index):
                try:
                        keymap = self.keyboardmaps[index]
                        print "Activating keymap:",keymap[1]
-                       keymappath = eEnv.resolve('${datadir}/keymaps/') + keymap[0]
-                       if os_path.exists(keymappath):
+                       keymappath = os.path.join(self.kpath, keymap[0])
+                       if os.path.exists(keymappath):
                                Console().ePopen(("loadkmap < " + str(keymappath)))
                except:
                        print "Selected keymap does not exist!"
index 1efce8f..12be286 100644 (file)
@@ -98,4 +98,3 @@ class MultiColorLabel(Label):
                                self.instance.setBackgroundColor(self.backColors[x])
                        else:
                                print "setBackgroundColorNum(%d) failed! defined colors:" %(x), self.backColors
-
index a6d1b32..089a3f0 100644 (file)
@@ -44,7 +44,7 @@ class LCD:
 def leaveStandby():
        config.lcd.bright.apply()
 
-def standbyCounterChanged(configElement):
+def standbyCounterChanged(dummy):
        from Screens.Standby import inStandby
        inStandby.onClose.append(leaveStandby)
        config.lcd.standby.apply()
@@ -94,11 +94,13 @@ def InitLcd():
 
                if SystemInfo["LcdLiveTV"]:
                        def lcdLiveTvChanged(configElement):
-                               open(SystemInfo["LcdLiveTV"], "w").write(configElement.value and "0" or "1")
-                               InfoBarInstance = InfoBar.instance
-                               InfoBarInstance and InfoBarInstance.session.open(dummyScreen)
+                               setLCDLiveTv(configElement.value)
+                               configElement.save()
                        config.lcd.showTv = ConfigYesNo(default = False)
                        config.lcd.showTv.addNotifier(lcdLiveTvChanged)
+
+                       if "live_enable" in SystemInfo["LcdLiveTV"]:
+                               config.misc.standbyCounter.addNotifier(standbyCounterChangedLCDLiveTV, initial_call = False)
        else:
                def doNothing():
                        pass
@@ -110,3 +112,22 @@ def InitLcd():
 
        config.misc.standbyCounter.addNotifier(standbyCounterChanged, initial_call = False)
 
+def setLCDLiveTv(value):
+       if "live_enable" in SystemInfo["LcdLiveTV"]:
+               open(SystemInfo["LcdLiveTV"], "w").write(value and "enable" or "disable")
+       else:
+               open(SystemInfo["LcdLiveTV"], "w").write(value and "0" or "1")
+       if not value:
+               InfoBarInstance = InfoBar.instance
+               InfoBarInstance and InfoBarInstance.session.open(dummyScreen)
+
+def leaveStandbyLCDLiveTV():
+       if config.lcd.showTv.value:
+               setLCDLiveTv(True)
+
+def standbyCounterChangedLCDLiveTV(dummy):
+       if config.lcd.showTv.value:
+               from Screens.Standby import inStandby
+               if leaveStandbyLCDLiveTV not in inStandby.onClose:
+                       inStandby.onClose.append(leaveStandbyLCDLiveTV)
+               setLCDLiveTv(False)
index f9eaf67..1ab3fcc 100644 (file)
@@ -774,7 +774,7 @@ class MovieList(GUIComponent):
                if ref.flags & eServiceReference.mustDescent:
                        return (0, x[1] and x[1].getName(ref).lower() or "")
                return (1, -x[2])
-               
+
        def buildGroupwiseSortkey(self, x):
                # Sort recordings by date, sort MP3 and stuff by name
                ref = x[0]
index 8fe9788..026f420 100644 (file)
@@ -30,4 +30,4 @@ if __name__ == '__main__':
        print "socket no:", nls.fileno()
        while 1:
                for item in nls.parse():
-                       print repr(item)
\ No newline at end of file
+                       print repr(item)
index 21c2a05..af2429e 100644 (file)
@@ -207,7 +207,7 @@ class SecConfigure:
                                                print "[SecConfigure] diseqcmode: ", nim.diseqcMode.value
                                                if nim.diseqcMode.value == "single":                    #single
                                                        currentCircular = False
-                                                       if nim.diseqcA.value in ("360", "560"): 
+                                                       if nim.diseqcA.value in ("360", "560"):
                                                                currentCircular = nim.simpleDiSEqCSetCircularLNB.value
                                                        if nim.simpleSingleSendDiSEqC.value:
                                                                self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, diseqc13V = nim.diseqc13V.value, CircularLNB = currentCircular)
@@ -989,7 +989,7 @@ class NimManager:
                                if dm == "positioner":
                                        for x in self.satList:
                                                list.append(x)
-                               if dm == "positioner_select": 
+                               if dm == "positioner_select":
                                        userSatlist = nim.userSatellitesList.value
                                        userSatlist = userSatlist.replace("]", "").replace("[", "")
                                        for x in self.satList:
index 6bf2d44..40ef2de 100644 (file)
@@ -274,4 +274,4 @@ class ParentalControl:
                                for ref in self.blacklist:
                                        if TYPE_BOUQUET not in ref:
                                                eDVBDB.getInstance().removeFlag(eServiceReference(ref), 2)
-                       refreshServiceList()
\ No newline at end of file
+                       refreshServiceList()
index 9e42c03..5dd0080 100644 (file)
@@ -125,4 +125,4 @@ class PlaylistIOPLS(PlaylistIO):
                return self.list
 
        def save(self, filename = None):
-               return self.ERROR
\ No newline at end of file
+               return self.ERROR
index a8fadf7..ea3550c 100644 (file)
@@ -17,4 +17,3 @@ class ChannelNumber(Renderer, VariableText):
                                self.text = str(num)
                        else:
                                self.text = '---'
-
index e660de1..3813ce2 100644 (file)
@@ -19,4 +19,3 @@ class Label(VariableText, Renderer):
                        self.text = ""
                else:
                        self.text = self.source.text
-
index 06a8bea..9b43fe4 100644 (file)
@@ -19,4 +19,4 @@ class NextEpgInfo(Renderer, VariableText):
                nextEvent = self.epgcache.lookupEvent(['IBDCTSERNX', (reference.toString(), 1, -1)])
                if nextEvent:
                        if nextEvent[0][4]:
-                               self.text = pgettext("now/next: 'next' event label", "Next") + ": " + nextEvent[0][4]
\ No newline at end of file
+                               self.text = pgettext("now/next: 'next' event label", "Next") + ": " + nextEvent[0][4]
index 3af7afd..d0c0294 100644 (file)
@@ -43,4 +43,4 @@ class Pig(Renderer):
        def onHide(self):
                if self.instance:
                        self.preWidgetRemove(self.instance)
-                       self.hidePip and PipPigMode(False)
\ No newline at end of file
+                       self.hidePip and PipPigMode(False)
index 7c6b579..32b615d 100644 (file)
@@ -16,4 +16,3 @@ class Pixmap(Renderer):
                        if self.source and hasattr(self.source, "pixmap"):
                                if self.instance:
                                        self.instance.setPixmap(self.source.pixmap)
-
index a133bce..a2eae65 100644 (file)
@@ -24,4 +24,3 @@ class VideoSize(Renderer, VariableText):
                        self.text = str(xresol)+'x'+str(yresol)
                else:
                        self.text = ''
-
index 8307fcd..69a2e30 100644 (file)
@@ -20,4 +20,4 @@ class ResourceManager:
                if self.hasResource(name):
                        del self.resourceList[name]
 
-resourcemanager = ResourceManager()
\ No newline at end of file
+resourcemanager = ResourceManager()
index 2c3b702..0e4da55 100644 (file)
@@ -163,7 +163,7 @@ class ServiceList(HTMLComponent, GUIComponent):
                                                config.servicelist.lastmode.save()
                                                self.serviceList.saveChannel(ref)
                                                return True
-                               self.serviceList.enterUserbouquet(revert_tv_root)       
+                               self.serviceList.enterUserbouquet(revert_tv_root)
                                self.serviceList.setModeRadio()
                                revert_radio_root = self.getRoot()
                                bouquets = self.serviceList.getBouquetList()
@@ -173,7 +173,7 @@ class ServiceList(HTMLComponent, GUIComponent):
                                                config.servicelist.lastmode.save()
                                                self.serviceList.saveChannel(ref)
                                                return True
-                               self.serviceList.enterUserbouquet(revert_radio_root)            
+                               self.serviceList.enterUserbouquet(revert_radio_root)
                                print "[servicelist] service not found in any userbouquets"
                                if revert_mode == "tv":
                                        self.serviceList.setModeTv()
index d06690b..2556182 100644 (file)
@@ -42,4 +42,3 @@ class CurrentService(PerServiceBase, Source):
        def destroy(self):
                PerServiceBase.destroy(self)
                Source.destroy(self)
-
index 5f905f3..966c883 100644 (file)
@@ -39,4 +39,3 @@ class EventInfo(PerServiceBase, Source, object):
        def destroy(self):
                PerServiceBase.destroy(self)
                Source.destroy(self)
-
index 8f1b36d..0e22350 100644 (file)
@@ -51,4 +51,3 @@ class FrontendStatus(Source):
        def destroy(self):
                self.poll_timer.callback.remove(self.updateFrontendStatus)
                Source.destroy(self)
-
index 2fa4c29..6002455 100644 (file)
@@ -21,4 +21,3 @@ class ObsoleteSource(Source):
                self.new_source = new_source
                self.description = description
                self.removal_date = removal_date
-
index b3fae02..7df3718 100644 (file)
@@ -43,7 +43,7 @@ SystemInfo["VFD_scroll_repeats"] = not HardwareInfo().get_device_model().startsw
 SystemInfo["VFD_scroll_delay"] = not HardwareInfo().get_device_model().startswith("et8500") and fileCheck("/proc/stb/lcd/scroll_delay")
 SystemInfo["VFD_initial_scroll_delay"] = not HardwareInfo().get_device_model().startswith("et8500") and fileCheck("/proc/stb/lcd/initial_scroll_delay")
 SystemInfo["VFD_final_scroll_delay"] = not HardwareInfo().get_device_model().startswith("et8500") and fileCheck("/proc/stb/lcd/final_scroll_delay")
-SystemInfo["LcdLiveTV"] = fileCheck("/proc/stb/fb/sd_detach")
+SystemInfo["LcdLiveTV"] = fileCheck("/proc/stb/fb/sd_detach") or fileCheck("/proc/stb/lcd/live_enable")
 SystemInfo["3DMode"] = fileCheck("/proc/stb/fb/3dmode") or fileCheck("/proc/stb/fb/primary/3d")
 SystemInfo["3DZNorm"] = fileCheck("/proc/stb/fb/znorm") or fileCheck("/proc/stb/fb/primary/zoffset")
 SystemInfo["Blindscan_t2_available"] = fileCheck("/proc/stb/info/vumodel")
index 8595652..b536f3d 100644 (file)
@@ -288,4 +288,4 @@ class TuneTest:
        # can be overwritten
        # progress = (range, value, status, transponder)
        def progressCallback(self, progress):
-               pass
\ No newline at end of file
+               pass
index a013c08..3571ffd 100644 (file)
@@ -56,7 +56,7 @@ def InitUsageConfig():
        config.usage.show_infobar_on_zap = ConfigYesNo(default = True)
        config.usage.show_infobar_on_skip = ConfigYesNo(default = True)
        config.usage.show_infobar_on_event_change = ConfigYesNo(default = False)
-       config.usage.show_second_infobar = ConfigSelection(default = "5", choices = [(None, _("None"))] + choicelist + [("EPG",_("EPG"))])      
+       config.usage.show_second_infobar = ConfigSelection(default = "5", choices = [(None, _("None"))] + choicelist + [("EPG",_("EPG"))])
        config.usage.infobar_frontend_source = ConfigSelection(default = "tuner", choices = [("settings", _("Settings")), ("tuner", _("Tuner"))])
        config.usage.oldstyle_zap_controls = ConfigYesNo(default = False)
        config.usage.oldstyle_channel_select_controls = ConfigYesNo(default = False)
index 2906aa3..be1a97d 100644 (file)
@@ -12,4 +12,4 @@ class VideoWindow(GUIComponent):
 
        def postWidgetCreate(self, instance):
                instance.setDecoder(self.decoder)
-               instance.setFBSize(eSize(self.fb_width, self.fb_height));
\ No newline at end of file
+               instance.setFBSize(eSize(self.fb_width, self.fb_height));
index e3df416..70ef7d3 100644 (file)
@@ -2,8 +2,8 @@ from enigma import getPrevAsciiCode
 from Tools.NumericalTextInput import NumericalTextInput
 from Tools.Directories import resolveFilename, SCOPE_CONFIG, fileExists
 from Components.Harddisk import harddiskmanager
-from copy import copy as copy_copy
-from os import path as os_path
+import copy
+import os
 from time import localtime, strftime
 
 # ConfigElement, the base class of all ConfigElements.
@@ -505,7 +505,7 @@ class ConfigSequence(ConfigElement):
                self.censor_char = censor_char
 
                self.last_value = self.default = default
-               self.value = copy_copy(default)
+               self.value = copy.copy(default)
                self.endNotifier = None
 
        def validate(self):
@@ -647,7 +647,7 @@ class ConfigSequence(ConfigElement):
        def onDeselect(self, session):
                if self.last_value != self._value:
                        self.changedFinal()
-                       self.last_value = copy_copy(self._value)
+                       self.last_value = copy.copy(self._value)
 
 ip_limits = [(0,255),(0,255),(0,255),(0,255)]
 class ConfigIP(ConfigSequence):
@@ -1108,6 +1108,7 @@ class ConfigNumber(ConfigText):
                                self.allmarked = False
                        self.insertChar(newChar, self.marked_pos, False)
                        self.marked_pos += 1
+                       self.changed()
                else:
                        ConfigText.handleKey(self, key)
                self.conform()
@@ -1385,7 +1386,7 @@ class ConfigLocations(ConfigElement):
                                self.addedMount(x)
 
        def getMountpoint(self, file):
-               file = os_path.realpath(file)+"/"
+               file = os.path.realpath(file)+"/"
                for m in self.mountpoints:
                        if file.startswith(m):
                                return m
index 7d46005..fbee95e 100644 (file)
@@ -167,4 +167,4 @@ class DVDTitle:
                        timestring = timestring.replace("$s", ("%02d" % (p % (90000 * 60) / 90000)))
                        timestring = timestring.replace("$t", ("%03d" % ((p % 90000) / 90)))
                        timestamps.append(timestring)
-               return timestamps
\ No newline at end of file
+               return timestamps
index 110e471..f9ca10c 100644 (file)
@@ -248,4 +248,4 @@ class ProjectSettings(Screen,ConfigListScreen):
                        if self.project.loadProject(self.path):
                                self.initConfigList()
                        else:
-                               self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
\ No newline at end of file
+                               self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
index 3f2abb0..619c4b5 100644 (file)
@@ -1226,7 +1226,7 @@ class GraphMultiEPG(Screen, HelpableScreen):
                        prev_state = timer.state
                        isRunning = prev_state in (1, 2)
                        title_text = isRepeat and _("Attention, this is repeated timer!\n") or ""
-                       firstNextRepeatEvent = isRepeat and (begin < timer.begin <= end or timer.begin <= begin <= timer.end) and not timer.justplay 
+                       firstNextRepeatEvent = isRepeat and (begin < timer.begin <= end or timer.begin <= begin <= timer.end) and not timer.justplay
                        menu = [(_("Delete timer"), "delete"),(_("Edit timer"), "edit")]
                        buttons = ["red", "green"]
                        if not isRunning:
index 521ab9a..2898c6c 100644 (file)
@@ -9,7 +9,6 @@ from Components.PluginComponent import plugins
 from Components.config import config, ConfigSubsection, ConfigInteger, ConfigSelection, ConfigText, ConfigEnableDisable, KEY_LEFT, KEY_RIGHT, KEY_0, getConfigListEntry, ConfigNumber
 from Components.ConfigList import ConfigList, ConfigListScreen
 
-from Tools.Directories import *
 addnotifier = None
 
 class GraphMultiEpgSetup(Screen, ConfigListScreen):
index f8c04b7..b7473f3 100644 (file)
@@ -612,4 +612,3 @@ class Pic_Full_View(Screen):
                        getDesktop(0).resize(eSize(self.size_w, self.size_h))
 
                self.close(self.lastindex + self.dirlistcount)
-
index 65142e3..733301a 100644 (file)
@@ -30,4 +30,3 @@ class SocketMMIMessageHandler:
        def dlgClosed(self, slot):
                if slot in self.dlgs:
                        del self.dlgs[slot]
-
index 568cde2..7aef7a8 100644 (file)
@@ -25,4 +25,3 @@ def Plugins(**kwargs):
        return [ PluginDescriptor(name = "SocketMMI", description = _("Python frontend for /tmp/mmi.socket"), where = PluginDescriptor.WHERE_MENU, needsRestart = True, fnc = menu),
                PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = True, fnc = sessionstart),
                PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = True, fnc = autostart) ]
-
index 92a0fc0..8c1e6e3 100644 (file)
@@ -13,6 +13,9 @@ from Plugins.Plugin import PluginDescriptor
 from xml.etree.cElementTree import parse as ci_parse
 from Tools.XMLTools import elementsWithTag, mergeText, stringToXML
 from enigma import eDVBCI_UI, eDVBCIInterfaces, eEnv
+from Screens.ChoiceBox import ChoiceBox
+from Tools.BoundFunction import boundFunction
+from Tools.XMLTools import stringToXML
 
 import os
 
@@ -180,7 +183,7 @@ class CIconfigMenu(Screen):
 
        def cancel(self):
                self.saveXML()
-               activate_all(self)
+               activate_all(self, editcallback=True)
                self.close()
 
        def setServiceListInfo(self):
@@ -204,18 +207,30 @@ class CIconfigMenu(Screen):
                        if find_in_list(self.servicelist, service_name, 0) == False:
                                split_ref = service_ref.ref.toString().split(":")
                                if split_ref[0] == "1":#== dvb service und nicht muell von None
-                                       self.servicelist.append((service_name , ConfigNothing(), 0, service_ref.ref.toString()))
+                                       self.servicelist.append((service_name, ConfigNothing(), 0, service_ref.ref.toString()))
                                        self["ServiceList"].l.setList(self.servicelist)
                                        self.setServiceListInfo()
 
        def finishedProviderSelection(self, *args):
-               if len(args) > 1: # bei nix selected kommt nur 1 arg zurueck (==None)
-                       name = args[0]
-                       dvbnamespace = args[1]
-                       if find_in_list(self.servicelist, name, 0) == False:
-                               self.servicelist.append((name , ConfigNothing(), 1, dvbnamespace))
+               item = len(args)
+               if item > 1: # bei nix selected kommt nur 1 arg zurueck (==None)
+                       if item > 2 and args[2] is True:
+                               for ref in args[0]:
+                                       service_ref = ServiceReference(ref)
+                                       service_name = service_ref.getServiceName()
+                                       if len(service_name) and find_in_list(self.servicelist, service_name, 0) == False:
+                                               split_ref = service_ref.ref.toString().split(":")
+                                               if split_ref[0] == "1":
+                                                       self.servicelist.append((service_name, ConfigNothing(), 0, service_ref.ref.toString()))
                                self["ServiceList"].l.setList(self.servicelist)
                                self.setServiceListInfo()
+                       else:
+                               name = args[0]
+                               dvbnamespace = args[1]
+                               if find_in_list(self.servicelist, name, 0) == False:
+                                       self.servicelist.append((name, ConfigNothing(), 1, dvbnamespace))
+                                       self["ServiceList"].l.setList(self.servicelist)
+                                       self.setServiceListInfo()
 
        def finishedCAidSelection(self, *args):
                if len(args):
@@ -248,9 +263,9 @@ class CIconfigMenu(Screen):
                        for item in self.servicelist:
                                if len(self.servicelist):
                                        if item[2]==1:
-                                               fp.write("\t\t<provider name=\"%s\" dvbnamespace=\"%s\" />\n" % (item[0], item[3]))
+                                               fp.write("\t\t<provider name=\"%s\" dvbnamespace=\"%s\" />\n" % (stringToXML(item[0]), item[3]))
                                        else:
-                                               fp.write("\t\t<service name=\"%s\" ref=\"%s\" />\n"  % (item[0], item[3]))
+                                               fp.write("\t\t<service name=\"%s\" ref=\"%s\" />\n"  % (stringToXML(item[0]), item[3]))
                        fp.write("\t</slot>\n")
                        fp.write("</ci>\n")
                        fp.close()
@@ -409,10 +424,10 @@ class myProviderSelection(ChannelSelectionBase):
 
                self["actions"] = ActionMap(["OkCancelActions", "ChannelSelectBaseActions"],
                        {
-                               "showFavourites": self.doNothing,
-                               "showAllServices": self.cancel,
-                               "showProviders": self.doNothing,
-                               "showSatellites": self.doNothing,
+                               "showFavourites": self.showFavourites,
+                               "showAllServices": self.showAllServices,
+                               "showProviders": self.showProviders,
+                               "showSatellites": boundFunction(self.showSatellites, changeMode=True),
                                "cancel": self.cancel,
                                "ok": self.channelSelected
                        })
@@ -422,7 +437,14 @@ class myProviderSelection(ChannelSelectionBase):
                self["key_blue"] = StaticText()
                self["introduction"] = StaticText(_("Press OK to select a Provider."))
 
-       def doNothing(self):
+
+       def showProviders(self):
+               pass
+
+       def showAllServices(self):
+               self.close(None)
+
+       def showFavourites(self):
                pass
 
        def __onExecCallback(self):
@@ -431,14 +453,37 @@ class myProviderSelection(ChannelSelectionBase):
 
        def channelSelected(self): # just return selected service
                ref = self.getCurrentSelection()
-               splited_ref=ref.toString().split(":")
-               if ref.flags == 7 and splited_ref[6] != "0":
-                       self.dvbnamespace=splited_ref[6]
-                       self.enterPath(ref)
-               else:
-                       self.close(ref.getName(), self.dvbnamespace)
-
-       def showSatellites(self):
+               if ref is None: return
+               if not (ref.flags & 64):
+                       splited_ref = ref.toString().split(":")
+                       if ref.flags == 7 and splited_ref[6] != "0":
+                               self.dvbnamespace = splited_ref[6]
+                               self.enterPath(ref)
+                       elif (ref.flags & 7) == 7 and 'provider' in ref.toString():
+                               menu = [(_("Provider"), "provider"),(_("All services provider"), "providerlist")]
+                               def addAction(choice):
+                                       if choice is not None:
+                                               if choice[1] == "provider":
+                                                       self.close(ref.getName(), self.dvbnamespace)
+                                               elif choice[1] == "providerlist":
+                                                       serviceHandler = eServiceCenter.getInstance()
+                                                       servicelist = serviceHandler.list(ref)
+                                                       if not servicelist is None:
+                                                               providerlist = []
+                                                               while True:
+                                                                       service = servicelist.getNext()
+                                                                       if not service.valid():
+                                                                               break
+                                                                       providerlist.append((service))
+                                                               if providerlist:
+                                                                       self.close(providerlist, self.dvbnamespace, True)
+                                                               else:
+                                                                       self.close(None)
+                               self.session.openWithCallback(addAction, ChoiceBox, title = _("Select action"), list=menu)
+
+       def showSatellites(self, changeMode=False):
+               if changeMode:
+                       return
                if not self.pathChangeDisabled:
                        refstr = '%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types)
                        if not self.preEnterPath(refstr):
@@ -515,17 +560,17 @@ class myChannelSelection(ChannelSelectionBase):
 
                self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions", "ChannelSelectBaseActions"],
                        {
-                               "showProviders": self.doNothing,
-                               "showSatellites": self.showAllServices,
-                               "showAllServices": self.cancel,
+                               "showProviders": self.showProviders,
+                               "showSatellites": boundFunction(self.showSatellites, changeMode=True),
+                               "showAllServices": self.showAllServices,
                                "cancel": self.cancel,
                                "ok": self.channelSelected,
                                "keyRadio": self.setModeRadio,
                                "keyTV": self.setModeTv
                        })
 
-               self["key_red"] = StaticText(_("Close"))
-               self["key_green"] = StaticText(_("All"))
+               self["key_red"] = StaticText(_("All"))
+               self["key_green"] = StaticText(_("Close"))
                self["key_yellow"] = StaticText()
                self["key_blue"] = StaticText(_("Favourites"))
                self["introduction"] = StaticText(_("Press OK to select a Provider."))
@@ -534,9 +579,13 @@ class myChannelSelection(ChannelSelectionBase):
                self.setModeTv()
                self.setTitle(_("Select service to add..."))
 
-       def doNothing(self):
+       def showProviders(self):
                pass
 
+       def showSatellites(self, changeMode=False):
+               if changeMode:
+                       self.close(None)
+
        def channelSelected(self): # just return selected service
                ref = self.getCurrentSelection()
                if (ref.flags & 7) == 7:
@@ -556,14 +605,11 @@ class myChannelSelection(ChannelSelectionBase):
        def cancel(self):
                self.close(None)
 
-def activate_all(session):
+def activate_all(session, editcallback=False):
        NUM_CI = eDVBCIInterfaces.getInstance().getNumOfSlots()
        print "[CI_Activate] FOUND %d CI Slots " % NUM_CI
        if NUM_CI and NUM_CI > 0:
-               ci_config=[]
                def getValue(definitions, default):
-                       # Initialize Output
-                       ret = ""
                        # How many definitions are present
                        Len = len(definitions)
                        return Len > 0 and definitions[Len-1].text or default   
@@ -596,22 +642,19 @@ def activate_all(session):
                                                read_provider_dvbname = provider.get("dvbnamespace").encode("UTF-8")
                                                read_providers.append((read_provider_name,long(read_provider_dvbname,16)))
 
-                                       ci_config.append((int(read_slot), (read_services, read_providers, usingcaid)))
+                                       if editcallback or (read_slot is not False and (read_services or read_providers or usingcaid)):
+                                               print "[CI_Activate] activate CI%d with following settings:" % int(read_slot)
+                                               print read_services, read_providers, usingcaid
+                                               try:
+                                                       eDVBCIInterfaces.getInstance().setDescrambleRules(int(read_slot), (read_services, read_providers, usingcaid))
+                                               except:
+                                                       print "[CI_Activate_Config_CI%d] error setting DescrambleRules..." % int(read_slot)
                        except:
                                print "[CI_Activate_Config_CI%d] error parsing xml..." % ci
                                try:
                                        os.remove(filename)
                                except:
                                        print "[CI_Activate_Config_CI%d] error remove damaged xml..." % ci
-               for item in ci_config:
-                       if len(item) > 1 and len(item[1]) > 0:
-                               print "[CI_Activate] activate CI%d with following settings:" % item[0]
-                               print item[0]
-                               print item[1]
-                               try:
-                                       eDVBCIInterfaces.getInstance().setDescrambleRules(item[0],item[1])
-                               except:
-                                       print "[CI_Activate_Config_CI%d] error setting DescrambleRules..." %item[0]
 
 def find_in_list(list, search, listpos=0):
        for item in list:
index 39a2e74..946712d 100644 (file)
@@ -413,7 +413,7 @@ class DiseqcTester(Screen, TuneTest, ResultParser):
                        self.results[index]["status"] = status
 
                if self.results[index]["status"] != _("working"):
-                       self.results[index]["internalstatus"] = self.results[index]["status"] 
+                       self.results[index]["internalstatus"] = self.results[index]["status"]
                self.results[index]["failed"] = failedTune + self.results[index]["failed"]
                self.results[index]["successful"] = successfullyTune + self.results[index]["successful"]
 
index 389a95e..a27d7ae 100644 (file)
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from os import path as os_path, walk as os_walk, unlink as os_unlink
-
 from Plugins.Plugin import PluginDescriptor
 
 from Screens.Screen import Screen
@@ -16,6 +14,8 @@ from Components.ActionMap import ActionMap
 
 from enigma import eFastScan, eDVBFrontendParametersSatellite, eTimer
 
+import os
+
 config.misc.fastscan = ConfigSubsection()
 config.misc.fastscan.last_configuration = ConfigText(default = "()")
 config.misc.fastscan.auto = ConfigYesNo(default = True)
@@ -73,17 +73,17 @@ class FastScanStatus(Screen):
                self.scan.scanProgress.get().append(self.scanProgress)
                fstfile = None
                fntfile = None
-               for root, dirs, files in os_walk('/tmp/'):
+               for root, dirs, files in os.walk('/tmp/'):
                        for f in files:
                                if f.endswith('.bin'):
                                        if '_FST' in f:
-                                               fstfile = os_path.join(root, f)
+                                               fstfile = os.path.join(root, f)
                                        elif '_FNT' in f:
-                                               fntfile = os_path.join(root, f)
+                                               fntfile = os.path.join(root, f)
                if fstfile and fntfile:
                        self.scan.startFile(fntfile, fstfile)
-                       os_unlink(fstfile)
-                       os_unlink(fntfile)
+                       os.unlink(fstfile)
+                       os.unlink(fntfile)
                else:
                        self.scan.start(self.scanTuner)
 
diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am
deleted file mode 100644 (file)
index 78b2843..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-installdir = $(pkglibdir)/python/Plugins/SystemPlugins/FrontprocessorUpgrade
-
-SUBDIRS = meta
-
-install_PYTHON =       \
-       __init__.py \
-       plugin.py
-
diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/__init__.py b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
deleted file mode 100644 (file)
index 5ab313a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-installdir = $(datadir)/meta
-
-dist_install_DATA = plugin_frontprocessorupgrade.xml
diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/plugin_frontprocessorupgrade.xml b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/plugin_frontprocessorupgrade.xml
deleted file mode 100644 (file)
index 7b6fdca..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<default>
-         <prerequisites>
-                    <hardware type="dm8000" />
-                    <tag type="System" />
-         </prerequisites>
-          <info>
-                    <author>Dream Multimedia</author>
-                    <name>FrontprocessorUpgrade</name>
-                    <packagename>enigma2-plugin-systemplugins-frontprocessorupgrade</packagename>
-                   <packagetype>internal</packagetype> <!-- internal/public , public is default, internal metas are not displayed inside plugin manager -->
-                    <shortdescription>Internal firmware updater</shortdescription>
-                    <description>This system tool is internally used to program the hardware with firmware updates.
-                    </description>
-         </info>
-
-         <files type="package"> <!-- without version, without .ipk -->
-               <file type="package" name="enigma2-plugin-systemplugins-frontprocessorupgrade" />
-       </files>
-
-</default>
diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
deleted file mode 100644 (file)
index 75b3fa3..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-from Screens.Screen import Screen
-from Components.ActionMap import ActionMap
-from Components.Label import Label
-from Plugins.Plugin import PluginDescriptor
-
-def getUpgradeVersion():
-       import os
-       try:
-               r = os.popen("fpupgrade --version").read()
-       except IOError:
-               return None
-       if r[:16] != "FP update tool v":
-               return None
-       else:
-               return int(r[16:17])
-
-class FPUpgrade(Screen):
-       skin = """
-               <screen position="150,200" size="450,200" title="FP upgrade required" >
-                       <widget name="text" position="0,0" size="550,50" font="Regular;20" />
-                       <widget name="oldversion_label" position="10,100" size="290,25" font="Regular;20" />
-                       <widget name="newversion_label" position="10,125" size="290,25" font="Regular;20" />
-                       <widget name="oldversion" position="300,100" size="50,25" font="Regular;20" />
-                       <widget name="newversion" position="300,125" size="50,25" font="Regular;20" />
-               </screen>"""
-       def __init__(self, session):
-               self.skin = FPUpgrade.skin
-               Screen.__init__(self, session)
-
-               self.setTitle(_("FP upgrade required"))
-
-               from Tools.StbHardware import getFPVersion
-               version = str(getFPVersion() or "N/A")
-               newversion = str(getUpgradeVersion() or "N/A")
-
-               self["text"] = Label(_("Your frontprocessor firmware must be upgraded.\nPress OK to start upgrade."))
-               self["oldversion_label"] = Label(_("Current version:"))
-               self["newversion_label"] = Label(_("New version:"))
-
-               self["oldversion"] = Label(version)
-               self["newversion"] = Label(newversion)
-
-               self["actions"] = ActionMap(["OkCancelActions"],
-               {
-                       "ok": self.ok,
-                       "cancel": self.close,
-               })
-
-       def ok(self):
-               self.close(4)
-
-class SystemMessage(Screen):
-       skin = """
-               <screen position="150,200" size="450,200" title="System Message" >
-                       <widget source="text" position="0,0" size="450,200" font="Regular;20" halign="center" valign="center" render="Label" />
-                       <ePixmap pixmap="skin_default/icons/input_error.png" position="5,5" size="53,53" alphatest="on" />
-               </screen>"""
-       def __init__(self, session, message):
-               from Components.Sources.StaticText import StaticText
-
-               Screen.__init__(self, session)
-
-               self.setTitle(_("System Message"))
-
-               self["text"] = StaticText(message)
-
-               self["actions"] = ActionMap(["OkCancelActions"],
-               {
-                       "cancel": self.ok,
-               })
-
-       def ok(self):
-               self.close()
-
-def Plugins(**kwargs):
-       from Tools.StbHardware import getFPVersion
-       from Screens.MessageBox import MessageBox
-
-       version = getFPVersion()
-       newversion = getUpgradeVersion() or 0
-       list = []
-       if version is not None and version < newversion:
-               list.append(PluginDescriptor(name=_("FP Upgrade"), where = PluginDescriptor.WHERE_WIZARD, needsRestart = True, fnc=(8, FPUpgrade)))
-
-       try:
-               msg = open("/proc/stb/message").read()
-               list.append(PluginDescriptor(name=_("System Message Check"), where = PluginDescriptor.WHERE_WIZARD, needsRestart = True, fnc=(9, SystemMessage, msg)))
-       except:
-               pass
-
-       return list
index 888a480..8c39c41 100644 (file)
@@ -10,9 +10,5 @@ if HAVE_TEMPFANCONTROL
 SUBDIRS += TempFanControl
 endif
 
-if DREAMBOX
-SUBDIRS += FrontprocessorUpgrade NFIFlash
-endif
-
 install_PYTHON =       \
        __init__.py
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am b/lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am
deleted file mode 100644 (file)
index aa2c56a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-installdir = $(pkglibdir)/python/Plugins/SystemPlugins/NFIFlash
-
-SUBDIRS = meta
-