2 files changed, 14 insertions, 7 deletions
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 9ab58704..2e010ab6 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -1,7 +1,8 @@
 from HTMLComponent import *
 from GUIComponent import *
+from Tools.FuzzyDate import FuzzyTime
 
-from enigma import eListboxPythonMultiContent, eListbox, gFont
+from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation
 
 from enigma import eServiceReference, eServiceCenter, \
 	eServiceCenterPtr, iListableServicePtr, \
@@ -38,8 +39,17 @@ def MovieListEntry(serviceref, serviceHandler):
 		len = "?:??"
 	
 	res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
-	res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, "Toller Film"))
-	res.append((0, 50, 200, 20, 1, RT_HALIGN_LEFT, "Aufgenommen: irgendwann"))
+	
+	description = info.getInfoString(serviceref, iServiceInformation.sDescription)
+	begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
+	
+	begin_string = ""
+	if begin > 0:
+		t = FuzzyTime(begin)
+		begin_string = t[0] + ", " + t[1]
+	
+	res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, description))
+	res.append((0, 50, 200, 20, 1, RT_HALIGN_LEFT, begin_string))
 	res.append((200, 50, 200, 20, 1, RT_HALIGN_RIGHT, len))
 	
 	return res
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index b1e8bf45..f4176fad 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -26,9 +26,6 @@ RT_WRAP = 32
 def TimerEntryComponent(timer, processed):
 	res = [ timer ]
 	
-	print time.strftime("%c", time.localtime(timer.begin))
-	print time.strftime("%c", time.localtime(timer.end))
-		
 	res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
 	repeatedtext = ""
 	days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]
@@ -46,7 +43,7 @@ def TimerEntryComponent(timer, processed):
 	else:
 		res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
 
-	res.append((300, 0, 200, 20, 1, RT_HALIGN_RIGHT, timer.description))
+	res.append((300, 0, 200, 20, 1, RT_HALIGN_RIGHT, timer.name))
 	
 	if not processed:
 		if timer.state == TimerEntry.StateWait: