X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2590d97005eecab111a4bf8476da9eb1c700654c..1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b:/screens.py

diff --git a/screens.py b/screens.py
index a04772db..cf0daae9 100644
--- a/screens.py
+++ b/screens.py
@@ -1,5 +1,6 @@
 from components import *
 import sys
+from enigma import quitMainloop
 
 # some screens
 def doGlobal(screen):
@@ -7,6 +8,19 @@ def doGlobal(screen):
 
 class Screen(dict, HTMLSkin, GUISkin):
 	""" bla """
+
+	def __init__(self, session):
+		self.skinName = self.__class__.__name__
+		self.session = session
+		GUISkin.__init__(self)
+		
+	def execBegin(self):
+		for (name, val) in self.items():
+			val.execBegin()
+	
+	def execEnd(self):
+		for (name, val) in self.items():
+			val.execEnd()
 	
 	# never call this directly - it will be called from the session!
 	def doClose(self):
@@ -14,70 +28,126 @@ class Screen(dict, HTMLSkin, GUISkin):
 	
 	def close(self, retval=None):
 		self.session.close()
+
+class mainMenu(Screen):
 	
-# a test dialog
-class testDialog(Screen):
-	def testDialogClick(self):
-		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!");
+		self["title"].setText("EMUs ARE ILLEGAL AND NOT SUPPORTED!")
 	
 	def goTimeshift(self):
-#		self.close(2)
-		self["title"].setText("JUST PRESS THE YELLOW BUTTON!");
+		self["title"].setText("JUST PRESS THE YELLOW BUTTON!")
 	
 	def goHDTV(self):
-#		self.close(3)
-		self["title"].setText("HDTV GREEN FLASHES: ENABLED");
+		self["title"].setText("HDTV GREEN FLASHES: ENABLED")
+	
+	def goScan(self):
+		self.session.open(serviceScan)
+	
+	def goClock(self):
+		self.session.open(clockDisplay, Clock())
 
-	def __init__(self):
-		GUISkin.__init__(self)
+	def okbuttonClick(self):
+		selection = self["menu"].getCurrent()
+		selection[1]()
+	
+	def __init__(self, session):
+		Screen.__init__(self, session)
 		b = Button("ok")
-		b.onClick = [ self.testDialogClick ]
+
+		self["actions"] = ActionMap("MainMenuActions", 
+			{
+				"selected": self.okbuttonClick
+			})
+
+		b.onClick = [ self.okbuttonClick ]
 		self["okbutton"] = b
-		self["title"] = Header("Test Dialog - press ok to leave!")
+		self["title"] = Header("Main Menu! - press ok to leave!")
 		self["menu"] = MenuList(
 			[
-				("MAIN MENU", self.goMain), 
+				("Close Main Menu", self.close),
+				("Service Scan", self.goScan),
+				("Quit", quitMainloop),
 				("EMU SETUP", self.goEmu),
 				("TIMESHIFT SETUP", self.goTimeshift),
-				("HDTV PIP CONFIG", self.goHDTV)
+				("HDTV PIP CONFIG", self.goHDTV),
+				("wie spaet ists?!", self.goClock)
 			])
 
+#class mainMenu(Screen):
+#	def __init__(self):
+#		GUISkin.__init__(self)
+#		
+#		self["title"] = Header("this is the\nMAIN MENU !!!");
+#		self["okbutton"] = Button("ok")
+#		self["okbutton"].onClick = [ self.close ]
 
-class MainMenu(Screen):
-	def __init__(self):
-		GUISkin.__init__(self)
+class channelSelection(Screen):
+	def __init__(self, session):
+		Screen.__init__(self, session)
 		
-		self["ok"] = Button("ok")
-		self["ok"].onClick = [ self.close ]
+		self["list"] = ServiceList()
+		self["list"].setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:PREMIERE"))
+		
+		self["okbutton"] = Button("ok", [self.channelSelected])
+
+		self["actions"] = ActionMap("ChannelSelectActions", 
+			{
+				"selectChannel": self.channelSelected,
+			})
 
+	def channelSelected(self):
+		self.session.nav.playService(self["list"].getCurrent())
+		self.close()
+		pass
+
+class infoBar(Screen):
+	def __init__(self, session):
+		Screen.__init__(self, session)
+		
+		self["actions"] = ActionMap("InfobarActions", 
+			{
+				"switchChannel": self.switchChannel,
+				"mainMenu": self.mainMenu
+			})
+		self["channelSwitcher"] = Button("switch Channel", [self.switchChannel])
+		self["okbutton"] = Button("mainMenu", [self.mainMenu])
+		
+		self["ServiceName"] = ServiceName(self.session.nav)
+		
+		self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
+		self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next)
 	
+	def mainMenu(self):
+		self.session.open(mainMenu)
+		
+	def switchChannel(self):
+		self.session.open(channelSelection)
+
 # a clock display dialog
 class clockDisplay(Screen):
 	def okbutton(self):
-		print "clockDisplay close"
-		
 		self.session.close()
 	
-	def __init__(self, clock):
-		GUISkin.__init__(self)
+	def __init__(self, session, clock):
+		Screen.__init__(self, session)
 		self["theClock"] = clock
 		b = Button("bye")
 		b.onClick = [ self.okbutton ]
 		self["okbutton"] = b
 		self["title"] = Header("clock dialog: here you see the current uhrzeit!")
 
-# defined screens
-screens = {
-	"global": doGlobal,
-	"testDialog": testDialog,
-	"clockDisplay": clockDisplay }
 
+class serviceScan(Screen):
+	def ok(self):
+		if self["scan"].isDone():
+			self.close()
+	
+	def __init__(self, session):
+		Screen.__init__(self, session)
+		
+		self["scan_progress"] = ProgressBar()
+		self["scan_state"] = Label("scan state")
+		self["scan"] = ServiceScan(self["scan_progress"], self["scan_state"])
+
+		self["okbutton"] = Button("ok", [self.ok])
+		self["okbutton"].disable()