X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FAbout.py;h=a2740101114fb30f6401061caf0a423d1fafb04f;hp=2e32e7d70d0a61db25fb599ffdc3f23988008950;hb=bd1476c4800f2d3d9025db14fcb8fc168d87006a;hpb=cdeb634affac7c3083937825bbf2c89cd11e84f9

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 2e32e7d..a274010 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -1,26 +1,46 @@
 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.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["tunerA"] = Label("   Tuner A: Alps BSBE1 (DVB-S)")
-		self["tunerB"] = Label("   Tuner B: Alps BSBE1 (DVB-S)")
+		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"] = StaticText(fp_version)
+
+		nims = nimmanager.nimList()
+		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["hdd"] = Label("Detected HDD:")
-		hdd = Harddisk(0)
-		#self["hddA"] = Label("%s (%s, %d MB free)" % (hdd.model(), hdd.capacity(),hdd.free()))
-		self["hddA"] = Label("Seagate 398 GByte (323 GByte free)")
+		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"], 
+		self["actions"] = ActionMap(["SetupActions", "ColorActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.close,
 			})
-	
\ No newline at end of file