- sdl is now default output

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 13a2c26621ea9e47d10dcf55339c8ad22fc78341..1a4b03630fed5769acd189c5599d31e8b397041e 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -71,47 +71,63 @@ class Session:
        
        def processDelay(self):
                self.execEnd()
-               self.currentDialog.doClose()
                
-               dump(self.currentDialog)
-               print sys.getrefcount(self.currentDialog)
-               del self.currentDialog
-               del self.currentWindow
+               if self.currentDialog.isTmp:
+                       self.currentDialog.doClose()
                
-               if len(self.dialogStack):
-                       (self.currentDialog, self.currentWindow) = self.dialogStack.pop()
-                       self.execBegin()
+                       print sys.getrefcount(self.currentDialog)
+                       del self.currentDialog.instance
+                       dump(self.currentDialog)
+                       del self.currentDialog
+               
+               self.popCurrent()
                        
        def execBegin(self):
                        self.currentDialog.execBegin()
-                       self.currentWindow.show()
+                       self.currentDialog.instance.show()
                
        def execEnd(self):
                        self.currentDialog.execEnd()
-                       self.currentWindow.hide()
+                       self.currentDialog.instance.hide()
        
        def create(self, screen, arguments):
+               # creates an instance of 'screen' (which is a class)
                return screen(self, *arguments)
        
-       def open(self, screen, *arguments):
+       def instantiateDialog(self, screen, *arguments):
+               dlg = self.create(screen, arguments)
+               assert self.desktop != None
+               dlg.instance = eWindow(self.desktop)
+
+               gui = GUIOutputDevice()
+               gui.parent = dlg.instance
+               gui.create(dlg)
+
+               applyGUIskin(dlg, None, dlg.skinName, self.desktop)
+               
+               return dlg
+        
+       def pushCurrent(self):
                if self.currentDialog:
-                       self.dialogStack.append((self.currentDialog, self.currentWindow))
+                       self.dialogStack.append(self.currentDialog)
                        self.execEnd()
-               
-               self.currentDialog = self.create(screen, arguments)
-               
-               if self.desktop != None:
-                       self.currentWindow = eWindow(self.desktop)
-
-                       gui = GUIOutputDevice()
-                       gui.parent = self.currentWindow
-                       gui.create(self.currentDialog)
-
-                       applyGUIskin(self.currentDialog, self.currentWindow, None, self.currentDialog.skinName)
-
+       
+       def popCurrent(self):
+               if len(self.dialogStack):
+                       self.currentDialog = self.dialogStack.pop()
                        self.execBegin()
-               else:
-                       self.currentWindow = None
+       
+       def execDialog(self, dialog):
+               self.pushCurrent()
+               self.currentDialog = dialog
+               self.currentDialog.isTmp = False
+               self.execBegin()
+
+       def open(self, screen, *arguments):
+               self.pushCurrent()
+               self.currentDialog = self.instantiateDialog(screen, *arguments)
+               self.currentDialog.isTmp = True
+               self.execBegin()
 
        def keyEvent(self, code):
 #              print "code " + str(code)
@@ -146,6 +162,8 @@ def runScreenTest():
 
 import keymapparser
 keymapparser.readKeymap()
+import skin
+skin.loadSkin()
 
 # first, setup a screen
 runScreenTest()