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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 0ead7221..e98ebbae 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -19,12 +19,19 @@ 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["actions"] = ActionMap( [ "InfobarActions" ], 
 			{
@@ -44,7 +51,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 +66,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..."
@@ -77,10 +87,12 @@ class InfoBar(Screen):
 		self.instance.hide()
 
 	def toggleShow(self):
-		if self.instance.isVisible():
-			self.instance.hide()
+		if self.state == self.STATE_SHOWN:
+#			self.instance.hide()
+			self.startHide()
 		else:
-			self.instance.show()
+#			self.instance.show()
+			self.startShow()
 
 	def	zapUp(self):
 		self.servicelist.moveUp()
@@ -97,6 +109,14 @@ 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()
@@ -106,8 +126,8 @@ class InfoBar(Screen):
 		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"