split Misc Converter/Source into RecordState and TunerInfo Source /

Converter
add deprecation Warnings for some old InfoBar Components (Nim_A, NimB,
NimA_Active, NimB_Active, BlinkingPoint)

3 files changed, 22 insertions, 8 deletions

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index f0a5267a..806a7a0c 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1318,6 +1318,9 @@ class InfoBarInstantRecord:
 #### DEPRECATED CODE ####
 		self["BlinkingPoint"] = BlinkingPixmapConditional()
 		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):
@@ -1663,9 +1666,21 @@ class InfoBarAdditionalInfo:
 
 ######### 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:
@@ -1915,8 +1930,7 @@ 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.GlobalInfo" render="FixedLabel" text=" " position="62,46" size="82,18" zPosition="1" >
-			<convert type="Misc">RecordRunning</convert>
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="62,46" size="82,18" zPosition="1" >
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 		<widget source="session.CurrentService" render="Label" position="6,4" size="120,42" font="Regular;18" >
@@ -1948,8 +1962,7 @@ 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.GlobalInfo" render="FixedLabel" text=" " position="62,46" size="64,18" zPosition="1" >
-			<convert type="Misc">RecordRunning</convert>
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="62,46" size="64,18" zPosition="1" >
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 		<widget source="session.CurrentService" render="Label" position="6,4" size="120,42" font="Regular;18" >
diff --git a/lib/python/Screens/SessionGlobals.py b/lib/python/Screens/SessionGlobals.py
index df884ba9..3eadf332 100644
--- a/lib/python/Screens/SessionGlobals.py
+++ b/lib/python/Screens/SessionGlobals.py
@@ -5,7 +5,8 @@ from Components.Sources.EventInfo import EventInfo
 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.FrontendInfo import FrontendInfo
 from Components.Sources.Source import Source
-from Components.Sources.Misc import Misc
+from Components.Sources.TunerInfo import TunerInfo
+from Components.Sources.RecordState import RecordState
 
 class SessionGlobals(Screen):
 	def __init__(self, session):
@@ -16,7 +17,8 @@ class SessionGlobals(Screen):
 		self["FrontendStatus"] = FrontendStatus(service_source = session.nav.getCurrentService)
 		self["FrontendInfo"] = FrontendInfo(service_source = session.nav.getCurrentService)
 		self["VideoPicture"] = Source()
-		self["GlobalInfo"] = Misc(session)
+		self["TunerInfo"] = TunerInfo()
+		self["RecordState"] = RecordState(session)
 		session.nav.event.append(self.serviceEvent)
 		self.service_state = 0
 
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 86b7ca03..ab3e413a 100644
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -75,8 +75,7 @@ class StandbySummary(Screen):
 		<widget source="global.CurrentTime" render="Label" position="0,0" size="132,64" font="Regular;40" halign="center">
 			<convert type="ClockToText" />
 		</widget>
-		<widget source="session.GlobalInfo" render="FixedLabel" text=" " position="0,0" size="132,64" zPosition="1" >
-			<convert type="Global">RecordRunning</convert>
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="0,0" size="132,64" zPosition="1" >
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>"""