X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2dc9b0cb83069aaed4dbb3f45b3d15835568d0d9..a8c0bc898071ff61073ce7d798bccd3972ecfefe:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index c10dad2d..9702eed7 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,7 +1,6 @@
 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
@@ -11,6 +10,7 @@ from Components.config import configfile
 
 from Screens.MessageBox import MessageBox
 from Screens.MovieSelection import MovieSelection
+from Screens.Volume import Volume
 
 from enigma import *
 
@@ -30,10 +30,11 @@ class InfoBar(Screen):
 
 		#instantiate forever
 		self.servicelist = self.session.instantiateDialog(ChannelSelection)
-		self.volumeBar = VolumeBar()		
 		
 		self.state = self.STATE_HIDDEN
 		
+		self.volumeDialog = self.session.instantiateDialog(Volume)
+		
 		self.hideTimer = eTimer()
 		self.hideTimer.timeout.get().append(self.doTimerHide)
 		#self.hideTimer.start(1000)
@@ -61,8 +62,6 @@ class InfoBar(Screen):
 		# ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
 		# Clock()
 
-		self["Volume"] = self.volumeBar
-		
 		self["ServiceName"] = ServiceName(self.session.nav)
 		
 		self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
@@ -120,12 +119,25 @@ class InfoBar(Screen):
 
 	def	volUp(self):
 		eDVBVolumecontrol.getInstance().volumeUp()
-		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.volumeDialog.instance.show()
+		# FIXME: help wanted :)
+		self.volumeDialog.instance.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.hideVolTimer = eTimer()
+		self.hideVolTimer.timeout.get().append(self.volHide)
+		self.hideVolTimer.start(3000)
 
 	def	volDown(self):
 		eDVBVolumecontrol.getInstance().volumeDown()
-		self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.volumeDialog.instance.show()
+		# FIXME: help wanted :)
+		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+		self.hideVolTimer = eTimer()
+		self.hideVolTimer.timeout.get().append(self.volHide)
+		self.hideVolTimer.start(3000)
 		
+	def volHide(self):
+		self.volumeDialog.instance.hide()
+
 	def startShow(self):
 		self.instance.m_animation.startMoveAnimation(ePoint(0, 600), ePoint(0, 380), 100)
 		self.state = self.STATE_SHOWN
@@ -141,30 +153,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
-			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")
-	
+			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?")
+
 	def showMovies(self):
 		self.session.open(MovieSelection)