X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FAbout.py;h=6b322c9d560b0ab6b142dd83bf561841c263cb88;hb=99e6ea49ff22e993eecce31af689da1b3b85157c;hp=2aa3f50c67058640cfb2efa98ab2fc1bb0b99f73;hpb=9baa414aa72dc31177f9b0fe80b80b42f7e4de82;p=vuplus_dvbapp

diff --git a/lib/python/Components/About.py b/lib/python/Components/About.py
old mode 100644
new mode 100755
index 2aa3f50..6b322c9
--- a/lib/python/Components/About.py
+++ b/lib/python/Components/About.py
@@ -1,10 +1,15 @@
 from Tools.Directories import resolveFilename, SCOPE_SYSETC
+from enigma import getEnigmaVersionString
+from os import popen
 
 class About:
 	def __init__(self):
 		pass
-	
+
 	def getVersionString(self):
+		return self.getImageVersionString()
+
+	def getImageVersionString(self):
 		try:
 			file = open(resolveFilename(SCOPE_SYSETC, 'image-version'), 'r')
 			lines = file.readlines()
@@ -15,15 +20,38 @@ class About:
 					#0120 2005 11 29 01 16
 					#0123 4567 89 01 23 45
 					version = splitted[1]
+					image_type = version[0] # 0 = release, 1 = experimental
+					major = version[1]
+					minor = version[2]
+					revision = version[3]
 					year = version[4:8]
 					month = version[8:10]
 					day = version[10:12]
-					
-					return '-'.join(["dev", year, month, day])
+					date = '-'.join((year, month, day))
+					if image_type == '0':
+						image_type = "Release"
+						version = '.'.join((major, minor, revision))
+						return ' '.join((image_type, version, date))
+					else:
+						image_type = "Experimental"
+						return ' '.join((image_type, date))
 			file.close()
 		except IOError:
 			pass
 
 		return "unavailable"
-	
+
+	def getEnigmaVersionString(self):
+		return getEnigmaVersionString()
+
+	def getKernelVersionString(self):
+		try:
+			result = popen("uname -r","r").read().strip("\n").split('-')
+			kernel_version = result[0]
+			return kernel_version
+		except:
+			pass
+
+		return "unknown"
+
 about = About()