X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8138d67d47307c7e438166b9c9cac5992e4929a5..1806c7b99229f67aba07d971863f9ed5a725ffbe:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 8ab16c53..5666fc8e 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -6,7 +6,7 @@ from Components.config import configfile, configsequencearg
 from Components.config import config, configElement, ConfigSubsection, configSequence
 from ChannelSelection import ChannelSelection
 
-from Components.Pixmap import PixmapConditional
+from Components.Pixmap import Pixmap, PixmapConditional
 from Components.BlinkingPixmap import BlinkingPixmapConditional
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
@@ -246,7 +246,43 @@ class InfoBarNumberZap:
 	def numberEntered(self, retval):
 #		print self.servicelist
 		if retval > 0:
-			self.servicelist.zapToNumber(retval)
+			self.zapToNumber(retval)
+
+	def searchNumberHelper(self, serviceHandler, num, bouquet):
+		servicelist = serviceHandler.list(bouquet)
+		if not servicelist is None:
+			while num:
+				serviceIterator = servicelist.getNext()
+				if not serviceIterator.valid(): #check end of list
+					break
+				if serviceIterator.flags: #assume normal dvb service have no flags set
+					continue
+				num -= 1;
+			if not num: #found service with searched number ?
+				return serviceIterator, 0
+		return None, num
+
+	def zapToNumber(self, number):
+		bouquet = self.servicelist.bouquet_root
+		service = None
+		serviceHandler = eServiceCenter.getInstance()
+		if bouquet.toString().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK
+			service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
+		else:
+			bouquetlist = serviceHandler.list(bouquet)
+			if not bouquetlist is None:
+				while number:
+					bouquet = bouquetlist.getNext()
+					if not bouquet.valid(): #check end of list
+						break
+					if ((bouquet.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory):
+						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.setCurrentSelection(service) #select the service in servicelist
 
 class InfoBarChannelSelection:
 	""" ChannelSelection - handles the channelSelection dialog and the initial 
@@ -396,7 +432,8 @@ class InfoBarInstantRecord:
 		
 		self["BlinkingPoint"] = BlinkingPixmapConditional()
 		self.onShown.append(self["BlinkingPoint"].hidePixmap)
-
+		self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording)
+		
 	def stopCurrentRecording(self):	
 		self.session.nav.RecordTimer.removeEntry(self.recording)
 		self.recording = None
@@ -418,7 +455,7 @@ class InfoBarInstantRecord:
 		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")
 		self.recording.dontSave = True
 		
-		self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
+		#self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
 		
 	def isInstantRecordRunning(self):
 		if self.recording != None:
@@ -475,4 +512,10 @@ class InfoBarAdditionalInfo:
 		
 		self["FormatActive"] = PixmapConditional()
 		# TODO: get the info from c++ somehow
-		self["FormatActive"].setConnect(lambda: False)
\ No newline at end of file
+		self["FormatActive"].setConnect(lambda: False)
+		
+		self["ButtonRed"] = Pixmap()
+		self["ButtonRedText"] = Label(_("Record"))
+		self["ButtonGreen"] = Pixmap()
+		self["ButtonYellow"] = Pixmap()
+		self["ButtonBlue"] = Pixmap()
\ No newline at end of file