From ca8fa63112d8d41af3c496b4bb8dfeebb0547177 Mon Sep 17 00:00:00 2001 From: hschang Date: Tue, 19 Feb 2013 18:30:38 +0900 Subject: [PATCH] fix default skins for SD skins. fix Vuplusi Authenticity to support latest SN. --- .../Plugins/Extensions/VuplusEvent/plugin.py | 22 +++++++++-- .../Plugins/SystemPlugins/DeviceManager/plugin.py | 46 +++++++++++----------- lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py | 2 +- .../SystemPlugins/ManualFancontrol/plugin.py | 14 +++---- .../SystemPlugins/RemoteControlCode/plugin.py | 18 +++++---- .../SystemPlugins/TransCodingSetup/plugin.py | 14 +++---- .../Plugins/SystemPlugins/UI3DSetup/plugin.py | 12 +++--- .../SystemPlugins/WirelessAccessPoint/plugin.py | 2 +- .../SystemPlugins/ZappingModeSelection/plugin.py | 12 +++--- 9 files changed, 80 insertions(+), 62 deletions(-) mode change 100644 => 100755 lib/python/Plugins/SystemPlugins/ZappingModeSelection/plugin.py diff --git a/lib/python/Plugins/Extensions/VuplusEvent/plugin.py b/lib/python/Plugins/Extensions/VuplusEvent/plugin.py index 7b1d743..fa476ea 100755 --- a/lib/python/Plugins/Extensions/VuplusEvent/plugin.py +++ b/lib/python/Plugins/Extensions/VuplusEvent/plugin.py @@ -15,8 +15,9 @@ import urllib2 default_email_address = "Please input your E-mail address" config.plugins.vuplusauthenticity = ConfigSubsection() -config.plugins.vuplusauthenticity.sn_a = NoSave(ConfigSelection(default = "MSA", choices = [ ("MSA", _("MSA")), ("MA", _("MA")), ("MB", _("MB")), ("MC", _("MC")), ("MD", _("MD")), ("ME", _("ME")), ("MF", _("MF")), ("MG", _("MG")), ("MH", _("MH"))] )) -config.plugins.vuplusauthenticity.sn_b = NoSave(ConfigInteger(default = 0, limits = (1, 999999999))) +config.plugins.vuplusauthenticity.sn_a = NoSave(ConfigSelection(default = "MSA", choices = [ ("MSA", _("MSA")), ("MA", _("MA")), ("MB", _("MB")), ("MC", _("MC")), ("C", _("C")), ("D", _("D")), ("E", _("E")), ("F", _("F")), ("G", _("G"))] )) +config.plugins.vuplusauthenticity.sn_b = NoSave(ConfigInteger(default = 0, limits = (1, 9999999999))) +config.plugins.vuplusauthenticity.sn_b_mx = NoSave(ConfigInteger(default = 0, limits = (1, 999999999))) config.plugins.vuplusauthenticity.sn_b_msa = NoSave(ConfigInteger(default = 0, limits = (1, 9999999))) config.plugins.vuplusauthenticity.email = NoSave(ConfigText(default = default_email_address, visible_width = 50, fixed_size = False)) @@ -81,6 +82,8 @@ class VuplusAuthenticity(Screen, ConfigListScreen): self.sn_aEntry = getConfigListEntry(_("1-1. Serial Number (The first two or three letters of SN)"), config.plugins.vuplusauthenticity.sn_a) if config.plugins.vuplusauthenticity.sn_a.value == "MSA": self.sn_bEntry = getConfigListEntry(_("1-2. Serial Number (The remaining numbers of SN)"), config.plugins.vuplusauthenticity.sn_b_msa) + elif config.plugins.vuplusauthenticity.sn_a.value in [ 'MA', 'MB', 'MC' ]: + self.sn_bEntry = getConfigListEntry(_("1-2. Serial Number (The remaining numbers of SN)"), config.plugins.vuplusauthenticity.sn_b_mx) else: self.sn_bEntry = getConfigListEntry(_("1-2. Serial Number (The remaining numbers of SN)"), config.plugins.vuplusauthenticity.sn_b) self.emailEntry = getConfigListEntry(_("2. Contact"), config.plugins.vuplusauthenticity.email) @@ -94,14 +97,22 @@ class VuplusAuthenticity(Screen, ConfigListScreen): if config.plugins.vuplusauthenticity.sn_a.value == 'MSA': sn_length = 7 sn = str(config.plugins.vuplusauthenticity.sn_b_msa.value) - else: + elif config.plugins.vuplusauthenticity.sn_a.value in [ 'MA', 'MB', 'MC' ]: sn_length = 9 + sn = str(config.plugins.vuplusauthenticity.sn_b_mx.value) + else: + sn_length = 10 sn = str(config.plugins.vuplusauthenticity.sn_b.value) if len(sn) > sn_length or sn == '0': return False else: while(len(sn) + - - - + + + - - - - - + + + + + {"templates": {"default": (54,[ - MultiContentEntryText(pos = (100, 0), size = (560, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0), # index 0 is vendor - model - MultiContentEntryText(pos = (100, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 1 is Device - MultiContentEntryText(pos = (230, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 2 is Size - MultiContentEntryText(pos = (360, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 3), # index 3 is Partitions - MultiContentEntryText(pos = (490, 32), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 4), # index 4 is Removable - MultiContentEntryPixmapAlphaTest(pos = (0, 52), size = (670, 2), png = 5), # png 5 is the div pixmap + MultiContentEntryText(pos = (50, 0), size = (510, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0), # index 0 is vendor - model + MultiContentEntryText(pos = (50, 32), size = (120, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 1 is Device + MultiContentEntryText(pos = (170, 32), size = (120, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 2 is Size + MultiContentEntryText(pos = (290, 32), size = (120, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 3), # index 3 is Partitions + MultiContentEntryText(pos = (410, 32), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 4), # index 4 is Removable + MultiContentEntryPixmapAlphaTest(pos = (0, 52), size = (590, 2), png = 5), # png 5 is the div pixmap ]), "partitions": (98, [ - MultiContentEntryText(pos = (100, 0), size = (560, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0), # index 1 is Partition - MultiContentEntryText(pos = (100, 32), size = (560, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 2 is Mounted on - MultiContentEntryText(pos = (100, 54), size = (560, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 3 UUID - MultiContentEntryText(pos = (100, 76), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 3), # index 4 Type - MultiContentEntryText(pos = (230, 76), size = (140, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 4), # index 5 Size_total - MultiContentEntryText(pos = (380, 76), size = (200, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 5), # index 6 Size_free - MultiContentEntryPixmapAlphaTest(pos = (0, 96), size = (670, 2), png = 6), # png 6 is the div pixmap + MultiContentEntryText(pos = (50, 0), size = (500, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 0), # index 1 is Partition + MultiContentEntryText(pos = (50, 32), size = (500, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 2 is Mounted on + MultiContentEntryText(pos = (50, 54), size = (500, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 3 UUID + MultiContentEntryText(pos = (50, 76), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 3), # index 4 Type + MultiContentEntryText(pos = (180, 76), size = (130, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 4), # index 5 Size_total + MultiContentEntryText(pos = (310, 76), size = (190, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 5), # index 6 Size_free + MultiContentEntryPixmapAlphaTest(pos = (0, 96), size = (590, 2), png = 6), # png 6 is the div pixmap ]), "mountpoint": (54,[ MultiContentEntryPixmapAlphaTest(pos = (10, 7), size = (30, 30), png = 0), # index 0: picture MultiContentEntryText(pos = (40, 0), size = (500, 30), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 1), # index 1 name MultiContentEntryText(pos = (40, 32), size = (500, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_CENTER, text = 2), # index 2 path - MultiContentEntryPixmapAlphaTest(pos = (0, 52), size = (670, 2), png = 5), # index 5 is the div pixmap + MultiContentEntryPixmapAlphaTest(pos = (0, 52), size = (590, 2), png = 5), # index 5 is the div pixmap ]) }, "fonts": [gFont("Regular", 22),gFont("Regular", 16),gFont("Regular", 28)], diff --git a/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py b/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py index df595b9..1151ec4 100755 --- a/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py +++ b/lib/python/Plugins/SystemPlugins/HDMICEC/plugin.py @@ -39,7 +39,7 @@ class HdmiCecPlugin(Screen,ConfigListScreen): - + """ def __init__(self, session): diff --git a/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py b/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py index 9715bcb..f2da601 100755 --- a/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py +++ b/lib/python/Plugins/SystemPlugins/ManualFancontrol/plugin.py @@ -11,15 +11,15 @@ from enigma import eTimer class ManualFancontrol(Screen,ConfigListScreen): skin = """ - - - + + + - - + + - - + + """ diff --git a/lib/python/Plugins/SystemPlugins/RemoteControlCode/plugin.py b/lib/python/Plugins/SystemPlugins/RemoteControlCode/plugin.py index ba1e2c6..19cc610 100755 --- a/lib/python/Plugins/SystemPlugins/RemoteControlCode/plugin.py +++ b/lib/python/Plugins/SystemPlugins/RemoteControlCode/plugin.py @@ -40,14 +40,14 @@ class RemoteControlCodeInit: class RemoteControlCode(Screen,ConfigListScreen,RemoteControlCodeInit): skin = """ - - - + + + - - + + - + """ @@ -158,7 +158,11 @@ self["list"].instance.resize(eSize(*listsize)) # center window newwidth = wsize[0] newheight = wsize[1] -self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (orgheight - newheight)/2)) +window_posx = orgpos.x() + (orgwidth - newwidth)/2 +window_posy = orgpos.y() + (orgheight - newheight)/2 +if (150 > window_posy): + window_posy = 150 +self.instance.move(ePoint(window_posx, window_posy)) """ diff --git a/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py b/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py index b07f35f..7bb47a4 100755 --- a/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py @@ -130,13 +130,13 @@ class TranscodingSetupInit: class TranscodingSetup(Screen,ConfigListScreen, TranscodingSetupInit): skin = """ - - - - - - - + + + + + + + """ diff --git a/lib/python/Plugins/SystemPlugins/UI3DSetup/plugin.py b/lib/python/Plugins/SystemPlugins/UI3DSetup/plugin.py index d5ce741..f315cee 100755 --- a/lib/python/Plugins/SystemPlugins/UI3DSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/UI3DSetup/plugin.py @@ -13,14 +13,14 @@ config.plugins.UI3DSetup.setmode = ConfigSelection(choices = setmodelist, defaul class UI3DSetupScreen(Screen, ConfigListScreen): skin = """ - - - + + + - - + + - + """ diff --git a/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py index 1416e31..9da5d2e 100755 --- a/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py +++ b/lib/python/Plugins/SystemPlugins/WirelessAccessPoint/plugin.py @@ -76,7 +76,7 @@ class WirelessAccessPoint(Screen,ConfigListScreen): - + diff --git a/lib/python/Plugins/SystemPlugins/ZappingModeSelection/plugin.py b/lib/python/Plugins/SystemPlugins/ZappingModeSelection/plugin.py old mode 100644 new mode 100755 index b0fee9b..ad25c29 --- a/lib/python/Plugins/SystemPlugins/ZappingModeSelection/plugin.py +++ b/lib/python/Plugins/SystemPlugins/ZappingModeSelection/plugin.py @@ -25,12 +25,12 @@ class ZappingModeSelectionInit: class ZappingModeSelection(Screen,ConfigListScreen,ZappingModeSelectionInit): skin = """ - - - - - - + + + + + + """ -- 2.7.4