recursive close Menu when a screen returns true at close
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Mon, 30 Oct 2006 16:03:37 +0000 (16:03 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Mon, 30 Oct 2006 16:03:37 +0000 (16:03 +0000)
lib/python/Screens/Menu.py

index 3cc4592..a038cdf 100644 (file)
@@ -112,11 +112,11 @@ class Menu(Screen):
 
                self.openDialog(*eval(arg[1]))
 
-       def nothing(self):                                                                                                                                      #dummy
+       def nothing(self): #dummy
                pass
 
        def openDialog(self, *dialog):                          # in every layer needed
-               self.session.open(*dialog)
+               self.session.openWithCallback(self.menuClosed, *dialog)
 
        def openSetup(self, dialog):
                self.session.openWithCallback(self.menuClosed, Setup, dialog)
@@ -241,21 +241,3 @@ class MainMenu(Menu):
        def __init__(self, *x):
                Menu.__init__(self, *x)
                self.skinName = "Menu"
-
-       def openDialog(self, dialog):
-               self.session.open(dialog)
-
-       def openSetup(self, dialog):
-               self.session.open(Setup, dialog)
-
-       def setModeTV(self):
-               print "set Mode to TV"
-               pass
-
-       def setModeRadio(self):
-               print "set Mode to Radio"
-               pass
-
-       def setModeFile(self):
-               print "set Mode to File"
-               pass