fix inverted setting (meaning was inverted too)

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

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index 81501ca8388330a1eb5d2b04318a51aeb2dff0b0..d79187d185723bd4166ec84369ef1ca3281c6eb7 100644 (file)
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -2,6 +2,7 @@ from HTMLComponent import *
 from GUIComponent import *
 
 from Tools.FuzzyDate import FuzzyTime
 from GUIComponent import *
 
 from Tools.FuzzyDate import FuzzyTime

+import time

 
 from enigma import eListboxPythonMultiContent, eListbox, gFont
 from timer import TimerEntry
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont
 from timer import TimerEntry


@@ -25,11 +26,12 @@ RT_WRAP = 32
 def TimerEntryComponent(timer, processed):
        res = [ timer ]
        
 def TimerEntryComponent(timer, processed):
        res = [ timer ]
        

-
-       res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 560, 30, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, timer.service_ref.getServiceName()))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, timer.name))
+       

        repeatedtext = ""
        days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]
        repeatedtext = ""
        days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]

-       if (timer.repeated != 0):
+       if not timer.repeated:

                flags = timer.repeated
                count = 0
                for x in range(0, 7):
                flags = timer.repeated
                count = 0
                for x in range(0, 7):


@@ -39,18 +41,14 @@ def TimerEntryComponent(timer, processed):
                                        repeatedtext += days[x]
                                        count += 1
                                flags = flags >> 1
                                        repeatedtext += days[x]
                                        count += 1
                                flags = flags >> 1

-               print [FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]]
-               print (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:])
-               res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
+               res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 300, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))

        else:
        else:

-               res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
+               res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 300, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))

 
 

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

        if not processed:
        if not processed:

-               if timer.state == TimerEntry.StateWait:
+               if timer.state == TimerEntry.StateWaiting:

                        state = "waiting"
                        state = "waiting"

-               elif timer.state == TimerEntry.StatePrepare:
+               elif timer.state == TimerEntry.StatePrepared:

                        state = "about to start"
                elif timer.state == TimerEntry.StateRunning:
                        state = "recording..."
                        state = "about to start"
                elif timer.state == TimerEntry.StateRunning:
                        state = "recording..."


@@ -59,7 +57,7 @@ def TimerEntryComponent(timer, processed):
        else:
                state = "done!"
        
        else:
                state = "done!"
        

-       res.append((300, 30, 200, 20, 1, RT_HALIGN_RIGHT, state))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 320, 50, 240, 20, 1, RT_HALIGN_RIGHT|RT_VALIGN_CENTER, state))

        
        return res
 
        
        return res
 


@@ -68,8 +66,8 @@ class TimerList(HTMLComponent, GUIComponent):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
                self.l.setList(list)
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
                self.l.setList(list)

-               self.l.setFont(0, gFont("Arial", 20))
-               self.l.setFont(1, gFont("Arial", 18))
+               self.l.setFont(0, gFont("Regular", 20))
+               self.l.setFont(1, gFont("Regular", 18))

        
        def getCurrent(self):
                return self.l.getCurrentSelection()
        
        def getCurrent(self):
                return self.l.getCurrentSelection()


@@ -77,7 +75,7 @@ class TimerList(HTMLComponent, GUIComponent):
        def GUIcreate(self, parent):
                self.instance = eListbox(parent)
                self.instance.setContent(self.l)
        def GUIcreate(self, parent):
                self.instance = eListbox(parent)
                self.instance.setContent(self.l)

-               self.instance.setItemHeight(50)
+               self.instance.setItemHeight(70)

        
        def GUIdelete(self):
                self.instance.setContent(None)
        
        def GUIdelete(self):
                self.instance.setContent(None)