X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cc1ae69c4a43b7bb2ed0cab4e8e9f221bb33c1d0..c87f1f3b8eb5dec60131976cc092bd5ed6e66acf:/mytest.py

diff --git a/mytest.py b/mytest.py
index a40e2635..53054d9a 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,12 +1,18 @@
 from enigma import *
 from tools import *
 
+import traceback
+import Screens.InfoBar
 
 import sys
 import time
 
-from screens import *
-from skin import applyGUIskin
+import ServiceReference
+
+from Navigation import Navigation
+
+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.
@@ -35,12 +41,6 @@ def dump(dir, p = ""):
 
 # + ":" + str(dir.__class__)
 
-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-
 # display
 
 class OutputDevice:
@@ -56,8 +56,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,96 +75,118 @@ class Session:
 		if self.currentDialog.isTmp:
 			self.currentDialog.doClose()
 		
-			dump(self.currentDialog)
 			print sys.getrefcount(self.currentDialog)
+			del self.currentDialog.instance
+#			dump(self.currentDialog)
 			del self.currentDialog
-			del self.currentWindow
 		
 		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 instantiateDialog(self, screen, *arguments):
-		dlg = self.create(screen, arguments)
-		assert self.desktop != None
-		wnd = eWindow(self.desktop)
+		# create dialog
+		
+		try:
+			dlg = self.create(screen, arguments)
+		except:
+			print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
+			print '-'*60
+			traceback.print_exc(file=sys.stdout)
+			quitMainloop()
+			print '-'*60
+		
+		# 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 = wnd
-		gui.create(dlg)
-
-		applyGUIskin(dlg, wnd, None, dlg.skinName)
-	 	
-		return (dlg, wnd)
+		gui.parent = dlg.instance
+		gui.create(dlg, self.desktop)
+		
+		return dlg
 	 
 	def pushCurrent(self):
 		if self.currentDialog:
-			self.dialogStack.append((self.currentDialog, self.currentWindow))
+			self.dialogStack.append(self.currentDialog)
 			self.execEnd()
 	
 	def popCurrent(self):
 		if len(self.dialogStack):
-			(self.currentDialog, self.currentWindow) = self.dialogStack.pop()
+			self.currentDialog = self.dialogStack.pop()
 			self.execBegin()
 	
 	def execDialog(self, dialog):
 		self.pushCurrent()
-		(self.currentDialog, self.currentWindow) = dialog
+		self.currentDialog = dialog
 		self.currentDialog.isTmp = False
 		self.execBegin()
 
 	def open(self, screen, *arguments):
 		self.pushCurrent()
-		(self.currentDialog, self.currentWindow) = self.instantiateDialog(screen, *arguments)
+		self.currentDialog = self.instantiateDialog(screen, *arguments)
 		self.currentDialog.isTmp = True
 		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(getDesktop())
+
+import Components.InputDevice
+Components.InputDevice.InitInputDevices()
+
+import Components.AVSwitch
+Components.AVSwitch.InitAVSwitch()
+
+import Components.SetupDevices
+Components.SetupDevices.InitSetupDevices()
 
 # first, setup a screen
-runScreenTest()
+try:
+	runScreenTest()
+except:
+	print 'EXCEPTION IN PYTHON STARTUP CODE:'
+	print '-'*60
+	traceback.print_exc(file=sys.stdout)
+	quitMainloop()
+	print '-'*60
 
 # now, run the mainloop