[ScanSetup] Fix error on complete scan with T2 tuners.

[vuplus_dvbapp] / lib / python / Screens / About.py

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 7e93aa0..a274010 100644 (file)
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -1,9 +1,8 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
-from Components.Label import Label
-from Components.Harddisk import Harddisk
+from Components.Sources.StaticText import StaticText
+from Components.Harddisk import harddiskmanager
 from Components.NimManager import nimmanager
-from Components.MenuList import MenuList
 from Components.About import about
 
 from Tools.DreamboxHardware import getFPVersion
@@ -11,33 +10,36 @@ from Tools.DreamboxHardware import getFPVersion
 class About(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
-               
-               self["text"] = Label("Enigma v" + about.getVersionString())
 
-               self["tuner"] = Label(_("Detected NIMs:"))
+               self["EnigmaVersion"] = StaticText("Version: " + about.getEnigmaVersionString())
+               self["ImageVersion"] = StaticText("Image: " + about.getImageVersionString())
+
+               self["TunerHeader"] = StaticText(_("Detected NIMs:"))
 
                fp_version = getFPVersion()
                if fp_version is None:
                        fp_version = ""
                else:
                        fp_version = _("Frontprocessor version: %d") % fp_version
-               
-               self["fpVersion"] = Label(fp_version)
-               
+
+               self["FPVersion"] = StaticText(fp_version)
+
                nims = nimmanager.nimList()
-               count = 0
-               for i in nims:
-                       self["tuner" + str(count)] = Label(i[0])
-                       count += 1
-
-               self["hdd"] = Label(_("Detected HDD:"))
-               hdd = Harddisk(0)
-               if hdd.model() != "":
-                       self["hddA"] = Label(_("%s (%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
-               else:                   
-                       self["hddA"] = Label(_("none"))
-
-               self["actions"] = ActionMap(["SetupActions"], 
+               for count in (0, 1, 2, 3):
+                       if count < len(nims):
+                               self["Tuner" + str(count)] = StaticText(nims[count])
+                       else:
+                               self["Tuner" + str(count)] = StaticText("")
+
+               self["HDDHeader"] = StaticText(_("Detected HDD:"))
+               hddlist = harddiskmanager.HDDList()
+               hdd = hddlist and hddlist[0][1] or None
+               if hdd is not None and hdd.model() != "":
+                       self["hddA"] = StaticText(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
+               else:
+                       self["hddA"] = StaticText(_("none"))
+
+               self["actions"] = ActionMap(["SetupActions", "ColorActions"], 
                        {
                                "cancel": self.close,
                                "ok": self.close,