Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...
authorkos <kos@dev3>
Mon, 30 Jan 2012 01:56:08 +0000 (10:56 +0900)
committerkos <kos@dev3>
Mon, 30 Jan 2012 01:56:08 +0000 (10:56 +0900)
20 files changed:
configure.ac
lib/python/Plugins/Extensions/VuplusEvent/plugin.py
lib/python/Plugins/Extensions/WebBrowser/Makefile.am
lib/python/Plugins/Extensions/WebBrowser/desc/Makefile.am [new file with mode: 0644]
lib/python/Plugins/Extensions/WebBrowser/desc/rc_wb_desc.png [new file with mode: 0644]
lib/python/Plugins/Extensions/WebBrowser/mp_wb_background.png [new file with mode: 0644]
lib/python/Plugins/Extensions/WebBrowser/mp_wb_buttons.png [new file with mode: 0644]
lib/python/Plugins/Extensions/WebBrowser/plugin.py
lib/python/Plugins/SystemPlugins/Blindscan/plugin.py
lib/python/Plugins/SystemPlugins/CrashReport/plugin.py
lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
lib/python/Plugins/SystemPlugins/Fancontrol/plugin.py
lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py
lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/plugin.py
lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py
lib/python/Plugins/SystemPlugins/RemoteControlCode/plugin.py
lib/python/Plugins/SystemPlugins/UI3DSetup/plugin.py
lib/python/Plugins/SystemPlugins/UIPositionSetup/plugin.py
lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py

index c08344c..28fd415 100644 (file)
@@ -183,6 +183,7 @@ lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile
 lib/python/Plugins/Extensions/WebBrowser/Makefile
 lib/python/Plugins/Extensions/WebBrowser/meta/Makefile
 lib/python/Plugins/Extensions/WebBrowser/keymap/Makefile
+lib/python/Plugins/Extensions/WebBrowser/desc/Makefile
 lib/python/Plugins/Extensions/VuplusEvent/Makefile
 lib/python/Plugins/Extensions/VuplusEvent/meta/Makefile
 lib/python/Plugins/SystemPlugins/CleanupWizard/Makefile
index 7c2e340..a0fd876 100755 (executable)
@@ -30,29 +30,20 @@ GENUINE_MESSAGES={
 }
 
 class VuplusAuthenticity(Screen, ConfigListScreen):
-       def __init__(self,session):
-               if session.desktop.size().width() > 720:
-                       self.skin = """
-                       <screen name="VuplusAuthenticity" position="center,center" size="800,370" title="Return the Love Event (only for genuine box)">
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="250,15" size="25,25" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="435,15" size="25,25" alphatest="on" />
-                       <widget source="key_red" render="Label" position="265,15" zPosition="1" size="140,25" font="Regular;24" halign="center" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="450,15" zPosition="1" size="140,25" font="Regular;24" halign="center" valign="center" transparent="1" />
-                       <widget name="config" zPosition="2" position="80,70" size="640,80" scrollbarMode="showOnDemand" transparent="1" />
-                       <widget name="text1" position="0,165" size="800,90" font="Regular;32" halign="center" valign="center"/>
-                       <widget name="text2" position="100,260" size="600,110" font="Regular;24" halign="center" valign="center"/>
-                       </screen>"""
+       skin =  """
+               <screen name="VuplusAuthenticity" position="center,center" size="600,320" title="Return the Love Event (only for genuine box)">
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="140,15" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="320,15" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="140,15" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="320,15" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
 
-               else:
-                       self.skin="""<screen name="VuplusAuthenticity" position="center,center" size="600,320" title="Return the Love Event (only for genuine box)">
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="170,15" size="25,25" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="355,15" size="25,25" alphatest="on" />
-                       <widget source="key_red" render="Label" position="185,15" zPosition="1" size="140,25" font="Regular;24" halign="center" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="370,15" zPosition="1" size="140,25" font="Regular;24" halign="center" valign="center" transparent="1" />
                        <widget name="config" zPosition="2" position="10,70" size="580,80" scrollbarMode="showOnDemand" transparent="1" />
                        <widget name="text1" position="10,160" size="580,50" font="Regular;32" halign="center" valign="center"/>
                        <widget name="text2" position="10,220" size="580,100" font="Regular;18" halign="center" valign="center"/>
