X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3af66122574386a2856e83ba9c5d73d27a6f3710..094378485e220c9866ec449d4e0e3114a3f1c34d:/screens.py diff --git a/screens.py b/screens.py index 82646282..999ad4bf 100644 --- a/screens.py +++ b/screens.py @@ -15,17 +15,22 @@ class Screen(dict, HTMLSkin, GUISkin): GUISkin.__init__(self) def execBegin(self): +# assert self.session == None, "a screen can only exec one per time" +# self.session = session for (name, val) in self.items(): val.execBegin() def execEnd(self): for (name, val) in self.items(): val.execEnd() +# assert self.session != None, "execEnd on non-execing screen!" +# self.session = None # never call this directly - it will be called from the session! def doClose(self): GUISkin.close(self) + del self.session for (name, val) in self.items(): print "%s -> %d" % (name, sys.getrefcount(val)) del self[name] @@ -78,14 +83,6 @@ class mainMenu(Screen): ("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) @@ -165,6 +162,7 @@ class clockDisplay(Screen): class serviceScan(Screen): def ok(self): + print "ok" if self["scan"].isDone(): self.close()