X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5f3fcf5eb76d7f94a699161c0f356959b8bd25c3..8e63444e6767c17cffe73fb03a88fe4b68fa06c3:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 3320d23d..b720d200 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -9,11 +9,8 @@ from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.PluginComponent import plugins
 from Components.ServiceEventTracker import ServiceEventTracker
-from Components.Sources.CurrentService import CurrentService
-from Components.Sources.EventInfo import EventInfo
-from Components.Sources.FrontendStatus import FrontendStatus
+from Components.Sources.Source import ObsoleteSource
 from Components.Sources.Boolean import Boolean
-from Components.Sources.Clock import Clock
 from Components.config import config, ConfigBoolean, ConfigClock
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
@@ -203,7 +200,8 @@ class InfoBarNumberZap:
 			else:
 				self.servicelist.recallPrevService()
 		else:
-			self.session.openWithCallback(self.numberEntered, NumberZap, number)
+			if self.has_key("TimeshiftActions") and not self.timeshift_enabled:
+				self.session.openWithCallback(self.numberEntered, NumberZap, number)
 
 	def numberEntered(self, retval):
 #		print self.servicelist
@@ -544,13 +542,13 @@ class InfoBarEPG:
 class InfoBarTuner:
 	"""provides a snr/agc/ber display"""
 	def __init__(self):
-		self["FrontendStatus"] = FrontendStatus(service_source = self.session.nav.getCurrentService)
+		self["FrontendStatus"] = ObsoleteSource(new_source = "session.FrontendStatus", removal_date = "2008-01")
 
 class InfoBarEvent:
 	"""provides a current/next event info display"""
 	def __init__(self):
-		self["Event_Now"] = EventInfo(self.session.nav, EventInfo.NOW)
-		self["Event_Next"] = EventInfo(self.session.nav, EventInfo.NEXT)
+		self["Event_Now"] = ObsoleteSource(new_source = "session.Event_Now", removal_date = "2008-01")
+		self["Event_Next"] = ObsoleteSource(new_source = "session.Event_Next", removal_date = "2008-01")
 
 class InfoBarRdsDecoder:
 	"""provides RDS and Rass support/display"""
@@ -602,7 +600,7 @@ class InfoBarRdsDecoder:
 
 class InfoBarServiceName:
 	def __init__(self):
-		self["CurrentService"] = CurrentService(self.session.nav)
+		self["CurrentService"] = ObsoleteSource(new_source = "session.CurrentService", removal_date = "2008-01")
 
 class InfoBarSeek:
 	"""handles actions like seeking, pause"""
@@ -1908,18 +1906,21 @@ class InfoBarCueSheetSupport:
 class InfoBarSummary(Screen):
 	skin = """
 	<screen position="0,0" size="132,64">
-		<widget source="CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16" >
+		<widget source="global.CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16" >
 			<convert type="ClockToText">WithSeconds</convert>
 		</widget>
-		<widget source="CurrentService" render="Label" position="6,4" size="120,42" font="Regular;18" >
+		<widget source="session.CurrentService" render="Label" position="6,4" size="120,42" font="Regular;18" >
 			<convert type="ServiceName">Name</convert>
-		</widget>
+		</widget> 
 	</screen>"""
 
+# for picon:  (path="piconlcd" will use LCD picons)
+#		<widget source="session.CurrentService" render="Picon" position="6,0" size="120,64" path="piconlcd" >
+#			<convert type="ServiceName">Reference</convert>
+#		</widget>
+
 	def __init__(self, session, parent):
 		Screen.__init__(self, session)
-		self["CurrentService"] = CurrentService(self.session.nav)
-		self["CurrentTime"] = Clock()
 
 class InfoBarSummarySupport:
 	def __init__(self):
@@ -1928,6 +1929,30 @@ class InfoBarSummarySupport:
 	def createSummary(self):
 		return InfoBarSummary
 
+class InfoBarMoviePlayerSummary(Screen):
+	skin = """
+	<screen position="0,0" size="132,64">
+		<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.CurrentService" render="Label" position="6,4" size="120,42" font="Regular;18" >
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="session.CurrentService" render="Progress" position="6,46" size="56,18" borderWidth="1" >
+			<convert type="ServicePosition">Position</convert>
+		</widget>
+	</screen>"""
+
+	def __init__(self, session, parent):
+		Screen.__init__(self, session)
+
+class InfoBarMoviePlayerSummarySupport:
+	def __init__(self):
+		pass
+
+	def createSummary(self):
+		return InfoBarMoviePlayerSummary
+
 class InfoBarTeletextPlugin:
 	def __init__(self):
 		self.teletext_plugin = None