-                       </screen>"""
+               </screen>
+               """
+       def __init__(self,session):
                Screen.__init__(self,session)
                self.session = session
                self["shortcuts"] = ActionMap(["ShortcutActions", "SetupActions" ],
@@ -161,12 +152,12 @@ class VuplusAuthenticity(Screen, ConfigListScreen):
 
 class MessageBoxGenuine(MessageBox):
        skin = """
-               <screen position="center,center" size="600,10" title="Message">
+               <screen name="MessageBoxGenuine" position="center,center" size="600,10" title="Message">
                <widget name="text" position="65,8" size="420,0" font="Regular;22" />
                <widget name="ErrorPixmap" pixmap="Vu_HD/icons/input_error.png" position="5,5" size="53,53" alphatest="blend" />
                <widget name="QuestionPixmap" pixmap="Vu_HD/icons/input_question.png" position="5,5" size="53,53" alphatest="blend" />
                <widget name="InfoPixmap" pixmap="Vu_HD/icons/input_info.png" position="5,5" size="53,53" alphatest="blend" />
-               <widget name="list" position="100,100" size="380,375" transparent="1" backgroundColor="darkgrey" />
+               <widget name="list" position="100,100" size="380,375" transparent="1" />
                <applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
 from enigma import eSize, ePoint
index 11f2495..1b9820f 100755 (executable)
@@ -1,8 +1,10 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions/WebBrowser
 
-SUBDIRS = meta keymap
+SUBDIRS = meta keymap desc
 
 install_PYTHON =        \
+       mp_wb_background.png \
+       mp_wb_buttons.png \
        __init__.py \
        plugin.py 
 
diff --git a/lib/python/Plugins/Extensions/WebBrowser/desc/Makefile.am b/lib/python/Plugins/Extensions/WebBrowser/desc/Makefile.am
new file mode 100644 (file)
index 0000000..b3f8353
--- /dev/null
@@ -0,0 +1,3 @@
+installdir = $(datadir)/enigma2
+
+install_DATA = rc_wb_desc.png
diff --git a/lib/python/Plugins/Extensions/WebBrowser/desc/rc_wb_desc.png b/lib/python/Plugins/Extensions/WebBrowser/desc/rc_wb_desc.png
new file mode 100644 (file)
index 0000000..921bf12
Binary files /dev/null and b/lib/python/Plugins/Extensions/WebBrowser/desc/rc_wb_desc.png differ
diff --git a/lib/python/Plugins/Extensions/WebBrowser/mp_wb_background.png b/lib/python/Plugins/Extensions/WebBrowser/mp_wb_background.png
new file mode 100644 (file)
index 0000000..890c118
Binary files /dev/null and b/lib/python/Plugins/Extensions/WebBrowser/mp_wb_background.png differ
diff --git a/lib/python/Plugins/Extensions/WebBrowser/mp_wb_buttons.png b/lib/python/Plugins/Extensions/WebBrowser/mp_wb_buttons.png
new file mode 100644 (file)
index 0000000..bfa1e61
Binary files /dev/null and b/lib/python/Plugins/Extensions/WebBrowser/mp_wb_buttons.png differ
index 344f698..6d9e8ea 100644 (file)
@@ -16,9 +16,15 @@ from urllib import quote, unquote_plus, unquote
 from urllib2 import Request, URLError, urlopen as urlopen2
 from httplib import HTTPConnection, CannotSendRequest, BadStatusLine, HTTPException
 
+from Screens.Screen import Screen
+from Screens.ChoiceBox import ChoiceBox
+from Screens.MessageBox import MessageBox
+from Screens.DefaultWizard import DefaultWizard
+from Screens.InfoBarGenerics import InfoBarNotifications
+
 from Components.Button import Button
 from Components.Label import Label
-from Components.Pixmap import Pixmap
+from Components.Pixmap import Pixmap, MovingPixmap
 from Components.Language import language
 from Components.Sources.List import List
 from Components.ConfigList import ConfigListScreen
@@ -27,13 +33,10 @@ from Components.ActionMap import NumberActionMap, ActionMap
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.config import config, ConfigSelection, getConfigListEntry, ConfigSlider
 
-from Screens.Screen import Screen
-from Screens.ChoiceBox import ChoiceBox
-from Screens.MessageBox import MessageBox
-from Screens.DefaultWizard import DefaultWizard
-from Screens.InfoBarGenerics import InfoBarNotifications
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS
+from Tools.LoadPixmap import LoadPixmap
 
-from enigma import eTimer, eServiceReference, iPlayableService, fbClass, eRCInput, eConsoleAppContainer, getDesktop
+from enigma import eTimer, eServiceReference, iPlayableService, fbClass, eRCInput, eConsoleAppContainer, getDesktop, ePicLoad
 
 HTTPConnection.debuglevel = 1
 
@@ -89,11 +92,13 @@ def wb_islock():
 
 class VuPlayer(Screen, InfoBarNotifications):
        size = getDesktop(0).size()
-       position_params = size.width() > 750 and (620) or (480)
+       wb_bgr = resolveFilename(SCOPE_PLUGINS, "Extensions/WebBrowser/mp_wb_background.png")
+       wb_btn = resolveFilename(SCOPE_PLUGINS, "Extensions/WebBrowser/mp_wb_buttons.png")
+       position_params = size.width() > 750 and (620, wb_bgr, wb_btn) or (480, wb_bgr, wb_btn)
        skin =  """
                <screen name="VuPlayer" flags="wfNoBorder" position="center,%d" size="455,53" title="VuPlayer" backgroundColor="transparent">
-                       <ePixmap pixmap="Vu_HD/mp_wb_background.png" position="0,0" zPosition="-1" size="455,53" />
-                       <ePixmap pixmap="Vu_HD/icons/mp_wb_buttons.png" position="40,23" size="30,13" alphatest="on" />
+                       <ePixmap pixmap="%s" position="0,0" zPosition="-1" size="455,53" />
+                       <ePixmap pixmap="%s" position="40,23" size="30,13" alphatest="on" />
 
                        <widget source="session.CurrentService" render="PositionGauge" position="80,25" size="220,10" zPosition="2" pointer="skin_default/position_pointer.png:540,0" transparent="1" foregroundColor="#20224f">
                                <convert type="ServicePosition">Gauge</convert>
@@ -407,24 +412,24 @@ class VuPlayerService:
                conn.close()
 
 class BrowserLauncher(ConfigListScreen, Screen):
-       size = getDesktop(0).size()
-       position_params = size.width() > 750 and (309,498, 0,150, 0,455) or (618,320, 312,5, 0,180)
        skin=   """
-               <screen name="BrowserLauncher" position="center,center" size="%d,%d" title="Web Browser">
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="4,0" size="40,40" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="154,0" size="40,40" alphatest="on" />
+               <screen position="center,center" size="623,300" title="Web Browser">
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="158,0" size="140,40" alphatest="on" />
 
-                       <widget source="key_red" render="Label" position="30,0" zPosition="1" size="125,30" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="180,0" zPosition="1" size="125,30" font="Regular;20" halign="center" valign="center" transparent="1" />
+                       <widget source="key_red" render="Label" position="10,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="158,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
 
                        <widget name="config" position="0,50" size="309,100" scrollbarMode="showOnDemand" />
-                       <ePixmap pixmap="Vu_HD/rc_wb_desc.png" position="%d,%d" size="309,296" alphatest="on" />
-                       <widget name="info" position="%d,%d" size="309,50" font="Regular;18" halign="center" foregroundColor="blue" transparent="1" />
+                       <ePixmap pixmap="rc_wb_desc.png" position="312,5" size="309,296" alphatest="on" />
+                       <widget name="info" position="0,180" size="309,50" font="Regular;18" halign="center" foregroundColor="#a08500" transparent="1" />
                </screen>
-               """ % position_params
+               """
 
        def __init__(self, session): 
                Screen.__init__(self, session)
+               
+
                 self.session = session
                self.list = []
                ConfigListScreen.__init__(self, self.list)
index 93966bc..3ab1368 100644 (file)
@@ -19,22 +19,20 @@ from Tools.Directories import resolveFilename, SCOPE_DEFAULTPARTITIONMOUNTDIR, S
 from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, eDVBFrontendParametersCable, eConsoleAppContainer, eDVBResourceManager, getDesktop
 
 class Blindscan(ConfigListScreen, Screen):
-       size = getDesktop(0).size()
-       position_params = size.width() > 750 and ('center') or ('140')
        skin =  """
-               <screen name="Blindscan" position="center,%s" size="560,370" title="Blindscan">
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="5,0" size="80,40" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="186,0" size="80,40" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/blue.png" position="372,0" size="80,40" alphatest="on" />
+               <screen position="center,center" size="560,390" title="Blindscan">
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="40,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="210,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/blue.png" position="380,10" size="140,40" alphatest="on" />
 
-                       <widget source="key_red" render="Label" position="28,0" zPosition="1" size="160,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
-                       <widget source="key_green" render="Label" position="213,0" zPosition="1" size="160,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
-                       <widget source="key_blue" render="Label" position="400,0" zPosition="1" size="160,30" font="Regular;20" halign="center" valign="center" transparent="1"/>
+                       <widget source="key_red" render="Label" position="40,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1"/>
+                       <widget source="key_green" render="Label" position="210,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1"/>
+                       <widget source="key_blue" render="Label" position="380,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" foregroundColor="#ffffff" transparent="1"/>
 
-                       <widget name="config" position="5,50" size="550,280" scrollbarMode="showOnDemand" />
-                       <widget name="introduction" position="0,345" size="560,20" font="Regular;20" halign="center" />
+                       <widget name="config" position="5,70" size="550,280" scrollbarMode="showOnDemand" />
+                       <widget name="introduction" position="0,365" size="560,20" font="Regular;20" halign="center" />
                </screen>
-               """ % position_params
+               """
 
        def __init__(self, session): 
                Screen.__init__(self, session)
index 1a43319..f2fb0cb 100644 (file)
@@ -79,45 +79,22 @@ def loadConfig():
                g_default_machineinfo = False
 
 class CrashlogReportConfiguration(Screen, ConfigListScreen):
-       skin_list = {}
-       skin_list["hd"] = """
-               <screen name="CrashlogReportSetting" position="209,48" size="865,623" title="CrashlogReport Setting" flags="wfNoBorder" backgroundColor="transparent">  
-                       <ePixmap pixmap="Vu_HD/Bg_EPG_list.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
-                       <eLabel text="CrashlogReport Setting" position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
-                       <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" halign="right" backgroundColor="#27d9dee2" transparent="1">
-                               <convert type="ClockToText">Format:%H:%M</convert>
-                       </widget>
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="435,98" size="25,25" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="630,98" size="25,25" alphatest="blend" />
-                       <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget name="config" zPosition="2" position="50,130" itemHeight="36" size="750,324" scrollbarMode="showOnDemand" transparent="1" />
-                       <widget source="status" render="Label" position="160,525" size="540,60" zPosition="10" foregroundColor="#3c3c3c" backgroundColor="#27aeaeae" font="Regular;20" halign="center" valign="center" transparent="1"/>
-                       <widget name="VKeyIcon" pixmap="Vu_HD/buttons/key_text.png" position="500,350" zPosition="10" size="35,25" transparent="1" alphatest="on" />
-                       <widget name="HelpWindow" pixmap="Vu_HD/vkey_icon.png" position="310,400" zPosition="1" size="1,1" transparent="1" alphatest="on" />
-               </screen>
-               """
-       skin_list["sd"] = """
-               <screen name="CrashlogReportSetting" position="center,120" size="560,420" title="CrashlogReport Settings" >
-                       <ePixmap pixmap="750S/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-                       <ePixmap pixmap="750S/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-                       <widget source="key_red" render="Label" position="20,0" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-                       <widget source="key_green" render="Label" position="160,0" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-                       <widget name="config" zPosition="2" position="5,50" size="550,300" scrollbarMode="showOnDemand" transparent="1" />
-                       <ePixmap pixmap="750S/div-h.png" position="0,360" zPosition="10" size="560,2" transparent="1" alphatest="on" />
+       skin =  """
+               <screen position="center,120" size="560,420" title="CrashlogReport Settings" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="config" zPosition="2" position="5,70" size="550,300" scrollbarMode="showOnDemand" transparent="1" />
+                       <ePixmap pixmap="skin_default/div-h.png" position="0,360" zPosition="10" size="560,2" transparent="1" alphatest="on" />
                        <widget source="status" render="Label" position="10,370" size="540,40" zPosition="10" font="Regular;20" halign="center" valign="center" backgroundColor="#25062748" transparent="1"/>
-                       <widget name="VKeyIcon" pixmap="750S/buttons/key_text.png" position="10,390" zPosition="10" size="35,25" transparent="1" alphatest="on" />
-                       <widget name="HelpWindow" pixmap="750S/vkey_icon.png" position="160,300" zPosition="1" size="1,1" transparent="1" alphatest="on" />
+                       <widget name="VKeyIcon" pixmap="skin_default/buttons/key_text.png" position="10,390" zPosition="10" size="35,25" transparent="1" alphatest="on" />
+                       <widget name="HelpWindow" pixmap="skin_default/vkey_icon.png" position="160,350" zPosition="1" size="1,1" transparent="1" alphatest="on" />
                </screen>
                """
 
-       size = getDesktop(0).size()
-       skin = skin_list[size.width() > 750 and "hd" or "sd"]
-
        def __init__(self, session):
                Screen.__init__(self, session)
                self.session = session
index 87ecedf..5fd7a7e 100644 (file)
@@ -122,16 +122,14 @@ class FPGAUpgradeManager:
                return str(self.fu.errmsg)
 
 class UpgradeStatus(Screen):
-       size = getDesktop(0).size()
-       position_params = size.width() > 750 and (' ') or ('backgroundColor=\"blue\"')
        skin =  """
-               <screen position="center,center" size="450,130" title="FPGA Upgrade">
+               <screen position="center,center" size="450,130" title=" ">
                        <widget name="name" position="10,0" size="430,20" font="Regular;18" halign="left" valign="bottom"/>
                        <widget name="slider" position="10,25" size="430,30" borderWidth="2" borderColor="#cccccc"/>
-                       <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="blue" %s transparent="1"/>
-                       <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+                       <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="#9f1313" transparent="1"/>
+                       <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" transparent="1"/>
                </screen>
-               """ % position_params
+               """
 
        def __init__(self, session, parent, timeout = 20):
                Screen.__init__(self,session)
@@ -157,6 +155,8 @@ class UpgradeStatus(Screen):
                self.slider = Slider(0, 100)
                self["slider"] = self.slider
                
+               self.setTitle("FPGA Upgrade Status")
+
                self.parent = parent
                self.timer_check_progress = eTimer()
                self.timer_check_progress.callback.append(self.callbackDoCheckProgress)
@@ -211,22 +211,20 @@ class UpgradeStatus(Screen):
                        self.close()
                
 class FPGAUpgrade(Screen):
-       size = getDesktop(0).size()
-       position_params = size.width() > 750 and ('center', 440) or ('120', 420)
        skin =  """
-               <screen position="center,%s" size="560,%d" title="FPGA Upgrade" >
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="0,7" size="80,40" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="186,7" size="80,40" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/blue.png" position="372,7" size="80,40" alphatest="blend" />
+               <screen position="center,center" size="560,430" title="FPGA Upgrade" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="40,10" size="140,40" alphatest="blend" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="210,10" size="140,40" alphatest="blend" />
+                       <ePixmap pixmap="skin_default/buttons/blue.png" position="380,10" size="140,40" alphatest="blend" />
 
-                       <widget source="key_red" render="Label" position="28,0" zPosition="1" size="160,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
-                       <widget source="key_green" render="Label" position="213,0" zPosition="1" size="160,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
-                       <widget source="key_blue" render="Label" position="400,0" zPosition="1" size="160,40" font="Regular;20" halign="center" valign="center" transparent="1"/>
+                       <widget source="key_red" render="Label" position="40,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1"/>
+                       <widget source="key_green" render="Label" position="210,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1"/>
+                       <widget source="key_blue" render="Label" position="380,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" foregroundColor="#ffffff" transparent="1"/>
 
-                       <widget source="status" render="Label" position="15,45" zPosition="1" size="540,40" font="Regular;18" halign="left" valign="center" backgroundColor="#a08500" transparent="1" />
-                       <widget name="file_list" position="0,100" size="555,325" scrollbarMode="showOnDemand" />
+                       <widget source="status" render="Label" position="15,60" zPosition="1" size="540,40" font="Regular;18" halign="left" valign="center" transparent="1" />
+                       <widget name="file_list" position="0,100" size="555,320" scrollbarMode="showOnDemand" />
                 </screen>
-               """ % position_params 
+               """
 
        def __init__(self, session): 
                Screen.__init__(self, session)
index e3d3c52..d28fe8e 100644 (file)
@@ -18,14 +18,17 @@ config.plugins.fancontrols.fanontime = ConfigInteger(default = 5, limits = (1, 1
 config.plugins.fancontrols.fanofftime = ConfigInteger(default = 60, limits = (1, 100))
 
 class FancontrolConfiguration(Screen, ConfigListScreen):
-       skin = """
-               <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Standbymode Fancontrol 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" />
-                       <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ececec" 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" foregroundColor="#ececec" backgroundColor="#1f771f" transparent="1" />
-                       <widget name="config" zPosition="2" position="5,50" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
-               </screen>"""
+       skin =  """
+               <screen position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
+               </screen>
+               """
        def __init__(self, session):
                Screen.__init__(self, session)
                self.session = session
index f506ee6..7834f06 100644 (file)
@@ -210,26 +210,14 @@ class FirmwareUpgradeManager:
                return str(self.fu.errmsg)
 
 class UpgradeStatus(Screen):
-       '''
        skin =  """
-               <screen position="center,center" size="450,100" title=" ">
-                       <widget name="name" position="10,0" size="430,20" font="Regular;18" halign="left" valign="bottom"/>
-                       <widget name="slider" position="10,25" size="430,30" backgroundColor="white"/>
-                       <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="black" backgroundColor="black" transparent="1"/>
-                       <widget source="info" render="Label" position="10,70" zPosition="1" size="430,30" font="Regular;22" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
-               </screen>
-               """
-       '''
-       size = getDesktop(0).size()
-       position_params = size.width() > 750 and (' ') or ('backgroundColor=\"blue\"')
-       skin =  """
-               <screen position="center,center" size="450,130" title="FPGA Upgrade">
+               <screen position="center,center" size="450,130" title=" ">
                        <widget name="name" position="10,0" size="430,20" font="Regular;18" halign="left" valign="bottom"/>
                        <widget name="slider" position="10,25" size="430,30" borderWidth="2" borderColor="#cccccc"/>
-                       <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="blue" %s transparent="1"/>
-                       <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+                       <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="#9f1313" transparent="1"/>
+                       <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" transparent="1"/>
                </screen>
-               """ % position_params
+               """
 
        def __init__(self, session, parent, firmware, datafile, device):
                Screen.__init__(self,session)
@@ -316,14 +304,15 @@ class UpgradeStatus(Screen):
                        self.callback("Reboot now for a successful upgrade.", True)
                self.session.openWithCallback(self.cbConfirmExit, MessageBox, _("Do you want to remove binary data?"), MessageBox.TYPE_YESNO, timeout = 10, default = False)
 
-class Filebrowser(Screen):
+class FUFilebrowser(Screen):
        skin =  """
-               <screen position="center,center" size="500,260" title="File Browser" >
-                       <ePixmap pixmap="Vu_HD/buttons/blue.png" position="5,7" size="80,40" alphatest="blend" />
-                       <widget source="key_blue" render="Label" position="40,0" zPosition="1" size="300,40" font="Regular;20" halign="left" valign="center" transparent="1"/>
-                       <widget name="file_list" position="0,50" size="500,160" scrollbarMode="showOnDemand" />
+               <screen position="center,center" size="500,290" title="File Browser" >
+                       <ePixmap pixmap="skin_default/buttons/blue.png" position="5,10" size="140,40" alphatest="blend" />
+
+                       <widget source="key_blue" render="Label" position="5,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" foregroundColor="#ffffff" transparent="1"/>
 
-                       <widget source="status" render="Label" position="0,220" zPosition="1" size="500,40" font="Regular;18" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
+                       <widget name="file_list" position="0,70" size="495,160" scrollbarMode="showOnDemand" />
+                       <widget source="status" render="Label" position="0,230" zPosition="1" size="495,70" font="Regular;18" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
                 </screen>
                """
 
@@ -331,7 +320,7 @@ class Filebrowser(Screen):
                Screen.__init__(self, session)
                 self.session = session 
                
-               self["key_blue"] = StaticText(_("Download  the  firmware (latest)"))
+               self["key_blue"] = StaticText(_("Download"))
 
                self["status"]    = StaticText(_(" "))
                self["file_list"] = FileList("/", matchingPattern = "^.*")
@@ -357,7 +346,7 @@ class Filebrowser(Screen):
                self.setTitle(firmware.upper() + " File Browser")
 
        def resetGUI(self):
-               self["status"].setText("Select to press OK, Exit to press Cancel.")
+               self["status"].setText("Select to press OK, Exit to press Cancel.\nPress the BLUE button to download the latest firmware.")
 
        def setCallback(self, func):
                self.callback = func
@@ -545,14 +534,14 @@ class Filebrowser(Screen):
 class FirmwareUpgrade(Screen, ConfigListScreen):
        skin =  """
                <screen position="center,center" size="560,175" title="Firmware Upgrade" >
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="125,7" size="80,40" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="330,7" size="80,40" alphatest="blend" />
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="blend" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="blend" />
 
-                       <widget source="key_red" render="Label" position="160,0" zPosition="1" size="155,40" font="Regular;20" halign="left" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="365,0" zPosition="1" size="155,40" font="Regular;20" halign="left" valign="center" transparent="1" />
+                       <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
 
-                       <widget name="config" zPosition="2" position="0,50" itemHeight="36" size="540,40" scrollbarMode="showOnDemand" transparent="1" />
-                       <widget source="status" render="Label" position="0,100" zPosition="1" size="540,75" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
+                       <widget name="config" zPosition="2" position="0,70" itemHeight="36" size="540,40" scrollbarMode="showOnDemand" transparent="1" />
+                       <widget source="status" render="Label" position="0,100" zPosition="1" size="540,75" font="Regular;20" halign="center" valign="center" />
                 </screen>
                """
 
@@ -664,7 +653,7 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                fbs.setCallback(self.cbFinishedUpgrade)
        
        def doFileOpen(self):
-               fbs = self.session.open(Filebrowser, self, self._item_firmware.value)
+               fbs = self.session.open(FUFilebrowser, self, self._item_firmware.value)
                fbs.setCallback(self.cbSetStatus)
 
        def keyLeft(self):
@@ -677,6 +666,8 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                self.setupStatus()
 
        def keyRight(self):
+               if self.rebootLock:
+                       return
                global fwlist
                if fwlist is None:
                        return
index 9603d14..329c85a 100755 (executable)
@@ -27,33 +27,22 @@ from os import system
 from Components.InputDevice import iInputDevices
 
 class HdmiCecPlugin(Screen,ConfigListScreen):
-       def __init__(self, session):
-               if session.desktop.size().width() > 720:
-                       self.skin = """
-                       <screen name="HDMICEC" position="center,center" size="700,400" title="HDMI-CEC Plugin" >
-                       <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" foregroundColor="#ececec" 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" foregroundColor="#ececec" 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" foregroundColor="#ececec" backgroundColor="#1f771f" transparent="1" />
-                       <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ececec" backgroundColor="#1f771f" transparent="1" />
-                       <widget name="config" zPosition="2" position="5,50" size="650,300" scrollbarMode="showOnDemand" transparent="1" />
-                       </screen>"""
-               else:
-                       self.skin = """
-                       <screen name="HDMICEC" position="center,center" size="600,320" title="HDMI-CEC Plugin" >
-                       <ePixmap pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
-                       <ePixmap pixmap="skin_default/buttons/green.png" position="150,0" size="140,40" alphatest="on" />
-                       <ePixmap pixmap="skin_default/buttons/yellow.png" position="290,0" size="140,40" alphatest="on" />
-                       <ePixmap pixmap="skin_default/buttons/blue.png" position="430,0" size="140,40" alphatest="on" />
-                       <widget source="key_red" render="Label" position="10,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ececec" backgroundColor="#9f1313" transparent="1" />
-                       <widget source="key_green" render="Label" position="150,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ececec" backgroundColor="#1f771f" transparent="1" />
-                       <widget source="key_yellow" render="Label" position="290,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ececec" backgroundColor="#1f771f" transparent="1" />
-                       <widget source="key_blue" render="Label" position="430,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ececec" backgroundColor="#1f771f" transparent="1" />
+       skin =  """
+               <screen position="center,center" size="590,320" title="HDMI-CEC Plugin" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="20,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="160,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/yellow.png" position="300,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/blue.png" position="440,0" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="20,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#9f1313" transparent="1" />
+                       <widget source="key_green" render="Label" position="160,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#1f771f" transparent="1" />
+                       <widget source="key_yellow" render="Label" position="300,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#a08500" transparent="1" />
+                       <widget source="key_blue" render="Label" position="440,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" foregroundColor="#ffffff" backgroundColor="#18188b" transparent="1" />
+
                        <widget name="config" zPosition="2" position="10,50" size="580,270" scrollbarMode="showOnDemand" transparent="1" />
-                       </screen>"""
+               </screen>
+               """
+       def __init__(self, session):
                Screen.__init__(self, session)
                config.hdmicec.input_address = ConfigText(default = "0", visible_width = 50, fixed_size = False)
                config.hdmicec.input_value1 = ConfigText(default = "0", visible_width = 50, fixed_size = False)
index f5cc4fc..9d29a46 100755 (executable)
@@ -57,17 +57,20 @@ class LEDSetup:
 ledsetup = LEDSetup()
 
 class LEDBrightnessSetup(Screen,ConfigListScreen):
-       skin = """
-                       <screen name="LEDBrightnessSetup" position="center,center" size="560,300" title="LED Brightness Setup">
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="10,10" size="25,25" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="195,10" size="25,25" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/yellow.png" position="380,10" size="25,25" alphatest="on" />
-                       <widget source="key_red" render="Label" position="30,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="215,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget source="key_yellow" render="Label" position="400,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget name="config" zPosition="2" position="5,50" size="550,200" scrollbarMode="showOnDemand" transparent="1"/>
+       skin =  """
+               <screen position="center,center" size="560,300" title="LED Brightness Setup">
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="40,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="210,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/yellow.png" position="380,10" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="40,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="210,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_yellow" render="Label" position="380,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1"/>
                        <widget name="current_entry" position="130,240" size="300,30" font="Regular;18" halign="center" valign="center"/>
-                       </screen>"""
+               </screen>
+               """
 
        def __init__(self,session):
                Screen.__init__(self,session)
index 8a0be65..d38ed8c 100755 (executable)
@@ -9,15 +9,18 @@ from Plugins.SystemPlugins.ManualFancontrol.InstandbyOn import instandbyon
 import NavigationInstance
 
 class ManualFancontrol(Screen,ConfigListScreen):
-       skin = """
-                       <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Standby mode" >
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="10,10" size="25,25" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="290,10" size="25,25" alphatest="on" />
-                       <widget source="key_red" render="Label" position="40,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="320,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget name="config" zPosition="2" position="5,50" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
-                       <widget source="current" render="Label" position="150,270" zPosition="1" size="280,30" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       </screen>"""
+       skin =  """
+               <screen position="center,center" size="560,300" title="Fancontrol Settings in Standby mode" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
+                       <widget source="current" render="Label" position="150,270" zPosition="1" size="280,30" font="Regular;20" halign="center" valign="center" />
+               </screen>
+               """
 
        def __init__(self,session):
                Screen.__init__(self,session)
index 83df8b3..fccb6a6 100755 (executable)
@@ -39,14 +39,17 @@ class RemoteControlCodeInit:
                        return False
 
 class RemoteControlCode(Screen,ConfigListScreen,RemoteControlCodeInit):
-       skin = """
-                       <screen name="RemoteControlCode" position="center,center" size="560,250" title="Remote Control System Code Setting" >
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="10,10" size="25,25" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="290,10" size="25,25" alphatest="on" />
-                       <widget source="key_red" render="Label" position="40,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="320,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget name="config" zPosition="2" position="5,50" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
-                       </screen>"""
+       skin =  """
+               <screen position="center,center" size="560,250" title="Remote Control System Code Setting" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
+               </screen>
+               """
 
        def __init__(self,session):
                Screen.__init__(self,session)
@@ -114,21 +117,21 @@ class RemoteControlCode(Screen,ConfigListScreen,RemoteControlCodeInit):
                quitMainloop(3)
 
 class MessageBoxConfirmCode(MessageBox):
-       skin = """
-               <screen position="center,center" size="600,10" title="Message">
-               <widget name="text" position="65,8" size="420,0" font="Regular;22" />
-               <widget name="ErrorPixmap" pixmap="Vu_HD/icons/input_error.png" position="5,5" size="53,53" alphatest="blend" />
-               <widget name="QuestionPixmap" pixmap="Vu_HD/icons/input_question.png" position="5,5" size="53,53" alphatest="blend" />
-               <widget name="InfoPixmap" pixmap="Vu_HD/icons/input_info.png" position="5,5" size="53,53" alphatest="blend" />
-               <widget name="list" position="100,100" size="380,375" transparent="1" backgroundColor="#279e9fa4" />
-               <applet type="onLayoutFinish">
+       skin =  """
+               <screen position="center,center" size="620,10" title="Message">
+                       <widget name="text" position="65,8" size="420,0" font="Regular;20" />
+                       <widget name="ErrorPixmap" pixmap="skin_default/icons/input_error.png" position="5,5" size="53,53" alphatest="blend" />
+                       <widget name="QuestionPixmap" pixmap="skin_default/icons/input_question.png" position="5,5" size="53,53" alphatest="blend" />
+                       <widget name="InfoPixmap" pixmap="skin_default/icons/input_info.png" position="5,5" size="53,53" alphatest="blend" />
+                       <widget name="list" position="100,100" size="380,375" transparent="1" />
+                       <applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
 from enigma import eSize, ePoint
 
-orgwidth = self.instance.size().width()
+orgwidth  = self.instance.size().width()
 orgheight = self.instance.size().height()
-orgpos = self.instance.position()
-textsize = self[&quot;text&quot;].getSize()
+orgpos    = self.instance.position()
+textsize  = self[&quot;text&quot;].getSize()
 
 # y size still must be fixed in font stuff...
 textsize = (textsize[0] + 50, textsize[1] + 50)
@@ -141,7 +144,6 @@ if (280 &gt; wsizex):
        wsizex = 280
 wsize = (wsizex, wsizey)
 
-
 # resize
 self.instance.resize(eSize(*wsize))
 
@@ -157,8 +159,9 @@ self[&quot;list&quot;].instance.resize(eSize(*listsize))
 newwidth = wsize[0]
 newheight = wsize[1]
 self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (orgheight - newheight)/2))
