add openWithCallback and return values

diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index bb6318bed25d4c8334d74447f87daf4d2b8aaeb4..bde31e835e8f91b4091f6dfacb8e58b111affaf4 100644 (file)
--- a/lib/python/Screens/MessageBox.py
+++ b/lib/python/Screens/MessageBox.py
@@ -10,6 +10,12 @@ class MessageBox(Screen):
 
                self["actions"] = ActionMap(["OkCancelActions"], 
                        {
 
                self["actions"] = ActionMap(["OkCancelActions"], 
                        {

-                               "cancel": self.close
+                               "cancel": self.cancel,
+                               "ok": self.ok

                        })
                        })

-
+       
+       def cancel(self):
+               self.close(False)
+       
+       def ok(self):
+               self.close(True)

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index aed7dc67f7bed71a611b9b6173457e4fe7a9c10a..a95c765502c4f84c837eb2ab4c37a12658a22557 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -31,8 +31,8 @@ class Screen(dict, HTMLSkin, GUISkin):
                for (name, val) in self.items():
                        del self[name]
        
                for (name, val) in self.items():
                        del self[name]
        

-       def close(self, retval=None):
-               self.session.close()
+       def close(self, *retval):
+               self.session.close(*retval)

 
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
 
        def setFocus(self, o):
                self.instance.setFocus(o.instance)

diff --git a/mytest.py b/mytest.py
index eaa4e1ca86487d7ea81216e33a378be4a1eaad55..49283357fcb39d4d7903114ccb027bd3fe93ed71 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -13,16 +13,6 @@ from Navigation import Navigation
 
 from skin import readSkin, applyAllAttributes
 
 
 from skin import readSkin, applyAllAttributes
 

-
-# A screen is a function which instanciates all components of a screen into a temporary component.
-# Thus, the global stuff is a screen, too.
-# In a screen, components can either be instanciated from the class-tree, cloned (copied) or
-# "linked" from the instance tree.
-# A screen itself lives as the container of the components, so a screen is a component, too.
-
-# we thus have one (static) hierarchy of screens (classes, not instances)
-# and one with the instanciated components itself (both global and dynamic)
-

 had = dict()
 
 def dump(dir, p = ""):
 had = dict()
 
 def dump(dir, p = ""):


@@ -72,6 +62,9 @@ class Session:
        def processDelay(self):
                self.execEnd()
                
        def processDelay(self):
                self.execEnd()
                

+               callback = self.currentDialog.callback
+               retval = self.currentDialog.returnValue
+               

                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
                
                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
                


@@ -79,9 +72,13 @@ class Session:
                        del self.currentDialog.instance
 #                      dump(self.currentDialog)
                        del self.currentDialog
                        del self.currentDialog.instance
 #                      dump(self.currentDialog)
                        del self.currentDialog

+               else:
+                       del self.currentDialog.callback

                
                self.popCurrent()
                
                self.popCurrent()

-                       
+               if callback is not None:
+                       callback(*retval)
+

        def execBegin(self):
                        self.currentDialog.execBegin()
                        self.currentDialog.instance.show()
        def execBegin(self):
                        self.currentDialog.execBegin()
                        self.currentDialog.instance.show()


@@ -128,23 +125,30 @@ class Session:
                if len(self.dialogStack):
                        self.currentDialog = self.dialogStack.pop()
                        self.execBegin()
                if len(self.dialogStack):
                        self.currentDialog = self.dialogStack.pop()
                        self.execBegin()

-       
+

        def execDialog(self, dialog):
                self.pushCurrent()
                self.currentDialog = dialog
                self.currentDialog.isTmp = False
        def execDialog(self, dialog):
                self.pushCurrent()
                self.currentDialog = dialog
                self.currentDialog.isTmp = False

+               self.currentDialog.callback = None # would cause re-entrancy problems.

                self.execBegin()
 
                self.execBegin()
 

+       def openWithCallback(self, callback, screen, *arguments):
+               self.open(screen, *arguments)
+               self.currentDialog.callback = callback
+

        def open(self, screen, *arguments):
                self.pushCurrent()
                self.currentDialog = self.instantiateDialog(screen, *arguments)
                self.currentDialog.isTmp = True
        def open(self, screen, *arguments):
                self.pushCurrent()
                self.currentDialog = self.instantiateDialog(screen, *arguments)
                self.currentDialog.isTmp = True

+               self.currentDialog.callback = None

                self.execBegin()
 
        def keyEvent(self, code):
                print "code " + str(code)
 
                self.execBegin()
 
        def keyEvent(self, code):
                print "code " + str(code)
 

-       def close(self):
+       def close(self, *retval):
+               self.currentDialog.returnValue = retval

                self.delayTimer.start(0, 1)
 
 
                self.delayTimer.start(0, 1)