X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7bc4a59528ab13f3062dc1520e76f9ecedd87400..aa3d1162bef321bd2d0effdafce6eb080660a7ca:/mytest.py

diff --git a/mytest.py b/mytest.py
index 461fdfa2..01db6e65 100644
--- a/mytest.py
+++ b/mytest.py
@@ -10,7 +10,7 @@ import ServiceReference
 
 from Navigation import Navigation
 
-from skin import applyGUIskin
+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.
@@ -54,8 +54,8 @@ html = HTMLOutputDevice()
 
 class GUIOutputDevice(OutputDevice):
 	parent = None
-	def create(self, comp):
-		comp.createGUIScreen(self.parent)
+	def create(self, comp, desktop):
+		comp.createGUIScreen(self.parent, desktop)
 
 class Session:
 	def __init__(self):
@@ -75,7 +75,7 @@ class Session:
 		
 			print sys.getrefcount(self.currentDialog)
 			del self.currentDialog.instance
-			dump(self.currentDialog)
+#			dump(self.currentDialog)
 			del self.currentDialog
 		
 		self.popCurrent()
@@ -93,16 +93,20 @@ class Session:
 		return screen(self, *arguments)
 	
 	def instantiateDialog(self, screen, *arguments):
+		# create dialog
 		dlg = self.create(screen, arguments)
+		
+		# read skin data
+		readSkin(dlg, None, dlg.skinName, self.desktop)
+
+		# create GUI view of this dialog
 		assert self.desktop != None
 		dlg.instance = eWindow(self.desktop)
-
+		applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes)
 		gui = GUIOutputDevice()
 		gui.parent = dlg.instance
-		gui.create(dlg)
-
-		applyGUIskin(dlg, None, dlg.skinName, self.desktop)
-	 	
+		gui.create(dlg, self.desktop)
+		
 		return dlg
 	 
 	def pushCurrent(self):
@@ -153,7 +157,7 @@ def runScreenTest():
 import keymapparser
 keymapparser.readKeymap()
 import skin
-skin.loadSkin()
+skin.loadSkin(getDesktop())
 
 # first, setup a screen
 runScreenTest()