-               </applet>
-       </screen>"""
+                       </applet>
+               </screen>
+               """
 
        def __init__(self, session, replytext_1="", replytext_2="", type = MessageBox.TYPE_YESNO, timeout = -1, close_on_any_key = False, default = True, enable_input = True, msgBoxID = None):
                self.replytext_1 = replytext_1
index 645b829..d5ce741 100755 (executable)
@@ -12,14 +12,17 @@ config.plugins.UI3DSetup.znorm = ConfigInteger(default = 0)
 config.plugins.UI3DSetup.setmode = ConfigSelection(choices = setmodelist, default = "mode1")
 
 class UI3DSetupScreen(Screen, ConfigListScreen):
-       skin = """
+       skin =  """
                <screen position="center,center" size="560,300" title="UI 3D setup" >
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="10,10" size="25,25" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="290,10" size="25,25" alphatest="on" />
-                       <widget source="key_red" render="Label" position="40,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="320,10" zPosition="1" size="140,25" font="Regular;20" halign="center" valign="center" transparent="1" />
-                       <widget name="config" zPosition="2" position="5,50" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
-               </screen>"""
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="config" zPosition="2" position="5,70" size="550,200" scrollbarMode="showOnDemand" transparent="1" />
+               </screen>
+               """
 
        def __init__(self, session):
                self.skin = UI3DSetupScreen.skin
index 22b4170..25c7f92 100755 (executable)
@@ -46,19 +46,22 @@ class UIPositionSetupInit:
 uipositionsetupinit = UIPositionSetupInit()
 
 class UIPositionSetup(Screen, ConfigListScreen, UIPositionSetupInit):
+       skin =  """
+               <screen position="0,0" size="%d,%d" title="Screen Position Setup" backgroundColor="#27d8dee2" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="%d,%d" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="%d,%d" size="140,40" alphatest="on" />"
+
+                       <widget source="key_red" render="Label" position="%d,%d" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="%d,%d" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="config" zPosition="2" position="%d,%d" size="500,200" scrollbarMode="showOnDemand" foregroundColor="#1c1c1c" transparent="1" />
+               </screen>
+               """
        def __init__(self,session):
-               size_w = session.desktop.size().width()
-               size_h = session.desktop.size().height()
-               xpos = (size_w-500)/2
-               ypos = (size_h-300)/2
-               self.skin=""
-               self.skin += "<screen position=\"0,0\" size=\"" + str(size_w) + "," + str(size_h) + "\" title=\"Screen Position Setup\" backgroundColor=\"#27d8dee2\">"
-               self.skin += "<ePixmap pixmap=\"Vu_HD/buttons/red.png\" position=\""+str(xpos+10) + "," + str(ypos+10) + "\" size=\"25,25\" alphatest=\"on\" />"
-               self.skin += "<ePixmap pixmap=\"Vu_HD/buttons/green.png\" position=\""+str(xpos+290) + "," + str(ypos+10) + "\" size=\"25,25\" alphatest=\"on\" />"
-               self.skin += "<widget source=\"key_red\" render=\"Label\" position=\""+str(xpos+40) + "," + str(ypos+10) + "\" zPosition=\"1\" size=\"140,25\" font=\"Regular;20\" halign=\"center\" valign=\"center\" foregroundColor=\"#1c1c1c\" transparent=\"1\" />"
-               self.skin += "<widget source=\"key_green\" render=\"Label\" position=\""+str(xpos+320) + "," + str(ypos+10) + "\" zPosition=\"1\" size=\"140,25\" font=\"Regular;20\" halign=\"center\" valign=\"center\" foregroundColor=\"#1c1c1c\" transparent=\"1\" />"
-               self.skin += "<widget name=\"config\" zPosition=\"2\" position=\""+str(xpos+5) + "," + str(ypos+50) + "\" size=\"550,200\" scrollbarMode=\"showOnDemand\" foregroundColor=\"#1c1c1c\" transparent=\"1\" />"
-               self.skin += "</screen>"
+               w,h   = session.desktop.size().width(), session.desktop.size().height()
+               cw,ch = w/2, h/2
+               #                             btn_red        btn_green     lb_red         lb_green      config
+               self.skin = self.skin % (w,h, cw-190,ch-110, cw+50,ch-110, cw-190,ch-110, cw+50,ch-110, cw-250,ch-50)
 
                Screen.__init__(self,session)
                self.session = session
