don't use internals of other classes

[enigma2.git] / lib / python / Components / TimerList.py

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index 9ef7cc4b400e91924173154ed156e4d8026acbe6..078210bde63b9ddbccdbc4581047d9057cb4f4b6 100644 (file)
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -22,16 +22,18 @@ RT_WRAP = 32
 #  | <Service>     <Name of the Timer>  |
 #  | <start>                     <end>  |
 #
 #  | <Service>     <Name of the Timer>  |
 #  | <start>                     <end>  |
 #

-def TimerEntry(timer, processed):
+def TimerEntryComponent(timer, processed):

        res = [ timer ]
        
        res = [ timer ]
        

+

        res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
        res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, "%s, %s" % FuzzyTime(timer.begin)))
        res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
        res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, "%s, %s" % FuzzyTime(timer.begin)))

-       
+
+       res.append((300, 0, 200, 20, 1, RT_HALIGN_RIGHT, timer.description))    

        if processed:
        if processed:

-               res.append((200, 30, 200, 20, 1, RT_HALIGN_RIGHT, FuzzyTime(timer.end)[1]))
+               res.append((300, 30, 200, 20, 1, RT_HALIGN_RIGHT, FuzzyTime(timer.end)[1]))

        else:
        else:

-               res.append((200, 30, 200, 20, 1, RT_HALIGN_RIGHT, "done"))
+               res.append((300, 30, 200, 20, 1, RT_HALIGN_RIGHT, "done"))

        return res
 
 class TimerList(HTMLComponent, GUIComponent):
        return res
 
 class TimerList(HTMLComponent, GUIComponent):


@@ -45,7 +47,7 @@ class TimerList(HTMLComponent, GUIComponent):
        def getCurrent(self):
                return self.l.getCurrentSelection()
        
        def getCurrent(self):
                return self.l.getCurrentSelection()
        

-       def GUIcreate(self, parent, skindata):
+       def GUIcreate(self, parent):

                self.instance = eListbox(parent)
                self.instance.setContent(self.l)
                self.instance.setItemHeight(50)
                self.instance = eListbox(parent)
                self.instance.setContent(self.l)
                self.instance.setItemHeight(50)


@@ -54,4 +56,6 @@ class TimerList(HTMLComponent, GUIComponent):
                self.instance.setContent(None)
                self.instance = None
 
                self.instance.setContent(None)
                self.instance = None
 

+       def invalidate(self):
+               self.l.invalidate()