X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=screens.py;fp=screens.py;h=a04772db3620e9d9a1bee435dc5c66904c9f0c1f;hb=2590d97005eecab111a4bf8476da9eb1c700654c;hp=cf1dac10ee4e0d355530b9eaa97b6b44a1ac7a58;hpb=cd621fe499141885e5a0d8b4e42a0f8a7f41a9ac;p=vuplus_dvbapp

diff --git a/screens.py b/screens.py
index cf1dac1..a04772d 100644
--- a/screens.py
+++ b/screens.py
@@ -8,15 +8,34 @@ def doGlobal(screen):
 class Screen(dict, HTMLSkin, GUISkin):
 	""" bla """
 	
-	def close(self):
+	# never call this directly - it will be called from the session!
+	def doClose(self):
 		GUISkin.close(self)
 	
+	def close(self, retval=None):
+		self.session.close()
+	
 # a test dialog
 class testDialog(Screen):
 	def testDialogClick(self):
-		self["title"].setText(self["menu"].getCurrent())
-
-		self.tries += 1
+		selection = self["menu"].getCurrent()
+		selection[1]()
+	
+	def goMain(self):
+#		self.close(0)
+		self["title"].setText("you selected the main menu!");
+		
+	def goEmu(self):
+#		self.close(1)
+		self["title"].setText("EMUs ARE ILLEGAL AND NOT SUPPORTED!");
+	
+	def goTimeshift(self):
+#		self.close(2)
+		self["title"].setText("JUST PRESS THE YELLOW BUTTON!");
+	
+	def goHDTV(self):
+#		self.close(3)
+		self["title"].setText("HDTV GREEN FLASHES: ENABLED");
 
 	def __init__(self):
 		GUISkin.__init__(self)
@@ -24,10 +43,23 @@ class testDialog(Screen):
 		b.onClick = [ self.testDialogClick ]
 		self["okbutton"] = b
 		self["title"] = Header("Test Dialog - press ok to leave!")
-		self["menu"] = MenuList()
+		self["menu"] = MenuList(
+			[
+				("MAIN MENU", self.goMain), 
+				("EMU SETUP", self.goEmu),
+				("TIMESHIFT SETUP", self.goTimeshift),
+				("HDTV PIP CONFIG", self.goHDTV)
+			])
+
+
+class MainMenu(Screen):
+	def __init__(self):
+		GUISkin.__init__(self)
 		
-		self.tries = 0
+		self["ok"] = Button("ok")
+		self["ok"].onClick = [ self.close ]
 
+	
 # a clock display dialog
 class clockDisplay(Screen):
 	def okbutton(self):