git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- improved scan error handling
[enigma2.git]
/
screens.py
diff --git
a/screens.py
b/screens.py
index a0d0d7f6ee45d9c42c5e5a493c8652a37042595d..fe8d69dbdbe73522a393aae34734dbb48ae30b5d 100644
(file)
--- a/
screens.py
+++ b/
screens.py
@@
-83,14
+83,6
@@
class mainMenu(Screen):
("wie spaet ists?!", self.goClock)
])
("wie spaet ists?!", self.goClock)
])
-#class mainMenu(Screen):
-# def __init__(self):
-# GUISkin.__init__(self)
-#
-# self["title"] = Header("this is the\nMAIN MENU !!!");
-# self["okbutton"] = Button("ok")
-# self["okbutton"].onClick = [ self.close ]
-
class channelSelection(Screen):
def __init__(self, session):
Screen.__init__(self, session)
class channelSelection(Screen):
def __init__(self, session):
Screen.__init__(self, session)
@@
-170,9
+162,13
@@
class clockDisplay(Screen):
class serviceScan(Screen):
def ok(self):
class serviceScan(Screen):
def ok(self):
+ print "ok"
if self["scan"].isDone():
self.close()
if self["scan"].isDone():
self.close()
+ def cancel(self):
+ print "cancel not yet implemented ;)"
+
def __init__(self, session):
Screen.__init__(self, session)
def __init__(self, session):
Screen.__init__(self, session)
@@
-180,5
+176,9
@@
class serviceScan(Screen):
self["scan_state"] = Label("scan state")
self["scan"] = ServiceScan(self["scan_progress"], self["scan_state"])
self["scan_state"] = Label("scan state")
self["scan"] = ServiceScan(self["scan_progress"], self["scan_state"])
- self["okbutton"] = Button("ok", [self.ok])
- self["okbutton"].disable()
+ self["actions"] = ActionMap(["OkCancelActions"],
+ {
+ "ok": self.ok,
+ "cancel": self.cancel
+ })
+