aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens/TaskView.py
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2010-03-30 18:27:08 +0200
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2010-03-30 18:27:08 +0200
commit8999614810e50368d80d5e03811dfdf3788901e0 (patch)
treefc5c9aead7f28dbfbeba1688fc1e7198f9f5691c /lib/python/Screens/TaskView.py
parent54e03fa5099bfe1862dd8fd83761c64ce17d555b (diff)
parent525b031d2b8401750293fde4e334dfc8a5193517 (diff)
downloadenigma2-8999614810e50368d80d5e03811dfdf3788901e0.tar.gz
enigma2-8999614810e50368d80d5e03811dfdf3788901e0.zip
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
Diffstat (limited to 'lib/python/Screens/TaskView.py')
-rw-r--r--lib/python/Screens/TaskView.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index eb926ca3..9907e2fb 100644
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -7,7 +7,7 @@ import Screens.Standby
from Tools import Notifications
class JobView(InfoBarNotifications, Screen, ConfigListScreen):
- def __init__(self, session, job, parent=None, cancelable = True, backgroundable = True, afterEvent = 0):
+ def __init__(self, session, job, parent=None, cancelable = True, backgroundable = True):
from Components.Sources.StaticText import StaticText
from Components.Sources.Progress import Progress
from Components.Sources.Boolean import Boolean
@@ -43,19 +43,20 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
"ok": self.ok,
}, -2)
- self.afterevents = [ "nothing", "standby", "deepstandby", "close" ]
self.settings = ConfigSubsection()
if SystemInfo["DeepstandbySupport"]:
shutdownString = _("go to deep standby")
else:
shutdownString = _("shut down")
- self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to standby")), ("deepstandby", shutdownString)], default = self.afterevents[afterEvent])
+ self.settings.afterEvent = ConfigSelection(choices = [("nothing", _("do nothing")), ("close", _("Close")), ("standby", _("go to standby")), ("deepstandby", shutdownString)], default = self.job.afterEvent or "nothing")
+ self.job.afterEvent = self.settings.afterEvent.getValue()
self.setupList()
self.state_changed()
def setupList(self):
self["config"].setList( [ getConfigListEntry(_("After event"), self.settings.afterEvent) ])
-
+ self.job.afterEvent = self.settings.afterEvent.getValue()
+
def keyLeft(self):
ConfigListScreen.keyLeft(self)
self.setupList()