X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c7cd66f2d4bc83faeaa8a94752330038a4672c4..29595f9e351b8d7b4f77b0a9885209d45929d2b1:/lib/python/Components/TimerList.py

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index bdc749e4..2f60fcfb 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -43,7 +43,7 @@ def TimerEntryComponent(timer, processed):
 					count += 1
 				flags = flags >> 1
 		if timer.justplay:
-			res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ((" %s "+ _("(ZAP)")) % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
+			res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ((" %s "+ _("(ZAP)")) % (FuzzyTime(timer.begin)[1]))))
 		else:
 			res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 400, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ((" %s ... %s (%d " + _("mins") + ")") % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1], (timer.end - timer.begin) / 60))))
 	else:
@@ -75,7 +75,7 @@ def TimerEntryComponent(timer, processed):
 	
 	return res
 
-class TimerList(HTMLComponent, GUIComponent):
+class TimerList(HTMLComponent, GUIComponent, object):
 	def __init__(self, list):
 		GUIComponent.__init__(self)
 		self.l = eListboxPythonMultiContent()
@@ -86,10 +86,11 @@ class TimerList(HTMLComponent, GUIComponent):
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
 	
-	def GUIcreate(self, parent):
-		self.instance = eListbox(parent)
-		self.instance.setContent(self.l)
-		self.instance.setItemHeight(70)
+	GUI_WIDGET = eListbox
+	
+	def postWidgetCreate(self, instance):
+		instance.setContent(self.l)
+		instance.setItemHeight(70)
 
 	def moveToIndex(self, index):
 		self.instance.moveSelectionTo(index)
@@ -97,13 +98,11 @@ class TimerList(HTMLComponent, GUIComponent):
 	def getCurrentIndex(self):
 		return self.instance.getCurrentIndex()
 
+	currentIndex = property(moveToIndex, getCurrentIndex)
+	currentSelection = property(getCurrent)
+
 	def moveDown(self):
 		self.instance.moveSelection(self.instance.moveDown)
 
-	def GUIdelete(self):
-		self.instance.setContent(None)
-		self.instance = None
-
 	def invalidate(self):
 		self.l.invalidate()
-