Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...

diff --git a/lib/python/Plugins/Extensions/WebBrowser/plugin.py b/lib/python/Plugins/Extensions/WebBrowser/plugin.py
index 7626007..344f698 100644 (file)
--- a/lib/python/Plugins/Extensions/WebBrowser/plugin.py
+++ b/lib/python/Plugins/Extensions/WebBrowser/plugin.py
@@ -33,7 +33,7 @@ from Screens.MessageBox import MessageBox
 from Screens.DefaultWizard import DefaultWizard
 from Screens.InfoBarGenerics import InfoBarNotifications
 
-from enigma import eTimer, eServiceReference, iPlayableService, fbClass, eRCInput, eConsoleAppContainer
+from enigma import eTimer, eServiceReference, iPlayableService, fbClass, eRCInput, eConsoleAppContainer, getDesktop
 
 HTTPConnection.debuglevel = 1
 
@@ -88,8 +88,10 @@ def wb_islock():
        return lock
 
 class VuPlayer(Screen, InfoBarNotifications):
+       size = getDesktop(0).size()
+       position_params = size.width() > 750 and (620) or (480)
        skin =  """
-               <screen name="VuPlayer" flags="wfNoBorder" position="center,620" size="455,53" title="VuPlayer" backgroundColor="transparent">
+               <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" />
 
@@ -105,7 +107,8 @@ class VuPlayer(Screen, InfoBarNotifications):
                                <convert type="ServicePosition">Length</convert>
                        </widget>
                </screen>
-               """
+               """ % position_params
+
        PLAYER_IDLE     = 0
        PLAYER_PLAYING  = 1
        PLAYER_PAUSED   = 2
@@ -404,8 +407,10 @@ 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="309,498" title="Web Browser">
+               <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" />
 
@@ -413,10 +418,10 @@ class BrowserLauncher(ConfigListScreen, Screen):
                        <widget source="key_green" render="Label" position="180,0" zPosition="1" size="125,30" font="Regular;20" halign="center" valign="center" transparent="1" />
 
                        <widget name="config" position="0,50" size="309,100" scrollbarMode="showOnDemand" />
-                       <ePixmap pixmap="Vu_HD/rc_wb_desc.png" position="0,150" size="309,296" alphatest="on" />
-                       <widget name="info" position="0,455" size="309,50" font="Regular;18" halign="center" foregroundColor="blue" transparent="1" />
+                       <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" />
                </screen>
-               """
+               """ % position_params
 
        def __init__(self, session): 
                Screen.__init__(self, session)

diff --git a/lib/python/Plugins/SystemPlugins/Blindscan/plugin.py b/lib/python/Plugins/SystemPlugins/Blindscan/plugin.py
index 8c515c6..93966bc 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Blindscan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Blindscan/plugin.py
@@ -16,11 +16,13 @@ from Components.config import config, ConfigSubsection, ConfigSelection, ConfigY
 from Tools.HardwareInfo import HardwareInfo
 from Tools.Directories import resolveFilename, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITION
 
-from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, eDVBFrontendParametersCable, eConsoleAppContainer, eDVBResourceManager
+from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, eDVBFrontendParametersCable, eConsoleAppContainer, eDVBResourceManager, getDesktop
 
 class Blindscan(ConfigListScreen, Screen):
-       skin="""
-               <screen name="Blindscan" position="center,center" size="560,370" title="Blindscan">
+       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" />
@@ -32,7 +34,8 @@ class Blindscan(ConfigListScreen, Screen):
                        <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" />
                </screen>
-               """
+               """ % position_params
+
        def __init__(self, session): 
                Screen.__init__(self, session)
 

diff --git a/lib/python/Plugins/SystemPlugins/CrashReport/plugin.py b/lib/python/Plugins/SystemPlugins/CrashReport/plugin.py
index d39d715..1a43319 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/CrashReport/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/CrashReport/plugin.py
@@ -15,7 +15,7 @@ from Screens.VirtualKeyBoard import VirtualKeyBoard
 from Screens.ChoiceBox import ChoiceBox
 from Screens.MessageBox import MessageBox
 
-from enigma import ePoint, eConsoleAppContainer
+from enigma import ePoint, eConsoleAppContainer, getDesktop
 
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 
@@ -79,7 +79,8 @@ def loadConfig():
                g_default_machineinfo = False
 
 class CrashlogReportConfiguration(Screen, ConfigListScreen):
-       skin =  """
+       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" />
@@ -100,6 +101,23 @@ class CrashlogReportConfiguration(Screen, ConfigListScreen):
                        <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" />
+                       <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" />
+               </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

diff --git a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
index 14b5087..87ecedf 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
@@ -1,6 +1,6 @@
 import os, fcntl, thread
 
-from enigma import eTimer
+from enigma import eTimer, getDesktop
 
 from urllib import urlretrieve
 import urllib
@@ -122,14 +122,17 @@ 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">
                        <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 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"/>
                </screen>
-               """
+               """ % position_params
+
        def __init__(self, session, parent, timeout = 20):
                Screen.__init__(self,session)
                self.session = session
@@ -208,8 +211,10 @@ 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,center" size="560,440" title="FPGA Upgrade" >
+               <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" />
@@ -221,7 +226,7 @@ class FPGAUpgrade(Screen):
                        <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" />
                 </screen>
-               """
+               """ % position_params 
 
        def __init__(self, session): 
                Screen.__init__(self, session)

diff --git a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
index 0181fac..f506ee6 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
@@ -16,7 +16,7 @@ from Components.Slider import Slider
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 
-from enigma import ePoint, eConsoleAppContainer, eTimer
+from enigma import ePoint, eConsoleAppContainer, eTimer, getDesktop
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 
 fwlist = None
@@ -210,6 +210,7 @@ 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"/>
@@ -218,6 +219,17 @@ class UpgradeStatus(Screen):
                        <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">
+                       <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"/>
+               </screen>
+               """ % position_params
 
        def __init__(self, session, parent, firmware, datafile, device):
                Screen.__init__(self,session)