X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/13b7a9b397f36ca3195aad3702feb3db4cbb2f3e..fef70b939aea15a2438f480d7bdd679e181dcb06:/mytest.py

diff --git a/mytest.py b/mytest.py
index 53a398ed..54f0f862 100644
--- a/mytest.py
+++ b/mytest.py
@@ -29,7 +29,6 @@ screens["global"](components)
 
 # test our screens
 components["$001"] = screens["testDialog"]()
-components["$002"] = screens["clockDisplay"](components["clock"])
 
 print "*** classes:"
 dump(screens)
@@ -55,93 +54,71 @@ class GUIOutputDevice(OutputDevice):
 	def create(self, comp):
 		comp.createGUIScreen(self.parent)
 
-
-
-def test():
-	desktop = getDesktop()
-	print "desktop: " + str(desktop)
-
-	wnd = eWindow(desktop)
-	print "window " + str(wnd)
-	wnd.setTitle("python")
-	wnd.move(ePoint(300, 100))
-	wnd.resize(eSize(300, 300))
-
-	gui = GUIOutputDevice()
-	gui.parent = wnd
-	gui.create(components["$002"])
-#	for (x,y) in components["$001"].data.items():
-#		print str(x) + " -> " + str(y) + " (" + y["instance"].getText() + ")"
-
-#	print components["$001"].data["okbutton"]["instance"].doClick()
-
-# diese sachen gehoeren in den skin! :)
-	applyGUIskin(components["$002"], None, "clockDialog")
+class Session:
+	def __init__(self):
+		self.desktop = None
+		self.delayTimer = eTimer()
+		self.delayTimer.timeout.get().append(self.processDelay)
 	
-# das ist dann schon die echte funktionalitaet ;)
-	components["clock"].doClock()
-	components["clock"].doClock()
+	def processDelay(self):
+		components[self.screenname].close()
+		if self.currentWindow != None:
+			self.currentWindow.hide()
+		
+		del components[self.screenname]
+		del self.currentWindow
+		
+
+	def open(self, screenname, screen):
+		components[screenname] = screen
+		self.screenname = screenname
+		screen.session = self
+		
+		if self.desktop != None:
+			self.currentWindow = wnd = eWindow(self.desktop)
+			wnd.setTitle("Screen from python!")
+			wnd.move(ePoint(300, 100))
+			wnd.resize(eSize(300, 300))
+
+			gui = GUIOutputDevice()
+			gui.parent = wnd
+			gui.create(components["$002"])
+
+		 	applyGUIskin(components["$002"], None, "clockDialog")
+
+			wnd.show()
+		else:
+			self.currentWindow = None
 
+	def close(self):
+		self.delayTimer.start(0, 1)
 
-# output as html
-	print "--------------------------------------"
-	html.create(components["$001"])
-	print "--------------------------------------"
-	html.create(components["$002"])
-	print "--------------------------------------"
-	
+def runScreenTest():
+	session = Session()
+	session.desktop = getDesktop()
 	
-# direkter test der GUI aus python:
-#	label1 = eLabel(wnd)
-#	label1.setText("hello world!\nfrom python!")
-#	label1.move(ePoint(10, 10))
-#	label1.resize(eSize(80, 50))
-#
-#	label2 = eLabel(wnd)
-#	label2.setText("the second\nlabel works\nas well!")
-#	label2.move(ePoint(90, 10))
-#	label2.resize(eSize(80, 50))
-#
-#	button = eButton(wnd)
-#	button.setText("OK")
-#	button.move(ePoint(200, 10))
-#	button.resize(eSize(80, 50)) 
-
-	wnd.show()
-	
-	components["$002"].data["okbutton"]["instance"].push()	
+#	components["$002"] = screens["clockDisplay"](components["clock"])
 
-	for x in range(200):
-		time.sleep(0.1)
-		components["clock"].doClock()
-		if x > 100:
-			r = 200 - x
-		else:
-			r = x
-#		components["$002"]["okbutton"].setValue(r)
-		desktop.paint()
-	
-#	
-#	print "delete label1"
-#	del button
-#	del label2
-#	del label1
-#	print "delete wnd"
-#	del wnd
-#	print "bye"
+	session.open("$002", screens["clockDisplay"](components["clock"]))
 
 	
+	def blub():
+#		x = components["$002"]
+		components["$002"].data["okbutton"]["instance"].push()
+#		dump(components)
+#		print "session, close screen " + str(sys.getrefcount(x))
+#		session.close()
+		
+	tmr = eTimer()
+	tmr.timeout.get().append(blub)
+	tmr.start(4000, 1)
+	
+	runMainloop()
 	
 	return 0
 
-def testI2(a):
-	print "PYTHON says: it's a " + str(a) + "!!!"
-	return 0
 
-def testI(a = 0):
-	print "magic integer is " + str(a)
-	
-	list = testsignal.get()
-	print "list -> " + str(list)
-	list.append(testI2)
-	return 1
+# first, setup a screen
+runScreenTest()
+
+# now, run the mainloop