X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e713bd3d222127573350eddb3f71941fda771054..0c2185a46606c2ac3e41205fe92e6d5ba4ead1b9:/lib/python/Screens/TaskView.py diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py index 48961f61..8d38ed62 100644 --- a/lib/python/Screens/TaskView.py +++ b/lib/python/Screens/TaskView.py @@ -1,18 +1,22 @@ from Screen import Screen +from Components.ConfigList import ConfigListScreen +from Components.config import config, ConfigSubsection, ConfigSelection, getConfigListEntry from InfoBarGenerics import InfoBarNotifications +import Screens.Standby +from Tools import Notifications -class JobView(InfoBarNotifications, Screen): - def __init__(self, session, job, parent=None, cancelable = True, backgroundable = True, close_on_finish = False): +class JobView(InfoBarNotifications, Screen, ConfigListScreen): + def __init__(self, session, job, parent=None, cancelable = True, backgroundable = True, afterEvent = 0): from Components.Sources.StaticText import StaticText from Components.Sources.Progress import Progress from Components.Sources.Boolean import Boolean from Components.ActionMap import ActionMap Screen.__init__(self, session, parent) InfoBarNotifications.__init__(self) + ConfigListScreen.__init__(self, []) self.parent = parent self.job = job self.job.taskview = self - self.close_on_finish = close_on_finish self["job_name"] = StaticText(job.name) self["job_progress"] = Progress() @@ -27,21 +31,34 @@ class JobView(InfoBarNotifications, Screen): self.onShow.append(self.windowShow) self.onHide.append(self.windowHide) - self["actions"] = ActionMap(["OkCancelActions"], - { - "ok": self.ok, - "cancel": self.ok - }) - self["ColorActions"] = ActionMap(["ColorActions"], - { - "red": self.abort, - "green": self.ok, - "blue": self.background, - }) + self["setupActions"] = ActionMap(["SetupActions", "ColorActions"], + { + "green": self.ok, + "red": self.abort, + "blue": self.background, + "cancel": self.ok, + "ok": self.ok, + }, -2) + self.afterevents = [ "nothing", "standby", "deepstandby", "close" ] + self.settings = ConfigSubsection() + self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to standby")), ("deepstandby", _("go to deep standby"))], default = self.afterevents[afterEvent]) + self.setupList() + self.state_changed() + + def setupList(self): + self["config"].setList( [ getConfigListEntry(_("After event"), self.settings.afterEvent) ]) + + def keyLeft(self): + ConfigListScreen.keyLeft(self) + self.setupList() + + def keyRight(self): + ConfigListScreen.keyRight(self) + self.setupList() + def windowShow(self): self.job.state_changed.append(self.state_changed) - self.state_changed() def windowHide(self): if len(self.job.state_changed) > 0: @@ -52,14 +69,13 @@ class JobView(InfoBarNotifications, Screen): self["job_progress"].range = j.end self["job_progress"].value = j.progress #print "JobView::state_changed:", j.end, j.progress - self["job_status"].text = {j.NOT_STARTED: _("Waiting"), j.IN_PROGRESS: _("In Progress"), j.FINISHED: _("Finished"), j.FAILED: _("Failed")}[j.status] + self["job_status"].text = j.getStatustext() if j.status == j.IN_PROGRESS: self["job_task"].text = j.tasks[j.current_task].name else: self["job_task"].text = "" if j.status in [j.FINISHED, j.FAILED]: - if self.close_on_finish: - self.close() + self.performAfterEvent() self["backgroundable"].boolean = False if j.status == j.FINISHED: self["finished"].boolean = True @@ -68,7 +84,6 @@ class JobView(InfoBarNotifications, Screen): self["cancelable"].boolean = True def background(self): - print "[background]" if self["backgroundable"].boolean == True: self.close(True) @@ -81,3 +96,25 @@ class JobView(InfoBarNotifications, Screen): self.close(False) if self["cancelable"].boolean == True: self.job.cancel() + + def performAfterEvent(self): + self["config"].hide() + if self.settings.afterEvent.getValue() == "nothing": + return + elif self.settings.afterEvent.getValue() == "close": + self.abort() + from Screens.MessageBox import MessageBox + if self.settings.afterEvent.getValue() == "deepstandby": + if not Screens.Standby.inTryQuitMainloop: + Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A sleep timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20) + elif self.settings.afterEvent.getValue() == "standby": + if not Screens.Standby.inStandby: + Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20) + + def sendStandbyNotification(self, answer): + if answer: + Notifications.AddNotification(Screens.Standby.Standby) + + def sendTryQuitMainloopNotification(self, answer): + if answer: + Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1)