diff --git a/lib/python/Plugins/SystemPlugins/ViX/BackupManager.py b/lib/python/Plugins/SystemPlugins/ViX/BackupManager.py index bd5540665e3..2d87b5e4923 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/BackupManager.py +++ b/lib/python/Plugins/SystemPlugins/ViX/BackupManager.py @@ -139,12 +139,7 @@ def BackupManagerautostart(reason, session=None, **kwargs): class VIXBackupManager(Screen): skin = [""" - - - - - - + @@ -155,12 +150,6 @@ class VIXBackupManager(Screen): """, 560, 400, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, 0, 45, 35, 25, # menu key 40, 45, 35, 25, # info key 0, 50, 560, 50, 18, # lab1 @@ -760,21 +749,10 @@ def Stage6(self, result=None, retval=None, extra_args=None): class BackupSelection(Screen): skin = [""" - - - - - - + """, 560, 400, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, 5, 50, 550, 250, 25, 19, ] # noqa: E124 @@ -862,17 +840,10 @@ def closeRecursive(self): class XtraPluginsSelection(Screen): skin = [""" - - - - + """, 560, 400, # screen - 0, 0, 140, 40, # red - 140, 0, 140, 40, # green - 0, 0, 140, 40, 20, # red - 140, 0, 140, 40, 20, # green 5, 50, 550, 250, 25, 19, ] # noqa: E124 diff --git a/lib/python/Plugins/SystemPlugins/ViX/IPKInstaller.py b/lib/python/Plugins/SystemPlugins/ViX/IPKInstaller.py index a57f3b732b1..a767a19c7e7 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/IPKInstaller.py +++ b/lib/python/Plugins/SystemPlugins/ViX/IPKInstaller.py @@ -18,12 +18,7 @@ class VIXIPKInstaller(Screen): skin = [""" - - - - - - + @@ -31,12 +26,6 @@ class VIXIPKInstaller(Screen): """, 560, 400, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, 0, 50, 560, 50, 18, # lab1 10, 105, 540, 260, 20, # list 26, @@ -165,27 +154,12 @@ def myclose(self): class IpkgInstaller(Screen): skin = [""" - - - - - - - - + """, 560, 450, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 420, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, - 420, 0, 140, 40, 20, 5, 50, 540, 360, 20, # list 0, 410, 560, 2, 5, 420, 550, 30, 22, diff --git a/lib/python/Plugins/SystemPlugins/ViX/ImageManager.py b/lib/python/Plugins/SystemPlugins/ViX/ImageManager.py index c1f14e77cb1..020ff6645c7 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/ImageManager.py +++ b/lib/python/Plugins/SystemPlugins/ViX/ImageManager.py @@ -134,14 +134,7 @@ class tmp: class VIXImageManager(Screen): skin = [""" - - - - - - - - + @@ -151,14 +144,6 @@ class VIXImageManager(Screen): """, 560, 400, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 420, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, - 420, 0, 140, 40, 20, 0, 45, 35, 25, # menu key 0, 50, 560, 50, 18, # lab1 10, 105, 540, 260, 20, # list @@ -873,14 +858,7 @@ def doBackup(self, answer): class ImageBackup(Screen): skin = [""" - - - - - - - - + @@ -888,14 +866,6 @@ class ImageBackup(Screen): """, 560, 400, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 420, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, - 420, 0, 140, 40, 20, 0, 50, 560, 50, 18, # lab1 10, 105, 540, 260, 20, # list 26, @@ -1569,14 +1539,6 @@ def BackupComplete(self, answer=None): class ImageManagerDownload(Screen): skin = [""" - - - - - - - - @@ -1584,14 +1546,6 @@ class ImageManagerDownload(Screen): """, 560, 400, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 420, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, - 420, 0, 140, 40, 20, 0, 50, 560, 50, 18, # lab1 10, 105, 540, 260, 20, # list 26, diff --git a/lib/python/Plugins/SystemPlugins/ViX/MountManager.py b/lib/python/Plugins/SystemPlugins/ViX/MountManager.py index 9006fe4364a..b477a5d5bfa 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/MountManager.py +++ b/lib/python/Plugins/SystemPlugins/ViX/MountManager.py @@ -200,14 +200,7 @@ class VIXDevicesPanel(Screen): - - - - - - - - + """, 560, 495, # screen 10, 50, 540, 400, # Listbox @@ -217,14 +210,6 @@ class VIXDevicesPanel(Screen): 24, 20, # fonts 80, 10, 10, 540, 425, 25, - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 420, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, - 420, 0, 140, 40, 20, ] # noqa: E124 def __init__(self, session): @@ -362,18 +347,11 @@ def addFstab(self, result=None, retval=None, extra_args=None): class DeviceMountSetup(Screen, ConfigListScreen): skin = [""" - - - - + """, 560, 450, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, 0, 50, 560, 275, 26, 20, # config 0, 365, 560, 20, 18, ] # noqa: E124 diff --git a/lib/python/Plugins/SystemPlugins/ViX/PackageManager.py b/lib/python/Plugins/SystemPlugins/ViX/PackageManager.py index a276b7adfb4..746e3c8cebd 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/PackageManager.py +++ b/lib/python/Plugins/SystemPlugins/ViX/PackageManager.py @@ -24,10 +24,7 @@ def __init__(self, session, parent): class PackageManager(Screen): skin = [""" - - - - + {"template": [ @@ -42,16 +39,12 @@ class PackageManager(Screen): """, - 530, 420, # Screen - 0, 0, 140, 40, # colours - 140, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 5, 50, 520, 365, # list - 5, 1, 440, 28, # template - 5, 26, 440, 20, - 445, 2, 48, 48, - 5, 50, 510, 2, + 560, 420, # Screen + 5, 50, 550, 365, # list + 5, 1, 470, 28, # template + 5, 26, 470, 20, + 475, 2, 48, 48, + 5, 50, 540, 2, 22, 14, # font 52, # itemHeight ] diff --git a/lib/python/Plugins/SystemPlugins/ViX/SoftcamManager.py b/lib/python/Plugins/SystemPlugins/ViX/SoftcamManager.py index dc78b2a36e2..30bcf119716 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/SoftcamManager.py +++ b/lib/python/Plugins/SystemPlugins/ViX/SoftcamManager.py @@ -79,14 +79,7 @@ def spinnerSkin(skinName): class VIXSoftcamManager(Screen): skin = [""" - - - - - - - - + @@ -98,14 +91,6 @@ class VIXSoftcamManager(Screen): """, 560, 400, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 420, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, - 420, 0, 140, 40, 20, 0, 45, 35, 25, # menu key 40, 45, 35, 25, # info key 40, 110, 170, 20, 22, # lab1 diff --git a/lib/python/Plugins/SystemPlugins/ViX/SwapManager.py b/lib/python/Plugins/SystemPlugins/ViX/SwapManager.py index 1f5a2d21917..bded79762c7 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/SwapManager.py +++ b/lib/python/Plugins/SystemPlugins/ViX/SwapManager.py @@ -87,14 +87,7 @@ def startSwap2(self, result=None, retval=None, extra_args=None): # lets find sw class VIXSwap(Screen): skin = [""" - - - - - - - - + @@ -107,14 +100,6 @@ class VIXSwap(Screen): """, 560, 250, # screen - 0, 0, 140, 40, # colors - 140, 0, 140, 40, - 280, 0, 140, 40, - 420, 0, 140, 40, - 0, 0, 140, 40, 20, - 140, 0, 140, 40, 20, - 280, 0, 140, 40, 20, - 420, 0, 140, 40, 20, 10, 50, 32, 32, # lock off 10, 50, 32, 32, # lock on 50, 50, 360, 30, 20, diff --git a/lib/python/Plugins/SystemPlugins/ViX/ui.py b/lib/python/Plugins/SystemPlugins/ViX/ui.py index f7cee81dcd1..15ef978c7e9 100644 --- a/lib/python/Plugins/SystemPlugins/ViX/ui.py +++ b/lib/python/Plugins/SystemPlugins/ViX/ui.py @@ -10,8 +10,7 @@ class VIXMenu(Screen, ProtectedScreen): skin = [""" - - + {"template": [ @@ -35,8 +34,6 @@ class VIXMenu(Screen, ProtectedScreen): """, 610, 410, # screen - 0, 0, 140, 40, # key red image - 0, 0, 140, 40, 20, # key red text 15, 60, 330, 286, # first menu Listbox 2, 0, 330, 26, # template one 22, # fonts