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

diff --git a/mytest.py b/mytest.py
index 74ac2736..461fdfa2 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,11 +1,15 @@
 from enigma import *
 from tools import *
 
+import Screens.InfoBar
 
 import sys
 import time
 
-from screens import *
+import ServiceReference
+
+from Navigation import Navigation
+
 from skin import applyGUIskin
 
 # A screen is a function which instanciates all components of a screen into a temporary component.
@@ -35,12 +39,6 @@ def dump(dir, p = ""):
 
 # + ":" + str(dir.__class__)
 
-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-
 # display
 
 class OutputDevice:
@@ -103,7 +101,7 @@ class Session:
 		gui.parent = dlg.instance
 		gui.create(dlg)
 
-		applyGUIskin(dlg, None, dlg.skinName)
+		applyGUIskin(dlg, None, dlg.skinName, self.desktop)
 	 	
 		return dlg
 	 
@@ -130,38 +128,32 @@ class Session:
 		self.execBegin()
 
 	def keyEvent(self, code):
-#		print "code " + str(code)
-		if code == 32:
-			self.currentDialog["okbutton"].instance.push()
-
-		if code == 33:
-			self.currentDialog["channelSwitcher"].instance.push()
-		
-		if code >= 0x30 and code <= 0x39:
-			try:
-				self.currentDialog["menu"].instance.moveSelection(code - 0x31)
-			except:
-				self.currentDialog["list"].instance.moveSelection(code - 0x31)
+		print "code " + str(code)
 
 	def close(self):
 		self.delayTimer.start(0, 1)
 
+
 def runScreenTest():
 	session = Session()
 	session.desktop = getDesktop()
 	
-	session.nav = pNavigation()
+	session.nav = Navigation()
 	
-	session.open(infoBar)
+	session.open(Screens.InfoBar.InfoBar)
 
 	CONNECT(keyPressedSignal(), session.keyEvent)
 	
 	runMainloop()
 	
+	session.nav.shutdown()
+	
 	return 0
 
 import keymapparser
 keymapparser.readKeymap()
+import skin
+skin.loadSkin()
 
 # first, setup a screen
 runScreenTest()