replace some more Clock() by ObsoleteSource redirect (and fix skin_default), by Moritz Venn

6 files changed, 13 insertions, 14 deletions

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
index 594aea4b..9a8b4935 100644
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
@@ -7,7 +7,7 @@ from Components.HTMLComponent import HTMLComponent
 from Components.GUIComponent import GUIComponent
 from Components.EpgList import Rect
 from Components.Sources.Event import Event
-from Components.Sources.Clock import Clock
+from Components.Sources.Source import ObsoleteSource
 from Screens.Screen import Screen
 from Screens.EventView import EventViewSimple
 from Screens.TimeDateInput import TimeDateInput
@@ -327,7 +327,7 @@ class GraphMultiEPG(Screen):
 		self["key_green"] = Button(_("Add timer"))
 		self["timeline_text"] = TimelineText()
 		self["Event"] = Event()
-		self["Clock"] = Clock()
+		self["Clock"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
 		self.time_lines = [ ]
 		for x in (0,1,2,3,4,5):
 			pm = Pixmap()
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 62949ed1..c50d82bc 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -9,7 +9,7 @@ from enigma import eServiceReference, eEPGCache, eServiceCenter, eTimer, eDVBDB,
 from Components.config import config, ConfigSubsection, ConfigText
 from Tools.NumericalTextInput import NumericalTextInput
 from Components.NimManager import nimmanager
-from Components.Sources.Clock import Clock
+from Components.Sources.Source import ObsoleteSource
 from Components.Sources.RdsDecoder import RdsDecoder
 from Components.Sources.ServiceEvent import ServiceEvent
 from Components.Input import Input
@@ -1053,7 +1053,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 		ChannelSelectionEPG.__init__(self)
 		SelectionEventInfo.__init__(self)
 
-		self["CurrentTime"] = Clock()
+		self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
 
 		self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
 			{
@@ -1303,7 +1303,7 @@ class RadioInfoBar(Screen, InfoBarEvent, InfoBarServiceName):
 		Screen.__init__(self, session)
 		InfoBarEvent.__init__(self)
 		InfoBarServiceName.__init__(self)
-		self["CurrentTime"] = Clock()
+		self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
 		self["RdsDecoder"] = RdsDecoder(self.session.nav)
 		self["BlinkingPoint"] = Pixmap()
 		self["BlinkingPoint"].hide()
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index eeb0f418..27f75388 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -5,7 +5,7 @@ from Screens.ChannelSelection import ChannelSelectionRadio
 from Screens.MessageBox import MessageBox
 from Screens.Ci import CiHandler
 
-from Components.Sources.Clock import Clock
+from Components.Sources.Source import ObsoleteSource
 from Components.ActionMap import HelpableActionMap
 from Components.config import config
 from Components.ServiceEventTracker import ServiceEventTracker
@@ -59,7 +59,7 @@ class InfoBar(InfoBarShowHide,
 		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
 		self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
 
-		self["CurrentTime"] = Clock()
+		self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
 
 		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
 			{
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2ca2681f..dde271bc 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -11,7 +11,6 @@ from Components.PluginComponent import plugins
 from Components.ServiceEventTracker import ServiceEventTracker
 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
diff --git a/lib/python/Screens/SimpleSummary.py b/lib/python/Screens/SimpleSummary.py
index 1a5fe887..651d2e3d 100644
--- a/lib/python/Screens/SimpleSummary.py
+++ b/lib/python/Screens/SimpleSummary.py
@@ -1,10 +1,10 @@
 from Screens.Screen import Screen
-from Components.Sources.Clock import Clock
+from Components.Sources.Source import ObsoleteSource
 
 class SimpleSummary(Screen):
 	skin = """
 	<screen position="0,0" size="132,64">
-		<widget name="Clock" position="56,46" size="82,18" font="Regular;16">
+		<widget name="global.CurrentTime" position="56,46" size="82,18" font="Regular;16">
 			<convert type="ClockToText">WithSeconds</convert>
 		</widget>
 		<widget name="Title" position="6,4" size="120,42" font="Regular;18" />
@@ -12,7 +12,7 @@ class SimpleSummary(Screen):
 	def __init__(self, session, root_screen):
 		from Components.Label import Label
 		Screen.__init__(self, session)
-		self["Clock"] = Clock()
+		self["Clock"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
 		self["Title"] = Label(root_screen.title)
 
 	def setTitle(self, title):
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index b572bd80..43c95dbd 100644
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -3,7 +3,7 @@ from Components.ActionMap import ActionMap
 from Components.config import config
 from Components.AVSwitch import AVSwitch
 from enigma import eDVBVolumecontrol, eDBoxLCD
-from Components.Sources.Clock import Clock
+from Components.Sources.Source import ObsoleteSource
 
 inStandby = None
 
@@ -72,14 +72,14 @@ class Standby(Screen):
 class StandbySummary(Screen):
 	skin = """
 	<screen position="0,0" size="132,64">
-		<widget source="CurrentTime" render="Label" position="0,0" size="132,64" font="Regular;40" halign="center">
+		<widget source="global.CurrentTime" render="Label" position="0,0" size="132,64" font="Regular;40" halign="center">
 			<convert type="ClockToText" />
 		</widget>
 	</screen>"""
 
 	def __init__(self, session, parent):
 		Screen.__init__(self, session)
-		self["CurrentTime"] = Clock()
+		self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
 
 from enigma import quitMainloop, iRecordableService
 from Screens.MessageBox import MessageBox