X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0905e6fa81fbe52817b2e67081da9944131a96fb..5c66de23e71d94ddba590c67e4751e046a095e68:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index d868fd8b..be6b65c9 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -6,12 +6,15 @@ from Components.Button import Button
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 
+from Screens.MessageBox import MessageBox
+from Screens.MovieSelection import MovieSelection
+
 from enigma import *
 
 import time
 
 # hack alert!
-from Menu import *
+from Menu import MainMenu, mdom
 
 class InfoBar(Screen):
 	def __init__(self, session):
@@ -29,9 +32,10 @@ class InfoBar(Screen):
 				"zapDown": self.zapDown,
 				"instantRecord": self.instantRecord,
 				"hide": self.hide,
-				"toggleShow": self.toggleShow
+				"toggleShow": self.toggleShow,
+				"showMovies": self.showMovies,
 			})
-		self["okbutton"] = Button("mainMenu", [self.mainMenu])
+#		self["okbutton"] = Button("mainMenu", [self.mainMenu])
 		
 		self["CurrentTime"] = Clock()
 		
@@ -49,7 +53,7 @@ class InfoBar(Screen):
 		print "loading mainmenu XML..."
 		menu = mdom.childNodes[0]
 		assert menu.tagName == "menu", "root element in menu must be 'menu'!"
-		self.session.open(Menu, menu, menu.childNodes)
+		self.session.open(MainMenu, menu, menu.childNodes)
 
 	def switchChannelUp(self):	
 		self.servicelist.moveUp()
@@ -77,6 +81,9 @@ class InfoBar(Screen):
 		self.servicelist.zap()
 		
 	def instantRecord(self):
+		self.session.open(MessageBox, "this would be an instant recording! do you really know what you're doing?!")
+		return
+	
 		if self.recording != None:
 			print "remove entry"
 			self.session.nav.RecordTimer.removeEntry(self.recording)
@@ -93,7 +100,8 @@ class InfoBar(Screen):
 					ev = eServiceEventPtr()
 					if info.getEvent(ev, 0) == 0:
 						epg = ev
-
-			self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg)
-			print "got entry: %s" % (str(self.recording))
-
+			# fix me, description. 
+			self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+	
+	def showMovies(self):
+		self.session.open(MovieSelection)