X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2fcfe7e7703ce61ccb532939b6e2132b8423b7c3..a029953596adaed49a5b0346acd5a867eff91a57:/lib/python/Screens/About.py

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 2e267a07..2c7d98f5 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -3,26 +3,37 @@ from Components.ActionMap import ActionMap
 from Components.Label import Label
 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["text"] = Label("Enigma v" + about.getVersionString())
 
 		self["tuner"] = Label(_("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)
 		
 		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)] = Label(nims[count])
+			else:
+				self["tuner" + str(count)] = Label("")
 
 		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()))
+			self["hddA"] = Label(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
 		else:			
 			self["hddA"] = Label(_("none"))
 
@@ -31,4 +42,3 @@ class About(Screen):
 				"cancel": self.close,
 				"ok": self.close,
 			})
-	
\ No newline at end of file