From 630294d38cb3cab784ecc1102804394974b162b0 Mon Sep 17 00:00:00 2001 From: kos Date: Fri, 20 Jan 2012 12:38:09 +0900 Subject: [PATCH] fix ui of plugins on 750s. - webbrowser - blindscan - fpgaupgrade - firmwareupgrade - crashreport --- lib/python/Plugins/Extensions/WebBrowser/plugin.py | 19 ++++++++++++------- .../Plugins/SystemPlugins/Blindscan/plugin.py | 11 +++++++---- .../Plugins/SystemPlugins/CrashReport/plugin.py | 22 ++++++++++++++++++++-- .../Plugins/SystemPlugins/FPGAUpgrade/plugin.py | 17 +++++++++++------ .../SystemPlugins/FirmwareUpgrade/plugin.py | 14 +++++++++++++- 5 files changed, 63 insertions(+), 20 deletions(-) diff --git a/lib/python/Plugins/Extensions/WebBrowser/plugin.py b/lib/python/Plugins/Extensions/WebBrowser/plugin.py index 7626007..344f698 100644 --- 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 = """ - + @@ -105,7 +107,8 @@ class VuPlayer(Screen, InfoBarNotifications): Length - """ + """ % 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= """ - + @@ -413,10 +418,10 @@ class BrowserLauncher(ConfigListScreen, 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 --- 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=""" - + size = getDesktop(0).size() + position_params = size.width() > 750 and ('center') or ('140') + skin = """ + @@ -32,7 +34,8 @@ class Blindscan(ConfigListScreen, 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 --- 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"] = """ @@ -100,6 +101,23 @@ class CrashlogReportConfiguration(Screen, ConfigListScreen): """ + skin_list["sd"] = """ + + + + + + + + + + + + """ + + 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 --- 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 = """ - - + + - """ + """ % 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 = """ - + @@ -221,7 +226,7 @@ class FPGAUpgrade(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 --- 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 = """ @@ -218,6 +219,17 @@ class UpgradeStatus(Screen): """ + ''' + size = getDesktop(0).size() + position_params = size.width() > 750 and (' ') or ('backgroundColor=\"blue\"') + skin = """ + + + + + + + """ % position_params def __init__(self, session, parent, firmware, datafile, device): Screen.__init__(self,session) -- 2.7.4