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

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index f6b14138..8270210a 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -2,25 +2,45 @@ from Screen import Screen
 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.0a")
+		self["text"] = Label("Enigma v" + about.getVersionString())
 
-		self["tuner"] = Label("Detected NIMs:")
-		self["tunerA"] = Label("   Tuner A: Fujitsu QST (DVB-S)")
-		self["tunerB"] = Label("   Tuner B: Fujitsu QST (DVB-S)")
+		self["tuner"] = Label(_("Detected NIMs:"))
 
-		self["hdd"] = Label("Detected HDD:")
+		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()
+		for count in range(2):
+			print "count:", nimmanager.nimCount
+			if count < nimmanager.nimCount:
+				self["tuner" + str(count)] = Label(nims[count][0])
+			else:
+				self["tuner" + str(count)] = Label("")
+
+		self["hdd"] = Label(_("Detected HDD:"))
 		hdd = Harddisk(0)
-		self["hddA"] = Label("%s (%s, %d MB free)" % (hdd.model(), hdd.capacity(),hdd.free()))
+		if hdd.model() != "":
+			self["hddA"] = Label(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
+		else:			
+			self["hddA"] = Label(_("none"))
 
 		self["actions"] = ActionMap(["SetupActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.close,
 			})
-	
\ No newline at end of file