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

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 03fbd10..a274010 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -1,8 +1,7 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Sources.StaticText import StaticText
-from Components.Sources.Source import ObsoleteSource
-from Components.Harddisk import Harddisk
+from Components.Harddisk import harddiskmanager
 from Components.NimManager import nimmanager
 from Components.About import about
 
@@ -12,7 +11,7 @@ class About(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
-		self["EnigmaVersion"] = StaticText("Enigma: " + about.getEnigmaVersionString())
+		self["EnigmaVersion"] = StaticText("Version: " + about.getEnigmaVersionString())
 		self["ImageVersion"] = StaticText("Image: " + about.getImageVersionString())
 
 		self["TunerHeader"] = StaticText(_("Detected NIMs:"))
@@ -26,20 +25,21 @@ class About(Screen):
 		self["FPVersion"] = StaticText(fp_version)
 
 		nims = nimmanager.nimList()
-		for count in range(4):
+		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["HDDHeader"] = StaticText(_("Detected HDD:"))
-		hdd = Harddisk(0)
-		if hdd.model() != "":
+		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:			
+		else:
 			self["hddA"] = StaticText(_("none"))
 
-		self["actions"] = ActionMap(["SetupActions"], 
+		self["actions"] = ActionMap(["SetupActions", "ColorActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.close,