git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_258_sorting_of_configsatlist'
[enigma2.git]
/
lib
/
python
/
Screens
/
TaskView.py
diff --git
a/lib/python/Screens/TaskView.py
b/lib/python/Screens/TaskView.py
index 1dcdc5158aac8549f73cc5ee5e7e37caf1b16902..1453c05f338de2a28e142bbde4f7d80afd7738fb 100644
(file)
--- a/
lib/python/Screens/TaskView.py
+++ b/
lib/python/Screens/TaskView.py
@@
-33,7
+33,7
@@
class JobView(InfoBarNotifications, Screen, ConfigListScreen):
self.onShow.append(self.windowShow)
self.onHide.append(self.windowHide)
self.onShow.append(self.windowShow)
self.onHide.append(self.windowHide)
- self["setupActions"] = ActionMap(["
SetupActions", "Color
Actions"],
+ self["setupActions"] = ActionMap(["
ColorActions", "Setup
Actions"],
{
"green": self.ok,
"red": self.abort,
{
"green": self.ok,
"red": self.abort,
@@
-80,7
+80,7
@@
class JobView(InfoBarNotifications, Screen, ConfigListScreen):
else:
self["job_task"].text = ""
self["summary_job_task"].text = j.getStatustext()
else:
self["job_task"].text = ""
self["summary_job_task"].text = j.getStatustext()
- if j.status in
[j.FINISHED, j.FAILED]
:
+ if j.status in
(j.FINISHED, j.FAILED)
:
self.performAfterEvent()
self["backgroundable"].boolean = False
if j.status == j.FINISHED:
self.performAfterEvent()
self["backgroundable"].boolean = False
if j.status == j.FINISHED:
@@
-94,11
+94,11
@@
class JobView(InfoBarNotifications, Screen, ConfigListScreen):
self.close(True)
def ok(self):
self.close(True)
def ok(self):
- if self.job.status in
[self.job.FINISHED, self.job.FAILED]
:
+ if self.job.status in
(self.job.FINISHED, self.job.FAILED)
:
self.close(False)
def abort(self):
self.close(False)
def abort(self):
- if self.job.status in
[self.job.FINISHED, self.job.FAILED]
:
+ if self.job.status in
(self.job.FINISHED, self.job.FAILED)
:
self.close(False)
if self["cancelable"].boolean == True:
self.job.cancel()
self.close(False)
if self["cancelable"].boolean == True:
self.job.cancel()