self.session.nav.RecordTimer.timeChanged(t)
self.refill()
self.updateState()
-
+
+ def removeAction(self, descr):
+ actions = self["actions"].actions
+ if descr in actions:
+ del actions[descr]
+
def updateState(self):
cur = self["timerlist"].getCurrent()
if cur:
if self.key_red_choice != self.DELETE:
self["actions"].actions.update({"red":self.removeTimerQuestion})
self["key_red"].setText(_("Delete"))
- self["key_red"].instance.invalidate()
self.key_red_choice = self.DELETE
if cur.disabled and (self.key_yellow_choice != self.ENABLE):
self["actions"].actions.update({"yellow":self.toggleDisabledState})
self["key_yellow"].setText(_("Enable"))
- self["key_yellow"].instance.invalidate()
self.key_yellow_choice = self.ENABLE
elif cur.isRunning() and not cur.repeated and (self.key_yellow_choice != self.EMPTY):
- del self["actions"].actions["yellow"]
+ self.removeAction("yellow")
self["key_yellow"].setText(" ")
- self["key_yellow"].instance.invalidate()
self.key_yellow_choice = self.EMPTY
elif ((not cur.isRunning())or cur.repeated ) and (not cur.disabled) and (self.key_yellow_choice != self.DISABLE):
self["actions"].actions.update({"yellow":self.toggleDisabledState})
self["key_yellow"].setText(_("Disable"))
- self["key_yellow"].instance.invalidate()
self.key_yellow_choice = self.DISABLE
else:
if self.key_red_choice != self.EMPTY:
- del self["actions"].actions["red"]
+ self.removeAction("red")
self["key_red"].setText(" ")
- self["key_red"].instance.invalidate()
self.key_red_choice = self.EMPTY
if self.key_yellow_choice != self.EMPTY:
- del self["actions"].actions["yellow"]
+ self.removeAction("yellow")
self["key_yellow"].setText(" ")
- self["key_yellow"].instance.invalidate()
self.key_yellow_choice = self.EMPTY
showCleanup = True
if showCleanup and (self.key_blue_choice != self.CLEANUP):
self["actions"].actions.update({"blue":self.cleanupQuestion})
self["key_blue"].setText(_("Cleanup"))
- self["key_blue"].instance.invalidate()
self.key_blue_choice = self.CLEANUP
elif (not showCleanup) and (self.key_blue_choice != self.EMPTY):
- del self["actions"].actions["blue"]
+ self.removeAction("blue")
self["key_blue"].setText(" ")
- self["key_blue"].instance.invalidate()
self.key_blue_choice = self.EMPTY
-
def fillTimerList(self):
del self.list[:]
self.updateState()
def removeTimerQuestion(self):
- if not self["timerlist"].getCurrent():
+ cur = self["timerlist"].getCurrent()
+ if not cur:
return
- self.session.openWithCallback(self.removeTimer, MessageBox, _("Really delete this timer?"))
+
+ self.session.openWithCallback(self.removeTimer, MessageBox, _("Do you really want to delete %s?") % (cur.name))
def removeTimer(self, result):
if not result:
timer = cur
timer.afterEvent = AFTEREVENT.NONE
self.session.nav.RecordTimer.removeEntry(timer)
- if not timer.dontSave:
- for timer in self.session.nav.RecordTimer.timer_list:
- if timer.dontSave and timer.autoincrease:
- timer.end = timer.begin + (3600 * 24 * 356 * 1)
- self.session.nav.RecordTimer.timeChanged(timer)
- timersanitycheck = TimerSanityCheck(self.session.nav.RecordTimer.timer_list,timer)
- if not timersanitycheck.check():
- tsc_list = timersanitycheck.getSimulTimerList()
- if len(tsc_list) > 1:
- timer.end = tsc_list[1].begin - 30
- self.session.nav.RecordTimer.timeChanged(timer)
-
self.refill()
self.updateState()
def addTimer(self, timer):
self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
+
def finishedEdit(self, answer):
print "finished edit"
EMPTY = 0
ENABLE = 1
DISABLE = 2
+ EDIT = 3
def __init__(self, session, timer):
Screen.__init__(self, session)
self.list.append((_("Conflicting timer") + " " + str(count), x))
self.list2.append((timer[count], False))
count += 1
+ if count == 1:
+ self.list.append((_("Channel not in services list")))
self["list"] = MenuList(self.list)
self["timer2"] = TimerList(self.list2)
self["key_red"] = Button("Edit")
self["key_green"] = Button(" ")
- self["key_yellow"] = Button("Edit")
+ self["key_yellow"] = Button(" ")
self["key_blue"] = Button(" ")
self.key_green_choice = self.EMPTY
+ self.key_yellow_choice = self.EMPTY
self.key_blue_choice = self.EMPTY
self["actions"] = ActionMap(["OkCancelActions", "DirectionActions", "ShortcutActions", "TimerEditActions"],
def down(self):
self["list"].instance.moveSelection(self["list"].instance.moveDown)
self["timer2"].moveToIndex(self["list"].getSelectedIndex())
-
+
+ def removeAction(self, descr):
+ actions = self["actions"].actions
+ if descr in actions:
+ del actions[descr]
+
def updateState(self):
if self.timer[0] is not None:
if self.timer[0].disabled and self.key_green_choice != self.ENABLE:
self["actions"].actions.update({"green":self.toggleTimer1})
self["key_green"].setText(_("Enable"))
- self["key_green"].instance.invalidate()
self.key_green_choice = self.ENABLE
elif self.timer[0].isRunning() and not timer[0].repeated and self.key_green_choice != self.EMPTY:
- del self["actions"].actions["green"]
+ self.removeAction("green")
self["key_green"].setText(" ")
- self["key_green"].instance.invalidate()
self.key_green_choice = self.EMPTY
elif (not self.timer[0].isRunning() or self.timer[0].repeated ) and self.key_green_choice != self.DISABLE:
self["actions"].actions.update({"green":self.toggleTimer1})
self["key_green"].setText(_("Disable"))
- self["key_green"].instance.invalidate()
self.key_green_choice = self.DISABLE
+
if len(self.timer) > 1:
x = self["list"].getSelectedIndex()
if self.timer[x] is not None:
+ if self.key_yellow_choice == self.EMPTY:
+ self["actions"].actions.update({"yellow":self.editTimer2})
+ self["key_yellow"].setText(_("Edit"))
+ self.key_yellow_choice = self.EDIT
if self.timer[x].disabled and self.key_blue_choice != self.ENABLE:
self["actions"].actions.update({"blue":self.toggleTimer2})
self["key_blue"].setText(_("Enable"))
- self["key_blue"].instance.invalidate()
self.key_blue_choice = self.ENABLE
elif self.timer[x].isRunning() and not timer[x].repeated and self.key_blue_choice != self.EMPTY:
- del self["actions"].actions["blue"]
+ self.removeAction("blue")
self["key_blue"].setText(" ")
- self["key_blue"].instance.invalidate()
self.key_blue_choice = self.EMPTY
elif (not self.timer[x].isRunning() or self.timer[x].repeated ) and self.key_blue_choice != self.DISABLE:
self["actions"].actions.update({"blue":self.toggleTimer2})
self["key_blue"].setText(_("Disable"))
- self["key_blue"].instance.invalidate()
self.key_blue_choice = self.DISABLE
else:
#FIXME.... this doesnt hide the buttons self.... just the text
- del self["actions"].actions["yellow"]
- self["key_yellow"].setText(" ")
- self["key_yellow"].instance.invalidate()
- self.key_yellow_choice = self.EMPTY
- del self["actions"].actions["blue"]
- self["key_blue"].setText(" ")
- self["key_blue"].instance.invalidate()
- self.key_blue_choice = self.EMPTY
+ if self.key_yellow_choice != self.EMPTY:
+ self.removeAction("yellow")
+ self["key_yellow"].setText(" ")
+ self.key_yellow_choice = self.EMPTY
+ if self.key_blue_choice != self.EMPTY:
+ self.removeAction("blue")
+ self["key_blue"].setText(" ")
+ self.key_blue_choice = self.EMPTY
git.cweiske.de / enigma2.git / blobdiff