Allow going into standby/shutting down after completing jobs (dvd burning)

diff --git a/data/skin_default.xml b/data/skin_default.xml
index f541f8158c519572c658a6dfb577897a935f664a..600f8383ec9e94c78b78d782eaae325c45534ac2 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1118,30 +1118,31 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                        <convert type="ConditionalShowHide">Blink</convert>
                </widget>
        </screen>
-       <screen name="JobView" position="84,122" size="522,374" title="Job View">
-               <widget source="job_progress" render="Progress" position="130,184" size="362,28" borderWidth="1" />
-               <widget source="job_status" render="Label" position="15,246" size="278,62" font="Regular;28" />
-               <widget source="job_name" render="Label" position="25,12" size="464,76" font="Regular;28" />
-               <widget source="job_task" render="Label" position="19,93" size="475,61" font="Regular;28" />
-               <widget source="job_progress" render="Label" position="16,182" size="106,65" font="Regular;28">
+       <screen name="JobView" position="84,122" size="520,350" title="Job View">
+               <widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28" />
+               <widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23" />
+               <widget source="job_progress" render="Progress" position="20,162" size="480,36" borderWidth="2" backgroundColor="#254f7497" />
+               <widget source="job_progress" render="Label" position="120,166" size="280,32" font="Regular;28" foregroundColor="#000000" zPosition="2" halign="center" transparent="1"  >
                        <convert type="ProgressToText" />
                </widget>
-               <widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="0,330" size="140,40" alphatest="on" >
+               <widget source="job_status" render="Label" position="20,212" size="480,26" font="Regular;23" />
+               <widget name="config" position="20,254" size="480,20" />
+               <widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="20,300" size="140,40" alphatest="on" >
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="cancelable" render="FixedLabel" text="Abort" position="0,330" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" >
+               <widget source="cancelable" render="FixedLabel" text="Cancel" position="20,300" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" >
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="170,330" size="140,40" alphatest="on" >
+               <widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="190,300" size="140,40" alphatest="on" >
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="170,330" size="140,40" transparent="1" backgroundColor="#1f771f" >
+               <widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="190,300" size="140,40" transparent="1" backgroundColor="#1f771f" >
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="380,330" size="140,40" alphatest="on" >
+               <widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="360,300" size="140,40" alphatest="on" >
                        <convert type="ConditionalShowHide" />
                </widget>
-               <widget source="backgroundable" render="FixedLabel" text="Background" font="Regular;20" halign="center" valign="center" position="380,330" size="140,40" transparent="1" backgroundColor="#18188b" >
+               <widget source="backgroundable" render="FixedLabel" text="Continue in background" font="Regular;20" halign="center" valign="center" position="360,300" size="140,40" transparent="1" backgroundColor="#18188b" >
                        <convert type="ConditionalShowHide" />
                </widget>
        </screen>

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 48961f61c755c352d03854f8d8d952bdaf9c4ed5..06348579f77f46424c8c1ab2ab35a6c2c18a1935 100644 (file)
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -1,8 +1,12 @@
 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
@@ -12,7 +16,6 @@ class JobView(InfoBarNotifications, Screen):
                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()
@@ -38,10 +41,26 @@ class JobView(InfoBarNotifications, Screen):
                                "green": self.ok,
                                "blue": self.background,
                        })
+               ConfigListScreen.__init__(self, [])
+               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:
@@ -58,8 +77,7 @@ class JobView(InfoBarNotifications, Screen):
                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 +86,6 @@ class JobView(InfoBarNotifications, Screen):
                                self["cancelable"].boolean = True
 
        def background(self):
-               print "[background]"
                if self["backgroundable"].boolean == True:
                        self.close(True)
 
@@ -81,3 +98,24 @@ class JobView(InfoBarNotifications, Screen):
                        self.close(False)
                if self["cancelable"].boolean == True:
                        self.job.cancel()
+
+       def performAfterEvent(self):
+               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)

diff --git a/po/de.po b/po/de.po
index 36a2257939ea7c8a9cc25768ac7b20b8fe1c0eff..db4fb7e31cbfac8cf2ee405791aa35110d5c9b89 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -717,6 +717,9 @@ msgstr "Konstellation"
 msgid "Content does not fit on DVD!"
 msgstr "Inhalt passt nicht auf die DVD!"
 
+msgid "Continue in background"
+msgstr "Im Hintergrund fortsetzen"
+
 msgid "Continue playing"
 msgstr "Abspielen fortsetzen"