X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8f01a41693ff4b01a224e9ea2f9a26538ec20414..d7ade1df1e1d8e0259378d783a38ae49e3271fd6:/lib/python/Screens/About.py

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 5359b26b..03fbd106 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -1,34 +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 v2.0b")
 
-		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