@@ -71,6 +74,7 @@ class UIPositionSetup(Screen, ConfigListScreen, UIPositionSetupInit):
                }, -2)
                self.list = []
                ConfigListScreen.__init__(self, self.list,session = self.session)
+
                self["key_red"] = StaticText(_("Cancel"))
                self["key_green"] = StaticText(_("Save"))
                self["current"] = StaticText(_(" "))
@@ -79,19 +83,19 @@ class UIPositionSetup(Screen, ConfigListScreen, UIPositionSetupInit):
        def createSetup(self):
                self.list = []
 
-               left = config.plugins.UIPositionSetup.dst_left.value
-               width = config.plugins.UIPositionSetup.dst_width.value
-               top = config.plugins.UIPositionSetup.dst_top.value
+               left   = config.plugins.UIPositionSetup.dst_left.value
+               width  = config.plugins.UIPositionSetup.dst_width.value
+               top    = config.plugins.UIPositionSetup.dst_top.value
                height = config.plugins.UIPositionSetup.dst_height.value
 
-               self.dst_left = ConfigSlider(default = left, increment = 5, limits = (0, 720))
-               self.dst_width = ConfigSlider(default = width, increment = 5, limits = (0, 720))
-               self.dst_top = ConfigSlider(default = top, increment = 5, limits = (0, 576))
+               self.dst_left   = ConfigSlider(default = left, increment = 5, limits = (0, 720))
+               self.dst_width  = ConfigSlider(default = width, increment = 5, limits = (0, 720))
+               self.dst_top    = ConfigSlider(default = top, increment = 5, limits = (0, 576))
                self.dst_height = ConfigSlider(default = height, increment = 5, limits = (0, 576))
 
