X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/39542988a01b4e836d3d6680470995c0f550a10b..a8310a1a7345577916560e789cdb8c1712e620a9:/mytest.py

diff --git a/mytest.py b/mytest.py
index a8559c06..d6cfb1a2 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:
@@ -130,69 +128,11 @@ 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)
 
-# TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
-class Navigation:
-	def __init__(self):
-		self.pnav = pNavigation()
-		self.pnav.m_event.get().append(self.callEvent)
-		self.event = [ ]
-		self.currentlyPlayingService = None
-
-	def callEvent(self, i):
-		for x in self.event:
-			x(i)
-	
-	def playService(self, ref):
-		self.currentlyPlayingServiceReference = None
-		if not self.pnav.playService(ref):
-			self.currentlyPlayingServiceReference = ref
-			return 0
-		return 1
-	
-	def getCurrentlyPlayingServiceReference(self):
-		return self.currentlyPlayingServiceReference
-	
-	def recordService(self, ref):
-		print "recording service: %s" % (str(ref))
-		print self.pnav.recordService
-		return self.pnav.recordService(ref)
-	
-	def endRecording(self):
-		return self.pnav.endRecording()
-	
-	def enqueueService(self, ref):
-		return self.pnav.enqueueService(ref)
-	
-	def getCurrentService(self):
-		service = iPlayableServicePtr()
-		if self.pnav.getCurrentService(service):
-			return None
-		return service
-	
-	def getPlaylist(self):
-		playlist = ePlaylistPtr()
-		if self.pnav.getPlaylist(playlist):
-			return None
-		return playlist
-	
-	def pause(self, p):
-		return self.pnav.pause(p)
 
 def runScreenTest():
 	session = Session()
@@ -200,18 +140,20 @@ def runScreenTest():
 	
 	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()
+skin.loadSkin(getDesktop())
 
 # first, setup a screen
 runScreenTest()