X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/49b1d6023e84aa49b29bc0c0cd2e293b3a7e360c..562f08b0d0d53a3b79516dff47a7eea7ba971d17:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index a627cdb4..7a2f985e 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -10,14 +10,12 @@ from ChannelSelection import ChannelSelection, BouquetSelector
 from Components.Pixmap import Pixmap, PixmapConditional
 from Components.BlinkingPixmap import BlinkingPixmapConditional
 from Components.ServiceName import ServiceName
-from Components.EventInfo import EventInfo
+from Components.EventInfo import EventInfo, EventInfoProgress
 
 from ServiceReference import ServiceReference
 from EpgSelection import EPGSelection
 
 from Screens.MessageBox import MessageBox
-from Screens.Volume import Volume
-from Screens.Mute import Mute
 from Screens.Dish import Dish
 from Screens.Standby import Standby
 from Screens.EventView import EventView
@@ -38,69 +36,10 @@ from Components.config import config, currentConfigSelectionElement
 # hack alert!
 from Menu import MainMenu, mdom
 
-from GlobalActions import globalActionMap
-
-class InfoBarVolumeControl:
-	"""Volume control, handles volUp, volDown, volMute actions and display 
-	a corresponding dialog"""
-
-	def __init__(self):
-		global globalActionMap
-		globalActionMap.actions["volumeUp"]=self.volUp
-		globalActionMap.actions["volumeDown"]=self.volDown
-		globalActionMap.actions["volumeMute"]=self.volMute
-
-		config.audio = ConfigSubsection()
-		config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100)))
-
-		self.volumeDialog = self.session.instantiateDialog(Volume)
-		self.muteDialog = self.session.instantiateDialog(Mute)
-
-		self.hideVolTimer = eTimer()
-		self.hideVolTimer.timeout.get().append(self.volHide)
-
-		vol = config.audio.volume.value[0]
-		self.volumeDialog.setValue(vol)
-		eDVBVolumecontrol.getInstance().setVolume(vol, vol)
-	
-	def volSave(self):
-		config.audio.volume.value = eDVBVolumecontrol.getInstance().getVolume()
-		config.audio.volume.save()
-		
-	def	volUp(self):
-		if (eDVBVolumecontrol.getInstance().isMuted()):
-			self.volMute()
-		eDVBVolumecontrol.getInstance().volumeUp()
-		self.volumeDialog.instance.show()
-		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-		self.volSave()
-		self.hideVolTimer.start(3000, True)
-
-	def	volDown(self):
-		if (eDVBVolumecontrol.getInstance().isMuted()):
-			self.volMute()
-		eDVBVolumecontrol.getInstance().volumeDown()
-		self.volumeDialog.instance.show()
-		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-		self.volSave()
-		self.hideVolTimer.start(3000, True)
-		
-	def volHide(self):
-		self.volumeDialog.instance.hide()
-
-	def	volMute(self):
-		eDVBVolumecontrol.getInstance().volumeToggleMute()
-		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-		
-		if (eDVBVolumecontrol.getInstance().isMuted()):
-			self.muteDialog.instance.show()
-		else:
-			self.muteDialog.instance.hide()
-
 class InfoBarDish:
 	def __init__(self):
 		self.dishDialog = self.session.instantiateDialog(Dish)
-		self.onShown.append(self.dishDialog.instance.hide)
+		self.onShown.append(self.dishDialog.instance.show)
 
 class InfoBarShowHide:
 	""" InfoBar show/hide control, accepts toggleShow and hide actions, might start
@@ -260,7 +199,7 @@ class InfoBarNumberZap:
 	def keyNumberGlobal(self, number):
 #		print "You pressed number " + str(number)
 		if number == 0:
-			self.session.nav.zapLast()
+			self.servicelist.recallPrevService()
 			self.instance.show()
 			self.show()
 		else:
@@ -302,10 +241,13 @@ class InfoBarNumberZap:
 						continue
 					service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
 		if not service is None:
-			self.session.nav.playService(service) #play service
 			if self.servicelist.getRoot() != bouquet: #already in correct bouquet?
-				self.servicelist.setRoot(bouquet)
+				self.servicelist.clearPath()
+				if self.servicelist.bouquet_root != bouquet:
+					self.servicelist.enterPath(self.servicelist.bouquet_root)
+				self.servicelist.enterPath(bouquet)
 			self.servicelist.setCurrentSelection(service) #select the service in servicelist
+			self.servicelist.zap()
 
 class InfoBarChannelSelection:
 	""" ChannelSelection - handles the channelSelection dialog and the initial 
@@ -515,6 +457,8 @@ class InfoBarEvent:
 		self["Event_Now_Duration"] = EventInfo(self.session.nav, EventInfo.Now_Duration)
 		self["Event_Next_Duration"] = EventInfo(self.session.nav, EventInfo.Next_Duration)
 
+		self["Now_ProgressBar"] = EventInfoProgress(self.session.nav, EventInfo.Now)
+
 class InfoBarServiceName:
 	def __init__(self):
 		self["ServiceName"] = ServiceName(self.session.nav)