-               self.dst_left_entry = getConfigListEntry(_("left"), self.dst_left)
-               self.dst_width_entry = getConfigListEntry(_("width"), self.dst_width)
-               self.dst_top_entry = getConfigListEntry(_("top"), self.dst_top)
+               self.dst_left_entry   = getConfigListEntry(_("left"), self.dst_left)
+               self.dst_width_entry  = getConfigListEntry(_("width"), self.dst_width)
+               self.dst_top_entry    = getConfigListEntry(_("top"), self.dst_top)
                self.dst_height_entry = getConfigListEntry(_("height"), self.dst_height)
 
                self.list.append(self.dst_left_entry)
index 3b6a214..f3e5920 100755 (executable)
@@ -29,37 +29,22 @@ from Tools.Directories import fileExists
 import time
 
 class WlanSelection(Screen,HelpableScreen):
-       def __init__(self, session):
-               if session.desktop.size().width() > 720:
-                       self.skin = """
-                       <screen name="WlanSelection" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">
-                       <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
-                       <eLabel text="Wireless Network Adapter Selection..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
-                       <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
-                               <convert type="ClockToText">Format:%H:%M</convert>
-                       </widget>
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
-                       <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
-                       <widget name="menulist" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
-                       <widget source="description" render="Label" position="500,140" size="280,360" font="Regular;19" halign="center" valign="center" backgroundColor="#c5c9cc" transparent="1"/>
-                       </screen>"""
-               else:
-                       self.skin = """
-                       <screen name="WlanSelection" position="110,120" size="500,400" title="Wireless Network Adapter Selection..." >
-                       <ePixmap pixmap="750S/div-h.png" position="0,350" zPosition="1" size="560,2" />
-                       <ePixmap pixmap="750S/border_menu_a.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
-                       <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
-                       <widget source="key_red" render="Label" position="30,360" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-                       <ePixmap pixmap="750S/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
-                       <widget source="key_green" render="Label" position="380,360" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-                       <widget name="menulist" position="20,20" size="230,260" selectionPixmap="750S/buttons/Selected_bar_230x23px.png" transparent="1" backgroundColor="#371e1c1a" zPosition="10" scrollbarMode="showOnDemand" />
+       skin =  """
+               <screen position="center,center" size="510,400" title="Wireless Network Adapter Selection..." >
+                       <ePixmap pixmap="skin_default/div-h.png" position="0,350" zPosition="1" size="560,2" />
+                       <ePixmap pixmap="skin_default/border_menu.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
+
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="10,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="360,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="menulist" position="20,20" size="230,260" transparent="1" backgroundColor="#371e1c1a" zPosition="10" scrollbarMode="showOnDemand" />
                        <widget source="description" render="Label" position="305,10" size="195,300" font="Regular;19" halign="center" valign="center" />
