X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3db964eee299eae5c98a48753a096fe7786af29a..198c2588d73a87f3106412467ff72af643b8f0ed:/lib/python/Screens/Screen.py diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py index 231cbfaa..a8d0b048 100644 --- a/lib/python/Screens/Screen.py +++ b/lib/python/Screens/Screen.py @@ -15,7 +15,11 @@ class Screen(dict, HTMLSkin, GUISkin): self.onExecBegin = [ ] self.onShown = [ ] + self.onShow = [ ] + self.onHide = [ ] + self.execing = False + self.shown = False # in order to support screens *without* a help, # we need the list in every screen. how ironic. @@ -46,6 +50,7 @@ class Screen(dict, HTMLSkin, GUISkin): # for (name, val) in self.items(): for val in self.active_components: val.execEnd() + del self.active_components # assert self.session != None, "execEnd on non-execing screen!" # self.session = None self.execing = False @@ -62,9 +67,28 @@ class Screen(dict, HTMLSkin, GUISkin): del self.session for (name, val) in self.items(): del self[name] + + # really delete all elements now + self.__dict__.clear() def close(self, *retval): self.session.close(*retval) def setFocus(self, o): self.instance.setFocus(o.instance) + + def show(self): + if self.shown: + return + self.shown = True + self.instance.show() + for x in self.onShow: + x() + + def hide(self): + if not self.shown: + return + self.shown = False + self.instance.hide() + for x in self.onHide: + x()