X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/19d448e556072c1f1c9d4e34fbdb0241b2dabb56..173e6c3e6d613fe18d11c07ea8f52f457ac96e4b:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 28bb39df..73825f25 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -33,6 +33,11 @@ class InfoBar(Screen):
 		self.volumeBar = VolumeBar()		
 		
 		self.state = self.STATE_HIDDEN
+		
+		self.hideTimer = eTimer()
+		self.hideTimer.timeout.get().append(self.doTimerHide)
+		#self.hideTimer.start(1000)
+
 
 		self["actions"] = ActionMap( [ "InfobarActions" ], 
 			{
@@ -87,13 +92,23 @@ class InfoBar(Screen):
 	def hide(self):	
 		self.instance.hide()
 
+	def doTimerHide(self):
+		if self.state == self.STATE_SHOWN:
+			self.instance.hide()
+			self.state = self.STATE_HIDDEN
+
 	def toggleShow(self):
 		if self.state == self.STATE_SHOWN:
-#			self.instance.hide()
-			self.startHide()
+			self.instance.hide()
+			#pls check animation support, sorry
+#			self.startHide()
+			self.state = self.STATE_HIDDEN
 		else:
-#			self.instance.show()
-			self.startShow()
+			self.instance.show()
+#			self.startShow()
+			self.state = self.STATE_SHOWN
+			#TODO: make it customizable
+			self.hideTimer.start(5000)
 
 	def	zapUp(self):
 		self.servicelist.moveUp()
@@ -126,30 +141,42 @@ class InfoBar(Screen):
 	def	quit(self):
 		configfile.save()
 		quitMainloop()
+	
+	def stopCurrentRecording(self):	
+		print "remove entry"
+		self.session.nav.RecordTimer.removeEntry(self.recording)
+		self.recording = None
+	
+	def startInstantRecording(self):
+		serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
+			
+		# try to get event info
+		epg = None
+		try:
+			service = self.session.nav.getCurrentService()
+			info = service.info()
+			ev = info.getEvent(0)
+			epg = ev
+		except:
+			pass
+		
+		# fix me, description. 
+		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+
+	def recordQuestionCallback(self, answer):
+		if answer == False:
+			return
 		
+		if self.recording != None:
+			self.stopCurrentRecording()
+		else:
+			self.startInstantRecording()
+
 	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)
-			self.recording = None
+			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Do you want to stop the current\n(instant) recording?")
 		else:
-			serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
-			
-			# try to get event info
-			epg = None
-			service = self.session.nav.getCurrentService()
-			if service != None:
-				info = iServiceInformationPtr()
-				if not service.info(info):
-					ev = eServiceEventPtr()
-					if info.getEvent(ev, 0) == 0:
-						epg = ev
-			# fix me, description. 
-			self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
-	
+			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?")
+
 	def showMovies(self):
 		self.session.open(MovieSelection)
-