X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d5e22a275d2ecdf3205bfefa927be6e125ac27b8..26333622d12f5f959e26164d9889474d7cd1f552:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index be6b65c9..e98ebbae 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,10 +1,12 @@
 from Screen import Screen
 from ChannelSelection import ChannelSelection
 from Components.Clock import Clock
+from Components.VolumeBar import VolumeBar
 from Components.ActionMap import ActionMap
 from Components.Button import Button
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
+from Components.ServicePosition import ServicePosition
 
 from Screens.MessageBox import MessageBox
 from Screens.MovieSelection import MovieSelection
@@ -17,12 +19,20 @@ 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" ], 
 			{
 				"switchChannelUp": self.switchChannelUp,
@@ -30,14 +40,22 @@ class InfoBar(Screen):
 				"mainMenu": self.mainMenu,
 				"zapUp": self.zapUp,
 				"zapDown": self.zapDown,
+				"volumeUp": self.volUp,
+				"volumeDown": self.volDown,
+				"volumeMute": self.volMute,
 				"instantRecord": self.instantRecord,
 				"hide": self.hide,
 				"toggleShow": self.toggleShow,
 				"showMovies": self.showMovies,
+				"quit": self.quit
 			})
 #		self["okbutton"] = Button("mainMenu", [self.mainMenu])
 		
 		self["CurrentTime"] = Clock()
+		# ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+		# Clock()
+
+		self["Volume"] = self.volumeBar
 		
 		self["ServiceName"] = ServiceName(self.session.nav)
 		
@@ -48,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..."
@@ -67,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()
@@ -79,10 +101,33 @@ class InfoBar(Screen):
 	def	zapDown(self):
 		self.servicelist.moveDown()
 		self.servicelist.zap()
+
+	def	volUp(self):
+		eDVBVolumecontrol.getInstance().volumeUp()
+		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+
+	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):
+		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"
@@ -105,3 +150,4 @@ class InfoBar(Screen):
 	
 	def showMovies(self):
 		self.session.open(MovieSelection)
+