X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;h=e222b4e13257a22308d7af0957ab5ac8c8c565e6;hp=603f476218f865aa96a3fb908f5425b2d5ad87e5;hb=9e4a418c7ce0e0281ca8c06be4ee92a48eaab87a;hpb=fb1e03cf013bb255146c445e5f2c748bab21b6d8

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 603f476..e222b4e 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -46,7 +46,6 @@ from Menu import MainMenu, mdom
 class InfoBarDish:
 	def __init__(self):
 		self.dishDialog = self.session.instantiateDialog(Dish)
-		self.onLayoutFinish.append(self.dishDialog.show)
 
 class InfoBarShowHide:
 	""" InfoBar show/hide control, accepts toggleShow and hide actions, might start
@@ -1316,9 +1315,13 @@ class InfoBarInstantRecord:
 				"instantRecord": (self.instantRecord, _("Instant Record...")),
 			})
 		self.recording = []
+#### DEPRECATED CODE ####
 		self["BlinkingPoint"] = BlinkingPixmapConditional()
-		self["BlinkingPoint"].hide()
 		self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording)
+		self["BlinkingPoint"].deprecationInfo = (
+			"session.RecordState source, Pixmap renderer and "
+			"ConditionalShowHide/Blink Converter", "2008-02")
+#########################
 
 	def stopCurrentRecording(self, entry = -1):
 		if entry is not None and entry != -1:
@@ -1364,7 +1367,9 @@ class InfoBarInstantRecord:
 		recording.dontSave = True
 		self.recording.append(recording)
 
-		#self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
+#### DEPRECATED CODE ####
+		self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
+#########################
 
 	def isInstantRecordRunning(self):
 		print "self.recording:", self.recording
@@ -1654,20 +1659,35 @@ class InfoBarSubserviceSelection:
 
 class InfoBarAdditionalInfo:
 	def __init__(self):
-		self["NimA"] = Pixmap()
-		self["NimB"] = Pixmap()
-		self["NimA_Active"] = Pixmap()
-		self["NimB_Active"] = Pixmap()
 
 		self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0)
 		self["TimeshiftPossible"] = self["RecordingPossible"]
 		self["ExtensionsAvailable"] = Boolean(fixed=1)
 
-		self.session.nav.event.append(self.gotServiceEvent) # we like to get service events
+######### DEPRECATED CODE ##########
+		self["NimA"] = Pixmap()
+		self["NimA"].deprecationInfo = (
+			"session.TunerInfo source, Pixmap renderer, TunerInfo/UseMask Converter"
+			", ValueBitTest(1) Converter and ConditionalShowHide Converter", "2008-02")
+		self["NimB"] = Pixmap()
+		self["NimB"].deprecationInfo = (
+			"session.TunerInfo source, Pixmap renderer, TunerInfo/UseMask Converter"
+			", ValueBitTest(2) Converter and ConditionalShowHide Converter", "2008-02")
+		self["NimA_Active"] = Pixmap()
+		self["NimA_Active"].deprecationInfo = (
+			"session.FrontendInfo source, Pixmap renderer, FrontendInfo/NUMBER Converter"
+			", ValueRange(1,1) Converter and ConditionalShowHide Converter", "2008-02")
+		self["NimB_Active"] = Pixmap()
+		self["NimB_Active"].deprecationInfo = (
+			"session.FrontendInfo source, Pixmap renderer, FrontendInfo/NUMBER Converter"
+			", ValueRange(1,1) Converter and ConditionalShowHide Converter", "2008-02")
+
 		res_mgr = eDVBResourceManager.getInstance()
 		if res_mgr:
 			res_mgr.frontendUseMaskChanged.get().append(self.tunerUseMaskChanged)
 
+		self.session.nav.event.append(self.gotServiceEvent) # we like to get service events
+
 	def tunerUseMaskChanged(self, mask):
 		if mask&1:
 			self["NimA_Active"].show()
@@ -1695,6 +1715,7 @@ class InfoBarAdditionalInfo:
 		service = self.session.nav.getCurrentService()
 		if ev == iPlayableService.evUpdatedInfo or ev == iPlayableService.evEnd:
 			self.checkTunerState(service)
+####################################
 
 class InfoBarNotifications:
 	def __init__(self):
@@ -1909,6 +1930,10 @@ class InfoBarSummary(Screen):
 		<widget source="global.CurrentTime" render="Label" position="62,46" size="82,18" font="Regular;16" >
 			<convert type="ClockToText">WithSeconds</convert>
 		</widget>
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="62,46" size="82,18" zPosition="1" >
+			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
+			<convert type="ConditionalShowHide">Blink</convert>
+		</widget>
 		<widget source="session.CurrentService" render="Label" position="6,4" size="120,42" font="Regular;18" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
@@ -1923,7 +1948,7 @@ class InfoBarSummary(Screen):
 #		</widget>
 
 	def __init__(self, session, parent):
-		Screen.__init__(self, session)
+		Screen.__init__(self, session, parent = parent)
 
 class InfoBarSummarySupport:
 	def __init__(self):
@@ -1938,6 +1963,10 @@ class InfoBarMoviePlayerSummary(Screen):
 		<widget source="global.CurrentTime" render="Label" position="62,46" size="64,18" font="Regular;16" halign="right" >
 			<convert type="ClockToText">WithSeconds</convert>
 		</widget>
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="62,46" size="64,18" zPosition="1" >
+			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
+			<convert type="ConditionalShowHide">Blink</convert>
+		</widget>
 		<widget source="session.CurrentService" render="Label" position="6,4" size="120,42" font="Regular;18" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
@@ -2058,7 +2087,8 @@ class InfoBarServiceErrorPopupSupport:
 			eDVBServicePMTHandler.eventNewProgramInfo: None,
 			eDVBServicePMTHandler.eventTuned: None,
 			eDVBServicePMTHandler.eventSOF: None,
-			eDVBServicePMTHandler.eventEOF: None
+			eDVBServicePMTHandler.eventEOF: None,
+			eDVBServicePMTHandler.eventMisconfiguration: _("Service unavailable!\nCheck tuner configuration!"),
 		}
 
 		error = errors.get(error) #this returns None when the key not exist in the dict