-                       </screen>"""
+               </screen>
+               """
+       def __init__(self, session):
                Screen.__init__(self,session)
                HelpableScreen.__init__(self)
                self.mainmenu = self.getWlandevice()
@@ -137,37 +122,22 @@ class WlanSelection(Screen,HelpableScreen):
                iNetwork.stopGetInterfacesConsole()
 
 class WlanSetup(Screen,HelpableScreen):
-       def __init__(self, session, ifaces):
-               if session.desktop.size().width() > 720:
-                       self.skin = """
-                       <screen name="WlanSetup" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">   
-                       <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
-                       <eLabel text="Wireless Network Setup Menu..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
-                       <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
-                               <convert type="ClockToText">Format:%H:%M</convert>
-                       </widget>
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
-                       <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
-                       <widget name="menulist" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
-                       <widget source="description" render="Label" position="500,140" size="280,360" font="Regular;19" halign="center" valign="center" backgroundColor="#c5c9cc" transparent="1"/>
-                       </screen>"""
-               else:
-                       self.skin = """
-                       <screen name="WlanSetup" position="110,120" size="500,400" title="Wireless Network Setup Menu..." >
-                       <ePixmap pixmap="750S/div-h.png" position="0,350" zPosition="1" size="560,2" />
-                       <ePixmap pixmap="750S/border_menu_a.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
-                       <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
-                       <widget source="key_red" render="Label" position="30,360" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-                       <ePixmap pixmap="750S/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
-                       <widget source="key_green" render="Label" position="380,360" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-                       <widget name="menulist" position="20,20" size="230,260" selectionPixmap="750S/buttons/Selected_bar_230x23px.png" backgroundColor="#371e1c1a" zPosition="10" scrollbarMode="showOnDemand" />
+       skin =  """
+               <screen position="center,center" size="510,400" title="Wireless Network Setup Menu..." >
+                       <ePixmap pixmap="skin_default/div-h.png" position="0,350" zPosition="1" size="560,2" />
+                       <ePixmap pixmap="skin_default/border_menu.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
+
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="10,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="360,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="menulist" position="20,20" size="230,260" transparent="1" backgroundColor="#371e1c1a" zPosition="10" scrollbarMode="showOnDemand" />
                        <widget source="description" render="Label" position="305,10" size="195,300" font="Regular;19" halign="center" valign="center" />
-                       </screen>"""
+               </screen>
+               """
+       def __init__(self, session, ifaces):
                Screen.__init__(self, session)
                HelpableScreen.__init__(self)
                self.session = session
@@ -322,47 +292,25 @@ wlanconfig.gateway = ConfigIP([0,0,0,0])
 
 selectap = None        
 class WlanConfig(Screen, ConfigListScreen, HelpableScreen):
-       def __init__(self, session, iface):
-               if session.desktop.size().width() > 720:
-                       self.skin = """
-                       <screen name="WlanConfig" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">  
-                       <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
-                       <eLabel text="Wireless Network Configuration..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
-                       <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
-                               <convert type="ClockToText">Format:%H:%M</convert>
-                       </widget>
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
-                       <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
-                       <widget name="config" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
-                       <widget name="menulist" position="20,80" size="230,230" selectionPixmap="750S/buttons/Selected_bar_230x23px.png" transparent="1" backgroundColor="#371e1c1a" zPosition="10" scrollbarMode="showOnDemand" />
-                       <eLabel text="IP Address : " position="500,160" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />             
-                       <widget source="ipaddress" render="Label" position="530,190" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />             
-                       <eLabel text="NetMask : " position="500,220" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />                
-                       <widget source="netmask" render="Label" position="530,250" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />               
-                       <eLabel text="Gateway : " position="500,280" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />                
-                       <widget source="gateway" render="Label" position="530,310" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />               
-                       </screen>"""
-               else:
-                       self.skin = """
-                       <screen name="WlanConfig" position="110,120" size="500,400" title="Wireless Network Configuration..." >
-                       <ePixmap pixmap="750S/buttons/red.png" position="0,355" size="140,40" alphatest="on" />
-                       <ePixmap pixmap="750S/buttons/green.png" position="360,355" size="140,40" alphatest="on" />
-                       <widget source="key_red" render="Label" position="20,355" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-                       <widget source="key_green" render="Label" position="380,355" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-                       <widget name="config" position="10,10" backgroundColor="#371e1c1a" size="480,210" scrollbarMode="showOnDemand" />
-                       <ePixmap pixmap="750S/div-h.png" position="0,225" zPosition="1" size="550,2" />
+       skin =  """
+               <screen position="center,center" size="510,400" title="Wireless Network Configuration..." >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="10,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="360,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="config" position="10,10" backgroundColor="#371e1c1a" transparent="1" size="480,210" scrollbarMode="showOnDemand" />
+                       <ePixmap pixmap="skin_default/div-h.png" position="0,225" zPosition="1" size="550,2" />
                        <eLabel text="IP Address : " position="100,250" size="190,21" font="Regular;19" />
                        <widget source="ipaddress" render="Label" position="300,250" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />
                        <eLabel text="NetMask : " position="100,275" size="190,21" font="Regular;19" />
                        <widget source="netmask" render="Label" position="300,275" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />     
                        <eLabel text="Gateway : " position="100,300" size="190,21" font="Regular;19" />
                        <widget source="gateway" render="Label" position="300,300" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />
