convert About screen to source/renderer system. Change names a bit, add enigma versio...

[enigma2.git] / lib / python / Screens / About.py

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 5bd5f273ed6d53464f0d6330052028d401718002..03fbd1061fb420ebc0b013772fe1a225e6d7f74e 100644 (file)
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -1,35 +1,46 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
-from Components.Label import Label
+from Components.Sources.StaticText import StaticText
+from Components.Sources.Source import ObsoleteSource
 from Components.Harddisk import Harddisk
 from Components.NimManager import nimmanager
-from Components.MenuList import MenuList
 from Components.About import about
 
+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("Enigma: " + 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"] = StaticText(fp_version)
+
                nims = nimmanager.nimList()
-               count = 0
-               for i in nims:
-                       self["tuner" + str(count)] = Label(i[0])
-                       count += 1
+               for count in range(4):
+                       if count < len(nims):
+                               self["Tuner" + str(count)] = StaticText(nims[count])
+                       else:
+                               self["Tuner" + str(count)] = StaticText("")
 
-               self["hdd"] = Label(_("Detected HDD:"))
+               self["HDDHeader"] = StaticText(_("Detected HDD:"))
                hdd = Harddisk(0)
                if hdd.model() != "":
-                       self["hddA"] = Label(_("%s (%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
+                       self["hddA"] = StaticText(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
                else:                   
-                       self["hddA"] = Label(_("none"))
+                       self["hddA"] = StaticText(_("none"))
 
                self["actions"] = ActionMap(["SetupActions"], 
                        {
                                "cancel": self.close,
                                "ok": self.close,
                        })
-       
\ No newline at end of file