X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FAbout.py;h=328d98d92ee0cec885e56338170fe2de16e2ea6a;hp=2c7d98f539b4aa848fa202c72c37a9713069c842;hb=1d557af556c71a9c658deea9cec783a66903c136;hpb=67b53c1cb06988394c35a6e965c99b72b67fe1be

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 2c7d98f..328d98d 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -1,7 +1,7 @@
 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
 
@@ -10,34 +10,62 @@ 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(4):
-			if count < len(nims):
-				self["tuner" + str(count)] = Label(nims[count])
-			else:
-				self["tuner" + str(count)] = Label("")
-
-		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["actions"] = ActionMap(["SetupActions"], 
+		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:"))
+		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", "ColorActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.close,