-                       </screen>"""
+               </screen>
+               """
+       def __init__(self, session, iface):
                Screen.__init__(self,session)
                self.session = session
                self["key_red"] = StaticText(_("Close"))
@@ -922,51 +870,30 @@ class WlanConfig(Screen, ConfigListScreen, HelpableScreen):
                                                self.wpaphraseconsole.kill(name)
 
 class WlanScanAp(Screen,HelpableScreen):
-       def __init__(self, session, iface):
-               if session.desktop.size().width() > 720:
-                       self.skin = """
-                       <screen name="WlanScanAp" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">
-                       <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
-                       <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
-                       <eLabel text="Wireless Network AP Scan..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
-                       <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
-                               <convert type="ClockToText">Format:%H:%M</convert>
-                       </widget>
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="240,98" size="25,25" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/blue.png" position="630,98" size="25,25" alphatest="blend" />
-                       <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="key_blue" render="Label" position="665,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                       <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
-                       <widget name="menulist" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
-                       <widget source="Address" render="Label" position="490,220" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="ESSID" render="Label" position="490,250" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="Protocol" render="Label" position="490,280" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />      
-                       <widget source="Frequency" render="Label" position="490,310" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="Encryption key" render="Label" position="490,340" zPosition="1" size="300,30" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
-                       <widget source="BitRate" render="Label" position="490,370" zPosition="1" size="300,60" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
-                       </screen>"""
-               else:
-                       self.skin = """
-                       <screen name="WlanScanAp" position="110,120" size="500,400" title="Wireless Network AP Scan..." >
-                       <ePixmap pixmap="750S/div-h.png" position="0,350" zPosition="1" size="560,2" />
-                       <ePixmap pixmap="750S/border_menu_a.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
-                       <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
-                       <ePixmap pixmap="750S/buttons/green.png" position="185,360" size="140,40" alphatest="on" />
-                       <ePixmap pixmap="750S/buttons/blue.png" position="360,360" size="140,40" alphatest="on" />
-                       <widget source="key_red" render="Label" position="30,360" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-                       <widget source="key_green" render="Label" position="205,360" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-                       <widget source="key_blue" render="Label" position="380,360" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-                       <widget name="menulist" position="20,20" size="230,260" selectionPixmap="750S/buttons/Selected_bar_230x23px.png" backgroundColor="#371e1c1a" zPosition="10" scrollbarMode="showOnDemand" />
+       skin =  """
+               <screen position="center,center" size="510,400" title="Wireless Network AP Scan..." >
+                       <ePixmap pixmap="skin_default/div-h.png" position="0,350" zPosition="1" size="560,2" />
+                       <ePixmap pixmap="skin_default/border_menu.png" position="10,10" zPosition="1" size="250,300" transparent="1" alphatest="on" />
+
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="185,360" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/blue.png" position="360,360" size="140,40" alphatest="on" />
+
+                       <widget source="key_red" render="Label" position="10,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="185,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_blue" render="Label" position="360,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" foregroundColor="#ffffff" transparent="1" />
+
+                       <widget name="menulist" position="20,20" size="230,260" backgroundColor="#371e1c1a" transparent="1" zPosition="10" scrollbarMode="showOnDemand" />
+
                        <widget source="Address" render="Label" position="265,70" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
                        <widget source="ESSID" render="Label" position="265,100" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
                        <widget source="Protocol" render="Label" position="265,130" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
-                       <widget source="Frequency" render="Label" position="265,160" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
-                       <widget source="Encryption key" render="Label" position="265,190" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
+                       <widget source="Frequency" render="Label" position="265,160" zPosition="1" size="240,40" font="Regular;18" halign="center" valign="center" />
+                       <widget source="Encryption key" render="Label" position="265,200" zPosition="1" size="240,30" font="Regular;18" halign="center" valign="center" />
                        <widget source="BitRate" render="Label" position="265,220" zPosition="1" size="240,60" font="Regular;18" halign="center" valign="center" />
-                       </screen>"""
+               </screen>
+               """
+       def __init__(self, session, iface):
                Screen.__init__(self,session)
                HelpableScreen.__init__(self)
                self.session = session
@@ -1560,28 +1487,15 @@ class NetworkAdapterTest(Screen):
                callback(self.apState)
                
 class Wlanstatus(Screen):
+       skin =  """
+               <screen position="center,center" size="510,400" title="Wireless Network Status..." >
+                       <widget source="status" render="Label" position="5,15" size="500,350" font="Regular;18" zPosition="1" />
+
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="185,360" size="140,40" alphatest="on" />
+                       <widget source="key_red" render="Label" position="185,360" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+               </screen>
+               """
        def __init__(self, session,iface):
-               if session.desktop.size().width() > 720:
-                       self.skin = """
-                       <screen name="Wlanstatus" position="209,48" size="865,623" title="Wireless Network Configuration..." flags="wfNoBorder" backgroundColor="transparent">
-                               <ePixmap pixmap="Vu_HD/Bg_EPG_view.png" zPosition="-1" position="0,0" size="865,623" alphatest="on" />
-                               <ePixmap pixmap="Vu_HD/menu/ico_title_Setup.png" position="32,41" size="40,40" alphatest="blend"  transparent="1" />
-                               <eLabel text="Wireless Network Status..." position="90,50" size="600,32" font="Semiboldit;32" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
-                               <ePixmap pixmap="Vu_HD/icons/clock.png" position="750,55" zPosition="1" size="20,20" alphatest="blend" />
-                               <widget source="global.CurrentTime" render="Label" position="770,57" zPosition="1" size="50,20" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" halign="right" transparent="1">
-                                       <convert type="ClockToText">Format:%H:%M</convert>
-                               </widget>
-                               <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
-                               <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
-                               <widget source="status" render="Label" position="110,200" size="650,400" transparent="1" font="Regular;20" foregroundColor="#1c1c1c" backgroundColor="#27d9dee2" zPosition="1" />
-                       </screen>"""
-               else:
-                       self.skin =  """
-                       <screen name="Wlanstatus" position="center,center" size="400,350" title="Wireless Network Status..." >
-                               <ePixmap pixmap="750S/buttons/red.png" position="0,300" size="140,40" alphatest="on" />
-                               <widget source="key_red" render="Label" position="20,300" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-                               <widget source="status" render="Label" position="10,10" size="380,290" font="Regular;20" zPosition="1" />
-                       </screen>"""
                Screen.__init__(self,session)
                self.session = session
                self.iface = iface