git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small pat/pmt scan fix
[enigma2.git]
/
lib
/
python
/
Screens
/
TimerEdit.py
diff --git
a/lib/python/Screens/TimerEdit.py
b/lib/python/Screens/TimerEdit.py
index 3497fcbe1d859840490b1207475d2f61ad57cdcf..bdf3527dbbff0fd3f9592f935f07be79f810cf9b 100644
(file)
--- a/
lib/python/Screens/TimerEdit.py
+++ b/
lib/python/Screens/TimerEdit.py
@@
-1,5
+1,6
@@
from Components.ActionMap import ActionMap
from Components.Button import Button
from Components.ActionMap import ActionMap
from Components.Button import Button
+from Components.config import config
from Components.MenuList import MenuList
from Components.TimerList import TimerList
from Components.TimerSanityCheck import TimerSanityCheck
from Components.MenuList import MenuList
from Components.TimerList import TimerList
from Components.TimerSanityCheck import TimerSanityCheck
@@
-130,10
+131,12
@@
class TimerEditList(Screen):
if delete:
self.session.nav.RecordTimer.cleanup()
self.refill()
if delete:
self.session.nav.RecordTimer.cleanup()
self.refill()
-
+
def removeTimerQuestion(self):
def removeTimerQuestion(self):
+ if not self["timerlist"].getCurrent():
+ return
self.session.openWithCallback(self.removeTimer, MessageBox, _("Really delete this timer?"))
self.session.openWithCallback(self.removeTimer, MessageBox, _("Really delete this timer?"))
-
+
def removeTimer(self, result):
if not result:
return
def removeTimer(self, result):
if not result:
return
@@
-146,8
+149,15
@@
class TimerEditList(Screen):
self.refill()
def refill(self):
self.refill()
def refill(self):
+ oldsize = len(self.list)
self.fillTimerList()
self.fillTimerList()
- self["timerlist"].invalidate()
+ lst = self["timerlist"]
+ newsize = len(self.list)
+ if oldsize and oldsize != newsize:
+ idx = lst.getCurrentIndex()
+ lst.entryRemoved(idx)
+ else:
+ lst.invalidate()
def addCurrentTimer(self):
event = None
def addCurrentTimer(self):
event = None
@@
-165,7
+175,7
@@
class TimerEditList(Screen):
else:
data = parseEvent(event, description = False)
else:
data = parseEvent(event, description = False)
- self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, *data))
+ self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True,
dirname = config.movielist.last_timer_videodir.value,
*data))
def addTimer(self, timer):
self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
def addTimer(self, timer):
self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)