X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1f5b1a20e4de369c197de1dae8fcb368e3e10b26..96bef29b4b14fa91d6cf7ff1439d5a8b4325e149:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 0ead7221..c10dad2d 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -7,6 +7,7 @@ from Components.Button import Button
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 from Components.ServicePosition import ServicePosition
+from Components.config import configfile
 
 from Screens.MessageBox import MessageBox
 from Screens.MovieSelection import MovieSelection
@@ -19,12 +20,24 @@ import time
 from Menu import MainMenu, mdom
 
 class InfoBar(Screen):
+	STATE_HIDDEN = 0
+	STATE_HIDING = 1
+	STATE_SHOWING = 2
+	STATE_SHOWN = 3
+	
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
 		#instantiate forever
 		self.servicelist = self.session.instantiateDialog(ChannelSelection)
 		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" ], 
 			{
@@ -44,7 +57,8 @@ class InfoBar(Screen):
 			})
 #		self["okbutton"] = Button("mainMenu", [self.mainMenu])
 		
-		self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+		self["CurrentTime"] = Clock()
+		# ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
 		# Clock()
 
 		self["Volume"] = self.volumeBar
@@ -58,6 +72,8 @@ class InfoBar(Screen):
 		self["Event_Next_Duration"] = EventInfo(self.session.nav, EventInfo.Next_Duration)
 		
 		self.recording = None
+		
+		self.pos = 0
 	
 	def mainMenu(self):
 		print "loading mainmenu XML..."
@@ -76,11 +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.instance.isVisible():
+		if self.state == self.STATE_SHOWN:
 			self.instance.hide()
+			#pls check animation support, sorry
+#			self.startHide()
+			self.state = self.STATE_HIDDEN
 		else:
 			self.instance.show()
+#			self.startShow()
+			self.state = self.STATE_SHOWN
+			#TODO: make it customizable
+			self.hideTimer.start(5000)
 
 	def	zapUp(self):
 		self.servicelist.moveUp()
@@ -97,17 +125,26 @@ class InfoBar(Screen):
 	def	volDown(self):
 		eDVBVolumecontrol.getInstance().volumeDown()
 		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		
+	def startShow(self):
+		self.instance.m_animation.startMoveAnimation(ePoint(0, 600), ePoint(0, 380), 100)
+		self.state = self.STATE_SHOWN
+	
+	def startHide(self):
+		self.instance.m_animation.startMoveAnimation(ePoint(0, 380), ePoint(0, 600), 100)
+		self.state = self.STATE_HIDDEN
 
 	def	volMute(self):
 		eDVBVolumecontrol.getInstance().volumeToggleMute()
 		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
 
 	def	quit(self):
+		configfile.save()
 		quitMainloop()
 		
 	def instantRecord(self):
-		self.session.open(MessageBox, "this would be an instant recording! do you really know what you're doing?!")
-		return
+		#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"
@@ -118,16 +155,16 @@ class InfoBar(Screen):
 			
 			# 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
+			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 showMovies(self):
 		self.session.open(MovieSelection)
-