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

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 03fbd10..c1104da 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
 
@@ -11,8 +10,10 @@ from Tools.DreamboxHardware import getFPVersion
 class About(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
+		self["NetworkHeader"] = StaticText(_("Network:"))
+		self["Network"] = StaticText(about.getNetworkInfo())
 
-		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 +27,47 @@ class About(Screen):
 		self["FPVersion"] = StaticText(fp_version)
 
 		nims = nimmanager.nimList()
-		for count in range(4):
-			if count < len(nims):
-				self["Tuner" + str(count)] = StaticText(nims[count])
-			else:
-				self["Tuner" + str(count)] = StaticText("")
+		if len(nims) <= 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("")
+		else:
+			desc_list = []
+			count = 0
+			cur_idx = -1
+			while count < len(nims):
+				data = nims[count].split(":")
+				idx = data[0].strip('Tuner').strip()
+				desc = data[1].strip()
+				if desc_list and desc_list[cur_idx]['desc'] == desc:
+					desc_list[cur_idx]['end'] = idx
+				else:
+					desc_list.append({'desc' : desc, 'start' : idx, 'end' : idx})
+					cur_idx += 1
+				count += 1
+
+			for count in (0, 1, 2, 3):
+				if count < len(desc_list):
+					if desc_list[count]['start'] == desc_list[count]['end']:
+						text = "Tuner %s: %s" % (desc_list[count]['start'], desc_list[count]['desc'])
+					else:
+						text = "Tuner %s-%s: %s" % (desc_list[count]['start'], desc_list[count]['end'], desc_list[count]['desc'])
+				else:
+					text = ""
+
+				self["Tuner" + str(count)] = StaticText(text)
 
 		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,