sync
[enigma2.git] / mytest.py
index eaa4e1c..2a7eb9a 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,16 +62,22 @@ 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()
                
-                       print sys.getrefcount(self.currentDialog)
                        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()
@@ -103,7 +99,7 @@ class Session:
                        print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
                        print '-'*60
                        traceback.print_exc(file=sys.stdout)
                        print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
                        print '-'*60
                        traceback.print_exc(file=sys.stdout)
-                       quitMainloop()
+                       quitMainloop(5)
                        print '-'*60
                
                # read skin data
                        print '-'*60
                
                # read skin data
@@ -128,23 +124,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)
 
 
@@ -178,9 +181,15 @@ Components.AVSwitch.InitAVSwitch()
 import Components.Network
 Components.Network.InitNetwork()
 
 import Components.Network
 Components.Network.InitNetwork()
 
+import Components.Lcd
+Components.Lcd.InitLcd()
+
 import Components.SetupDevices
 Components.SetupDevices.InitSetupDevices()
 
 import Components.SetupDevices
 Components.SetupDevices.InitSetupDevices()
 
+import Components.RFmod
+Components.RFmod.InitRFmod()
+
 import Components.NimManager
 
 # first, setup a screen
 import Components.NimManager
 
 # first, setup a screen
@@ -190,7 +199,7 @@ except:
        print 'EXCEPTION IN PYTHON STARTUP CODE:'
        print '-'*60
        traceback.print_exc(file=sys.stdout)
        print 'EXCEPTION IN PYTHON STARTUP CODE:'
        print '-'*60
        traceback.print_exc(file=sys.stdout)
-       quitMainloop()
+       quitMainloop(5)
        print '-'*60
 
 # now, run the mainloop
        print '-'*60
 
 # now, run the mainloop