projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'dm/experimental' into vuplus_experimental
[vuplus_dvbapp]
/
lib
/
python
/
Screens
/
TimerEdit.py
diff --git
a/lib/python/Screens/TimerEdit.py
b/lib/python/Screens/TimerEdit.py
index
2130943
..
0abb42a
100644
(file)
--- a/
lib/python/Screens/TimerEdit.py
+++ b/
lib/python/Screens/TimerEdit.py
@@
-13,7
+13,7
@@
from ServiceReference import ServiceReference
from TimerEntry import TimerEntry, TimerLog
from Tools.BoundFunction import boundFunction
from time import time
from TimerEntry import TimerEntry, TimerLog
from Tools.BoundFunction import boundFunction
from time import time
-from timer import TimerEntry
+from timer import TimerEntry
as RealTimerEntry
class TimerEditList(Screen):
EMPTY = 0
class TimerEditList(Screen):
EMPTY = 0
@@
-177,9
+177,9
@@
class TimerEditList(Screen):
def fillTimerList(self):
#helper function to move finished timers to end of list
def eol_compare(x, y):
def fillTimerList(self):
#helper function to move finished timers to end of list
def eol_compare(x, y):
- if x[0].state != y[0].state and x[0].state ==
TimerEntry.StateEnded or y[0].state ==
TimerEntry.StateEnded:
+ if x[0].state != y[0].state and x[0].state ==
RealTimerEntry.StateEnded or y[0].state == Real
TimerEntry.StateEnded:
return cmp(x[0].state, y[0].state)
return cmp(x[0].state, y[0].state)
- return cmp(x[0].begin,
x[1
].begin)
+ return cmp(x[0].begin,
y[0
].begin)
list = self.list
del list[:]
list = self.list
del list[:]