X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87bfe5dfced0fb7a4e9839fdafa898261a39c86c..495f6c0ff7a37c224319af9f07a3e39fa5e804e1:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index da2509e2..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
@@ -30,6 +31,13 @@ class InfoBar(Screen):
 		#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" ], 
 			{
@@ -49,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
@@ -83,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.instance.isVisible():
-#			self.instance.hide()
-			self.startHide()
+		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.instance.show()
+#			self.startShow()
+			self.state = self.STATE_SHOWN
+			#TODO: make it customizable
+			self.hideTimer.start(5000)
 
 	def	zapUp(self):
 		self.servicelist.moveUp()
@@ -108,16 +127,19 @@ class InfoBar(Screen):
 		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
 		
 	def startShow(self):
-		self.instance.m_animation.startMoveAnimation(ePoint(0, 500), ePoint(0, 380), 100)
+		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, 500), 100)
+		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):
@@ -133,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)
-