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

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 8270210..a274010 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -1,9 +1,8 @@
 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.MenuList import MenuList
 from Components.About import about
 
 from Tools.DreamboxHardware import getFPVersion
@@ -11,35 +10,36 @@ 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("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"] = Label(fp_version)
-		
+
+		self["FPVersion"] = StaticText(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])
+		for count in (0, 1, 2, 3):
+			if count < len(nims):
+				self["Tuner" + str(count)] = StaticText(nims[count])
 			else:
-				self["tuner" + str(count)] = Label("")
+				self["Tuner" + str(count)] = StaticText("")
 
-		self["hdd"] = Label(_("Detected HDD:"))
-		hdd = Harddisk(0)
-		if hdd.model() != "":
-			self["hddA"] = Label(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
-		else:			
-			self["hddA"] = Label(_("none"))
+		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,